diff options
| author | Jordan Pittier <jordan.pittier@scality.com> | 2016-11-04 13:13:20 +0100 |
|---|---|---|
| committer | Jordan Pittier <jordan.pittier@scality.com> | 2016-11-08 17:35:51 +0100 |
| commit | 55669b90c041815c1862d468fe8eb76172a212d8 (patch) | |
| tree | 804c03fcafc17ea300bc53490c2ffaeffde7d526 /openstackclient | |
| parent | e07b0e0919784b48dc47ae9cd8836342b8c13480 (diff) | |
| download | python-openstackclient-55669b90c041815c1862d468fe8eb76172a212d8.tar.gz | |
Add 'all-projects' option to 'volume backup list'
Similar to what 'volume list --all-projects' does, 'volume backup
list --all-projects' list volume backups accross all projects.
Change-Id: Id5dda9b5adc822c4ddfb2dda339946d3322858e2
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/unit/volume/v1/test_backup.py | 7 | ||||
| -rw-r--r-- | openstackclient/tests/unit/volume/v2/test_backup.py | 9 | ||||
| -rw-r--r-- | openstackclient/volume/v1/backup.py | 7 | ||||
| -rw-r--r-- | openstackclient/volume/v2/backup.py | 7 |
4 files changed, 27 insertions, 3 deletions
diff --git a/openstackclient/tests/unit/volume/v1/test_backup.py b/openstackclient/tests/unit/volume/v1/test_backup.py index f4a3b5e5..1097d3f1 100644 --- a/openstackclient/tests/unit/volume/v1/test_backup.py +++ b/openstackclient/tests/unit/volume/v1/test_backup.py @@ -260,6 +260,7 @@ class TestBackupList(TestBackup): ("name", None), ("status", None), ("volume", None), + ('all_projects', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -269,8 +270,9 @@ class TestBackupList(TestBackup): "name": None, "status": None, "volume_id": None, + "all_tenants": False, } - self.volumes_mock.get.assert_not_called + self.volumes_mock.get.assert_not_called() self.backups_mock.list.assert_called_with( search_opts=search_opts, ) @@ -283,12 +285,14 @@ class TestBackupList(TestBackup): "--name", self.backups[0].name, "--status", "error", "--volume", self.volume.id, + "--all-projects" ] verifylist = [ ("long", True), ("name", self.backups[0].name), ("status", "error"), ("volume", self.volume.id), + ('all_projects', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -298,6 +302,7 @@ class TestBackupList(TestBackup): "name": self.backups[0].name, "status": "error", "volume_id": self.volume.id, + "all_tenants": True, } self.volumes_mock.get.assert_called_once_with(self.volume.id) self.backups_mock.list.assert_called_with( diff --git a/openstackclient/tests/unit/volume/v2/test_backup.py b/openstackclient/tests/unit/volume/v2/test_backup.py index dd2b2689..10e7aac5 100644 --- a/openstackclient/tests/unit/volume/v2/test_backup.py +++ b/openstackclient/tests/unit/volume/v2/test_backup.py @@ -294,6 +294,7 @@ class TestBackupList(TestBackup): ("volume", None), ("marker", None), ("limit", None), + ('all_projects', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -303,9 +304,10 @@ class TestBackupList(TestBackup): "name": None, "status": None, "volume_id": None, + 'all_tenants': False, } - self.volumes_mock.get.assert_not_called - self.backups_mock.get.assert_not_called + self.volumes_mock.get.assert_not_called() + self.backups_mock.get.assert_not_called() self.backups_mock.list.assert_called_with( search_opts=search_opts, marker=None, @@ -321,6 +323,7 @@ class TestBackupList(TestBackup): "--status", "error", "--volume", self.volume.id, "--marker", self.backups[0].id, + "--all-projects", "--limit", "3", ] verifylist = [ @@ -329,6 +332,7 @@ class TestBackupList(TestBackup): ("status", "error"), ("volume", self.volume.id), ("marker", self.backups[0].id), + ('all_projects', True), ("limit", 3), ] @@ -339,6 +343,7 @@ class TestBackupList(TestBackup): "name": self.backups[0].name, "status": "error", "volume_id": self.volume.id, + 'all_tenants': True, } self.volumes_mock.get.assert_called_once_with(self.volume.id) self.backups_mock.get.assert_called_once_with(self.backups[0].id) diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py index bf4e8625..a02cdccb 100644 --- a/openstackclient/volume/v1/backup.py +++ b/openstackclient/volume/v1/backup.py @@ -172,6 +172,12 @@ class ListVolumeBackup(command.Lister): help=_("Filters results by the volume which they " "backup (name or ID)") ) + parser.add_argument( + '--all-projects', + action='store_true', + default=False, + help=_('Include all projects (admin only)'), + ) return parser def take_action(self, parsed_args): @@ -215,6 +221,7 @@ class ListVolumeBackup(command.Lister): 'name': parsed_args.name, 'status': parsed_args.status, 'volume_id': filter_volume_id, + 'all_tenants': parsed_args.all_projects, } data = volume_client.backups.list( search_opts=search_opts, diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py index e674ef2b..c41cffda 100644 --- a/openstackclient/volume/v2/backup.py +++ b/openstackclient/volume/v2/backup.py @@ -212,6 +212,12 @@ class ListVolumeBackup(command.Lister): metavar='<limit>', help=_('Maximum number of backups to display'), ) + parser.add_argument( + '--all-projects', + action='store_true', + default=False, + help=_('Include all projects (admin only)'), + ) return parser def take_action(self, parsed_args): @@ -259,6 +265,7 @@ class ListVolumeBackup(command.Lister): 'name': parsed_args.name, 'status': parsed_args.status, 'volume_id': filter_volume_id, + 'all_tenants': parsed_args.all_projects, } data = volume_client.backups.list( search_opts=search_opts, |
