openstack
diff --git a/‎openstackclient/tests/unit/volume/v2/test_volume_snapshot.py‎
Lines changed: 79 additions & 73 deletions b/‎openstackclient/tests/unit/volume/v2/test_volume_snapshot.py‎
Lines changed: 79 additions & 73 deletions
@@ -519,16 +519,18 @@ def test_snapshot_list_negative_limit(self):
         )
 
 
-class TestVolumeSnapshotSet(TestVolumeSnapshot):
-    snapshot = volume_fakes.create_one_snapshot()
-
+class TestVolumeSnapshotSet(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.snapshots_mock.get.return_value = self.snapshot
-        self.snapshots_mock.set_metadata.return_value = None
-        self.snapshots_mock.update.return_value = None
-        # Get the command object to mock
+        self.snapshot = sdk_fakes.generate_fake_resource(
+            _snapshot.Snapshot, metadata={'foo': 'bar'}
+        )
+        self.volume_sdk_client.find_snapshot.return_value = self.snapshot
+        self.volume_sdk_client.delete_snapshot_metadata.return_value = None
+        self.volume_sdk_client.set_snapshot_metadata.return_value = None
+        self.volume_sdk_client.update_snapshot.return_value = None
+
         self.cmd = volume_snapshot.SetVolumeSnapshot(self.app, None)
 
     def test_snapshot_set_no_option(self):
@@ -541,11 +543,14 @@ def test_snapshot_set_no_option(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.snapshots_mock.get.assert_called_once_with(parsed_args.snapshot)
-        self.assertNotCalled(self.snapshots_mock.reset_state)
-        self.assertNotCalled(self.snapshots_mock.update)
-        self.assertNotCalled(self.snapshots_mock.set_metadata)
+
         self.assertIsNone(result)
+        self.volume_sdk_client.find_snapshot.assert_called_once_with(
+            parsed_args.snapshot, ignore_missing=False
+        )
+        self.volume_sdk_client.reset_snapshot_status.assert_not_called()
+        self.volume_sdk_client.update_snapshot.assert_not_called()
+        self.volume_sdk_client.set_snapshot_metadata.assert_not_called()
 
     def test_snapshot_set_name_and_property(self):
         arglist = [
@@ -557,26 +562,22 @@ def test_snapshot_set_name_and_property(self):
             "foo=foo",
             self.snapshot.id,
         ]
-        new_property = {"x": "y", "foo": "foo"}
         verifylist = [
             ("name", "new_snapshot"),
-            ("property", new_property),
+            ("properties", {"x": "y", "foo": "foo"}),
             ("snapshot", self.snapshot.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
 
-        kwargs = {
-            "name": "new_snapshot",
-        }
-        self.snapshots_mock.update.assert_called_with(
-            self.snapshot.id, **kwargs
+        self.assertIsNone(result)
+        self.volume_sdk_client.update_snapshot.assert_called_with(
+            self.snapshot.id, name="new_snapshot"
         )
-        self.snapshots_mock.set_metadata.assert_called_with(
-            self.snapshot.id, new_property
+        self.volume_sdk_client.set_snapshot_metadata.assert_called_with(
+            self.snapshot.id, x="y", foo="foo"
         )
-        self.assertIsNone(result)
 
     def test_snapshot_set_with_no_property(self):
         arglist = [
@@ -590,14 +591,17 @@ def test_snapshot_set_with_no_property(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.snapshots_mock.get.assert_called_once_with(parsed_args.snapshot)
-        self.assertNotCalled(self.snapshots_mock.reset_state)
-        self.assertNotCalled(self.snapshots_mock.update)
-        self.assertNotCalled(self.snapshots_mock.set_metadata)
-        self.snapshots_mock.delete_metadata.assert_called_with(
-            self.snapshot.id, ["foo"]
-        )
+
         self.assertIsNone(result)
+        self.volume_sdk_client.find_snapshot.assert_called_once_with(
+            parsed_args.snapshot, ignore_missing=False
+        )
+        self.volume_sdk_client.reset_snapshot_status.assert_not_called()
+        self.volume_sdk_client.update_snapshot.assert_not_called()
+        self.volume_sdk_client.set_snapshot_metadata.assert_not_called()
+        self.volume_sdk_client.delete_snapshot_metadata.assert_called_with(
+            self.snapshot.id, keys=["foo"]
+        )
 
     def test_snapshot_set_with_no_property_and_property(self):
         arglist = [
@@ -608,22 +612,26 @@ def test_snapshot_set_with_no_property_and_property(self):
         ]
         verifylist = [
             ("no_property", True),
-            ("property", {"foo_1": "bar_1"}),
+            ("properties", {"foo_1": "bar_1"}),
             ("snapshot", self.snapshot.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.snapshots_mock.get.assert_called_once_with(parsed_args.snapshot)
-        self.assertNotCalled(self.snapshots_mock.reset_state)
-        self.assertNotCalled(self.snapshots_mock.update)
-        self.snapshots_mock.delete_metadata.assert_called_with(
-            self.snapshot.id, ["foo"]
+
+        self.assertIsNone(result)
+        self.volume_sdk_client.find_snapshot.assert_called_once_with(
+            parsed_args.snapshot, ignore_missing=False
         )
-        self.snapshots_mock.set_metadata.assert_called_once_with(
-            self.snapshot.id, {"foo_1": "bar_1"}
+        self.volume_sdk_client.reset_snapshot_status.assert_not_called()
+        self.volume_sdk_client.update_snapshot.assert_not_called()
+        self.volume_sdk_client.delete_snapshot_metadata.assert_called_with(
+            self.snapshot.id, keys=["foo"]
+        )
+        self.volume_sdk_client.set_snapshot_metadata.assert_called_once_with(
+            self.snapshot.id,
+            foo_1="bar_1",
         )
-        self.assertIsNone(result)
 
     def test_snapshot_set_state_to_error(self):
         arglist = ["--state", "error", self.snapshot.id]
@@ -632,30 +640,32 @@ def test_snapshot_set_state_to_error(self):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.snapshots_mock.reset_state.assert_called_with(
+        self.assertIsNone(result)
+        self.volume_sdk_client.reset_snapshot_status.assert_called_with(
             self.snapshot.id, "error"
         )
-        self.assertIsNone(result)
 
     def test_volume_set_state_failed(self):
-        self.snapshots_mock.reset_state.side_effect = exceptions.CommandError()
+        self.volume_sdk_client.reset_snapshot_status.side_effect = (
+            exceptions.CommandError()
+        )
         arglist = ['--state', 'error', self.snapshot.id]
         verifylist = [('state', 'error'), ('snapshot', self.snapshot.id)]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        try:
-            self.cmd.take_action(parsed_args)
-            self.fail('CommandError should be raised.')
-        except exceptions.CommandError as e:
-            self.assertEqual(
-                'One or more of the set operations failed', str(e)
-            )
-        self.snapshots_mock.reset_state.assert_called_once_with(
+
+        exc = self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+        self.assertEqual('One or more of the set operations failed', str(exc))
+        self.volume_sdk_client.reset_snapshot_status.assert_called_once_with(
             self.snapshot.id, 'error'
         )
 
     def test_volume_set_name_and_state_failed(self):
-        self.snapshots_mock.reset_state.side_effect = exceptions.CommandError()
+        self.volume_sdk_client.reset_snapshot_status.side_effect = (
+            exceptions.CommandError()
+        )
         arglist = [
             '--state',
             'error',
@@ -668,22 +678,19 @@ def test_volume_set_name_and_state_failed(self):
             ("name", "new_snapshot"),
             ('snapshot', self.snapshot.id),
         ]
-
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        try:
-            self.cmd.take_action(parsed_args)
-            self.fail('CommandError should be raised.')
-        except exceptions.CommandError as e:
-            self.assertEqual(
-                'One or more of the set operations failed', str(e)
-            )
-        kwargs = {
-            "name": "new_snapshot",
-        }
-        self.snapshots_mock.update.assert_called_once_with(
-            self.snapshot.id, **kwargs
+
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+        self.assertEqual('One or more of the set operations failed', str(exc))
+        self.volume_sdk_client.update_snapshot.assert_called_once_with(
+            self.snapshot.id, name="new_snapshot"
         )
-        self.snapshots_mock.reset_state.assert_called_once_with(
+        self.volume_sdk_client.reset_snapshot_status.assert_called_once_with(
             self.snapshot.id, 'error'
         )
 
@@ -732,15 +739,14 @@ def test_snapshot_show(self):
         self.assertCountEqual(self.data, data)
 
 
-class TestVolumeSnapshotUnset(TestVolumeSnapshot):
-    snapshot = volume_fakes.create_one_snapshot()
-
+class TestVolumeSnapshotUnset(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.snapshots_mock.get.return_value = self.snapshot
-        self.snapshots_mock.delete_metadata.return_value = None
-        # Get the command object to mock
+        self.snapshot = sdk_fakes.generate_fake_resource(_snapshot.Snapshot)
+        self.volume_sdk_client.find_snapshot.return_value = self.snapshot
+        self.volume_sdk_client.delete_snapshot_metadata.return_value = None
+
         self.cmd = volume_snapshot.UnsetVolumeSnapshot(self.app, None)
 
     def test_snapshot_unset(self):
@@ -750,15 +756,15 @@ def test_snapshot_unset(self):
             self.snapshot.id,
         ]
         verifylist = [
-            ("property", ["foo"]),
+            ("properties", ["foo"]),
             ("snapshot", self.snapshot.id),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
 
-        self.snapshots_mock.delete_metadata.assert_called_with(
-            self.snapshot.id, ["foo"]
-        )
         self.assertIsNone(result)
+        self.volume_sdk_client.delete_snapshot_metadata.assert_called_with(
+            self.snapshot.id, keys=["foo"]
+        )