From 01834e8faa8f5377968d65b337c70ac85a338203 Mon Sep 17 00:00:00 2001 From: Rudra Rugge Date: Tue, 15 Sep 2015 17:36:04 -0700 Subject: [PATCH] VM fq-name should be display name for netns For non virtual-machine based service VMs the fq-name should be set to the instance_name inferred from service instance name. VM uuid should be used only for vm baesd services. Change-Id: Ibdee497c9b7e48e0dfb6a882839f3343f555e50a Closes-Bug: #1496186 --- src/config/svc-monitor/svc_monitor/instance_manager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/svc-monitor/svc_monitor/instance_manager.py b/src/config/svc-monitor/svc_monitor/instance_manager.py index 9f76963030a..95d7edf18f7 100644 --- 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