From 3a2529cfa45c79984d342fe5b42c47e515e024bf Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 26 Feb 2013 15:19:40 +0100 Subject: [PATCH] Fetch all pages when listing NVP Nat Rules Bug 1133318 Change-Id: I24e9943b4771c4f2b941c229ba1c300dfbf7e331 --- quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py index 72fa05575..0bbabd598 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py @@ -1239,7 +1239,7 @@ def query_nat_rules(cluster, router_id, fields="*", filters=None): uri = _build_uri_path(LROUTERNAT_RESOURCE, parent_resource_id=router_id, fields=fields, filters=filters) try: - resp = do_single_request(HTTP_GET, uri, cluster=cluster) + result = get_all_query_pages(uri, cluster) except NvpApiClient.ResourceNotFound: LOG.exception(_("NVP Logical Router '%s' not found"), router_id) raise @@ -1247,8 +1247,7 @@ def query_nat_rules(cluster, router_id, fields="*", filters=None): LOG.exception(_("An error occured while retrieving NAT rules for " "NVP logical router '%s'"), router_id) raise - res = json.loads(resp) - return res["results"] + return result # NOTE(salvatore-orlando): The following FIXME applies in general to -- 2.45.2