Ignore PortNotFoundClient for neutron

Change-Id: I9d80faec13134af33beedc9a81c599050237a004

diff --git a/os_cloud_cleaner/os_connector.py b/os_cloud_cleaner/os_connector.py
index cd0871da04deff88ebc0bd47c66fe6a01575d7c1..d45779e94598d465630c50399db715d96131ca47 100644 (file)
--- a/os_cloud_cleaner/os_connector.py
+++ b/os_cloud_cleaner/os_connector.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import neutronclient.common.exceptions
 from cinderclient.exceptions import NotFound
 from cinderclient.v2.client import Client as CinderClient
 from heatclient.v1.client import Client as HeatClient
@@ -540,7 +541,10 @@ class OpenStackActions(object):
             net_ports_resp = self.neutron.list_ports(network_id=net_uuid)
             for net_port in net_ports_resp['ports']:
                 existing_ports.append(net_port['id'])
-                self.neutron.delete_port(net_port['id'])
+                try:
+                    self.neutron.delete_port(net_port['id'])
+                except neutronclient.common.exceptions.PortNotFoundClient:
+                    logger.warning("Got PortNotFoundClient for port {}, ignoring".format(net_port['id']))
 
         try:
             helpers.wait_false(self.check_any_port_exists,