Merge "Enabling domain lookup for project set v3 command"

This commit is contained in:
Jenkins 2016-01-04 16:31:21 +00:00 committed by Gerrit Code Review
commit 1b916da1a0
2 changed files with 2 additions and 11 deletions

View File

@ -283,16 +283,12 @@ class SetProject(command.Command):
and not parsed_args.disable):
return
project = utils.find_resource(
identity_client.projects,
parsed_args.project,
)
project = common.find_project(identity_client, parsed_args.project,
parsed_args.domain)
kwargs = {}
if parsed_args.name:
kwargs['name'] = parsed_args.name
if parsed_args.domain:
kwargs['domain'] = parsed_args.domain
if parsed_args.description:
kwargs['description'] = parsed_args.description
if parsed_args.enable:

View File

@ -636,7 +636,6 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
'name': 'qwerty',
'domain': identity_fakes.domain_id,
}
# ProjectManager.update(project, name=, domain=, description=,
# enabled=, **kwargs)
@ -665,7 +664,6 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
'domain': identity_fakes.domain_id,
'description': 'new desc',
}
self.projects_mock.update.assert_called_with(
@ -692,7 +690,6 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
'domain': identity_fakes.domain_id,
'enabled': True,
}
self.projects_mock.update.assert_called_with(
@ -719,7 +716,6 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
'domain': identity_fakes.domain_id,
'enabled': False,
}
self.projects_mock.update.assert_called_with(
@ -746,7 +742,6 @@ class TestProjectSet(TestProject):
# Set expected values
kwargs = {
'domain': identity_fakes.domain_id,
'fee': 'fi',
'fo': 'fum',
}