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

openstackclient/volume/v2/volume_host.py

@@ -23,7 +23,7 @@ class FailoverVolumeHost(command.Command):
     _description = _("Failover volume host to different backend")
 
     def get_parser(self, prog_name):
-        parser = super(FailoverVolumeHost, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "host", metavar="<host-name>", help=_("Name of volume host")
         )
@@ -49,7 +49,7 @@ class SetVolumeHost(command.Command):
     _description = _("Set volume host properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetVolumeHost, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "host", metavar="<host-name>", help=_("Name of volume host")
         )

openstackclient/volume/v2/volume_snapshot.py

@@ -45,7 +45,7 @@ class VolumeIdColumn(cliff_columns.FormattableColumn):
     """
 
     def __init__(self, value, volume_cache=None):
-        super(VolumeIdColumn, self).__init__(value)
+        super().__init__(value)
         self._volume_cache = volume_cache or {}
 
     def human_readable(self):
@@ -64,7 +64,7 @@ class CreateVolumeSnapshot(command.ShowOne):
     _description = _("Create new volume snapshot")
 
     def get_parser(self, prog_name):
-        parser = super(CreateVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "snapshot_name",
             metavar="<snapshot-name>",
@@ -159,7 +159,7 @@ class DeleteVolumeSnapshot(command.Command):
     _description = _("Delete volume snapshot(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "snapshots",
             metavar="<snapshot>",
@@ -210,7 +210,7 @@ class ListVolumeSnapshot(command.Lister):
     _description = _("List volume snapshots")
 
     def get_parser(self, prog_name):
-        parser = super(ListVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--all-projects',
             action='store_true',
@@ -289,7 +289,7 @@ class ListVolumeSnapshot(command.Lister):
                 volume_cache[s.id] = s
         except Exception:
             # Just forget it if there's any trouble
-            pass
+            pass  # nosec: B110
         _VolumeIdColumn = functools.partial(
             VolumeIdColumn, volume_cache=volume_cache
         )
@@ -346,7 +346,7 @@ class SetVolumeSnapshot(command.Command):
     _description = _("Set volume snapshot properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'snapshot',
             metavar='<snapshot>',
@@ -461,7 +461,7 @@ class ShowVolumeSnapshot(command.ShowOne):
     _description = _("Display volume snapshot details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "snapshot",
             metavar="<snapshot>",
@@ -488,7 +488,7 @@ class UnsetVolumeSnapshot(command.Command):
     _description = _("Unset volume snapshot properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetVolumeSnapshot, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'snapshot',
             metavar='<snapshot>',

openstackclient/volume/v2/volume_transfer_request.py

@@ -16,7 +16,6 @@
 
 import logging
 
-from cinderclient import api_versions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
@@ -31,7 +30,7 @@ class AcceptTransferRequest(command.ShowOne):
     _description = _("Accept volume transfer request.")
 
     def get_parser(self, prog_name):
-        parser = super(AcceptTransferRequest, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'transfer_request',
             metavar="<transfer-request-id>",
@@ -70,31 +69,12 @@ class CreateTransferRequest(command.ShowOne):
     _description = _("Create volume transfer request.")
 
     def get_parser(self, prog_name):
-        parser = super(CreateTransferRequest, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--name',
             metavar="<name>",
             help=_('New transfer request name (default to None)'),
         )
-        parser.add_argument(
-            '--snapshots',
-            action='store_true',
-            dest='snapshots',
-            help=_(
-                'Allow transfer volumes without snapshots (default) '
-                '(supported by --os-volume-api-version 3.55 or later)'
-            ),
-            default=None,
-        )
-        parser.add_argument(
-            '--no-snapshots',
-            action='store_false',
-            dest='snapshots',
-            help=_(
-                'Disallow transfer volumes without snapshots '
-                '(supported by --os-volume-api-version 3.55 or later)'
-            ),
-        )
         parser.add_argument(
             'volume',
             metavar="<volume>",
@@ -107,18 +87,6 @@ class CreateTransferRequest(command.ShowOne):
 
         kwargs = {}
 
-        if parsed_args.snapshots is not None:
-            if volume_client.api_version < api_versions.APIVersion('3.55'):
-                msg = _(
-                    "--os-volume-api-version 3.55 or greater is required to "
-                    "support the '--(no-)snapshots' option"
-                )
-                raise exceptions.CommandError(msg)
-
-            # unfortunately this option is negative so we have to reverse
-            # things
-            kwargs['no_snapshots'] = not parsed_args.snapshots
-
         volume_id = utils.find_resource(
             volume_client.volumes,
             parsed_args.volume,
@@ -137,7 +105,7 @@ class DeleteTransferRequest(command.Command):
     _description = _("Delete volume transfer request(s).")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteTransferRequest, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'transfer_request',
             metavar="<transfer-request>",
@@ -180,7 +148,7 @@ class ListTransferRequest(command.Lister):
     _description = _("Lists all volume transfer requests.")
 
     def get_parser(self, prog_name):
-        parser = super(ListTransferRequest, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--all-projects',
             dest='all_projects',
@@ -214,7 +182,7 @@ class ShowTransferRequest(command.ShowOne):
     _description = _("Show volume transfer request details.")
 
     def get_parser(self, prog_name):
-        parser = super(ShowTransferRequest, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'transfer_request',
             metavar="<transfer-request>",

openstackclient/volume/v2/volume_type.py

@@ -17,7 +17,6 @@
 import functools
 import logging
 
-from cinderclient import api_versions
 from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
@@ -44,7 +43,7 @@ class EncryptionInfoColumn(cliff_columns.FormattableColumn):
     """
 
     def __init__(self, value, encryption_data=None):
