x/vmware-nsxlib
Code Issues Proposed changes

Merge "Support clear ip_pool_id in create_or_overwrite (Tier1)Segment"

Browse Source
This commit is contained in:
Zuul 2020-04-07 04:57:24 +00:00 committed by Gerrit Code Review
commit 753ed629bb
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vmware_nsxlib/tests/unit/v3/policy/test_resources.py
View File

@ -4024,13 +4024,14 @@ class TestPolicySegment(NsxPolicyLibTestCase):
self.resourceApi = self.policy_lib.segment self.resourceApi = self.policy_lib.segment
def _test_create(self, tier1_id=None, tier0_id=None, mdproxy=None, def _test_create(self, tier1_id=None, tier0_id=None, mdproxy=None,
dhcp_server=None, admin_state=None): dhcp_server=None, admin_state=None,
ip_pool_id='external-ip-pool'):
name = 'test' name = 'test'
description = 'desc' description = 'desc'
subnets = [core_defs.Subnet(gateway_address="2.2.2.0/24")] subnets = [core_defs.Subnet(gateway_address="2.2.2.0/24")]
kwargs = {'description': description, kwargs = {'description': description,
'subnets': subnets, 'subnets': subnets,
'ip_pool_id': 'external-ip-pool', 'ip_pool_id': ip_pool_id,
'tenant': TEST_TENANT} 'tenant': TEST_TENANT}
if tier1_id: if tier1_id:
kwargs['tier1_id'] = tier1_id kwargs['tier1_id'] = tier1_id
@ -4060,6 +4061,15 @@ class TestPolicySegment(NsxPolicyLibTestCase):
self.assert_called_with_def(api_call, expected_def) self.assert_called_with_def(api_call, expected_def)
self.assertIsNotNone(result) self.assertIsNotNone(result)
if ip_pool_id is None:
expected_advanced_config = {'address_pool_paths': []}
else:
ip_pool_def = core_defs.IpPoolDef(ip_pool_id=ip_pool_id)
ip_pool_path = ip_pool_def.get_resource_full_path()
expected_advanced_config = {
'address_pool_paths': [ip_pool_path]}
self.assertEqual(expected_def.get_obj_dict()['advanced_config'],
expected_advanced_config)
def test_create_with_t1(self): def test_create_with_t1(self):
self._test_create(tier1_id='111') self._test_create(tier1_id='111')
@ -4084,6 +4094,9 @@ class TestPolicySegment(NsxPolicyLibTestCase):
def test_create_with_admin_state_down(self): def test_create_with_admin_state_down(self):
self._test_create(admin_state=False) self._test_create(admin_state=False)
def test_create_without_ip_pool(self):
self._test_create(ip_pool_id=None)
def test_delete(self): def test_delete(self):
segment_id = '111' segment_id = '111'
with mock.patch.object(self.policy_api, "delete") as api_call: with mock.patch.object(self.policy_api, "delete") as api_call:

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

@ -914,6 +914,8 @@ class BaseSegmentDef(ResourceDef):
return 'Segment' return 'Segment'
def _get_adv_config(self, ip_pool_id): def _get_adv_config(self, ip_pool_id):
if ip_pool_id is None:
return {'address_pool_paths': []}
ip_pool_def = IpPoolDef(ip_pool_id=ip_pool_id) ip_pool_def = IpPoolDef(ip_pool_id=ip_pool_id)
ip_pool_path = ip_pool_def.get_resource_full_path() ip_pool_path = ip_pool_def.get_resource_full_path()
return {'address_pool_paths': [ip_pool_path]} return {'address_pool_paths': [ip_pool_path]}