tests: Add pytest.mark.ospfd to tests

Add pytest marking for ospfd.  This commit also has some other test markings
because I do not want to have to go through the same test multiple times.

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

diff --git a/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py b/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py
index 1cec62789bab714b0583cb774413cebb0d216a67..9ce14dd75eef1c03253f06687d3385bdc55d36d8 100755 (executable)
--- a/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py
+++ b/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py
@@ -90,6 +90,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bfdd, pytest.mark.ospfd]
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py b/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py
index 74e3fd9ce0f93ff0e47a8cd6c6d024b81c42dcd7..76e9ef247feddd4c3323ada03a1ea2e290f3cc81 100644 (file)
--- a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py
+++ b/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py
@@ -45,7 +45,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-pytestmark = [pytest.mark.bfdd, pytest.mark.isisd]
+pytestmark = [pytest.mark.bfdd, pytest.mark.isisd, pytest.mark.ospfd]
 
 class BFDProfTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.py b/tests/topotests/bfd-topo2/test_bfd_topo2.py
index 0d7e71974f8832bfa517c4c870c87e4a6237e496..c31cc02b3aac03a499f4c926729db24ff9c30f76 100644 (file)
--- a/tests/topotests/bfd-topo2/test_bfd_topo2.py
+++ b/tests/topotests/bfd-topo2/test_bfd_topo2.py
@@ -46,7 +46,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-pytestmark = [pytest.mark.bfdd]
+pytestmark = [pytest.mark.bfdd, pytest.mark.ospfd]
 
 class BFDTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bgp-auth/test_bgp_auth.py b/tests/topotests/bgp-auth/test_bgp_auth.py
index 559cf4fb1bb3c7ad2970eb694b724aaa96943781..f01ce8844f69c561606f4c812b235f06e52c47ac 100644 (file)
--- a/tests/topotests/bgp-auth/test_bgp_auth.py
+++ b/tests/topotests/bgp-auth/test_bgp_auth.py
@@ -69,6 +69,8 @@ from lib.common_config import apply_raw_config
 
 ERROR_LIST = ["Malformed", "Failure", "Unknown", "Incomplete"]
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
+
 
 class InvalidCLIError(Exception):
     """Raise when the CLI command is wrong"""

diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py b/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py
index 9a38158b2be040fe0d290650e63e2b0b6e221a3c..785a3acbf914c97d90622cdf9db4e2eee14686ab 100755 (executable)
--- a/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py
+++ b/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py
@@ -45,6 +45,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bgp_features/test_bgp_features.py b/tests/topotests/bgp_features/test_bgp_features.py
index 3d963b4cf65b53291454de680025110d37659f70..a68508c4aec8fd9c4c9a5ef453d4b702ba3c9d0f 100644 (file)
--- a/tests/topotests/bgp_features/test_bgp_features.py
+++ b/tests/topotests/bgp_features/test_bgp_features.py
@@ -48,6 +48,8 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
+
 #####################################################
 #
 #   Network Topology Definition

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
index d226904102f88171101c093b3bbfd135b6134479..d863f9c3ed9a462762ec7839d98f8d34c1f030dc 100755 (executable)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
@@ -29,6 +29,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
 
 from lib.ltemplate import *
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
 
 def test_adjacencies():
     CliOnFail = None

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
index b537735c6528cc5b076edc48d5cf8c94d47502ea..d2e40037a6453b6b9d26e6242fcd8f0432ec3639 100755 (executable)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
@@ -29,6 +29,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../")
 
 from lib.ltemplate import *
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
 
 def test_check_linux_vrf():
     CliOnFail = None

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
index cd59bbc3956fd4229afc62943d541169c9e072a5..ce69f28abad42dfd62816f3d5110ccd95c93e8a6 100755 (executable)
--- a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
@@ -29,6 +29,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
 
 from lib.ltemplate import *
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
 
 def test_add_routes():
     CliOnFail = None

diff --git a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py b/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py
index 3b3ed3383c75cb4b7a059d53b24830901b494d52..a74e80dd80d47c6024f78c351569eada4a5498f9 100644 (file)
--- a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py
+++ b/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py
@@ -78,6 +78,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.ldpd, pytest.mark.ospfd]
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py b/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py
index ead991b18390b562bf762bed86a6c41549d028ee..97790487f2074101376bf7cf8b05e771f5e46441 100644 (file)
--- a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py
+++ b/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py
@@ -78,6 +78,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.ldpd, pytest.mark.ospfd]
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py b/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
index 20d7f46d4cea13d04c1a676d8784fa4cafb583dd..99c831c8cfc9b0322576acf6fe8e8af9f853d66c 100644 (file)
--- a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
+++ b/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
@@ -79,6 +79,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.ldpd, pytest.mark.ospfd]
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ldp-topo1/test_ldp_topo1.py b/tests/topotests/ldp-topo1/test_ldp_topo1.py
index d9e23e9ea9ef4e57f25b3fb81310f8d07d54f394..06e773409415fecf86b4c62dec08043b20721af1 100644 (file)
--- a/tests/topotests/ldp-topo1/test_ldp_topo1.py
+++ b/tests/topotests/ldp-topo1/test_ldp_topo1.py
@@ -77,7 +77,7 @@ from lib import topotest
 
 fatal_error = ""
 
-pytestmark = [pytest.mark.ldpd]
+pytestmark = [pytest.mark.ldpd, pytest.mark.ospfd]
 
 #####################################################
 ##

diff --git a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
index 53322f432fee9347499357bdaf3349064fa8dd8b..5c901c067a5811bb26196b5f08ff6e37af36bc9d 100644 (file)
--- a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
+++ b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
@@ -48,6 +48,7 @@ from lib.topolog import logger
 # and Finally pytest
 import pytest
 
+pytestmark = [pytest.mark.ospfd]
 
 class OspfSrTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
index 2421b312d210caf2e616ebccb8ac435157fdf439..92dac0f39c4f341d046c7380f13e0a2a3403f532 100644 (file)
--- a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
+++ b/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
@@ -45,6 +45,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.ospfd]
 
 class OSPFTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.py b/tests/topotests/ospf-topo1/test_ospf_topo1.py
index 24806dd8fcab6f0db543581f7a8bbfb6b95938ab..7197c0581279f24a157469dfc5708b393eb87ea2 100644 (file)
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.py
+++ b/tests/topotests/ospf-topo1/test_ospf_topo1.py
@@ -45,6 +45,7 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.ospfd]
 
 class OSPFTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py
index 37b7528490023ba5fc985a0c9e5a2e7a4ad8b388..b044bd0eeb9a4a59d06c7140542a7a14b16070e0 100644 (file)
--- 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]
 
 # Global variables
 topo = None