Merge "Pass arguments to v3 keystoneclient by kwarg"

4 files changed, 59 insertions, 48 deletions

diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 0479d379..e0420a1e 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -70,13 +70,14 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': None,
             'description': None,
             'enabled': True,
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=, description=,
+        #                       enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            None,
             **kwargs
         )
 
@@ -109,13 +110,14 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': None,
             'description': 'new desc',
             'enabled': True,
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=, description=,
+        #                       enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            None,
             **kwargs
         )
 
@@ -148,13 +150,14 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': identity_fakes.domain_id,
             'description': None,
             'enabled': True,
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=, description=,
+        #                       enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            identity_fakes.domain_id,
             **kwargs
         )
 
@@ -186,13 +189,14 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': None,
             'description': None,
             'enabled': True,
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=, description=,
+        #                       enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            None,
             **kwargs
         )
 
@@ -224,13 +228,14 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': None,
             'description': None,
             'enabled': False,
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=,
+        #                       description=, enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            None,
             **kwargs
         )
 
@@ -262,15 +267,16 @@ class TestProjectCreate(TestProject):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.project_name,
+            'domain': None,
             'description': None,
             'enabled': True,
             'fee': 'fi',
             'fo': 'fum',
         }
-        # ProjectManager.create(name, domain, description=, enabled=, **kwargs)
+        # ProjectManager.create(name=, domain=, description=,
+        #                       enabled=, **kwargs)
         self.projects_mock.create.assert_called_with(
-            identity_fakes.project_name,
-            None,
             **kwargs
         )
 
diff --git a/openstackclient/tests/identity/v3/test_role.py b/openstackclient/tests/identity/v3/test_role.py
index 040c39dd..0c0551e1 100644
--- a/openstackclient/tests/identity/v3/test_role.py
+++ b/openstackclient/tests/identity/v3/test_role.py
@@ -232,9 +232,14 @@ class TestRoleCreate(TestRole):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
 
-        # RoleManager.create(name)
+        # Set expected values
+        kwargs = {
+            'name': identity_fakes.role_name,
+        }
+
+        # RoleManager.create(name=)
         self.roles_mock.create.assert_called_with(
-            identity_fakes.role_name,
+            **kwargs
         )
 
         collist = ('id', 'name')
diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py
index 10d249c5..6733f7fa 100644
--- a/openstackclient/tests/identity/v3/test_service.py
+++ b/openstackclient/tests/identity/v3/test_service.py
@@ -60,11 +60,11 @@ class TestServiceCreate(TestService):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
 
-        # ServiceManager.create(name, type, enabled=, **kwargs)
+        # ServiceManager.create(name=, type=, enabled=, **kwargs)
         self.services_mock.create.assert_called_with(
-            identity_fakes.service_name,
-            identity_fakes.service_type,
-            True,
+            name=identity_fakes.service_name,
+            type=identity_fakes.service_type,
+            enabled=True,
         )
 
         collist = ('enabled', 'id', 'name', 'type')
@@ -93,11 +93,11 @@ class TestServiceCreate(TestService):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
 
-        # ServiceManager.create(name, type, enabled=, **kwargs)
+        # ServiceManager.create(name=, type=, enabled=, **kwargs)
         self.services_mock.create.assert_called_with(
-            None,
-            identity_fakes.service_type,
-            True,
+            name=None,
+            type=identity_fakes.service_type,
+            enabled=True,
         )
 
         collist = ('enabled', 'id', 'name', 'type')
@@ -126,11 +126,11 @@ class TestServiceCreate(TestService):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
 
-        # ServiceManager.create(name, type, enabled=, **kwargs)
+        # ServiceManager.create(name=, type=, enabled=, **kwargs)
         self.services_mock.create.assert_called_with(
-            None,
-            identity_fakes.service_type,
-            False,
+            name=None,
+            type=identity_fakes.service_type,
+            enabled=False,
         )
 
         collist = ('enabled', 'id', 'name', 'type')
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
index af7b2f70..093d919b 100644
--- a/openstackclient/tests/identity/v3/test_user.py
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -85,6 +85,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -93,10 +94,9 @@ class TestUserCreate(TestUser):
             'password': None,
         }
 
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -131,6 +131,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -138,10 +139,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': 'secret',
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -179,6 +179,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -186,10 +187,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': 'abc123',
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -223,6 +223,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -230,10 +231,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': None,
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -282,6 +282,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': identity_fakes.PROJECT_2['id'],
             'description': None,
             'domain': None,
@@ -289,10 +290,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': None,
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -326,6 +326,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': identity_fakes.domain_id,
@@ -333,10 +334,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': None,
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -369,6 +369,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -376,10 +377,9 @@ class TestUserCreate(TestUser):
             'enabled': True,
             'password': None,
         }
-        # UserManager.create(name, domain=, project=, password=, email=,
+        # UserManager.create(name=, domain=, project=, password=, email=,
         #   description=, enabled=, default_project=)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )
 
@@ -412,6 +412,7 @@ class TestUserCreate(TestUser):
 
         # Set expected values
         kwargs = {
+            'name': identity_fakes.user_name,
             'default_project': None,
             'description': None,
             'domain': None,
@@ -419,9 +420,8 @@ class TestUserCreate(TestUser):
             'enabled': False,
             'password': None,
         }
-        # users.create(name, password, email, tenant_id=None, enabled=True)
+        # users.create(name=, password, email, tenant_id=None, enabled=True)
         self.users_mock.create.assert_called_with(
-            identity_fakes.user_name,
             **kwargs
         )