openstack/python-openstackclient
Code Issues Proposed changes

Pass arguments to v3 keystoneclient by kwarg

Browse Source 
Keystoneclient has added the positional decorator which emits a warning
if arguments aren't passed by keyword. This means we are getting
warnings in certain places in openstackclient.

Change-Id: Ic5446cd6f122cbb56fce543011386d53bc31fe18
Closes-Bug: #1302199
This commit is contained in:
Jamie Lennox 2014-04-04 08:09:43 +10:00
parent ee22070473
commit 022b6d95d1
13 changed files with 83 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/identity/v3/credential.py
View File

@ -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)))

4
openstackclient/identity/v3/domain.py
View File

@ -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,
)

20
openstackclient/identity/v3/endpoint.py
View File

@ -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

2
openstackclient/identity/v3/group.py
View File

@ -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)

2
openstackclient/identity/v3/policy.py
View File

@ -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)))

4
openstackclient/identity/v3/project.py
View File

@ -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

2
openstackclient/identity/v3/role.py
View File

@ -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)))

6
openstackclient/identity/v3/service.py
View File

@ -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)))

2
openstackclient/identity/v3/user.py
View File

@ -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,

42
openstackclient/tests/identity/v3/test_project.py
View File

@ -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
)

9
openstackclient/tests/identity/v3/test_role.py
View File

@ -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')

24
openstackclient/tests/identity/v3/test_service.py
View File

@ -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')

32
openstackclient/tests/identity/v3/test_user.py
View File

@ -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
)