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

openstackclient/compute/v2/server.py

@@ -17,11 +17,12 @@
 
 import argparse
 import base64
+from collections.abc import Iterable, Sequence
 import getpass
 import json
 import logging
 import os
-import typing as ty
+from typing import Any
 
 from cliff import columns as cliff_columns
 import iso8601
@@ -38,7 +39,6 @@ from openstackclient.common import envvars
 from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
-from openstackclient.network import common as network_common
 
 LOG = logging.getLogger(__name__)
 
@@ -59,28 +59,31 @@ class PowerStateColumn(cliff_columns.FormattableColumn[int]):
         'Suspended',  # 0x07
     ]
 
-    def human_readable(self):
+    def human_readable(self) -> str:
         try:
             return self.power_states[self._value]
         except Exception:
             return 'N/A'
 
 
-class AddressesColumn(cliff_columns.FormattableColumn[ty.Any]):
+class AddressesColumn(cliff_columns.FormattableColumn[Any]):
     """Generate a formatted string of a server's addresses."""
 
-    def human_readable(self):
+    def human_readable(self) -> str:
         try:
-            return utils.format_dict_of_list(
-                {
-                    k: [i['addr'] for i in v if 'addr' in i]
-                    for k, v in self._value.items()
-                }
+            return (
+                utils.format_dict_of_list(
+                    {
+                        k: [i['addr'] for i in v if 'addr' in i]
+                        for k, v in self._value.items()
+                    }
+                )
+                or ''
             )
         except Exception:
             return 'N/A'
 
-    def machine_readable(self):
+    def machine_readable(self) -> Any:
         return {
             k: [i['addr'] for i in v if 'addr' in i]
             for k, v in (self._value.items() if self._value else [])
@@ -90,14 +93,16 @@ class AddressesColumn(cliff_columns.FormattableColumn[ty.Any]):
 class HostColumn(cliff_columns.FormattableColumn[str | None]):
     """Generate a formatted string of a hostname."""
 
-    def human_readable(self):
+    def human_readable(self) -> str:
         if self._value is None:
             return ''
 
         return self._value
 
 
-def _get_ip_address(addresses, address_type, ip_address_family):
+def _get_ip_address(
+    addresses: Any, address_type: str, ip_address_family: list[int]
+) -> Any:
     # Old style addresses
     if address_type in addresses:
         for addy in addresses[address_type]:
@@ -130,7 +135,13 @@ 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: Any,
+    image_client: Any,
+    server: Any,
+    *,
+    refresh: bool = True,
+) -> dict[str, Any]:
     """Prepare the detailed server dict for printing
 
     :param compute_client: a compute client instance
@@ -352,7 +363,7 @@ def _prep_server_detail(compute_client, image_client, server, *, refresh=True):
 class AddFixedIP(command.ShowOne):
     _description = _("Add fixed IP address to server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -381,7 +392,9 @@ class AddFixedIP(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
         server = compute_client.find_server(
             parsed_args.server, ignore_missing=False
@@ -403,7 +416,7 @@ class AddFixedIP(command.ShowOne):
         else:
             net_id = parsed_args.network
 
-        kwargs = {'net_id': net_id}
+        kwargs: dict[str, Any] = {'net_id': net_id}
         if parsed_args.fixed_ip_address:
             kwargs['fixed_ips'] = [
                 {"ip_address": parsed_args.fixed_ip_address}
@@ -447,10 +460,11 @@ class AddFixedIP(command.ShowOne):
         )
 
 
-class AddFloatingIP(network_common.NetworkAndComputeCommand):
+class AddFloatingIP(command.Command):
     _description = _("Add floating IP address to server")
 
-    def update_parser_common(self, parser):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -475,7 +489,8 @@ class AddFloatingIP(network_common.NetworkAndComputeCommand):
         )
         return parser
 
-    def take_action_network(self, client, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        client = self.app.client_manager.network
         compute_client = self.app.client_manager.compute
 
         attrs = {}
@@ -534,19 +549,11 @@ class AddFloatingIP(network_common.NetworkAndComputeCommand):
             if error:
                 raise error
 
-    def take_action_compute(self, client, parsed_args):
-        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,
-        )
-
 
 class AddPort(command.Command):
     _description = _("Add port to server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -568,7 +575,7 @@ class AddPort(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -600,7 +607,7 @@ class AddPort(command.Command):
 class AddNetwork(command.Command):
     _description = _("Add network to server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -622,7 +629,7 @@ class AddNetwork(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -655,7 +662,7 @@ class AddNetwork(command.Command):
 class AddServerSecurityGroup(command.Command):
     _description = _("Add security group(s) to server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -673,7 +680,7 @@ class AddServerSecurityGroup(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -729,7 +736,7 @@ Specify ``--os-compute-api-version 2.20`` or higher to add a volume to a server
 with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -775,7 +782,9 @@ with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
         volume_client = self.app.client_manager.sdk_connection.volume
 
@@ -849,7 +858,12 @@ with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
 
 
 class NoneNICAction(argparse.Action):
-    def __init__(self, option_strings, dest, help=None):
+    def __init__(
+        self,
+        option_strings: list[str],
+        dest: str,
+        help: str | None = None,
+    ) -> None:
         super().__init__(
             option_strings=option_strings,
             dest=dest,
@@ -859,7 +873,13 @@ class NoneNICAction(argparse.Action):
             help=help,
         )
 
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         # Make sure we have an empty dict rather than None
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
@@ -868,7 +888,12 @@ class NoneNICAction(argparse.Action):
 
 
 class AutoNICAction(argparse.Action):
-    def __init__(self, option_strings, dest, help=None):
+    def __init__(
+        self,
+        option_strings: list[str],
+        dest: str,
+        help: str | None = None,
+    ) -> None:
         super().__init__(
             option_strings=option_strings,
             dest=dest,
@@ -878,7 +903,13 @@ class AutoNICAction(argparse.Action):
             help=help,
         )
 
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         # Make sure we have an empty dict rather than None
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
@@ -889,12 +920,12 @@ class AutoNICAction(argparse.Action):
 class NICAction(argparse.Action):
     def __init__(
         self,
-        option_strings,
-        dest,
-        help=None,
-        metavar=None,
-        key=None,
-    ):
+        option_strings: list[str],
+        dest: str,
+        help: str | None = None,
+        metavar: str | None = None,
+        key: str | None = None,
+    ) -> None:
         self.key = key
         super().__init__(
             option_strings=option_strings,
@@ -909,7 +940,13 @@ class NICAction(argparse.Action):
             metavar=metavar,
         )
 
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         # Make sure we have an empty dict rather than None
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
@@ -940,9 +977,9 @@ class NICAction(argparse.Action):
         }
 
         for kv_str in values.split(','):
-            k, sep, v = kv_str.partition('=')
+            k, _sep, v = kv_str.partition('=')
 
-            if k not in list(info) + ['tag'] or not v:
+            if k not in [*list(info), 'tag'] or not v:
                 msg = _(
                     "Invalid argument %s; argument must be of form "
                     "'net-id=net-uuid,port-id=port-uuid,v4-fixed-ip=ip-addr,"
@@ -970,12 +1007,18 @@ class NICAction(argparse.Action):
 
 
 class BDMLegacyAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         # Make sure we have an empty list rather than None
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        dev_name, sep, dev_map = values.partition('=')
+        dev_name, _sep, dev_map = values.partition('=')
         dev_map = dev_map.split(':') if dev_map else dev_map
         if not dev_name or not dev_map or len(dev_map) > 4:
             msg = _(
@@ -1014,7 +1057,9 @@ class BDMLegacyAction(argparse.Action):
 
 
 class BDMAction(parseractions.MultiKeyValueAction):
-    def __init__(self, option_strings, dest, **kwargs):
+    def __init__(
+        self, option_strings: list[str], dest: str, **kwargs: Any
+    ) -> None:
         optional_keys = [
             'uuid',
             'source_type',
@@ -1039,7 +1084,7 @@ class BDMAction(parseractions.MultiKeyValueAction):
 
     # TODO(stephenfin): Remove once I549d0897ef3704b7f47000f867d6731ad15d3f2b
     # or similar lands in a release
-    def validate_keys(self, keys):
+    def validate_keys(self, keys: Sequence[str]) -> None:
         """Validate the provided keys.
 
         :param keys: A list of keys to validate.
@@ -1075,7 +1120,13 @@ class BDMAction(parseractions.MultiKeyValueAction):
                 },
             )
 
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
@@ -1094,7 +1145,7 @@ class BDMAction(parseractions.MultiKeyValueAction):
 class CreateServer(command.ShowOne):
     _description = _("Create a new server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server_name',
@@ -1535,8 +1586,10 @@ class CreateServer(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -1554,7 +1607,7 @@ class CreateServer(command.ShowOne):
 
         if not image and parsed_args.image_properties:
 
-            def _match_image(image_api, wanted_properties):
+            def _match_image(image_api: Any, wanted_properties: Any) -> Any:
                 image_list = image_api.images()
                 images_matched = []
                 for img in image_list:
@@ -1909,6 +1962,7 @@ class CreateServer(command.ShowOne):
 
             networks = parsed_args.nics[0]
         else:
+            _networks = []
             for nic in parsed_args.nics:
                 if 'tag' in nic:
                     if not sdk_utils.supports_microversion(
@@ -1969,7 +2023,8 @@ class CreateServer(command.ShowOne):
                 if nic.get('tag'):  # tags are optional
                     network['tag'] = nic['tag']
 
-                networks.append(network)  # type: ignore[union-attr]
+                _networks.append(network)
+            networks = _networks
 
         if not parsed_args.nics and sdk_utils.supports_microversion(
             compute_client, '2.37'
@@ -2153,7 +2208,8 @@ class CreateServer(command.ShowOne):
                 raise exceptions.CommandError(msg)
 
         data = _prep_server_detail(compute_client, image_client, server)
-        return zip(*sorted(data.items()))
+        col_headers, col_data = zip(*sorted(data.items()))
+        return col_headers, col_data
 
 
 class CreateServerDump(command.Command):
@@ -2168,7 +2224,7 @@ class CreateServerDump(command.Command):
     This command requires ``--os-compute-api-version`` 2.17 or greater.
     """
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -2178,7 +2234,7 @@ class CreateServerDump(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for name_or_id in parsed_args.server:
             server = compute_client.find_server(
@@ -2190,7 +2246,7 @@ class CreateServerDump(command.Command):
 class DeleteServer(command.Command):
     _description = _("Delete server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -2219,8 +2275,8 @@ class DeleteServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -2273,17 +2329,17 @@ class DeleteServer(command.Command):
 class PercentAction(argparse.Action):
     def __init__(
         self,
-        option_strings,
-        dest,
-        nargs=None,
-        const=None,
-        default=None,
-        type=None,
-        choices=None,
-        required=False,
-        help=None,
-        metavar=None,
-    ):
+        option_strings: list[str],
+        dest: str,
+        nargs: int | str | None = None,
+        const: Any = None,
+        default: Any = None,
+        type: Any = None,
+        choices: Any = None,
+        required: bool = False,
+        help: str | None = None,
+        metavar: str | tuple[str, ...] | None = None,
+    ) -> None:
         if nargs == 0:
             raise ValueError(
                 'nargs for store actions must be != 0; if you '
@@ -2307,7 +2363,13 @@ class PercentAction(argparse.Action):
             metavar=metavar,
         )
 
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: Any,
+        option_string: str | None = None,
+    ) -> None:
         x = int(values)
         if not 0 < x <= 100:
             raise argparse.ArgumentError(self, "Must be between 0 and 100")
@@ -2317,7 +2379,7 @@ class PercentAction(argparse.Action):
 class ListServer(command.Lister):
     _description = _("List servers")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             '--reservation-id',
@@ -2657,7 +2719,9 @@ class ListServer(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
         compute_client = self.app.client_manager.compute
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
@@ -2790,6 +2854,9 @@ class ListServer(command.Lister):
             search_opts['limit'] = parsed_args.limit
             search_opts['paginated'] = False
 
+        if parsed_args.max_items is not None:
+            search_opts['max_items'] = parsed_args.max_items
+
         LOG.debug('search options: %s', search_opts)
 
         if search_opts['changes-before']:
@@ -3038,8 +3105,8 @@ class ListServer(command.Lister):
             else:
                 try:
                     flavors_list = compute_client.flavors(is_public=None)
-                    for i in flavors_list:
-                        flavors[i.id] = i
+                    for f in flavors_list:
+                        flavors[f.id] = f
                 except Exception:  # noqa: S110
                     # retrieving flavor names is not crucial, so we swallow any
                     # exceptions
@@ -3060,30 +3127,33 @@ class ListServer(command.Lister):
             if 'id' in s.image and s.image.id is not None:
                 image = images.get(s.image['id'])
                 if image:
-                    s.image_name = image.name
+                    setattr(s, 'image_name', image.name)
                 s.image_id = s.image['id']
             else:
                 # NOTE(melwitt): An server booted from a volume will have no
                 # image associated with it. We fill in the Image Name and ID
                 # with "N/A (booted from volume)" to help users who want to be
                 # able to grep for boot-from-volume servers when using the CLI.
-                s.image_name = IMAGE_STRING_FOR_BFV
+                setattr(s, 'image_name', IMAGE_STRING_FOR_BFV)
                 s.image_id = IMAGE_STRING_FOR_BFV
 
             if not sdk_utils.supports_microversion(compute_client, '2.47'):
-                flavor = flavors.get(s.flavor['id'])
-                if flavor:
-                    s.flavor_name = flavor.name
+                if s.flavor['id'] in flavors:
+                    setattr(s, 'flavor_name', flavors[s.flavor['id']].name)
                 s.flavor_id = s.flavor['id']
             else:
-                s.flavor_name = s.flavor['original_name']
+                setattr(s, 'flavor_name', s.flavor['original_name'])
 
         # Add a list with security group name as attribute
         for s in data:
             if hasattr(s, 'security_groups') and s.security_groups is not None:
-                s.security_groups_name = [x["name"] for x in s.security_groups]
+                setattr(
+                    s,
+                    'security_groups_name',
+                    [x["name"] for x in s.security_groups],
+                )
             else:
-                s.security_groups_name = []
+                setattr(s, 'security_groups_name', [])
 
         # The host_status field contains the status of the compute host the
         # server is on. It is only returned by the API when the nova-api
@@ -3134,7 +3204,7 @@ class LockServer(command.Command):
 A non-admin user will not be able to execute actions."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3153,7 +3223,7 @@ A non-admin user will not be able to execute actions."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         kwargs = {}
@@ -3189,16 +3259,25 @@ class MigrateServer(command.Command):
     _description = _(
         """Migrate server to different host.
 
-A migrate operation is implemented as a resize operation using the same flavor
-as the old server. This means that, like resize, migrate works by creating a
-new server using the same flavor and copying the contents of the original disk
-into a new one. As with resize, the migrate operation is a two-step process for
-the user: the first step is to perform the migrate, and the second step is to
-either confirm (verify) success and release the old server, or to declare a
-revert to release the new server and restart the old one."""
+There are two types of migration operation: a cold migration and a live
+migration.
+
+A cold migration operation is implemented as a resize operation
+using the same flavor as the old server. This means that, like resize, migrate
+works by shutting down the original server, creating a new server using the
+same flavor and copying the contents of the original disk into a new one.
+As with resize, the migrate operation is a two-step process for the user:
+the first step is to perform the migrate, and the second step is to either
+confirm (verify) success and release the old server, or to declare a revert
+to release the new server and restart the old one.
+
+By comparison, a live migration operation does not involve shutting the server
+down, and is a one-step process that does not require a confirmation or revert
+to finish.
+"""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3272,8 +3351,8 @@ revert to release the new server and restart the old one."""
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -3370,7 +3449,7 @@ revert to release the new server and restart the old one."""
 class PauseServer(command.Command):
     _description = _("Pause server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3380,7 +3459,7 @@ class PauseServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -3393,7 +3472,7 @@ class PauseServer(command.Command):
 class RebootServer(command.Command):
     _description = _("Perform a hard or soft server reboot")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3424,8 +3503,8 @@ class RebootServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -3453,7 +3532,7 @@ class RebootServer(command.Command):
 class RebuildServer(command.ShowOne):
     _description = _("Rebuild server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3629,8 +3708,10 @@ class RebuildServer(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -3822,7 +3903,8 @@ class RebuildServer(command.ShowOne):
         data = _prep_server_detail(
             compute_client, image_client, server, refresh=False
         )
-        return zip(*sorted(data.items()))
+        col_headers, col_data = zip(*sorted(data.items()))
+        return col_headers, col_data
 
 
 class EvacuateServer(command.ShowOne):
@@ -3843,7 +3925,7 @@ root disk will be preserved and reused for the evacuated instance on the new
 host."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -3890,8 +3972,10 @@ host."""
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -3946,13 +4030,14 @@ host."""
                 raise exceptions.CommandError(msg)
 
         data = _prep_server_detail(compute_client, image_client, server)
-        return zip(*sorted(data.items()))
+        col_headers, col_data = zip(*sorted(data.items()))
+        return col_headers, col_data
 
 
 class RemoveFixedIP(command.Command):
     _description = _("Remove fixed IP address from server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -3966,7 +4051,7 @@ class RemoveFixedIP(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -3977,10 +4062,11 @@ class RemoveFixedIP(command.Command):
         )
 
 
-class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
+class RemoveFloatingIP(command.Command):
     _description = _("Remove floating IP address from server")
 
-    def update_parser_common(self, parser):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -3995,7 +4081,8 @@ class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
         )
         return parser
 
-    def take_action_network(self, client, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        client = self.app.client_manager.network
         obj = client.find_ip(
             parsed_args.ip_address,
             ignore_missing=False,
@@ -4003,15 +4090,11 @@ class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
 
         client.update_ip(obj, port_id=None)
 
-    def take_action_compute(self, client, parsed_args):
-        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):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -4025,7 +4108,7 @@ class RemovePort(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -4050,7 +4133,7 @@ class RemovePort(command.Command):
 class RemoveNetwork(command.Command):
     _description = _("Remove all ports of a network from server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "server",
@@ -4064,7 +4147,7 @@ class RemoveNetwork(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -4090,7 +4173,7 @@ class RemoveNetwork(command.Command):
 class RemoveServerSecurityGroup(command.Command):
     _description = _("Remove security group from server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4108,7 +4191,7 @@ class RemoveServerSecurityGroup(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -4164,7 +4247,7 @@ Specify ``--os-compute-api-version 2.20`` or higher to remove a
 volume from a server with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4178,9 +4261,11 @@ volume from a server with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
-        volume_client = self.app.client_manager.sdk_connection.volume
+        volume_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.volume, '3'
+        )
 
         server = compute_client.find_server(
             parsed_args.server,
@@ -4192,8 +4277,8 @@ volume from a server with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
         )
 
         compute_client.delete_volume_attachment(
-            volume,
             server,
+            volume,
             ignore_missing=False,
         )
 
@@ -4206,7 +4291,7 @@ Specify ``--os-compute-api-version 2.87`` or higher to rescue a
 server booted from a volume."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4231,7 +4316,7 @@ server booted from a volume."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         image_client = self.app.client_manager.image
 
@@ -4260,7 +4345,7 @@ confirm (verify) success and release the old server or to declare a revert to
 release the new server and restart the old one."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4298,8 +4383,8 @@ release the new server and restart the old one."""
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -4356,7 +4441,7 @@ class ResizeConfirm(command.Command):
 Confirm (verify) success of resize operation and release the old server."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4365,7 +4450,7 @@ Confirm (verify) success of resize operation and release the old server."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         server = compute_client.find_server(
             parsed_args.server, ignore_missing=False
@@ -4377,7 +4462,7 @@ Confirm (verify) success of resize operation and release the old server."""
 class MigrateConfirm(ResizeConfirm):
     _description = _("DEPRECATED: Use 'server migration confirm' instead.")
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         msg = _(
             "The 'server migrate confirm' command has been deprecated in "
             "favour of the 'server migration confirm' command."
@@ -4404,7 +4489,7 @@ Revert the resize operation. Release the new server and restart the old
 one."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4413,7 +4498,7 @@ one."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         server = compute_client.find_server(
             parsed_args.server, ignore_missing=False
@@ -4425,7 +4510,7 @@ one."""
 class MigrateRevert(ResizeRevert):
     _description = _("DEPRECATED: Use 'server migration revert' instead.")
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         msg = _(
             "The 'server migrate revert' command has been deprecated in "
             "favour of the 'server migration revert' command."
@@ -4447,7 +4532,7 @@ one."""
 class RestoreServer(command.Command):
     _description = _("Restore server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4457,7 +4542,7 @@ class RestoreServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -4470,7 +4555,7 @@ class RestoreServer(command.Command):
 class ResumeServer(command.Command):
     _description = _("Resume server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4480,7 +4565,7 @@ class ResumeServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -4493,7 +4578,7 @@ class ResumeServer(command.Command):
 class SetServer(command.Command):
     _description = _("Set server properties")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4593,7 +4678,7 @@ class SetServer(command.Command):
         return parser
 
     @staticmethod
-    def ask_user_yesno(msg):
+    def ask_user_yesno(msg: str) -> bool:
         """Ask user Y/N question
 
         :param str msg: question text
@@ -4606,7 +4691,7 @@ class SetServer(command.Command):
             elif answer in ('n', 'N', 'no'):
                 return False
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         server = compute_client.find_server(
             parsed_args.server, ignore_missing=False
@@ -4704,7 +4789,7 @@ class ShelveServer(command.Command):
     specified. This is an admin-only operation by default.
     """
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'servers',
@@ -4730,8 +4815,8 @@ class ShelveServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()
@@ -4804,7 +4889,7 @@ Specify ``--os-compute-api-version 2.47`` or higher to see the embedded flavor
 information for the server."""
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4830,7 +4915,9 @@ information for the server."""
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
         image_client = self.app.client_manager.image
 
@@ -4841,8 +4928,9 @@ information for the server."""
         )
 
         if parsed_args.diagnostics:
-            data = compute_client.get_server_diagnostics(server)
-            return zip(*sorted(data.items()))
+            diagnostics = compute_client.get_server_diagnostics(server)
+            col_headers, col_data = zip(*sorted(diagnostics.items()))
+            return col_headers, col_data
 
         topology = None
         if parsed_args.topology:
@@ -4860,13 +4948,14 @@ information for the server."""
         )
         if topology:
             data['topology'] = format_columns.DictColumn(topology)
-        return zip(*sorted(data.items()))
+        col_headers, col_data = zip(*sorted(data.items()))
+        return col_headers, col_data
 
 
 class SshServer(command.Command):
     _description = _("SSH to server")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -4960,7 +5049,7 @@ class SshServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -5017,7 +5106,7 @@ class SshServer(command.Command):
             ip_address_family,
         )
 
-        cmd = ' '.join(['ssh', ip_address] + args)
+        cmd = ' '.join(['ssh', ip_address, *args])
         LOG.debug('ssh command: %s', cmd)
         # we intentionally pass through user-provided arguments and run this in
         # the user's shell
@@ -5027,7 +5116,7 @@ class SshServer(command.Command):
 class StartServer(command.Command):
     _description = _("Start server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5046,7 +5135,7 @@ class StartServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -5062,7 +5151,7 @@ class StartServer(command.Command):
 class StopServer(command.Command):
     _description = _("Stop server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5081,7 +5170,7 @@ class StopServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -5096,7 +5185,7 @@ class StopServer(command.Command):
 class SuspendServer(command.Command):
     _description = _("Suspend server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5106,7 +5195,7 @@ class SuspendServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -5119,7 +5208,7 @@ class SuspendServer(command.Command):
 class UnlockServer(command.Command):
     _description = _("Unlock server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5129,7 +5218,7 @@ class UnlockServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -5142,7 +5231,7 @@ class UnlockServer(command.Command):
 class UnpauseServer(command.Command):
     _description = _("Unpause server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5152,7 +5241,7 @@ class UnpauseServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         for server in parsed_args.server:
             server_id = compute_client.find_server(
@@ -5165,7 +5254,7 @@ class UnpauseServer(command.Command):
 class UnrescueServer(command.Command):
     _description = _("Restore server from rescue mode")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5174,7 +5263,7 @@ class UnrescueServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
         server = compute_client.find_server(
             parsed_args.server, ignore_missing=False
@@ -5185,7 +5274,7 @@ class UnrescueServer(command.Command):
 class UnsetServer(command.Command):
     _description = _("Unset server properties and tags")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5241,7 +5330,7 @@ class UnsetServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
 
         server = compute_client.find_server(
@@ -5281,7 +5370,7 @@ class UnsetServer(command.Command):
 class UnshelveServer(command.Command):
     _description = _("Unshelve server(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'server',
@@ -5327,8 +5416,8 @@ class UnshelveServer(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        def _show_progress(progress):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        def _show_progress(progress: int | None) -> None:
             if progress:
                 self.app.stdout.write(f'\rProgress: {progress}')
                 self.app.stdout.flush()