Skip to content

Commit

Permalink
[topo][m0] Add m0-2vlan topo (#8578)
Browse files Browse the repository at this point in the history
What is the motivation for this PR?
For Mgmt ToR Router, we need to simulate 2 Vlans scenario.

How did you do it?
Add new topo m0-2vlan which default vlan config is two vlan.

How did you verify/test it?
Add topo and deploy minigraph in testbed.

Signed-off-by: Yaqiang Zhu <yaqiangzhu@microsoft.com>
  • Loading branch information
yaqiangz authored and mssonicbld committed Jun 14, 2023
1 parent 35d409e commit 18f7975
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 0 deletions.
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/m0-2vlan-m1.j2
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/m0-2vlan-mx.j2
244 changes: 244 additions & 0 deletions ansible/vars/topo_m0-2vlan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
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
- 22
- 23
- 24
- 25
- 26
- 27
- 28
- 29
- 30
- 31
- 32
- 33
- 34
- 35
- 36
- 37
- 38
- 39
- 40
- 41
- 42
- 43
- 44
- 45
VMs:
ARISTA01MX:
vlans:
- 46
vm_offset: 0
ARISTA02MX:
vlans:
- 47
vm_offset: 1
ARISTA01M1:
vlans:
- 48
vm_offset: 2
ARISTA02M1:
vlans:
- 49
vm_offset: 3
ARISTA03M1:
vlans:
- 50
vm_offset: 4
ARISTA04M1:
vlans:
- 51
vm_offset: 5
DUT:
vlan_configs:
default_vlan_config: two_vlan_a
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, 22]
prefix: 192.168.0.1/25
prefix_v6: fc02:1000:0:0::1/64
tag: 1000
Vlan2000:
id: 2000
intfs: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45]
prefix: 192.168.0.128/25
prefix_v6: fc02:1000:0:1::1/64
tag: 2000

configuration_properties:
common:
dut_asn: 65100
dut_type: MgmtToRRouter
failure_rate: 0
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
colo_number: 30
m0_number: 16
m0_asn_start: 64600
m0_subnet_number: 1
m0_subnet_size: 64
mx_subnet_size: 64
mx_subnet_number: 1
mx_asn_start: 68000
mx:
swrole: mx
m1:
swrole: m1

configuration:
ARISTA01MX:
properties:
- common
- mx
bgp:
asn: 64001
peers:
65100:
- 10.0.0.64
- FC00::81
interfaces:
Loopback0:
ipv4: 100.1.0.33/32
ipv6: 2064:100::21/128
Ethernet1:
ipv4: 10.0.0.65/31
ipv6: fc00::82/126
bp_interface:
ipv4: 10.10.246.33/24
ipv6: fc0a::44/64

ARISTA02MX:
properties:
- common
- mx
bgp:
asn: 64002
peers:
65100:
- 10.0.0.66
- FC00::85
interfaces:
Loopback0:
ipv4: 100.1.0.34/32
ipv6: 2064:100::22/128
Ethernet1:
ipv4: 10.0.0.67/31
ipv6: fc00::86/126
bp_interface:
ipv4: 10.10.246.34/24
ipv6: fc0a::47/64

ARISTA01M1:
properties:
- common
- m1
bgp:
asn: 65200
peers:
65100:
- 10.0.0.56
- FC00::71
interfaces:
Loopback0:
ipv4: 100.1.0.29/32
ipv6: 2064:100::1d/128
Ethernet1:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.57/31
ipv6: fc00::72/126
bp_interface:
ipv4: 10.10.246.29/24
ipv6: fc0a::3a/64

ARISTA02M1:
properties:
- common
- m1
bgp:
asn: 65200
peers:
65100:
- 10.0.0.58
- FC00::75
interfaces:
Loopback0:
ipv4: 100.1.0.30/32
ipv6: 2064:100::1e/128
Ethernet1:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.59/31
ipv6: fc00::76/126
bp_interface:
ipv4: 10.10.246.30/24
ipv6: fc0a::3d/64

ARISTA03M1:
properties:
- common
- m1
bgp:
asn: 65200
peers:
65100:
- 10.0.0.60
- FC00::79
interfaces:
Loopback0:
ipv4: 100.1.0.31/32
ipv6: 2064:100::1f/128
Ethernet1:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.61/31
ipv6: fc00::7a/126
bp_interface:
ipv4: 10.10.246.31/24
ipv6: fc0a::3e/64

ARISTA04M1:
properties:
- common
- m1
bgp:
asn: 65200
peers:
65100:
- 10.0.0.62
- FC00::7D
interfaces:
Loopback0:
ipv4: 100.1.0.32/32
ipv6: 2064:100::20/128
Ethernet1:
lacp: 1
Port-Channel1:
ipv4: 10.0.0.63/31
ipv6: fc00::7e/126
bp_interface:
ipv4: 10.10.246.32/24
ipv6: fc0a::41/64
1 change: 1 addition & 0 deletions ansible/veos
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ all:
- dualtor-mixed-56
- dualtor-mixed-120
- m0
- m0-2vlan
- mc0
- mx
children:
Expand Down

0 comments on commit 18f7975

Please sign in to comment.