Merge "For contrail-status to introspect and get NodeStatus status th…

…e service name should be in NodeUVEImplemented services. The contrail-tor-agent needs a bit special handling as it's appended with a tor-id."
Juniper · May 22, 2015 · ec17f2d · ec17f2d
2 parents 2a2cd2f + f104c75
commit ec17f2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/config/utils/contrail-status.py b/src/config/utils/contrail-status.py
@@ -291,7 +291,8 @@ def check_svc_status(service_name, debug, detail, timeout):
                 svc_detail_info = ' '.join(supervisor_svc_info[2:])
                 # Extract UVE state only for running processes
                 svc_uve_description = None
-                if svc_name in NodeUVEImplementedServices and svc_status == 'active':
+                if (svc_name in NodeUVEImplementedServices or
+                    svc_name.rsplit('-', 1)[0] in NodeUVEImplementedServices) and svc_status == 'active':
                     try:
                         svc_uve_status, svc_uve_description = get_svc_uve_status(svc_name, debug, timeout)
                     except requests.ConnectionError, e:

diff --git a/src/sandesh/common/vns.sandesh b/src/sandesh/common/vns.sandesh
@@ -9,6 +9,7 @@
  */
 
 // Service names
+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"
@@ -116,6 +117,7 @@ const map<string, u16> ServiceHttpPortMap = {
 }
 
 const list<string> NodeUVEImplementedServices = [
+    SERVICE_TOR_AGENT,
     SERVICE_VROUTER_AGENT,
     SERVICE_CONTROL_NODE,
     SERVICE_COLLECTOR,