qontract-reconcile 0.10.1rc723__py3-none-any.whl → 0.10.1rc724__py3-none-any.whl

{qontract_reconcile-0.10.1rc723.dist-info → qontract_reconcile-0.10.1rc724.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc723
+Version: 0.10.1rc724
 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.1rc723.dist-info → qontract_reconcile-0.10.1rc724.dist-info}/RECORD

@@ -746,7 +746,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=blfKR_QxxnqxBWyX_x5V5cXEydnmM3v9Iy5gAIFrCIc,114530
+tools/qontract_cli.py,sha256=vm1uti_uMmPKiDE2gP_VXqoURqrq5YmIFZhQU6u3p2U,115670
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -764,8 +764,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc723.dist-info/METADATA,sha256=lx9z1uiO5ZTe9qO_d0fm1X86mxSU2fABbcxCL9Jmv8g,2382
-qontract_reconcile-0.10.1rc723.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc723.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc723.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc723.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc724.dist-info/METADATA,sha256=PjfsZ0NRyqqevEEofVjYp6lI20qIJHsKyRc6CHZTA7A,2382
+qontract_reconcile-0.10.1rc724.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc724.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc724.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc724.dist-info/RECORD,,

tools/qontract_cli.py

@@ -1021,8 +1021,20 @@ def network_reservations(ctx) -> None:
 
 
 @get.command()
+@click.option(
+    "--for-cluster",
+    help="If it is for getting cidr block for a cluster.",
+    type=bool,
+    default=False,
+)
+@click.option(
+    "--mask",
+    help="Mask for the latest available CIDR block for AWS resources. A decimal number between 1~32.",
+    type=int,
+    default=24,
+)
 @click.pass_context
-def cidr_blocks(ctx) -> None:
+def cidr_blocks(ctx, for_cluster: int, mask: int) -> None:
     import ipaddress
 
     from reconcile.typed_queries.aws_vpcs import get_aws_vpcs
@@ -1070,8 +1082,29 @@ def cidr_blocks(ctx) -> None:
 
     cidrs.sort(key=lambda item: ipaddress.ip_network(item["cidr"]))
 
-    ctx.obj["options"]["sort"] = False
-    print_output(ctx.obj["options"], cidrs, columns)
+    if for_cluster:
+        latest_cluster_cidr = next(
+            (item for item in reversed(cidrs) if item["type"] == "cluster"),
+            None,
+        )
+
+        if not latest_cluster_cidr:
+            print("ERROR: Unable to find any existing cluster CIDR block.")
+            sys.exit(1)
+
+        avail_addr = ipaddress.ip_address(latest_cluster_cidr["to"]) + 1
+
+        print(f"INFO: Latest available network address: {str(avail_addr)}")
+        try:
+            result_cidr_block = str(ipaddress.ip_network((avail_addr, mask)))
+        except ValueError:
+            print(f"ERROR: Invalid CIDR Mask {mask} Provided.")
+            sys.exit(1)
+        print(f"INFO: You are reserving {str(2 ** (32 - mask))} network addresses.")
+        print(f"\nYou can use: {str(result_cidr_block)}")
+    else:
+        ctx.obj["options"]["sort"] = False
+        print_output(ctx.obj["options"], cidrs, columns)
 
 
 def ocm_aws_infrastructure_access_switch_role_links_data() -> list[dict]: