reslove() -> make_address

5 files changed, 11 insertions, 15 deletions

diff --git a/messagebus/src/tests/error/error.cpp b/messagebus/src/tests/error/error.cpp
index 1d8a489a5ed..6ac15ae4015 100644
--- a/messagebus/src/tests/error/error.cpp
+++ b/messagebus/src/tests/error/error.cpp
@@ -18,8 +18,6 @@
 
 using namespace mbus;
 
-TEST_SETUP(Test);
-
 RoutingSpec getRouting() {
     return RoutingSpec()
         .addTable(RoutingTableSpec("Simple")
@@ -28,10 +26,7 @@ RoutingSpec getRouting() {
                   .addRoute(RouteSpec("test").addHop("pxy").addHop("dst")));
 }
 
-int
-Test::Main()
-{
-    TEST_INIT("error_test");
+TEST("error_test") {
 
     Slobrok     slobrok;
     TestServer  srcNet(Identity("test/src"), getRouting(), slobrok);
@@ -76,5 +71,6 @@ Test::Main()
         EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session");
         EXPECT_EQUAL(reply->getError(1).getService(), "test/pxy/session");
     }
-    TEST_DONE();
 }
+
+TEST_MAIN() { TEST_RUN_ALL(); }
\ No newline at end of file
diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
index 770cac620a9..c5d07bc437a 100644
--- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp
+++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
@@ -24,7 +24,7 @@ bool
 testNullAddress(RPCNetwork &network, const string &pattern)
 {
     RPCService service(network.getMirror(), pattern);
-    RPCServiceAddress::UP obj = service.resolve();
+    RPCServiceAddress::UP obj = service.make_address();
     if ( ! EXPECT_FALSE(obj)) {
         return false;
     }
@@ -36,7 +36,7 @@ testAddress(RPCNetwork &network, const string &pattern,
             const string &expectedSpec, const string &expectedSession)
 {
     RPCService service(network.getMirror(), pattern);
-    RPCServiceAddress::UP obj = service.resolve();
+    RPCServiceAddress::UP obj = service.make_address();
     if (!EXPECT_TRUE(obj)) {
         return false;
     }
diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.cpp b/messagebus/src/vespa/messagebus/network/rpcservice.cpp
index 8a7c60392bb..ecf40973187 100644
--- a/messagebus/src/vespa/messagebus/network/rpcservice.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcservice.cpp
@@ -21,8 +21,8 @@ RPCService::RPCService(const Mirror &mirror, const string &pattern) :
     } else {
         Mirror::SpecList addressList = mirror.lookup(pattern);
         if (!addressList.empty()) {
-            assert(addressList.size() == 1);
-            const auto &entry = addressList[random() % addressList.size()];
+            assert(addressList.size() == 1); //TODO URGENT remove assert after a few factory runs.
+            const auto &entry = addressList.front();
             _serviceName = entry.first;
             _connectionSpec = entry.second;
         }
@@ -32,7 +32,7 @@ RPCService::RPCService(const Mirror &mirror, const string &pattern) :
 RPCService::~RPCService() = default;
 
 RPCServiceAddress::UP
-RPCService::resolve()
+RPCService::make_address()
 {
     if ( !_serviceName.empty()) {
         return std::make_unique<RPCServiceAddress>(_serviceName, _connectionSpec);
diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.h b/messagebus/src/vespa/messagebus/network/rpcservice.h
index ad08470321c..13792163693 100644
--- a/messagebus/src/vespa/messagebus/network/rpcservice.h
+++ b/messagebus/src/vespa/messagebus/network/rpcservice.h
@@ -40,7 +40,7 @@ public:
      *
      * @return A concrete service address.
      */
-    RPCServiceAddress::UP resolve();
+    RPCServiceAddress::UP make_address();
 
     bool isValid() const { return ! _connectionSpec.empty(); }
 };
diff --git a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
index dd192a7a848..358698570d2 100644
--- a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
@@ -33,10 +33,10 @@ RPCServicePool::resolve(const string &pattern)
     }
 
     if (service) {
-        return service->resolve();
+        return service->make_address();
     } else {
         service = std::make_shared<RPCService>(_mirror, pattern);
-        auto result = service->resolve();
+        auto result = service->make_address();
         if (service->isValid()) {
             LockGuard guard(_lock);
             (*_lru)[pattern] = std::move(service);