mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-06 09:00:55 +00:00
tests: Add pytest.mark.pimd for those missing it
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
bf3a0a9a4b
commit
4be92408e4
@ -49,6 +49,9 @@ from lib.topolog import logger
|
|||||||
# Required to instantiate the topology builder class.
|
# Required to instantiate the topology builder class.
|
||||||
from mininet.topo import Topo
|
from mininet.topo import Topo
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.bgpd, pytest.mark.bgpd]
|
||||||
|
|
||||||
|
|
||||||
#####################################################
|
#####################################################
|
||||||
##
|
##
|
||||||
## Network Topology Definition
|
## Network Topology Definition
|
||||||
|
@ -113,6 +113,9 @@ from lib.pim import (
|
|||||||
from lib.topolog import logger
|
from lib.topolog import logger
|
||||||
from lib.topojson import build_topo_from_json, build_config_from_json
|
from lib.topojson import build_topo_from_json, build_config_from_json
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.pimd, pytest.mark.staticd]
|
||||||
|
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/mcast_pim_bsmp_01.json".format(CWD)
|
jsonFile = "{}/mcast_pim_bsmp_01.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -104,8 +104,7 @@ from lib.pim import (
|
|||||||
from lib.topolog import logger
|
from lib.topolog import logger
|
||||||
from lib.topojson import build_topo_from_json, build_config_from_json
|
from lib.topojson import build_topo_from_json, build_config_from_json
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.pimd, pytest.mark.staticd]
|
||||||
pytestmark = [pytest.mark.pimd]
|
|
||||||
|
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
|
@ -107,6 +107,9 @@ from lib.pim import (
|
|||||||
from lib.topolog import logger
|
from lib.topolog import logger
|
||||||
from lib.topojson import build_topo_from_json, build_config_from_json
|
from lib.topojson import build_topo_from_json, build_config_from_json
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.pimd]
|
||||||
|
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/multicast_pim_sm_topo1.json".format(CWD)
|
jsonFile = "{}/multicast_pim_sm_topo1.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -102,6 +102,9 @@ from lib.pim import (
|
|||||||
from lib.topolog import logger
|
from lib.topolog import logger
|
||||||
from lib.topojson import build_topo_from_json, build_config_from_json
|
from lib.topojson import build_topo_from_json, build_config_from_json
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.pimd]
|
||||||
|
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/multicast_pim_sm_topo2.json".format(CWD)
|
jsonFile = "{}/multicast_pim_sm_topo2.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -153,6 +153,9 @@ from lib.pim import (
|
|||||||
clear_ip_mroute_verify,
|
clear_ip_mroute_verify,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.pimd, pytest.mark.staticd]
|
||||||
|
|
||||||
|
|
||||||
# Reading the data from JSON File for topology and configuration creation
|
# Reading the data from JSON File for topology and configuration creation
|
||||||
jsonFile = "{}/multicast_pim_static_rp.json".format(CWD)
|
jsonFile = "{}/multicast_pim_static_rp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -121,7 +121,7 @@ from lib.topolog import logger
|
|||||||
# Required to instantiate the topology builder class.
|
# Required to instantiate the topology builder class.
|
||||||
from mininet.topo import Topo
|
from mininet.topo import Topo
|
||||||
|
|
||||||
pytestmark = [pytest.mark.pimd]
|
pytestmark = [pytest.mark.pimd, pytest.mark.ospfd]
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -111,7 +111,7 @@ from lib.common_config import (
|
|||||||
# Required to instantiate the topology builder class.
|
# Required to instantiate the topology builder class.
|
||||||
from mininet.topo import Topo
|
from mininet.topo import Topo
|
||||||
|
|
||||||
pytestmark = [pytest.mark.pimd]
|
pytestmark = [pytest.mark.ospfd, pytest.mark.pimd]
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user