x/vmware-nsxlib
Code Issues Proposed changes

Use domain in policy deployment maps api

Browse Source 
Commit I09d79b27d8267964a5b7e26de4316c727a21531a added the domain as a parent
for the deployment maps.
This commit adds this as a mandatory parameters to the apis for get/delete/list
a deployment map.

Change-Id: Ia5df9418add006478365322b1d6001821e121c53
This commit is contained in:
Adit Sarfaty
2017-08-16 10:19:34 +03:00
parent 41dcfa291c
commit 4a47faeea8
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vmware_nsxlib/tests/unit/v3/test_policy_resources.py
View File

@@ -1171,34 +1171,44 @@ class TestPolicyDeploymentMap(NsxPolicyLibTestCase):
def test_delete(self):
id = '111'
domain_id = 'domain1'
with mock.patch.object(self.policy_api, "delete") as api_call:
self.resourceApi.delete(id, tenant=TEST_TENANT)
self.resourceApi.delete(id, domain_id=domain_id,
tenant=TEST_TENANT)
expected_def = policy_defs.DeploymentMapDef(map_id=id,
domain_id=domain_id,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
def test_get(self):
id = '111'
domain_id = 'domain1'
with mock.patch.object(self.policy_api, "get") as api_call:
self.resourceApi.get(id, tenant=TEST_TENANT)
self.resourceApi.get(id, domain_id=domain_id, tenant=TEST_TENANT)
expected_def = policy_defs.DeploymentMapDef(map_id=id,
domain_id=domain_id,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
def test_get_by_name(self):
name = 'ep1'
domain_id = 'domain1'
with mock.patch.object(
self.policy_api, "list",
return_value={'results': [{'display_name': name}]}) as api_call:
obj = self.resourceApi.get_by_name(name, tenant=TEST_TENANT)
obj = self.resourceApi.get_by_name(name, domain_id=domain_id,
tenant=TEST_TENANT)
self.assertIsNotNone(obj)
expected_def = policy_defs.DeploymentMapDef(tenant=TEST_TENANT)
expected_def = policy_defs.DeploymentMapDef(domain_id=domain_id,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
def test_list(self):
domain_id = 'domain1'
with mock.patch.object(self.policy_api, "list") as api_call:
self.resourceApi.list(tenant=TEST_TENANT)
expected_def = policy_defs.DeploymentMapDef(tenant=TEST_TENANT)
self.resourceApi.list(domain_id=domain_id, tenant=TEST_TENANT)
expected_def = policy_defs.DeploymentMapDef(domain_id=domain_id,
tenant=TEST_TENANT)
self.assert_called_with_def(api_call, expected_def)
def test_update(self):

27
vmware_nsxlib/v3/policy_resources.py
View File

@@ -740,20 +740,35 @@ class NsxPolicyDeploymentMapApi(NsxPolicyResourceBase):
tenant=tenant)
return self.policy_api.create_or_update(map_def)
def delete(self, map_id,
def delete(self, map_id, domain_id=None,
tenant=policy_constants.POLICY_INFRA_TENANT):
if not domain_id:
# domain_id must be provided
err_msg = (_("Cannot delete deployment maps without a domain"))
raise exceptions.ManagerError(details=err_msg)
map_def = policy_defs.DeploymentMapDef(
map_id=map_id, tenant=tenant)
map_id=map_id, domain_id=domain_id, tenant=tenant)
self.policy_api.delete(map_def)
def get(self, map_id,
def get(self, map_id, domain_id=None,
tenant=policy_constants.POLICY_INFRA_TENANT):
if not domain_id:
# domain_id must be provided
err_msg = (_("Cannot get deployment maps without a domain"))
raise exceptions.ManagerError(details=err_msg)
map_def = policy_defs.DeploymentMapDef(
map_id=map_id, tenant=tenant)
map_id=map_id, domain_id=domain_id, tenant=tenant)
return self.policy_api.get(map_def)
def list(self, tenant=policy_constants.POLICY_INFRA_TENANT):
map_def = policy_defs.DeploymentMapDef(tenant=tenant)
def list(self, domain_id=None,
tenant=policy_constants.POLICY_INFRA_TENANT):
if not domain_id:
# domain_id must be provided
err_msg = (_("Cannot list deployment maps without a domain"))
raise exceptions.ManagerError(details=err_msg)
map_def = policy_defs.DeploymentMapDef(domain_id=domain_id,
tenant=tenant)
return self.policy_api.list(map_def)['results']
def update(self, map_id, name=None, description=None,