proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 18:56:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Cleaning up daemon param used in start_topology()

Browse Source 
Earlier daemon parameter was passed to
start_topology(), which is not needed now,
as new code is implemented to start
feature specific daemons.

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
This commit is contained in:
Kuldeep Kashyap 2022-12-13 10:26:14 -08:00
parent dc4c450fc2
commit 991a971fe9
42 changed files with 55 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/topotests/bgp_ecmp_topo3/test_ibgp_ecmp_topo3.py
View File

@ -39,8 +39,7 @@ sys.path.append(os.path.join(CWD, "../../"))
# pylint: disable=C0413
# Import topogen and topotest helpers
from lib.topogen import get_topogen
from lib import topojson
from lib.topogen import Topogen, get_topogen
from lib.common_config import (
write_test_header,
@ -51,11 +50,12 @@ from lib.common_config import (
reset_config_on_routers,
shutdown_bringup_interface,
apply_raw_config,
start_topology,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
from lib.bgp import create_router_bgp, verify_bgp_convergence
pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
@ -78,9 +78,19 @@ def setup_module(mod):
logger.info("Testsuite start time: {}".format(testsuite_run_time))
logger.info("=" * 40)
tgen = topojson.setup_module_from_json(mod.__file__)
# This function initiates the topology build with Topogen...
json_file = "{}/ibgp_ecmp_topo3.json".format(CWD)
tgen = Topogen(json_file, mod.__name__)
global topo
topo = tgen.json_topo
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)
# Don't run this test if we have any failure.
if tgen.routers_have_failure():
pytest.skip(tgen.errors)

2
tests/topotests/lib/common_config.py
View File

@ -961,7 +961,7 @@ def generate_support_bundle():
return True
def start_topology(tgen, daemon=None):
def start_topology(tgen):
"""
Starting topology, create tmp files which are loaded to routers
to start daemons and then start routers

6
tests/topotests/multicast_pim6_static_rp_topo1/test_multicast_pim6_static_rp1.py
View File

@ -86,7 +86,6 @@ from lib.common_config import (
socat_send_mld_join,
socat_send_pim6_traffic,
kill_socat,
topo_daemons,
)
from lib.pim import (
create_pim_config,
@ -162,12 +161,9 @@ def setup_module(mod):
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, TOPO)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim6_static_rp_topo1/test_multicast_pim6_static_rp2.py
View File

@ -75,7 +75,6 @@ from lib.common_config import (
socat_send_mld_join,
socat_send_pim6_traffic,
kill_socat,
topo_daemons,
)
from lib.pim import (
create_pim_config,
@ -165,12 +164,9 @@ def setup_module(mod):
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, TOPO)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim_bsm_topo1/test_mcast_pim_bsmp_01.py
View File

@ -83,7 +83,6 @@ from lib.common_config import (
apply_raw_config,
run_frr_cmd,
required_linux_kernel_version,
topo_daemons,
verify_rib,
)
@ -168,12 +167,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim_bsm_topo2/test_mcast_pim_bsmp_02.py
View File

@ -67,7 +67,6 @@ from lib.common_config import (
reset_config_on_routers,
run_frr_cmd,
required_linux_kernel_version,
topo_daemons,
verify_rib,
)
@ -148,12 +147,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_dr_nondr_test/test_pim_dr_nondr_with_ospf_topo2.py
View File

@ -166,12 +166,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, tgen.json_topo)
# Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_dr_nondr_test/test_pim_dr_nondr_with_static_routes_topo1.py
View File

@ -180,12 +180,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, tgen.json_topo)
# Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_dr_nondr_test/test_pim_dr_nondr_with_transit_router_topo3.py
View File

@ -185,12 +185,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, tgen.json_topo)
# Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_sm_topo1/test_multicast_pim_sm_topo1.py
View File

@ -175,12 +175,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, tgen.json_topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_sm_topo2/test_multicast_pim_sm_topo2.py
View File

@ -172,12 +172,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py
View File

@ -186,12 +186,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo4.py
View File

@ -151,12 +151,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

5
tests/topotests/multicast_pim_static_rp_topo1/test_multicast_pim_static_rp.py
View File

@ -223,12 +223,9 @@ def setup_module(mod):
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, TOPO)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim_static_rp_topo1/test_multicast_pim_static_rp1.py
View File

@ -128,7 +128,6 @@ from lib.common_config import (
kill_router_daemons,
start_router_daemons,
create_static_routes,
topo_daemons,
)
from lib.pim import (
create_pim_config,
@ -223,12 +222,9 @@ def setup_module(mod):
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, TOPO)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim_static_rp_topo1/test_multicast_pim_static_rp2.py
View File

@ -128,7 +128,6 @@ from lib.common_config import (
kill_router_daemons,
start_router_daemons,
create_static_routes,
topo_daemons,
)
from lib.pim import (
create_pim_config,
@ -223,12 +222,9 @@ def setup_module(mod):
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, TOPO)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/multicast_pim_uplink_topo1/test_multicast_pim_uplink_topo1.py
View File

@ -64,7 +64,6 @@ from lib.common_config import (
stop_router,
create_static_routes,
required_linux_kernel_version,
topo_daemons,
)
from lib.bgp import create_router_bgp
from lib.pim import (
@ -148,12 +147,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, tgen.json_topo)
# Starting topology, create tmp files which are loaded to routers
# to start deamons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Don"t run this test if we have any failure.
if tgen.routers_have_failure():

6
tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py
View File

@ -53,7 +53,6 @@ from lib.common_config import (
start_router_daemons,
create_route_maps,
shutdown_bringup_interface,
topo_daemons,
create_prefix_lists,
create_route_maps,
create_interfaces_cfg,
@ -142,12 +141,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py
View File

@ -46,7 +46,6 @@ from lib.common_config import (
verify_rib,
create_static_routes,
step,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -134,12 +133,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_authentication.py
View File

@ -47,7 +47,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
shutdown_bringup_interface,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -102,12 +101,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_chaos.py
View File

@ -43,7 +43,6 @@ from lib.common_config import (
write_test_footer,
reset_config_on_routers,
step,
topo_daemons,
verify_rib,
stop_router,
start_router,
@ -113,12 +112,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py
View File

@ -47,7 +47,6 @@ from lib.common_config import (
create_static_routes,
step,
shutdown_bringup_interface,
topo_daemons,
)
from lib.topolog import logger
@ -116,12 +115,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py
View File

@ -45,7 +45,6 @@ from lib.common_config import (
verify_rib,
create_static_routes,
step,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -117,12 +116,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_lan.py
View File

@ -49,7 +49,6 @@ from lib.common_config import (
shutdown_bringup_interface,
stop_router,
start_router,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -116,12 +115,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_nssa.py
View File

@ -39,7 +39,6 @@ from lib.common_config import (
verify_rib,
create_static_routes,
step,
topo_daemons,
)
from lib.topogen import Topogen, get_topogen
import os
@ -114,12 +113,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_p2mp.py
View File

@ -46,7 +46,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
retry,
run_frr_cmd,
)
@ -105,12 +104,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py
View File

@ -48,7 +48,6 @@ from lib.common_config import (
step,
create_route_maps,
verify_prefix_lists,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -129,12 +128,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py
View File

@ -48,7 +48,6 @@ from lib.common_config import (
create_static_routes,
step,
shutdown_bringup_interface,
topo_daemons,
)
from lib.bgp import verify_bgp_convergence, create_router_bgp
from lib.topolog import logger
@ -125,12 +124,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_basic_functionality/test_ospf_single_area.py
View File

@ -48,7 +48,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -110,12 +109,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_dual_stack/test_ospf_dual_stack.py
View File

@ -17,7 +17,6 @@ from lib.common_config import (
write_test_footer,
reset_config_on_routers,
step,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -48,12 +47,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
View File

@ -43,7 +43,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
scapy_send_raw_packet,
)
@ -121,12 +120,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py
View File

@ -43,7 +43,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
scapy_send_raw_packet,
)
@ -121,12 +120,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py
View File

@ -43,7 +43,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
scapy_send_raw_packet,
)
@ -121,12 +120,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
View File

@ -55,7 +55,6 @@ from lib.common_config import (
shutdown_bringup_interface,
create_prefix_lists,
create_route_maps,
topo_daemons,
create_interfaces_cfg,
)
from lib.topolog import logger
@ -158,12 +157,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_authentication.py
View File

@ -50,7 +50,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
shutdown_bringup_interface,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_topo_from_json, build_config_from_json
@ -112,12 +111,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_ecmp.py
View File

@ -46,7 +46,6 @@ from lib.common_config import (
create_static_routes,
step,
shutdown_bringup_interface,
topo_daemons,
get_frr_ipv6_linklocal,
)
from lib.topolog import logger
@ -117,12 +116,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_ecmp_lan.py
View File

@ -53,7 +53,6 @@ from lib.common_config import (
create_route_maps,
shutdown_bringup_interface,
create_interfaces_cfg,
topo_daemons,
get_frr_ipv6_linklocal,
)
from lib.topolog import logger
@ -130,12 +129,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_nssa.py
View File

@ -7,7 +7,6 @@ from lib.common_config import (
write_test_footer,
reset_config_on_routers,
step,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -62,12 +61,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_nssa2.py
View File

@ -57,7 +57,6 @@ from lib.common_config import (
verify_rib,
create_static_routes,
step,
topo_daemons,
create_route_maps,
shutdown_bringup_interface,
create_interfaces_cfg,
@ -139,12 +138,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_routemaps.py
View File

@ -48,7 +48,6 @@ from lib.common_config import (
step,
create_route_maps,
verify_prefix_lists,
topo_daemons,
)
from lib.topolog import logger
from lib.topojson import build_config_from_json
@ -131,12 +130,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_rte_calc.py
View File

@ -46,7 +46,6 @@ from lib.common_config import (
step,
shutdown_bringup_interface,
create_interfaces_cfg,
topo_daemons,
get_frr_ipv6_linklocal,
check_router_status,
create_static_routes,
@ -122,12 +121,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)

6
tests/topotests/ospfv3_basic_functionality/test_ospfv3_single_area.py
View File

@ -48,7 +48,6 @@ from lib.common_config import (
reset_config_on_routers,
step,
create_interfaces_cfg,
topo_daemons,
create_debug_log_config,
apply_raw_config,
)
@ -116,12 +115,9 @@ def setup_module(mod):
topo = tgen.json_topo
# ... and here it calls Mininet initialization functions.
# get list of daemons needs to be started for this suite.
daemons = topo_daemons(tgen, topo)
# Starting topology, create tmp files which are loaded to routers
# to start daemons and then start routers
start_topology(tgen, daemons)
start_topology(tgen)
# Creating configuration from JSON
build_config_from_json(tgen, topo)