From 3cec1ba25e2335bb344cca22a44c526ff3a619ef Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 29 Nov 2023 14:28:08 +0100 Subject: [PATCH] topotests: use the Role field when testing ospf6 To handle the future change of naming in the ospf6 state, align the ospf6 tests with the new 'Role' nickname instead of the old 'state' value. Signed-off-by: Philippe Guibert --- tests/topotests/ospf6_topo1/test_ospf6_topo1.py | 2 +- tests/topotests/ospf6_topo2/test_ospf6_topo2.py | 2 +- tests/topotests/ospf_topo1/test_ospf_topo1.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/topotests/ospf6_topo1/test_ospf6_topo1.py b/tests/topotests/ospf6_topo1/test_ospf6_topo1.py index 5649757010c3..0769ce93bfa8 100644 --- a/tests/topotests/ospf6_topo1/test_ospf6_topo1.py +++ b/tests/topotests/ospf6_topo1/test_ospf6_topo1.py @@ -174,7 +174,7 @@ def expect_neighbor_full(router, neighbor): topotest.router_json_cmp, tgen.gears[router], "show ipv6 ospf6 neighbor json", - {"neighbors": [{"neighborId": neighbor, "state": "Full"}]}, + {"neighbors": [{"neighborId": neighbor, "Role": "Full"}]}, ) _, result = topotest.run_and_expect(test_func, None, count=130, wait=1) assertmsg = '"{}" convergence failure'.format(router) diff --git a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py index f95f7bbe5e8b..b7508dd93e91 100644 --- a/tests/topotests/ospf6_topo2/test_ospf6_topo2.py +++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py @@ -157,7 +157,7 @@ def expect_neighbor_full(router, neighbor): topotest.router_json_cmp, tgen.gears[router], "show ipv6 ospf6 neighbor json", - {"neighbors": [{"neighborId": neighbor, "state": "Full"}]}, + {"neighbors": [{"neighborId": neighbor, "Role": "Full"}]}, ) _, result = topotest.run_and_expect(test_func, None, count=130, wait=1) assertmsg = '"{}" convergence failure'.format(router) diff --git a/tests/topotests/ospf_topo1/test_ospf_topo1.py b/tests/topotests/ospf_topo1/test_ospf_topo1.py index a079f5698ff1..53c31a4a6494 100644 --- a/tests/topotests/ospf_topo1/test_ospf_topo1.py +++ b/tests/topotests/ospf_topo1/test_ospf_topo1.py @@ -154,7 +154,7 @@ def expect_ospfv3_neighbor_full(router, neighbor): topotest.router_json_cmp, tgen.gears[router], "show ipv6 ospf6 neighbor json", - {"neighbors": [{"neighborId": neighbor, "state": "Full"}]}, + {"neighbors": [{"neighborId": neighbor, "Role": "Full"}]}, ) _, result = topotest.run_and_expect(test_func, None, count=130, wait=1) assertmsg = '"{}" convergence failure'.format(router)