Add options to "volume backup list" command

Add "--name", "--status", "--volume", "--marker" (v2 only)
and "--limit" (v2 only) options to "volume backup list" command

Change-Id: If20cb7650f2359d393ee314d9e055a8659c73009
Closes-Bug: #1612484
Closes-Bug: #1639712

2 files changed, 87 insertions, 6 deletions

diff --git a/openstackclient/tests/unit/volume/v1/test_backup.py b/openstackclient/tests/unit/volume/v1/test_backup.py
index 32c2fd22..f4a3b5e5 100644
--- a/openstackclient/tests/unit/volume/v1/test_backup.py
+++ b/openstackclient/tests/unit/volume/v1/test_backup.py
@@ -249,26 +249,60 @@ class TestBackupList(TestBackup):
 
         self.volumes_mock.list.return_value = [self.volume]
         self.backups_mock.list.return_value = self.backups
+        self.volumes_mock.get.return_value = self.volume
         # Get the command to test
         self.cmd = backup.ListVolumeBackup(self.app, None)
 
     def test_backup_list_without_options(self):
         arglist = []
-        verifylist = [("long", False)]
+        verifylist = [
+            ("long", False),
+            ("name", None),
+            ("status", None),
+            ("volume", None),
+        ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
+        search_opts = {
+            "name": None,
+            "status": None,
+            "volume_id": None,
+        }
+        self.volumes_mock.get.assert_not_called
+        self.backups_mock.list.assert_called_with(
+            search_opts=search_opts,
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
     def test_backup_list_with_options(self):
-        arglist = ["--long"]
-        verifylist = [("long", True)]
+        arglist = [
+            "--long",
+            "--name", self.backups[0].name,
+            "--status", "error",
+            "--volume", self.volume.id,
+        ]
+        verifylist = [
+            ("long", True),
+            ("name", self.backups[0].name),
+            ("status", "error"),
+            ("volume", self.volume.id),
+        ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
+        search_opts = {
+            "name": self.backups[0].name,
+            "status": "error",
+            "volume_id": self.volume.id,
+        }
+        self.volumes_mock.get.assert_called_once_with(self.volume.id)
+        self.backups_mock.list.assert_called_with(
+            search_opts=search_opts,
+        )
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data_long, list(data))
 
diff --git a/openstackclient/tests/unit/volume/v2/test_backup.py b/openstackclient/tests/unit/volume/v2/test_backup.py
index 306c9eb3..dd2b2689 100644
--- a/openstackclient/tests/unit/volume/v2/test_backup.py
+++ b/openstackclient/tests/unit/volume/v2/test_backup.py
@@ -280,26 +280,73 @@ class TestBackupList(TestBackup):
 
         self.volumes_mock.list.return_value = [self.volume]
         self.backups_mock.list.return_value = self.backups
+        self.volumes_mock.get.return_value = self.volume
+        self.backups_mock.get.return_value = self.backups[0]
         # Get the command to test
         self.cmd = backup.ListVolumeBackup(self.app, None)
 
     def test_backup_list_without_options(self):
         arglist = []
-        verifylist = [("long", False)]
+        verifylist = [
+            ("long", False),
+            ("name", None),
+            ("status", None),
+            ("volume", None),
+            ("marker", None),
+            ("limit", None),
+        ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
+        search_opts = {
+            "name": None,
+            "status": None,
+            "volume_id": None,
+        }
+        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,
+            limit=None,
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
     def test_backup_list_with_options(self):
-        arglist = ["--long"]
-        verifylist = [("long", True)]
+        arglist = [
+            "--long",
+            "--name", self.backups[0].name,
+            "--status", "error",
+            "--volume", self.volume.id,
+            "--marker", self.backups[0].id,
+            "--limit", "3",
+        ]
+        verifylist = [
+            ("long", True),
+            ("name", self.backups[0].name),
+            ("status", "error"),
+            ("volume", self.volume.id),
+            ("marker", self.backups[0].id),
+            ("limit", 3),
+        ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
+        search_opts = {
+            "name": self.backups[0].name,
+            "status": "error",
+            "volume_id": self.volume.id,
+        }
+        self.volumes_mock.get.assert_called_once_with(self.volume.id)
+        self.backups_mock.get.assert_called_once_with(self.backups[0].id)
+        self.backups_mock.list.assert_called_with(
+            search_opts=search_opts,
+            marker=self.backups[0].id,
+            limit=3,
+        )
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data_long, list(data))