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

openstackclient/network/v2/network_segment_range.py

@@ -22,19 +22,22 @@ import itertools
 import logging
 from typing import Any
 
+from openstack.network.v2 import network_segment_range as _segment_range
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _segment_range.NetworkSegmentRange,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns
@@ -358,6 +361,7 @@ class ListNetworkSegmentRange(command.Lister):
                 'List only network segment ranges without available segments'
             ),
         )
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -376,7 +380,15 @@ class ListNetworkSegmentRange(command.Lister):
             ) % {'e': e}
             raise exceptions.CommandError(msg)
 
-        data = network_client.network_segment_ranges()
+        filters = {}
+        if parsed_args.marker is not None:
+            filters['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            filters['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            filters['max_items'] = parsed_args.max_items
+
+        data = network_client.network_segment_ranges(**filters)
 
         headers: tuple[str, ...] = (
             'ID',

openstackclient/network/v2/network_trunk.py

@@ -22,6 +22,7 @@ import logging
 from typing import Any
 
 from cliff import columns as cliff_columns
+from openstack.network.v2 import trunk as _trunk
 from osc_lib.cli import format_columns
 from osc_lib.cli import identity as identity_utils
 from osc_lib.cli import parseractions
@@ -367,7 +368,9 @@ _formatters = {
 }
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _trunk.Trunk,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'tenant_id']
     return osc_utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns

openstackclient/network/v2/port.py

@@ -21,6 +21,7 @@ import logging
 from typing import Any
 
 from cliff import columns as cliff_columns
+from openstack.network.v2 import port as _port
 from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
@@ -28,6 +29,7 @@ from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -74,7 +76,9 @@ _list_formatters = copy.deepcopy(_formatters)
 _list_formatters.update({'trunk_details': SubPortColumn})
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _port.Port,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_data_mapping = {
         'admin_state_up': 'is_admin_state_up',
         'allowed_address_pairs': 'allowed_address_pairs',
@@ -105,6 +109,8 @@ def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
         'port_security_enabled': 'is_port_security_enabled',
         'project_id': 'project_id',
         'propagate_uplink_status': 'propagate_uplink_status',
+        'pvlan_type': 'pvlan_type',
+        'pvlan_community': 'pvlan_community',
         'resource_request': 'resource_request',
         'revision_number': 'revision_number',
         'qos_network_policy_id': 'qos_network_policy_id',
@@ -189,8 +195,6 @@ def _get_attrs(
     if 'network' in parsed_args and parsed_args.network is not None:
         attrs['network_id'] = parsed_args.network
     if 'project' in parsed_args and parsed_args.project is not None:
-        # TODO(singhj): since 'project' logic is common among
-        # router, network, port etc., maybe move it to a common file.
         identity_client = client_manager.identity
         project_id = identity_common.find_project(
             identity_client,
@@ -256,9 +260,48 @@ def _get_attrs(
     if parsed_args.trusted:
         attrs['trusted'] = True
 
+    if 'pvlan_type' in parsed_args and parsed_args.pvlan_type is not None:
+        attrs['pvlan_type'] = parsed_args.pvlan_type
+    if (
+        'pvlan_community' in parsed_args
+        and parsed_args.pvlan_community is not None
+    ):
+        attrs['pvlan_community'] = parsed_args.pvlan_community
+
+    _validate_pvlan_port(attrs)
+
     return attrs
 
 
+def _validate_pvlan_port(attrs: dict[str, Any]) -> None:
+    if (attrs.get('pvlan_type') or attrs.get('pvlan_community')) and attrs.get(
+        'port_security_enabled'
+    ) is False:
+        msg = _(
+            "PVLAN attributes cannot be set when port security is disabled."
+        )
+        raise exceptions.CommandError(msg)
+
+    if attrs.get('pvlan_type') == 'community' and not attrs.get(
+        'pvlan_community'
+    ):
+        msg = _(
+            "--pvlan-community is required when --pvlan-type is 'community'."
+        )
+        raise exceptions.CommandError(msg)
+
+
+def _validate_pvlan_network_port(attrs: dict[str, Any], network: Any) -> None:
+    if not (attrs.get('pvlan_type') or attrs.get('pvlan_community')):
+        return
+    if not network.pvlan:
+        msg = _(
+            "PVLAN attributes cannot be set on a port whose "
+            "network does not have PVLAN enabled."
+        )
+        raise exceptions.CommandError(msg)
+
+
 def _prepare_fixed_ips(
     client_manager: Any, parsed_args: argparse.Namespace
 ) -> None:
@@ -445,10 +488,28 @@ def _add_updatable_args(
             "which expect it in this dictionary (for example, Nova)."
         ),
     )
+    parser.add_argument(
+        '--pvlan-type',
+        metavar='<type>',
+        choices=['promiscuous', 'isolated', 'community'],
+        dest='pvlan_type',
+        help=_(
+            "Set Private VLAN type for this port. Requires PVLAN service "
+            "plugin. Default: promiscuous."
+        ),
+    )
+    parser.add_argument(
+        '--pvlan-community',
+        metavar='<community>',
+        dest='pvlan_community',
+        help=_(
+            "Set PVLAN community name for this port. "
+            "Only applies when pvlan-type is 'community'. "
+            "Requires PVLAN service plugin. Default: None."
+        ),
+    )
 
 
-# TODO(abhiraut): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 def _convert_address_pairs(
     parsed_args: argparse.Namespace,
 ) -> list[dict[str, Any]]:
@@ -732,6 +793,8 @@ class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
             self._parse_extra_properties(parsed_args.extra_properties)
         )
 
+        _validate_pvlan_network_port(attrs, network)
+
         with common.check_missing_extension_if_error(network_client, attrs):
             obj = network_client.create_port(**attrs)
 
@@ -785,8 +848,6 @@ class DeletePort(command.Command):
             raise exceptions.CommandError(msg)
 
 
-# TODO(abhiraut): Use only the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class ListPort(command.Lister):
     _description = _("List ports")
 
@@ -886,6 +947,7 @@ class ListPort(command.Lister):
             ),
         )
         _tag.add_tag_filtering_option_to_parser(parser, _('ports'))
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -917,7 +979,6 @@ class ListPort(command.Lister):
             column_headers.extend(
                 ['Security Groups', 'Device Owner', 'Tags', 'Trunk subports']
             )
