Skip to content
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

[202311] support 2 vlans test in test_acl dynamically #16606

Merged
merged 1 commit into from
Jan 22, 2025
+361 −17
Merged

[202311] support 2 vlans test in test_acl dynamically #16606

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
6 changes: 5 additions & 1 deletion ansible/module_utils/port_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,16 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
s100G_ports += [x for x in range(23, 27)]

port_alias_to_name_map = _port_alias_to_name_map_50G(all_ports, s100G_ports)
elif hwsku in ["Arista-7260CX3-D108C8", "Arista-7260CX3-D108C8-AILAB", "Arista-7260CX3-D108C8-CSI"]:
elif hwsku in ["Arista-7260CX3-D108C8", "Arista-7260CX3-D108C8-AILAB",
"Arista-7260CX3-D108C8-CSI", "Arista-7260CX3-D108C10"]:
# All possible breakout 50G port numbers:
all_ports = [x for x in range(1, 65)]

# 100G ports
s100G_ports = [x for x in range(13, 21)]
if hwsku == "Arista-7260CX3-D108C10":
# The first 2 ports are 100G
s100G_ports.extend([x for x in range(1, 3)])

if hwsku == "Arista-7260CX3-D108C8-AILAB":
s100G_ports = [x for x in range(45, 53)]
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/t0-118-leaf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
t0-leaf-lag-2.j2
294 changes: 294 additions & 0 deletions ansible/vars/topo_t0-118.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,294 @@
topology:
host_interfaces:
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 30
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 38
- 39
- 40
- 41
- 42
- 43
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
- 55
- 56
- 57
- 58
- 59
- 60
- 61
- 62
- 63
- 64
- 65
- 66
- 67
- 68
- 69
- 70
- 71
- 72
- 73
- 74
- 75
- 76
- 77
- 78
- 79
- 80
- 81
- 82
- 83
- 84
- 85
- 86
- 87
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
VMs:
ARISTA01T1:
vlans:
- 22
- 23
vm_offset: 0
ARISTA02T1:
vlans:
- 24
- 25
vm_offset: 1
ARISTA03T1:
vlans:
- 26
- 27
vm_offset: 2
ARISTA04T1:
vlans:
- 28
- 29
vm_offset: 3
DUT:
vlan_configs:
default_vlan_config: two_vlan_a
one_vlan_a:
Vlan1000:
id: 1000
intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117]
prefix: 192.168.0.1/21
prefix_v6: fc02:1000::1/64
tag: 1000
two_vlan_a:
Vlan1000:
id: 1000
intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62]
prefix: 192.168.0.1/25
prefix_v6: fc02:1000::1/64
tag: 1000
Vlan2000:
id: 2000
intfs: [63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117]
prefix: 192.168.0.129/25
prefix_v6: fc02:1000:0:1::1/64
tag: 2000
four_vlan_a:
Vlan1000:
id: 1000
intfs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 30, 31, 33, 34, 35]
prefix: 192.168.0.1/23
prefix_v6: fc02:400::1/64
tag: 1000
Vlan2000:
id: 2000
intfs: [36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]
prefix: 192.168.2.1/23
prefix_v6: fc02:401::1/64
tag: 2000
Vlan3000:
id: 3000
intfs: [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90]
prefix: 192.168.4.1/23
prefix_v6: fc02:402::1/64
tag: 3000
Vlan4000:
id: 4000
intfs: [91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117]
prefix: 192.168.6.1/23
prefix_v6: fc02:403::1/64
tag: 4000

configuration_properties:
common:
dut_asn: 4200065100
dut_type: ToRRouter
swrole: leaf
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine_asn: 65534
leaf_asn_start: 4200064600
tor_asn_start: 4200065500
nhipv4: 10.10.246.254
nhipv6: FC0A::FF

configuration:
ARISTA01T1:
properties:
- common
bgp:
asn: 4200064600
peers:
4200065100:
- 10.0.0.32
- FC00::21
interfaces:
Loopback0:
ipv4: 100.1.0.33/32
ipv6: 2064:100::33/128
Ethernet1:
lacp: 1
Ethernet2:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.33/31
ipv6: fc00::22/126
bp_interface:
ipv4: 10.10.246.33/24
ipv6: fc0a::23/64

ARISTA02T1:
properties:
- common
bgp:
asn: 4200064600
peers:
4200065100:
- 10.0.0.34
- FC00::25
interfaces:
Loopback0:
ipv4: 100.1.0.35/32
ipv6: 2064:100::26/128
Ethernet1:
lacp: 1
Ethernet2:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.35/31
ipv6: fc00::26/126
bp_interface:
ipv4: 10.10.246.35/24
ipv6: fc0a::26/64

ARISTA03T1:
properties:
- common
bgp:
asn: 4200064600
peers:
4200065100:
- 10.0.0.36
- FC00::29
interfaces:
Loopback0:
ipv4: 100.1.0.37/32
ipv6: 2064:100::2A/128
Ethernet1:
lacp: 1
Ethernet2:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.37/31
ipv6: fc00::2A/126
bp_interface:
ipv4: 10.10.246.37/24
ipv6: fc0a::2A/64

ARISTA04T1:
properties:
- common
bgp:
asn: 4200064600
peers:
4200065100:
- 10.0.0.38
- FC00::2D
interfaces:
Loopback0:
ipv4: 100.1.0.39/32
ipv6: 2064:100::2E/128
Ethernet1:
lacp: 1
Ethernet2:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.39/31
ipv6: fc00::2E/126
bp_interface:
ipv4: 10.10.246.39/24
ipv6: fc0a::2E/64
1 change: 1 addition & 0 deletions ansible/veos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ all:
- t0-64-32
- t0-80
- t0-116
- t0-118
- t0-backend
- dualtor
- dualtor-56
Expand Down
1 change: 1 addition & 0 deletions ansible/veos_vtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ all:
- t0-64
- t0-64-32
- t0-116
- t0-118
- t0-backend
- dualtor
- dualtor-56
Expand Down
1 change: 1 addition & 0 deletions docs/testbed/README.testbed.Overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ The T0 type topology has different variations. The differences are just the numb
* t0-56-po2vlan
* t0-80
* t0-116
* t0-118
* t0-120
* t0-backend

Expand Down
Loading
Loading