python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/compute/v2/server.py

@@ -16,15 +16,15 @@
 """Compute v2 Server action implementations"""
 
 import argparse
+import base64
 import getpass
-import io
 import json
 import logging
 import os
+import typing as ty
 
 from cliff import columns as cliff_columns
 import iso8601
-from novaclient import api_versions
 from openstack import exceptions as sdk_exceptions
 from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
@@ -33,6 +33,7 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.api import compute_v2
 from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -81,7 +82,7 @@ class AddressesColumn(cliff_columns.FormattableColumn):
     def machine_readable(self):
         return {
             k: [i['addr'] for i in v if 'addr' in i]
-            for k, v in self._value.items()
+            for k, v in (self._value.items() if self._value else [])
         }
 
 
@@ -128,23 +129,26 @@ def _get_ip_address(addresses, address_type, ip_address_family):
     )
 
 
-def _prep_server_detail(compute_client, image_client, server, refresh=True):
+def _prep_server_detail(compute_client, image_client, server, *, refresh=True):
     """Prepare the detailed server dict for printing
 
     :param compute_client: a compute client instance
     :param image_client: an image client instance
     :param server: a Server resource
     :param refresh: Flag indicating if ``server`` is already the latest version
-                    or if it needs to be refreshed, for example when showing
-                    the latest details of a server after creating it.
+        or if it needs to be refreshed, for example when showing the latest
+        details of a server after creating it.
     :rtype: a dict of server details
     """
-    # Note: Some callers of this routine pass a novaclient server, and others
-    # pass an SDK server. Column names may be different across those cases.
     info = server.to_dict()
+
     if refresh:
-        server = utils.find_resource(compute_client.servers, info['id'])
-        info.update(server.to_dict())
+        server = compute_client.get_server(info['id'])
+        # we only update if the field is not empty, to avoid overwriting
+        # existing values
+        info.update(
+            **{x: y for x, y in server.to_dict().items() if x not in info or y}
+        )
 
     # Some commands using this routine were originally implemented with the
     # nova python wrappers, and were later migrated to use the SDK. Map the
@@ -159,7 +163,6 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
         'compute_host': 'OS-EXT-SRV-ATTR:host',
         'created_at': 'created',
         'disk_config': 'OS-DCF:diskConfig',
-        'flavor_id': 'flavorRef',
         'has_config_drive': 'config_drive',
         'host_id': 'hostId',
         'fault': 'fault',
@@ -180,6 +183,7 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
         'updated_at': 'updated',
         'user_data': 'OS-EXT-SRV-ATTR:user_data',
         'vm_state': 'OS-EXT-STS:vm_state',
+        'pinned_availability_zone': 'pinned_availability_zone',
     }
     # Some columns returned by openstacksdk should not be shown because they're
     # either irrelevant or duplicates
@@ -193,9 +197,13 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
         'public_v6',
         # create-only columns
         'block_device_mapping',
+        'flavor_id',
+        'host',
         'image_id',
         'max_count',
         'min_count',
+        'networks',
+        'personality',
         'scheduler_hints',
         # aliases
         'volumes',
@@ -205,11 +213,12 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
     # Some columns are only present in certain responses and should not be
     # shown otherwise.
     optional_columns = {
-        'admin_password',  # removed in 2.14
-        'fault',  # only present in errored servers
-        'flavor_id',  # removed in 2.47
-        'networks',  # only present in create responses
-        'security_groups',  # only present in create, detail responses
+        # only in create responses if '[api] enable_instance_password' is set
+        'admin_password',
+        # only present in errored servers
+        'fault',
+        # only present in create, detail responses
+        'security_groups',
     }
 
     data = {}
@@ -232,7 +241,7 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
         image_id = image_info.get('id', '')
         try:
             image = image_client.get_image(image_id)
-            info['image'] = "%s (%s)" % (image.name, image_id)
+            info['image'] = f"{image.name} ({image_id})"
         except Exception:
             info['image'] = image_id
     else:
@@ -249,8 +258,10 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
     if flavor_info.get('original_name') is None:  # microversion < 2.47
         flavor_id = flavor_info.get('id', '')
         try:
-            flavor = utils.find_resource(compute_client.flavors, flavor_id)
-            info['flavor'] = "%s (%s)" % (flavor.name, flavor_id)
+            flavor = compute_client.find_flavor(
+                flavor_id, ignore_missing=False
+            )
+            info['flavor'] = f"{flavor.name} ({flavor_id})"
         except Exception:
             info['flavor'] = flavor_id
     else:  # microversion >= 2.47
@@ -283,7 +294,9 @@ def _prep_server_detail(compute_client, image_client, server, refresh=True):
         )
 
     if 'tags' in info:
-        info.update({'tags': format_columns.ListColumn(info.pop('tags'))})
+        info.update(
+            {'tags': format_columns.ListColumn(info.pop('tags') or [])}
+        )
 
     # Map 'networks' to 'addresses', if present. Note that the 'networks' key
     # is used for create responses, otherwise it's 'addresses'. We know it'll
@@ -357,7 +370,7 @@ class AddFixedIP(command.ShowOne):
     _description = _("Add fixed IP address to server")
 
     def get_parser(self, prog_name):
