Skip to content

Add missing t1-64 EOS templates and enable test topology mark #22695

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

Open
mattkim25 wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −36
Open

Add missing t1-64 EOS templates and enable test topology mark #22695

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
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/t1-64-spine.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
t1-lag-spine.j2
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/t1-64-tor.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
t1-64-lag-tor.j2
64 changes: 32 additions & 32 deletions ansible/vars/topo_t1-64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.65/31
ipv6: fc00::82/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.33/24
ipv6: fc0a::43/64

Expand All @@ -1011,7 +1011,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.67/31
ipv6: fc00::86/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.34/24
ipv6: fc0a::45/64

Expand All @@ -1033,7 +1033,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.69/31
ipv6: fc00::8a/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.35/24
ipv6: fc0a::47/64

Expand All @@ -1055,7 +1055,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.71/31
ipv6: fc00::8e/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.36/24
ipv6: fc0a::49/64

Expand All @@ -1077,7 +1077,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.73/31
ipv6: fc00::92/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.37/24
ipv6: fc0a::4b/64

Expand All @@ -1099,7 +1099,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.75/31
ipv6: fc00::96/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.38/24
ipv6: fc0a::4d/64

Expand All @@ -1121,7 +1121,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.77/31
ipv6: fc00::9a/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.39/24
ipv6: fc0a::4f/64

Expand All @@ -1143,7 +1143,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.79/31
ipv6: fc00::9e/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.40/24
ipv6: fc0a::51/64

Expand All @@ -1165,7 +1165,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.81/31
ipv6: fc00::a2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.41/24
ipv6: fc0a::53/64

Expand All @@ -1187,7 +1187,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.83/31
ipv6: fc00::a6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.42/24
ipv6: fc0a::55/64

Expand All @@ -1209,7 +1209,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.85/31
ipv6: fc00::aa/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.43/24
ipv6: fc0a::57/64

Expand All @@ -1231,7 +1231,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.87/31
ipv6: fc00::ae/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.44/24
ipv6: fc0a::59/64

Expand All @@ -1253,7 +1253,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.89/31
ipv6: fc00::b2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.45/24
ipv6: fc0a::5b/64

Expand All @@ -1275,7 +1275,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.91/31
ipv6: fc00::b6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.46/24
ipv6: fc0a::5d/64

Expand All @@ -1297,7 +1297,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.93/31
ipv6: fc00::ba/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.47/24
ipv6: fc0a::5f/64

Expand All @@ -1319,7 +1319,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.95/31
ipv6: fc00::be/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.48/24
ipv6: fc0a::61/64

Expand All @@ -1341,7 +1341,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.97/31
ipv6: fc00::c2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.49/24
ipv6: fc0a::63/64

Expand All @@ -1363,7 +1363,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.99/31
ipv6: fc00::c6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.50/24
ipv6: fc0a::65/64

Expand All @@ -1385,7 +1385,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.101/31
ipv6: fc00::ca/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.51/24
ipv6: fc0a::67/64

Expand All @@ -1407,7 +1407,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.103/31
ipv6: fc00::ce/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.52/24
ipv6: fc0a::69/64

Expand All @@ -1429,7 +1429,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.105/31
ipv6: fc00::d2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.53/24
ipv6: fc0a::6b/64

Expand All @@ -1451,7 +1451,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.107/31
ipv6: fc00::d6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.54/24
ipv6: fc0a::6d/64

Expand All @@ -1473,7 +1473,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.109/31
ipv6: fc00::da/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.55/24
ipv6: fc0a::6f/64

Expand All @@ -1495,7 +1495,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.111/31
ipv6: fc00::de/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.56/24
ipv6: fc0a::71/64

Expand All @@ -1517,7 +1517,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.113/31
ipv6: fc00::e2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.57/24
ipv6: fc0a::73/64

Expand All @@ -1539,7 +1539,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.115/31
ipv6: fc00::e6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.58/24
ipv6: fc0a::75/64

Expand All @@ -1561,7 +1561,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.117/31
ipv6: fc00::ea/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.59/24
ipv6: fc0a::77/64

Expand All @@ -1583,7 +1583,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.119/31
ipv6: fc00::ee/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.60/24
ipv6: fc0a::79/64

Expand All @@ -1605,7 +1605,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.121/31
ipv6: fc00::f2/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.61/24
ipv6: fc0a::7b/64

Expand All @@ -1627,7 +1627,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.123/31
ipv6: fc00::f6/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.62/24
ipv6: fc0a::7d/64

Expand All @@ -1649,7 +1649,7 @@ configuration:
Ethernet1:
ipv4: 10.0.0.125/31
ipv6: fc00::fa/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.63/24
ipv6: fc0a::7f/64

Expand All @@ -1671,6 +1671,6 @@ configuration:
Ethernet1:
ipv4: 10.0.0.127/31
ipv6: fc00::fe/126
bp_interfaces:
bp_interface:
ipv4: 10.10.246.64/24
ipv6: fc0a::81/64
8 changes: 4 additions & 4 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,23 +699,23 @@ copp/test_copp.py:
skip:
reason: "Topology not supported by COPP tests"
conditions:
- "(topo_name not in ['dualtor-aa', 'dualtor-aa-64-breakout', 'ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"
- "(topo_name not in ['dualtor-aa', 'dualtor-aa-64-breakout', 'ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-64', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"

copp/test_copp.py::TestCOPP::test_add_new_trap:
skip:
reason: "Copp test_add_new_trap is not yet supported on these testbeds"
conditions_logical_operator: or
conditions:
- "is_multi_asic==True"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-64', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"

copp/test_copp.py::TestCOPP::test_remove_trap:
skip:
reason: "Copp test_remove_trap is not yet supported on these testbeds"
conditions_logical_operator: or
conditions:
- "is_multi_asic==True"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-64', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"

copp/test_copp.py::TestCOPP::test_trap_config_save_after_reboot:
skip:
Expand All @@ -725,7 +725,7 @@ copp/test_copp.py::TestCOPP::test_trap_config_save_after_reboot:
- "is_multi_asic==True"
- "build_version.split('.')[0].isdigit() and int(build_version.split('.')[0]) == 20220531 and int(build_version.split('.')[1]) > 27 and hwsku in ['Arista-7050-QX-32S', 'Arista-7050QX32S-Q32', 'Arista-7050-QX32', 'Arista-7050QX-32S-S4Q31', 'Arista-7060CX-32S-D48C8', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-Q32', 'Arista-7060CX-32S-C32-T1']"
- "build_version.split('.')[0].isdigit() and int(build_version.split('.')[0]) > 20220531 and hwsku in ['Arista-7050-QX-32S', 'Arista-7050QX32S-Q32', 'Arista-7050-QX32', 'Arista-7050QX-32S-S4Q31', 'Arista-7060CX-32S-D48C8', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-Q32', 'Arista-7060CX-32S-C32-T1']"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"
- "(topo_name not in ['ptf32', 'ptf64', 't0', 't0-64', 't0-52', 't0-116', 't0-118', 't0-88-o8c80', 't1', 't1-64', 't1-lag', 't1-28-lag', 't1-48-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 'm0', 'm0-2vlan', 'mx', 'm1-48', 'm1-44', 'm1-108', 'm1-128', 't0-isolated-d16u16s1', 't1-isolated-d28u1', 't0-isolated-d32u32s2', 't1-isolated-d56u2'] and 't2' not in topo_type)"

copp/test_copp.py::TestCOPP::test_trap_neighbor_miss:
skip:
Expand Down
Loading