Merge "Use *_as_ids instead *_as_list"

Author: Jenkins

openstackclient/identity/v3/project.py

@@ -380,15 +380,8 @@ def take_action(self, parsed_args):
             #                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)))

openstackclient/tests/unit/identity/v3/test_project.py

@@ -913,8 +913,8 @@ def test_project_show_parents(self):
 
         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 @@ def test_project_show_parents(self):
             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 @@ def test_project_show_subtree(self):
         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 @@ def test_project_show_subtree(self):
             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 @@ def test_project_show_parents_and_children(self):
         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 @@ def test_project_show_parents_and_children(self):
             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)