Merge "FIP missing on SI VM ports"

Juniper · Mar 24, 2016 · 52996c7 · 52996c7
2 parents 48184e2 + 4a7383b
commit 52996c7
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/instance_manager.py b/src/config/svc-monitor/svc_monitor/instance_manager.py
@@ -155,6 +155,8 @@ def _link_fip_to_vmi(self, vmi_id, fip_id):
         fip = FloatingIpSM.get(fip_id)
         vmi = VirtualMachineInterfaceSM.get(vmi_id)
         if not fip or not vmi:
+            self.logger.error("Failed associating fip %s to vmi %s" %
+                              (fip_id, vmi_id))
             return
         if fip_id in vmi.floating_ips:
             return
@@ -784,9 +786,16 @@ def add_fip_to_vip_vmi(self, fip):
         if not vip_vmi:
             return
 
+        if not vip_vmi.instance_ips:
+            self.logger.error("VMI %s missing instance_ip backrefs" %
+                               vip_vmi.uuid)
+            return
+
         for iip_id in vip_vmi.instance_ips:
             iip = InstanceIpSM.get(iip_id)
             if not iip:
+                self.logger.error("Instance IP object missing for iip_id %s" \
+                                   % iip_id)
                 continue
             for vmi_id in iip.virtual_machine_interfaces:
                 if vmi_id == vip_vmi.uuid: