From 9a974f22928a2795843e68ac823f323ea81304f1 Mon Sep 17 00:00:00 2001 From: ckishimo Date: Wed, 5 Jan 2022 23:46:24 +0100 Subject: [PATCH] ospf6d: fix topotest The routes in the test_nssa_range() are E2 "routes":{ "2001:db8:1000::2/128":{ "destinationType":"Network", "installedTimeSince":"00:06:29", "changedTimeSince":"00:06:29", "numberOfLock":2, "flags":"BA--", "associatedArea":"0.0.0.2", "pathType":"External-2", "lsOriginRoutePathType":"NSSA", "lsId":"0.0.0.3", "lsAdvertisingRouter":"10.254.254.4", "options":"--|-|-|--|-|--", "routerBits":"--------", "prefixOptions":"--|P|--|--|--", "metricType":2, "metricCost":10, "metricCostE2":20, "pathsCount":1, "nextHopCount":1, "nextHops":[ { "nextHop":"::", "interfaceName":"r2-eth2" } ] } This PR fixes the key from `metricCost` to `metricCostE2` Signed-off-by: ckishimo --- .../topotests/ospf6_topo2/test_ospf6_topo2.py | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py index eb8561c404..d17aeda3ea 100644 --- a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py +++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py @@ -134,6 +134,7 @@ def build_topo(tgen): switch = tgen.add_switch("s4") switch.add_link(tgen.gears["r4"], nodeif="r4-stubnet") + def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(build_topo, mod.__name__) @@ -585,10 +586,11 @@ def test_nssa_range(): logger.info("Expecting NSSA range to be added on r3") routes = { "2001:db8:1000::/64": { - "metricType":2, - "metricCost":20, - "metricCostE2":10, - }} + "metricType": 2, + "metricCost": 20, + "metricCostE2": 10, + } + } expect_ospfv3_routes("r3", routes, wait=30, type="external-2", detail=True) # Change the NSSA range cost. @@ -601,10 +603,11 @@ def test_nssa_range(): logger.info("Expecting NSSA range to be updated with new cost") routes = { "2001:db8:1000::/64": { - "metricType":2, - "metricCost":20, - "metricCostE2":1000, - }} + "metricType": 2, + "metricCost": 20, + "metricCostE2": 1000, + } + } expect_ospfv3_routes("r3", routes, wait=30, type="external-2", detail=True) # Configure the NSSA range to not be advertised. @@ -631,12 +634,12 @@ def test_nssa_range(): logger.info("Expecting previously summarized routes to be re-added") routes = { "2001:db8:1000::1/128": { - "metricType":2, - "metricCost":20, + "metricType": 2, + "metricCostE2": 20, }, "2001:db8:1000::2/128": { - "metricType":2, - "metricCost":20, + "metricType": 2, + "metricCostE2": 20, }, } expect_ospfv3_routes("r3", routes, wait=30, type="external-2", detail=True)