summaryrefslogtreecommitdiff
path: root/tests/topotests/route_scale/scale_test_common.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/topotests/route_scale/scale_test_common.py')
-rw-r--r--tests/topotests/route_scale/scale_test_common.py27
1 files changed, 24 insertions, 3 deletions
diff --git a/tests/topotests/route_scale/scale_test_common.py b/tests/topotests/route_scale/scale_test_common.py
index 0b239dc04b..bb95c66031 100644
--- a/tests/topotests/route_scale/scale_test_common.py
+++ b/tests/topotests/route_scale/scale_test_common.py
@@ -86,6 +86,23 @@ def scale_converge_protocols():
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
+ logger.info("Ensuring that Connected Routes are actually installed")
+ r1 = tgen.gears["r1"]
+ expected = {
+ "routes": [
+ {"fib": 32, "rib": 32, "type": "connected"},
+ {"fib": 32, "rib": 32, "type": "local"},
+ ],
+ "routesTotal": 64,
+ "routesTotalFib": 64,
+ }
+
+ test_func = partial(
+ topotest.router_json_cmp, r1, "show ip route summary json", expected
+ )
+ success, result = topotest.run_and_expect(test_func, None, 60, 1)
+ assert success, "Connected routes are not properly installed:\n{}".format(result)
+
def run_one_setup(r1, s):
"Run one ecmp config"
@@ -102,7 +119,11 @@ def run_one_setup(r1, s):
count = d["rib"]
break
- logger.info("Testing {} routes X {} ecmp".format(count, s["ecmp"]))
+ logger.info(
+ "Testing {} routes X {} ecmp, waiting {} retries {}".format(
+ count, s["ecmp"], wait, retries
+ )
+ )
r1.vtysh_cmd(
"sharp install route 1.0.0.0 \
@@ -176,8 +197,8 @@ def route_install_helper(iter):
[2, "two"],
[4, "four"],
[8, "eight"],
- [16, "sixteen", 10, 40],
- [32, "thirtytwo", 10, 40],
+ [16, "sixteen", 10, 80],
+ [32, "thirtytwo", 10, 80],
]
# Build up a list of dicts with params for each step of the test;