From 8b0cda66538b480ef4447cc2c7fd3f6cd2b8f4bd Mon Sep 17 00:00:00 2001
From: Kumar Harsh <hkumar@juniper.net>
Date: Tue, 12 Jul 2016 11:37:02 +0530
Subject: [PATCH] For Discovey agent client initialization use port value as
 set in agent param.

Closes-Bug: #1580109

Change-Id: Ic84036bb500618e26bbc8ffd67aa78eadc28e8e8
---
 src/vnsw/agent/cfg/discovery_agent.cc | 2 +-
 src/vnsw/agent/init/agent_param.cc    | 8 ++++----
 src/vnsw/agent/init/agent_param.h     | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/vnsw/agent/cfg/discovery_agent.cc b/src/vnsw/agent/cfg/discovery_agent.cc
index b3808f2bbcb..7c01f8f436c 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 a8639c44f5b..d5c67df3578 100644
--- a/src/vnsw/agent/init/agent_param.cc
+++ b/src/vnsw/agent/init/agent_param.cc
@@ -297,7 +297,7 @@ void AgentParam::ParseVirtualHost() {
 
 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_ = 2;
@@ -588,7 +588,7 @@ void AgentParam::ParseVirtualHostArguments
 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");
 }
@@ -1132,7 +1132,7 @@ AgentParam::AgentParam(Agent *agent, bool enable_flow_options,
         eth_port_no_arp_(false), eth_port_encap_type_(),
         xmpp_instance_count_(),
         dns_port_1_(ContrailPorts::DnsServerPort()),
-        dns_port_2_(ContrailPorts::DnsServerPort()),
+        dns_port_2_(ContrailPorts::DnsServerPort()), dss_port_(0),
         mgmt_ip_(), hypervisor_mode_(MODE_KVM), xen_ll_(),
         tunnel_type_(), metadata_shared_secret_(), max_vm_flows_(),
         linklocal_system_flows_(), linklocal_vm_flows_(),
@@ -1199,7 +1199,7 @@ AgentParam::AgentParam(Agent *agent, 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 90eccf86342..3bda801cc78 100644
--- a/src/vnsw/agent/init/agent_param.h
+++ b/src/vnsw/agent/init/agent_param.h
@@ -144,6 +144,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_; }
@@ -349,7 +350,7 @@ class AgentParam  {
     uint16_t dns_port_1_;
     uint16_t dns_port_2_;
     std::string dss_server_;
-    uint16_t dss_port_;
+    uint32_t dss_port_;
     Ip4Address mgmt_ip_;
     HypervisorMode hypervisor_mode_;
     PortInfo xen_ll_;