Skip to content

update t1-isolated-d56u2 topo with port-channel #18152

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
StormLiangMS merged 5 commits into from
May 26, 2025
Merged

update t1-isolated-d56u2 topo with port-channel #18152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0775aee
update t0, t1 isolated topo
sdszhang May 19, 2025
ad06135
update based on review comments
sdszhang May 2, 2025
a719b4f
fix portchannel
sdszhang May 3, 2025
4bb439f
update gene topo
sdszhang May 24, 2025
a1b486f
Merge remote-tracking branch 'public/master' into topo_d56u2_pc
sdszhang May 24, 2025
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
9 changes: 6 additions & 3 deletions ansible/generate_topo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ def __contains__(self, key):
'skip_ports': [],
"panel_port_step": 1},
'c448o16-sparse': {"ds_breakout": 8, "us_breakout": 2, "ds_link_step": 8, "us_link_step": 2,
'uplink_ports': [12, 13, 16, 17, 44, 45, 48, 49],
'uplink_ports': PortList(LagPort(12), 13, 16, 17, 44, 45, 48, 49),
'peer_ports': [],
'skip_ports': [16, 17, 44, 45, 48, 49],
'skip_ports': [13, 16, 17, 44, 45, 48, 49],
"panel_port_step": 1},
'o128lt2': {"ds_breakout": 2, "us_breakout": 2, "ds_link_step": 1, "us_link_step": 1,
'uplink_ports': PortList(LagPort(45), 46, 47, 48, LagPort(49), 50, 51, 52),
Expand Down Expand Up @@ -362,7 +362,10 @@ def _find_lag_port(port_id: int) -> bool:
vm_list.append(vm)

if link_type == 'up':
uplinkif_list.append(link_id_start)
if role == 't1':
uplinkif_list.extend(list(range(link_id_start, link_id_end+1, link_step)))
else:
uplink_ports.append(link_id_start)
elif link_type == 'down':
tornum += 1
downlinkif_list.append(link_id_start)
Expand Down
13 changes: 12 additions & 1 deletion ansible/templates/topo_t1-isolated-v6.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ topology:
{%- for vm in vm_list %}
{{ vm.name }}:
vlans:
- {{ vm.vlans[0] }}
{%- for vlan_id in vm.vlans %}
- {{ vlan_id }}
{%- endfor %}
vm_offset: {{ vm.vm_offset }}
{%- endfor %}

Expand Down Expand Up @@ -45,8 +47,17 @@ configuration:
interfaces:
Loopback0:
ipv6: {{vm.loopback_ipv6}}/128
{%- if vm.vlans|length > 1 %}
{%- for idx in range(vm.vlans|length) %}
Ethernet{{idx+1}}:
lacp: 1
{%- endfor %}
Port-Channel1:
ipv6: {{vm.pc_intf_ipv6}}/126
{%- else %}
Ethernet1:
ipv6: {{vm.pc_intf_ipv6}}/126
{%- endif %}
bp_interface:
ipv6: {{vm.bp_ipv6}}/64
{%- endfor %}
14 changes: 13 additions & 1 deletion ansible/templates/topo_t1-isolated.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ topology:
{%- for vm in vm_list %}
{{ vm.name }}:
vlans:
- {{ vm.vlans[0] }}
{%- for vlan_id in vm.vlans %}
- {{ vlan_id }}
{%- endfor %}
vm_offset: {{ vm.vm_offset }}
{%- endfor %}

Expand Down Expand Up @@ -44,9 +46,19 @@ configuration:
Loopback0:
ipv4: {{vm.loopback_ipv4}}/32
ipv6: {{vm.loopback_ipv6}}/128
{%- if vm.vlans|length > 1 %}
{%- for idx in range(vm.vlans|length) %}
Ethernet{{idx+1}}:
lacp: 1
{%- endfor %}
Port-Channel1:
ipv4: {{vm.pc_intf_ipv4}}/31
ipv6: {{vm.pc_intf_ipv6}}/126
{%- else %}
Ethernet1:
ipv4: {{vm.pc_intf_ipv4}}/31
ipv6: {{vm.pc_intf_ipv6}}/126
{%- endif %}
bp_interface:
ipv4: {{vm.bp_ipv4}}/22
ipv6: {{vm.bp_ipv6}}/64
Expand Down
117 changes: 49 additions & 68 deletions ansible/vars/topo_t1-isolated-d56u2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,187 +51,184 @@ topology:
ARISTA01T2:
vlans:
- 96
- 97
vm_offset: 12
ARISTA03T2:
vlans:
- 98
vm_offset: 13
ARISTA97T0:
vlans:
- 100
vm_offset: 14
vm_offset: 13
ARISTA105T0:
vlans:
- 108
vm_offset: 15
vm_offset: 14
ARISTA113T0:
vlans:
- 120
vm_offset: 16
vm_offset: 15
ARISTA121T0:
vlans:
- 128
vm_offset: 17
vm_offset: 16
ARISTA129T0:
vlans:
- 136
vm_offset: 18
vm_offset: 17
ARISTA137T0:
vlans:
- 144
vm_offset: 19
vm_offset: 18
ARISTA145T0:
vlans:
- 152
vm_offset: 20
vm_offset: 19
ARISTA153T0:
vlans:
- 160
vm_offset: 21
vm_offset: 20
ARISTA161T0:
vlans:
- 168
vm_offset: 22
vm_offset: 21
ARISTA169T0:
vlans:
- 176
vm_offset: 23
vm_offset: 22
ARISTA177T0:
vlans:
- 184
vm_offset: 24
vm_offset: 23
ARISTA185T0:
vlans:
- 192
vm_offset: 25
vm_offset: 24
ARISTA193T0:
vlans:
- 200
vm_offset: 26
vm_offset: 25
ARISTA201T0:
vlans:
- 208
vm_offset: 27
vm_offset: 26
ARISTA209T0:
vlans:
- 216
vm_offset: 28
vm_offset: 27
ARISTA217T0:
vlans:
- 224
vm_offset: 29
vm_offset: 28
ARISTA225T0:
vlans:
- 232
vm_offset: 30
vm_offset: 29
ARISTA233T0:
vlans:
- 240
vm_offset: 31
vm_offset: 30
ARISTA241T0:
vlans:
- 248
vm_offset: 32
vm_offset: 31
ARISTA249T0:
vlans:
- 256
vm_offset: 33
vm_offset: 32
ARISTA257T0:
vlans:
- 264
vm_offset: 34
vm_offset: 33
ARISTA265T0:
vlans:
- 272
vm_offset: 35
vm_offset: 34
ARISTA273T0:
vlans:
- 280
vm_offset: 36
vm_offset: 35
ARISTA281T0:
vlans:
- 288
vm_offset: 37
vm_offset: 36
ARISTA289T0:
vlans:
- 296
vm_offset: 38
vm_offset: 37
ARISTA297T0:
vlans:
- 304
vm_offset: 39
vm_offset: 38
ARISTA305T0:
vlans:
- 312
vm_offset: 40
vm_offset: 39
ARISTA313T0:
vlans:
- 320
vm_offset: 41
vm_offset: 40
ARISTA321T0:
vlans:
- 332
vm_offset: 42
vm_offset: 41
ARISTA329T0:
vlans:
- 340
vm_offset: 43
vm_offset: 42
ARISTA337T0:
vlans:
- 352
vm_offset: 44
vm_offset: 43
ARISTA345T0:
vlans:
- 360
vm_offset: 45
vm_offset: 44
ARISTA353T0:
vlans:
- 368
vm_offset: 46
vm_offset: 45
ARISTA361T0:
vlans:
- 376
vm_offset: 47
vm_offset: 46
ARISTA369T0:
vlans:
- 384
vm_offset: 48
vm_offset: 47
ARISTA377T0:
vlans:
- 392
vm_offset: 49
vm_offset: 48
ARISTA385T0:
vlans:
- 400
vm_offset: 50
vm_offset: 49
ARISTA393T0:
vlans:
- 408
vm_offset: 51
vm_offset: 50
ARISTA401T0:
vlans:
- 416
vm_offset: 52
vm_offset: 51
ARISTA409T0:
vlans:
- 424
vm_offset: 53
vm_offset: 52
ARISTA417T0:
vlans:
- 432
vm_offset: 54
vm_offset: 53
ARISTA425T0:
vlans:
- 440
vm_offset: 55
vm_offset: 54
ARISTA433T0:
vlans:
- 448
vm_offset: 56
vm_offset: 55
ARISTA441T0:
vlans:
- 456
vm_offset: 57
vm_offset: 56

configuration_properties:
common:
Expand Down Expand Up @@ -517,31 +514,15 @@ configuration:
ipv4: 100.1.0.97/32
ipv6: 2064:100:0:61::/128
Ethernet1:
lacp: 1
Ethernet2:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.193/31
ipv6: fc00::182/126
bp_interface:
ipv4: 10.10.246.98/22
ipv6: fc0a::62/64
ARISTA03T2:
properties:
- common
- spine
bgp:
asn: 65202
peers:
65100:
- 10.0.0.196
- fc00::189
interfaces:
Loopback0:
ipv4: 100.1.0.99/32
ipv6: 2064:100:0:63::/128
Ethernet1:
ipv4: 10.0.0.197/31
ipv6: fc00::18a/126
bp_interface:
ipv4: 10.10.246.100/22
ipv6: fc0a::64/64
ARISTA97T0:
properties:
- common
Expand Down
Loading
Loading