diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2020-11-19 07:40:03 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2020-11-19 07:40:03 -0500 |
| commit | a28055a47830398da3b84433435df8ff4fc29e09 (patch) | |
| tree | e7ecf32298ef41e737f1b5b7b57c6ed163a19095 /tests/topotests/lib/common_config.py | |
| parent | 53a85efa514b88be08c29dfe539612e58f2d2fb3 (diff) | |
tests: Fix common_config.py issues
1) in generate_ips if start_ipaddr does not have a `/` in it
there exists a code path where both mask and step are
null values. Write a bit of code to ensure this pre-req
is found early and often
2) in verify_rib there exists a code path where static_route
is null when we get to the non static route section. Change
the code to operate on the advertise_network_dict that
we are iterating over.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'tests/topotests/lib/common_config.py')
| -rw-r--r-- | tests/topotests/lib/common_config.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py index 9c104db3cd..6c24b6ddbb 100644 --- a/tests/topotests/lib/common_config.py +++ b/tests/topotests/lib/common_config.py @@ -1150,6 +1150,9 @@ def generate_ips(network, no_of_ips): if "/" in start_ipaddr: start_ip = start_ipaddr.split("/")[0] 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) if addr_type == "ipv4": @@ -2865,7 +2868,7 @@ def verify_rib( for advertise_network_dict in advertise_network: if "vrf" in advertise_network_dict: - cmd = "{} vrf {} json".format(command, static_route["vrf"]) + cmd = "{} vrf {} json".format(command, advertise_network_dict["vrf"]) else: cmd = "{} json".format(command) |