x/vmware-nsx
Code Issues Proposed changes

Fix octavia pool delete & delete cascade

Browse Source 
Change-Id: I68f1d8369177dc987efa5cd0f7cada363c983ff7
This commit is contained in:
asarfaty 2020-11-03 10:14:08 +02:00 committed by Adit Sarfaty
parent 39e3008627
commit b5ed6cbc82
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmware_nsx/services/lbaas/octavia/octavia_listener.py
View File

@ -347,6 +347,8 @@ class NSXOctaviaListenerEndpoint(object):
pool['listener']['default_pool']['id'] = pool[ pool['listener']['default_pool']['id'] = pool[
'listener']['default_pool']['pool_id'] 'listener']['default_pool']['pool_id']
pool['listeners'] = [pool['listener']] pool['listeners'] = [pool['listener']]
else:
pool['listeners'] = []
for member in pool.get('members', []): for member in pool.get('members', []):
if not member.get('pool'): if not member.get('pool'):
member['pool'] = pool member['pool'] = pool
@ -475,7 +477,7 @@ class NSXOctaviaListenerEndpoint(object):
if pool.get('healthmonitor'): if pool.get('healthmonitor'):
pool['healthmonitor']['pool'] = pool pool['healthmonitor']['pool'] = pool
try: try:
self.healthmonitor.delete_cascade( self.healthmonitor.delete(
ctx, pool['healthmonitor'], dummy_completor) ctx, pool['healthmonitor'], dummy_completor)
except Exception as e: except Exception as e:
delete_result['value'] = False delete_result['value'] = False
@ -485,7 +487,12 @@ class NSXOctaviaListenerEndpoint(object):
try: try:
if not member.get('pool'): if not member.get('pool'):
member['pool'] = pool member['pool'] = pool
self.member.delete_cascade(ctx, member, dummy_completor) if ('loadbalancer' in member['pool'] and
not member.get('subnet_id')):
# Use the parent vip_subnet_id instead
member['subnet_id'] = member['pool']['loadbalancer'][
'vip_subnet_id']
self.member.delete(ctx, member, dummy_completor)
except Exception as e: except Exception as e:
delete_result['value'] = False delete_result['value'] = False
LOG.error('NSX driver pool_delete failed to delete member' LOG.error('NSX driver pool_delete failed to delete member'