tests: Add some pytest.mark.bgpd

Add some pytest.mark.bgpd.  This is about all I could stomach doing
in one patch.  I'll do another pass at another time.

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

diff --git a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py b/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py
index 4c3bad128013010a35e219100df8963de2b042e3..9b77de2b6e7712a568acd3c6f9c8eb182564d216 100644 (file)
--- a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py
+++ b/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py
@@ -44,7 +44,8 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-pytestmark = [pytest.mark.bfdd]
+pytestmark = [pytest.mark.bgpd, pytest.mark.bfdd]
+
 
 class BFDTopo(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 76e9ef247feddd4c3323ada03a1ea2e290f3cc81..4a2c8ee00244ba1519222cedef1d7834b46f1b7e 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,8 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-pytestmark = [pytest.mark.bfdd, pytest.mark.isisd, pytest.mark.ospfd]
+pytestmark = [pytest.mark.bfdd, pytest.mark.bgpd, pytest.mark.isisd, pytest.mark.ospfd]
+
 
 class BFDProfTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.py b/tests/topotests/bfd-topo1/test_bfd_topo1.py
index 76078b5d7d35ba2a1740c19e8380778418e04f1d..86bdcfed04e2f8ac6635f3da7dc0ada3eb1fc90f 100644 (file)
--- a/tests/topotests/bfd-topo1/test_bfd_topo1.py
+++ b/tests/topotests/bfd-topo1/test_bfd_topo1.py
@@ -45,7 +45,8 @@ 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.bgpd]
+
 
 class BFDTopo(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 c31cc02b3aac03a499f4c926729db24ff9c30f76..e85b2644ddb4062ef43c2c32582011792171b540 100644 (file)
--- a/tests/topotests/bfd-topo2/test_bfd_topo2.py
+++ b/tests/topotests/bfd-topo2/test_bfd_topo2.py
@@ -46,7 +46,8 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-pytestmark = [pytest.mark.bfdd, pytest.mark.ospfd]
+pytestmark = [pytest.mark.bfdd, pytest.mark.bgpd, pytest.mark.ospfd]
+
 
 class BFDTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bfd-topo3/test_bfd_topo3.py b/tests/topotests/bfd-topo3/test_bfd_topo3.py
index f473b6710878a21ae9e443981d06bdead1e66735..6bb223e2036259b67113387c6ca9ca8b487f3bbf 100644 (file)
--- a/tests/topotests/bfd-topo3/test_bfd_topo3.py
+++ b/tests/topotests/bfd-topo3/test_bfd_topo3.py
@@ -45,6 +45,8 @@ from lib.topolog import logger
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bfdd, pytest.mark.bgpd]
+
 
 class BFDTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py b/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py
index a238ff8da3d36922a33ba46db04293c709619c7b..8a1ffe085d9cd5038c635866ba45d98e946e2be3 100644 (file)
--- a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py
+++ b/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py
@@ -46,7 +46,8 @@ 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.bgpd]
+
 
 class BFDTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py b/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py
index 0db47da3f26a398a0c45b1c53c81f2ee898cb645..c4bbdce2c3eb0659cbb46ebb67f049226bd8fcd2 100644 (file)
--- a/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py
+++ b/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py
@@ -40,6 +40,8 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class BgpAggregatorAsnZero(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
index b701a0d61e6f557c2b9f4047070b748ca0ddc68f..374cce21f61bc463f347dc1512482e579fbc89bd 100644 (file)
--- a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
+++ b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
@@ -91,6 +91,9 @@ from lib.bgp import (
 )
 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 = "{}/bgp_basic_functionality.json".format(CWD)
 try:

diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py b/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
index 5eb1738632e1acff8a416d5d71dd7024a8998eae..fa60c35679486cbcba94f338367afb523d391801 100755 (executable)
--- a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
+++ b/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
@@ -47,6 +47,8 @@ from lib.snmptest import SnmpTester
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.isisd]
+
 
 class TemplateTopo(Topo):
     "Test topology builder"

