python-openstackclient 7.4.0__py3-none-any.whl → 8.0.0__py3-none-any.whl

openstackclient/network/v2/network_segment_range.py

@@ -18,6 +18,7 @@
 
 import itertools
 import logging
+import typing as ty
 
 from osc_lib.command import command
 from osc_lib import exceptions
@@ -32,19 +33,18 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    column_map = {}
     hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
-        item, column_map, hidden_columns
+        item, {}, hidden_columns
     )
 
 
 def _get_ranges(item):
     item = sorted([int(i) for i in item])
     for a, b in itertools.groupby(enumerate(item), lambda xy: xy[1] - xy[0]):
-        b = list(b)
+        c = list(b)
         yield (
-            f"{b[0][1]}-{b[-1][1]}" if b[0][1] != b[-1][1] else str(b[0][1])
+            f"{c[0][1]}-{c[-1][1]}" if c[0][1] != c[-1][1] else str(c[0][1])
         )
 
 
@@ -59,7 +59,7 @@ def _is_prop_empty(columns, props, prop_name):
 
 
 def _exchange_dict_keys_with_values(orig_dict):
-    updated_dict = dict()
+    updated_dict: dict[str, ty.Any] = {}
     for k, v in orig_dict.items():
         k = [k]
         if not updated_dict.get(v):
@@ -105,8 +105,7 @@ class CreateNetworkSegmentRange(
             dest="private",
             action="store_true",
             help=_(
-                'Network segment range is assigned specifically to the '
-                'project'
+                'Network segment range is assigned specifically to the project'
             ),
         )
         shared_group.add_argument(
@@ -125,7 +124,7 @@ class CreateNetworkSegmentRange(
             metavar='<project>',
             help=_(
                 'Network segment range owner (name or ID). Optional when '
-                'the segment range is shared'
+                'the segment range is shared.'
             ),
         )
         identity_common.add_project_domain_option_to_parser(parser)
@@ -196,8 +195,7 @@ class CreateNetworkSegmentRange(
             and parsed_args.physical_network
         ):
             msg = _(
-                "--physical-network is only allowed with --network-type "
-                "vlan"
+                "--physical-network is only allowed with --network-type vlan"
             )
             raise exceptions.CommandError(msg)
 
@@ -323,7 +321,7 @@ class ListNetworkSegmentRange(command.Lister):
             '--unused',
             action='store_true',
             help=_(
-                'List network segment ranges that have segments ' 'not in use'
+                'List network segment ranges that have segments not in use'
             ),
         )
         available_group = parser.add_mutually_exclusive_group()
@@ -353,10 +351,9 @@ class ListNetworkSegmentRange(command.Lister):
             ) % {'e': e}
             raise exceptions.CommandError(msg)
 
-        filters = {}
-        data = network_client.network_segment_ranges(**filters)
+        data = network_client.network_segment_ranges()
 
