tests: Change order of config files

Our CI test system is configuring interfaces like this:

int A
  <ospfX config>

router ospfX
  router-id Z.Y.M.Q

On sufficiently loaded systems, the router-id might not be respected because
the interface A neighbor might have come up by the time the router-id
command is read in.  This is a problem for our topotests in that
the tests expect neighbors to be formed with certain router-id,
but the FRR code has stored the new router-id but not accepted
it's use since a neighbor relationship has formed.

Modify the ci test system code to put the 'router ospfX' commands
before the interface commands, thus forcing the router-id to be
read in *before* any possibility that the neighbor can have come
up.

Also, I've filed issue #13452 to address the ordering of commands
with regards to router-id in our ospf protocols.  Once that is
done this should be backed out, to return to a more natural ordering
of commands.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/tests/topotests/lib/topojson.py b/tests/topotests/lib/topojson.py
index 53e6945bee1ad0d4e3f1fa8101e8ad2dfdf44520..ad6dddc76b4213267293e5ea3eb788bf7f5824f8 100644 (file)
--- a/tests/topotests/lib/topojson.py
+++ b/tests/topotests/lib/topojson.py
@@ -316,6 +316,7 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
     func_dict = OrderedDict(
         [
             ("vrfs", create_vrf_cfg),
+            ("ospf", create_router_ospf),
             ("links", create_interfaces_cfg),
             ("static_routes", create_static_routes),
             ("prefix_lists", create_prefix_lists),
@@ -325,7 +326,6 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
             ("igmp", create_igmp_config),
             ("mld", create_mld_config),
             ("bgp", create_router_bgp),
-            ("ospf", create_router_ospf),
         ]
     )