x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|P: Fix devstack cleanup for fwaas"

Browse Source
This commit is contained in:
Zuul 2021-03-09 11:51:12 +00:00 committed by Gerrit Code Review
commit f79235fe78
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/tools/nsxp_cleanup.py
View File

@ -543,14 +543,22 @@ class NSXClient(object):
tags_to_search, tags_to_search,
self.nsxpolicy.group.entry_def.resource_type())['results'] self.nsxpolicy.group.entry_def.resource_type())['results']
for group in groups: for group in groups:
self.nsxpolicy.group.delete(policy_constants.DEFAULT_DOMAIN, try:
group['id']) self.nsxpolicy.group.delete(
policy_constants.DEFAULT_DOMAIN, group['id'])
except exceptions.ResourceInUse:
# This may happen if the rule is used in multiple gateways
pass
services = self.nsxpolicy.search_by_tags( services = self.nsxpolicy.search_by_tags(
tags_to_search, tags_to_search,
self.nsxpolicy.service.parent_entry_def.resource_type()) self.nsxpolicy.service.parent_entry_def.resource_type())
for srv in services['results']: for srv in services['results']:
try:
self.nsxpolicy.service.delete(srv['id']) self.nsxpolicy.service.delete(srv['id'])
except exceptions.ResourceInUse:
# This may happen if the rule is used in multiple gateways
pass
def get_os_qos_policies(self): def get_os_qos_policies(self):
policies = self.get_os_resources(self.nsxpolicy.qos_profile.list()) policies = self.get_os_resources(self.nsxpolicy.qos_profile.list())

3
vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py
View File

@ -452,6 +452,9 @@ class NsxpFwaasCallbacksV2(com_callbacks.NsxCommonv3FwaasCallbacksV2):
self.cleanup_router_fw_resources(router_id) self.cleanup_router_fw_resources(router_id)
def cleanup_router_fw_resources(self, router_id): def cleanup_router_fw_resources(self, router_id):
# TODO(asarfaty): In case multiple routers are using the same rule,
# the group and service will hold on one of the router ids. so this
# delete may fail or not get called.
tags_to_search = [{'scope': ROUTER_FW_TAG, 'tag': router_id}] tags_to_search = [{'scope': ROUTER_FW_TAG, 'tag': router_id}]
# Delete per rule & per network groups # Delete per rule & per network groups
groups = self.nsxpolicy.search_by_tags( groups = self.nsxpolicy.search_by_tags(