python-openstackclient 8.2.0__py3-none-any.whl → 9.0.0__py3-none-any.whl

openstackclient/tests/unit/network/v2/test_subnet.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib.cli import format_columns
@@ -266,19 +265,14 @@ class TestCreateSubnet(TestSubnet):
         self.domains_mock.get.return_value = self.domain
 
         # Mock SDK calls for all tests.
-        self.network_client.create_subnet = mock.Mock(
-            return_value=self._subnet
-        )
-        self.network_client.set_tags = mock.Mock(return_value=None)
-        self.network_client.find_network = mock.Mock(
-            return_value=self._network
-        )
-        self.network_client.find_segment = mock.Mock(
-            return_value=self._network_segment
-        )
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=self._subnet_pool
-        )
+        self.network_client.create_subnet.return_value = self._subnet
+
+        self.network_client.set_tags.return_value = None
+        self.network_client.find_network.return_value = self._network
+
+        self.network_client.find_segment.return_value = self._network_segment
+
+        self.network_client.find_subnet_pool.return_value = self._subnet_pool
 
     def test_create_no_options(self):
         arglist = []
@@ -333,7 +327,7 @@ class TestCreateSubnet(TestSubnet):
     def test_create_from_subnet_pool_options(self):
         # Mock SDK calls for this test.
         self.network_client.create_subnet.return_value = self._subnet_from_pool
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.set_tags.return_value = None
         self._network.id = self._subnet_from_pool.network_id
 
         arglist = [
@@ -721,7 +715,7 @@ class TestDeleteSubnet(TestSubnet):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_subnet = mock.Mock(return_value=None)
+        self.network_client.delete_subnet.return_value = None
 
         self.network_client.find_subnet = network_fakes.FakeSubnet.get_subnets(
             self._subnets
@@ -775,9 +769,7 @@ class TestDeleteSubnet(TestSubnet):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         find_mock_result = [self._subnets[0], exceptions.CommandError]
-        self.network_client.find_subnet = mock.Mock(
-            side_effect=find_mock_result
-        )
+        self.network_client.find_subnet.side_effect = find_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -855,7 +847,7 @@ class TestListSubnet(TestSubnet):
         # Get the command object to test
         self.cmd = subnet_v2.ListSubnet(self.app, None)
 
-        self.network_client.subnets = mock.Mock(return_value=self._subnet)
+        self.network_client.subnets.return_value = self._subnet
 
     def test_subnet_list_no_options(self):
         arglist = []
@@ -1019,7 +1011,7 @@ class TestListSubnet(TestSubnet):
 
     def test_subnet_list_network(self):
         network = network_fakes.create_one_network()
-        self.network_client.find_network = mock.Mock(return_value=network)
+        self.network_client.find_network.return_value = network
         arglist = [
             '--network',
             network.id,
@@ -1038,7 +1030,7 @@ class TestListSubnet(TestSubnet):
 
     def test_subnet_list_gateway(self):
         subnet = network_fakes.FakeSubnet.create_one_subnet()
-        self.network_client.find_network = mock.Mock(return_value=subnet)
+        self.network_client.find_network.return_value = subnet
         arglist = [
             '--gateway',
             subnet.gateway_ip,
@@ -1057,7 +1049,7 @@ class TestListSubnet(TestSubnet):
 
     def test_subnet_list_name(self):
         subnet = network_fakes.FakeSubnet.create_one_subnet()
-        self.network_client.find_network = mock.Mock(return_value=subnet)
+        self.network_client.find_network.return_value = subnet
         arglist = [
             '--name',
             subnet.name,
@@ -1076,7 +1068,7 @@ class TestListSubnet(TestSubnet):
 
     def test_subnet_list_subnet_range(self):
         subnet = network_fakes.FakeSubnet.create_one_subnet()
-        self.network_client.find_network = mock.Mock(return_value=subnet)
+        self.network_client.find_network.return_value = subnet
         arglist = [
             '--subnet-range',
             subnet.cidr,
@@ -1098,10 +1090,9 @@ class TestListSubnet(TestSubnet):
         subnet = network_fakes.FakeSubnet.create_one_subnet(
             {'subnetpool_id': subnet_pool.id}
         )
-        self.network_client.find_network = mock.Mock(return_value=subnet)
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=subnet_pool
-        )
+        self.network_client.find_network.return_value = subnet
+        self.network_client.find_subnet_pool.return_value = subnet_pool
+
         arglist = [
             '--subnet-pool',
             subnet_pool.name,
@@ -1123,10 +1114,9 @@ class TestListSubnet(TestSubnet):
         subnet = network_fakes.FakeSubnet.create_one_subnet(
             {'subnetpool_id': subnet_pool.id}
         )
-        self.network_client.find_network = mock.Mock(return_value=subnet)
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=subnet_pool
-        )
+        self.network_client.find_network.return_value = subnet
+        self.network_client.find_subnet_pool.return_value = subnet_pool
+
         arglist = [
             '--subnet-pool',
             subnet_pool.id,
@@ -1182,9 +1172,9 @@ class TestSetSubnet(TestSubnet):
 
     def setUp(self):
         super().setUp()
-        self.network_client.update_subnet = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
-        self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
+        self.network_client.update_subnet.return_value = None
+        self.network_client.set_tags.return_value = None
+        self.network_client.find_subnet.return_value = self._subnet
         self.cmd = subnet_v2.SetSubnet(self.app, None)
 
     def test_set_this(self):
@@ -1263,7 +1253,7 @@ class TestSetSubnet(TestSubnet):
                 'service_types': ["network:router_gateway"],
             }
         )
-        self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
+        self.network_client.find_subnet.return_value = _testsubnet
         arglist = [
             '--dns-nameserver',
             '10.0.0.2',
@@ -1329,7 +1319,7 @@ class TestSetSubnet(TestSubnet):
                 'dns_nameservers': ["10.0.0.1"],
             }
         )
-        self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
+        self.network_client.find_subnet.return_value = _testsubnet
         arglist = [
             '--host-route',
             'destination=10.30.30.30/24,gateway=10.30.30.1',
@@ -1379,7 +1369,7 @@ class TestSetSubnet(TestSubnet):
                 'dns_nameservers': ['10.0.0.1'],
             }
         )
-        self.network_client.find_subnet = mock.Mock(return_value=_testsubnet)
+        self.network_client.find_subnet.return_value = _testsubnet
         arglist = [
             '--no-host-route',
             '--no-allocation-pool',
@@ -1448,8 +1438,8 @@ class TestSetSubnet(TestSubnet):
                 'segment_id': None,
             }
         )
-        self.network_client.find_subnet = mock.Mock(return_value=_subnet)
-        self.network_client.find_segment = mock.Mock(return_value=_segment)
+        self.network_client.find_subnet.return_value = _subnet
+        self.network_client.find_segment.return_value = _segment
         arglist = ['--network-segment', _segment.id, _subnet.name]
         verifylist = [('network_segment', _segment.id)]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1514,7 +1504,7 @@ class TestShowSubnet(TestSubnet):
         # Get the command object to test
         self.cmd = subnet_v2.ShowSubnet(self.app, None)
 
-        self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
+        self.network_client.find_subnet.return_value = self._subnet
 
     def test_show_no_options(self):
         arglist = []
@@ -1572,11 +1562,10 @@ class TestUnsetSubnet(TestSubnet):
                 'tags': ['green', 'red'],
             }
         )
