From 80c10d7bf02b3ee0067a642656372f69a4de7d6c Mon Sep 17 00:00:00 2001
From: harsh <hkumar@juniper.net>
Date: Thu, 14 Jul 2016 11:13:46 +0530
Subject: [PATCH] For Discovey agent client initialization use port value as
 set in agent param.

Change-Id: I38dbc90d3d563a43d22898b8209f89c5c2f8cea0
Closes-Bug: #1580109
---
 src/vnsw/agent/cfg/discovery_agent.cc | 2 +-
 src/vnsw/agent/init/agent_param.cc    | 6 +++---
 src/vnsw/agent/init/agent_param.h     | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vnsw/agent/cfg/discovery_agent.cc b/src/vnsw/agent/cfg/discovery_agent.cc
index d4f4e0593f2..0e8bb768334 100644
--- a/src/vnsw/agent/cfg/discovery_agent.cc
+++ b/src/vnsw/agent/cfg/discovery_agent.cc
@@ -19,7 +19,7 @@ using namespace boost::asio;
 
 void DiscoveryAgentClient::Init(AgentParam *param) {
     param_ = param;
-    uint32_t port = agent_cfg_->agent()->discovery_server_port();
+    uint32_t port = param_->discovery_server_port();
     if (!port) {
         port = DISCOVERY_SERVER_PORT;
     }
diff --git a/src/vnsw/agent/init/agent_param.cc b/src/vnsw/agent/init/agent_param.cc
index 7ce6c242d87..b20a88fb23d 100644
--- a/src/vnsw/agent/init/agent_param.cc
+++ b/src/vnsw/agent/init/agent_param.cc
@@ -307,7 +307,7 @@ void AgentParam::ParseDns() {
 
 void AgentParam::ParseDiscovery() {
     GetValueFromTree<string>(dss_server_, "DISCOVERY.server");
-    GetValueFromTree<uint16_t>(dss_port_, "DISCOVERY.port");
+    GetValueFromTree<uint32_t>(dss_port_, "DISCOVERY.port");
     if (!GetValueFromTree<uint16_t>(xmpp_instance_count_,
                                     "DISCOVERY.max_control_nodes")) {
         xmpp_instance_count_ = MAX_XMPP_SERVERS;
@@ -675,7 +675,7 @@ void AgentParam::ParseDnsArguments
 void AgentParam::ParseDiscoveryArguments
     (const boost::program_options::variables_map &var_map) {
     GetOptValue<string>(var_map, dss_server_, "DISCOVERY.server");
-    GetOptValue<uint16_t>(var_map, dss_port_, "DISCOVERY.port");
+    GetOptValue<uint32_t>(var_map, dss_port_, "DISCOVERY.port");
     GetOptValue<uint16_t>(var_map, xmpp_instance_count_,
                           "DISCOVERY.max_control_nodes");
 }
@@ -1417,7 +1417,7 @@ AgentParam::AgentParam(bool enable_flow_options,
          "Run agent in vrouter / tsn / tor mode")
         ("DEFAULT.agent_base_directory", opt::value<string>(),
          "Base directory used by the agent")
-        ("DISCOVERY.port", opt::value<uint16_t>()->default_value(DISCOVERY_SERVER_PORT),
+        ("DISCOVERY.port", opt::value<uint32_t>()->default_value(DISCOVERY_SERVER_PORT),
          "Listen port of discovery server")
         ("DISCOVERY.server", opt::value<string>()->default_value("127.0.0.1"),
          "IP address of discovery server")
diff --git a/src/vnsw/agent/init/agent_param.h b/src/vnsw/agent/init/agent_param.h
index 5dec0c87897..56d4dda504e 100644
--- a/src/vnsw/agent/init/agent_param.h
+++ b/src/vnsw/agent/init/agent_param.h
@@ -178,6 +178,7 @@ class AgentParam  {
         return collector_server_list_;
     }
     uint16_t http_server_port() const { return http_server_port_; }
+    uint32_t discovery_server_port() const { return dss_port_; }
     const std::string &host_name() const { return host_name_; }
     int agent_stats_interval() const { return agent_stats_interval_; }
     int flow_stats_interval() const { return flow_stats_interval_; }
@@ -430,7 +431,7 @@ class AgentParam  {
     uint16_t dns_client_port_;
     uint16_t mirror_client_port_;
     std::string dss_server_;
-    uint16_t dss_port_;
+    uint32_t dss_port_;
     Ip4Address mgmt_ip_;
     HypervisorMode hypervisor_mode_;
     PortInfo xen_ll_;