Merge "VM fq-name should be display name for netns" into R2.22-dev

Juniper · Sep 17, 2015 · bac3bcb · bac3bcb
2 parents ae118a3 + 01834e8
commit bac3bcb
Showing 1 changed file with 4 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
@@ -138,8 +138,11 @@ def update_static_routes(self, si):
     def link_si_to_vm(self, si, st, instance_index, vm_uuid):
         vm_obj = VirtualMachine()
         vm_obj.uuid = vm_uuid
-        vm_obj.fq_name = [vm_uuid]
         instance_name = self._get_instance_name(si, instance_index)
+        if st.virtualization_type == 'virtual-machine':
+            vm_obj.fq_name = [vm_uuid]
+        else:
+            vm_obj.fq_name = [instance_name]
         vm_obj.set_display_name(instance_name + '__' + st.virtualization_type)
         si_obj = ServiceInstance()
         si_obj.uuid = si.uuid