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

openstackclient/network/v2/bgpvpn/bgpvpn.py

@@ -12,11 +12,13 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
-import typing as ty
+from typing import Any
 
+from openstack.network.v2 import bgpvpn as _bgpvpn
 from osc_lib.cli import format_columns
 from osc_lib.cli import identity as osc_id
 from osc_lib.cli.parseractions import KeyValueAction
@@ -59,7 +61,9 @@ _formatters = {
 }
 
 
-def _get_columns(item):
+def _get_columns(
+    item: _bgpvpn.BgpVpn,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map: dict[str, str] = {}
     hidden_columns = ['location', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
@@ -67,7 +71,9 @@ def _get_columns(item):
     )
 
 
-def _get_common_parser(parser, update=None):
+def _get_common_parser(
+    parser: argparse.ArgumentParser, update: str | None = None
+) -> None:
     """Adds to parser arguments common to create, set and unset commands.
 
     :params ArgumentParser parser: argparse object contains all command's
@@ -95,7 +101,7 @@ def _get_common_parser(parser, update=None):
     REPEAT_RT = _("repeat option for multiple Route Targets")
     REPEAT_RD = _("repeat option for multiple Route Distinguishers")
 
-    def is_appended():
+    def is_appended() -> bool:
         return update is None or update == 'set'
 
     if update is None or update == 'set':
@@ -183,7 +189,9 @@ def _get_common_parser(parser, update=None):
     )
 
 
-def _args2body(client_manager, id, action, args):
+def _args2body(
+    client_manager: Any, id: str, action: str, args: argparse.Namespace
+) -> dict[str, Any]:
 
     if not (
         args.purge_route_target
@@ -198,7 +206,7 @@ def _args2body(client_manager, id, action, args):
     ):
         bgpvpn = client_manager.network.get_bgpvpn(id)
 
-    attrs: dict[str, ty.Any] = {}
+    attrs: dict[str, Any] = {}
 
     if 'name' in args and args.name is not None:
         attrs['name'] = str(args.name)
@@ -265,7 +273,7 @@ def _args2body(client_manager, id, action, args):
 class CreateBgpvpn(command.ShowOne):
     _description = _("Create BGP VPN resource")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         osc_id.add_project_owner_option_to_parser(parser)
         _get_common_parser(parser)
@@ -280,7 +288,9 @@ class CreateBgpvpn(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         attrs = {}
         if parsed_args.name is not None:
@@ -317,7 +327,7 @@ class CreateBgpvpn(command.ShowOne):
 class SetBgpvpn(command.Command):
     _description = _("Set BGP VPN 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(
             'bgpvpn',
@@ -327,7 +337,7 @@ class SetBgpvpn(command.Command):
         _get_common_parser(parser, update='set')
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         id = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)['id']
         body = _args2body(self.app.client_manager, id, 'set', parsed_args)
@@ -337,7 +347,7 @@ class SetBgpvpn(command.Command):
 class UnsetBgpvpn(command.Command):
     _description = _("Unset BGP VPN 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(
             'bgpvpn',
@@ -347,7 +357,7 @@ class UnsetBgpvpn(command.Command):
         _get_common_parser(parser, update='unset')
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         id = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)['id']
         body = _args2body(self.app.client_manager, id, 'unset', parsed_args)
@@ -357,7 +367,7 @@ class UnsetBgpvpn(command.Command):
 class DeleteBgpvpn(command.Command):
     _description = _("Delete BGP VPN resource(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(
             'bgpvpns',
@@ -367,7 +377,7 @@ class DeleteBgpvpn(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         fails = 0
         for id_or_name in parsed_args.bgpvpns:
@@ -393,7 +403,7 @@ class DeleteBgpvpn(command.Command):
 class ListBgpvpn(command.Lister):
     _description = _("List BGP VPN resources")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         osc_id.add_project_owner_option_to_parser(parser)
         parser.add_argument(
@@ -413,7 +423,9 @@ class ListBgpvpn(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[tuple[Any, ...]]]:
         client = self.app.client_manager.network
         params = {}
         if parsed_args.project is not None:
@@ -443,7 +455,7 @@ class ListBgpvpn(command.Lister):
 class ShowBgpvpn(command.ShowOne):
     _description = _("Show information of a given BGP VPN")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgpvpn',
@@ -452,7 +464,9 @@ class ShowBgpvpn(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         id = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)['id']
         obj = client.get_bgpvpn(id)

openstackclient/network/v2/bgpvpn/network_association.py

@@ -12,11 +12,15 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
-import typing as ty
+from typing import Any
 
+from openstack.network.v2 import (
+    bgpvpn_network_association as _bgpvpn_network_association,
+)
 from osc_lib.cli import identity as osc_id
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
@@ -34,10 +38,12 @@ _attr_map = (
     ('project_id', 'Project', column_util.LIST_LONG_ONLY),
     ('network_id', 'Network ID', column_util.LIST_BOTH),
 )
-_formatters: dict[str, ty.Any] = {}
+_formatters: dict[str, Any] = {}
 
 
-def _get_columns(item):
+def _get_columns(
+    item: _bgpvpn_network_association.BgpVpnNetworkAssociation,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map: dict[str, str] = {}
     hidden_columns = ['location', 'name', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
@@ -48,7 +54,7 @@ def _get_columns(item):
 class CreateBgpvpnNetAssoc(command.ShowOne):
     _description = _("Create a BGP VPN network association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         osc_id.add_project_owner_option_to_parser(parser)
         parser.add_argument(
@@ -63,13 +69,15 @@ class CreateBgpvpnNetAssoc(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         network = client.find_network(
             parsed_args.resource, ignore_missing=False
         )
-        body: dict[str, ty.Any] = {'network_id': network['id']}
+        body: dict[str, Any] = {'network_id': network['id']}
         if 'project' in parsed_args and parsed_args.project is not None:
             project_id = osc_id.find_project(
                 self.app.client_manager.sdk_connection,
@@ -91,7 +99,7 @@ class DeleteBgpvpnNetAssoc(command.Command):
         "Delete a BGP VPN network association(s) for a given BGP VPN"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'resource_association_ids',
@@ -106,7 +114,7 @@ class DeleteBgpvpnNetAssoc(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         fails = 0
@@ -138,7 +146,7 @@ class DeleteBgpvpnNetAssoc(command.Command):
 class ListBgpvpnNetAssoc(command.Lister):
     _description = _("List BGP VPN network associations for a given BGP VPN")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgpvpn',
@@ -161,7 +169,9 @@ class ListBgpvpnNetAssoc(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[tuple[Any, ...]]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         params = {}
@@ -187,7 +197,7 @@ class ListBgpvpnNetAssoc(command.Lister):
 class ShowBgpvpnNetAssoc(command.ShowOne):
     _description = _("Show information of a given BGP VPN network association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'resource_association_id',
@@ -201,7 +211,9 @@ class ShowBgpvpnNetAssoc(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         obj = client.get_bgpvpn_network_association(

openstackclient/network/v2/bgpvpn/port_association.py

@@ -12,11 +12,15 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
-import typing as ty
+from typing import Any
 
+from openstack.network.v2 import (
+    bgpvpn_port_association as _bgpvpn_port_association,
+)
 from osc_lib.cli import format_columns
 from osc_lib.cli import identity as osc_id
 from osc_lib.cli import parseractions
@@ -55,7 +59,9 @@ _formatters = {
 }
 
 
-def _get_columns(item):
+def _get_columns(
+    item: _bgpvpn_port_association.BgpVpnPortAssociation,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map: dict[str, str] = {}
     hidden_columns = ['location', 'name', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
@@ -63,7 +69,7 @@ def _get_columns(item):
     )
 
 
-def _transform_resource(data):
+def _transform_resource(data: Any) -> Any:
     """Transforms BGP VPN port association routes property.
 
     Separates the two route types and formats them with ListColumn.
@@ -101,7 +107,7 @@ def _transform_resource(data):
     return data
 
 
-def _get_common_parser(parser, action):
+def _get_common_parser(parser: argparse.ArgumentParser, action: str) -> None:
     """Adds to parser arguments common to create, set and unset commands.
 
     :params ArgumentParser parser: argparse object contains all command's
@@ -194,8 +200,10 @@ def _get_common_parser(parser, action):
         )
 
 
-def _args2body(client, action, bgpvpn_id, args):
-    attrs: dict[str, ty.Any] = {}
+def _args2body(
+    client: Any, action: str, bgpvpn_id: str, args: argparse.Namespace
+) -> dict[str, Any]:
+    attrs: dict[str, Any] = {}
 
     if action != 'create':
         assoc = client.find_bgpvpn_port_association(
@@ -211,7 +219,7 @@ def _args2body(client, action, bgpvpn_id, args):
     elif args.no_advertise_fixed_ips:
         attrs['advertise_fixed_ips'] = action == 'unset'
 
-    prefix_routes: dict[str, ty.Any] | None = None
+    prefix_routes: dict[str, Any] | None = None
     if 'purge_prefix_route' in args and args.purge_prefix_route:
         prefix_routes = {}
     else:
@@ -232,7 +240,7 @@ def _args2body(client, action, bgpvpn_id, args):
                 for prefix in args.prefix_routes:
                     prefix_routes.pop(prefix, None)
 
-    bgpvpn_routes: dict[str, ty.Any] | None = None
+    bgpvpn_routes: dict[str, Any] | None = None
     if 'purge_bgpvpn_route' in args and args.purge_bgpvpn_route:
         bgpvpn_routes = {}
     else:
@@ -262,7 +270,7 @@ def _args2body(client, action, bgpvpn_id, args):
         attrs.setdefault('routes', [])
     elif prefix_routes is not None:
         for prefix, local_pref in prefix_routes.items():
-            route: dict[str, ty.Any] = {
+            route: dict[str, Any] = {
                 'type': 'prefix',
                 'prefix': prefix,
             }
@@ -287,7 +295,7 @@ def _args2body(client, action, bgpvpn_id, args):
 class CreateBgpvpnPortAssoc(command.ShowOne):
     _description = _("Create a BGP VPN port association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         osc_id.add_project_owner_option_to_parser(parser)
         parser.add_argument(
@@ -303,11 +311,13 @@ class CreateBgpvpnPortAssoc(command.ShowOne):
         _get_common_parser(parser, 'create')
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         port = client.find_port(parsed_args.port, ignore_missing=False)
-        body: dict[str, ty.Any] = {'port_id': port['id']}
+        body: dict[str, Any] = {'port_id': port['id']}
         if 'project' in parsed_args and parsed_args.project is not None:
             project_id = osc_id.find_project(
                 self.app.client_manager.sdk_connection,
@@ -331,7 +341,7 @@ class SetBgpvpnPortAssoc(command.Command):
     _description = _("Set BGP VPN port association properties")
     _action = 'set'
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'port_association_id',
@@ -346,7 +356,7 @@ class SetBgpvpnPortAssoc(command.Command):
         _get_common_parser(parser, self._action)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         body = _args2body(client, self._action, bgpvpn['id'], parsed_args)
@@ -365,7 +375,7 @@ class DeleteBgpvpnPortAssoc(command.Command):
         "Delete a BGP VPN port association(s) for a given BGP VPN"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'port_association_ids',
@@ -380,7 +390,7 @@ class DeleteBgpvpnPortAssoc(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         fails = 0
@@ -412,7 +422,7 @@ class DeleteBgpvpnPortAssoc(command.Command):
 class ListBgpvpnPortAssoc(command.Lister):
     _description = _("List BGP VPN port associations for a given BGP VPN")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgpvpn',
@@ -435,7 +445,9 @@ class ListBgpvpnPortAssoc(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[tuple[Any, ...]]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         params = {}
@@ -462,7 +474,7 @@ class ListBgpvpnPortAssoc(command.Lister):
 class ShowBgpvpnPortAssoc(command.ShowOne):
     _description = _("Show information of a given BGP VPN port association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'port_association_id',
@@ -476,7 +488,9 @@ class ShowBgpvpnPortAssoc(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         obj = client.get_bgpvpn_port_association(

openstackclient/network/v2/bgpvpn/router_association.py

@@ -12,10 +12,15 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
+from typing import Any
 
+from openstack.network.v2 import (
+    bgpvpn_router_association as _bgpvpn_router_association,
+)
 from osc_lib.cli import identity as osc_id
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
@@ -41,7 +46,9 @@ _attr_map = (
 _formatters: dict[str, osc_utils.FormatterT] = {}
 
 
-def _get_columns(item):
+def _get_columns(
+    item: _bgpvpn_router_association.BgpVpnRouterAssociation,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map: dict[str, str] = {}
     hidden_columns = ['location', 'name', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
@@ -49,7 +56,7 @@ def _get_columns(item):
     )
 
 
-def _get_common_parser(parser, action):
+def _get_common_parser(parser: argparse.ArgumentParser, action: str) -> None:
     """Adds to parser arguments common to create, set and unset commands.
 
     :params ArgumentParser parser: argparse object contains all command's
@@ -76,7 +83,7 @@ def _get_common_parser(parser, action):
     )
 
 
