tests: Fixup more missing pytestmark annotations

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

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
index ee71ae16e0ad8595f86f9d2273c576165c1e6e4c..814272374a8e7cb28ab5b1f8ae309e523da4cb26 100644 (file)
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
@@ -82,6 +82,8 @@ from lib.common_config import (
 )
 
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(CWD, "../"))

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
index a9987a8f963c08b193b90e698470c0cd60e9e859..8e6f9306335d0aec10f4bb49822fdba7441360c9 100644 (file)
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
@@ -81,6 +81,8 @@ from lib.common_config import (
 )
 
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(CWD, "../"))

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py
index 95511568c6870d57cd75506abbebd6b132d13078..9e5250406b7ea8e8dfc89651a269ee01347c4368 100644 (file)
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py
@@ -68,6 +68,7 @@ from lib.common_config import (
     check_router_status,
 )
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
 
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))
@@ -1138,6 +1139,7 @@ def test_verify_default_originate_after_BGP_and_FRR_restart_p2(request):
 
     write_test_footer(tc_name)
 
+
 def test_verify_default_originate_after_shut_no_shut_bgp_neighbor_p1(request):
     """
     Summary: "Verify default-originate route after shut/no shut and clear BGP neighbor  "
@@ -2532,6 +2534,7 @@ def test_verify_default_originate_after_shut_no_shut_bgp_neighbor_p1(request):
 
     write_test_footer(tc_name)
 
+
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]
     sys.exit(pytest.main(args))

diff --git a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
index d330a044392da1e74a534d823f65580760debb39..fa5164fb7157fb31e9d084858c85b9497e76f0a0 100644 (file)
--- a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
+++ b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
@@ -73,6 +73,8 @@ from lib.common_config import (
     delete_route_maps,
 )
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(CWD, "../"))

diff --git a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
index 272a7fe291c2a194f7746e50ca5c4c5fbe0521d9..9e3a3b56605d28023f189cbad93f44394f60c87c 100644 (file)
--- a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
+++ b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
@@ -74,6 +74,8 @@ CWD = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(CWD, "../"))
 sys.path.append(os.path.join(CWD, "../lib/"))
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Required to instantiate the topology builder class.
 
 # pylint: disable=C0413

diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py
index 68436177d8d8552db7eb105cebe8974c64f48508..9f01287c91d910f6ba1ba9c279c6218c3a5fb9f6 100644 (file)
--- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py
+++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py
@@ -56,6 +56,9 @@ from lib.bgp import (
 )
 from lib.topojson import build_config_from_json
 
+
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Global variables
 topo = None
 

diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py
index 1d424caa30eb3a04654efd153ca6294bb7044efc..48f308e316e94a5ff9159e4c209fb2cc3b500eef 100644 (file)
--- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py
+++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py
@@ -55,6 +55,8 @@ from lib.bgp import (
 )
 from lib.topojson import build_config_from_json
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Global variables
 topo = None
 

diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py
index fc2d2364c69aadcbb60529cb7045914735667942..4105c3fe63eb6de27e0be757bc04906322301ccc 100644 (file)
--- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py
+++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py
@@ -52,6 +52,8 @@ from lib.bgp import create_router_bgp, verify_bgp_convergence, verify_bgp_rib
 
 from lib.topojson import build_config_from_json
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Global variables
 topo = None
 

diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py
index 862cae42e9e1b98cc32ae822f6330b040b6960ca..a9e6d21b8d928b3412afaa8307e3d10766f7c240 100644 (file)
--- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py
+++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py
@@ -58,9 +58,10 @@ from lib.bgp import (
 )
 from lib.topojson import build_config_from_json
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
 # Global variables
 topo = None
-
 # Global variables
 NETWORK = {
     "ipv4": [

diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py
index 1a91257f06a0c1ed402ecd0b4abddbd7c2542ecc..9a0fc441755e8ca555db5c91ad2f8a814019dc5d 100644 (file)
--- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py
+++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py
@@ -54,6 +54,7 @@ from lib.topojson import build_config_from_json
 # Global variables
 topo = None
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
 
 # Global variables
 NETWORK_CMD_IP = "1.0.1.17/32"

diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
index 8c855620be6fba08cbc6ecde83eb12ce6e74504b..58d37a368c0df86d52a9dcd0edbf8f7375adbea9 100644 (file)
--- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
+++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py
@@ -57,6 +57,8 @@ from lib.ospf import (
     create_router_ospf,
 )
 
+pytestmark = [pytest.mark.ospfd]
+
 # Global variables
 topo = None
 Iters = 5

diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py
index e7d0621df835f0f740de211b23b99c91ae403a65..85646a8fab5ac3f98cdeddf221c81b768fa287bc 100644 (file)
--- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py
+++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py
@@ -57,6 +57,8 @@ from lib.ospf import (
     create_router_ospf,
 )
 
+pytestmark = [pytest.mark.ospfd]
+
 # Global variables
 topo = None
 Iters = 5

diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py
index 4cb3747c5681e0f67b9f8988831eb2cddfeb31b1..ec97c254d1fc0c1989e7b10aa8d9b00788338cff 100644 (file)
--- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py
+++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py
@@ -57,6 +57,8 @@ from lib.ospf import (
     create_router_ospf,
 )
 
+pytestmark = [pytest.mark.ospfd]
+
 # Global variables
 topo = None
 Iters = 5

diff --git a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
index 3967f5f42a886042679e1f75b72b25ce68854bea..59ba8236c743640a42c7687a6bc240d327320ab6 100644 (file)
--- a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
+++ b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py
@@ -68,6 +68,7 @@ from lib.ospf import (
     verify_ospf_summary,
 )
 
+pytestmark = [pytest.mark.ospfd, pytest.mark.staticd]
 
 # Global variables
 topo = None