x/vmware-nsx
Code Issues Proposed changes

NSX-V3| fix devstack cleanup

Browse Source 
firewall sections were not deleted properly causing other objects not
to be deleted too.
Fixed 2 things:
- backend list results do not always have the cursor field
- delete the fw section with cascade instead of deleting each rule.

Change-Id: Ib96ab16cc49e12111e729ead716953c8114fa99c
This commit is contained in:
Adit Sarfaty 2017-03-27 14:10:43 +03:00
parent 6228a06399
commit 580331604c
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devstack/tools/nsxv3_cleanup.py
View File

@ -151,7 +151,7 @@ class NSXClient(object):
verify=self.verify, params=params).json() verify=self.verify, params=params).json()
results = response['results'] results = response['results']
missing = response['result_count'] - len(results) missing = response['result_count'] - len(results)
cursor = response['cursor'] cursor = response.get('cursor', self.NULL_CURSOR_PREFIX)
op = '&' if urlparse.urlparse(self.url).query else '?' op = '&' if urlparse.urlparse(self.url).query else '?'
url = self.url + op + 'cursor=' url = self.url + op + 'cursor='
@ -316,29 +316,6 @@ class NSXClient(object):
if fws['id'] in db_sections] if fws['id'] in db_sections]
return fw_sections return fw_sections
def get_firewall_section_rules(self, fw_section):
"""
Retrieve all fw rules for a given fw section
"""
endpoint = "/firewall/sections/%s/rules" % fw_section['id']
return self.get_list_results(endpoint=endpoint)
def cleanup_firewall_section_rules(self, fw_section):
"""
Cleanup all firewall rules for a given fw section
"""
fw_rules = self.get_firewall_section_rules(fw_section)
for rule in fw_rules:
endpoint = "/firewall/sections/%s/rules/%s" % (fw_section['id'],
rule['id'])
response = self.delete(endpoint=endpoint)
if response.status_code == requests.codes.ok:
print("Successfully deleted fw rule %s in fw section %s" %
(rule['display_name'], fw_section['display_name']))
else:
print("Failed to delete fw rule %s in fw section %s" %
(rule['display_name'], fw_section['display_name']))
def cleanup_os_firewall_sections(self): def cleanup_os_firewall_sections(self):
""" """
Cleanup all firewall sections created from OpenStack Cleanup all firewall sections created from OpenStack
@ -347,8 +324,7 @@ class NSXClient(object):
print("Number of OS Firewall Sections to be deleted: %s" % print("Number of OS Firewall Sections to be deleted: %s" %
len(fw_sections)) len(fw_sections))
for fw in fw_sections: for fw in fw_sections:
self.cleanup_firewall_section_rules(fw) endpoint = "/firewall/sections/%s?cascade=true" % fw['id']
endpoint = "/firewall/sections/%s" % fw['id']
response = self.delete(endpoint=endpoint) response = self.delete(endpoint=endpoint)
if response.status_code == requests.codes.ok: if response.status_code == requests.codes.ok:
print("Successfully deleted firewall section %s" % print("Successfully deleted firewall section %s" %