Merge "fix for health_check alias_ip removal in port" into R3.1

Juniper · Sep 8, 2016 · 7801257 · 7801257
2 parents a37c81f + 7893631
commit 7801257
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/port_tuple.py b/src/config/svc-monitor/svc_monitor/port_tuple.py
@@ -251,11 +251,10 @@ def delete_old_vmi_links(self, vmi):
             return
         for iip_id in list(vmi.instance_ips):
             iip = InstanceIpSM.get(iip_id)
-            if not iip or not iip.service_instance:
-                continue
-            self._vnc_lib.ref_update('instance-ip', iip_id,
-                'virtual-machine-interface', vmi.uuid, None, 'DELETE')
-            vmi.instance_ips.remove(iip_id)
+            if iip and (iip.service_instance or iip.service_health_check_ip):
+                self._vnc_lib.ref_update('instance-ip', iip_id,
+                    'virtual-machine-interface', vmi.uuid, None, 'DELETE')
+                vmi.instance_ips.remove(iip_id)
 
         for irt_id in list(vmi.interface_route_tables):
             irt = InterfaceRouteTableSM.get(irt_id)