Send Generator Name from agent in correct format.

Send hostname instead of agent_name in InitGenerator Also send module id as contrail-tor-agent for tor agent instead of TorAgent-<tor-id> Change-Id: Ia5156a597e1e98044f32fee2178f79ab445ba21c Closes-Bug: #1455618
Juniper · May 21, 2015 · 2258c4b · 2258c4b
1 parent f514603
commit 2258c4b
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/src/sandesh/common/vns.sandesh b/src/sandesh/common/vns.sandesh
@@ -182,6 +182,7 @@ enum Module {
     CONTRAIL_TOPOLOGY,
     INVENTORY_AGENT,
     ALARM_GENERATOR,
+    TOR_AGENT,
     MAX_MODULE,
 }
 
@@ -222,6 +223,7 @@ const string MODULE_IPMI_STATS_MGR_NAME = "Ipmi-Stats-mgr"
 const string MODULE_CONTRAIL_SNMP_COLLECTOR_NAME = "contrail-snmp-collector"
 const string MODULE_CONTRAIL_TOPOLOGY_NAME = "contrail-topology"
 const string MODULE_SERVER_INVENTORY_AGENT_NAME = "InventoryAgent"
+const string MODULE_TOR_AGENT_NAME = "contrail-tor-agent"
 
 const map<Module, string> ModuleNames = {
     Module.CONTROL_NODE       : MODULE_CONTROL_NODE_NAME,
@@ -249,6 +251,7 @@ const map<Module, string> ModuleNames = {
     Module.CONTRAIL_TOPOLOGY  : MODULE_CONTRAIL_TOPOLOGY_NAME,
     Module.INVENTORY_AGENT    : MODULE_SERVER_INVENTORY_AGENT_NAME,
     Module.ALARM_GENERATOR    : MODULE_ALARM_GENERATOR_NAME,
+    Module.TOR_AGENT          : MODULE_TOR_AGENT_NAME,
 }
 
 const map<string, Module> ModuleIds = {
@@ -330,6 +333,7 @@ const map <Module, NodeType> Module2NodeType = {
     Module.CONTRAIL_SNMP_COLLECTOR : NodeType.ANALYTICS,
     Module.CONTRAIL_TOPOLOGY  : NodeType.ANALYTICS,
     Module.INVENTORY_AGENT    : NodeType.COMPUTE,
+    Module.TOR_AGENT          : NodeType.COMPUTE,
 }
 
 const string INSTANCE_ID_DEFAULT = "0"

diff --git a/src/vnsw/agent/cfg/discovery_agent.cc b/src/vnsw/agent/cfg/discovery_agent.cc
@@ -135,7 +135,8 @@ void DiscoveryAgentClient::DiscoverServices() {
 
             //subscribe to collector service
             if (param_->collector_server_list().size() == 0) {
-                Module::type module = Module::VROUTER_AGENT;
+                Module::type module = static_cast<Module::type>
+                    (agent->module_type());
                 NodeType::type node_type = 
                     g_vns_constants.Module2NodeType.find(module)->second;
                 std::string subscriber_name =
@@ -149,7 +150,7 @@ void DiscoveryAgentClient::DiscoverServices() {
                 std::vector<std::string> list;
                 list.clear();
                 Sandesh::InitGenerator(subscriber_name,
-                                       agent->agent_name(),
+                                       agent->host_name(),
                                        node_type_name,
                                        agent->instance_id(),
                                        agent->event_manager(),

diff --git a/src/vnsw/agent/cmn/agent.cc b/src/vnsw/agent/cmn/agent.cc
@@ -296,12 +296,12 @@ void Agent::InitCollector() {
      * collector. If not we still need to invoke InitGenerator to initialize
      * introspect.
      */
-    Module::type module = Module::VROUTER_AGENT;
+    Module::type module = static_cast<Module::type>(module_type_);
     NodeType::type node_type =
         g_vns_constants.Module2NodeType.find(module)->second;
     if (params_->collector_server_list().size() != 0) {
         Sandesh::InitGenerator(discovery_client_name_,
-                agent_name(),
+                host_name(),
                 g_vns_constants.NodeTypeNames.find(node_type)->second,
                 instance_id_,
                 event_manager(),
@@ -310,7 +310,7 @@ void Agent::InitCollector() {
                 NULL);
     } else {
         Sandesh::InitGenerator(discovery_client_name_,
-                agent_name(),
+                host_name(),
                 g_vns_constants.NodeTypeNames.find(node_type)->second,
                 instance_id_,
                 event_manager(),
@@ -394,7 +394,8 @@ Agent::Agent() :
     dns_xmpp_client_(), dns_xmpp_init_(), agent_stale_cleaner_(NULL),
     cn_mcast_builder_(NULL), ds_client_(NULL), host_name_(""), agent_name_(""),
     prog_name_(""), introspect_port_(0),
-    instance_id_(g_vns_constants.INSTANCE_ID_DEFAULT), db_(NULL),
+    instance_id_(g_vns_constants.INSTANCE_ID_DEFAULT),
+    module_type_(Module::VROUTER_AGENT), db_(NULL),
     task_scheduler_(NULL), agent_init_(NULL), intf_table_(NULL),
     nh_table_(NULL), uc_rt_table_(NULL), mc_rt_table_(NULL), vrf_table_(NULL),
     vm_table_(NULL), vn_table_(NULL), sg_table_(NULL), mpls_table_(NULL),
@@ -431,7 +432,8 @@ Agent::Agent() :
     SetAgentTaskPolicy();
     CreateLifetimeManager();
 
-    discovery_client_name_ = g_vns_constants.ModuleNames.find(Module::VROUTER_AGENT)->second;
+    Module::type module = static_cast<Module::type>(module_type_);
+    discovery_client_name_ = g_vns_constants.ModuleNames.find(module)->second;
 
     agent_signal_.reset(
         AgentObjectFactory::Create<AgentSignal>(event_mgr_));

diff --git a/src/vnsw/agent/cmn/agent.h b/src/vnsw/agent/cmn/agent.h
@@ -554,6 +554,9 @@ class Agent {
     const std::string &instance_id() const { return instance_id_; }
     void set_instance_id(const std::string &id) { instance_id_ = id; }
 
+    const int &module_type() const { return module_type_; }
+    void set_module_type(int id) { module_type_ = id; }
+
     // Multicast related
     const std::string &multicast_label_range(uint8_t idx) { 
         return label_range_[idx]; 
@@ -852,6 +855,7 @@ class Agent {
     std::string prog_name_;
     int introspect_port_;
     std::string instance_id_;
+    int module_type_;
 
     // DB handles
     DB *db_;

diff --git a/src/vnsw/agent/init/agent_init.cc b/src/vnsw/agent/init/agent_init.cc
@@ -48,8 +48,12 @@ void AgentInit::ProcessOptions
     agent_param_->Init(config_file, program_name);
 }
 
+int AgentInit::ModuleType() {
+    return Module::VROUTER_AGENT;
+}
+
 string AgentInit::ModuleName() {
-    Module::type module = Module::VROUTER_AGENT;
+    Module::type module = static_cast<Module::type>(ModuleType());
     return g_vns_constants.ModuleNames.find(module)->second;
 }
 
@@ -77,6 +81,7 @@ int AgentInit::Start() {
     agent_->set_discovery_client_name(module_name);
     agent_->set_agent_name(AgentName());
     agent_->set_instance_id(InstanceId());
+    agent_->set_module_type(ModuleType());
 
     LoggingInit(agent_param_->log_file(), agent_param_->log_file_size(),
                 agent_param_->log_files_count(), agent_param_->use_syslog(),

diff --git a/src/vnsw/agent/init/agent_init.h b/src/vnsw/agent/init/agent_init.h
@@ -39,6 +39,7 @@ class AgentInit {
 
     virtual std::string InstanceId();
     virtual std::string ModuleName();
+    virtual int ModuleType();
     virtual std::string AgentName();
 
     // Init has two set of routines

diff --git a/src/vnsw/agent/ovs_tor_agent/tor_agent_init.cc b/src/vnsw/agent/ovs_tor_agent/tor_agent_init.cc
@@ -61,8 +61,8 @@ string TorAgentInit::InstanceId() {
     return param->tor_id();
 }
 
-string TorAgentInit::ModuleName() {
-    return "TorAgent-" + InstanceId();
+int TorAgentInit::ModuleType() {
+    return Module::TOR_AGENT;
 }
 
 void TorAgentInit::FactoryInit() {

diff --git a/src/vnsw/agent/ovs_tor_agent/tor_agent_init.h b/src/vnsw/agent/ovs_tor_agent/tor_agent_init.h
@@ -29,7 +29,7 @@ class TorAgentInit : public AgentInit {
     int Start();
 
     virtual std::string InstanceId();
-    virtual std::string ModuleName();
+    virtual int ModuleType();
     // Initialization virtual methods
     void FactoryInit();
     void CreatePeers();