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>

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"

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"

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"

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"""

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"

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

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

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

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

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"

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"

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"

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]
 
 #####################################################
 ##

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"

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"

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"

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