x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|P: Fix loadbalancer delete cascade"

This commit is contained in:
Zuul 2019-04-30 11:30:07 +00:00 committed by Gerrit Code Review
parent 27d641530d 7a97e220ff
commit bf9404ff1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/services/lbaas/nsx_p/implementation/listener_mgr.py
View File

@ -214,7 +214,7 @@ class EdgeListenerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
raise n_exc.BadRequest(resource='lbaas-listener', msg=msg)
# Delete imported NSX cert if there is any
if listener['default_tls_container_id']:
if listener.get('default_tls_container_id'):
cert_client = self.core_plugin.nsxpolicy.certificate
try:
cert_client.delete(listener['id'])

2
vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py
View File

@ -284,7 +284,7 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
# NOTE(salv-orlando): Guard against accidental compat breakages
try:
listener = pool['listener'] or pool['listeners'][0]
listener = pool.get('listener') or pool.get('listeners', [])[0]
except IndexError:
# If listeners is an empty list we hit this exception
listener = None