Merge "NSX|V: don't fail port deletion if static binding deletion fails"

This commit is contained in:
Jenkins 2016-07-03 19:25:03 +00:00 committed by Gerrit Code Review
commit b5703e527e
1 changed files with 8 additions and 3 deletions

View File

@ -383,9 +383,14 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
def _delete_dhcp_static_binding(self, context, neutron_port_db):
network_id = neutron_port_db['network_id']
self.edge_manager.delete_dhcp_binding(
context, neutron_port_db['id'], network_id,
neutron_port_db['mac_address'])
try:
self.edge_manager.delete_dhcp_binding(
context, neutron_port_db['id'], network_id,
neutron_port_db['mac_address'])
except Exception as e:
LOG.error(_LE('Unable to delete static bindings for %(id)s. '
'Error: %(e)s'),
{'id': neutron_port_db['id'], 'e': e})
def _validate_network_qos(self, network, backend_network):
err_msg = None