-        parser = super(AddFixedIP, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -480,16 +493,16 @@ class AddFloatingIP(network_common.NetworkAndComputeCommand):
         return parser
 
     def take_action_network(self, client, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
         attrs = {}
         obj = client.find_ip(
             parsed_args.ip_address,
             ignore_missing=False,
         )
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
         ports = list(client.ports(device_id=server.id))
         if not ports:
@@ -539,8 +552,9 @@ class AddFloatingIP(network_common.NetworkAndComputeCommand):
                 raise error
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_add(
-            parsed_args.server,
+        server = client.find_server(parsed_args.server, ignore_missing=False)
+        client.add_floating_ip_to_server(
+            server,
             parsed_args.ip_address,
             fixed_address=parsed_args.fixed_ip_address,
         )
@@ -550,7 +564,7 @@ class AddPort(command.Command):
     _description = _("Add port to server")
 
     def get_parser(self, prog_name):
-        parser = super(AddPort, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -604,7 +618,7 @@ class AddNetwork(command.Command):
     _description = _("Add network to server")
 
     def get_parser(self, prog_name):
-        parser = super(AddNetwork, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -659,7 +673,7 @@ class AddServerSecurityGroup(command.Command):
     _description = _("Add security group to server")
 
     def get_parser(self, prog_name):
-        parser = super(AddServerSecurityGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -673,17 +687,21 @@ class AddServerSecurityGroup(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        )
-        security_group = compute_client.api.security_group_find(
-            parsed_args.group,
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
-
-        server.add_security_group(security_group['id'])
+        if self.app.client_manager.is_network_endpoint_enabled():
+            # the server handles both names and IDs for neutron SGs, so just
+            # pass things through
+            security_group = parsed_args.group
+        else:
+            # however, if using nova-network then it needs a name, not an ID
+            security_group = compute_v2.find_security_group(
+                compute_client, parsed_args.group
+            )['name']
+        compute_client.add_security_group_to_server(server, security_group)
 
 
 class AddServerVolume(command.ShowOne):
@@ -695,7 +713,7 @@ with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(AddServerVolume, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -914,10 +932,17 @@ class NICAction(argparse.Action):
 
         if info['net-id'] and info['port-id']:
             msg = _(
-                'Invalid argument %s; either network or port should be '
-                'specified but not both'
+                "Invalid argument %s; either 'network' or 'port' should be "
+                "specified but not both"
             )
-            raise argparse.ArgumenteError(self, msg % values)
+            raise argparse.ArgumentError(self, msg % values)
+
+        if info['v4-fixed-ip'] and info['v6-fixed-ip']:
+            msg = _(
+                "Invalid argument %s; either 'v4-fixed-ip' or 'v6-fixed-ip' "
+                "should be specified but not both"
+            )
+            raise argparse.ArgumentError(self, msg % values)
 
         getattr(namespace, self.dest).append(info)
 
@@ -1049,7 +1074,7 @@ class CreateServer(command.ShowOne):
     _description = _("Create a new server")
 
     def get_parser(self, prog_name):
-        parser = super(CreateServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server_name',
             metavar='<server-name>',
@@ -1148,7 +1173,7 @@ class CreateServer(command.ShowOne):
         )
         parser.add_argument(
             '--block-device',
-            metavar='',
+            metavar='<block-device>',
             action=BDMAction,
             dest='block_devices',
             default=[],
@@ -1482,7 +1507,7 @@ class CreateServer(command.ShowOne):
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         volume_client = self.app.client_manager.volume
         image_client = self.app.client_manager.image
 
@@ -1518,7 +1543,7 @@ class CreateServer(command.ShowOne):
                         img_dict_items.extend(list(img.properties.items()))
                     for key, value in img_dict_items:
                         try:
-                            set([key, value])
+                            {key, value}
                         except TypeError:
                             if key != 'properties':
                                 LOG.debug(
@@ -1577,12 +1602,12 @@ class CreateServer(command.ShowOne):
                 parsed_args.snapshot,
             ).id
 
-        flavor = utils.find_resource(
-            compute_client.flavors, parsed_args.flavor
+        flavor = compute_client.find_flavor(
+            parsed_args.flavor, ignore_missing=False
         )
 
         if parsed_args.file:
-            if compute_client.api_version >= api_versions.APIVersion('2.57'):
+            if sdk_utils.supports_microversion(compute_client, '2.57'):
                 msg = _(
                     'Personality files are deprecated and are not supported '
                     'for --os-compute-api-version greater than 2.56; use '
@@ -1594,8 +1619,8 @@ class CreateServer(command.ShowOne):
         for f in parsed_args.file:
             dst, src = f.split('=', 1)
             try:
-                files[dst] = io.open(src, 'rb')
-            except IOError as e:
+                files[dst] = open(src, 'rb')
+            except OSError as e:
                 msg = _("Can't open '%(source)s': %(exception)s")
                 raise exceptions.CommandError(
                     msg % {'source': src, 'exception': e}
@@ -1613,18 +1638,20 @@ class CreateServer(command.ShowOne):
             msg = _("max instances should be > 0")
             raise exceptions.CommandError(msg)
 
-        userdata = None
+        user_data = None
         if parsed_args.user_data:
             try:
-                userdata = io.open(parsed_args.user_data)
-            except IOError as e:
+                with open(parsed_args.user_data, 'rb') as fh:
+                    # TODO(stephenfin): SDK should do this for us
+                    user_data = base64.b64encode(fh.read()).decode('utf-8')
+            except OSError as e:
                 msg = _("Can't open '%(data)s': %(exception)s")
                 raise exceptions.CommandError(
                     msg % {'data': parsed_args.user_data, 'exception': e}
                 )
 
         if parsed_args.description:
-            if compute_client.api_version < api_versions.APIVersion("2.19"):
+            if not sdk_utils.supports_microversion(compute_client, '2.19'):
                 msg = _(
                     '--os-compute-api-version 2.19 or greater is '
                     'required to support the --description option'
@@ -1632,26 +1659,7 @@ class CreateServer(command.ShowOne):
                 raise exceptions.CommandError(msg)
 
         block_device_mapping_v2 = []
-        if volume:
-            block_device_mapping_v2 = [
-                {
-                    'uuid': volume,
-                    'boot_index': 0,
-                    'source_type': 'volume',
-                    'destination_type': 'volume',
-                }
-            ]
-        elif snapshot:
-            block_device_mapping_v2 = [
-                {
-                    'uuid': snapshot,
-                    'boot_index': 0,
-                    'source_type': 'snapshot',
-                    'destination_type': 'volume',
-                    'delete_on_termination': False,
-                }
-            ]
-        elif parsed_args.boot_from_volume:
+        if parsed_args.boot_from_volume:
             # Tell nova to create a root volume from the image provided.
             if not image:
                 msg = _(
@@ -1670,6 +1678,35 @@ class CreateServer(command.ShowOne):
             ]
             # If booting from volume we do not pass an image to compute.
             image = None
+        elif image:
+            block_device_mapping_v2 = [
+                {
+                    'uuid': image.id,
+                    'boot_index': 0,
+                    'source_type': 'image',
+                    'destination_type': 'local',
+                    'delete_on_termination': True,
+                }
+            ]
+        elif volume:
+            block_device_mapping_v2 = [
+                {
+                    'uuid': volume,
+                    'boot_index': 0,
+                    'source_type': 'volume',
+                    'destination_type': 'volume',
+                }
+            ]
+        elif snapshot:
+            block_device_mapping_v2 = [
+                {
+                    'uuid': snapshot,
+                    'boot_index': 0,
+                    'source_type': 'snapshot',
+                    'destination_type': 'volume',
+                    'delete_on_termination': False,
+                }
+            ]
 
         if parsed_args.swap:
             block_device_mapping_v2.append(
@@ -1745,7 +1782,7 @@ class CreateServer(command.ShowOne):
                     raise exceptions.CommandError(msg)
 
             if 'tag' in mapping and (
-                compute_client.api_version < api_versions.APIVersion('2.42')
+                not sdk_utils.supports_microversion(compute_client, '2.42')
             ):
                 msg = _(
                     '--os-compute-api-version 2.42 or greater is '
@@ -1754,7 +1791,7 @@ class CreateServer(command.ShowOne):
                 raise exceptions.CommandError(msg)
 
             if 'volume_type' in mapping and (
-                compute_client.api_version < api_versions.APIVersion('2.67')
+                not sdk_utils.supports_microversion(compute_client, '2.67')
             ):
                 msg = _(
                     '--os-compute-api-version 2.67 or greater is '
@@ -1810,7 +1847,7 @@ class CreateServer(command.ShowOne):
 
             block_device_mapping_v2.append(mapping)
 
-        if not image and not any(
+        if not any(
             [bdm.get('boot_index') == 0 for bdm in block_device_mapping_v2]
         ):
             msg = _(
@@ -1819,10 +1856,12 @@ class CreateServer(command.ShowOne):
             )
             raise exceptions.CommandError(msg)
 
-        nics = parsed_args.nics
+        # Default to empty list if nothing was specified and let nova
+        # decide the default behavior.
+        networks: ty.Union[str, ty.List[ty.Dict[str, str]], None] = []
 
-        if 'auto' in nics or 'none' in nics:
-            if len(nics) > 1:
+        if 'auto' in parsed_args.nics or 'none' in parsed_args.nics:
+            if len(parsed_args.nics) > 1:
                 msg = _(
                     'Specifying a --nic of auto or none cannot '
                     'be used with any other --nic, --network '
@@ -1830,7 +1869,7 @@ class CreateServer(command.ShowOne):
                 )
                 raise exceptions.CommandError(msg)
 
-            if compute_client.api_version < api_versions.APIVersion('2.37'):
+            if not sdk_utils.supports_microversion(compute_client, '2.37'):
                 msg = _(
                     '--os-compute-api-version 2.37 or greater is '
                     'required to support explicit auto-allocation of a '
@@ -1838,12 +1877,12 @@ class CreateServer(command.ShowOne):
                 )
                 raise exceptions.CommandError(msg)
 
-            nics = nics[0]
+            networks = parsed_args.nics[0]
         else:
-            for nic in nics:
+            for nic in parsed_args.nics:
                 if 'tag' in nic:
-                    if compute_client.api_version < api_versions.APIVersion(
-                        '2.43'
+                    if not sdk_utils.supports_microversion(
+                        compute_client, '2.43'
                     ):
                         msg = _(
                             '--os-compute-api-version 2.43 or greater is '
@@ -1869,9 +1908,11 @@ class CreateServer(command.ShowOne):
                         nic['port-id'] = port.id
                 else:
                     if nic['net-id']:
-                        nic['net-id'] = compute_client.api.network_find(
+                        net = compute_v2.find_network(
+                            compute_client,
                             nic['net-id'],
-                        )['id']
+                        )
+                        nic['net-id'] = net['id']
 
                     if nic['port-id']:
                         msg = _(
@@ -1880,18 +1921,35 @@ class CreateServer(command.ShowOne):
                         )
                         raise exceptions.CommandError(msg)
 
-        if not nics:
+                # convert from the novaclient-derived "NIC" view to the actual
+                # "network" view
+                network = {}
+
+                if nic['net-id']:
+                    network['uuid'] = nic['net-id']
+
+                if nic['port-id']:
+                    network['port'] = nic['port-id']
+
+                if nic['v4-fixed-ip']:
+                    network['fixed'] = nic['v4-fixed-ip']
+                elif nic['v6-fixed-ip']:
+                    network['fixed'] = nic['v6-fixed-ip']
+
+                if nic.get('tag'):  # tags are optional
+                    network['tag'] = nic['tag']
+
+                networks.append(network)
+
+        if not parsed_args.nics and sdk_utils.supports_microversion(
+            compute_client, '2.37'
+        ):
             # Compute API version >= 2.37 requires a value, so default to
             # 'auto' to maintain legacy behavior if a nic wasn't specified.
-            if compute_client.api_version >= api_versions.APIVersion('2.37'):
-                nics = 'auto'
-            else:
-                # Default to empty list if nothing was specified and let nova
-                # decide the default behavior.
-                nics = []
+            networks = 'auto'
 
         # Check security group exist and convert ID to name
-        security_group_names = []
+        security_groups = []
         if self.app.client_manager.is_network_endpoint_enabled():
             network_client = self.app.client_manager.network
             for each_sg in parsed_args.security_group:
@@ -1900,12 +1958,12 @@ class CreateServer(command.ShowOne):
                 )
                 # Use security group ID to avoid multiple security group have
                 # same name in neutron networking backend
-                security_group_names.append(sg.id)
+                security_groups.append({'name': sg.id})
         else:
             # Handle nova-network case
             for each_sg in parsed_args.security_group:
-                sg = compute_client.api.security_group_find(each_sg)
-                security_group_names.append(sg['name'])
+                sg = compute_v2.find_security_group(compute_client, each_sg)
+                security_groups.append({'name': sg['name']})
 
         hints = {}
         for key, values in parsed_args.hints.items():
@@ -1916,9 +1974,8 @@ class CreateServer(command.ShowOne):
                 hints[key] = values
 
         if parsed_args.server_group:
-            server_group_obj = utils.find_resource(
-                compute_client.server_groups,
-                parsed_args.server_group,
+            server_group_obj = compute_client.find_server_group(
+                parsed_args.server_group, ignore_missing=False
             )
             hints['group'] = server_group_obj.id
 
@@ -1940,69 +1997,89 @@ class CreateServer(command.ShowOne):
             else:
                 config_drive = parsed_args.config_drive
 
-        boot_args = [parsed_args.server_name, image, flavor]
-
-        boot_kwargs = dict(
-            meta=parsed_args.properties,
-            files=files,
-            reservation_id=None,
-            min_count=parsed_args.min,
-            max_count=parsed_args.max,
-            security_groups=security_group_names,
-            userdata=userdata,
-            key_name=parsed_args.key_name,
-            availability_zone=parsed_args.availability_zone,
-            admin_pass=parsed_args.password,
-            block_device_mapping_v2=block_device_mapping_v2,
-            nics=nics,
-            scheduler_hints=hints,
-            config_drive=config_drive,
-        )
+        kwargs = {
+            'name': parsed_args.server_name,
+            'image_id': image.id if image else '',
+            'flavor_id': flavor.id,
+            'min_count': parsed_args.min,
+            'max_count': parsed_args.max,
+        }
 
         if parsed_args.description:
-            boot_kwargs['description'] = parsed_args.description
+            kwargs['description'] = parsed_args.description
+
+        if parsed_args.availability_zone:
+            kwargs['availability_zone'] = parsed_args.availability_zone
+
+        if parsed_args.password:
+            kwargs['admin_password'] = parsed_args.password
+
+        if parsed_args.properties:
+            kwargs['metadata'] = parsed_args.properties
+
+        if parsed_args.key_name:
+            kwargs['key_name'] = parsed_args.key_name
+
+        if user_data:
+            kwargs['user_data'] = user_data
+
+        if files:
+            kwargs['personality'] = files
+
+        if security_groups:
+            kwargs['security_groups'] = security_groups
+
+        if block_device_mapping_v2:
+            kwargs['block_device_mapping'] = block_device_mapping_v2
+
+        if hints:
+            kwargs['scheduler_hints'] = hints
+
+        if networks is not None:
+            kwargs['networks'] = networks
+
+        if config_drive is not None:
+            kwargs['config_drive'] = config_drive
 
         if parsed_args.tags:
-            if compute_client.api_version < api_versions.APIVersion('2.52'):
+            if not sdk_utils.supports_microversion(compute_client, '2.52'):
                 msg = _(
                     '--os-compute-api-version 2.52 or greater is required to '
                     'support the --tag option'
                 )
                 raise exceptions.CommandError(msg)
 
-            boot_kwargs['tags'] = parsed_args.tags
+            kwargs['tags'] = parsed_args.tags
 
         if parsed_args.host:
-            if compute_client.api_version < api_versions.APIVersion("2.74"):
+            if not sdk_utils.supports_microversion(compute_client, '2.74'):
                 msg = _(
                     '--os-compute-api-version 2.74 or greater is required to '
                     'support the --host option'
                 )
                 raise exceptions.CommandError(msg)
 
-            boot_kwargs['host'] = parsed_args.host
+            kwargs['host'] = parsed_args.host
 
         if parsed_args.hypervisor_hostname:
-            if compute_client.api_version < api_versions.APIVersion("2.74"):
+            if not sdk_utils.supports_microversion(compute_client, '2.74'):
                 msg = _(
                     '--os-compute-api-version 2.74 or greater is required to '
                     'support the --hypervisor-hostname option'
                 )
                 raise exceptions.CommandError(msg)
 
-            boot_kwargs[
-                'hypervisor_hostname'
-            ] = parsed_args.hypervisor_hostname
+            kwargs['hypervisor_hostname'] = parsed_args.hypervisor_hostname
 
         if parsed_args.hostname:
-            if compute_client.api_version < api_versions.APIVersion("2.90"):
+            if not sdk_utils.supports_microversion(compute_client, '2.90'):
                 msg = _(
                     '--os-compute-api-version 2.90 or greater is required to '
                     'support the --hostname option'
                 )
                 raise exceptions.CommandError(msg)
 
-            boot_kwargs['hostname'] = parsed_args.hostname
+            kwargs['hostname'] = parsed_args.hostname
 
         # TODO(stephenfin): Handle OS_TRUSTED_IMAGE_CERTIFICATE_IDS
         if parsed_args.trusted_image_certs:
@@ -2012,7 +2089,7 @@ class CreateServer(command.ShowOne):
                     'servers booted directly from images'
                 )
                 raise exceptions.CommandError(msg)
-            if compute_client.api_version < api_versions.APIVersion('2.63'):
+            if not sdk_utils.supports_microversion(compute_client, '2.63'):
                 msg = _(
                     '--os-compute-api-version 2.63 or greater is required to '
                     'support the --trusted-image-cert option'
@@ -2020,25 +2097,22 @@ class CreateServer(command.ShowOne):
                 raise exceptions.CommandError(msg)
 
             certs = parsed_args.trusted_image_certs
-            boot_kwargs['trusted_image_certificates'] = certs
+            kwargs['trusted_image_certificates'] = certs
 
-        LOG.debug('boot_args: %s', boot_args)
-        LOG.debug('boot_kwargs: %s', boot_kwargs)
+        LOG.debug('boot_kwargs: %s', kwargs)
 
         # Wrap the call to catch exceptions in order to close files
         try:
-            server = compute_client.servers.create(*boot_args, **boot_kwargs)
+            server = compute_client.create_server(**kwargs)
         finally:
             # Clean up open files - make sure they are not strings
             for f in files:
                 if hasattr(f, 'close'):
                     f.close()
-            if hasattr(userdata, 'close'):
-                userdata.close()
 
         if parsed_args.wait:
             if utils.wait_for_status(
-                compute_client.servers.get,
+                compute_client.get_server,
                 server.id,
                 callback=_show_progress,
             ):
@@ -2047,8 +2121,8 @@ class CreateServer(command.ShowOne):
                 msg = _('Error creating server: %s') % parsed_args.server_name
                 raise exceptions.CommandError(msg)
 
-        details = _prep_server_detail(compute_client, image_client, server)
-        return zip(*sorted(details.items()))
+        data = _prep_server_detail(compute_client, image_client, server)
+        return zip(*sorted(data.items()))
 
 
 class CreateServerDump(command.Command):
@@ -2064,7 +2138,7 @@ class CreateServerDump(command.Command):
     """
 
     def get_parser(self, prog_name):
-        parser = super(CreateServerDump, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -2084,7 +2158,7 @@ class DeleteServer(command.Command):
     _description = _("Delete server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -2118,25 +2192,22 @@ class DeleteServer(command.Command):
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         for server in parsed_args.server:
-            server_obj = utils.find_resource(
-                compute_client.servers,
+            server_obj = compute_client.find_server(
                 server,
-                all_tenants=parsed_args.all_projects,
+                ignore_missing=False,
+                all_projects=parsed_args.all_projects,
             )
 
-            if parsed_args.force:
-                compute_client.servers.force_delete(server_obj.id)
-            else:
-                compute_client.servers.delete(server_obj.id)
+            compute_client.delete_server(server_obj, force=parsed_args.force)
 
             if parsed_args.wait:
-                if not utils.wait_for_delete(
-                    compute_client.servers,
-                    server_obj.id,
-                    callback=_show_progress,
-                ):
+                try:
+                    compute_client.wait_for_delete(
+                        server_obj, callback=_show_progress
+                    )
+                except sdk_exceptions.ResourceTimeout:
                     msg = _('Error deleting server: %s') % server_obj.id
                     raise exceptions.CommandError(msg)
 
@@ -2189,7 +2260,7 @@ class ListServer(command.Lister):
     _description = _("List servers")
 
     def get_parser(self, prog_name):
-        parser = super(ListServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--reservation-id',
             metavar='<reservation-id>',
@@ -2457,7 +2528,7 @@ class ListServer(command.Lister):
             action='store_true',
             default=False,
             help=_(
-                'When looking up flavor and image names, look them up'
+                'When looking up flavor and image names, look them up '
                 'one by one as needed instead of all together (default). '
                 'Mutually exclusive with "--no-name-lookup|-n" option.'
             ),
@@ -2752,11 +2823,13 @@ class ListServer(command.Lister):
         if parsed_args.long:
             columns += (
                 'availability_zone',
+                'pinned_availability_zone',
                 'hypervisor_hostname',
                 'metadata',
             )
             column_headers += (
                 'Availability Zone',
+                'Pinned Availability Zone',
                 'Host',
                 'Properties',
             )
@@ -2791,6 +2864,12 @@ class ListServer(command.Lister):
                 if c in ('Availability Zone', "availability_zone"):
                     columns += ('availability_zone',)
                     column_headers += ('Availability Zone',)
+                if c in (
+                    'pinned_availability_zone',
+                    "Pinned Availability Zone",
+                ):
+                    columns += ('Pinned Availability Zone',)
+                    column_headers += ('Pinned Availability Zone',)
                 if c in ('Host', "host"):
                     columns += ('hypervisor_hostname',)
                     column_headers += ('Host',)
@@ -2834,11 +2913,12 @@ class ListServer(command.Lister):
             # there are infra failures
             if parsed_args.name_lookup_one_by_one or image_id:
                 for image_id in image_ids:
-                    # "Image Name" is not crucial, so we swallow any exceptions
                     try:
                         images[image_id] = image_client.get_image(image_id)
                     except Exception:
-                        pass
+                        # retrieving image names is not crucial, so we swallow
+                        # any exceptions
+                        pass  # nosec: B110
             else:
                 try:
                     # some deployments can have *loads* of images so we only
@@ -2857,33 +2937,37 @@ class ListServer(command.Lister):
                     for i in images_list:
                         images[i.id] = i
                 except Exception:
-                    pass
+                    # retrieving image names is not crucial, so we swallow any
+                    # exceptions
+                    pass  # nosec: B110
 
             # create a dict that maps flavor_id to flavor object, which is used
             # to display the "Flavor Name" column. Note that 'flavor.id' is not
             # present on microversion 2.47 or later and 'flavor' won't be
             # present if there are infra failures
             if parsed_args.name_lookup_one_by_one or flavor_id:
-                for f_id in set(
+                for f_id in {
                     s.flavor['id']
                     for s in data
                     if s.flavor and s.flavor.get('id')
-                ):
-                    # "Flavor Name" is not crucial, so we swallow any
-                    # exceptions
+                }:
                     try:
                         flavors[f_id] = compute_client.find_flavor(
                             f_id, ignore_missing=False
                         )
                     except Exception:
-                        pass
+                        # retrieving flavor names is not crucial, so we swallow
+                        # any exceptions
+                        pass  # nosec: B110
             else:
                 try:
                     flavors_list = compute_client.flavors(is_public=None)
                     for i in flavors_list:
                         flavors[i.id] = i
                 except Exception:
-                    pass
+                    # retrieving flavor names is not crucial, so we swallow any
+                    # exceptions
+                    pass  # nosec: B110
 
         # Populate image_name, image_id, flavor_name and flavor_id attributes
         # of server objects so that we can display those columns.
@@ -2974,7 +3058,7 @@ A non-admin user will not be able to execute actions."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(LockServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -3038,7 +3122,7 @@ revert to release the new server and restart the old one."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(MigrateServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -3117,11 +3201,10 @@ revert to release the new server and restart the old one."""
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
 
         if parsed_args.live_migration:
@@ -3129,9 +3212,7 @@ revert to release the new server and restart the old one."""
 
             block_migration = parsed_args.block_migration
             if block_migration is None:
-                if compute_client.api_version < api_versions.APIVersion(
-                    '2.25'
-                ):
+                if not sdk_utils.supports_microversion(compute_client, '2.25'):
                     block_migration = False
                 else:
                     block_migration = 'auto'
@@ -3144,10 +3225,8 @@ revert to release the new server and restart the old one."""
             # want to support, so if the user is using --live-migration
             # and --host, we want to enforce that they are using version
             # 2.30 or greater.
-            if (
-                parsed_args.host
-                and compute_client.api_version
-                < api_versions.APIVersion('2.30')
+            if parsed_args.host and not sdk_utils.supports_microversion(
+                compute_client, '2.30'
             ):
                 raise exceptions.CommandError(
                     '--os-compute-api-version 2.30 or greater is required '
@@ -3157,13 +3236,13 @@ revert to release the new server and restart the old one."""
             # The host parameter is required in the API even if None.
             kwargs['host'] = parsed_args.host
 
-            if compute_client.api_version < api_versions.APIVersion('2.25'):
-                kwargs['disk_over_commit'] = parsed_args.disk_overcommit
+            if not sdk_utils.supports_microversion(compute_client, '2.25'):
+                kwargs['disk_overcommit'] = parsed_args.disk_overcommit
                 # We can't use an argparse default value because then we can't
                 # distinguish between explicit 'False' and unset for the below
                 # case (microversion >= 2.25)
-                if kwargs['disk_over_commit'] is None:
-                    kwargs['disk_over_commit'] = False
+                if kwargs['disk_overcommit'] is None:
+                    kwargs['disk_overcommit'] = False
             elif parsed_args.disk_overcommit is not None:
                 # TODO(stephenfin): Raise an error here in OSC 7.0
                 msg = _(
@@ -3174,7 +3253,7 @@ revert to release the new server and restart the old one."""
                 )
                 self.log.warning(msg)
 
-            server.live_migrate(**kwargs)
+            compute_client.live_migrate_server(server, **kwargs)
         else:  # cold migration
             if parsed_args.block_migration or parsed_args.disk_overcommit:
                 raise exceptions.CommandError(
@@ -3183,9 +3262,7 @@ revert to release the new server and restart the old one."""
                     "specified"
                 )
             if parsed_args.host:
-                if compute_client.api_version < api_versions.APIVersion(
-                    '2.56'
-                ):
+                if not sdk_utils.supports_microversion(compute_client, '2.56'):
                     msg = _(
                         '--os-compute-api-version 2.56 or greater is '
                         'required to use --host without --live-migration.'
@@ -3193,16 +3270,21 @@ revert to release the new server and restart the old one."""
                     raise exceptions.CommandError(msg)
 
             kwargs = {'host': parsed_args.host} if parsed_args.host else {}
-            server.migrate(**kwargs)
+            compute_client.migrate_server(server, **kwargs)
 
         if parsed_args.wait:
             if utils.wait_for_status(
-                compute_client.servers.get,
+                compute_client.get_server,
                 server.id,
-                success_status=['active', 'verify_resize'],
+                success_status=('active', 'verify_resize'),
                 callback=_show_progress,
             ):
-                self.app.stdout.write(_('Complete\n'))
+                self.app.stdout.write(
+                    _(
+                        'Complete, check success/failure by '
+                        'openstack server migration/event list/show\n'
+                    )
+                )
             else:
                 msg = _('Error migrating server: %s') % server.id
                 raise exceptions.CommandError(msg)
@@ -3212,7 +3294,7 @@ class PauseServer(command.Command):
     _description = _("Pause server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(PauseServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -3295,7 +3377,7 @@ class RebuildServer(command.ShowOne):
     _description = _("Rebuild server")
 
     def get_parser(self, prog_name):
-        parser = super(RebuildServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -3476,11 +3558,11 @@ class RebuildServer(command.ShowOne):
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         image_client = self.app.client_manager.image
 
-        server = utils.find_resource(
-            compute_client.servers, parsed_args.server
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
 
         # If parsed_args.image is not set and if the instance is image backed,
@@ -3492,7 +3574,7 @@ class RebuildServer(command.ShowOne):
                 parsed_args.image, ignore_missing=False
             )
         else:
-            if not server.image:
+            if not server.image or not server.image.id:
                 msg = _(
                     'The --image option is required when rebuilding a '
                     'volume-backed server'
@@ -3505,14 +3587,17 @@ class RebuildServer(command.ShowOne):
         if parsed_args.name is not None:
             kwargs['name'] = parsed_args.name
 
+        if parsed_args.password is not None:
+            kwargs['admin_password'] = parsed_args.password
+
         if parsed_args.preserve_ephemeral is not None:
             kwargs['preserve_ephemeral'] = parsed_args.preserve_ephemeral
 
         if parsed_args.properties:
-            kwargs['meta'] = parsed_args.properties
+            kwargs['metadata'] = parsed_args.properties
 
         if parsed_args.description:
-            if compute_client.api_version < api_versions.APIVersion('2.19'):
+            if not sdk_utils.supports_microversion(compute_client, '2.19'):
                 msg = _(
                     '--os-compute-api-version 2.19 or greater is required to '
                     'support the --description option'
@@ -3522,7 +3607,7 @@ class RebuildServer(command.ShowOne):
             kwargs['description'] = parsed_args.description
 
         if parsed_args.key_name:
-            if compute_client.api_version < api_versions.APIVersion('2.54'):
+            if not sdk_utils.supports_microversion(compute_client, '2.54'):
                 msg = _(
                     '--os-compute-api-version 2.54 or greater is required to '
                     'support the --key-name option'
@@ -3531,7 +3616,7 @@ class RebuildServer(command.ShowOne):
 
             kwargs['key_name'] = parsed_args.key_name
         elif parsed_args.no_key_name:
-            if compute_client.api_version < api_versions.APIVersion('2.54'):
+            if not sdk_utils.supports_microversion(compute_client, '2.54'):
                 msg = _(
                     '--os-compute-api-version 2.54 or greater is required to '
                     'support the --no-key-name option'
@@ -3540,9 +3625,8 @@ class RebuildServer(command.ShowOne):
 
             kwargs['key_name'] = None
 
-        userdata = None
         if parsed_args.user_data:
-            if compute_client.api_version < api_versions.APIVersion('2.54'):
+            if not sdk_utils.supports_microversion(compute_client, '2.54'):
                 msg = _(
                     '--os-compute-api-version 2.54 or greater is required to '
                     'support the --user-data option'
@@ -3550,27 +3634,29 @@ class RebuildServer(command.ShowOne):
                 raise exceptions.CommandError(msg)
 
             try:
-                userdata = io.open(parsed_args.user_data)
-            except IOError as e:
+                with open(parsed_args.user_data, 'rb') as fh:
+                    # TODO(stephenfin): SDK should do this for us
+                    user_data = base64.b64encode(fh.read()).decode('utf-8')
+            except OSError as e:
                 msg = _("Can't open '%(data)s': %(exception)s")
                 raise exceptions.CommandError(
                     msg % {'data': parsed_args.user_data, 'exception': e}
                 )
 
-            kwargs['userdata'] = userdata
+            kwargs['user_data'] = user_data
         elif parsed_args.no_user_data:
-            if compute_client.api_version < api_versions.APIVersion('2.54'):
+            if not sdk_utils.supports_microversion(compute_client, '2.54'):
                 msg = _(
                     '--os-compute-api-version 2.54 or greater is required to '
                     'support the --no-user-data option'
                 )
                 raise exceptions.CommandError(msg)
 
-            kwargs['userdata'] = None
+            kwargs['user_data'] = None
 
         # TODO(stephenfin): Handle OS_TRUSTED_IMAGE_CERTIFICATE_IDS
         if parsed_args.trusted_image_certs:
-            if compute_client.api_version < api_versions.APIVersion('2.63'):
+            if not sdk_utils.supports_microversion(compute_client, '2.63'):
                 msg = _(
                     '--os-compute-api-version 2.63 or greater is required to '
                     'support the --trusted-certs option'
@@ -3580,7 +3666,7 @@ class RebuildServer(command.ShowOne):
             certs = parsed_args.trusted_image_certs
             kwargs['trusted_image_certificates'] = certs
         elif parsed_args.no_trusted_image_certs:
-            if compute_client.api_version < api_versions.APIVersion('2.63'):
+            if not sdk_utils.supports_microversion(compute_client, '2.63'):
                 msg = _(
                     '--os-compute-api-version 2.63 or greater is required to '
                     'support the --no-trusted-certs option'
@@ -3590,7 +3676,7 @@ class RebuildServer(command.ShowOne):
             kwargs['trusted_image_certificates'] = None
 
         if parsed_args.hostname:
-            if compute_client.api_version < api_versions.APIVersion('2.90'):
+            if not sdk_utils.supports_microversion(compute_client, '2.90'):
                 msg = _(
                     '--os-compute-api-version 2.90 or greater is required to '
                     'support the --hostname option'
@@ -3599,9 +3685,8 @@ class RebuildServer(command.ShowOne):
 
             kwargs['hostname'] = parsed_args.hostname
 
-        v2_93 = api_versions.APIVersion('2.93')
         if parsed_args.reimage_boot_volume:
-            if compute_client.api_version < v2_93:
+            if not sdk_utils.supports_microversion(compute_client, '2.93'):
                 msg = _(
                     '--os-compute-api-version 2.93 or greater is required to '
                     'support the --reimage-boot-volume option'
@@ -3610,8 +3695,8 @@ class RebuildServer(command.ShowOne):
         else:
             # force user to explicitly request reimaging of volume-backed
             # server
-            if not server.image:
-                if compute_client.api_version >= v2_93:
+            if not server.image or not server.image.id:
+                if sdk_utils.supports_microversion(compute_client, '2.93'):
                     msg = (
                         '--reimage-boot-volume is required to rebuild a '
                         'volume-backed server'
@@ -3643,15 +3728,11 @@ class RebuildServer(command.ShowOne):
             msg = _("The server status is not ACTIVE, SHUTOFF or ERROR.")
             raise exceptions.CommandError(msg)
 
-        try:
-            server = server.rebuild(image, parsed_args.password, **kwargs)
-        finally:
-            if userdata and hasattr(userdata, 'close'):
-                userdata.close()
+        server = compute_client.rebuild_server(server, image, **kwargs)
 
         if parsed_args.wait:
             if utils.wait_for_status(
-                compute_client.servers.get,
+                compute_client.get_server,
                 server.id,
                 callback=_show_progress,
                 success_status=success_status,
@@ -3661,10 +3742,10 @@ class RebuildServer(command.ShowOne):
                 msg = _('Error rebuilding server: %s') % server.id
                 raise exceptions.CommandError(msg)
 
-        details = _prep_server_detail(
+        data = _prep_server_detail(
             compute_client, image_client, server, refresh=False
         )
-        return zip(*sorted(details.items()))
+        return zip(*sorted(data.items()))
 
 
 class EvacuateServer(command.ShowOne):
@@ -3686,13 +3767,12 @@ host."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(EvacuateServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
             help=_('Server (name or ID)'),
         )
-
         parser.add_argument(
             '--wait',
             action='store_true',
@@ -3739,11 +3819,11 @@ host."""
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         image_client = self.app.client_manager.image
 
         if parsed_args.host:
-            if compute_client.api_version < api_versions.APIVersion('2.29'):
+            if not sdk_utils.supports_microversion(compute_client, '2.29'):
                 msg = _(
                     '--os-compute-api-version 2.29 or later is required '
                     'to specify a preferred host.'
@@ -3751,7 +3831,7 @@ host."""
                 raise exceptions.CommandError(msg)
 
         if parsed_args.shared_storage:
-            if compute_client.api_version > api_versions.APIVersion('2.13'):
+            if sdk_utils.supports_microversion(compute_client, '2.14'):
                 msg = _(
                     '--os-compute-api-version 2.13 or earlier is required '
                     'to specify shared-storage.'
@@ -3763,18 +3843,17 @@ host."""
             'password': parsed_args.password,
         }
 
-        if compute_client.api_version <= api_versions.APIVersion('2.13'):
+        if not sdk_utils.supports_microversion(compute_client, '2.14'):
             kwargs['on_shared_storage'] = parsed_args.shared_storage
 
-        server = utils.find_resource(
-            compute_client.servers, parsed_args.server
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
-
-        server.evacuate(**kwargs)
+        compute_client.evacuate_server(server, **kwargs)
 
         if parsed_args.wait:
             if utils.wait_for_status(
-                compute_client.servers.get,
+                compute_client.get_server,
                 server.id,
                 callback=_show_progress,
             ):
@@ -3783,17 +3862,15 @@ host."""
                 msg = _('Error evacuating server: %s') % server.id
                 raise exceptions.CommandError(msg)
 
-        details = _prep_server_detail(
-            compute_client, image_client, server, refresh=True
-        )
-        return zip(*sorted(details.items()))
+        data = _prep_server_detail(compute_client, image_client, server)
+        return zip(*sorted(data.items()))
 
 
 class RemoveFixedIP(command.Command):
     _description = _("Remove fixed IP address from server")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveFixedIP, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -3807,13 +3884,14 @@ class RemoveFixedIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
-        server = utils.find_resource(
-            compute_client.servers, parsed_args.server
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
+        )
+        compute_client.remove_fixed_ip_from_server(
+            server, parsed_args.ip_address
         )
-
-        server.remove_fixed_ip(parsed_args.ip_address)
 
 
 class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
@@ -3845,17 +3923,15 @@ class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
         client.update_ip(obj, **attrs)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_remove(
-            parsed_args.server,
-            parsed_args.ip_address,
-        )
+        server = client.find_server(parsed_args.server, ignore_missing=False)
+        client.remove_floating_ip_from_server(server, parsed_args.ip_address)
 
 
 class RemovePort(command.Command):
     _description = _("Remove port from server")
 
     def get_parser(self, prog_name):
-        parser = super(RemovePort, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -3894,7 +3970,7 @@ class RemoveNetwork(command.Command):
     _description = _("Remove all ports of a network from server")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveNetwork, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -3934,32 +4010,38 @@ class RemoveServerSecurityGroup(command.Command):
     _description = _("Remove security group from server")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveServerSecurityGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
-            help=_('Name or ID of server to use'),
+            help=_('Server (name or ID)'),
         )
         parser.add_argument(
             'group',
             metavar='<group>',
-            help=_('Name or ID of security group to remove from server'),
+            help=_('Security group to remove (name or ID)'),
         )
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
-        security_group = compute_client.api.security_group_find(
-            parsed_args.group,
+        if self.app.client_manager.is_network_endpoint_enabled():
+            # the server handles both names and IDs for neutron SGs, so just
+            # pass things through
+            security_group = parsed_args.group
+        else:
+            # however, if using nova-network then it needs a name, not an ID
+            security_group = compute_v2.find_security_group(
+                compute_client, parsed_args.group
+            )['name']
+        compute_client.remove_security_group_from_server(
+            server, security_group
         )
 
-        server.remove_security_group(security_group['id'])
-
 
 class RemoveServerVolume(command.Command):
     _description = _(
@@ -3970,7 +4052,7 @@ volume from a server with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(RemoveServerVolume, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4012,7 +4094,7 @@ server booted from a volume."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(RescueServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4022,34 +4104,36 @@ server booted from a volume."""
             '--image',
             metavar='<image>',
             help=_(
-                'Image (name or ID) to use for the rescue mode.'
-                ' Defaults to the currently used one.'
+                'Image (name or ID) to use for the rescue mode '
+                '(defaults to the currently used one)'
             ),
         )
         parser.add_argument(
             '--password',
             metavar='<password>',
             help=_(
-                'Set the password on the rescued instance. '
-                'This option requires cloud support.'
+                'Set the password on the rescued instance '
+                '(requires cloud support)'
             ),
         )
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
         image_client = self.app.client_manager.image
 
-        image = None
+        image_ref = None
         if parsed_args.image:
-            image = image_client.find_image(
+            image_ref = image_client.find_image(
                 parsed_args.image, ignore_missing=False
-            )
+            ).id
 
-        utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        ).rescue(image=image, password=parsed_args.password)
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
+        )
+        compute_client.rescue_server(
+            server, admin_pass=parsed_args.password, image_ref=image_ref
+        )
 
 
 class ResizeServer(command.Command):
@@ -4064,13 +4148,13 @@ release the new server and restart the old one."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(ResizeServer, self).get_parser(prog_name)
-        phase_group = parser.add_mutually_exclusive_group()
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
             help=_('Server (name or ID)'),
         )
+        phase_group = parser.add_mutually_exclusive_group()
         phase_group.add_argument(
             '--flavor',
             metavar='<flavor>',
@@ -4107,16 +4191,11 @@ release the new server and restart the old one."""
                 self.app.stdout.write('\rProgress: %s' % progress)
                 self.app.stdout.flush()
 
-        compute_client = self.app.client_manager.compute
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        compute_client = self.app.client_manager.sdk_connection.compute
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
         if parsed_args.flavor:
-            flavor = utils.find_resource(
-                compute_client.flavors,
-                parsed_args.flavor,
-            )
             if not server.image:
                 self.log.warning(
                     _(
@@ -4124,18 +4203,21 @@ release the new server and restart the old one."""
                         "while booting from a persistent volume."
                     )
                 )
-            compute_client.servers.resize(server, flavor)
+            flavor = compute_client.find_flavor(
+                parsed_args.flavor, ignore_missing=False
+            )
+            compute_client.resize_server(server, flavor)
             if parsed_args.wait:
-                if utils.wait_for_status(
-                    compute_client.servers.get,
+                if not utils.wait_for_status(
+                    compute_client.get_server,
                     server.id,
-                    success_status=['active', 'verify_resize'],
+                    success_status=('active', 'verify_resize'),
                     callback=_show_progress,
                 ):
-                    self.app.stdout.write(_('Complete\n'))
-                else:
                     msg = _('Error resizing server: %s') % server.id
                     raise exceptions.CommandError(msg)
+
+                self.app.stdout.write(_('Complete\n'))
         elif parsed_args.confirm:
             self.log.warning(
                 _(
@@ -4143,7 +4225,7 @@ release the new server and restart the old one."""
                     "'openstack server resize confirm' command instead."
                 )
             )
-            compute_client.servers.confirm_resize(server)
+            compute_client.confirm_server_resize(server)
         elif parsed_args.revert:
             self.log.warning(
                 _(
@@ -4151,7 +4233,7 @@ release the new server and restart the old one."""
                     "'openstack server resize revert' command instead."
                 )
             )
-            compute_client.servers.revert_resize(server)
+            compute_client.revert_server_resize(server)
 
 
 class ResizeConfirm(command.Command):
@@ -4162,7 +4244,7 @@ Confirm (verify) success of resize operation and release the old server."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(ResizeConfirm, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4171,12 +4253,11 @@ Confirm (verify) success of resize operation and release the old server."""
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        compute_client = self.app.client_manager.sdk_connection.compute
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
-        server.confirm_resize()
+        compute_client.confirm_server_resize(server)
 
 
 # TODO(stephenfin): Remove in OSC 7.0
@@ -4211,7 +4292,7 @@ one."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(ResizeRevert, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4220,12 +4301,11 @@ one."""
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        compute_client = self.app.client_manager.sdk_connection.compute
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
-        server.revert_resize()
+        compute_client.revert_server_resize(server)
 
 
 # TODO(stephenfin): Remove in OSC 7.0
@@ -4255,7 +4335,7 @@ class RestoreServer(command.Command):
     _description = _("Restore server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(RestoreServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4278,7 +4358,7 @@ class ResumeServer(command.Command):
     _description = _("Resume server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(ResumeServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4301,7 +4381,7 @@ class SetServer(command.Command):
     _description = _("Set server properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4389,14 +4469,13 @@ class SetServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        compute_client = self.app.client_manager.sdk_connection.compute
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
 
         if parsed_args.description:
-            if server.api_version < api_versions.APIVersion("2.19"):
+            if not sdk_utils.supports_microversion(compute_client, '2.19'):
                 msg = _(
                     '--os-compute-api-version 2.19 or greater is required to '
                     'support the --description option'
@@ -4404,7 +4483,7 @@ class SetServer(command.Command):
                 raise exceptions.CommandError(msg)
 
         if parsed_args.tags:
-            if server.api_version < api_versions.APIVersion('2.26'):
+            if not sdk_utils.supports_microversion(compute_client, '2.26'):
                 msg = _(
                     '--os-compute-api-version 2.26 or greater is required to '
                     'support the --tag option'
@@ -4412,7 +4491,7 @@ class SetServer(command.Command):
                 raise exceptions.CommandError(msg)
 
         if parsed_args.hostname:
-            if server.api_version < api_versions.APIVersion('2.90'):
+            if not sdk_utils.supports_microversion(compute_client, '2.90'):
                 msg = _(
                     '--os-compute-api-version 2.90 or greater is required to '
                     'support the --hostname option'
@@ -4431,30 +4510,32 @@ class SetServer(command.Command):
             update_kwargs['hostname'] = parsed_args.hostname
 
         if update_kwargs:
-            server.update(**update_kwargs)
+            compute_client.update_server(server, **update_kwargs)
 
         if parsed_args.properties:
-            compute_client.servers.set_meta(server, parsed_args.properties)
+            compute_client.set_server_metadata(
+                server, **parsed_args.properties
+            )
 
         if parsed_args.state:
-            server.reset_state(state=parsed_args.state)
+            compute_client.reset_server_state(server, state=parsed_args.state)
 
         if parsed_args.root_password:
             p1 = getpass.getpass(_('New password: '))
             p2 = getpass.getpass(_('Retype new password: '))
             if p1 == p2:
-                server.change_password(p1)
+                compute_client.change_server_password(server, p1)
             else:
                 msg = _("Passwords do not match, password unchanged")
                 raise exceptions.CommandError(msg)
         elif parsed_args.password:
-            server.change_password(parsed_args.password)
+            compute_client.change_server_password(server, parsed_args.password)
         elif parsed_args.no_password:
-            server.clear_password()
+            compute_client.clear_server_password(server)
 
         if parsed_args.tags:
             for tag in parsed_args.tags:
-                server.add_tag(tag=tag)
+                compute_client.add_tag_to_server(server, tag=tag)
 
 
 class ShelveServer(command.Command):
@@ -4575,7 +4656,7 @@ information for the server."""
     )
 
     def get_parser(self, prog_name):
-        parser = super(ShowServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4602,12 +4683,13 @@ information for the server."""
 
     def take_action(self, parsed_args):
         compute_client = self.app.client_manager.sdk_connection.compute
+        image_client = self.app.client_manager.image
 
-        # Find by name or ID, then get the full details of the server
         server = compute_client.find_server(
-            parsed_args.server, ignore_missing=False
+            parsed_args.server,
+            ignore_missing=False,
+            details=True,
         )
-        server = compute_client.get_server(server)
 
         if parsed_args.diagnostics:
             data = compute_client.get_server_diagnostics(server)
@@ -4625,17 +4707,10 @@ information for the server."""
             topology = server.fetch_topology(compute_client)
 
         data = _prep_server_detail(
-            # TODO(dannosliwcd): Replace these clients with SDK clients after
-            # all callers of _prep_server_detail() are using the SDK.
-            self.app.client_manager.compute,
-            self.app.client_manager.image,
-            server,
-            refresh=False,
+            compute_client, image_client, server, refresh=False
         )
-
         if topology:
             data['topology'] = format_columns.DictColumn(topology)
-
         return zip(*sorted(data.items()))
 
 
@@ -4643,7 +4718,7 @@ class SshServer(command.Command):
     _description = _("SSH to server")
 
     def get_parser(self, prog_name):
-        parser = super(SshServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4737,11 +4812,10 @@ class SshServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+        compute_client = self.app.client_manager.sdk_connection.compute
 
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
 
         # first, handle the deprecated options
@@ -4795,8 +4869,10 @@ class SshServer(command.Command):
         )
 
         cmd = ' '.join(['ssh', ip_address] + args)
-        LOG.debug("ssh command: {cmd}".format(cmd=cmd))
-        os.system(cmd)
+        LOG.debug(f"ssh command: {cmd}")
+        # we intentionally pass through user-provided arguments and run this in
+        # the user's shell
+        os.system(cmd)  # nosec: B605
 
 
 class StartServer(command.Command):
@@ -4815,7 +4891,7 @@ class StartServer(command.Command):
             action='store_true',
             default=boolenv('ALL_PROJECTS'),
             help=_(
-                'Start server(s) in another project by name (admin only)'
+                'Start server(s) in another project by name (admin only) '
                 '(can be specified using the ALL_PROJECTS envvar)'
             ),
         )
@@ -4824,17 +4900,12 @@ class StartServer(command.Command):
     def take_action(self, parsed_args):
         compute_client = self.app.client_manager.sdk_connection.compute
         for server in parsed_args.server:
-            try:
-                server_id = compute_client.find_server(
-                    server,
-                    ignore_missing=False,
-                    details=False,
-                    all_projects=parsed_args.all_projects,
-                ).id
-            except sdk_exceptions.HttpException as exc:
-                if exc.status_code == 403:
-                    msg = _("Policy doesn't allow passing all-projects")
-                    raise exceptions.Forbidden(msg)
+            server_id = compute_client.find_server(
+                server,
+                ignore_missing=False,
+                details=False,
+                all_projects=parsed_args.all_projects,
+            ).id
 
             compute_client.start_server(server_id)
 
@@ -4864,18 +4935,12 @@ class StopServer(command.Command):
     def take_action(self, parsed_args):
         compute_client = self.app.client_manager.sdk_connection.compute
         for server in parsed_args.server:
-            try:
-                server_id = compute_client.find_server(
-                    server,
-                    ignore_missing=False,
-                    details=False,
-                    all_projects=parsed_args.all_projects,
-                ).id
-            except sdk_exceptions.HttpException as exc:
-                if exc.status_code == 403:
-                    msg = _("Policy doesn't allow passing all-projects")
-                    raise exceptions.Forbidden(msg)
-
+            server_id = compute_client.find_server(
+                server,
+                ignore_missing=False,
+                details=False,
+                all_projects=parsed_args.all_projects,
+            ).id
             compute_client.stop_server(server_id)
 
 
@@ -4883,7 +4948,7 @@ class SuspendServer(command.Command):
     _description = _("Suspend server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(SuspendServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4929,7 +4994,7 @@ class UnpauseServer(command.Command):
     _description = _("Unpause server(s)")
 
     def get_parser(self, prog_name):
-        parser = super(UnpauseServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4952,7 +5017,7 @@ class UnrescueServer(command.Command):
     _description = _("Restore server from rescue mode")
 
     def get_parser(self, prog_name):
-        parser = super(UnrescueServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
@@ -4961,24 +5026,25 @@ class UnrescueServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        ).unrescue()
+        compute_client = self.app.client_manager.sdk_connection.compute
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
+        )
+        compute_client.unrescue_server(server)
 
 
 class UnsetServer(command.Command):
     _description = _("Unset server properties and tags")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetServer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
             metavar='<server>',
             help=_('Server (name or ID)'),
         )
-        parser.add_argument(
+        property_group = parser.add_mutually_exclusive_group()
+        property_group.add_argument(
             '--property',
             metavar='<key>',
             action='append',
@@ -4989,16 +5055,22 @@ class UnsetServer(command.Command):
                 '(repeat option to remove multiple values)'
             ),
         )
+        property_group.add_argument(
+            '--all-properties',
+            action='store_true',
+            help=_('Remove all properties'),
+        )
         parser.add_argument(
             '--description',
             dest='description',
             action='store_true',
             help=_(
-                'Unset server description (supported by '
-                '--os-compute-api-version 2.19 or above)'
+                'Unset server description '
+                '(supported by --os-compute-api-version 2.19 or above)'
             ),
         )
-        parser.add_argument(
+        tag_group = parser.add_mutually_exclusive_group()
+        tag_group.add_argument(
             '--tag',
             metavar='<tag>',
             action='append',
@@ -5010,32 +5082,40 @@ class UnsetServer(command.Command):
                 '(supported by --os-compute-api-version 2.26 or above)'
             ),
         )
+        tag_group.add_argument(
+            '--all-tags',
+            action='store_true',
+            help=_(
+                'Remove all tags '
+                '(supported by --os-compute-api-version 2.26 or above)'
+            ),
+        )
         return parser
 
     def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
+        compute_client = self.app.client_manager.sdk_connection.compute
+
+        server = compute_client.find_server(
+            parsed_args.server, ignore_missing=False
         )
 
-        if parsed_args.properties:
-            compute_client.servers.delete_meta(server, parsed_args.properties)
+        if parsed_args.properties or parsed_args.all_properties:
+            compute_client.delete_server_metadata(
+                server, parsed_args.properties or None
+            )
 
         if parsed_args.description:
-            if compute_client.api_version < api_versions.APIVersion("2.19"):
+            if not sdk_utils.supports_microversion(compute_client, '2.19'):
                 msg = _(
-                    '--os-compute-api-version 2.19 or greater is '
-                    'required to support the --description option'
+                    '--os-compute-api-version 2.19 or greater is required to '
+                    'support the --description option'
                 )
                 raise exceptions.CommandError(msg)
-            compute_client.servers.update(
-                server,
-                description="",
-            )
 
-        if parsed_args.tags:
-            if compute_client.api_version < api_versions.APIVersion('2.26'):
+            compute_client.update_server(server, description="")
+
+        if parsed_args.tags or parsed_args.all_tags:
+            if not sdk_utils.supports_microversion(compute_client, '2.26'):
                 msg = _(
                     '--os-compute-api-version 2.26 or greater is required to '
                     'support the --tag option'
@@ -5043,7 +5123,10 @@ class UnsetServer(command.Command):
                 raise exceptions.CommandError(msg)
 
             for tag in parsed_args.tags:
-                compute_client.servers.delete_tag(server, tag=tag)
+                compute_client.remove_tag_from_server(server, tag)
+
+            if parsed_args.all_tags:
+                compute_client.remove_tags_from_server(server)
 
 
 class UnshelveServer(command.Command):