NSX|V3: treat missing exclude list entry on delete

Ensure that there is not an exception with port deletion if the
port is not in the exclude list.

Change-Id: If9fcfba56fb0af13993c051ea2c38e9d5b915ae4
This commit is contained in:
Gary Kotton 2017-05-10 19:08:45 -07:00
parent 914756e9ed
commit 22b52b418e

View File

@ -2167,8 +2167,12 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
self._is_excluded_port(port.get('device_owner'),
port.get('port_security_enabled'))):
fs = self.nsxlib.firewall_section
fs.remove_member_from_fw_exclude_list(
nsx_port_id, nsxlib_consts.TARGET_TYPE_LOGICAL_PORT)
try:
fs.remove_member_from_fw_exclude_list(
nsx_port_id, nsxlib_consts.TARGET_TYPE_LOGICAL_PORT)
except Exception as e:
LOG.warning("Unable to remove port from exclude list. "
"Reason: %s", e)
self.disassociate_floatingips(context, port_id)
# Remove Mac/IP binding from native DHCP server and neutron DB.