Re-order oauth commands and sync with keystoneclient

1) split out token and consumer
2) sync parameters with keystoneclient

Change-Id: I2d529f0f9087f9939101e963af3d801497fc1171

Author: Steve Martinelli

openstackclient/identity/v3/consumer.py

@@ -0,0 +1,157 @@
+#   Copyright 2012-2013 OpenStack Foundation
+#
+#   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 Consumer action implementations"""
+
+import logging
+import six
+import sys
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class CreateConsumer(show.ShowOne):
+    """Create consumer command"""
+
+    log = logging.getLogger(__name__ + '.CreateConsumer')
+
+    def get_parser(self, prog_name):
+        parser = super(CreateConsumer, self).get_parser(prog_name)
+        parser.add_argument(
+            '--description',
+            metavar='<consumer-description>',
+            help='New consumer description',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        consumer = identity_client.consumers.create_consumer(
+            parsed_args.description
+        )
+        info = {}
+        info.update(consumer._info)
+        return zip(*sorted(six.iteritems(info)))
+
+
+class DeleteConsumer(command.Command):
+    """Delete consumer command"""
+
+    log = logging.getLogger(__name__ + '.DeleteConsumer')
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteConsumer, self).get_parser(prog_name)
+        parser.add_argument(
+            'consumer',
+            metavar='<consumer>',
+            help='ID of consumer 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
+        consumer = utils.find_resource(
+            identity_client.consumers, parsed_args.consumer)
+        identity_client.consumers.delete_consumer(consumer.id)
+        return
+
+
+class ListConsumer(lister.Lister):
+    """List consumer command"""
+
+    log = logging.getLogger(__name__ + '.ListConsumer')
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        columns = ('ID', 'Description')
+        data = self.app.client_manager.identity.consumers.list_consumers()
+        return (columns,
+                (utils.get_item_properties(
+                    s, columns,
+                    formatters={},
+                ) for s in data))
+
+
+class SetConsumer(command.Command):
+    """Set consumer command"""
+
+    log = logging.getLogger(__name__ + '.SetConsumer')
+
+    def get_parser(self, prog_name):
+        parser = super(SetConsumer, self).get_parser(prog_name)
+        parser.add_argument(
+            'consumer',
+            metavar='<consumer>',
+            help='ID of consumer to change',
+        )
+        parser.add_argument(
+            '--description',
+            metavar='<new-consumer-description>',
+            help='New consumer description',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        consumer = utils.find_resource(
+            identity_client.consumers, parsed_args.consumer)
+        kwargs = {}
+        if parsed_args.description:
+            kwargs['description'] = parsed_args.description
+
+        if not len(kwargs):
+            sys.stdout.write("Consumer not updated, no arguments present")
+            return
+
+        consumer = identity_client.consumers.update_consumer(
+            consumer.id,
+            **kwargs
+        )
+
+        info = {}
+        info.update(consumer._info)
+        return zip(*sorted(six.iteritems(info)))
+
+
+class ShowConsumer(show.ShowOne):
+    """Show consumer command"""
+
+    log = logging.getLogger(__name__ + '.ShowConsumer')
+
+    def get_parser(self, prog_name):
+        parser = super(ShowConsumer, self).get_parser(prog_name)
+        parser.add_argument(
+            'consumer',
+            metavar='<consumer>',
+            help='ID of consumer 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
+        consumer = utils.find_resource(
+            identity_client.consumers, parsed_args.consumer)
+
+        info = {}
+        info.update(consumer._info)
+        return zip(*sorted(six.iteritems(info)))