Merge "Enabling domain lookup for project set v3 command"

Author: Jenkins

openstackclient/identity/v3/project.py

@@ -283,16 +283,12 @@ def take_action(self, parsed_args):
                 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:

openstackclient/tests/identity/v3/test_project.py

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