diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-26 03:58:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-26 03:58:57 +0000 |
| commit | 86bda369638e53a8e9683731e7a5d432640fa813 (patch) | |
| tree | 9b1c1b88e03a562303b6cc3107c2d8954df3a9d2 /openstackclient | |
| parent | f67ebce530d13c8da4ad32556d93095ab0ff0392 (diff) | |
| parent | a98d369a39a4818f68333065f669d827e8216382 (diff) | |
| download | python-openstackclient-86bda369638e53a8e9683731e7a5d432640fa813.tar.gz | |
Merge "Use *_as_ids instead *_as_list"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/project.py | 11 | ||||
| -rw-r--r-- | openstackclient/tests/unit/identity/v3/test_project.py | 20 |
2 files changed, 12 insertions, 19 deletions
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index c7806ee1..60efbac4 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -380,15 +380,8 @@ class ShowProject(command.ShowOne): # identity manager.get() with kwargs directly. project = identity_client.projects.get( project.id, - parents_as_list=parsed_args.parents, - subtree_as_list=parsed_args.children) - - if project._info.get('parents'): - project._info['parents'] = [str(p['project']['id']) - for p in project._info['parents']] - if project._info.get('subtree'): - project._info['subtree'] = [str(p['project']['id']) - for p in project._info['subtree']] + parents_as_ids=parsed_args.parents, + subtree_as_ids=parsed_args.children) project._info.pop('links') return zip(*sorted(six.iteritems(project._info))) diff --git a/openstackclient/tests/unit/identity/v3/test_project.py b/openstackclient/tests/unit/identity/v3/test_project.py index 2ce26c64..16ac3116 100644 --- a/openstackclient/tests/unit/identity/v3/test_project.py +++ b/openstackclient/tests/unit/identity/v3/test_project.py @@ -913,8 +913,8 @@ class TestProjectShow(TestProject): self.projects_mock.get.assert_has_calls([call(self.project.id), call(self.project.id, - parents_as_list=True, - subtree_as_list=False, + parents_as_ids=True, + subtree_as_ids=False, )]) collist = ( @@ -936,7 +936,7 @@ class TestProjectShow(TestProject): self.project.is_domain, self.project.name, self.project.parent_id, - [self.project.parent_id], + [{'project': {'id': self.project.parent_id}}] ) self.assertEqual(data, datalist) @@ -972,8 +972,8 @@ class TestProjectShow(TestProject): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.get.assert_has_calls([call(self.project.id), call(self.project.id, - parents_as_list=False, - subtree_as_list=True, + parents_as_ids=False, + subtree_as_ids=True, )]) collist = ( @@ -995,7 +995,7 @@ class TestProjectShow(TestProject): self.project.is_domain, self.project.name, self.project.parent_id, - ['children-id'], + [{'project': {'id': 'children-id'}}] ) self.assertEqual(data, datalist) @@ -1033,8 +1033,8 @@ class TestProjectShow(TestProject): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.get.assert_has_calls([call(self.project.id), call(self.project.id, - parents_as_list=True, - subtree_as_list=True, + parents_as_ids=True, + subtree_as_ids=True, )]) collist = ( @@ -1057,8 +1057,8 @@ class TestProjectShow(TestProject): self.project.is_domain, self.project.name, self.project.parent_id, - [self.project.parent_id], - ['children-id'], + [{'project': {'id': self.project.parent_id}}], + [{'project': {'id': 'children-id'}}] ) self.assertEqual(data, datalist) |