Revert "Jonmv/reapply session cache with injected config"

1 files changed, 8 insertions, 1 deletions

diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
index fa0dd37ed13..e59db28e886 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
@@ -42,7 +42,7 @@ public class ServerTestDriver {
         }
 
         MessageBusParams mbusParams = new MessageBusParams().addProtocol(protocol);
-        RPCNetworkParams netParams = new RPCNetworkParams().setSlobroksConfig(client.slobroksConfig());
+        RPCNetworkParams netParams = new RPCNetworkParams().setSlobrokConfigId(client.slobrokId());
         SharedMessageBus mbus = SharedMessageBus.newInstance(mbusParams, netParams);
         ServerSession session = mbus.newDestinationSession(new DestinationSessionParams());
         server = new MbusServer(driver, session);
@@ -130,6 +130,13 @@ public class ServerTestDriver {
                                     guiceModules);
     }
 
+    public static ServerTestDriver newInstanceWithExternSlobrok(String slobrokId, RequestHandler requestHandler,
+                                                                boolean network, Module... guiceModules)
+    {
+        return new ServerTestDriver(RemoteClient.newInstanceWithExternSlobrok(slobrokId, network),
+                                    true, requestHandler, new SimpleProtocol(), guiceModules);
+    }
+
     public static ServerTestDriver newInactiveInstance(boolean network, Module... guiceModules) {
         return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), false, null,
                                     new SimpleProtocol(), guiceModules);