diff options
Diffstat (limited to 'tests/topotests/ospf_basic_functionality')
13 files changed, 13 insertions, 61 deletions
diff --git a/tests/topotests/ospf_basic_functionality/ospf_rte_calc.json b/tests/topotests/ospf_basic_functionality/ospf_rte_calc.json index 9062a09091..1fe076ea15 100644 --- a/tests/topotests/ospf_basic_functionality/ospf_rte_calc.json +++ b/tests/topotests/ospf_basic_functionality/ospf_rte_calc.json @@ -1,5 +1,5 @@ { - + "feature": ["bgp"], "ipv4base": "10.0.0.0", "ipv4mask": 24, "link_ip_start": { diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py index f42bc47d46..5b163d28e4 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_topo1.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py index 2c9959c499..b890f9a8aa 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_asbr_summary_type7_lsa.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py index 252481799c..8a94bf1178 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py index a0ab828717..27c6954d2b 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py index 2b479db3c2..d6bcbd0fcc 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py index 00feefc4d0..049c2b83f0 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py index 497a8b900b..80ca0c8b04 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py index 1917bd42f5..7391379bb9 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_p2mp.py b/tests/topotests/ospf_basic_functionality/test_ospf_p2mp.py index e131fba0c3..9e48f8e39b 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_p2mp.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_p2mp.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py index 22d768d9f6..c41985e0fe 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py index 8bd81a3854..b9da460909 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py @@ -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) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py index 21a7d83845..37f558b99c 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py @@ -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) |