tests: Don't double create ospfv3 config

When testers use the build_config_from_json function
the create_router_ospf function is double creating
the ospfv3 cli to be passed in.  This is because
the create_router_ospf loops over both v2 and v3
and then create_router_ospf6 re-adds v3.

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

diff --git a/tests/topotests/lib/topojson.py b/tests/topotests/lib/topojson.py
index 4f23e1ace03042a9e4977a4332f6bbda3f817fa6..1945ca535ba1790df2ee5e4b2bbe93ff46b3fb79 100644 (file)
--- a/tests/topotests/lib/topojson.py
+++ b/tests/topotests/lib/topojson.py
@@ -40,7 +40,7 @@ from lib.common_config import (
     topo_daemons,
     number_to_column,
 )
-from lib.ospf import create_router_ospf, create_router_ospf6
+from lib.ospf import create_router_ospf
 from lib.pim import create_igmp_config, create_pim_config
 from lib.topolog import logger
 
@@ -334,7 +334,6 @@ def build_config_from_json(tgen, topo=None, save_bkup=True):
             ("igmp", create_igmp_config),
             ("bgp", create_router_bgp),
             ("ospf", create_router_ospf),
-            ("ospf6", create_router_ospf6),
         ]
     )