-def _args2body(action, args):
+def _args2body(action: str, args: argparse.Namespace) -> dict[str, Any]:
     attrs = {'advertise_extra_routes': False}
     if args.advertise_extra_routes:
         attrs['advertise_extra_routes'] = action != 'unset'
@@ -88,7 +95,7 @@ def _args2body(action, args):
 class CreateBgpvpnRouterAssoc(command.ShowOne):
     _description = _("Create a BGP VPN router association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         osc_id.add_project_owner_option_to_parser(parser)
         parser.add_argument(
@@ -104,7 +111,9 @@ class CreateBgpvpnRouterAssoc(command.ShowOne):
         _get_common_parser(parser, 'create')
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         router = client.find_router(parsed_args.resource, ignore_missing=False)
@@ -131,7 +140,7 @@ class SetBgpvpnRouterAssoc(command.Command):
     _description = _("Set BGP VPN router association properties")
     _action = 'set'
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'resource_association_id',
@@ -146,7 +155,7 @@ class SetBgpvpnRouterAssoc(command.Command):
         _get_common_parser(parser, self._action)
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         body = _args2body(self._action, parsed_args)
@@ -165,7 +174,7 @@ class DeleteBgpvpnRouterAssoc(command.Command):
         "Delete a BGP VPN router association(s) for a given BGP VPN"
     )
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'resource_association_ids',
@@ -180,7 +189,7 @@ class DeleteBgpvpnRouterAssoc(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         fails = 0
@@ -212,7 +221,7 @@ class DeleteBgpvpnRouterAssoc(command.Command):
 class ListBgpvpnRouterAssoc(command.Lister):
     _description = _("List BGP VPN router associations for a given BGP VPN")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgpvpn',
@@ -235,7 +244,9 @@ class ListBgpvpnRouterAssoc(command.Lister):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[tuple[Any, ...]]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         params = {}
@@ -261,7 +272,7 @@ class ListBgpvpnRouterAssoc(command.Lister):
 class ShowBgpvpnRouterAssoc(command.ShowOne):
     _description = _("Show information of a given BGP VPN router association")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'resource_association_id',
@@ -275,7 +286,9 @@ class ShowBgpvpnRouterAssoc(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn, ignore_missing=False)
         obj = client.get_bgpvpn_router_association(

openstackclient/network/v2/default_security_group_rule.py

@@ -18,6 +18,9 @@ import logging
 from collections.abc import Iterable, Sequence
 from typing import Any
 
+from openstack.network.v2 import (
+    default_security_group_rule as _default_security_group_rule,
+)
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
 from osc_lib import utils
@@ -30,7 +33,9 @@ from openstackclient.network import utils as network_utils
 LOG = logging.getLogger(__name__)
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _default_security_group_rule.DefaultSecurityGroupRule,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'name', 'revision_number']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns
@@ -286,16 +291,19 @@ class ListDefaultSecurityGroupRule(command.Lister):
     security groups.
     """
 
-    def _format_network_security_group_rule(self, rule: Any) -> Any:
+    @staticmethod
+    def _format_network_security_group_rule(
+        rule: _default_security_group_rule.DefaultSecurityGroupRule,
+    ) -> dict[str, object]:
         """Transform the SDK DefaultSecurityGroupRule object to a dict
 
         The SDK object gets in the way of reformatting columns...
         Create port_range column from port_range_min and port_range_max
         """
-        rule = rule.to_dict()
-        rule['port_range'] = network_utils.format_network_port_range(rule)
-        rule['remote_ip_prefix'] = network_utils.format_remote_ip_prefix(rule)
-        return rule
+        data = rule.to_dict()
+        data['port_range'] = network_utils.format_network_port_range(data)
+        data['remote_ip_prefix'] = network_utils.format_remote_ip_prefix(data)
+        return data
 
     def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)