Collector should not publish if discovery is not explicity configured.

Change-Id: Id58ca9d1ebae4d3cfa09dc639f1aa926c22caa0b Closes-Bug:1665834
Juniper · Feb 19, 2017 · c39e9a1 · c39e9a1
1 parent 8936891
commit c39e9a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/analytics/main.cc b/src/analytics/main.cc
@@ -288,7 +288,22 @@ int main(int argc, char *argv[])
     // 6. Kafka Pub
     // 7. Database protobuf if enabled
 
-    std::vector<ConnectionTypeName> expected_connections = boost::assign::list_of
+    std::vector<ConnectionTypeName> expected_connections; 
+    if (options.discovery_server().empty()) {
+        expected_connections = boost::assign::list_of
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::COLLECTOR)->second, ""))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::REDIS_UVE)->second, "To"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::REDIS_UVE)->second, "From"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::DATABASE)->second,
+                             hostname+":Global"))
+         (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
+                             ConnectionType::KAFKA_PUB)->second, kstr));
+    } else {
+        expected_connections = boost::assign::list_of
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::COLLECTOR)->second, ""))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
@@ -306,6 +321,8 @@ int main(int argc, char *argv[])
                              hostname+":Global"))
          (ConnectionTypeName(g_process_info_constants.ConnectionTypeNames.find(
                              ConnectionType::KAFKA_PUB)->second, kstr));
+    }
+
     ConnectionStateManager::
         GetInstance()->Init(*a_evm->io_service(),
             hostname, module_id, instance_id,

diff --git a/src/analytics/options.cc b/src/analytics/options.cc
@@ -301,7 +301,7 @@ void Options::Initialize(EventManager &evm,
         ("DISCOVERY.port", opt::value<uint16_t>()->default_value(
                                                        default_discovery_port),
              "Port of Discovery Server")
-        ("DISCOVERY.server", opt::value<string>()->default_value("127.0.0.1"),
+        ("DISCOVERY.server", opt::value<string>()->default_value(""),
              "IP address of Discovery Server")
 
         ("REDIS.port",

diff --git a/src/analytics/test/options_test.cc b/src/analytics/test/options_test.cc
@@ -66,7 +66,6 @@ TEST_F(OptionsTest, NoArguments) {
     EXPECT_EQ(options_.collector_port(), default_collector_port);
     TASK_UTIL_EXPECT_VECTOR_EQ(expected_conf_files_,
                      options_.config_file());
-    EXPECT_EQ(options_.discovery_server(), "127.0.0.1");
     EXPECT_EQ(options_.discovery_port(), default_discovery_port);
     EXPECT_EQ(options_.hostname(), hostname_);
     EXPECT_EQ(options_.host_ip(), host_ip_);
@@ -119,7 +118,6 @@ TEST_F(OptionsTest, DefaultConfFile) {
     EXPECT_EQ(options_.collector_port(), default_collector_port);
     TASK_UTIL_EXPECT_VECTOR_EQ(options_.config_file(),
                                passed_conf_files);
-    EXPECT_EQ(options_.discovery_server(), "127.0.0.1");
     EXPECT_EQ(options_.discovery_port(), default_discovery_port);
     EXPECT_EQ(options_.hostname(), hostname_);
     EXPECT_EQ(options_.host_ip(), host_ip_);
@@ -174,7 +172,6 @@ TEST_F(OptionsTest, OverrideStringFromCommandLine) {
     EXPECT_EQ(options_.collector_port(), default_collector_port);
     TASK_UTIL_EXPECT_VECTOR_EQ(options_.config_file(),
                                passed_conf_files);
-    EXPECT_EQ(options_.discovery_server(), "127.0.0.1");
     EXPECT_EQ(options_.discovery_port(), default_discovery_port);
     EXPECT_EQ(options_.hostname(), hostname_);
     EXPECT_EQ(options_.host_ip(), host_ip_);
@@ -234,7 +231,6 @@ TEST_F(OptionsTest, OverrideBooleanFromCommandLine) {
     EXPECT_EQ(options_.collector_port(), default_collector_port);
     TASK_UTIL_EXPECT_VECTOR_EQ(options_.config_file(),
                                passed_conf_files);
-    EXPECT_EQ(options_.discovery_server(), "127.0.0.1");
     EXPECT_EQ(options_.discovery_port(), default_discovery_port);
     EXPECT_EQ(options_.hostname(), hostname_);
     EXPECT_EQ(options_.host_ip(), host_ip_);