x/vmware-nsx
Code Issues Proposed changes

NSX|V3+P: support removing LB listener default pool

Browse Source 
Change-Id: Ib4ef4176aa1bc0e26af8ee1bc7ab1154fb346d81
This commit is contained in:
asarfaty 2019-11-10 11:28:06 +02:00 committed by Adit Sarfaty
parent caeae0d6ea
commit 7189638533
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,8 +94,13 @@ class EdgeListenerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
kwargs['tags'] = tags
if listener['connection_limit'] != -1:
kwargs['max_concurrent_connections'] = listener['connection_limit']
if listener['default_pool_id']:
kwargs['pool_id'] = listener['default_pool_id']
if 'default_pool_id' in listener:
if listener['default_pool_id']:
kwargs['pool_id'] = listener['default_pool_id']
else:
# Remove the default pool
kwargs['pool_id'] = ''
kwargs['lb_persistence_profile_id'] = ''
if certificate:
ssl_profile_binding = self._upload_certificate(
listener['id'], listener['default_tls_container_id'], tags,

18
vmware_nsx/services/lbaas/nsx_v3/implementation/listener_mgr.py
View File

@ -57,12 +57,18 @@ class EdgeListenerManagerFromDict(base_mgr.Nsxv3LoadbalancerBaseManager):
if listener['connection_limit'] != -1:
kwargs['max_concurrent_connections'] = \
listener['connection_limit']
if listener['default_pool_id']:
pool_binding = nsx_db.get_nsx_lbaas_pool_binding(
context.session, listener['loadbalancer']['id'],
listener['default_pool_id'])
if pool_binding:
kwargs['pool_id'] = pool_binding.get('lb_pool_id')
if 'default_pool_id' in listener:
if listener['default_pool_id']:
pool_binding = nsx_db.get_nsx_lbaas_pool_binding(
context.session, listener['loadbalancer']['id'],
listener['default_pool_id'])
if pool_binding:
kwargs['pool_id'] = pool_binding.get('lb_pool_id')
else:
# Remove the default pool
kwargs['pool_id'] = None
kwargs['persistence_profile_id'] = ''
ssl_profile_binding = self._get_ssl_profile_binding(
tags, certificate=certificate)
if (listener['protocol'] == lb_const.LB_PROTOCOL_TERMINATED_HTTPS and

8
vmware_nsx/tests/unit/services/lbaas/test_nsxp_driver.py
View File

@ -453,7 +453,9 @@ class TestEdgeLbaasV2Listener(BaseTestEdgeLbaasV2):
name=mock.ANY,
ports=[listener['protocol_port']],
max_concurrent_connections=None,
virtual_server_id=listener_id)
virtual_server_id=listener_id,
pool_id='',
lb_persistence_profile_id='')
self.assertTrue(self.last_completor_called)
self.assertTrue(self.last_completor_succees)
@ -489,7 +491,9 @@ class TestEdgeLbaasV2Listener(BaseTestEdgeLbaasV2):
name=mock.ANY,
ports=[self.terminated_https_listener_dict['protocol_port']],
max_concurrent_connections=None,
virtual_server_id=HTTPS_LISTENER_ID)
virtual_server_id=HTTPS_LISTENER_ID,
pool_id='',
lb_persistence_profile_id='')
self.assertTrue(self.last_completor_called)
self.assertTrue(self.last_completor_succees)