From fdef6eb61cfb6b09e3e14928eff4e432c5ee8b1d Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Sun, 14 Apr 2019 16:22:56 +0300 Subject: [PATCH] NSXP LB: pass lb_pool_id when needed Change-Id: If464c36cbc83380e7b032c7b2ffc71da18e36e16 --- .../services/lbaas/nsx_p/implementation/pool_mgr.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py b/vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py index 6d1635cbbd..af8e3924f2 100644 --- a/vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_p/implementation/pool_mgr.py @@ -33,10 +33,9 @@ LOG = logging.getLogger(__name__) class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager): - def _get_pool_kwargs(self, pool_id, name=None, tags=None, algorithm=None, + def _get_pool_kwargs(self, name=None, tags=None, algorithm=None, description=None): kwargs = { - 'lb_pool_id': pool_id, 'snat_translation': {'type': "LBSnatAutoMap"}} if name: kwargs['name'] = name @@ -213,9 +212,9 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager): # creating resources in the backend lb_common.validate_session_persistence(pool, listener, completor) try: - kwargs = self._get_pool_kwargs(pool['id'], pool_name, tags, - lb_algorithm, description) - pool_client.create_or_overwrite(**kwargs) + kwargs = self._get_pool_kwargs( + pool_name, tags, lb_algorithm, description) + pool_client.create_or_overwrite(lb_pool_id=pool['id'], **kwargs) except nsxlib_exc.ManagerError: completor(success=False) msg = (_('Failed to create pool on NSX backend: %(pool)s') % @@ -264,7 +263,7 @@ class EdgePoolManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager): try: kwargs = self._get_pool_kwargs(pool_name, tags, lb_algorithm, description) - pool_client.update(**kwargs) + pool_client.update(lb_pool_id=new_pool['id'], **kwargs) if (listener and new_pool['session_persistence'] != old_pool['session_persistence']): self._process_vs_update(context, new_pool, new_pool['id'],