From 116f994926b37a1dde5a812b6b357b5f3b184da6 Mon Sep 17 00:00:00 2001 From: Rudra Rugge Date: Thu, 4 Aug 2016 14:07:46 -0700 Subject: [PATCH] Fix delete of shared instance ip Also add fix for snat vn delete. Change-Id: I6e1586459c7e8e4c9d1d6fc41e370fb8ab1d55a3 Closes-Bug: #1609983 --- src/config/svc-monitor/svc_monitor/snat_agent.py | 6 ++++-- src/config/svc-monitor/svc_monitor/svc_monitor.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/config/svc-monitor/svc_monitor/snat_agent.py b/src/config/svc-monitor/svc_monitor/snat_agent.py index 35518929a48..18d1ae437a1 100644 --- a/src/config/svc-monitor/svc_monitor/snat_agent.py +++ b/src/config/svc-monitor/svc_monitor/snat_agent.py @@ -216,8 +216,10 @@ def delete_snat_instance(self, router_obj): self._vnc_lib.route_table_delete(id=rt_obj.uuid) # Delete service instance - if si_obj: - self._vnc_lib.service_instance_delete(id=si_uuid) + if not si_obj: + return + + self._vnc_lib.service_instance_delete(id=si_uuid) # Delete left network vn_name = '%s_%s' % (svc_info.get_snat_left_vn_prefix(), diff --git a/src/config/svc-monitor/svc_monitor/svc_monitor.py b/src/config/svc-monitor/svc_monitor/svc_monitor.py index dd2107e5d0c..c34d5d03c94 100644 --- a/src/config/svc-monitor/svc_monitor/svc_monitor.py +++ b/src/config/svc-monitor/svc_monitor/svc_monitor.py @@ -546,7 +546,7 @@ def timer_callback(monitor): continue iip_delete_list.append(iip) for iip in iip_delete_list: - monitor.port_tuple_agent.delete_shared_iip(iip.uuid) + monitor.port_tuple_agent.delete_shared_iip(iip) # delete vms without si vm_delete_list = []