Add support for volume backup v2 command

openstack backup create
openstack backup list
openstack backup restore

Implements: blueprint volume-v2
Change-Id: I77965730065dd44f256c46bcc43c1e6a03b63145

2 files changed, 153 insertions, 1 deletions

diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index 3eade391..d6c07b9f 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -93,6 +93,7 @@ backup_description = "fake description"
 backup_object_count = None
 backup_container = None
 backup_size = 10
+backup_status = "error"
 
 BACKUP = {
     "id": backup_id,
@@ -101,7 +102,9 @@ BACKUP = {
     "description": backup_description,
     "object_count": backup_object_count,
     "container": backup_container,
-    "size": backup_size
+    "size": backup_size,
+    "status": backup_status,
+    "availability_zone": volume_availability_zone,
 }
 
 BACKUP_columns = tuple(sorted(BACKUP))
@@ -118,6 +121,8 @@ class FakeVolumeClient(object):
         self.backups.resource_class = fakes.FakeResource(None, {})
         self.volume_types = mock.Mock()
         self.volume_types.resource_class = fakes.FakeResource(None, {})
+        self.restores = mock.Mock()
+        self.restores.resource_class = fakes.FakeResource(None, {})
         self.auth_token = kwargs['token']
         self.management_url = kwargs['endpoint']
 
diff --git a/openstackclient/tests/volume/v2/test_backup.py b/openstackclient/tests/volume/v2/test_backup.py
index e24cac3c..7af22e8a 100644
--- a/openstackclient/tests/volume/v2/test_backup.py
+++ b/openstackclient/tests/volume/v2/test_backup.py
@@ -26,6 +26,55 @@ class TestBackup(volume_fakes.TestVolume):
 
         self.backups_mock = self.app.client_manager.volume.backups
         self.backups_mock.reset_mock()
+        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock.reset_mock()
+        self.restores_mock = self.app.client_manager.volume.restores
+        self.restores_mock.reset_mock()
+
+
+class TestBackupCreate(TestBackup):
+    def setUp(self):
+        super(TestBackupCreate, self).setUp()
+
+        self.volumes_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.VOLUME),
+            loaded=True
+        )
+
+        self.backups_mock.create.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.BACKUP),
+            loaded=True
+        )
+        # Get the command object to test
+        self.cmd = backup.CreateBackup(self.app, None)
+
+    def test_backup_create(self):
+        arglist = [
+            volume_fakes.volume_id,
+            "--name", volume_fakes.backup_name,
+            "--description", volume_fakes.backup_description,
+            "--container", volume_fakes.backup_name
+        ]
+        verifylist = [
+            ("volume", volume_fakes.volume_id),
+            ("name", volume_fakes.backup_name),
+            ("description", volume_fakes.backup_description),
+            ("container", volume_fakes.backup_name)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.backups_mock.create.assert_called_with(
+            volume_fakes.volume_id,
+            container=volume_fakes.backup_name,
+            name=volume_fakes.backup_name,
+            description=volume_fakes.backup_description
+        )
+        self.assertEqual(columns, volume_fakes.BACKUP_columns)
+        self.assertEqual(data, volume_fakes.BACKUP_data)
 
 
 class TestBackupShow(TestBackup):
@@ -80,3 +129,101 @@ class TestBackupDelete(TestBackup):
 
         self.cmd.take_action(parsed_args)
         self.backups_mock.delete.assert_called_with(volume_fakes.backup_id)
+
+
+class TestBackupRestore(TestBackup):
+    def setUp(self):
+        super(TestBackupRestore, self).setUp()
+
+        self.backups_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.BACKUP),
+            loaded=True
+        )
+        self.volumes_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.VOLUME),
+            loaded=True
+        )
+        self.restores_mock.restore.return_value = None
+        # Get the command object to mock
+        self.cmd = backup.RestoreBackup(self.app, None)
+
+    def test_backup_restore(self):
+        arglist = [
+            volume_fakes.backup_id,
+            volume_fakes.volume_id
+        ]
+        verifylist = [
+            ("backup", volume_fakes.backup_id),
+            ("volume", volume_fakes.volume_id)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.restores_mock.restore.assert_called_with(volume_fakes.backup_id,
+                                                      volume_fakes.volume_id)
+
+
+class TestBackupList(TestBackup):
+    def setUp(self):
+        super(TestBackupList, self).setUp()
+
+        self.volumes_mock.list.return_value = [
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(volume_fakes.VOLUME),
+                loaded=True
+            )
+        ]
+        self.backups_mock.list.return_value = [
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(volume_fakes.BACKUP),
+                loaded=True
+            )
+        ]
+        # Get the command to test
+        self.cmd = backup.ListBackup(self.app, None)
+
+    def test_backup_list_without_options(self):
+        arglist = []
+        verifylist = [("long", False)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        collist = ['ID', 'Name', 'Description', 'Status', 'Size']
+        self.assertEqual(collist, columns)
+
+        datalist = ((
+            volume_fakes.backup_id,
+            volume_fakes.backup_name,
+            volume_fakes.backup_description,
+            volume_fakes.backup_status,
+            volume_fakes.backup_size
+        ),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_backup_list_with_options(self):
+        arglist = ["--long"]
+        verifylist = [("long", True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        collist = ['ID', 'Name', 'Description', 'Status', 'Size',
+                   'Availability Zone', 'Volume', 'Container']
+        self.assertEqual(collist, columns)
+
+        datalist = ((
+            volume_fakes.backup_id,
+            volume_fakes.backup_name,
+            volume_fakes.backup_description,
+            volume_fakes.backup_status,
+            volume_fakes.backup_size,
+            volume_fakes.volume_availability_zone,
+            volume_fakes.backup_volume_id,
+            volume_fakes.backup_container
+        ),)
+        self.assertEqual(datalist, tuple(data))