openstack
/
shade
Code Issues Proposed changes

De-client-ify Remove User from Group 

Change-Id: Ica1cc5e472cfc14f9afeb05db5fa82cfd8ece500
This commit is contained in:
Samuel de Medeiros Queiroz 2017-08-30 18:50:42 -03:00
parent 6b034faa77
commit e42192e839
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/_tasks.py
View File

@ -22,11 +22,6 @@ class UserPasswordUpdate(task_manager.Task):
return client.keystone_client.users.update_password(**self.args)
class UserRemoveFromGroup(task_manager.Task):
def main(self, client):
return client.keystone_client.users.remove_from_group(**self.args)
class MachineCreate(task_manager.Task):
def main(self, client):
return client.ironic_client.node.create(**self.args)

12
shade/openstackcloud.py
View File

@ -1140,13 +1140,11 @@ class OpenStackCloud(
"""
user, group = self._get_user_and_group(name_or_id, group_name_or_id)
with _utils.shade_exceptions(
"Error removing user {user} from group {group}".format(
user=name_or_id, group=group_name_or_id)
):
self.manager.submit_task(
_tasks.UserRemoveFromGroup(user=user['id'], group=group['id'])
)
error_msg = "Error removing user {user} from group {group}".format(
user=name_or_id, group=group_name_or_id)
self._identity_client.delete(
'/groups/{g}/users/{u}'.format(g=group['id'], u=user['id']),
error_message=error_msg)
def get_template_contents(
self, template_file=None, template_url=None,