Fix 500 raised on disassociate_floatingips when out of sync

If one deletes NAT rules directly from NVP and not through quantum,
an error will be raised when deleting a port that is associated with
the floating ip. This patch catches the NotFound exception and logs
it so that the port can successfully be deleted.

Fixes bug: 1177176

Change-Id: Ia7d0b94957d0c6b014d242439245b0e4fa9de40d
This commit is contained in:
Aaron Rosen 2013-05-06 20:21:57 -07:00
parent e377f49d22
commit 35a5bd841d

View File

@ -1856,6 +1856,9 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
except sa_exc.NoResultFound:
LOG.debug(_("The port '%s' is not associated with floating IPs"),
port_id)
except q_exc.NotFound:
LOG.warning(_("Nat rules not found in nvp for port: %s"), id)
super(NvpPluginV2, self).disassociate_floatingips(context, port_id)
def create_network_gateway(self, context, network_gateway):