From 55da1de08422da35d326b9ffffbfcb7989dc0290 Mon Sep 17 00:00:00 2001 From: Gordon Zhang Date: Mon, 11 Feb 2019 17:46:18 -0800 Subject: [PATCH] Add connectivity_path parameter in Lb_Service def Change-Id: I33d15fd4d88ba7116560d3be402aec67f5821475 --- .../tests/unit/v3/policy/test_lb_resources.py | 10 ++++++++-- vmware_nsxlib/v3/policy/lb_defs.py | 2 +- vmware_nsxlib/v3/policy/lb_resources.py | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py b/vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py index 8520fb71..060d5fb0 100644 --- a/vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py +++ b/vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py @@ -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) diff --git a/vmware_nsxlib/v3/policy/lb_defs.py b/vmware_nsxlib/v3/policy/lb_defs.py index 40ea3e5d..6ace5f47 100644 --- a/vmware_nsxlib/v3/policy/lb_defs.py +++ b/vmware_nsxlib/v3/policy/lb_defs.py @@ -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 diff --git a/vmware_nsxlib/v3/policy/lb_resources.py b/vmware_nsxlib/v3/policy/lb_resources.py index e31361cf..ab707697 100644 --- a/vmware_nsxlib/v3/policy/lb_resources.py +++ b/vmware_nsxlib/v3/policy/lb_resources.py @@ -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):