mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-13 19:02:58 +00:00
tests: Add pytest.mark.staticd to topotests
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
parent
47679d6e44
commit
efb62eeddf
@ -63,7 +63,7 @@ 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
|
||||||
from ipaddress import IPv4Address
|
from ipaddress import IPv4Address
|
||||||
|
|
||||||
pytestmark = [pytest.mark.ospfd]
|
pytestmark = [pytest.mark.ospfd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
topo = None
|
topo = None
|
||||||
|
@ -63,6 +63,8 @@ from lib.topolog import logger
|
|||||||
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
||||||
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.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo1_ebgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo1_ebgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -73,6 +73,8 @@ from lib.topolog import logger
|
|||||||
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
||||||
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.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo2_ebgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo2_ebgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -68,6 +68,8 @@ from lib.topolog import logger
|
|||||||
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
||||||
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.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo3_ebgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo3_ebgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -86,6 +86,7 @@ ADDR_TYPES = check_address_types()
|
|||||||
NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"}
|
NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"}
|
||||||
NEXT_HOP_IP = {}
|
NEXT_HOP_IP = {}
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
class CreateTopo(Topo):
|
class CreateTopo(Topo):
|
||||||
"""
|
"""
|
||||||
|
@ -66,6 +66,8 @@ from lib.topolog import logger
|
|||||||
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
||||||
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.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo1_ibgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo1_ibgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -75,6 +75,8 @@ from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
|||||||
from lib.topojson import build_topo_from_json, build_config_from_json
|
from lib.topojson import build_topo_from_json, build_config_from_json
|
||||||
from lib.topotest import version_cmp
|
from lib.topotest import version_cmp
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo2_ibgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo2_ibgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -69,6 +69,8 @@ from lib.topolog import logger
|
|||||||
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib
|
||||||
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.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
# Reading the data from JSON File for topology creation
|
# Reading the data from JSON File for topology creation
|
||||||
jsonFile = "{}/static_routes_topo3_ibgp.json".format(CWD)
|
jsonFile = "{}/static_routes_topo3_ibgp.json".format(CWD)
|
||||||
try:
|
try:
|
||||||
|
@ -83,6 +83,7 @@ ADDR_TYPES = check_address_types()
|
|||||||
NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"}
|
NETWORK = {"ipv4": "2.2.2.2/32", "ipv6": "22:22::2/128"}
|
||||||
NEXT_HOP_IP = {}
|
NEXT_HOP_IP = {}
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
|
||||||
|
|
||||||
class CreateTopo(Topo):
|
class CreateTopo(Topo):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user