-        super(EncryptionInfoColumn, self).__init__(value)
+        super().__init__(value)
         self._encryption_data = encryption_data or {}
 
     def _get_encryption_info(self):
@@ -110,7 +109,7 @@ class CreateVolumeType(command.ShowOne):
     _description = _("Create new volume type")
 
     def get_parser(self, prog_name):
-        parser = super(CreateVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "name",
             metavar="<name>",
@@ -331,7 +330,7 @@ class DeleteVolumeType(command.Command):
     _description = _("Delete volume type(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "volume_types",
             metavar="<volume-type>",
@@ -373,7 +372,7 @@ class ListVolumeType(command.Lister):
     _description = _("List volume types")
 
     def get_parser(self, prog_name):
-        parser = super(ListVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -409,59 +408,6 @@ class ListVolumeType(command.Lister):
                 "(admin only)"
             ),
         )
-        parser.add_argument(
-            '--property',
-            metavar='<key=value>',
-            action=parseractions.KeyValueAction,
-            dest='properties',
-            help=_(
-                'Filter by a property on the volume types '
-                '(repeat option to filter by multiple properties) '
-                '(admin only except for user-visible extra specs) '
-                '(supported by --os-volume-api-version 3.52 or above)'
-            ),
-        )
-        parser.add_argument(
-            '--multiattach',
-            action='store_true',
-            default=False,
-            help=_(
-                "List only volume types with multi-attach enabled "
-                "(this is an alias for '--property multiattach=<is> True') "
-                "(supported by --os-volume-api-version 3.52 or above)"
-            ),
-        )
-        parser.add_argument(
-            '--cacheable',
-            action='store_true',
-            default=False,
-            help=_(
-                "List only volume types with caching enabled "
-                "(this is an alias for '--property cacheable=<is> True') "
-                "(admin only) "
-                "(supported by --os-volume-api-version 3.52 or above)"
-            ),
-        )
-        parser.add_argument(
-            '--replicated',
-            action='store_true',
-            default=False,
-            help=_(
-                "List only volume types with replication enabled "
-                "(this is an alias for '--property replication_enabled=<is> True') "  # noqa: E501
-                "(supported by --os-volume-api-version 3.52 or above)"
-            ),
-        )
-        parser.add_argument(
-            '--availability-zone',
-            action='append',
-            dest='availability_zones',
-            help=_(
-                "List only volume types with this availability configured "
-                "(this is an alias for '--property RESKEY:availability_zones:<az>') "  # noqa: E501
-                "(repeat option to filter on multiple availability zones)"
-            ),
-        )
         return parser
 
     def take_action(self, parsed_args):
@@ -473,14 +419,12 @@ class ListVolumeType(command.Lister):
                 'Name',
                 'Is Public',
                 'Description',
-                'Extra Specs',
             ]
             column_headers = [
                 'ID',
                 'Name',
                 'Is Public',
                 'Description',
-                'Properties',
             ]
         else:
             columns = ['ID', 'Name', 'Is Public']
@@ -489,33 +433,7 @@ class ListVolumeType(command.Lister):
         if parsed_args.default:
             data = [volume_client.volume_types.default()]
         else:
-            search_opts = {}
-            properties = {}
-            if parsed_args.properties:
-                properties.update(parsed_args.properties)
-            if parsed_args.multiattach:
-                properties['multiattach'] = '<is> True'
-            if parsed_args.cacheable:
-                properties['cacheable'] = '<is> True'
-            if parsed_args.replicated:
-                properties['replication_enabled'] = '<is> True'
-            if parsed_args.availability_zones:
-                properties['RESKEY:availability_zones'] = ','.join(
-                    parsed_args.availability_zones
-                )
-            if properties:
-                if volume_client.api_version < api_versions.APIVersion('3.52'):
-                    msg = _(
-                        "--os-volume-api-version 3.52 or greater is required "
-                        "to use the '--property' option or any of the alias "
-                        "options"
-                    )
-                    raise exceptions.CommandError(msg)
-
-                search_opts['extra_specs'] = properties
-
             data = volume_client.volume_types.list(
-                search_opts=search_opts,
                 is_public=parsed_args.is_public,
             )
 
@@ -565,7 +483,7 @@ class SetVolumeType(command.Command):
     _description = _("Set volume type properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'volume_type',
             metavar='<volume-type>',
@@ -804,7 +722,7 @@ class ShowVolumeType(command.ShowOne):
     _description = _("Display volume type details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "volume_type",
             metavar="<volume-type>",
@@ -875,7 +793,7 @@ class UnsetVolumeType(command.Command):
     _description = _("Unset volume type properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetVolumeType, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'volume_type',
             metavar='<volume-type>',

openstackclient/volume/v3/service.py

@@ -0,0 +1,56 @@
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Service action implementations"""
+
+from cinderclient import api_versions
+from osc_lib import utils
+
+from openstackclient.volume.v2 import service as service_v2
+
+
+class ListService(service_v2.ListService):
+
+    def take_action(self, parsed_args):
+        service_client = self.app.client_manager.volume
+
+        columns = [
+            "Binary",
+            "Host",
+            "Zone",
+            "Status",
+            "State",
+            "Updated At",
+        ]
+
+        if service_client.api_version >= api_versions.APIVersion('3.7'):
+            columns.append("Cluster")
+        if service_client.api_version >= api_versions.APIVersion('3.49'):
+            columns.append("Backend State")
+        if parsed_args.long:
+            columns.append("Disabled Reason")
+
+        data = service_client.services.list(
+            parsed_args.host, parsed_args.service
+        )
+        return (
+            columns,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
+                )
+                for s in data
+            ),
+        )