Skip to content

[202505][topo] Clear m2 m3 topo (#18760) #19137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yejianquan merged 1 commit into from
Jun 24, 2025
Merged

[202505][topo] Clear m2 m3 topo (#18760) #19137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/acl/null_route/test_null_route_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
logger = logging.getLogger(__name__)

pytestmark = [
pytest.mark.topology("t0", "m0", "mx", "m1", "m2", "m3"),
pytest.mark.topology("t0", "m0", "mx", "m1"),
pytest.mark.disable_loganalyzer, # Disable automatic loganalyzer, since we use it for the test
]

Expand Down
2 changes: 1 addition & 1 deletion tests/acl/test_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
pytestmark = [
pytest.mark.acl,
pytest.mark.disable_loganalyzer, # Disable automatic loganalyzer, since we use it for the test
pytest.mark.topology("t0", "t1", "t2", "m0", "mx", "m1", "m2", "m3"),
pytest.mark.topology("t0", "t1", "t2", "m0", "mx", "m1"),
pytest.mark.disable_memory_utilization
]

Expand Down
2 changes: 1 addition & 1 deletion tests/acl/test_stress_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from tests.common.fixtures.ptfhost_utils import skip_traffic_test # noqa: F401

pytestmark = [
pytest.mark.topology("t0", "t1", "m0", "mx", "m1", "m2", "m3"),
pytest.mark.topology("t0", "t1", "m0", "mx", "m1"),
pytest.mark.device_type('vs')
]

Expand Down
2 changes: 1 addition & 1 deletion tests/arp/test_arpall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


pytestmark = [
pytest.mark.topology('t1', 't2', 'm1', 'm2', 'm3')
pytest.mark.topology('t1', 't2', 'm1')
]

logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion tests/arp/test_neighbor_mac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
logger = logging.getLogger(__name__)

pytestmark = [
pytest.mark.topology('m1', 'm2', 'm3', 't1', 'ptf')
pytest.mark.topology('m1', 't1', 'ptf')
]


Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_allow_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from bgp_helpers import bgp_allow_list_setup, prepare_eos_routes # noqa:F401

pytestmark = [
pytest.mark.topology('t1', 'm1', 'm2', 'm3'),
pytest.mark.topology('t1', 'm1'),
pytest.mark.device_type('vs')
]

Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


pytestmark = [
pytest.mark.topology("t0", "t1", "m0", "mx", "m1", "m2", "m3"),
pytest.mark.topology("t0", "t1", "m0", "mx", "m1"),
pytest.mark.device_type('vs')
]

Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_peer_shutdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from tests.common.utilities import wait_until, delete_running_config

pytestmark = [
pytest.mark.topology('t0', 't1', 't2', 'm1', 'm2', 'm3'),
pytest.mark.topology('t0', 't1', 't2', 'm1'),
]

TEST_ITERATIONS = 5
Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
vrfname = 'default'

pytestmark = [
pytest.mark.topology("t0", "t1", 'm1', 'm2', 'm3'),
pytest.mark.topology("t0", "t1", 'm1'),
]


Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_session_flap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
memSpike = 1.3

pytestmark = [
pytest.mark.topology('t1', 't2', 'm1', 'm2', 'm3')
pytest.mark.topology('t1', 't2', 'm1')
]


Expand Down
2 changes: 1 addition & 1 deletion tests/bgp/test_bgp_stress_link_flap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

pytestmark = [
pytest.mark.disable_loganalyzer,
pytest.mark.topology('t0', 't1', "m0", "mx", 'm1', 'm2', 'm3')
pytest.mark.topology('t0', 't1', "m0", "mx", 'm1')
]

stop_tasks = False
Expand Down
Loading
Loading