Merge "Add role v3 support to identity in openstack client"

Jenkins · openstack-gerrit · commit e2c3dbf24d38 · 2013-03-15T18:50:06.000Z
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
@@ -0,0 +1,144 @@
+#   Copyright 2012-2013 OpenStack, LLC.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Identity v3 Role action implementations"""
+
+import logging
+import sys
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class CreateRole(show.ShowOne):
+    """Create new role"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.CreateRole')
+
+    def get_parser(self, prog_name):
+        parser = super(CreateRole, self).get_parser(prog_name)
+        parser.add_argument(
+            'role-name',
+            metavar='<role-name>',
+            help='New role name')
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        role = identity_client.roles.create(parsed_args.role_name)
+
+        return zip(*sorted(role._info.iteritems()))
+
+
+class DeleteRole(command.Command):
+    """Delete existing role"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.DeleteRole')
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteRole, self).get_parser(prog_name)
+        parser.add_argument(
+            'role',
+            metavar='<role>',
+            help='Name or ID of role to delete')
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        role_id = utils.find_resource(identity_client.roles,
+                                      parsed_args.role)
+        identity_client.roles.delete(role_id)
+        return
+
+
+class ListRole(lister.Lister):
+    """List roles"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.ListRole')
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        columns = ('ID', 'Name')
+        data = self.app.client_manager.identity.roles.list()
+        return (columns,
+                (utils.get_item_properties(
+                    s, columns,
+                    formatters={},
+                ) for s in data))
+
+
+class SetRole(command.Command):
+    """Set role command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.SetRole')
+
+    def get_parser(self, prog_name):
+        parser = super(SetRole, self).get_parser(prog_name)
+        parser.add_argument(
+            'role',
+            metavar='<role>',
+            help='Name or ID of role to change',
+        )
+        parser.add_argument(
+            '--name',
+            metavar='<new-role-name>',
+            help='New role name',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        role_id = utils.find_resource(identity_client.roles,
+                                      parsed_args.role)
+
+        if not parsed_args.name:
+            sys.stdout.write("Role not updated, no arguments present")
+            return
+
+        identity_client.roles.update(role_id, parsed_args.name)
+        return
+
+
+class ShowRole(show.ShowOne):
+    """Show single role"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.ShowRole')
+
+    def get_parser(self, prog_name):
+        parser = super(ShowRole, self).get_parser(prog_name)
+        parser.add_argument(
+            'role',
+            metavar='<role>',
+            help='Name or ID of role to display')
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        role = utils.find_resource(identity_client.roles,
+                                   parsed_args.role)
+
+        return zip(*sorted(role._info.iteritems()))
diff --git a/setup.py b/setup.py
@@ -132,6 +132,13 @@ def read(fname):
             'set_domain=openstackclient.identity.v3.domain:SetDomain',
             'show_domain=openstackclient.identity.v3.domain:ShowDomain',
             'list_domain=openstackclient.identity.v3.domain:ListDomain',
+            'create_role=' +
+            'openstackclient.identity.v3.role:CreateRole',
+            'delete_role=' +
+            'openstackclient.identity.v3.role:DeleteRole',
+            'list_role=openstackclient.identity.v3.role:ListRole',
+            'show_role=openstackclient.identity.v3.role:ShowRole',
+            'set_role=openstackclient.identity.v3.role:SetRole',
         ],
         'openstack.image.v2': [
             'list_image=openstackclient.image.v2.image:ListImage',
