Multiple API version support

* Use multiple entry point groups to represent each API+version
  combination supported
* Add some tests

Try it out:
* Right now only '* user' commands have multiple overlapping versions;
  you can see the selection between v2.0 and v3 by looking at the
  command help output for 'tenant' vs 'project':

  os --os-identity-api-version=2.0 help set user
  os --os-identity-api-version=3 help set user

Change-Id: I7114fd246843df0243d354a7cce697810bb7de62

2 files changed, 249 insertions, 2 deletions

diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 2017e5e3..840cc500 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-"""User action implementations"""
+"""Identity v2.0 User action implementations"""
 
 import logging
 
@@ -126,7 +126,7 @@ class ListUser(lister.Lister):
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         if parsed_args.long:
-            columns = ('ID', 'Name', 'TenantId', 'Email', 'Enabled')
+            columns = ('ID', 'Name', 'Tenant Id', 'Email', 'Enabled')
         else:
             columns = ('ID', 'Name')
         data = self.app.client_manager.identity.users.list()
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
new file mode 100644
index 00000000..bf592d81
--- /dev/null
+++ b/openstackclient/identity/v3/user.py
@@ -0,0 +1,247 @@
+#   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 User action implementations"""
+
+import logging
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class CreateUser(show.ShowOne):
+    """Create user command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.CreateUser')
+
+    def get_parser(self, prog_name):
+        parser = super(CreateUser, self).get_parser(prog_name)
+        parser.add_argument(
+            'name',
+            metavar='<user-name>',
+            help='New user name',
+        )
+        parser.add_argument(
+            '--password',
+            metavar='<user-password>',
+            help='New user password',
+        )
+        parser.add_argument(
+            '--email',
+            metavar='<user-email>',
+            help='New user email address',
+        )
+        parser.add_argument(
+            '--project',
+            metavar='<project>',
+            help='New default project name or ID',
+        )
+        enable_group = parser.add_mutually_exclusive_group()
+        enable_group.add_argument(
+            '--enable',
+            dest='enabled',
+            action='store_true',
+            default=True,
+            help='Enable user',
+        )
+        enable_group.add_argument(
+            '--disable',
+            dest='enabled',
+            action='store_false',
+            help='Disable user',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        if parsed_args.project:
+            project_id = utils.find_resource(
+                identity_client.projects, parsed_args.project).id
+        else:
+            project_id = None
+        user = identity_client.users.create(
+            parsed_args.name,
+            parsed_args.password,
+            parsed_args.email,
+            project_id=project_id,
+            enabled=parsed_args.enabled,
+        )
+
+        info = {}
+        info.update(user._info)
+        return zip(*sorted(info.iteritems()))
+
+
+class DeleteUser(command.Command):
+    """Delete user command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.DeleteUser')
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteUser, self).get_parser(prog_name)
+        parser.add_argument(
+            'user',
+            metavar='<user>',
+            help='Name or ID of user 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
+        user = utils.find_resource(
+            identity_client.users, parsed_args.user)
+        identity_client.users.delete(user.id)
+        return
+
+
+class ListUser(lister.Lister):
+    """List user command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.ListUser')
+
+    def get_parser(self, prog_name):
+        parser = super(ListUser, self).get_parser(prog_name)
+        parser.add_argument(
+            '--project',
+            metavar='<project>',
+            help='Name or ID of project to filter users',
+        )
+        parser.add_argument(
+            '--long',
+            action='store_true',
+            default=False,
+            help='Additional fields are listed in output',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        if parsed_args.long:
+            columns = ('ID', 'Name', 'Project Id', 'Email', 'Enabled')
+        else:
+            columns = ('ID', 'Name')
+        data = self.app.client_manager.identity.users.list()
+        return (columns,
+                (utils.get_item_properties(
+                    s, columns,
+                    formatters={},
+                ) for s in data))
+
+
+class SetUser(command.Command):
+    """Set user command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.SetUser')
+
+    def get_parser(self, prog_name):
+        parser = super(SetUser, self).get_parser(prog_name)
+        parser.add_argument(
+            'user',
+            metavar='<user>',
+            help='Name or ID of user to change',
+        )
+        parser.add_argument(
+            '--name',
+            metavar='<new-user-name>',
+            help='New user name',
+        )
+        parser.add_argument(
+            '--password',
+            metavar='<user-password>',
+            help='New user password',
+        )
+        parser.add_argument(
+            '--email',
+            metavar='<user-email>',
+            help='New user email address',
+        )
+        parser.add_argument(
+            '--project',
+            metavar='<project>',
+            help='New default project name or ID',
+        )
+        enable_group = parser.add_mutually_exclusive_group()
+        enable_group.add_argument(
+            '--enable',
+            dest='enabled',
+            action='store_true',
+            default=True,
+            help='Enable user (default)',
+        )
+        enable_group.add_argument(
+            '--disable',
+            dest='enabled',
+            action='store_false',
+            help='Disable user',
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)' % parsed_args)
+        identity_client = self.app.client_manager.identity
+        user = utils.find_resource(
+            identity_client.users, parsed_args.user)
+        kwargs = {}
+        if parsed_args.name:
+            kwargs['name'] = parsed_args.name
+        if parsed_args.email:
+            kwargs['email'] = parsed_args.email
+        if parsed_args.project:
+            project_id = utils.find_resource(
+                identity_client.projects, parsed_args.project).id
+            kwargs['projectId'] = project_id
+        if 'enabled' in parsed_args:
+            kwargs['enabled'] = parsed_args.enabled
+
+        if not len(kwargs):
+            stdout.write("User not updated, no arguments present")
+            return
+        identity_client.users.update(user.id, **kwargs)
+        return
+
+
+class ShowUser(show.ShowOne):
+    """Show user command"""
+
+    api = 'identity'
+    log = logging.getLogger(__name__ + '.ShowUser')
+
+    def get_parser(self, prog_name):
+        parser = super(ShowUser, self).get_parser(prog_name)
+        parser.add_argument(
+            'user',
+            metavar='<user>',
+            help='Name or ID of user 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
+        user = utils.find_resource(
+            identity_client.users, parsed_args.user)
+
+        info = {}
+        info.update(user._info)
+        return zip(*sorted(info.iteritems()))