From abb3e42d2b7d6b4369c388154eda1dd82cb33d0a Mon Sep 17 00:00:00 2001
From: Sundaresan Rajangam <srajanga@juniper.net>
Date: Tue, 21 Mar 2017 14:55:25 -0700
Subject: [PATCH] contrail-status doesn't get NodeStatus UVE from alarm-gen

If instance id is added to the contrail-alarm-gen process, then
contrail-status doesn't get the NodeStatus UVE from the introspect as
there is no mapping for contrail-alarm-gen:0 in NodeUVEImplementedServices.

Added contrail-alarm-gen:0 in NodeUVEImplementedServices.

Change-Id: I74bca942d951474ffc7abc1401cedf60841065c9
Closes-Bug: #1672506
(cherry picked from commit 838a6489375f9344bace17fb17f37263dab682db)
---
 src/opserver/contrail-alarm-gen.ini |  4 +---
 src/sandesh/common/vns.sandesh      | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/opserver/contrail-alarm-gen.ini b/src/opserver/contrail-alarm-gen.ini
index b53bf58bf74..5e66c2acfb4 100644
--- a/src/opserver/contrail-alarm-gen.ini
+++ b/src/opserver/contrail-alarm-gen.ini
@@ -1,7 +1,5 @@
 [program:contrail-alarm-gen]
-command=/usr/bin/contrail-alarm-gen -c /etc/contrail/contrail-alarm-gen.conf --http_server_port 920%(process_num)01d --worker_id %(process_num)s --log_file /var/log/contrail/contrail-alarm-gen-%(process_num)s.log
-numprocs=1
-process_name=%(process_num)s
+command=/usr/bin/contrail-alarm-gen
 priority=440
 autostart=true
 killasgroup=true
diff --git a/src/sandesh/common/vns.sandesh b/src/sandesh/common/vns.sandesh
index 7653a29b8e9..7a9667a85f9 100644
--- a/src/sandesh/common/vns.sandesh
+++ b/src/sandesh/common/vns.sandesh
@@ -13,17 +13,20 @@ const string SERVICE_TOR_AGENT = "contrail-tor-agent"
 const string SERVICE_VROUTER_AGENT = "contrail-vrouter-agent"
 const string SERVICE_CONTROL_NODE = "contrail-control"
 const string SERVICE_DNSD = "contrail-dns"
-const string SERVICE_API_SERVER = "contrail-api:0"
+const string SERVICE_API_SERVER = "contrail-api"
+const string SERVICE_API_SERVER_0 = "contrail-api:0"
 const string SERVICE_SCHEMA_TRANSFORMER = "contrail-schema"
 const string SERVICE_SVC_MONITOR = "contrail-svc-monitor"
 const string SERVICE_DEVICE_MANAGER = "contrail-device-manager"
 const string SERVICE_COLLECTOR = "contrail-collector"
 const string SERVICE_QUERY_ENGINE = "contrail-query-engine"
 const string SERVICE_OPSERVER = "contrail-analytics-api"
-const string SERVICE_ALARM_GENERATOR= "contrail-alarm-gen"
+const string SERVICE_ALARM_GENERATOR = "contrail-alarm-gen"
+const string SERVICE_ALARM_GENERATOR_0 = "contrail-alarm-gen:0"
 const string SERVICE_SNMP_COLLECTOR = "contrail-snmp-collector"
 const string SERVICE_TOPOLOGY = "contrail-topology"
-const string SERVICE_DISCOVERY = "contrail-discovery:0"
+const string SERVICE_DISCOVERY = "contrail-discovery"
+const string SERVICE_DISCOVERY_0 = "contrail-discovery:0"
 const string SERVICE_STORAGE_STATS_MGR = "contrail-storage-stats"
 const string SERVICE_IPMI_STATS_MGR = "contrail-ipmi-stats"
 const string SERVICE_INVENTORY_AGENT = "contrail-inventory-agent"
