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

openstackclient/image/v2/image.py

@@ -17,15 +17,17 @@
 
 import argparse
 from base64 import b64encode
+from collections.abc import Iterable, Sequence
 import copy
 import logging
 import os
 import sys
-import typing as ty
+from typing import Any
 import urllib.parse
 
 from openstack import exceptions as sdk_exceptions
 from openstack.image import image_signer
+from openstack.image.v2 import image as _image
 from openstack import utils as sdk_utils
 from osc_lib.api import utils as api_utils
 from osc_lib.cli import format_columns
@@ -73,11 +75,13 @@ MEMBER_STATUS_CHOICES = ["accepted", "pending", "rejected", "all"]
 LOG = logging.getLogger(__name__)
 
 
-def _format_image(image, human_readable=False):
+def _format_image(
+    image: _image.Image, human_readable: bool = False
+) -> dict[str, object]:
     """Format an image to make it more consistent with OSC operations."""
 
     info = {}
-    properties = {}
+    properties: dict[str, object] = {}
 
     # the only fields we're not including is "links", "tags" and the properties
     fields_to_show = [
@@ -105,25 +109,25 @@ def _format_image(image, human_readable=False):
 
     # TODO(gtema/anybody): actually it should be possible to drop this method,
     # since SDK already delivers a proper object
-    image = image.to_dict(ignore_none=True, original_names=True)
+    data = image.to_dict(ignore_none=True, original_names=True)
 
     # split out the usual key and the properties which are top-level
-    for key in image:
+    for key in data:
         if key in fields_to_show:
-            info[key] = image.get(key)
+            info[key] = data[key]
         elif key == 'tags':
             continue  # handle this later
         elif key == 'properties':
             # NOTE(gtema): flatten content of properties
-            properties.update(image.get(key))
+            properties.update(data[key])
         elif key != 'location':
-            properties[key] = image.get(key)
+            properties[key] = data[key]
 
     if human_readable:
-        info['size'] = utils.format_size(image['size'])
+        info['size'] = utils.format_size(data['size'])
 
     # format the tags if they are there
-    info['tags'] = format_columns.ListColumn(image.get('tags'))
+    info['tags'] = format_columns.ListColumn(data.get('tags') or [])
 
     # add properties back into the dictionary as a top-level key
     if properties:
@@ -137,7 +141,7 @@ _formatters = {
 }
 
 
-def _get_member_columns(item):
+def _get_member_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map = {'image_id': 'image_id'}
     hidden_columns = ['id', 'location', 'name']
     return utils.get_osc_show_columns_for_sdk_resource(
@@ -147,7 +151,7 @@ def _get_member_columns(item):
     )
 
 
-def get_data_from_stdin():
+def get_data_from_stdin() -> Any:
     # distinguish cases where:
     # (1) stdin is not valid (as in cron jobs):
     #    openstack ... <&-
@@ -166,10 +170,10 @@ def get_data_from_stdin():
         image = sys.stdin
         if hasattr(sys.stdin, 'buffer'):
             image = sys.stdin.buffer
-        if os.name == "nt":
+        if sys.platform == "win32":
             import msvcrt
 
-            msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)  # type: ignore
+            msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
 
         return image
     else:
@@ -177,7 +181,7 @@ def get_data_from_stdin():
         return None
 
 
-def _add_is_protected_args(parser):
+def _add_is_protected_args(parser: argparse.ArgumentParser) -> None:
     protected_group = parser.add_mutually_exclusive_group()
     protected_group.add_argument(
         "--protected",
@@ -195,7 +199,7 @@ def _add_is_protected_args(parser):
     )
 
 
-def _add_visibility_args(parser):
+def _add_visibility_args(parser: argparse.ArgumentParser) -> None:
     public_group = parser.add_mutually_exclusive_group()
     public_group.add_argument(
         "--public",
@@ -241,7 +245,7 @@ def _add_visibility_args(parser):
 class AddProjectToImage(command.ShowOne):
     _description = _("Associate project with image")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "image",
@@ -256,7 +260,9 @@ class AddProjectToImage(command.ShowOne):
         identity_common.add_project_domain_option_to_parser(parser)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
         identity_client = self.app.client_manager.identity
 
@@ -287,7 +293,7 @@ class CreateImage(command.ShowOne):
 
     deadopts = ('size', 'location', 'copy-from', 'checksum', 'store')
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         # TODO(bunting): There are additional arguments that v1 supported
         # that v2 either doesn't support or supports weirdly.
@@ -440,13 +446,15 @@ class CreateImage(command.ShowOne):
             )
         return parser
 