-        headers = (
+        headers: tuple[str, ...] = (
             'ID',
             'Name',
             'Default',
@@ -367,7 +364,7 @@ class ListNetworkSegmentRange(command.Lister):
             'Minimum ID',
             'Maximum ID',
         )
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'name',
             'default',
@@ -389,16 +386,16 @@ class ListNetworkSegmentRange(command.Lister):
             # should be listed in output.
             parsed_args.long = True
         if parsed_args.long:
-            headers = headers + (
+            headers += (
                 'Used',
                 'Available',
             )
-            columns = columns + (
+            columns += (
                 'used',
                 'available',
             )
 
-        display_props = tuple()
+        display_props: tuple[str, ...] = tuple()
         for s in data:
             props = utils.get_item_properties(s, columns)
             if (
@@ -457,8 +454,7 @@ class SetNetworkSegmentRange(common.NeutronCommandWithExtraArgs):
             )
         except Exception as e:
             msg = _(
-                'Network segment range set not supported by '
-                'Network API: %(e)s'
+                'Network segment range set not supported by Network API: %(e)s'
             ) % {'e': e}
             raise exceptions.CommandError(msg)
 

openstackclient/network/v2/network_trunk.py

@@ -17,6 +17,7 @@
 """Network trunk and subports action implementations"""
 
 import logging
+import typing as ty
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
@@ -69,8 +70,8 @@ class CreateNetworkTrunk(command.ShowOne):
             help=_(
                 "Subport to add. Subport is of form "
                 "'port=<name or ID>,segmentation-type=<segmentation-type>,"
-                "segmentation-id=<segmentation-ID>' (--subport) option "
-                "can be repeated"
+                "segmentation-id=<segmentation-ID>' (repeat option "
+                "to add multiple subports)"
             ),
         )
         admin_group = parser.add_mutually_exclusive_group()
@@ -128,7 +129,7 @@ class DeleteNetworkTrunk(command.Command):
                 )
         if result > 0:
             total = len(parsed_args.trunk)
-            msg = _("%(result)s of %(total)s trunks failed " "to delete.") % {
+            msg = _("%(result)s of %(total)s trunks failed to delete.") % {
                 'result': result,
                 'total': total,
             }
@@ -151,8 +152,8 @@ class ListNetworkTrunk(command.Lister):
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
         data = client.trunks()
-        headers = ('ID', 'Name', 'Parent Port', 'Description')
-        columns = ('id', 'name', 'port_id', 'description')
+        headers: tuple[str, ...] = ('ID', 'Name', 'Parent Port', 'Description')
+        columns: tuple[str, ...] = ('id', 'name', 'port_id', 'description')
         if parsed_args.long:
             headers += (
                 'Status',
@@ -199,9 +200,9 @@ class SetNetworkTrunk(command.Command):
             required_keys=['port'],
             help=_(
                 "Subport to add. Subport is of form "
-                "'port=<name or ID>,segmentation-type=<segmentation-type>"
-                ",segmentation-id=<segmentation-ID>' (--subport) option "
-                "can be repeated"
+                "'port=<name or ID>,segmentation-type=<segmentation-type>,"
+                "segmentation-id=<segmentation-ID>' (repeat option "
+                "to add multiple subports)"
             ),
         )
         admin_group = parser.add_mutually_exclusive_group()
@@ -277,8 +278,16 @@ class ListNetworkSubport(command.Lister):
         client = self.app.client_manager.network
         trunk_id = client.find_trunk(parsed_args.trunk)
         data = client.get_trunk_subports(trunk_id)
-        headers = ('Port', 'Segmentation Type', 'Segmentation ID')
-        columns = ('port_id', 'segmentation_type', 'segmentation_id')
+        headers: tuple[str, ...] = (
+            'Port',
+            'Segmentation Type',
+            'Segmentation ID',
+        )
+        columns: tuple[str, ...] = (
+            'port_id',
+            'segmentation_type',
+            'segmentation_id',
+        )
         return (
             headers,
             (
@@ -308,8 +317,8 @@ class UnsetNetworkTrunk(command.Command):
             action='append',
             dest='unset_subports',
             help=_(
-                "Subport to delete (name or ID of the port) "
-                "(--subport) option can be repeated"
+                "Subport to unset (name or ID of the port) "
+                "(repeat option to unset multiple subports)"
             ),
         )
         return parser
@@ -328,15 +337,14 @@ _formatters = {
 
 
 def _get_columns(item):
-    column_map = {}
     hidden_columns = ['location', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
-        item, column_map, hidden_columns
+        item, {}, hidden_columns
     )
 
 
 def _get_attrs_for_trunk(client_manager, parsed_args):
-    attrs = {}
+    attrs: dict[str, ty.Any] = {}
     if parsed_args.name is not None:
         attrs['name'] = str(parsed_args.name)
     if parsed_args.description is not None:
@@ -393,7 +401,7 @@ def _format_subports(client_manager, subports):
 
 
 def _get_attrs_for_subports(client_manager, parsed_args):
-    attrs = {}
+    attrs = []
     if 'set_subports' in parsed_args and parsed_args.set_subports is not None:
         attrs = _format_subports(client_manager, parsed_args.set_subports)
     if (

openstackclient/network/v2/port.py

@@ -17,6 +17,7 @@ import argparse
 import copy
 import json
 import logging
+import typing as ty
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
@@ -39,6 +40,8 @@ class AdminStateColumn(cliff_columns.FormattableColumn):
 
 
 class SubPortColumn(format_columns.ListDictColumn):
+    _value: ty.Any
+
     def _retrieve_subports(self):
         if isinstance(self._value, dict):
             self._value = self._value['sub_ports']
@@ -347,8 +350,8 @@ def _add_updatable_args(parser, create=False):
         help=_(
             "VNIC type for this port (direct | direct-physical | "
             "macvtap | normal | baremetal | virtio-forwarder | vdpa | "
-            "remote-managed, "
-            "default: normal)"
+            "remote-managed) "
+            "(default: normal)"
         ),
     )
     parser.add_argument(
@@ -368,8 +371,7 @@ def _add_updatable_args(parser, create=False):
         '--dns-name',
         metavar='<dns-name>',
         help=_(
-            "Set DNS name for this port "
-            "(requires DNS integration extension)"
+            "Set DNS name for this port (requires DNS integration extension)"
         ),
     )
     numa_affinity_policy_group = parser.add_mutually_exclusive_group()
@@ -406,7 +408,7 @@ def _add_updatable_args(parser, create=False):
             '(requires port-hints extension) '
             '(requires port-hint-ovs-tx-steering extension for alias: '
             'ovs-tx-steering) '
-            '(repeat option to set multiple hints)'
+            '(repeat option to set multiple hints).'
         ),
     )
     port_trusted = parser.add_mutually_exclusive_group()
@@ -416,7 +418,7 @@ def _add_updatable_args(parser, create=False):
         help=_(
             "Set port to be trusted. This will be populated into the "
             "'binding:profile' dictionary and passed to the services "
-            "which expect it in this dictionary (for example, Nova)"
+            "which expect it in this dictionary (for example, Nova)."
         ),
     )
     port_trusted.add_argument(
@@ -425,7 +427,7 @@ def _add_updatable_args(parser, create=False):
         help=_(
             "Set port to be not trusted. This will be populated into the "
             "'binding:profile' dictionary and passed to the services "
-            "which expect it in this dictionary (for example, Nova)"
+            "which expect it in this dictionary (for example, Nova)."
         ),
     )
 
@@ -512,7 +514,7 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
         fixed_ip.add_argument(
             '--no-fixed-ip',
             action='store_true',
-            help=_("No IP or subnet for this port."),
+            help=_("No IP or subnet set for this port"),
         )
         parser.add_argument(
             '--binding-profile',
@@ -520,8 +522,8 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
             action=JSONKeyValueAction,
             help=_(
                 "Custom data to be passed as binding:profile. Data may "
-                "be passed as <key>=<value> or JSON. "
-                "(repeat option to set multiple binding:profile data)"
+                "be passed as <key>=<value> or JSON "
+                "(repeat option to set multiple binding:profile data)."
             ),
         )
         admin_group = parser.add_mutually_exclusive_group()
@@ -596,7 +598,7 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
         port_security.add_argument(
             '--enable-port-security',
             action='store_true',
-            help=_("Enable port security for this port (Default)"),
+            help=_("Enable port security for this port (default)"),
         )
         port_security.add_argument(
             '--disable-port-security',
@@ -619,7 +621,7 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
         parser.add_argument(
             '--device-profile',
             metavar='<device-profile>',
-            help=_('Cyborg port device profile'),
+            help=_('Port device profile'),
         )
         parser.add_argument(
             '--hardware-offload-type',
@@ -753,7 +755,7 @@ class DeletePort(command.Command):
 
         if result > 0:
             total = len(parsed_args.port)
-            msg = _("%(result)s of %(total)s ports failed " "to delete.") % {
+            msg = _("%(result)s of %(total)s ports failed to delete.") % {
                 'result': result,
                 'total': total,
             }
@@ -901,7 +903,7 @@ class ListPort(command.Lister):
             )
             filters['device_id'] = _router.id
         if parsed_args.server:
-            compute_client = self.app.client_manager.sdk_connection.compute
+            compute_client = self.app.client_manager.compute
             server = compute_client.find_server(
                 parsed_args.server,
                 ignore_missing=False,
@@ -944,15 +946,12 @@ class ListPort(command.Lister):
                 for item in columns
             ]
 
-        headers, attrs = utils.calculate_header_and_attrs(
-            column_headers, columns, parsed_args
-        )
         return (
-            headers,
+            column_headers,
             (
                 utils.get_item_properties(
                     s,
-                    attrs,
+                    columns,
                     formatters=_list_formatters,
                 )
                 for s in data
@@ -996,7 +995,7 @@ class SetPort(common.NeutronCommandWithExtraArgs):
             '--no-fixed-ip',
             action='store_true',
             help=_(
-                "Clear existing information of fixed IP addresses."
+                "Clear existing information of fixed IP addresses. "
                 "Specify both --fixed-ip and --no-fixed-ip "
                 "to overwrite the current fixed IP addresses."
             ),
@@ -1007,8 +1006,8 @@ class SetPort(common.NeutronCommandWithExtraArgs):
             action=JSONKeyValueAction,
             help=_(
                 "Custom data to be passed as binding:profile. Data may "
-                "be passed as <key>=<value> or JSON. "
-                "(repeat option to set multiple binding:profile data)"
+                "be passed as <key>=<value> or JSON "
+                "(repeat option to set multiple binding:profile data)."
             ),
         )
         parser.add_argument(
@@ -1075,8 +1074,8 @@ class SetPort(common.NeutronCommandWithExtraArgs):
             help=_(
                 "Clear existing allowed-address pairs associated "
                 "with this port. "
-                "(Specify both --allowed-address and --no-allowed-address "
-                "to overwrite the current allowed-address pairs)"
+                "Specify both --allowed-address and --no-allowed-address "
+                "to overwrite the current allowed-address pairs."
             ),
         )
         parser.add_argument(
@@ -1100,7 +1099,7 @@ class SetPort(common.NeutronCommandWithExtraArgs):
             help=_(
                 "Set data plane status of this port (ACTIVE | DOWN). "
                 "Unset it to None with the 'port unset' command "
-                "(requires data plane status extension)"
+                "(requires data plane status extension)."
             ),
         )
         uplink_status_group = parser.add_mutually_exclusive_group()
@@ -1262,7 +1261,7 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
             action='append',
             help=_(
                 "Desired key which should be removed from binding:profile "
-                "(repeat option to unset multiple binding:profile data)"
+                "(repeat option to unset multiple binding:profile keys)"
             ),
         )
         parser.add_argument(
@@ -1298,7 +1297,7 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
         parser.add_argument(
             '--data-plane-status',
             action='store_true',
-            help=_("Clear existing information of data plane status"),
+            help=_("Clear existing data plane status information"),
         )
         parser.add_argument(
             '--numa-policy',
@@ -1309,13 +1308,13 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
             '--host',
             action='store_true',
             default=False,
-            help=_("Clear host binding for the port."),
+            help=_("Clear host binding for the port"),
         )
         parser.add_argument(
             '--hints',
             action='store_true',
             default=False,
-            help=_("Clear hints for the port."),
+            help=_("Clear hints for the port"),
         )
         _tag.add_tag_option_to_parser_for_unset(parser, _('port'))
         parser.add_argument(