Merge "network: Add '--marker', '--limit' to most list commands"

Author: Zuul

openstackclient/network/v2/address_group.py

@@ -24,6 +24,7 @@
 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
@@ -172,6 +173,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             ),
         )
         identity_common.add_project_domain_option_to_parser(parser)
+        pagination.add_marker_pagination_option_to_parser(parser)
 
         return parser
 
@@ -204,6 +206,11 @@ def take_action(
                 parsed_args.project_domain,
             ).id
             attrs['project_id'] = project_id
+        if parsed_args.marker is not None:
+            attrs['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            attrs['limit'] = parsed_args.limit
+
         data = client.address_groups(**attrs)
 
         return (

openstackclient/network/v2/address_scope.py

@@ -23,6 +23,7 @@
 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
@@ -188,7 +189,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             ),
         )
         identity_common.add_project_domain_option_to_parser(parser)
-
+        pagination.add_marker_pagination_option_to_parser(parser)
         shared_group = parser.add_mutually_exclusive_group()
         shared_group.add_argument(
             '--share',
@@ -200,6 +201,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             action='store_true',
             help=_("List only address scopes not shared between projects"),
         )
+
         return parser
 
     def take_action(
@@ -237,6 +239,10 @@ def take_action(
                 parsed_args.project_domain,
             ).id
             attrs['project_id'] = project_id
+        if parsed_args.marker is not None:
+            attrs['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            attrs['limit'] = parsed_args.limit
         data = client.address_scopes(**attrs)
 
         return (

openstackclient/network/v2/floating_ip.py

@@ -25,6 +25,7 @@
 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
@@ -311,6 +312,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             default=False,
             help=_("List additional fields in output"),
         )
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -398,6 +400,10 @@ def take_action(
                 ).id
                 router_ids.append(router_id)
             query['router_id'] = router_ids
+        if parsed_args.marker is not None:
+            query['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            query['limit'] = parsed_args.limit
 
         _tag.get_tag_filtering_args(parsed_args, query)
 

openstackclient/network/v2/floating_ip_port_forwarding.py

@@ -23,6 +23,7 @@
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.network import common
 
@@ -297,7 +298,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
                 "specified protocol number"
             ),
         )
-
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -343,6 +344,10 @@ def take_action(
                 )
         if parsed_args.protocol is not None:
             query['protocol'] = parsed_args.protocol
+        if parsed_args.marker is not None:
+            query['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            query['limit'] = parsed_args.limit
 
         obj = client.find_ip(
             parsed_args.floating_ip,

openstackclient/network/v2/ip_availability.py

@@ -22,6 +22,7 @@
 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
 
@@ -65,6 +66,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             ),
         )
         identity_common.add_project_domain_option_to_parser(parser)
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -88,7 +90,6 @@ def take_action(
         filters = {}
         if parsed_args.ip_version:
             filters['ip_version'] = parsed_args.ip_version
-
         if parsed_args.project:
             identity_client = self.app.client_manager.identity
             project_id = identity_common.find_project(
@@ -97,6 +98,11 @@ def take_action(
                 parsed_args.project_domain,
             ).id
             filters['project_id'] = project_id
+        if parsed_args.marker is not None:
+            filters['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            filters['limit'] = parsed_args.limit
+
         data = client.network_ip_availabilities(**filters)
         return (
             column_headers,

openstackclient/network/v2/l3_conntrack_helper.py

@@ -23,6 +23,7 @@
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
 LOG = logging.getLogger(__name__)
@@ -179,6 +180,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
                 'the netfilter conntrack target rule (name or ID)'
             ),
         )
+        pagination.add_marker_pagination_option_to_parser(parser)
 
         return parser
 
@@ -200,7 +202,13 @@ def take_action(
             'Protocol',
             'Port',
         )
+
         attrs = _get_attrs(client, parsed_args)
+        if parsed_args.marker is not None:
+            attrs['marker'] = parsed_args.marker
+        if parsed_args.limit is not None:
+            attrs['limit'] = parsed_args.limit
+
         data = client.conntrack_helpers(attrs.pop('router_id'), **attrs)
 
         return (

openstackclient/network/v2/network.py

@@ -25,6 +25,7 @@
 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
@@ -579,6 +580,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             help=_('List only networks hosted the specified agent (ID only)'),
         )
         _tag.add_tag_filtering_option_to_parser(parser, _('networks'))
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -690,6 +692,11 @@ def take_action(
             args['provider:segmentation_id'] = parsed_args.segmentation_id
             args['provider_segmentation_id'] = parsed_args.segmentation_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
+
         _tag.get_tag_filtering_args(parsed_args, args)
 
         return (

openstackclient/network/v2/network_agent.py

@@ -25,6 +25,7 @@
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
 LOG = logging.getLogger(__name__)
@@ -249,6 +250,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             default=False,
             help=_("List additional fields in output"),
         )
+        pagination.add_marker_pagination_option_to_parser(parser)
 
         return parser
 
@@ -276,6 +278,10 @@ def take_action(
         )
 
         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
 
         data: list[_agent.Agent]
         if parsed_args.network is not None:

openstackclient/network/v2/network_flavor.py

@@ -23,6 +23,7 @@
 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
@@ -193,6 +194,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
 class ListNetworkFlavor(command.Lister):
     _description = _("List network flavors")
 
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
+        pagination.add_marker_pagination_option_to_parser(parser)
+        return parser
+
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
@@ -207,7 +213,13 @@ def take_action(
             'Description',
         )
 
-        data = client.flavors()
+        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
+
+        data = client.flavors(**filters)
         return (
             column_headers,
             (

openstackclient/network/v2/network_flavor_profile.py

@@ -21,6 +21,7 @@
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.network import common
 
@@ -162,6 +163,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
 class ListNetworkFlavorProfile(command.Lister):
     _description = _("List network flavor profile(s)")
 
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
+        parser = super().get_parser(prog_name)
+        pagination.add_marker_pagination_option_to_parser(parser)
+        return parser
+
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
@@ -182,7 +188,14 @@ def take_action(
             'Description',
         )
 
-        data = client.service_profiles()
+        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
+
+        data = client.service_profiles(**filters)
+
         return (
             column_headers,
             (