Merge "Correct the expected connection for connection UVE"

Juniper · Feb 1, 2017 · 83cc89f · 83cc89f
2 parents 69d2232 + f58b96b
commit 83cc89f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/control-node/main.cc b/src/control-node/main.cc
@@ -357,9 +357,7 @@ int main(int argc, char *argv[]) {
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::COLLECTOR)->second, "Collector"))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                             ConnectionType::IFMAP)->second, "IFMapServer"));
-         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                             ConnectionType::DATABASE)->second, "Cassandra"));
+                             ConnectionType::DATABASE)->second, "Cassandra"))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::DATABASE)->second, "RabbitMQ"));
     } else {
@@ -371,17 +369,13 @@ int main(int argc, char *argv[]) {
                              ConnectionType::COLLECTOR)->second, "Collector"))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::DISCOVERY)->second,
-                             g_vns_constants.IFMAP_SERVER_DISCOVERY_SERVICE_NAME))
-         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                             ConnectionType::IFMAP)->second, "IFMapServer"))
+                             g_vns_constants.XMPP_SERVER_DISCOVERY_SERVICE_NAME))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                             ConnectionType::DISCOVERY)->second,
-                             g_vns_constants.XMPP_SERVER_DISCOVERY_SERVICE_NAME));
-         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                             ConnectionType::DATABASE)->second, "Cassandra"));
+                             ConnectionType::DATABASE)->second, "Cassandra"))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::DATABASE)->second, "RabbitMQ"));
     }
+
     ConnectionStateManager::GetInstance()->Init(
         *evm.io_service(), options.hostname(),
         module_name, g_vns_constants.INSTANCE_ID_DEFAULT,

diff --git a/src/dns/main.cc b/src/dns/main.cc
@@ -349,11 +349,30 @@ int main(int argc, char *argv[]) {
     // 2. AMQP Server
     //
     std::vector<ConnectionTypeName> expected_connections;
-    expected_connections = boost::assign::list_of
-     (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
-                         ConnectionType::DATABASE)->second, "Cassandra"));
-     (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+    if (options.discovery_server().empty()) {
+        expected_connections = boost::assign::list_of
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::COLLECTOR)->second, "Collector"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DATABASE)->second, "Cassandra"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DATABASE)->second, "RabbitMQ"));
+    } else {
+        expected_connections = boost::assign::list_of
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DISCOVERY)->second,
+                             g_vns_constants.COLLECTOR_DISCOVERY_SERVICE_NAME))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::COLLECTOR)->second, "Collector"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DISCOVERY)->second,
+                             g_vns_constants.DNS_SERVER_DISCOVERY_SERVICE_NAME))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DATABASE)->second, "Cassandra"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::DATABASE)->second, "RabbitMQ"));
+    }
+
     ConnectionStateManager::GetInstance()->Init(
         *(Dns::GetEventManager()->io_service()), options.hostname(),
         module_name, g_vns_constants.INSTANCE_ID_DEFAULT,