fedor/wcm
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Cidr4 merge algorithm #5

Merged
PavelPatsey merged 91 commits from CIDR4_merge_algorithm into main 2025-01-27 22:05:39 +03:00
Conversation 4 Commits 91 Files Changed 17
+23 -33
1 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c56d09cfd9 - Show all commits
tests/test_cidr4_merger.py
+23 -33
View File
@@ -1,23 +1,11 @@
import pytest import pytest
from cidr4_merger import ( from cidr4_merger import (Cidr4MergerError, cidr4_to_node,
Cidr4MergerError, find_neighbours_singles, get_group_with_max_mask_len,
cidr4_to_node, get_net_addr, get_parent_ip, have_same_parent,
find_neighbours_singles, lift_lonely_node, make_cidr4, make_groups,
get_group_with_max_mask_len, make_parent, merge_neighbors, merge_nodes,
get_net_addr, merge_nodes_recursion, reduce_nodes, sort_nodes)
get_parent_ip,
have_same_parent,
lift_lonely_node,
make_cidr4,
make_groups,
make_parent,
merge_neighbors,
merge_nodes,
merge_nodes_recursion,
reduce_nodes,
sort_nodes,
)
def test_true(): def test_true():
@@ -210,21 +198,23 @@ def test_merge_nodes():
def test_make_groups(): def test_make_groups():
groups = make_groups( nodes = [
[ (2398793728, 20, 0, 2398789632),
(0, 2, 12, 0), (2899943424, 20, 0, 2899943424),
(1073741824, 2, 3, 0), (3627728896, 20, 0, 3627728896),
(2147483648, 2, 1, 2147483648), (520963072, 22, 0, 520962048),
(3221225472, 2, 2, 2147483648), (1089054720, 22, 0, 1089054720),
] (2899902464, 19, 0, 2899902464),
) (2915221504, 19, 0, 2915221504),
assert dict(groups) == { ]
2: [ assert dict(make_groups(nodes)) == {
(0, 2, 12, 0), 20: [
(1073741824, 2, 3, 0), (2398793728, 20, 0, 2398789632),
(2147483648, 2, 1, 2147483648), (2899943424, 20, 0, 2899943424),
(3221225472, 2, 2, 2147483648), (3627728896, 20, 0, 3627728896),
] ],
22: [(520963072, 22, 0, 520962048), (1089054720, 22, 0, 1089054720)],
19: [(2899902464, 19, 0, 2899902464), (2915221504, 19, 0, 2915221504)],
} }