Merge "typing: Add types for _get_columns helpers"

Author: Zuul

openstackclient/network/v2/address_group.py

@@ -19,6 +19,7 @@
 from typing import Any
 
 import netaddr
+from openstack.network.v2 import address_group as _address_group
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -30,7 +31,9 @@
 LOG = logging.getLogger(__name__)
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _address_group.AddressGroup,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns

openstackclient/network/v2/address_scope.py

@@ -18,6 +18,7 @@
 from collections.abc import Iterable, Sequence
 from typing import Any
 
+from openstack.network.v2 import address_scope as _address_scope
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -29,7 +30,9 @@
 LOG = logging.getLogger(__name__)
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _address_scope.AddressScope,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map = {
         'is_shared': 'shared',
     }

openstackclient/network/v2/bgpvpn/bgpvpn.py

@@ -18,6 +18,7 @@
 import logging
 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
@@ -60,7 +61,9 @@
 }
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+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(

openstackclient/network/v2/bgpvpn/network_association.py

@@ -18,6 +18,9 @@
 import logging
 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
@@ -38,7 +41,9 @@
 _formatters: dict[str, Any] = {}
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+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(

openstackclient/network/v2/bgpvpn/port_association.py

@@ -18,6 +18,9 @@
 import logging
 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
@@ -56,7 +59,9 @@
 }
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+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(

openstackclient/network/v2/bgpvpn/router_association.py

@@ -18,6 +18,9 @@
 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
@@ -43,7 +46,9 @@
 _formatters: dict[str, osc_utils.FormatterT] = {}
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+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(

openstackclient/network/v2/default_security_group_rule.py

@@ -18,6 +18,9 @@
 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 @@
 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

openstackclient/network/v2/floating_ip.py

@@ -18,6 +18,7 @@
 from typing import Any
 
 from openstack import exceptions as sdk_exceptions
+from openstack.network.v2 import floating_ip as _floating_ip
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
@@ -35,7 +36,9 @@
 }
 
 
-def _get_network_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_network_columns(
+    item: _floating_ip.FloatingIP,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns

openstackclient/network/v2/floating_ip_port_forwarding.py

@@ -18,6 +18,7 @@
 from collections.abc import Iterable, Sequence
 from typing import Any
 
+from openstack.network.v2 import port_forwarding as _port_forwarding
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -91,7 +92,9 @@ def validate_port(port: int) -> None:
         raise exceptions.CommandError(msg)
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _port_forwarding.PortForwarding,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns

openstackclient/network/v2/ip_availability.py

@@ -17,6 +17,7 @@
 from collections.abc import Iterable, Sequence
 from typing import Any
 
+from openstack.network.v2 import network_ip_availability as _ip_availability
 from osc_lib.cli import format_columns
 from osc_lib import utils
 
@@ -29,7 +30,9 @@
 }
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _ip_availability.NetworkIPAvailability,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['id', 'name', 'location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns