From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 23 Nov 2021 12:06:05 +0000 (-0500)
Subject: tests: Don't double create ospfv3 config
X-Git-Tag: frr-8.2.2~219^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=04d01cc343d76849d149553fdf3f25a3b06d4005;p=mirror_frr.git

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 4f23e1ace..1945ca535 100644
--- 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),
         ]
     )