1 files changed, 17 insertions, 17 deletions
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
index 6cd8fb8f34d..57d0abd980b 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
@@ -1,17 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.messagebus.jdisc.test;
 
-import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.Message;
-import com.yahoo.messagebus.MessageBus;
-import com.yahoo.messagebus.MessageBusParams;
-import com.yahoo.messagebus.Protocol;
-import com.yahoo.messagebus.Reply;
-import com.yahoo.messagebus.Result;
-import com.yahoo.messagebus.SourceSession;
-import com.yahoo.messagebus.SourceSessionParams;
+import com.yahoo.messagebus.*;
 import com.yahoo.messagebus.network.local.LocalNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
@@ -25,14 +17,16 @@ import java.util.concurrent.TimeUnit;
 public class RemoteClient {
 
     private final Slobrok slobrok;
+    private final String slobrokId;
     private final MessageBus mbus;
     private final ReplyQueue queue = new ReplyQueue();
     private final SourceSession session;
 
-    private RemoteClient(Protocol protocol, boolean network) {
-        this.slobrok = newSlobrok();
+    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol, boolean network) {
+        this.slobrok = slobrok;
+        this.slobrokId = slobrok != null ? slobrok.configId() : slobrokId;
         mbus = network
-               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobroksConfig(slobroksConfig())),
+               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
                                 new MessageBusParams().addProtocol(protocol))
                : new MessageBus(new LocalNetwork(), new MessageBusParams().addProtocol(protocol));
         session = mbus.createSourceSession(new SourceSessionParams().setThrottlePolicy(null).setReplyHandler(queue));
@@ -46,22 +40,28 @@ public class RemoteClient {
         return queue.awaitReply(timeout, unit);
     }
 
-    public SlobroksConfig slobroksConfig() {
-        return TestUtils.configFor(slobrok);
+    public String slobrokId() {
+        return slobrokId;
     }
 
     public void close() {
         session.destroy();
         mbus.destroy();
-        slobrok.stop();
+        if (slobrok != null) {
+            slobrok.stop();
+        }
     }
 
     public static RemoteClient newInstanceWithInternSlobrok(boolean network) {
-        return new RemoteClient(new SimpleProtocol(), network);
+        return new RemoteClient(newSlobrok(), null, new SimpleProtocol(), network);
+    }
+
+    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId, boolean network) {
+        return new RemoteClient(null, slobrokId, new SimpleProtocol(), network);
     }
 
     public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol, boolean network) {
-        return new RemoteClient(protocol, network);
+        return new RemoteClient(newSlobrok(), null, protocol, network);
     }
 
     private static Slobrok newSlobrok() {