From 05c78ad399e7aa1262ced4fc9c9839b54bcfc6ed Mon Sep 17 00:00:00 2001 From: Pavel Patsey Date: Wed, 22 Jan 2025 21:56:19 +0300 Subject: [PATCH] delete added_ips_number info from node --- tests/cidr4_merge/test_cidr4_merger.py | 20 ++++++++++---------- vpn_manager/cidr4_merge/cidr4_merger.py | 11 +++++------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/cidr4_merge/test_cidr4_merger.py b/tests/cidr4_merge/test_cidr4_merger.py index 85490d4..6800752 100644 --- a/tests/cidr4_merge/test_cidr4_merger.py +++ b/tests/cidr4_merge/test_cidr4_merger.py @@ -33,18 +33,18 @@ ip_d = int(bin_d, 2) def test_cidr4_to_node(): - assert cidr4_to_node("4.78.139.0/24") == (72256256, 24, 0) - assert cidr4_to_node("0.0.0.0/32") == (0, 32, 0) + assert cidr4_to_node("4.78.139.0/24") == (72256256, 24) + assert cidr4_to_node("0.0.0.0/32") == (0, 32) - assert cidr4_to_node("23.234.30.0/24") == (401219072, 24, 0) - assert cidr4_to_node("172.217.0.0/19") == (2899902464, 19, 0) - assert cidr4_to_node("23.225.141.0/24") == (400657664, 24, 0) - assert cidr4_to_node("31.13.94.0/23") == (520969728, 23, 0) + assert cidr4_to_node("23.234.30.0/24") == (401219072, 24) + assert cidr4_to_node("172.217.0.0/19") == (2899902464, 19) + assert cidr4_to_node("23.225.141.0/24") == (400657664, 24) + assert cidr4_to_node("31.13.94.0/23") == (520969728, 23) - assert cidr4_to_node("0.0.0.0/2") == (0, 2, 0) - assert cidr4_to_node("64.0.0.0/2") == (1073741824, 2, 0) - assert cidr4_to_node("128.0.0.0/2") == (2147483648, 2, 0) - assert cidr4_to_node("192.0.0.0/2") == (3221225472, 2, 0) + assert cidr4_to_node("0.0.0.0/2") == (0, 2) + assert cidr4_to_node("64.0.0.0/2") == (1073741824, 2) + assert cidr4_to_node("128.0.0.0/2") == (2147483648, 2) + assert cidr4_to_node("192.0.0.0/2") == (3221225472, 2) def test_make_cidr4(): diff --git a/vpn_manager/cidr4_merge/cidr4_merger.py b/vpn_manager/cidr4_merge/cidr4_merger.py index db4163c..77f7212 100644 --- a/vpn_manager/cidr4_merge/cidr4_merger.py +++ b/vpn_manager/cidr4_merge/cidr4_merger.py @@ -1,6 +1,6 @@ import cProfile -Node = tuple[int, int, int] +Node = tuple[int, int] class Cidr4MergerError(Exception): @@ -15,11 +15,10 @@ def get_data(input_file): def cidr4_to_node(cidr4: str) -> Node: ip_address, mask_len = cidr4.strip().split("/") - mask_len = int(mask_len) a, b, c, d = list(map(int, ip_address.split("."))) ip = a * 256**3 + b * 256**2 + c * 256**1 + d * 256**0 - added_ips_number = 0 - return ip, mask_len, added_ips_number + mask_len = int(mask_len) + return ip, mask_len def sort_nodes(nodes: list[Node]) -> list[Node]: @@ -39,8 +38,8 @@ def get_parent_ip(ip: int, mask_len: int) -> int: def make_parent(a: Node, b: Node) -> Node: - ip, mask_len, added_ips_number = None - return ip, mask_len, added_ips_number + ip, mask_len = 0, 0 + return ip, mask_len def make_cidr4(ip, mask_len) -> str: