diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py index b82825f00b..93f67f6c08 100644 --- a/openstackclient/identity/v3/credential.py +++ b/openstackclient/identity/v3/credential.py @@ -68,9 +68,9 @@ class CreateCredential(show.ShowOne): else: project = None credential = identity_client.credentials.create( - user_id, - parsed_args.type, - parsed_args.data, + user=user_id, + type=parsed_args.type, + blob=parsed_args.data, project=project) return zip(*sorted(six.iteritems(credential._info))) diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py index 1e9a4a2a0b..a74b12e295 100644 --- a/openstackclient/identity/v3/domain.py +++ b/openstackclient/identity/v3/domain.py @@ -61,8 +61,8 @@ class CreateDomain(show.ShowOne): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity domain = identity_client.domains.create( - parsed_args.name, - parsed_args.description, + name=parsed_args.name, + description=parsed_args.description, enabled=parsed_args.enabled, ) diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py index 055f9fe2ee..64334c636f 100644 --- a/openstackclient/identity/v3/endpoint.py +++ b/openstackclient/identity/v3/endpoint.py @@ -73,11 +73,11 @@ class CreateEndpoint(show.ShowOne): parsed_args.service) endpoint = identity_client.endpoints.create( - service.id, - parsed_args.url, - parsed_args.interface, - parsed_args.region, - parsed_args.enabled + service=service.id, + url=parsed_args.url, + interface=parsed_args.interface, + region=parsed_args.region, + enabled=parsed_args.enabled ) info = {} @@ -192,11 +192,11 @@ class SetEndpoint(command.Command): identity_client.endpoints.update( endpoint.id, - service.id, - parsed_args.url, - parsed_args.interface, - parsed_args.region, - parsed_args.enabled + service=service.id, + url=parsed_args.url, + interface=parsed_args.interface, + region=parsed_args.region, + enabled=parsed_args.enabled ) return diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index 6c059b5df7..38d810cb87 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -133,7 +133,7 @@ class CreateGroup(show.ShowOne): else: domain = None group = identity_client.groups.create( - parsed_args.name, + name=parsed_args.name, domain=domain, description=parsed_args.description) diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py index a760d8cdd8..249ba1ee22 100644 --- a/openstackclient/identity/v3/policy.py +++ b/openstackclient/identity/v3/policy.py @@ -52,7 +52,7 @@ class CreatePolicy(show.ShowOne): identity_client = self.app.client_manager.identity policy = identity_client.policies.create( - blob, type=parsed_args.type + blob=blob, type=parsed_args.type ) return zip(*sorted(six.iteritems(policy._info))) diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index d3618fb3ce..36787bb0e2 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -88,8 +88,8 @@ class CreateProject(show.ShowOne): kwargs = parsed_args.property.copy() project = identity_client.projects.create( - parsed_args.name, - domain, + name=parsed_args.name, + domain=domain, description=parsed_args.description, enabled=enabled, **kwargs diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py index 05bdbbfc01..664a05dcc9 100644 --- a/openstackclient/identity/v3/role.py +++ b/openstackclient/identity/v3/role.py @@ -155,7 +155,7 @@ class CreateRole(show.ShowOne): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity - role = identity_client.roles.create(parsed_args.name) + role = identity_client.roles.create(name=parsed_args.name) return zip(*sorted(six.iteritems(role._info))) diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py index 7e3bfc6b2d..63997d1cd7 100644 --- a/openstackclient/identity/v3/service.py +++ b/openstackclient/identity/v3/service.py @@ -64,9 +64,9 @@ class CreateService(show.ShowOne): enabled = False service = identity_client.services.create( - parsed_args.name, - parsed_args.type, - enabled, + name=parsed_args.name, + type=parsed_args.type, + enabled=enabled, ) return zip(*sorted(six.iteritems(service._info))) diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index 060eeca7c4..a5209020a6 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -107,7 +107,7 @@ class CreateUser(show.ShowOne): parsed_args.password = utils.get_password(self.app.stdin) user = identity_client.users.create( - parsed_args.name, + name=parsed_args.name, domain=domain_id, default_project=project_id, password=parsed_args.password, diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py index 0479d37996..e0420a1e80 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 040c39dd1b..0c0551e11f 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 10d249c5db..6733f7faef 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 af7b2f70c1..093d919b1b 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 )