qontract-reconcile 0.10.1rc194__py3-none-any.whl → 0.10.1rc195__py3-none-any.whl

{qontract_reconcile-0.10.1rc194.dist-info → qontract_reconcile-0.10.1rc195.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc194
+Version: 0.10.1rc195
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc194.dist-info → qontract_reconcile-0.10.1rc195.dist-info}/RECORD

@@ -525,7 +525,7 @@ reconcile/utils/oc.py,sha256=AIkBSXLnsJCE_9HCMN66-QK359pMBNPs4Q2XPI9zjyU,64780
 reconcile/utils/oc_connection_parameters.py,sha256=mUP0WtpozdFDufcdNKy2OGweRvI3Faq8YLiR0ngJYes,9799
 reconcile/utils/oc_filters.py,sha256=RWn8pC5A7ZZT7C6WPq9bOw5KBNkiAb5puFSr_FpdAf8,1358
 reconcile/utils/oc_map.py,sha256=nT69J5pdPeIDnIYjD9fwY6GkE3BMQCf-AF0rmHJuUNw,9068
-reconcile/utils/ocm_base_client.py,sha256=bUE9uUJVVwHaNNKdL86pIA_GnpHraXvtS-3KMRmszps,5177
+reconcile/utils/ocm_base_client.py,sha256=7WHzSQ2j3FhZ1d8DA9v2szfg0tpzavfGCaVgGkvoquY,5003
 reconcile/utils/openshift_resource.py,sha256=fLqURJcjrg8kd9jxbJ91fJBB5woiB4KT_wMKyADzffo,24214
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
 reconcile/utils/output.py,sha256=htcMXMe0y2dNnwu8MW8x0JZ5YBaEJRy5w4tR8yLF0OU,1738
@@ -614,8 +614,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc194.dist-info/METADATA,sha256=fwjAaL7rTDnxFa3zJlkPcnDugqB_JvO_MNHMf_QT1Yo,2320
-qontract_reconcile-0.10.1rc194.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc194.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc194.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc194.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc195.dist-info/METADATA,sha256=PUU-Wdx0R2NJQ6PZRfei54GtnyNCp2GZsMVHQn2PXvg,2320
+qontract_reconcile-0.10.1rc195.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc195.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc195.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc195.dist-info/RECORD,,

reconcile/utils/ocm_base_client.py

@@ -89,23 +89,17 @@ class OCMBaseClient:
             params_copy = params.copy()
         params_copy["size"] = max_page_size
 
-        # fetch pages
-        records_seen = 0
         while True:
-            rs = self.get(api_path, params=params)
+            rs = self.get(api_path, params=params_copy)
             for item in rs.get("items", []):
                 yield item
-            total_records = rs.get("total", 0)
             current_page = rs.get("page", 0)
             records_on_page = rs.get("size", len(rs.get("items", [])))
-            records_seen += records_on_page
-            if total_records > records_seen and (
-                max_pages and max_pages < current_page
-            ):
-                # more page available
-                params_copy["page"] = current_page + 1
-            else:
+            if records_on_page < max_page_size:
                 return
+            if max_pages is not None and current_page >= max_pages:
+                return
+            params_copy["page"] = current_page + 1
 
     def post(
         self,