-
         if parsed_args.device_owner is not None:
             filters['device_owner'] = parsed_args.device_owner
         if parsed_args.device_id is not None:
@@ -960,6 +1021,12 @@ class ListPort(command.Lister):
             )
         if parsed_args.security_groups:
             filters['security_group_ids'] = parsed_args.security_groups
+        if parsed_args.marker is not None:
+            filters['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            filters['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            filters['max_items'] = parsed_args.max_items
 
         _tag.get_tag_filtering_args(parsed_args, filters)
 
@@ -984,8 +1051,6 @@ class ListPort(command.Lister):
         )
 
 
-# TODO(abhiraut): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class SetPort(common.NeutronCommandWithExtraArgs):
     _description = _("Set port properties")
 
@@ -1232,6 +1297,10 @@ class SetPort(common.NeutronCommandWithExtraArgs):
             self._parse_extra_properties(parsed_args.extra_properties)
         )
 
+        if attrs.get('pvlan_type') or attrs.get('pvlan_community'):
+            network = client.find_network(obj.network_id, ignore_missing=False)
+            _validate_pvlan_network_port(attrs, network)
+
         if attrs:
             with common.check_missing_extension_if_error(
                 self.app.client_manager.network, attrs
@@ -1262,8 +1331,6 @@ class ShowPort(command.ShowOne):
         return (display_columns, data)
 
 
-# TODO(abhiraut): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
     _description = _("Unset port properties")
 
@@ -1355,6 +1422,13 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
             default=False,
             help=_("Clear device owner for the port."),
         )
+        parser.add_argument(
+            '--pvlan-community',
+            action='store_true',
+            default=False,
+            dest='pvlan_community',
+            help=_("Clear PVLAN community name for the port."),
+        )
         _tag.add_tag_option_to_parser_for_unset(parser, _('port'))
         parser.add_argument(
             'port',
@@ -1425,6 +1499,8 @@ class UnsetPort(common.NeutronUnsetCommandWithExtraArgs):
             attrs['device_id'] = ''
         if parsed_args.device_owner:
             attrs['device_owner'] = ''
+        if parsed_args.pvlan_community:
+            attrs['pvlan_community'] = None
 
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties)

openstackclient/network/v2/router.py

@@ -22,6 +22,7 @@ import logging
 from typing import Any
 
 from cliff import columns as cliff_columns
+from openstack.network.v2 import router as _router
 from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
