Merge "typing: Add missing hints to network.v2.dynamic_routing"

Author: Zuul

openstackclient/network/v2/dynamic_routing/bgp_dragent.py

@@ -11,6 +11,10 @@
 #    under the License.
 #
 
+import argparse
+from collections.abc import Iterable, Sequence
+from typing import Any
+
 from osc_lib import utils
 
 from openstackclient import command
@@ -20,7 +24,7 @@
 class AddBgpSpeakerToDRAgent(command.Command):
     """Add a BGP speaker to a dynamic routing agent"""
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'dragent_id',
@@ -34,7 +38,7 @@ def get_parser(self, prog_name):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         speaker_id = client.find_bgp_speaker(
             parsed_args.bgp_speaker, ignore_missing=False
@@ -45,7 +49,7 @@ def take_action(self, parsed_args):
 class RemoveBgpSpeakerFromDRAgent(command.Command):
     """Removes a BGP speaker from a dynamic routing agent"""
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'dragent_id',
@@ -59,7 +63,7 @@ def get_parser(self, prog_name):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         speaker_id = client.find_bgp_speaker(
             parsed_args.bgp_speaker, ignore_missing=False
@@ -76,7 +80,7 @@ class ListDRAgent(command.Lister):
     list_columns = ['id', 'host', 'admin_state_up', 'alive']
     unknown_parts_flag = False
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             '--bgp-speaker',
@@ -88,8 +92,11 @@ def get_parser(self, prog_name):
         )
         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
+        data: Iterable[Any]
         if parsed_args.bgp_speaker is not None:
             speaker_id = client.find_bgp_speaker(
                 parsed_args.bgp_speaker, ignore_missing=False

openstackclient/network/v2/dynamic_routing/bgp_peer.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 identity as identity_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -25,7 +29,9 @@
 MAX_AS_NUM = 4294967295
 
 
-def _get_attrs(client_manager, parsed_args):
+def _get_attrs(
+    client_manager: Any, parsed_args: argparse.Namespace
+) -> dict[str, Any]:
     attrs = {}
 
     # Validate password
@@ -67,7 +73,7 @@ def _get_attrs(client_manager, parsed_args):
 class CreateBgpPeer(command.ShowOne):
     _description = _("Create a BGP peer")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'name', metavar='<name>', help=_("Name of the BGP peer to create")
@@ -110,7 +116,9 @@ def get_parser(self, prog_name):
         identity_utils.add_project_owner_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]]:
         client = self.app.client_manager.network
         attrs = _get_attrs(self.app.client_manager, parsed_args)
         obj = client.create_bgp_peer(**attrs)
@@ -124,7 +132,7 @@ def take_action(self, parsed_args):
 class DeleteBgpPeer(command.Command):
     _description = _("Delete a BGP peer")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgp_peer',
@@ -133,7 +141,7 @@ def get_parser(self, prog_name):
         )
         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_bgp_peer(
             parsed_args.bgp_peer, ignore_missing=False
@@ -144,7 +152,9 @@ def take_action(self, parsed_args):
 class ListBgpPeer(command.Lister):
     _description = _("List BGP peers")
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         data = self.app.client_manager.network.bgp_peers(retrieve_all=True)
         headers = ('ID', 'Name', 'Peer IP', 'Remote AS')
         columns = ('id', 'name', 'peer_ip', 'remote_as')
@@ -163,7 +173,7 @@ def take_action(self, parsed_args):
 class SetBgpPeer(command.Command):
     _description = _("Update a BGP peer")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument('--name', help=_("Updated name of the BGP peer"))
         parser.add_argument(
@@ -178,7 +188,7 @@ def get_parser(self, prog_name):
         )
         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_bgp_peer(
             parsed_args.bgp_peer, ignore_missing=False
@@ -190,7 +200,7 @@ def take_action(self, parsed_args):
 class ShowBgpPeer(command.ShowOne):
     _description = _("Show information for a BGP peer")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'bgp_peer',
@@ -199,7 +209,9 @@ def get_parser(self, prog_name):
         )
         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
         obj = client.find_bgp_peer(parsed_args.bgp_peer, ignore_missing=False)
         display_columns, columns = utils.get_osc_show_columns_for_sdk_resource(