Merge "Add parent project filter for listing projects"

This commit is contained in:
Zuul 2019-10-22 21:16:40 +00:00 committed by Gerrit Code Review
commit 7e98aaefa9
4 changed files with 44 additions and 0 deletions

View File

@ -102,6 +102,7 @@ List projects
openstack project list
[--domain <domain>]
[--parent <parent>]
[--user <user>]
[--my-projects]
[--long]
@ -115,6 +116,12 @@ List projects
.. versionadded:: 3
.. option:: --parent <parent>
Filter projects whose parent is :option:`\<parent\> <--parent>` (name or ID)
.. versionadded:: 3
.. option:: --user <user>
Filter projects by :option:`\<user\> <--user>` (name or ID)

View File

@ -185,6 +185,11 @@ class ListProject(command.Lister):
metavar='<domain>',
help=_('Filter projects by <domain> (name or ID)'),
)
parser.add_argument(
'--parent',
metavar='<parent>',
help=_('Filter projects whose parent is <parent> (name or ID)'),
)
parser.add_argument(
'--user',
metavar='<user>',
@ -226,6 +231,11 @@ class ListProject(command.Lister):
parsed_args.domain).id
kwargs['domain'] = domain_id
if parsed_args.parent:
parent_id = common.find_project(identity_client,
parsed_args.parent).id
kwargs['parent'] = parent_id
if parsed_args.user:
if parsed_args.domain:
user_id = utils.find_resource(identity_client.users,

View File

@ -645,6 +645,28 @@ class TestProjectList(TestProject):
self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data))
def test_project_list_parent(self):
self.parent = identity_fakes.FakeProject.create_one_project()
self.project = identity_fakes.FakeProject.create_one_project(
attrs={'domain_id': self.domain.id, 'parent_id': self.parent.id})
arglist = [
'--parent', self.parent.id,
]
verifylist = [
('parent', self.parent.id),
]
self.projects_mock.get.return_value = self.parent
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.projects_mock.list.assert_called_with(parent=self.parent.id)
self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data))
def test_project_list_sort(self):
self.projects_mock.list.return_value = self.projects

View File

@ -0,0 +1,5 @@
---
features:
- |
Add ``--parent`` option to ``project list`` command to filter projects
by the specified parent project.