x/vmware-nsxlib
Code Issues Proposed changes

Merge "NSXP: Additional pool member attributes"

Browse Source
This commit is contained in:
Zuul 2019-04-25 04:27:20 +00:00 committed by Gerrit Code Review
commit cf6de6b6fe
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsxlib/v3/policy/lb_defs.py
View File

@ -55,11 +55,13 @@ class LBRuleDef(object):
class LBPoolMemberDef(object):
def __init__(self, ip_address, port=None, name=None,
weight=None):
weight=None, admin_state=None, backup_member=None):
self.name = name
self.ip_address = ip_address
self.port = port
self.weight = weight
self.admin_state = admin_state
self.backup_member = backup_member
def get_obj_dict(self):
body = {'ip_address': self.ip_address}
@ -69,6 +71,10 @@ class LBPoolMemberDef(object):
body['port'] = self.port
if self.weight:
body['weight'] = self.weight
if self.admin_state:
body['admin_state'] = self.admin_state
if self.backup_member:
body['backup_member'] = self.backup_member
return body

23
vmware_nsxlib/v3/policy/lb_resources.py
View File

@ -492,12 +492,14 @@ class NsxPolicyLoadBalancerPoolApi(NsxPolicyResourceBase):
def create_pool_member_and_add_to_pool(
self, lb_pool_id, ip_address, port=None,
display_name=None, weight=None,
display_name=None, weight=None, admin_state=None,
backup_member=None,
tenant=constants.POLICY_INFRA_TENANT):
lb_pool_member = lb_defs.LBPoolMemberDef(
ip_address, port=port,
name=display_name,
weight=weight)
weight=weight, admin_state=admin_state,
backup_member=backup_member)
lb_pool_def = lb_defs.LBPoolDef(
lb_pool_id=lb_pool_id, tenant=tenant)
lb_pool = self.policy_api.get(lb_pool_def)
@ -509,17 +511,24 @@ class NsxPolicyLoadBalancerPoolApi(NsxPolicyResourceBase):
def update_pool_member(
self, lb_pool_id, ip_address, port=None,
display_name=None, weight=None,
display_name=None, weight=None, admin_state=None,
backup_member=None,
tenant=constants.POLICY_INFRA_TENANT):
lb_pool_def = lb_defs.LBPoolDef(
lb_pool_id=lb_pool_id, tenant=tenant)
lb_pool = self.policy_api.get(lb_pool_def)
lb_pool_members = lb_pool.get('members', [])
member_to_update = [x for x in lb_pool_members if (
x.get('ip_address') == ip_address and x.get('port') == port)]
x.get('ip_address') == ip_address and x.get('port') == str(port))]
if member_to_update:
member_to_update[0]['display_name'] = display_name
member_to_update[0]['weight'] = weight
if display_name:
member_to_update[0]['display_name'] = display_name
if weight:
member_to_update[0]['weight'] = weight
if admin_state:
member_to_update[0]['admin_state'] = admin_state
if backup_member:
member_to_update[0]['backup_member'] = backup_member
self._update_helper(lb_pool_id, members=lb_pool_members,
pool_data=lb_pool, tenant=tenant)
else:
@ -537,7 +546,7 @@ class NsxPolicyLoadBalancerPoolApi(NsxPolicyResourceBase):
lb_pool = self.policy_api.get(lb_pool_def)
lb_pool_members = lb_pool.get('members', [])
lb_pool_members = [x for x in lb_pool_members if (
x.get('ip_address') != ip_address and x.get('port') != port)]
x.get('ip_address') != ip_address and x.get('port') != str(port))]
self._update_helper(lb_pool_id, members=lb_pool_members,
pool_data=lb_pool, tenant=tenant)