@@ -112,6 +115,7 @@ const map<string, u16> ServiceHttpPortMap = {
     SERVICE_OPSERVER : HttpPortOpserver,
     SERVICE_DNSD : HttpPortDns,
     SERVICE_API_SERVER : HttpPortApiServer,
+    SERVICE_API_SERVER_0 : HttpPortApiServer,
     SERVICE_SCHEMA_TRANSFORMER : HttpPortSchemaTransformer,
     SERVICE_SVC_MONITOR : HttpPortSvcMonitor,
     SERVICE_DEVICE_MANAGER : HttpPortDeviceManager,
@@ -124,9 +128,11 @@ const map<string, u16> ServiceHttpPortMap = {
     SERVICE_IPMI_STATS_MGR : HttpPortIpmiStatsmgr,
     SERVICE_INVENTORY_AGENT: HttpPortInventorymgr,
     SERVICE_ALARM_GENERATOR: HttpPortAlarmGenerator,
+    SERVICE_ALARM_GENERATOR_0: HttpPortAlarmGenerator,
     SERVICE_SNMP_COLLECTOR : HttpPortSnmpCollector,
     SERVICE_TOPOLOGY : HttpPortTopology,
-    SERVICE_DISCOVERY : HttpPortDiscovery
+    SERVICE_DISCOVERY : HttpPortDiscovery,
+    SERVICE_DISCOVERY_0 : HttpPortDiscovery
 }
 
 const list<string> NodeUVEImplementedServices = [
@@ -137,10 +143,12 @@ const list<string> NodeUVEImplementedServices = [
     SERVICE_QUERY_ENGINE,
     SERVICE_OPSERVER,
     SERVICE_API_SERVER,
+    SERVICE_API_SERVER_0,
     SERVICE_SCHEMA_TRANSFORMER,
     SERVICE_SVC_MONITOR,
     SERVICE_DEVICE_MANAGER,
     SERVICE_ALARM_GENERATOR,
+    SERVICE_ALARM_GENERATOR_0,
     SERVICE_SNMP_COLLECTOR,
     SERVICE_DATABASE_NODE_MGR,
     SERVICE_CONFIG_NODE_MGR,
@@ -150,6 +158,7 @@ const list<string> NodeUVEImplementedServices = [
     SERVICE_DATABASE_NODE_MGR,
     SERVICE_TOPOLOGY,
     SERVICE_DISCOVERY,
+    SERVICE_DISCOVERY_0
 ]
 
 const list<string> BackupImplementedServices = [
@@ -165,15 +174,17 @@ const map<string, string> ServicesDefaultConfigurationFile = {
     SERVICE_QUERY_ENGINE : '/etc/contrail/contrail-query-engine.conf',
     SERVICE_OPSERVER : '/etc/contrail/contrail-analytics-api.conf',
     SERVICE_ALARM_GENERATOR : '/etc/contrail/contrail-alarm-gen.conf',
+    SERVICE_ALARM_GENERATOR_0 : '/etc/contrail/contrail-alarm-gen.conf',
     SERVICE_SNMP_COLLECTOR : '/etc/contrail/contrail-snmp-collector.conf',
     SERVICE_TOPOLOGY : '/etc/contrail/contrail-topology.conf',
     SERVICE_API_SERVER : '/etc/contrail/contrail-api.conf',
+    SERVICE_API_SERVER_0 : '/etc/contrail/contrail-api.conf',
     SERVICE_DISCOVERY : '/etc/contrail/contrail-discovery.conf',
+    SERVICE_DISCOVERY_0 : '/etc/contrail/contrail-discovery.conf',
     SERVICE_SCHEMA_TRANSFORMER : '/etc/contrail/contrail-schema.conf',
     SERVICE_SVC_MONITOR : '/etc/contrail/contrail-svc-monitor.conf',
     SERVICE_DEVICE_MANAGER : '/etc/contrail/contrail-device-manager.conf',
     SERVICE_DNSD : '/etc/contrail/dns.conf',
-    SERVICE_DISCOVERY : '/etc/contrail/contrail-discovery.conf',
 }
 
 enum Module {