Add support for volume snapshot v2 command

openstack snapshot create
openstack snapshot set
openstack snapshot unset
openstack snapshot list

Implements: blueprint volume-v2
Change-Id: Ia1d9f4426baa0099281a9931f4eec99ebe1969b1

2 files changed, 194 insertions, 4 deletions

diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index 3eade391..155ccae8 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -12,6 +12,7 @@
 #   under the License.
 #
 
+import copy
 import mock
 
 from openstackclient.tests import fakes
@@ -62,11 +63,17 @@ SNAPSHOT = {
     "name": snapshot_name,
     "description": snapshot_description,
     "size": snapshot_size,
-    "metadata": snapshot_metadata
+    "status": "available",
+    "metadata": snapshot_metadata,
+    "created_at": "2015-06-03T18:49:19.000000",
+    "volume_id": volume_name
 }
-
-SNAPSHOT_columns = tuple(sorted(SNAPSHOT))
-SNAPSHOT_data = tuple((SNAPSHOT[x] for x in sorted(SNAPSHOT)))
+EXPECTED_SNAPSHOT = copy.deepcopy(SNAPSHOT)
+EXPECTED_SNAPSHOT.pop("metadata")
+EXPECTED_SNAPSHOT['properties'] = "foo='bar'"
+SNAPSHOT_columns = tuple(sorted(EXPECTED_SNAPSHOT))
+SNAPSHOT_data = tuple((EXPECTED_SNAPSHOT[x]
+                       for x in sorted(EXPECTED_SNAPSHOT)))
 
 
 type_id = "5520dc9e-6f9b-4378-a719-729911c0f407"
diff --git a/openstackclient/tests/volume/v2/test_snapshot.py b/openstackclient/tests/volume/v2/test_snapshot.py
index 91015410..3ceb57fa 100644
--- a/openstackclient/tests/volume/v2/test_snapshot.py
+++ b/openstackclient/tests/volume/v2/test_snapshot.py
@@ -26,6 +26,53 @@ class TestSnapshot(volume_fakes.TestVolume):
 
         self.snapshots_mock = self.app.client_manager.volume.volume_snapshots
         self.snapshots_mock.reset_mock()
+        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock.reset_mock()
+
+
+class TestSnapshotCreate(TestSnapshot):
+    def setUp(self):
+        super(TestSnapshotCreate, self).setUp()
+
+        self.volumes_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.VOLUME),
+            loaded=True
+        )
+
+        self.snapshots_mock.create.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.SNAPSHOT),
+            loaded=True
+        )
+        # Get the command object to test
+        self.cmd = snapshot.CreateSnapshot(self.app, None)
+
+    def test_snapshot_create(self):
+        arglist = [
+            volume_fakes.volume_id,
+            "--name", volume_fakes.snapshot_name,
+            "--description", volume_fakes.snapshot_description,
+            "--force"
+        ]
+        verifylist = [
+            ("volume", volume_fakes.volume_id),
+            ("name", volume_fakes.snapshot_name),
+            ("description", volume_fakes.snapshot_description),
+            ("force", True)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.snapshots_mock.create.assert_called_with(
+            volume_fakes.volume_id,
+            force=True,
+            name=volume_fakes.snapshot_name,
+            description=volume_fakes.snapshot_description
+        )
+        self.assertEqual(columns, volume_fakes.SNAPSHOT_columns)
+        self.assertEqual(data, volume_fakes.SNAPSHOT_data)
 
 
 class TestSnapshotShow(TestSnapshot):
@@ -80,3 +127,139 @@ class TestSnapshotDelete(TestSnapshot):
 
         self.cmd.take_action(parsed_args)
         self.snapshots_mock.delete.assert_called_with(volume_fakes.snapshot_id)
+
+
+class TestSnapshotSet(TestSnapshot):
+    def setUp(self):
+        super(TestSnapshotSet, self).setUp()
+
+        self.snapshots_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.SNAPSHOT),
+            loaded=True
+        )
+        self.snapshots_mock.set_metadata.return_value = None
+        self.snapshots_mock.update.return_value = None
+        # Get the command object to mock
+        self.cmd = snapshot.SetSnapshot(self.app, None)
+
+    def test_snapshot_set(self):
+        arglist = [
+            volume_fakes.snapshot_id,
+            "--name", "new_snapshot",
+            "--property", "x=y",
+            "--property", "foo=foo"
+        ]
+        new_property = {"x": "y", "foo": "foo"}
+        verifylist = [
+            ("snapshot", volume_fakes.snapshot_id),
+            ("name", "new_snapshot"),
+            ("property", new_property)
+        ]
+
+        kwargs = {
+            "name": "new_snapshot",
+        }
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.snapshots_mock.update.assert_called_with(
+            volume_fakes.snapshot_id, **kwargs)
+        self.snapshots_mock.set_metadata.assert_called_with(
+            volume_fakes.snapshot_id, new_property
+        )
+
+
+class TestSnapshotUnset(TestSnapshot):
+    def setUp(self):
+        super(TestSnapshotUnset, self).setUp()
+
+        self.snapshots_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.SNAPSHOT),
+            loaded=True
+        )
+        self.snapshots_mock.delete_metadata.return_value = None
+        # Get the command object to mock
+        self.cmd = snapshot.UnsetSnapshot(self.app, None)
+
+    def test_snapshot_unset(self):
+        arglist = [
+            volume_fakes.snapshot_id,
+            "--property", "foo"
+        ]
+        verifylist = [
+            ("snapshot", volume_fakes.snapshot_id),
+            ("property", ["foo"])
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.snapshots_mock.delete_metadata.assert_called_with(
+            volume_fakes.snapshot_id, ["foo"]
+        )
+
+
+class TestSnapshotList(TestSnapshot):
+    def setUp(self):
+        super(TestSnapshotList, self).setUp()
+
+        self.volumes_mock.list.return_value = [
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(volume_fakes.VOLUME),
+                loaded=True
+            )
+        ]
+        self.snapshots_mock.list.return_value = [
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(volume_fakes.SNAPSHOT),
+                loaded=True
+            )
+        ]
+        # Get the command to test
+        self.cmd = snapshot.ListSnapshot(self.app, None)
+
+    def test_snapshot_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.snapshot_id,
+            volume_fakes.snapshot_name,
+            volume_fakes.snapshot_description,
+            "available",
+            volume_fakes.snapshot_size
+            ),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_snapshot_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", "Created At",
+                   "Volume", "Properties"]
+        self.assertEqual(collist, columns)
+
+        datalist = ((
+            volume_fakes.snapshot_id,
+            volume_fakes.snapshot_name,
+            volume_fakes.snapshot_description,
+            "available",
+            volume_fakes.snapshot_size,
+            "2015-06-03T18:49:19.000000",
+            volume_fakes.volume_name,
+            volume_fakes.EXPECTED_SNAPSHOT.get("properties")
+        ),)
+        self.assertEqual(datalist, tuple(data))