x/vmware-nsx
Code Issues Proposed changes

NSX|V: Fix FWaaS error firewall delete

Browse Source 
When deleting a firewall, errors like shared router attached to the FW
should be ignored, to allow the router deletion

Change-Id: I1c1d62418dbea5c9162fc7c84ee517928d4b12ee
This commit is contained in:
Adit Sarfaty 2018-07-01 11:29:07 +03:00
parent f570c651bf
commit e169e26ed2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx/services/fwaas/nsx_v/edge_fwaas_driver.py
View File

@ -99,7 +99,7 @@ class EdgeFwaasDriver(fwaas_base.FwaasDriverBase):
return True
def _get_routers_edges(self, context, apply_list):
def _get_routers_edges(self, context, apply_list, delete_fw=False):
# Get edges for all the routers in the apply list.
# note that shared routers are currently not supported
edge_manager = self.edge_manager
@ -107,7 +107,8 @@ class EdgeFwaasDriver(fwaas_base.FwaasDriverBase):
for router_info in apply_list:
# No FWaaS rules needed if there is no external gateway
if not self.should_apply_firewall_to_router(router_info.router):
if not self.should_apply_firewall_to_router(
router_info.router, raise_exception=(not delete_fw)):
continue
lookup_id = None
@ -224,7 +225,8 @@ class EdgeFwaasDriver(fwaas_base.FwaasDriverBase):
delete_fw=False):
# get router-edge mapping
context = n_context.get_admin_context()
edges_map = self._get_routers_edges(context, apply_list)
edges_map = self._get_routers_edges(context, apply_list,
delete_fw=delete_fw)
# if the firewall is deleted, rules should be None
rules = None if delete_fw else []