From efb62eeddf3a33483ca8ece0ee0635d020f292b6 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 23 Jan 2021 18:49:05 -0500 Subject: [PATCH] tests: Add pytest.mark.staticd to topotests Signed-off-by: Donald Sharp --- tests/topotests/ospf_basic_functionality/test_ospf_chaos.py | 2 +- .../static_routing_with_ebgp/test_static_routes_topo1_ebgp.py | 2 ++ .../static_routing_with_ebgp/test_static_routes_topo2_ebgp.py | 2 ++ .../static_routing_with_ebgp/test_static_routes_topo3_ebgp.py | 2 ++ .../static_routing_with_ebgp/test_static_routes_topo4_ebgp.py | 1 + .../static_routing_with_ibgp/test_static_routes_topo1_ibgp.py | 2 ++ .../static_routing_with_ibgp/test_static_routes_topo2_ibgp.py | 2 ++ .../static_routing_with_ibgp/test_static_routes_topo3_ibgp.py | 2 ++ .../static_routing_with_ibgp/test_static_routes_topo4_ibgp.py | 1 + 9 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py index b044bd0eeb..ca7cb736f9 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py @@ -63,7 +63,7 @@ from lib.topolog import logger from lib.topojson import build_topo_from_json, build_config_from_json from ipaddress import IPv4Address -pytestmark = [pytest.mark.ospfd] +pytestmark = [pytest.mark.ospfd, pytest.mark.staticd] # Global variables topo = None diff --git a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo1_ebgp.py b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo1_ebgp.py index a33257de65..712a40c738 100644 --- a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo1_ebgp.py +++ b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo1_ebgp.py @@ -63,6 +63,8 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo1_ebgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo2_ebgp.py b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo2_ebgp.py index 93320df327..c009929a48 100644 --- a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo2_ebgp.py +++ b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo2_ebgp.py @@ -73,6 +73,8 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo2_ebgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo3_ebgp.py b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo3_ebgp.py index 255bb073b4..175a1123d7 100644 --- a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo3_ebgp.py +++ b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo3_ebgp.py @@ -68,6 +68,8 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo3_ebgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo4_ebgp.py b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo4_ebgp.py index 75657a8895..3d41d89443 100644 --- a/tests/topotests/static_routing_with_ebgp/test_static_routes_topo4_ebgp.py +++ b/tests/topotests/static_routing_with_ebgp/test_static_routes_topo4_ebgp.py @@ -86,6 +86,7 @@ ADDR_TYPES = check_address_types() NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"} NEXT_HOP_IP = {} +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] class CreateTopo(Topo): """ diff --git a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo1_ibgp.py b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo1_ibgp.py index 130f4fd9aa..ca67ff6645 100644 --- a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo1_ibgp.py +++ b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo1_ibgp.py @@ -66,6 +66,8 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo1_ibgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo2_ibgp.py b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo2_ibgp.py index 0a757c9f28..2dc0a60d51 100644 --- a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo2_ibgp.py +++ b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo2_ibgp.py @@ -75,6 +75,8 @@ from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json from lib.topotest import version_cmp +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo2_ibgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo3_ibgp.py b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo3_ibgp.py index 924fb3a598..3eb431d64f 100644 --- a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo3_ibgp.py +++ b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo3_ibgp.py @@ -69,6 +69,8 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_topo_from_json, build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Reading the data from JSON File for topology creation jsonFile = "{}/static_routes_topo3_ibgp.json".format(CWD) try: diff --git a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo4_ibgp.py b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo4_ibgp.py index fdbfad25b3..01fdff69e6 100644 --- a/tests/topotests/static_routing_with_ibgp/test_static_routes_topo4_ibgp.py +++ b/tests/topotests/static_routing_with_ibgp/test_static_routes_topo4_ibgp.py @@ -83,6 +83,7 @@ ADDR_TYPES = check_address_types() NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"} NEXT_HOP_IP = {} +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] class CreateTopo(Topo): """ -- 2.39.5