proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 10:48:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7562 from donaldsharp/python_fixes

Browse Source 
tests: Fix common_config.py issues
This commit is contained in:
Donatas Abraitis 2020-11-20 09:37:58 +02:00 committed by GitHub
commit a1477006f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1150,6 +1150,9 @@ def generate_ips(network, no_of_ips):
if "/" in start_ipaddr: if "/" in start_ipaddr:
start_ip = start_ipaddr.split("/")[0] start_ip = start_ipaddr.split("/")[0]
mask = int(start_ipaddr.split("/")[1]) mask = int(start_ipaddr.split("/")[1])
else:
logger.debug("start_ipaddr {} must have a / in it".format(start_ipaddr))
assert(0)
addr_type = validate_ip_address(start_ip) addr_type = validate_ip_address(start_ip)
if addr_type == "ipv4": if addr_type == "ipv4":
@ -2865,7 +2868,7 @@ def verify_rib(
for advertise_network_dict in advertise_network: for advertise_network_dict in advertise_network:
if "vrf" in advertise_network_dict: if "vrf" in advertise_network_dict:
cmd = "{} vrf {} json".format(command, static_route["vrf"]) cmd = "{} vrf {} json".format(command, advertise_network_dict["vrf"])
else: else:
cmd = "{} json".format(command) cmd = "{} json".format(command)