diff --git a/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py b/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py
index 86fd4b601f0526cb8ed7f0b4819eb867b20643a2..be07fab87b75d9c5a3b9427ee5a76bc9224c0b77 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py
+++ b/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py
@@ -47,6 +47,8 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py b/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py
index c7d9f13f3f94157acbd72f5beb1fd76f0dcde9ea..484f40251ff0875de15a7d3a5f876512b9007c0c 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py
+++ b/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py
@@ -50,6 +50,8 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py b/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
index 544bda145cb1d6c1723ccc4ce520e017aa61be41..4d41c7a321301f57f186d12cc018ec39f57771f8 100644 (file)
--- a/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
+++ b/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
@@ -76,6 +76,9 @@ from lib.bgp import (
 )
 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 = "{}/bgp_as_allow_in.json".format(CWD)
 try:

diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/test_bgp_as_wide_bgp_identifier.py b/tests/topotests/bgp_as_wide_bgp_identifier/test_bgp_as_wide_bgp_identifier.py
index 02edb62ca072ef3231971a515f9f14dd02a7d54c..a7364639277a95357d5ba4683b29c000a6613bf9 100644 (file)
--- a/tests/topotests/bgp_as_wide_bgp_identifier/test_bgp_as_wide_bgp_identifier.py
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/test_bgp_as_wide_bgp_identifier.py
@@ -45,6 +45,8 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp_blackhole_community/test_bgp_blackhole_community.py b/tests/topotests/bgp_blackhole_community/test_bgp_blackhole_community.py
index a856c9278fd6833a7febc95aa30a00f73846ee3d..6512e4d4c6dd617d43ad2d65c9d2bef6bb2e34c9 100644 (file)
--- a/tests/topotests/bgp_blackhole_community/test_bgp_blackhole_community.py
+++ b/tests/topotests/bgp_blackhole_community/test_bgp_blackhole_community.py
@@ -40,6 +40,8 @@ from lib.topolog import logger
 from mininet.topo import Topo
 from lib.common_config import step
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py b/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py
index fe7052b80f1f4295cdb18fd39b0500aa9b5c51ee..81bf8da31ab2c7ba20fb9a2893cfb89610110649 100644 (file)
--- a/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py
+++ b/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py
@@ -45,6 +45,8 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 from mininet.topo import Topo
 
+pytestmark = [pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):

diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
index f2e54b24d6bc57b38b5f409c01b07397edf6402f..6d4a7d82e5e2d38a5e67c6a05d167b6a76923a78 100644 (file)
--- a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
+++ b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
@@ -66,6 +66,9 @@ from lib.bgp import (
 from lib.topojson import build_topo_from_json, build_config_from_json
 from copy import deepcopy
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
+
 # Reading the data from JSON File for topology creation
 jsonFile = "{}/bgp_communities.json".format(CWD)
 try:

diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py
index c0842148f1fa1ffe4b8fc3398aa4d67ba546be53..3415789068b771c6178ab4396d5fc734c53ade84 100644 (file)
--- a/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py
+++ b/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py
@@ -70,6 +70,9 @@ from lib.bgp import (
 from lib.topojson import build_topo_from_json, build_config_from_json
 from copy import deepcopy
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
+
+
 # Reading the data from JSON File for topology creation
 jsonFile = "{}/bgp_communities_topo2.json".format(CWD)
 try:

diff --git a/tests/topotests/bgp_community_change_update/test_bgp_community_change_update.py b/tests/topotests/bgp_community_change_update/test_bgp_community_change_update.py
index 5fc4310266d32a576d83767e97be39bf0c3251e8..95e63c617e7d11dce73adc20aeb5e078ef2ed705 100644 (file)
--- a/tests/topotests/bgp_community_change_update/test_bgp_community_change_update.py
+++ b/tests/topotests/bgp_community_change_update/test_bgp_community_change_update.py
@@ -59,6 +59,8 @@ from mininet.topo import Topo
 from lib.common_config import step
 from time import sleep
 
+pytestmark = [pytest.mark.bgpd, pytest.mark.bgpd]
+
 
 class TemplateTopo(Topo):
     def build(self, *_args, **_opts):