-        self.network_client.find_subnet = mock.Mock(
-            return_value=self._testsubnet
-        )
-        self.network_client.update_subnet = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.find_subnet.return_value = self._testsubnet
+
+        self.network_client.update_subnet.return_value = None
+        self.network_client.set_tags.return_value = None
         # Get the command object to test
         self.cmd = subnet_v2.UnsetSubnet(self.app, None)
 

openstackclient/tests/unit/network/v2/test_subnet_pool.py

@@ -10,7 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib.cli import format_columns
@@ -76,16 +75,15 @@ class TestCreateSubnetPool(TestSubnetPool):
     def setUp(self):
         super().setUp()
 
-        self.network_client.create_subnet_pool = mock.Mock(
-            return_value=self._subnet_pool
-        )
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.create_subnet_pool.return_value = self._subnet_pool
+
+        self.network_client.set_tags.return_value = None
 
         # Get the command object to test
         self.cmd = subnet_pool.CreateSubnetPool(self.app, None)
 
-        self.network_client.find_address_scope = mock.Mock(
-            return_value=self._address_scope
+        self.network_client.find_address_scope.return_value = (
+            self._address_scope
         )
 
         self.projects_mock.get.return_value = self.project
@@ -387,7 +385,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_subnet_pool = mock.Mock(return_value=None)
+        self.network_client.delete_subnet_pool.return_value = None
 
         self.network_client.find_subnet_pool = (
             network_fakes.FakeSubnetPool.get_subnet_pools(self._subnet_pools)
@@ -445,9 +443,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         find_mock_result = [self._subnet_pools[0], exceptions.CommandError]
-        self.network_client.find_subnet_pool = mock.Mock(
-            side_effect=find_mock_result
-        )
+        self.network_client.find_subnet_pool.side_effect = find_mock_result
 
         try:
             self.cmd.take_action(parsed_args)
@@ -514,9 +510,7 @@ class TestListSubnetPool(TestSubnetPool):
         # Get the command object to test
         self.cmd = subnet_pool.ListSubnetPool(self.app, None)
 
-        self.network_client.subnet_pools = mock.Mock(
-            return_value=self._subnet_pools
-        )
+        self.network_client.subnet_pools.return_value = self._subnet_pools
 
     def test_subnet_pool_list_no_option(self):
         arglist = []
@@ -653,7 +647,7 @@ class TestListSubnetPool(TestSubnetPool):
 
     def test_subnet_pool_list_name(self):
         subnet_pool = network_fakes.FakeSubnetPool.create_one_subnet_pool()
-        self.network_client.find_network = mock.Mock(return_value=subnet_pool)
+        self.network_client.find_network.return_value = subnet_pool
         arglist = [
             '--name',
             subnet_pool.name,
@@ -672,9 +666,8 @@ class TestListSubnetPool(TestSubnetPool):
 
     def test_subnet_pool_list_address_scope(self):
         addr_scope = network_fakes.create_one_address_scope()
-        self.network_client.find_address_scope = mock.Mock(
-            return_value=addr_scope
-        )
+        self.network_client.find_address_scope.return_value = addr_scope
+
         arglist = [
             '--address-scope',
             addr_scope.id,
@@ -734,15 +727,13 @@ class TestSetSubnetPool(TestSubnetPool):
     def setUp(self):
         super().setUp()
 
-        self.network_client.update_subnet_pool = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.update_subnet_pool.return_value = None
+        self.network_client.set_tags.return_value = None
 
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=self._subnet_pool
-        )
+        self.network_client.find_subnet_pool.return_value = self._subnet_pool
 
-        self.network_client.find_address_scope = mock.Mock(
-            return_value=self._address_scope
+        self.network_client.find_address_scope.return_value = (
+            self._address_scope
         )
 
         # Get the command object to test
@@ -1079,9 +1070,7 @@ class TestShowSubnetPool(TestSubnetPool):
     def setUp(self):
         super().setUp()
 
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=self._subnet_pool
-        )
+        self.network_client.find_subnet_pool.return_value = self._subnet_pool
 
         # Get the command object to test
         self.cmd = subnet_pool.ShowSubnetPool(self.app, None)
@@ -1122,11 +1111,10 @@ class TestUnsetSubnetPool(TestSubnetPool):
         self._subnetpool = network_fakes.FakeSubnetPool.create_one_subnet_pool(
             {'tags': ['green', 'red']}
         )
-        self.network_client.find_subnet_pool = mock.Mock(
-            return_value=self._subnetpool
-        )
-        self.network_client.update_subnet_pool = mock.Mock(return_value=None)
-        self.network_client.set_tags = mock.Mock(return_value=None)
+        self.network_client.find_subnet_pool.return_value = self._subnetpool
+
+        self.network_client.update_subnet_pool.return_value = None
+        self.network_client.set_tags.return_value = None
         # Get the command object to test
         self.cmd = subnet_pool.UnsetSubnetPool(self.app, None)
 

openstackclient/tests/unit/volume/test_find_resource.py

@@ -21,15 +21,6 @@ from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.tests.unit import utils as test_utils
-from openstackclient.volume import client  # noqa
-
-
-# Monkey patch for v1 cinderclient
-# NOTE(dtroyer): Do here because openstackclient.volume.client
-# doesn't do it until the client object is created now.
-volumes.Volume.NAME_ATTR = 'display_name'
-volume_snapshots.Snapshot.NAME_ATTR = 'display_name'
-
 
 ID = '1after909'
 NAME = 'PhilSpector'
@@ -42,14 +33,14 @@ class TestFindResourceVolumes(test_utils.TestCase):
         api.client = mock.Mock()
         api.client.get = mock.Mock()
         resp = mock.Mock()
-        body = {"volumes": [{"id": ID, 'display_name': NAME}]}
+        body = {"volumes": [{"id": ID, 'name': NAME}]}
         api.client.get.side_effect = [Exception("Not found"), (resp, body)]
         self.manager = volumes.VolumeManager(api)
 
     def test_find(self):
         result = utils.find_resource(self.manager, NAME)
         self.assertEqual(ID, result.id)
-        self.assertEqual(NAME, result.display_name)
+        self.assertEqual(NAME, result.name)
 
     def test_not_find(self):
         self.assertRaises(
@@ -67,14 +58,14 @@ class TestFindResourceVolumeSnapshots(test_utils.TestCase):
         api.client = mock.Mock()
         api.client.get = mock.Mock()
         resp = mock.Mock()
-        body = {"snapshots": [{"id": ID, 'display_name': NAME}]}
+        body = {"snapshots": [{"id": ID, 'name': NAME}]}
         api.client.get.side_effect = [Exception("Not found"), (resp, body)]
         self.manager = volume_snapshots.SnapshotManager(api)
 
     def test_find(self):
         result = utils.find_resource(self.manager, NAME)
         self.assertEqual(ID, result.id)
-        self.assertEqual(NAME, result.display_name)
+        self.assertEqual(NAME, result.name)
 
     def test_not_find(self):
         self.assertRaises(

openstackclient/tests/unit/volume/v2/test_consistency_group.py

@@ -129,7 +129,10 @@ class TestConsistencyGroupAddVolume(TestConsistencyGroup):
             utils, 'find_resource', side_effect=find_mock_result
         ) as find_mock:
             result = self.cmd.take_action(parsed_args)
-            mock_error.assert_called_with("1 of 2 volumes failed to add.")
+            mock_error.assert_called_with(
+                '%(result)s of %(total)s volumes failed to add.',
+                {'result': 1, 'total': 2},
+            )
             self.assertIsNone(result)
             find_mock.assert_any_call(
                 self.consistencygroups_mock, self._consistency_group.id
@@ -602,7 +605,10 @@ class TestConsistencyGroupRemoveVolume(TestConsistencyGroup):
             utils, 'find_resource', side_effect=find_mock_result
         ) as find_mock:
             result = self.cmd.take_action(parsed_args)
-            mock_error.assert_called_with("1 of 2 volumes failed to remove.")
+            mock_error.assert_called_with(
+                '%(result)s of %(total)s volumes failed to remove.',
+                {'result': 1, 'total': 2},
+            )
             self.assertIsNone(result)
             find_mock.assert_any_call(
                 self.consistencygroups_mock, self._consistency_group.id

openstackclient/tests/unit/volume/v2/test_volume.py

@@ -655,7 +655,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         arglist = [self.volumes[0].id]
         verifylist = [
             ("force", False),
-            ("purge", False),
+            ("cascade", False),
             ("volumes", [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -674,7 +674,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         arglist = [v.id for v in self.volumes]
         verifylist = [
             ('force', False),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', arglist),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -701,7 +701,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', False),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', [self.volumes[0].id, 'unexist_volume']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -732,7 +732,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', False),
-            ('purge', True),
+            ('cascade', True),
             ('volumes', [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -754,7 +754,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', True),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1618,7 +1618,8 @@ class TestVolumeSet(TestVolume):
         result = self.cmd.take_action(parsed_args)
         self.volumes_mock.retype.assert_not_called()
         mock_warning.assert_called_with(
-            "'--retype-policy' option will not work without '--type' option"
+            "'%s' option will not work without '--type' option",
+            '--retype-policy',
         )
         self.assertIsNone(result)
 

openstackclient/tests/unit/volume/v2/test_volume_backup.py

@@ -565,7 +565,9 @@ class TestBackupShow(volume_fakes.TestVolume):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_sdk_client.find_backup.assert_called_with(self.backup.id)
+        self.volume_sdk_client.find_backup.assert_called_with(
+            self.backup.id, ignore_missing=False
+        )
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/unit/volume/v3/test_volume.py

@@ -37,6 +37,7 @@ class TestVolumeCreate(volume_fakes.TestVolume):
     columns = (
         'attachments',
         'availability_zone',
+        'backup_id',
         'bootable',
         'cluster_name',
         'consistencygroup_id',
@@ -78,6 +79,7 @@ class TestVolumeCreate(volume_fakes.TestVolume):
         self.datalist = (
             self.volume.attachments,
             self.volume.availability_zone,
+            self.volume.backup_id,
             self.volume.is_bootable,
             self.volume.cluster_name,
             self.volume.consistency_group_id,
@@ -910,7 +912,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         arglist = [self.volumes[0].id]
         verifylist = [
             ("force", False),
-            ("purge", False),
+            ("cascade", False),
             ("volumes", [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -929,7 +931,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         arglist = [v.id for v in self.volumes]
         verifylist = [
             ('force', False),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', arglist),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -956,7 +958,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', False),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', [self.volumes[0].id, 'unexist_volume']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -987,7 +989,29 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', False),
-            ('purge', True),
+            ('cascade', True),
+            ('volumes', [self.volumes[0].id]),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.assertIsNone(result)
+
+        self.volume_sdk_client.find_volume.assert_called_once_with(
+            self.volumes[0].id, ignore_missing=False
+        )
+        self.volume_sdk_client.delete_volume.assert_called_once_with(
+            self.volumes[0].id, cascade=True, force=False
+        )
+
+    def test_volume_delete_with_cascade(self):
+        arglist = [
+            '--cascade',
+            self.volumes[0].id,
+        ]
+        verifylist = [
+            ('force', False),
+            ('cascade', True),
             ('volumes', [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1009,7 +1033,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         ]
         verifylist = [
             ('force', True),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1029,7 +1053,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         verifylist = [
             ("remote", True),
             ("force", False),
-            ("purge", False),
+            ("cascade", False),
             ("volumes", [self.volumes[0].id]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1050,7 +1074,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         verifylist = [
             ('remote', True),
             ('force', False),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', arglist[1:]),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1075,7 +1099,6 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         verifylist = [
             ('remote', True),
             ('force', False),
-            ('purge', True),
             ('volumes', [self.volumes[0].id]),
         ]
 
@@ -1084,7 +1107,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
         self.assertIn(
-            "The --force and --purge options are not supported with the "
+            "The --force and --cascade options are not supported with the "
             "--remote parameter.",
             str(exc),
         )
@@ -1102,7 +1125,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
         verifylist = [
             ('remote', True),
             ('force', True),
-            ('purge', False),
+            ('cascade', False),
             ('volumes', [self.volumes[0].id]),
         ]
 
@@ -1111,7 +1134,7 @@ class TestVolumeDelete(volume_fakes.TestVolume):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
         self.assertIn(
-            "The --force and --purge options are not supported with the "
+            "The --force and --cascade options are not supported with the "
             "--remote parameter.",
             str(exc),
         )
@@ -1996,7 +2019,8 @@ class TestVolumeSet(volume_fakes.TestVolume):
         result = self.cmd.take_action(parsed_args)
         self.volumes_mock.retype.assert_not_called()
         mock_warning.assert_called_with(
-            "'--retype-policy' option will not work without '--type' option"
+            "'%s' option will not work without '--type' option",
+            '--retype-policy',
         )
         self.assertIsNone(result)
 
@@ -2011,6 +2035,7 @@ class TestVolumeShow(volume_fakes.TestVolume):
         self.columns = (
             'attachments',
             'availability_zone',
+            'backup_id',
             'bootable',
             'cluster_name',
             'consistencygroup_id',
@@ -2045,6 +2070,7 @@ class TestVolumeShow(volume_fakes.TestVolume):
         self.data = (
             self.volume.attachments,
             self.volume.availability_zone,
+            self.volume.backup_id,
             self.volume.is_bootable,
             self.volume.cluster_name,
             self.volume.consistency_group_id,