-    def _take_action_image(self, parsed_args):
+    def _take_action_image(
+        self, parsed_args: argparse.Namespace
+    ) -> dict[str, Any]:
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
 
         # Build an attribute dict from the parsed args, only include
         # attributes that were actually set on the command line
-        kwargs: dict[str, ty.Any] = {'allow_duplicates': True}
+        kwargs: dict[str, Any] = {'allow_duplicates': True}
         copy_attrs = (
             'name',
             'id',
@@ -592,8 +600,12 @@ class CreateImage(command.ShowOne):
         image = image_client.get_image(image)
         return _format_image(image)
 
-    def _take_action_volume(self, parsed_args):
-        volume_client = self.app.client_manager.sdk_connection.volume
+    def _take_action_volume(
+        self, parsed_args: argparse.Namespace
+    ) -> dict[str, Any]:
+        volume_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.volume, '3'
+        )
 
         unsupported_opts = {
             # 'name',  # 'name' is a positional argument and will always exist
@@ -627,7 +639,7 @@ class CreateImage(command.ShowOne):
         source_volume = volume_client.find_volume(
             parsed_args.volume, ignore_missing=False
         )
-        kwargs: dict[str, ty.Any] = {
+        kwargs: dict[str, Any] = {
             'visibility': None,
             'protected': None,
         }
@@ -643,7 +655,7 @@ class CreateImage(command.ShowOne):
             kwargs['visibility'] = parsed_args.visibility or 'private'
             kwargs['protected'] = parsed_args.is_protected or False
 
-        response = volume_client.upload_volume_to_image(
+        response: dict[str, Any] = volume_client.upload_volume_to_image(
             source_volume.id,
             parsed_args.name,
             force=parsed_args.force,
@@ -659,7 +671,9 @@ class CreateImage(command.ShowOne):
 
         return info
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         for deadopt in self.deadopts:
             if getattr(parsed_args, deadopt.replace('-', '_'), None):
                 msg = _(
@@ -673,13 +687,14 @@ class CreateImage(command.ShowOne):
         else:
             info = self._take_action_image(parsed_args)
 
-        return zip(*sorted(info.items()))
+        col_headers, col_data = zip(*sorted(info.items()))
+        return col_headers, col_data
 
 
 class DeleteImage(command.Command):
     _description = _("Delete image(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(
             "images",
@@ -696,7 +711,7 @@ class DeleteImage(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         result = 0
         image_client = self.app.client_manager.image
         for image in parsed_args.images:
@@ -732,7 +747,7 @@ class DeleteImage(command.Command):
 class ListImage(command.Lister):
     _description = _("List available images")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         public_group = parser.add_mutually_exclusive_group()
         public_group.add_argument(
@@ -861,7 +876,9 @@ class ListImage(command.Lister):
         pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
 
@@ -870,6 +887,8 @@ class ListImage(command.Lister):
             kwargs['visibility'] = parsed_args.visibility
         if parsed_args.limit:
             kwargs['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            kwargs['max_items'] = parsed_args.max_items
         if parsed_args.marker:
             kwargs['marker'] = image_client.find_image(
                 parsed_args.marker,
@@ -962,7 +981,7 @@ class ListImage(command.Lister):
 class ListImageProjects(command.Lister):
     _description = _("List projects associated with image")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "image",
@@ -972,7 +991,9 @@ class ListImageProjects(command.Lister):
         identity_common.add_project_domain_option_to_parser(parser)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
         image_client = self.app.client_manager.image
         columns: tuple[str, ...] = ("Image ID", "Member ID", "Status")
 
@@ -998,7 +1019,7 @@ class ListImageProjects(command.Lister):
 class RemoveProjectImage(command.Command):
     _description = _("Disassociate project with image")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "image",
@@ -1013,7 +1034,7 @@ class RemoveProjectImage(command.Command):
         identity_common.add_project_domain_option_to_parser(parser)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         image_client = self.app.client_manager.image
         identity_client = self.app.client_manager.identity
 
@@ -1034,7 +1055,7 @@ class RemoveProjectImage(command.Command):
 class ShowProjectImage(command.ShowOne):
     _description = _("Show a particular project associated with image")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "image",
@@ -1049,7 +1070,9 @@ class ShowProjectImage(command.ShowOne):
         identity_common.add_project_domain_option_to_parser(parser)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
 
         image = image_client.find_image(
@@ -1071,7 +1094,7 @@ class ShowProjectImage(command.ShowOne):
 class SaveImage(command.Command):
     _description = _("Save an image locally")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "--chunk-size",
@@ -1096,7 +1119,7 @@ class SaveImage(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         image_client = self.app.client_manager.image
         image = image_client.find_image(
             parsed_args.image,
@@ -1120,7 +1143,7 @@ class SetImage(command.Command):
 
     deadopts = ('visibility',)
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         # TODO(bunting): There are additional arguments that v1 supported
         # --size - does not exist in v2
@@ -1296,7 +1319,7 @@ class SetImage(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
 
@@ -1340,6 +1363,7 @@ class SetImage(command.Command):
             # our own membership
             if not project_id:
                 project_id = self.app.client_manager.auth_ref.project_id
+                assert project_id is not None, 'this should not happen'
             image_client.update_member(
                 image=image.id,
                 member=project_id,
@@ -1421,7 +1445,7 @@ class SetImage(command.Command):
 class ShowImage(command.ShowOne):
     _description = _("Display image details")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "--human-readable",
@@ -1436,7 +1460,9 @@ class ShowImage(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
 
         image = image_client.find_image(
@@ -1445,13 +1471,14 @@ class ShowImage(command.ShowOne):
         )
 
         info = _format_image(image, parsed_args.human_readable)
-        return zip(*sorted(info.items()))
+        col_headers, col_data = zip(*sorted(info.items()))
+        return col_headers, col_data
 
 
 class UnsetImage(command.Command):
     _description = _("Unset image tags and 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(
             "image",
@@ -1482,7 +1509,7 @@ class UnsetImage(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         image_client = self.app.client_manager.image
         image = image_client.find_image(
             parsed_args.image,
@@ -1501,7 +1528,7 @@ class UnsetImage(command.Command):
                     )
                     tagret += 1
 
-        kwargs: dict[str, ty.Any] = {}
+        kwargs: dict[str, Any] = {}
         if parsed_args.properties:
             for k in parsed_args.properties:
                 if k in image:
@@ -1512,7 +1539,7 @@ class UnsetImage(command.Command):
                     # out, what was changed inside
                     # NOTE: ping gtema to improve that in SDK
                     new_props = kwargs.get(
-                        'properties', image.get('properties').copy()
+                        'properties', image['properties'].copy()
                     )
                     new_props.pop(k, None)
                     kwargs['properties'] = new_props
@@ -1569,7 +1596,7 @@ class StageImage(command.Command):
         "(Glance 16.0.0 (Queens))"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
 
         parser.add_argument(
@@ -1599,7 +1626,7 @@ class StageImage(command.Command):
 
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         image_client = self.app.client_manager.image
 
         image = image_client.find_image(
@@ -1619,7 +1646,7 @@ class StageImage(command.Command):
         else:
             fp = get_data_from_stdin()
 
-        kwargs: dict[str, ty.Any] = {}
+        kwargs: dict[str, Any] = {}
 
         if parsed_args.progress and parsed_args.filename:
             # NOTE(stephenfin): we only show a progress bar if the user
@@ -1645,7 +1672,7 @@ class ImportImage(command.ShowOne):
         "(Glance 16.0.0 (Queens))"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
 
         parser.add_argument(
@@ -1756,7 +1783,9 @@ class ImportImage(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
 
         try:
@@ -1886,7 +1915,8 @@ class ImportImage(command.ShowOne):
         )
 
         info = _format_image(image)
-        return zip(*sorted(info.items()))
+        col_headers, col_data = zip(*sorted(info.items()))
+        return col_headers, col_data
 
 
 class StoresInfo(command.Lister):
@@ -1894,7 +1924,7 @@ class StoresInfo(command.Lister):
         "Get available backends (only valid with Multi-Backend support)"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             "--detail",
@@ -1907,7 +1937,9 @@ class StoresInfo(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
         image_client = self.app.client_manager.image
         try:
             columns: tuple[str, ...] = ("id", "description", "is_default")

openstackclient/image/v2/info.py

@@ -11,6 +11,10 @@
 # under the License.
 
 
+import argparse
+from collections.abc import Iterable, Sequence
+from typing import Any
+
 from osc_lib.cli import format_columns
 
 from openstackclient import command
@@ -20,7 +24,9 @@ from openstackclient.i18n import _
 class ImportInfo(command.ShowOne):
     _description = _("Show available import methods")
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
 
         import_info = image_client.get_import_info()