x/vmware-nsx
Code Issues Proposed changes

Merge "NSXP: Forbid multiple listeners per LB pool"

Browse Source
This commit is contained in:
Zuul 2019-06-03 12:09:50 +00:00 committed by Gerrit Code Review
commit 65f8589017
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,19 @@ class EdgeListenerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
return app_client
def _validate_default_pool(self, listener, completor):
l_pool_id = listener.get('default_pool_id')
if l_pool_id:
vs_client = self.core_plugin.nsxpolicy.load_balancer.virtual_server
vs_list = vs_client.list()
for vs in vs_list:
pool_id = p_utils.path_to_id(vs.get('pool_path', ''))
if pool_id == l_pool_id:
completor(success=False)
msg = (_('Default pool %s is already used by another '
'listener') % listener['default_pool_id'])
raise n_exc.BadRequest(resource='lbaas-pool', msg=msg)
@log_helpers.log_method_call
def create(self, context, listener, completor,
certificate=None):
@ -143,8 +156,9 @@ class EdgeListenerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
vs_name = utils.get_name_and_uuid(listener['name'] or 'listener',
listener['id'])
tags = self._get_listener_tags(context, listener)
app_client = self._get_nsxlib_app_profile(nsxlib_lb, listener)
self._validate_default_pool(listener, completor)
try:
app_client = self._get_nsxlib_app_profile(nsxlib_lb, listener)
app_client.create_or_overwrite(
lb_app_profile_id=listener['id'], name=vs_name, tags=tags)
kwargs = self._get_virtual_server_kwargs(
@ -166,6 +180,7 @@ class EdgeListenerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
vs_name = None
tags = None
self._validate_default_pool(new_listener, completor)
if new_listener['name'] != old_listener['name']:
vs_name = utils.get_name_and_uuid(
new_listener['name'] or 'listener',

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

@ -211,6 +211,13 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
description = pool.get('description')
lb_algorithm = lb_const.LB_POOL_ALGORITHM_MAP.get(pool['lb_algorithm'])
if pool.get('listeners') and len(pool['listeners']) > 1:
completor(success=False)
msg = (_('Failed to create pool: Multiple listeners are not '
'supported.'))
raise n_exc.BadRequest(resource='lbaas-pool', msg=msg)
# NOTE(salv-orlando): Guard against accidental compat breakages
try:
listener = pool['listener'] or pool['listeners'][0]
@ -249,6 +256,12 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
tags = None
lb_algorithm = None
description = None
if new_pool.get('listeners') and len(new_pool['listeners']) > 1:
completor(success=False)
msg = (_('Failed to update pool %s: Multiple listeners are not '
'supported.') % new_pool['id'])
raise n_exc.BadRequest(resource='lbaas-pool', msg=msg)
if new_pool['name'] != old_pool['name']:
pool_name = utils.get_name_and_uuid(new_pool['name'] or 'pool',
new_pool['id'])