proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 05:18:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7498 from mjstapp/fix_topo_count_only

Browse Source 
tests: only test count of nexthops in bgp max-paths test
This commit is contained in:
Donald Sharp 2020-11-10 15:17:59 -05:00 committed by GitHub
commit 02a17eaddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py
View File

@ -292,6 +292,10 @@ def test_modify_ecmp_max_paths(request, ecmp_num, test_type):
input_dict_1 = {"r3": {"static_routes": [{"network": NETWORK[addr_type]}]}}
logger.info("Verifying %s routes on r3", addr_type)
# Only test the count of nexthops; the actual nexthop addresses
# can vary and are not deterministic.
#
result = verify_rib(
tgen,
addr_type,
@ -299,7 +303,9 @@ def test_modify_ecmp_max_paths(request, ecmp_num, test_type):
input_dict_1,
next_hop=NEXT_HOPS[addr_type][: int(ecmp_num)],
protocol=protocol,
count_only=True
)
assert result is True, "Testcase {} : Failed \n Error: {}".format(
tc_name, result
)

6
tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py
View File

@ -293,6 +293,10 @@ def test_modify_ecmp_max_paths(request, ecmp_num, test_type):
input_dict_1 = {"r3": {"static_routes": [{"network": NETWORK[addr_type]}]}}
logger.info("Verifying %s routes on r3", addr_type)
# Test only the count of nexthops, not the specific nexthop addresses -
# they're not deterministic
#
result = verify_rib(
tgen,
addr_type,
@ -300,7 +304,9 @@ def test_modify_ecmp_max_paths(request, ecmp_num, test_type):
input_dict_1,
next_hop=NEXT_HOPS[addr_type][: int(ecmp_num)],
protocol=protocol,
count_only=True
)
assert result is True, "Testcase {} : Failed \n Error: {}".format(
tc_name, result
)

21
tests/topotests/lib/common_config.py
View File

@ -2559,6 +2559,7 @@ def verify_rib(
tag=None,
metric=None,
fib=None,
count_only=False
):
"""
Data will be read from input_dict or input JSON file, API will generate
@ -2576,6 +2577,8 @@ def verify_rib(
* `next_hop`[optional]: next_hop which needs to be verified,
default: static
* `protocol`[optional]: protocol, default = None
* `count_only`[optional]: count of nexthops only, not specific addresses,
default = False
Usage
-----
@ -2739,7 +2742,23 @@ def verify_rib(
for rib_r in rib_routes_json[st_rt][0]["nexthops"]
]
if found_hops:
# Check only the count of nexthops
if count_only:
if len(next_hop) == len(found_hops):
nh_found = True
else:
errormsg = (
"Nexthops are missing for "
"route {} in RIB of router {}: "
"expected {}, found {}\n".format(
st_rt, dut, len(next_hop),
len(found_hops)
)
)
return errormsg
# Check the actual nexthops
elif found_hops:
missing_list_of_nexthops = set(
found_hops
).difference(next_hop)