Add ha information in UVE for service monitor

Change-Id: I7ea22f04dd439a1459156e1200ab3a21e7db2ea2
Juniper · Oct 3, 2014 · 08a992c · 08a992c
1 parent e84b588
commit 08a992c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/config/svc-monitor/svc_monitor/instance_manager.py b/src/config/svc-monitor/svc_monitor/instance_manager.py
@@ -614,8 +614,14 @@ def create_service(self, st_obj, si_obj):
             self.db.service_instance_insert(si_obj.get_fq_name_str(),
                                             vm_db_entry)
 
+            if int(local_preference) == svc_info.get_standby_preference():
+                ha = ("standby: %s" % (local_preference))
+            else:
+                ha = ("active: %s" % (local_preference))
+
             instances.append({'uuid': vm_obj.uuid,
-                              'vr_name': vrouter_name})
+                              'vr_name': vrouter_name,
+                              'ha': ha})
 
         # uve trace
         self.logger.uve_svc_instance(si_obj.get_fq_name_str(),

diff --git a/src/config/svc-monitor/svc_monitor/logger.py b/src/config/svc-monitor/svc_monitor/logger.py
@@ -140,6 +140,8 @@ def uve_svc_instance(self, si_fq_name_str, status=None,
             svc_uve_vm = UveSvcInstanceVMConfig(uuid=vm['uuid'])
             if vm.has_key('vr_name'):
                 svc_uve_vm.vr_name = vm['vr_name']
+            if vm.has_key('ha'):
+                svc_uve_vm.ha = vm['ha']
             svc_uve.vm_list.append(svc_uve_vm)
         if status:
             svc_uve.status = status

diff --git a/src/config/uve/service_instance.sandesh b/src/config/uve/service_instance.sandesh
@@ -9,6 +9,7 @@
 struct UveSvcInstanceVMConfig {
     1: string          uuid
     2: optional string vr_name;
+    3: optional string ha;
 }
 
 struct UveSvcInstanceConfig {