x/vmware-nsxlib
Code Issues Proposed changes

Merge "Add connectivity_path parameter in Lb_Service def"

Browse Source
This commit is contained in:
Zuul 2019-02-12 12:54:12 +00:00 committed by Gerrit Code Review
commit 3c6b72e002
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py
View File

@ -541,6 +541,7 @@ class TestPolicyLBService(test_resources.NsxPolicyLibTestCase):
description = 'desc'
obj_id = '111'
size = 'SMALL'
connectivity_path = 'path'
with mock.patch.object(self.policy_api,
"create_or_update") as api_call:
result = self.resourceApi.create_or_overwrite(
@ -548,6 +549,7 @@ class TestPolicyLBService(test_resources.NsxPolicyLibTestCase):
lb_service_id=obj_id,
description=description,
size=size,
connectivity_path=connectivity_path,
tenant=TEST_TENANT)
expected_def = (
lb_defs.LBServiceDef(
@ -555,6 +557,7 @@ class TestPolicyLBService(test_resources.NsxPolicyLibTestCase):
name=name,
description=description,
size=size,
connectivity_path=connectivity_path,
tenant=TEST_TENANT))
self.assert_called_with_def(api_call, expected_def)
self.assertEqual(obj_id, result)
@ -620,19 +623,22 @@ class TestPolicyLBService(test_resources.NsxPolicyLibTestCase):
name = 'new name'
description = 'new desc'
size = 'SMALL'
connectivity_path = 'path'
with mock.patch.object(self.policy_api,
"create_or_update") as update_call:
self.resourceApi.update(obj_id,
name=name,
description=description,
tenant=TEST_TENANT,
size=size)
size=size,
connectivity_path=connectivity_path)
expected_def = lb_defs.LBServiceDef(
lb_service_id=obj_id,
name=name,
description=description,
tenant=TEST_TENANT,
size=size)
size=size,
connectivity_path=connectivity_path)
self.assert_called_with_def(update_call, expected_def)

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

@ -344,7 +344,7 @@ class LBServiceDef(ResourceDef):
def get_obj_dict(self):
body = super(LBServiceDef, self).get_obj_dict()
self._set_attr_if_specified(body, 'size')
self._set_attrs_if_specified(body, ['size', 'connectivity_path'])
return body

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

@ -466,6 +466,7 @@ class NsxPolicyLoadBalancerServiceApi(NsxPolicyResourceBase):
description=IGNORE,
tags=IGNORE,
size=IGNORE,
connectivity_path=IGNORE,
tenant=constants.POLICY_INFRA_TENANT):
lb_service_id = self._init_obj_uuid(lb_service_id)
lb_service_def = self._init_def(
@ -474,6 +475,7 @@ class NsxPolicyLoadBalancerServiceApi(NsxPolicyResourceBase):
description=description,
tags=tags,
size=size,
connectivity_path=connectivity_path,
tenant=tenant)
self.policy_api.create_or_update(lb_service_def)
@ -496,12 +498,14 @@ class NsxPolicyLoadBalancerServiceApi(NsxPolicyResourceBase):
def update(self, lb_service_id, name=IGNORE,
description=IGNORE, tags=IGNORE,
size=IGNORE, tenant=constants.POLICY_INFRA_TENANT):
size=IGNORE, connectivity_path=IGNORE,
tenant=constants.POLICY_INFRA_TENANT):
self._update(lb_service_id=lb_service_id,
name=name,
description=description,
tags=tags,
size=size,
connectivity_path=connectivity_path,
tenant=tenant)
def get_status(self, lb_service_id):