python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/unit/compute/v2/test_server.py

@@ -11,8 +11,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
-import argparse
+
 import collections
 import copy
 import getpass
@@ -33,11 +32,11 @@ from openstackclient.compute.v2 import server
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
-from openstackclient.tests.unit import utils
-from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
+from openstackclient.tests.unit import utils as test_utils
+from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
-class TestPowerStateColumn(utils.TestCase):
+class TestPowerStateColumn(test_utils.TestCase):
     def test_human_readable(self):
         self.assertEqual(
             'NOSTATE', server.PowerStateColumn(0x00).human_readable()
@@ -67,40 +66,31 @@ class TestServer(compute_fakes.TestComputev2):
         super(TestServer, self).setUp()
 
         # Get a shortcut to the compute client ServerManager Mock
-        self.servers_mock = self.app.client_manager.compute.servers
+        self.servers_mock = self.compute_client.servers
         self.servers_mock.reset_mock()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-
         # Get a shortcut to the compute client ServerMigrationsManager Mock
-        self.server_migrations_mock = (
-            self.app.client_manager.compute.server_migrations
-        )
+        self.server_migrations_mock = self.compute_client.server_migrations
         self.server_migrations_mock.reset_mock()
 
         # Get a shortcut to the compute client VolumeManager mock
-        self.servers_volumes_mock = self.app.client_manager.compute.volumes
+        self.servers_volumes_mock = self.compute_client.volumes
         self.servers_volumes_mock.reset_mock()
 
         # Get a shortcut to the compute client MigrationManager mock
-        self.migrations_mock = self.app.client_manager.compute.migrations
+        self.migrations_mock = self.compute_client.migrations
         self.migrations_mock.reset_mock()
 
         # Get a shortcut to the compute client FlavorManager Mock
-        self.flavors_mock = self.app.client_manager.compute.flavors
+        self.flavors_mock = self.compute_client.flavors
         self.flavors_mock.reset_mock()
 
         # Get a shortcut to the volume client VolumeManager Mock
-        self.volumes_mock = self.app.client_manager.volume.volumes
+        self.volumes_mock = self.volume_client.volumes
         self.volumes_mock.reset_mock()
 
-        self.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.sdk_volume_client = self.app.client_manager.sdk_connection.volume
-
         # Get a shortcut to the volume client VolumeManager Mock
-        self.snapshots_mock = self.app.client_manager.volume.volume_snapshots
+        self.snapshots_mock = self.volume_client.volume_snapshots
         self.snapshots_mock.reset_mock()
 
         # Set object attributes to be tested. Could be overwritten in subclass.
@@ -115,7 +105,7 @@ class TestServer(compute_fakes.TestComputev2):
         self.addCleanup(patcher.stop)
         self.supports_microversion_mock = patcher.start()
         self._set_mock_microversion(
-            self.app.client_manager.compute.api_version.get_string()
+            self.compute_client.api_version.get_string()
         )
 
     def _set_mock_microversion(self, mock_v):
@@ -155,7 +145,7 @@ class TestServer(compute_fakes.TestComputev2):
         )
 
         # This is the return value for compute_client.find_server()
-        self.sdk_client.find_server.side_effect = servers
+        self.compute_sdk_client.find_server.side_effect = servers
 
         return servers
 
@@ -163,7 +153,7 @@ class TestServer(compute_fakes.TestComputev2):
         volumes = volume_fakes.create_sdk_volumes(count=count)
 
         # This is the return value for volume_client.find_volume()
-        self.sdk_volume_client.find_volume.side_effect = volumes
+        self.volume_sdk_client.find_volume.side_effect = volumes
 
         return volumes
 
@@ -179,7 +169,7 @@ class TestServer(compute_fakes.TestComputev2):
         result = self.cmd.take_action(parsed_args)
 
         calls = [call(s.id) for s in servers]
-        method = getattr(self.sdk_client, method_name)
+        method = getattr(self.compute_sdk_client, method_name)
         method.assert_has_calls(calls)
         self.assertIsNone(result)
 
@@ -237,7 +227,9 @@ class TestServerAddFixedIP(TestServer):
         servers = self.setup_sdk_servers_mock(count=1)
         network = compute_fakes.create_one_network()
         interface = compute_fakes.create_one_server_interface()
