Add Identity v2 role and service tests

* Add current auth info (auth_ref) to ClientManager
* Fix identity.v2_0.role.ListUserRole to get default user/project
  from ClientManager.auth_ref
* Fix identity.v2_0.role.AddRole call to roles.add_user_role()

Change-Id: Ie8bf41c491d97b0292a2b86bdc9b7580989a7f97

Author: Dean Troyer

openstackclient/common/clientmanager.py

@@ -1,4 +1,4 @@
-#   Copyright 2012-2013 OpenStack, LLC.
+#   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
@@ -62,8 +62,11 @@ def __init__(self, token=None, url=None, auth_url=None, project_name=None,
         self._api_version = api_version
         self._service_catalog = None
 
+        self.auth_ref = None
+
         if not self._url:
             # Populate other password flow attributes
+            self.auth_ref = self.identity.auth_ref
             self._token = self.identity.auth_token
             self._service_catalog = self.identity.service_catalog
 

openstackclient/identity/client.py

@@ -1,4 +1,4 @@
-#   Copyright 2012-2013 OpenStack, LLC.
+#   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
@@ -48,6 +48,7 @@ def make_client(instance):
             tenant_id=instance._project_id,
             auth_url=instance._auth_url,
             region_name=instance._region_name)
+        instance.auth_ref = client.auth_ref
     return client
 
 

openstackclient/identity/v2_0/role.py

@@ -22,6 +22,7 @@
 from cliff import lister
 from cliff import show
 
+from openstackclient.common import exceptions
 from openstackclient.common import utils
 
 
@@ -59,9 +60,10 @@ def take_action(self, parsed_args):
         )
         user = utils.find_resource(identity_client.users, parsed_args.user)
         role = identity_client.roles.add_user_role(
-            user,
-            role,
-            project)
+            user.id,
+            role.id,
+            project.id,
+        )
 
         info = {}
         info.update(role._info)
@@ -150,14 +152,23 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
+        auth_ref = self.app.client_manager.auth_ref
 
-        # user-only roles are not supported in KSL so we are
-        # required to have a user and project; default to the
-        # values used for authentication if not specified
+        # Project and user are required, if not included in command args
+        # default to the values used for authentication.  For token-flow
+        # authentication they must be included on the command line.
         if not parsed_args.project:
-            parsed_args.project = identity_client.auth_tenant_id
+            if self.app.client_manager.auth_ref:
+                parsed_args.project = auth_ref.project_id
+            else:
+                msg = "Project must be specified"
+                raise exceptions.CommandError(msg)
         if not parsed_args.user:
-            parsed_args.user = identity_client.auth_user_id
+            if self.app.client_manager.auth_ref:
+                parsed_args.user = auth_ref.user_id
+            else:
+                msg = "User must be specified"
+                raise exceptions.CommandError(msg)
 
         project = utils.find_resource(
             identity_client.tenants,

openstackclient/tests/identity/fakes.py

@@ -17,24 +17,10 @@
 
 from openstackclient.tests import fakes
 
-
-user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
-user_name = 'paul'
-user_description = 'Sir Paul'
-user_email = 'paul@applecorps.com'
-
 project_id = '8-9-64'
 project_name = 'beatles'
 project_description = 'Fab Four'
 
-USER = {
-    'id': user_id,
-    'name': user_name,
-    'tenantId': project_id,
-    'email': user_email,
-    'enabled': True,
-}
-
 PROJECT = {
     'id': project_id,
     'name': project_name,
@@ -49,9 +35,46 @@
     'enabled': True,
 }
 
+role_id = '1'
+role_name = 'boss'
+
+ROLE = {
+    'id': role_id,
+    'name': role_name,
+}
+
+service_id = '1925-10-11'
+service_name = 'elmore'
+service_description = 'Leonard, Elmore, rip'
+service_type = 'author'
+
+SERVICE = {
+    'id': service_id,
+    'name': service_name,
+    'description': service_description,
+    'type': service_type,
+}
+
+user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+user_name = 'paul'
+user_description = 'Sir Paul'
+user_email = 'paul@applecorps.com'
+
+USER = {
+    'id': user_id,
+    'name': user_name,
+    'tenantId': project_id,
+    'email': user_email,
+    'enabled': True,
+}
+
 
 class FakeIdentityv2Client(object):
     def __init__(self, **kwargs):
+        self.roles = mock.Mock()
+        self.roles.resource_class = fakes.FakeResource(None, {})
+        self.services = mock.Mock()
+        self.services.resource_class = fakes.FakeResource(None, {})
         self.tenants = mock.Mock()
         self.tenants.resource_class = fakes.FakeResource(None, {})
         self.users = mock.Mock()