@@ -29,6 +30,7 @@ from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -69,7 +71,9 @@ _formatters = {
 }
 
 
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _router.Router,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     column_map = {
         'is_ha': 'ha',
         'is_distributed': 'distributed',
@@ -84,6 +88,8 @@ def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
     if item.is_distributed is None:
         hidden_columns.append('is_distributed')
         column_map.pop('is_distributed')
+    if not hasattr(item, 'evpn_vni'):
+        hidden_columns.append('evpn_vni')
     return utils.get_osc_show_columns_for_sdk_resource(
         item, column_map, hidden_columns
     )
@@ -344,7 +350,7 @@ class AddPortToRouter(command.Command):
         port = client.find_port(parsed_args.port, ignore_missing=False)
         client.add_interface_to_router(
             client.find_router(parsed_args.router, ignore_missing=False),
-            port_id=port.id,
+            port=port.id,
         )
 
 
@@ -370,7 +376,7 @@ class AddSubnetToRouter(command.Command):
         subnet = client.find_subnet(parsed_args.subnet, ignore_missing=False)
         client.add_interface_to_router(
             client.find_router(parsed_args.router, ignore_missing=False),
-            subnet_id=subnet.id,
+            subnet=subnet.id,
         )
 
 
@@ -478,8 +484,6 @@ class RemoveExtraRoutesFromRouter(command.ShowOne):
         return (display_columns, data)
 
 
-# TODO(yanxing'an): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class CreateRouter(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a new router")
 
@@ -713,8 +717,6 @@ class DeleteRouter(command.Command):
             raise exceptions.CommandError(msg)
 
 
-# TODO(yanxing'an): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class ListRouter(command.Lister):
     _description = _("List routers")
 
@@ -754,6 +756,7 @@ class ListRouter(command.Lister):
             ),
         )
         _tag.add_tag_filtering_option_to_parser(parser, _('routers'))
+        pagination.add_marker_pagination_option_to_parser(parser)
 
         return parser
 
@@ -798,16 +801,26 @@ class ListRouter(command.Lister):
             ).id
             args['project_id'] = project_id
 
