openstack/shade
Code Issues Proposed changes

De-client-ify Group Create

Browse Source 
Change-Id: Id7674f3aacdfa1448c243fe0e3932dc5f303e9ba
This commit is contained in:
Samuel de Medeiros Queiroz
2017-07-19 06:01:32 -04:00
parent 67accb5b09
commit 9ca78367fd
3 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shade/_tasks.py
View File

@@ -167,11 +167,6 @@ class GroupList(task_manager.Task):
return client.keystone_client.groups.list()
class GroupCreate(task_manager.Task):
def main(self, client):
return client.keystone_client.groups.create(**self.args)
class GroupDelete(task_manager.Task):
def main(self, client):
return client.keystone_client.groups.delete(**self.args)

30
shade/operatorcloud.py
View File

@@ -1275,22 +1275,22 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
:raises: ``OpenStackCloudException``: if something goes wrong during
the openstack API call.
"""
with _utils.shade_exceptions(
"Error creating group {group}".format(group=name)
):
domain_id = None
if domain:
dom = self.get_domain(domain)
if not dom:
raise OpenStackCloudException(
"Creating group {group} failed: Invalid domain "
"{domain}".format(group=name, domain=domain)
)
domain_id = dom['id']
group_ref = {'name': name}
if description:
group_ref['description'] = description
if domain:
dom = self.get_domain(domain)
if not dom:
raise OpenStackCloudException(
"Creating group {group} failed: Invalid domain "
"{domain}".format(group=name, domain=domain)
)
group_ref['domain_id'] = dom['id']
group = self.manager.submit_task(_tasks.GroupCreate(
name=name, description=description, domain=domain_id)
)
error_msg = "Error creating group {group}".format(group=name)
data = self._identity_client.post(
'/groups', json={'group': group_ref}, error_message=error_msg)
group = self._get_and_munchify('group', data)
self.list_groups.invalidate(self)
return _utils.normalize_groups([group])[0]

6
shade/tests/unit/test_groups.py
View File

@@ -72,11 +72,7 @@ class TestGroups(base.RequestsMockTestCase):
uri=self.get_mock_url(),
status_code=200,
json=group_data.json_response,
validate=dict(json=group_data.json_request)),
dict(method='GET',
uri=self.get_mock_url(append=[group_data.group_id]),
status_code=200,
json=group_data.json_response)
validate=dict(json=group_data.json_request))
])
self.op_cloud.create_group(
name=group_data.group_name, description=group_data.description,