-        self.sdk_client.create_server_interface.return_value = interface
+        self.compute_sdk_client.create_server_interface.return_value = (
+            interface
+        )
 
         with mock.patch.object(
             self.app.client_manager,
@@ -272,7 +264,7 @@ class TestServerAddFixedIP(TestServer):
 
             self.assertEqual(expected_columns, columns)
             self.assertEqual(expected_data, tuple(data))
-            self.sdk_client.create_server_interface.assert_called_once_with(
+            self.compute_sdk_client.create_server_interface.assert_called_once_with(
                 servers[0].id, net_id=network['id']
             )
 
@@ -283,7 +275,9 @@ class TestServerAddFixedIP(TestServer):
         servers = self.setup_sdk_servers_mock(count=1)
         network = compute_fakes.create_one_network()
         interface = compute_fakes.create_one_server_interface()
-        self.sdk_client.create_server_interface.return_value = interface
+        self.compute_sdk_client.create_server_interface.return_value = (
+            interface
+        )
 
         with mock.patch.object(
             self.app.client_manager,
@@ -324,7 +318,7 @@ class TestServerAddFixedIP(TestServer):
 
             self.assertEqual(expected_columns, columns)
             self.assertEqual(expected_data, tuple(data))
-            self.sdk_client.create_server_interface.assert_called_once_with(
+            self.compute_sdk_client.create_server_interface.assert_called_once_with(
                 servers[0].id,
                 net_id=network['id'],
                 fixed_ips=[{'ip_address': '5.6.7.8'}],
@@ -337,7 +331,9 @@ class TestServerAddFixedIP(TestServer):
         servers = self.setup_sdk_servers_mock(count=1)
         network = compute_fakes.create_one_network()
         interface = compute_fakes.create_one_server_interface()
-        self.sdk_client.create_server_interface.return_value = interface
+        self.compute_sdk_client.create_server_interface.return_value = (
+            interface
+        )
 
         with mock.patch.object(
             self.app.client_manager,
@@ -383,7 +379,7 @@ class TestServerAddFixedIP(TestServer):
 
             self.assertEqual(expected_columns, columns)
             self.assertEqual(expected_data, tuple(data))
-            self.sdk_client.create_server_interface.assert_called_once_with(
+            self.compute_sdk_client.create_server_interface.assert_called_once_with(
                 servers[0].id,
                 net_id=network['id'],
                 fixed_ips=[{'ip_address': '5.6.7.8'}],
@@ -397,7 +393,9 @@ class TestServerAddFixedIP(TestServer):
         servers = self.setup_sdk_servers_mock(count=1)
         network = compute_fakes.create_one_network()
         interface = compute_fakes.create_one_server_interface()
-        self.sdk_client.create_server_interface.return_value = interface
+        self.compute_sdk_client.create_server_interface.return_value = (
+            interface
+        )
 
         with mock.patch.object(
             self.app.client_manager,
@@ -443,7 +441,7 @@ class TestServerAddFixedIP(TestServer):
 
             self.assertEqual(expected_columns, columns)
             self.assertEqual(expected_data, tuple(data))
-            self.sdk_client.create_server_interface.assert_called_once_with(
+            self.compute_sdk_client.create_server_interface.assert_called_once_with(
                 servers[0].id,
                 net_id=network['id'],
                 fixed_ips=[{'ip_address': '5.6.7.8'}],
@@ -749,7 +747,7 @@ class TestServerAddPort(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_server_interface.assert_called_once_with(
+        self.compute_sdk_client.create_server_interface.assert_called_once_with(
             servers[0], port_id=port_id
         )
         self.assertIsNone(result)
@@ -767,10 +765,6 @@ class TestServerAddPort(TestServer):
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_server_add_port_with_tag(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.49'
-        )
-
         servers = self.setup_sdk_servers_mock(count=1)
         self.find_port.return_value.id = 'fake-port'
         arglist = [
@@ -789,16 +783,12 @@ class TestServerAddPort(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.create_server_interface.assert_called_once_with(
+        self.compute_sdk_client.create_server_interface.assert_called_once_with(
             servers[0], port_id='fake-port', tag='tag1'
         )
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
     def test_server_add_port_with_tag_pre_v249(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.48'
-        )
-
         servers = self.setup_servers_mock(count=1)
         self.find_port.return_value.id = 'fake-port'
         arglist = [
@@ -841,7 +831,7 @@ class TestServerVolume(TestServer):
             attrs=attrs
         )
 
-        self.sdk_client.create_volume_attachment.return_value = (
+        self.compute_sdk_client.create_volume_attachment.return_value = (
             self.volume_attachment
         )
 
@@ -881,7 +871,7 @@ class TestServerAddVolume(TestServerVolume):
 
         self.assertEqual(expected_columns, columns)
         self.assertEqual(expected_data, data)
-        self.sdk_client.create_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
             self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb'
         )
 
@@ -924,7 +914,7 @@ class TestServerAddVolume(TestServerVolume):
 
         self.assertEqual(expected_columns, columns)
         self.assertEqual(expected_data, data)
-        self.sdk_client.create_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
             self.servers[0],
             volumeId=self.volumes[0].id,
             device='/dev/sdb',
@@ -995,7 +985,7 @@ class TestServerAddVolume(TestServerVolume):
         columns, data = self.cmd.take_action(parsed_args)
         self.assertEqual(expected_columns, columns)
         self.assertEqual(expected_data, data)
-        self.sdk_client.create_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
             self.servers[0],
             volumeId=self.volumes[0].id,
             device='/dev/sdb',
@@ -1046,7 +1036,7 @@ class TestServerAddVolume(TestServerVolume):
 
         self.assertEqual(expected_columns, columns)
         self.assertEqual(expected_data, data)
-        self.sdk_client.create_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
             self.servers[0],
             volumeId=self.volumes[0].id,
             device='/dev/sdb',
@@ -1137,7 +1127,7 @@ class TestServerAddVolume(TestServerVolume):
             ('disable_delete_on_termination', True),
         ]
         ex = self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1173,7 +1163,7 @@ class TestServerRemoveVolume(TestServerVolume):
         result = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(result)
-        self.sdk_client.delete_volume_attachment.assert_called_once_with(
+        self.compute_sdk_client.delete_volume_attachment.assert_called_once_with(
             self.volumes[0],
             self.servers[0],
             ignore_missing=False,
@@ -1208,7 +1198,7 @@ class TestServerAddNetwork(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.create_server_interface.assert_called_once_with(
+        self.compute_sdk_client.create_server_interface.assert_called_once_with(
             servers[0], net_id=net_id
         )
         self.assertIsNone(result)
@@ -1226,10 +1216,6 @@ class TestServerAddNetwork(TestServer):
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
     def test_server_add_network_with_tag(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.49'
-        )
-
         servers = self.setup_sdk_servers_mock(count=1)
         self.find_network.return_value.id = 'fake-network'
 
@@ -1249,16 +1235,12 @@ class TestServerAddNetwork(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.create_server_interface.assert_called_once_with(
+        self.compute_sdk_client.create_server_interface.assert_called_once_with(
             servers[0], net_id='fake-network', tag='tag1'
         )
 
     @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
     def test_server_add_network_with_tag_pre_v249(self, sm_mock):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.48'
-        )
-
         servers = self.setup_sdk_servers_mock(count=1)
         self.find_network.return_value.id = 'fake-network'
 
@@ -1331,7 +1313,6 @@ class TestServerCreate(TestServer):
         'id',
         'image',
         'name',
-        'networks',
         'properties',
     )
 
@@ -1345,7 +1326,6 @@ class TestServerCreate(TestServer):
             self.new_server.id,
             self.image.name + ' (' + self.new_server.image.get('id') + ')',
             self.new_server.name,
-            self.new_server.networks,
             format_columns.DictColumn(self.new_server.metadata),
         )
         return datalist
@@ -1390,7 +1370,7 @@ class TestServerCreate(TestServer):
         ]
 
         self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -1464,6 +1444,8 @@ class TestServerCreate(TestServer):
             'a=b',
             '--hint',
             'a=c',
+            '--server-group',
+            'servergroup',
             self.new_server.name,
         ]
         verifylist = [
@@ -1472,22 +1454,26 @@ class TestServerCreate(TestServer):
             ('key_name', 'keyname'),
             ('properties', {'Beta': 'b'}),
             ('security_group', ['securitygroup']),
-            ('hint', {'a': ['b', 'c']}),
+            ('hints', {'a': ['b', 'c']}),
+            ('server_group', 'servergroup'),
             ('config_drive', True),
             ('password', 'passw0rd'),
             ('server_name', self.new_server.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
+        fake_server_group = compute_fakes.create_one_server_group()
+        self.compute_client.server_groups.get.return_value = fake_server_group
+
         fake_sg = network_fakes.FakeSecurityGroup.create_security_groups()
         mock_find_sg = network_fakes.FakeSecurityGroup.get_security_groups(
             fake_sg
         )
         self.app.client_manager.network.find_security_group = mock_find_sg
 
+        # In base command class ShowOne in cliff, abstract method take_action()
+        # returns a two-part tuple with a tuple of column names and a tuple of
+        # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
         mock_find_sg.assert_called_once_with(
@@ -1507,7 +1493,7 @@ class TestServerCreate(TestServer):
             admin_pass='passw0rd',
             block_device_mapping_v2=[],
             nics=[],
-            scheduler_hints={'a': ['b', 'c']},
+            scheduler_hints={'a': ['b', 'c'], 'group': fake_server_group.id},
             config_drive=True,
         )
         # ServerManager.create(name, image, flavor, **kwargs)
@@ -1582,7 +1568,7 @@ class TestServerCreate(TestServer):
             return_value=False,
         ):
             with mock.patch.object(
-                self.app.client_manager.compute.api,
+                self.compute_client.api,
                 'security_group_find',
                 return_value={'name': 'fake_sg'},
             ) as mock_find:
@@ -1788,9 +1774,7 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.datalist(), data)
 
     def test_server_create_with_network_tag(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.43'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.43')
 
         arglist = [
             '--image',
@@ -1866,9 +1850,7 @@ class TestServerCreate(TestServer):
         self.app.client_manager.network.find_network.assert_called_once()
 
     def test_server_create_with_network_tag_pre_v243(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.42'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.42')
 
         arglist = [
             '--image',
@@ -1904,9 +1886,7 @@ class TestServerCreate(TestServer):
 
     def _test_server_create_with_auto_network(self, arglist):
         # requires API microversion 2.37 or later
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.37'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.37')
 
         verifylist = [
             ('image', 'image1'),
@@ -1972,9 +1952,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_auto_network_pre_v237(self):
         # use an API microversion that's too old
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.36'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.36')
 
         arglist = [
             '--image',
@@ -2010,9 +1988,7 @@ class TestServerCreate(TestServer):
     def test_server_create_with_auto_network_default_v2_37(self):
         """Tests creating a server without specifying --nic using 2.37."""
         # requires API microversion 2.37 or later
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.37'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.37')
 
         arglist = [
             '--image',
@@ -2058,9 +2034,7 @@ class TestServerCreate(TestServer):
 
     def _test_server_create_with_none_network(self, arglist):
         # requires API microversion 2.37 or later
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.37'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.37')
 
         verifylist = [
             ('image', 'image1'),
@@ -2126,9 +2100,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_none_network_pre_v237(self):
         # use an API microversion that's too old
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.36'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.36')
 
         arglist = [
             '--image',
@@ -2224,7 +2196,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2243,7 +2215,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2262,7 +2234,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2281,7 +2253,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -2336,7 +2308,7 @@ class TestServerCreate(TestServer):
             self.new_server.name, self.image, self.flavor, **kwargs
         )
         self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist(), data)
+        self.assertTupleEqual(self.datalist(), data)
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=False)
     def test_server_create_with_wait_fails(self, mock_wait_for_status):
@@ -2358,7 +2330,9 @@ class TestServerCreate(TestServer):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
         mock_wait_for_status.assert_called_once_with(
             self.servers_mock.get,
@@ -2611,9 +2585,7 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.datalist(), data)
 
     def test_server_create_with_block_device_full(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.67'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.67')
 
         block_device = (
             f'uuid={self.volume.id},source_type=volume,'
@@ -2714,9 +2686,7 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.datalist(), data)
 
     def test_server_create_with_block_device_from_file(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.67'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.67')
 
         block_device = {
             'uuid': self.volume.id,
@@ -2870,9 +2840,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_block_device_tag_pre_v242(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.41'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.41')
 
         block_device = f'uuid={self.volume.name},tag=foo'
         arglist = [
@@ -2893,9 +2861,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_block_device_volume_type_pre_v267(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.66'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.66')
 
         block_device = f'uuid={self.volume.name},volume_type=foo'
         arglist = [
@@ -3339,7 +3305,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3357,7 +3323,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3375,7 +3341,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3414,6 +3380,34 @@ class TestServerCreate(TestServer):
             '--volume is not allowed with --boot-from-volume', str(ex)
         )
 
+    def test_server_create_boot_from_volume_no_image(self):
+        # Test --boot-from-volume option without --image or
+        # --image-property.
+        arglist = [
+            '--flavor',
+            self.flavor.id,
+            '--boot-from-volume',
+            '1',
+            self.new_server.name,
+        ]
+        verifylist = [
+            ('flavor', self.flavor.id),
+            ('boot_from_volume', 1),
+            ('config_drive', False),
+            ('server_name', self.new_server.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        ex = self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+        # Assert it is the error we expect.
+        self.assertIn(
+            'An image (--image or --image-property) is required '
+            'to support --boot-from-volume option',
+            str(ex),
+        )
+
     def test_server_create_image_property(self):
         arglist = [
             '--image-property',
@@ -3768,7 +3762,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3786,7 +3780,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3805,7 +3799,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3823,7 +3817,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -3832,7 +3826,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_description_api_newer(self):
         # Description is supported for nova api version 2.19 or above
-        self.app.client_manager.compute.api_version = 2.19
+        self.compute_client.api_version = 2.19
 
         arglist = [
             '--image',
@@ -3888,7 +3882,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_description_api_older(self):
         # Description is not supported for nova api version below 2.19
-        self.app.client_manager.compute.api_version = 2.18
+        self.compute_client.api_version = 2.18
 
         arglist = [
             '--image',
@@ -3914,9 +3908,7 @@ class TestServerCreate(TestServer):
             )
 
     def test_server_create_with_tag(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.52'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.52')
 
         arglist = [
             '--image',
@@ -3969,9 +3961,7 @@ class TestServerCreate(TestServer):
         self.assertFalse(self.flavors_mock.called)
 
     def test_server_create_with_tag_pre_v252(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.51'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.51')
 
         arglist = [
             '--image',
@@ -4002,7 +3992,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_host_v274(self):
         # Explicit host is supported for nova api version 2.74 or above
-        self.app.client_manager.compute.api_version = 2.74
+        self.compute_client.api_version = 2.74
 
         arglist = [
             '--image',
@@ -4058,7 +4048,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_host_pre_v274(self):
         # Host is not supported for nova api version below 2.74
-        self.app.client_manager.compute.api_version = 2.73
+        self.compute_client.api_version = 2.73
 
         arglist = [
             '--image',
@@ -4086,7 +4076,7 @@ class TestServerCreate(TestServer):
     def test_server_create_with_hypervisor_hostname_v274(self):
         # Explicit hypervisor_hostname is supported for nova api version
         # 2.74 or above
-        self.app.client_manager.compute.api_version = 2.74
+        self.compute_client.api_version = 2.74
 
         arglist = [
             '--image',
@@ -4142,7 +4132,7 @@ class TestServerCreate(TestServer):
 
     def test_server_create_with_hypervisor_hostname_pre_v274(self):
         # Hypervisor_hostname is not supported for nova api version below 2.74
-        self.app.client_manager.compute.api_version = 2.73
+        self.compute_client.api_version = 2.73
 
         arglist = [
             '--image',
@@ -4170,7 +4160,7 @@ class TestServerCreate(TestServer):
     def test_server_create_with_host_and_hypervisor_hostname_v274(self):
         # Explicit host and hypervisor_hostname is supported for nova api
         # version 2.74 or above
-        self.app.client_manager.compute.api_version = 2.74
+        self.compute_client.api_version = 2.74
 
         arglist = [
             '--image',
@@ -4229,9 +4219,7 @@ class TestServerCreate(TestServer):
         self.assertFalse(self.flavors_mock.called)
 
     def test_server_create_with_hostname_v290(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.90'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.90')
 
         arglist = [
             '--image',
@@ -4280,9 +4268,7 @@ class TestServerCreate(TestServer):
         self.assertFalse(self.flavors_mock.called)
 
     def test_server_create_with_hostname_pre_v290(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.89'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.89')
 
         arglist = [
             '--image',
@@ -4307,9 +4293,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_trusted_image_cert(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
 
         arglist = [
             '--image',
@@ -4360,9 +4344,7 @@ class TestServerCreate(TestServer):
         self.assertFalse(self.flavors_mock.called)
 
     def test_server_create_with_trusted_image_cert_prev263(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.62'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.62')
 
         arglist = [
             '--image',
@@ -4389,9 +4371,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_trusted_image_cert_from_volume(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
         arglist = [
             '--volume',
             'volume1',
@@ -4417,9 +4397,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_trusted_image_cert_from_snapshot(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
         arglist = [
             '--snapshot',
             'snapshot1',
@@ -4445,9 +4423,7 @@ class TestServerCreate(TestServer):
         )
 
     def test_server_create_with_trusted_image_cert_boot_from_volume(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
         arglist = [
             '--image',
             'image1',
@@ -4598,7 +4574,9 @@ class TestServerDelete(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
         self.servers_mock.delete.assert_called_with(servers[0].id)
         mock_wait_for_delete.assert_called_once_with(
@@ -4633,7 +4611,9 @@ class TestServerDumpCreate(TestServer):
 
         self.assertIsNone(result)
         for s in servers:
-            s.trigger_crash_dump.assert_called_once_with(self.sdk_client)
+            s.trigger_crash_dump.assert_called_once_with(
+                self.compute_sdk_client
+            )
 
     def test_server_dump_one_server(self):
         self.run_test_server_dump(1)
@@ -4708,12 +4688,12 @@ class _TestServerList(TestServer):
         self.image_client.get_image.return_value = self.image
 
         self.flavor = compute_fakes.create_one_flavor()
-        self.sdk_client.find_flavor.return_value = self.flavor
+        self.compute_sdk_client.find_flavor.return_value = self.flavor
         self.attrs['flavor'] = {'original_name': self.flavor.name}
 
         # The servers to be listed.
         self.servers = self.setup_sdk_servers_mock(3)
-        self.sdk_client.servers.return_value = self.servers
+        self.compute_sdk_client.servers.return_value = self.servers
 
         # Get the command object to test
         self.cmd = server.ListServer(self.app, None)
@@ -4732,7 +4712,7 @@ class TestServerList(_TestServerList):
         ]
 
         Flavor = collections.namedtuple('Flavor', 'id name')
-        self.sdk_client.flavors.return_value = [
+        self.compute_sdk_client.flavors.return_value = [
             Flavor(id=s.flavor['id'], name=self.flavor.name)
             for s in self.servers
         ]
@@ -4762,9 +4742,9 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_called()
-        self.sdk_client.flavors.assert_called()
+        self.compute_sdk_client.flavors.assert_called()
         # we did not pass image or flavor, so gets on those must be absent
         self.assertFalse(self.flavors_mock.get.call_count)
         self.assertFalse(self.image_client.get_image.call_count)
@@ -4779,14 +4759,14 @@ class TestServerList(_TestServerList):
             ('deleted', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.sdk_client.servers.return_value = []
+        self.compute_sdk_client.servers.return_value = []
         self.data = ()
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_not_called()
-        self.sdk_client.flavors.assert_not_called()
+        self.compute_sdk_client.flavors.assert_not_called()
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
 
@@ -4820,12 +4800,12 @@ class TestServerList(_TestServerList):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         image_ids = {s.image['id'] for s in self.servers if s.image}
         self.image_client.images.assert_called_once_with(
             id=f'in:{",".join(image_ids)}',
         )
-        self.sdk_client.flavors.assert_called_once_with(is_public=None)
+        self.compute_sdk_client.flavors.assert_called_once_with(is_public=None)
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data, tuple(data))
 
@@ -4862,7 +4842,7 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertIn('Project ID', columns)
         self.assertIn('User ID', columns)
         self.assertIn('Created At', columns)
@@ -4901,9 +4881,9 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_not_called()
-        self.sdk_client.flavors.assert_not_called()
+        self.compute_sdk_client.flavors.assert_not_called()
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
 
@@ -4932,9 +4912,9 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_not_called()
-        self.sdk_client.flavors.assert_not_called()
+        self.compute_sdk_client.flavors.assert_not_called()
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
 
@@ -4949,11 +4929,11 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_not_called()
-        self.sdk_client.flavors.assert_not_called()
+        self.compute_sdk_client.flavors.assert_not_called()
         self.image_client.get_image.assert_called()
-        self.sdk_client.find_flavor.assert_called()
+        self.compute_sdk_client.find_flavor.assert_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -4970,9 +4950,9 @@ class TestServerList(_TestServerList):
         )
 
         self.kwargs['image'] = self.image.id
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_not_called()
-        self.sdk_client.flavors.assert_called_once()
+        self.compute_sdk_client.flavors.assert_called_once()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -4984,14 +4964,14 @@ class TestServerList(_TestServerList):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_flavor.assert_has_calls(
+        self.compute_sdk_client.find_flavor.assert_has_calls(
             [mock.call(self.flavor.id)]
         )
 
         self.kwargs['flavor'] = self.flavor.id
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.image_client.images.assert_called_once()
-        self.sdk_client.flavors.assert_not_called()
+        self.compute_sdk_client.flavors.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -5008,7 +4988,7 @@ class TestServerList(_TestServerList):
 
         self.kwargs['changes-since'] = '2016-03-04T06:27:59Z'
         self.kwargs['deleted'] = True
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -5051,7 +5031,7 @@ class TestServerList(_TestServerList):
 
         self.kwargs['tags'] = 'tag1,tag2'
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -5094,7 +5074,7 @@ class TestServerList(_TestServerList):
 
         self.kwargs['not-tags'] = 'tag1,tag2'
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -5133,7 +5113,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['availability_zone'] = 'test-az'
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5150,7 +5130,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['key_name'] = 'test-key'
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5166,7 +5146,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['config_drive'] = True
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5182,7 +5162,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['config_drive'] = False
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5199,7 +5179,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['progress'] = '100'
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5210,7 +5190,7 @@ class TestServerList(_TestServerList):
         ]
 
         self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -5230,7 +5210,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['vm_state'] = 'active'
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5247,7 +5227,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['task_state'] = 'deleting'
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5264,7 +5244,7 @@ class TestServerList(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['power_state'] = 1
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
@@ -5300,18 +5280,18 @@ class TestServerList(_TestServerList):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(tuple(self.data1), tuple(data))
 
         # Next test with host_status in the data -- the column should be
         # present in this case.
-        self.sdk_client.servers.reset_mock()
+        self.compute_sdk_client.servers.reset_mock()
 
         self.attrs['host_status'] = 'UP'
         servers = self.setup_sdk_servers_mock(3)
-        self.sdk_client.servers.return_value = servers
+        self.compute_sdk_client.servers.return_value = servers
 
         # Make sure the returned image and flavor IDs match the servers.
         Image = collections.namedtuple('Image', 'id name')
@@ -5347,7 +5327,7 @@ class TestServerList(_TestServerList):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertEqual(columns_long, columns)
         self.assertEqual(tuple(self.data2), tuple(data))
@@ -5395,7 +5375,7 @@ class TestServerListV273(_TestServerList):
 
         # The servers to be listed.
         self.servers = self.setup_sdk_servers_mock(3)
-        self.sdk_client.servers.return_value = self.servers
+        self.compute_sdk_client.servers.return_value = self.servers
 
         Image = collections.namedtuple('Image', 'id name')
         self.image_client.images.return_value = [
@@ -5407,7 +5387,7 @@ class TestServerListV273(_TestServerList):
 
         # The flavor information is embedded, so now reason for this to be
         # called
-        self.sdk_client.flavors = mock.NonCallableMock()
+        self.compute_sdk_client.flavors = mock.NonCallableMock()
 
         self.data = tuple(
             (
@@ -5443,7 +5423,7 @@ class TestServerListV273(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['locked'] = True
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, tuple(data))
@@ -5458,7 +5438,7 @@ class TestServerListV273(_TestServerList):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.kwargs['locked'] = False
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, tuple(data))
@@ -5469,7 +5449,7 @@ class TestServerListV273(_TestServerList):
         verifylist = [('locked', True), ('unlocked', True)]
 
         ex = self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -5491,7 +5471,7 @@ class TestServerListV273(_TestServerList):
         self.kwargs['changes-before'] = '2016-03-05T06:27:59Z'
         self.kwargs['deleted'] = True
 
-        self.sdk_client.servers.assert_called_with(**self.kwargs)
+        self.compute_sdk_client.servers.assert_called_with(**self.kwargs)
 
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, tuple(data))
@@ -5581,8 +5561,8 @@ class TestServerLock(TestServer):
 
         self.server = compute_fakes.create_one_sdk_server()
 
-        self.sdk_client.find_server.return_value = self.server
-        self.sdk_client.lock_server.return_value = None
+        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.lock_server.return_value = None
 
         # Get the command object to test
         self.cmd = server.LockServer(self.app, None)
@@ -5611,11 +5591,11 @@ class TestServerLock(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.id,
             ignore_missing=False,
         )
-        self.sdk_client.lock_server.assert_called_with(
+        self.compute_sdk_client.lock_server.assert_called_with(
             self.server.id,
             locked_reason="blah",
         )
@@ -5636,12 +5616,12 @@ class TestServerLock(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
-        self.assertEqual(2, self.sdk_client.find_server.call_count)
-        self.sdk_client.lock_server.assert_called_with(
+        self.assertEqual(2, self.compute_sdk_client.find_server.call_count)
+        self.compute_sdk_client.lock_server.assert_called_with(
             self.server.id,
             locked_reason="choo..choo",
         )
-        self.assertEqual(2, self.sdk_client.lock_server.call_count)
+        self.assertEqual(2, self.compute_sdk_client.lock_server.call_count)
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
     def test_server_lock_with_reason_pre_v273(self, sm_mock):
@@ -5723,9 +5703,7 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.56'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.56')
 
         result = self.cmd.take_action(parsed_args)
 
@@ -5849,9 +5827,7 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.30'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.30')
 
         result = self.cmd.take_action(parsed_args)
 
@@ -5911,9 +5887,7 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.24'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.24')
 
         result = self.cmd.take_action(parsed_args)
 
@@ -5938,9 +5912,7 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.24'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.24')
 
         result = self.cmd.take_action(parsed_args)
 
@@ -5965,9 +5937,7 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.25'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.25')
 
         with mock.patch.object(self.cmd.log, 'warning') as mock_warning:
             result = self.cmd.take_action(parsed_args)
@@ -6021,7 +5991,9 @@ class TestServerMigrate(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
         self.servers_mock.get.assert_called_with(self.server.id)
         self.server.migrate.assert_called_with()
@@ -6032,7 +6004,7 @@ class TestServerReboot(TestServer):
     def setUp(self):
         super().setUp()
 
-        self.sdk_client.reboot_server.return_value = None
+        self.compute_sdk_client.reboot_server.return_value = None
 
         self.cmd = server.RebootServer(self.app, None)
 
@@ -6051,7 +6023,7 @@ class TestServerReboot(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.reboot_server.assert_called_once_with(
+        self.compute_sdk_client.reboot_server.assert_called_once_with(
             servers[0].id,
             'SOFT',
         )
@@ -6073,7 +6045,7 @@ class TestServerReboot(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.reboot_server.assert_called_once_with(
+        self.compute_sdk_client.reboot_server.assert_called_once_with(
             servers[0].id,
             'HARD',
         )
@@ -6097,12 +6069,12 @@ class TestServerReboot(TestServer):
         result = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(result)
-        self.sdk_client.reboot_server.assert_called_once_with(
+        self.compute_sdk_client.reboot_server.assert_called_once_with(
             servers[0].id,
             'SOFT',
         )
         mock_wait_for_status.assert_called_once_with(
-            self.sdk_client.get_server,
+            self.compute_sdk_client.get_server,
             servers[0].id,
             callback=mock.ANY,
         )
@@ -6127,15 +6099,16 @@ class TestServerReboot(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
-        self.assertIn('Error rebooting server', mock_log.call_args[0][0])
-        self.sdk_client.reboot_server.assert_called_once_with(
+        self.compute_sdk_client.reboot_server.assert_called_once_with(
             servers[0].id,
             'SOFT',
         )
         mock_wait_for_status.assert_called_once_with(
-            self.sdk_client.get_server,
+            self.compute_sdk_client.get_server,
             servers[0].id,
             callback=mock.ANY,
         )
@@ -6320,9 +6293,7 @@ class TestServerRebuild(TestServer):
         self.server.rebuild.assert_called_with(self.image, password)
 
     def test_rebuild_with_description(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.19'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.19')
 
         description = 'description1'
         arglist = [self.server.id, '--description', description]
@@ -6338,9 +6309,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_description_pre_v219(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.18'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.18')
 
         description = 'description1'
         arglist = [self.server.id, '--description', description]
@@ -6392,7 +6361,9 @@ class TestServerRebuild(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
         mock_wait_for_status.assert_called_once_with(
             self.servers_mock.get,
@@ -6508,9 +6479,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_keypair_name(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.54'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.54')
 
         self.server.key_name = 'mykey'
         arglist = [
@@ -6533,9 +6502,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_keypair_name_pre_v254(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.53'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.53')
 
         self.server.key_name = 'mykey'
         arglist = [
@@ -6554,9 +6521,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_no_keypair_name(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.54'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.54')
 
         self.server.key_name = 'mykey'
         arglist = [
@@ -6586,7 +6551,7 @@ class TestServerRebuild(TestServer):
             ('key_name', self.server.key_name),
         ]
         self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -6595,9 +6560,7 @@ class TestServerRebuild(TestServer):
 
     @mock.patch('openstackclient.compute.v2.server.io.open')
     def test_rebuild_with_user_data(self, mock_open):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.57'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.57')
 
         mock_file = mock.Mock(name='File')
         mock_open.return_value = mock_file
@@ -6631,9 +6594,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_user_data_pre_v257(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.56'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.56')
 
         arglist = [
             self.server.id,
@@ -6651,9 +6612,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_no_user_data(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.54'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.54')
 
         self.server.key_name = 'mykey'
         arglist = [
@@ -6672,9 +6631,7 @@ class TestServerRebuild(TestServer):
         self.server.rebuild.assert_called_with(self.image, None, userdata=None)
 
     def test_rebuild_with_no_user_data_pre_v254(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.53'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.53')
 
         arglist = [
             self.server.id,
@@ -6698,13 +6655,15 @@ class TestServerRebuild(TestServer):
             '--no-user-data',
         ]
         self.assertRaises(
-            utils.ParserException, self.check_parser, self.cmd, arglist, None
+            test_utils.ParserException,
+            self.check_parser,
+            self.cmd,
+            arglist,
+            None,
         )
 
     def test_rebuild_with_trusted_image_cert(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
 
         arglist = [
             self.server.id,
@@ -6728,9 +6687,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_trusted_image_cert_pre_v263(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.62'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.62')
 
         arglist = [
             self.server.id,
@@ -6750,9 +6707,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_no_trusted_image_cert(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.63'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.63')
 
         arglist = [
             self.server.id,
@@ -6772,9 +6727,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_no_trusted_image_cert_pre_v263(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.62'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.62')
 
         arglist = [
             self.server.id,
@@ -6791,9 +6744,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_hostname(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.90'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.90')
 
         arglist = [self.server.id, '--hostname', 'new-hostname']
         verifylist = [('server', self.server.id), ('hostname', 'new-hostname')]
@@ -6808,9 +6759,7 @@ class TestServerRebuild(TestServer):
         )
 
     def test_rebuild_with_hostname_pre_v290(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.89'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.89')
 
         arglist = [
             self.server.id,
@@ -6855,9 +6804,7 @@ class TestServerRebuildVolumeBacked(TestServer):
         self.cmd = server.RebuildServer(self.app, None)
 
     def test_rebuild_with_reimage_boot_volume(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.93'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.93')
 
         arglist = [
             self.server.id,
@@ -6878,9 +6825,7 @@ class TestServerRebuildVolumeBacked(TestServer):
         self.server.rebuild.assert_called_with(self.new_image, None)
 
     def test_rebuild_with_no_reimage_boot_volume(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.93'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.93')
 
         arglist = [
             self.server.id,
@@ -6901,9 +6846,7 @@ class TestServerRebuildVolumeBacked(TestServer):
         self.assertIn('--reimage-boot-volume is required', str(exc))
 
     def test_rebuild_with_reimage_boot_volume_pre_v293(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.92'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.92')
 
         arglist = [
             self.server.id,
@@ -6996,9 +6939,7 @@ class TestEvacuateServer(TestServer):
         self._test_evacuate(args, verify_args, evac_args)
 
     def test_evacuate_with_host(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.29'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.29')
 
         host = 'target-host'
         args = [
@@ -7015,9 +6956,7 @@ class TestEvacuateServer(TestServer):
         self._test_evacuate(args, verify_args, evac_args)
 
     def test_evacuate_with_host_pre_v229(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.28'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.28')
 
         args = [
             self.server.id,
@@ -7035,9 +6974,7 @@ class TestEvacuateServer(TestServer):
         )
 
     def test_evacuate_without_share_storage(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.13'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.13')
 
         args = [self.server.id, '--shared-storage']
         verify_args = [
@@ -7052,9 +6989,7 @@ class TestEvacuateServer(TestServer):
         self._test_evacuate(args, verify_args, evac_args)
 
     def test_evacuate_without_share_storage_post_v213(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.14'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.14')
 
         args = [self.server.id, '--shared-storage']
         verify_args = [
@@ -7307,7 +7242,7 @@ class TestServerRemovePort(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.delete_server_interface.assert_called_with(
+        self.compute_sdk_client.delete_server_interface.assert_called_with(
             port_id, server=servers[0], ignore_missing=False
         )
         self.assertIsNone(result)
@@ -7340,7 +7275,9 @@ class TestServerRemoveNetwork(TestServer):
 
         self.find_network = mock.Mock()
         self.app.client_manager.network.find_network = self.find_network
-        self.sdk_client.server_interfaces.return_value = [self.fake_inf]
+        self.compute_sdk_client.server_interfaces.return_value = [
+            self.fake_inf
+        ]
 
     def _test_server_remove_network(self, network_id):
         self.fake_inf.net_id = network_id
@@ -7360,8 +7297,10 @@ class TestServerRemoveNetwork(TestServer):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.server_interfaces.assert_called_once_with(servers[0])
-        self.sdk_client.delete_server_interface.assert_called_once_with(
+        self.compute_sdk_client.server_interfaces.assert_called_once_with(
+            servers[0]
+        )
+        self.compute_sdk_client.delete_server_interface.assert_called_once_with(
             'fake-port', server=servers[0]
         )
         self.assertIsNone(result)
@@ -7596,7 +7535,9 @@ class TestServerResize(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
         self.servers_mock.get.assert_called_with(
             self.server.id,
@@ -7913,7 +7854,7 @@ class TestServerSet(TestServer):
             ('server', 'foo_vm'),
         ]
         self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -8137,8 +8078,8 @@ class TestServerShelve(TestServer):
             attrs={'status': 'ACTIVE'},
         )
 
-        self.sdk_client.find_server.return_value = self.server
-        self.sdk_client.shelve_server.return_value = None
+        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.shelve_server.return_value = None
 
         # Get the command object to test
         self.cmd = server.ShelveServer(self.app, None)
@@ -8155,12 +8096,14 @@ class TestServerShelve(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.name,
             ignore_missing=False,
         )
-        self.sdk_client.shelve_server.assert_called_with(self.server.id)
-        self.sdk_client.shelve_offload_server.assert_not_called()
+        self.compute_sdk_client.shelve_server.assert_called_with(
+            self.server.id
+        )
+        self.compute_sdk_client.shelve_offload_server.assert_not_called()
 
     def test_shelve_already_shelved(self):
         self.server.status = 'SHELVED'
@@ -8176,12 +8119,12 @@ class TestServerShelve(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.name,
             ignore_missing=False,
         )
-        self.sdk_client.shelve_server.assert_not_called()
-        self.sdk_client.shelve_offload_server.assert_not_called()
+        self.compute_sdk_client.shelve_server.assert_not_called()
+        self.compute_sdk_client.shelve_offload_server.assert_not_called()
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=True)
     def test_shelve_with_wait(self, mock_wait_for_status):
@@ -8196,14 +8139,16 @@ class TestServerShelve(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.name,
             ignore_missing=False,
         )
-        self.sdk_client.shelve_server.assert_called_with(self.server.id)
-        self.sdk_client.shelve_offload_server.assert_not_called()
+        self.compute_sdk_client.shelve_server.assert_called_with(
+            self.server.id
+        )
+        self.compute_sdk_client.shelve_offload_server.assert_not_called()
         mock_wait_for_status.assert_called_once_with(
-            self.sdk_client.get_server,
+            self.compute_sdk_client.get_server,
             self.server.id,
             callback=mock.ANY,
             success_status=('shelved', 'shelved_offloaded'),
@@ -8222,20 +8167,26 @@ class TestServerShelve(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        # two calls - one to retrieve the server state before shelving and
-        # another to do this before offloading
-        self.sdk_client.find_server.assert_has_calls(
-            [
-                mock.call(self.server.name, ignore_missing=False),
-                mock.call(self.server.name, ignore_missing=False),
-            ]
+        # one call to retrieve to retrieve the server state before shelving
+        self.compute_sdk_client.find_server.assert_called_once_with(
+            self.server.name,
+            ignore_missing=False,
+        )
+        # one call to retrieve the server state before offloading
+        self.compute_sdk_client.get_server.assert_called_once_with(
+            self.server.id
+        )
+        # one call to shelve the server
+        self.compute_sdk_client.shelve_server.assert_called_with(
+            self.server.id
         )
-        self.sdk_client.shelve_server.assert_called_with(self.server.id)
-        self.sdk_client.shelve_offload_server.assert_called_once_with(
+        # one call to shelve offload the server
+        self.compute_sdk_client.shelve_offload_server.assert_called_once_with(
             self.server.id,
         )
+        # one call to wait for the shelve offload to complete
         mock_wait_for_status.assert_called_once_with(
-            self.sdk_client.get_server,
+            self.compute_sdk_client.get_server,
             self.server.id,
             callback=mock.ANY,
             success_status=('shelved', 'shelved_offloaded'),
@@ -8256,9 +8207,11 @@ class TestServerShow(TestServer):
             'image': {'id': self.image.id},
             'flavor': {'id': self.flavor.id},
             'tenant_id': 'tenant-id-xxx',
-            'networks': {'public': ['10.20.30.40', '2001:db8::f']},
+            'addresses': {'public': ['10.20.30.40', '2001:db8::f']},
+        }
+        self.compute_sdk_client.get_server_diagnostics.return_value = {
+            'test': 'test'
         }
-        self.sdk_client.get_server_diagnostics.return_value = {'test': 'test'}
         server_method = {
             'fetch_topology': self.topology,
         }
@@ -8267,7 +8220,7 @@ class TestServerShow(TestServer):
         )
 
         # This is the return value for utils.find_resource()
-        self.sdk_client.get_server.return_value = self.server
+        self.compute_sdk_client.get_server.return_value = self.server
         self.image_client.get_image.return_value = self.image
         self.flavors_mock.get.return_value = self.flavor
 
@@ -8281,7 +8234,6 @@ class TestServerShow(TestServer):
             'id',
             'image',
             'name',
-            'networks',
             'project_id',
             'properties',
         )
@@ -8290,12 +8242,11 @@ class TestServerShow(TestServer):
             server.PowerStateColumn(
                 getattr(self.server, 'OS-EXT-STS:power_state')
             ),
-            format_columns.DictListColumn(self.server.networks),
             self.flavor.name + " (" + self.flavor.id + ")",
             self.server.id,
             self.image.name + " (" + self.image.id + ")",
             self.server.name,
-            {'public': ['10.20.30.40', '2001:db8::f']},
+            server.AddressesColumn({'public': ['10.20.30.40', '2001:db8::f']}),
             'tenant-id-xxx',
             format_columns.DictColumn({}),
         )
@@ -8305,7 +8256,7 @@ class TestServerShow(TestServer):
         verifylist = []
 
         self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -8562,7 +8513,7 @@ class TestServerStart(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             servers[0].id,
             ignore_missing=False,
             details=False,
@@ -8597,7 +8548,7 @@ class TestServerStop(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             servers[0].id,
             ignore_missing=False,
             details=False,
@@ -8689,7 +8640,7 @@ class TestServerUnset(TestServer):
 
     def test_server_unset_with_description_api_newer(self):
         # Description is supported for nova api version 2.19 or above
-        self.app.client_manager.compute.api_version = 2.19
+        self.compute_client.api_version = 2.19
 
         arglist = [
             '--description',
@@ -8710,7 +8661,7 @@ class TestServerUnset(TestServer):
 
     def test_server_unset_with_description_api_older(self):
         # Description is not supported for nova api version below 2.19
-        self.app.client_manager.compute.api_version = 2.18
+        self.compute_client.api_version = api_versions.APIVersion('2.18')
 
         arglist = [
             '--description',
@@ -8722,15 +8673,15 @@ class TestServerUnset(TestServer):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        with mock.patch.object(api_versions, 'APIVersion', return_value=2.19):
-            self.assertRaises(
-                exceptions.CommandError, self.cmd.take_action, parsed_args
-            )
+        ex = self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+        self.assertIn(
+            '--os-compute-api-version 2.19 or greater is required', str(ex)
+        )
 
     def test_server_unset_with_tag(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.26'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.26')
 
         arglist = [
             '--tag',
@@ -8756,9 +8707,7 @@ class TestServerUnset(TestServer):
         )
 
     def test_server_unset_with_tag_pre_v226(self):
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.25'
-        )
+        self.compute_client.api_version = api_versions.APIVersion('2.25')
 
         arglist = [
             '--tag',
@@ -8789,8 +8738,8 @@ class TestServerUnshelve(TestServer):
             attrs={'status': 'SHELVED'},
         )
 
-        self.sdk_client.find_server.return_value = self.server
-        self.sdk_client.unshelve_server.return_value = None
+        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_sdk_client.unshelve_server.return_value = None
 
         # Get the command object to test
         self.cmd = server.UnshelveServer(self.app, None)
@@ -8806,11 +8755,13 @@ class TestServerUnshelve(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             self.server.id,
             ignore_missing=False,
         )
-        self.sdk_client.unshelve_server.assert_called_once_with(self.server.id)
+        self.compute_sdk_client.unshelve_server.assert_called_once_with(
+            self.server.id
+        )
 
     def test_unshelve_with_az(self):
         self._set_mock_microversion('2.77')
@@ -8828,11 +8779,11 @@ class TestServerUnshelve(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             self.server.id,
             ignore_missing=False,
         )
-        self.sdk_client.unshelve_server.assert_called_once_with(
+        self.compute_sdk_client.unshelve_server.assert_called_once_with(
             self.server.id,
             availability_zone='foo-az',
         )
@@ -8874,11 +8825,11 @@ class TestServerUnshelve(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             self.server.id,
             ignore_missing=False,
         )
-        self.sdk_client.unshelve_server.assert_called_once_with(
+        self.compute_sdk_client.unshelve_server.assert_called_once_with(
             self.server.id,
             host='server1',
         )
@@ -8920,11 +8871,11 @@ class TestServerUnshelve(TestServer):
 
         self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_server.assert_called_once_with(
+        self.compute_sdk_client.find_server.assert_called_once_with(
             self.server.id,
             ignore_missing=False,
         )
-        self.sdk_client.unshelve_server.assert_called_once_with(
+        self.compute_sdk_client.unshelve_server.assert_called_once_with(
             self.server.id,
             availability_zone=None,
         )
@@ -8969,7 +8920,7 @@ class TestServerUnshelve(TestServer):
         ]
 
         ex = self.assertRaises(
-            utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,
@@ -8996,13 +8947,15 @@ class TestServerUnshelve(TestServer):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.find_server.assert_called_with(
+        self.compute_sdk_client.find_server.assert_called_with(
             self.server.name,
             ignore_missing=False,
         )
-        self.sdk_client.unshelve_server.assert_called_with(self.server.id)
+        self.compute_sdk_client.unshelve_server.assert_called_with(
+            self.server.id
+        )
         mock_wait_for_status.assert_called_once_with(
-            self.sdk_client.get_server,
+            self.compute_sdk_client.get_server,
             self.server.id,
             callback=mock.ANY,
             success_status=('active', 'shutoff'),
@@ -9102,7 +9055,7 @@ class TestServerGeneral(TestServer):
             'image': {u'id': _image.id},
             'flavor': {u'id': _flavor.id},
             'tenant_id': u'tenant-id-xxx',
-            'networks': {u'public': [u'10.20.30.40', u'2001:db8::f']},
+            'addresses': {u'public': [u'10.20.30.40', u'2001:db8::f']},
             'links': u'http://xxx.yyy.com',
             'properties': '',
             'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}],
@@ -9122,18 +9075,16 @@ class TestServerGeneral(TestServer):
             ),
             'properties': '',
             'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}],
-            'addresses': format_columns.DictListColumn(_server.networks),
+            'addresses': format_columns.DictListColumn(_server.addresses),
             'project_id': 'tenant-id-xxx',
         }
 
         # Call _prep_server_detail().
         server_detail = server._prep_server_detail(
-            self.app.client_manager.compute,
+            self.compute_client,
             self.image_client,
             _server,
         )
-        # 'networks' is used to create _server. Remove it.
-        server_detail.pop('networks')
 
         # Check the results.
         self.assertCountEqual(info, server_detail)