+        if parsed_args.marker is not None:
+            args['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            args['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            args['max_items'] = parsed_args.max_items
+
         _tag.get_tag_filtering_args(parsed_args, args)
 
-        if parsed_args.agent is not None:
+        if parsed_args.agent is None:
+            data = list(client.routers(**args))
+        else:
             agent = client.get_agent(parsed_args.agent)
-            data = client.agent_hosted_routers(agent)
             # NOTE: Networking API does not support filtering by parameters,
             # so we need filtering in the client side.
-            data = [d for d in data if self._filter_match(d, args)]
-        else:
-            data = client.routers(**args)
+            data = [
+                d
+                for d in client.agent_hosted_routers(agent)
+                if self._filter_match(d, args)
+            ]
 
         # check if "HA" and "Distributed" columns should be displayed also
         data = list(data)
@@ -887,7 +900,7 @@ class RemovePortFromRouter(command.Command):
         port = client.find_port(parsed_args.port, ignore_missing=False)
         client.remove_interface_from_router(
             client.find_router(parsed_args.router, ignore_missing=False),
-            port_id=port.id,
+            port=port.id,
         )
 
 
@@ -915,12 +928,10 @@ class RemoveSubnetFromRouter(command.Command):
         subnet = client.find_subnet(parsed_args.subnet, ignore_missing=False)
         client.remove_interface_from_router(
             client.find_router(parsed_args.router, ignore_missing=False),
-            subnet_id=subnet.id,
+            subnet=subnet.id,
         )
 
 
-# TODO(yanxing'an): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class SetRouter(common.NeutronCommandWithExtraArgs):
     _description = _("Set router properties")
 

openstackclient/network/v2/security_group.py

@@ -9,7 +9,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Security Group action implementations"""
 
@@ -19,15 +18,16 @@ import logging
 from typing import Any, cast
 
 from cliff import columns as cliff_columns
+from openstack.network.v2 import security_group as _security_group
 from osc_lib import exceptions
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
-from openstackclient.network import utils as network_utils
 
 LOG = logging.getLogger(__name__)
 
@@ -35,9 +35,8 @@ LOG = logging.getLogger(__name__)
 def _format_network_security_group_rules(
     sg_rules: list[dict[str, Any]],
 ) -> str:
-    # For readability and to align with formatting compute security group
-    # rules, trim keys with caller known (e.g. security group and tenant ID)
-    # or empty values.
+    # For readability, trim keys with caller known (e.g. security group and
+    # tenant ID) or empty values.
     for sg_rule in sg_rules:
         empty_keys = [k for k, v in sg_rule.items() if not v]
         for key in empty_keys:
@@ -48,53 +47,19 @@ def _format_network_security_group_rules(
     return utils.format_list_of_dicts(sg_rules) or ""
 
 
-def _format_compute_security_group_rule(sg_rule: dict[str, Any]) -> str:
-    info = network_utils.transform_compute_security_group_rule(sg_rule)
-    # Trim parent security group ID since caller has this information.
-    info.pop('parent_group_id', None)
-    # Trim keys with empty string values.
-    keys_to_trim = [
-        'ip_protocol',
-        'ip_range',
-        'port_range',
-        'remote_security_group',
-    ]
-    for key in keys_to_trim:
-        if key in info and not info[key]:
-            info.pop(key)
-    return utils.format_dict(info)
-
-
-def _format_compute_security_group_rules(
-    sg_rules: list[dict[str, Any]],
-) -> str:
-    rules = []
-    for sg_rule in sg_rules:
-        rules.append(_format_compute_security_group_rule(sg_rule))
-    return utils.format_list(rules, separator='\n') or ""
-
-
 class NetworkSecurityGroupRulesColumn(cliff_columns.FormattableColumn[Any]):
     def human_readable(self) -> str:
         return _format_network_security_group_rules(self._value)
 
 
-class ComputeSecurityGroupRulesColumn(cliff_columns.FormattableColumn[Any]):
-    def human_readable(self) -> str:
-        return _format_compute_security_group_rules(self._value)
-
-
-_formatters_network = {
+_formatters = {
     'security_group_rules': NetworkSecurityGroupRulesColumn,
 }
 
 
-_formatters_compute = {
-    'rules': ComputeSecurityGroupRulesColumn,
-}
-
-
-def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
+def _get_columns(
+    item: _security_group.SecurityGroup,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     # We still support Nova managed security groups, where we have tenant_id.
     column_map = {
         'security_group_rules': 'rules',
@@ -105,8 +70,6 @@ def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
     )
 
 
-# TODO(abhiraut): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class CreateSecurityGroup(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a new security group")
 
@@ -178,7 +141,7 @@ class CreateSecurityGroup(command.ShowOne, common.NeutronCommandWithExtraArgs):
         _tag.update_tags_for_set(client, obj, parsed_args)
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_item_properties(
-            obj, property_columns, formatters=_formatters_network
+            obj, property_columns, formatters=_formatters
         )
         return (display_columns, data)
 
@@ -223,8 +186,6 @@ class DeleteSecurityGroup(command.Command):
             raise exceptions.CommandError(msg)
 
 
-# TODO(rauta): Use the SDK resource mapped attribute names once
-# the OSC minimum requirements include SDK 1.0.
 class ListSecurityGroup(command.Lister):
     _description = _("List security groups")
     FIELDS_TO_RETRIEVE = [
@@ -265,6 +226,7 @@ class ListSecurityGroup(command.Lister):
         )
 
         _tag.add_tag_filtering_option_to_parser(parser, _('security group'))
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -272,6 +234,7 @@ class ListSecurityGroup(command.Lister):
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         filters = {}
+
         if parsed_args.project:
             identity_client = self.app.client_manager.identity
             project_id = identity_common.find_project(
@@ -283,6 +246,12 @@ class ListSecurityGroup(command.Lister):
 
         if parsed_args.shared is not None:
             filters['shared'] = parsed_args.shared
+        if parsed_args.marker is not None:
+            filters['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            filters['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            filters['max_items'] = parsed_args.max_items
 
         _tag.get_tag_filtering_args(parsed_args, filters)
         data = client.security_groups(
@@ -398,7 +367,7 @@ class ShowSecurityGroup(command.ShowOne):
         )
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_item_properties(
-            obj, property_columns, formatters=_formatters_network
+            obj, property_columns, formatters=_formatters
         )
         return (display_columns, data)
 

openstackclient/network/v2/security_group_rule.py

@@ -18,11 +18,13 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.network.v2 import security_group_rule as _security_group_rule
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -31,15 +33,15 @@ 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: _security_group_rule.SecurityGroupRule,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
     hidden_columns = ['location', 'name', 'tenant_id', 'tags']
     return utils.get_osc_show_columns_for_sdk_resource(
         item, {}, hidden_columns
     )
 
 
-# TODO(abhiraut): Use the SDK resource mapped attribute names once the
-# OSC minimum requirements include SDK 1.0.
 class CreateSecurityGroupRule(
     command.ShowOne, common.NeutronCommandWithExtraArgs
 ):
@@ -281,13 +283,16 @@ class DeleteSecurityGroupRule(command.Command):
 class ListSecurityGroupRule(command.Lister):
     _description = _("List security group rules")
 
-    def _format_network_security_group_rule(self, rule: Any) -> dict[str, Any]:
+    @staticmethod
+    def _format_network_security_group_rule(
+        rule: _security_group_rule.SecurityGroupRule,
+    ) -> dict[str, object]:
         """Transform the SDK SecurityGroupRule 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
         """
-        data: dict[str, Any] = rule.to_dict()
+        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
@@ -344,6 +349,7 @@ class ListSecurityGroupRule(command.Lister):
             help=_("List only rules with the specified project (name or ID)"),
         )
         identity_common.add_project_domain_option_to_parser(parser)
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def _get_column_headers(
@@ -413,6 +419,13 @@ class ListSecurityGroupRule(command.Lister):
             ).id
             query['project_id'] = project_id
 
+        if parsed_args.marker is not None:
+            query['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            query['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            query['max_items'] = parsed_args.max_items
+
         rules = [
             self._format_network_security_group_rule(r)
             for r in client.security_group_rules(**query)