Skip to content

Commit 5766d22

Browse files
emilaristaClausHolbechAristalaxmikantchintakindiVibhu-gslabpre-commit-ci[bot]
authored
Feat(eos_designs): Add subinterfaces to connected endpoint adapters (#5417)
Co-authored-by: Claus Holbech <holbech@arista.com> Co-authored-by: laxmikantchintakindi <159624484+laxmikantchintakindi@users.noreply.github.com> Co-authored-by: Vibhu-gslab <109593615+Vibhu-gslab@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 7b75b06 commit 5766d22

18 files changed

Lines changed: 1238 additions & 141 deletions

File tree

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ vlan 2020
199199
| --------- | ----------- | ------- | -------------------- | -------------------------- | ----------- | --------------------- | --------------------- | --------------------- | --------------------------- | ------------ | ---------------------- | ---------------------- |
200200
| Ethernet9.100 | - | - | dot1q | - | 100 | - | - | client | - | - | - | - |
201201
| Ethernet9.101 | - | - | dot1q | - | 101 | - | - | client | - | - | - | - |
202+
| Ethernet10.11 | - | 11 | dot1q | - | 11 | - | - | client | - | - | - | - |
203+
| Ethernet10.12 | Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES | 112 | dot1q | - | 211 | - | - | client | - | - | - | - |
202204

203205
##### IPv4
204206

@@ -222,6 +224,22 @@ vlan 2020
222224
| Ethernet1 | - | CORE | - | 60 | point-to-point | level-2 | False | md5 |
223225
| Ethernet2 | - | CORE | - | 500 | point-to-point | level-2 | False | md5 |
224226

227+
##### EVPN Multihoming
228+
229+
####### EVPN Multihoming Summary
230+
231+
| Interface | Ethernet Segment Identifier | Multihoming Redundancy Mode | Route Target |
232+
| --------- | --------------------------- | --------------------------- | ------------ |
233+
| Ethernet10 | 0000:0000:0303:0202:0201 | single-active | 03:03:02:02:02:01 |
234+
| Ethernet10.11 | 0000:0000:0303:0202:0211 | all-active | 03:03:02:02:02:11 |
235+
| Ethernet10.12 | 0000:0000:0303:0202:0212 | all-active | 03:03:02:02:02:12 |
236+
237+
####### Designated Forwarder Election Summary
238+
239+
| Interface | Algorithm | Preference Value | Dont Preempt | Hold time | Subsequent Hold Time | Candidate Reachability Required |
240+
| --------- | --------- | ---------------- | ------------ | --------- | -------------------- | ------------------------------- |
241+
| Ethernet10 | preference | 100 | False | - | - | False |
242+
225243
#### Ethernet Interfaces Device Configuration
226244

227245
```eos
@@ -312,6 +330,38 @@ interface Ethernet9.101
312330
no shutdown
313331
encapsulation vlan
314332
client dot1q 101 network client
333+
!
334+
interface Ethernet10
335+
description CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet1
336+
no shutdown
337+
no switchport
338+
!
339+
evpn ethernet-segment
340+
identifier 0000:0000:0303:0202:0201
341+
redundancy single-active
342+
designated-forwarder election algorithm preference 100
343+
route-target import 03:03:02:02:02:01
344+
!
345+
interface Ethernet10.11
346+
!! Testing structured config on subinterface.
347+
vlan id 11
348+
encapsulation vlan
349+
client dot1q 11 network client
350+
!
351+
evpn ethernet-segment
352+
identifier 0000:0000:0303:0202:0211
353+
route-target import 03:03:02:02:02:11
354+
storm-control broadcast level 12
355+
!
356+
interface Ethernet10.12
357+
description Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
358+
vlan id 112
359+
encapsulation vlan
360+
client dot1q 211 network client
361+
!
362+
evpn ethernet-segment
363+
identifier 0000:0000:0303:0202:0212
364+
route-target import 03:03:02:02:02:12
315365
```
316366

317367
### Port-Channel Interfaces

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@ vlan 2020
192192
| --------- | ----------- | ------- | -------------- | -------------------- |
193193
| Ethernet5.100 | TENANT_B_SITE_3 | - | 100 | - |
194194

195+
##### Flexible Encapsulation Interfaces
196+
197+
| Interface | Description | Vlan ID | Client Encapsulation | Client Inner Encapsulation | Client VLAN | Client Outer VLAN Tag | Client Inner VLAN Tag | Network Encapsulation | Network Inner Encapsulation | Network VLAN | Network Outer VLAN Tag | Network Inner VLAN Tag |
198+
| --------- | ----------- | ------- | -------------------- | -------------------------- | ----------- | --------------------- | --------------------- | --------------------- | --------------------------- | ------------ | ---------------------- | ---------------------- |
199+
| Ethernet10.11 | - | 11 | dot1q | - | 11 | - | - | client | - | - | - | - |
200+
| Ethernet10.12 | Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES | 112 | dot1q | - | 211 | - | - | client | - | - | - | - |
201+
195202
##### IPv4
196203

197204
| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
@@ -214,6 +221,22 @@ vlan 2020
214221
| Ethernet1 | - | CORE | - | 50 | point-to-point | level-1-2 | False | md5 |
215222
| Ethernet2 | - | CORE | - | 500 | point-to-point | level-2 | False | md5 |
216223

224+
##### EVPN Multihoming
225+
226+
####### EVPN Multihoming Summary
227+
228+
| Interface | Ethernet Segment Identifier | Multihoming Redundancy Mode | Route Target |
229+
| --------- | --------------------------- | --------------------------- | ------------ |
230+
| Ethernet10 | 0000:0000:0303:0202:0201 | single-active | 03:03:02:02:02:01 |
231+
| Ethernet10.11 | 0000:0000:0303:0202:0211 | all-active | 03:03:02:02:02:11 |
232+
| Ethernet10.12 | 0000:0000:0303:0202:0212 | all-active | 03:03:02:02:02:12 |
233+
234+
####### Designated Forwarder Election Summary
235+
236+
| Interface | Algorithm | Preference Value | Dont Preempt | Hold time | Subsequent Hold Time | Candidate Reachability Required |
237+
| --------- | --------- | ---------------- | ------------ | --------- | -------------------- | ------------------------------- |
238+
| Ethernet10 | preference | 0 | False | - | - | False |
239+
217240
#### Ethernet Interfaces Device Configuration
218241

219242
```eos
@@ -283,6 +306,38 @@ interface Ethernet8
283306
description CPE_CPE_TENANT_A_SITE1_Ethernet2
284307
no shutdown
285308
channel-group 8 mode active
309+
!
310+
interface Ethernet10
311+
description CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet2
312+
no shutdown
313+
no switchport
314+
!
315+
evpn ethernet-segment
316+
identifier 0000:0000:0303:0202:0201
317+
redundancy single-active
318+
designated-forwarder election algorithm preference 0
319+
route-target import 03:03:02:02:02:01
320+
!
321+
interface Ethernet10.11
322+
!! Testing structured config on subinterface.
323+
vlan id 11
324+
encapsulation vlan
325+
client dot1q 11 network client
326+
!
327+
evpn ethernet-segment
328+
identifier 0000:0000:0303:0202:0211
329+
route-target import 03:03:02:02:02:11
330+
storm-control broadcast level 12
331+
!
332+
interface Ethernet10.12
333+
description Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
334+
vlan id 112
335+
encapsulation vlan
336+
client dot1q 211 network client
337+
!
338+
evpn ethernet-segment
339+
identifier 0000:0000:0303:0202:0212
340+
route-target import 03:03:02:02:02:12
286341
```
287342

288343
### Port-Channel Interfaces

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/documentation/fabric/MPLS_CORE-topology.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@ pe,SITE1-LER1,,Ethernet8,cpe,CPE_TENANT_A_SITE1,,Ethernet1,True
99
pe,SITE1-LER1,,Ethernet9,l3_interface,,,,True
1010
pe,SITE1-LER1,,Ethernet9.100,point_to_point_service,,,,True
1111
pe,SITE1-LER1,,Ethernet9.101,point_to_point_service,,,,True
12+
pe,SITE1-LER1,,Ethernet10,cpe,CPE2_TENANT_A_SITE1_SUBINTERFACES,,Ethernet1,True
13+
pe,SITE1-LER1,,Ethernet10.11,,,,,True
14+
pe,SITE1-LER1,,Ethernet10.12,,,,,True
1215
pe,SITE1-LER2,,Ethernet1,p,SITE1-LSR2,,Ethernet1,True
1316
pe,SITE1-LER2,,Ethernet2,pe,SITE1-LER1,,Ethernet2,True
1417
pe,SITE1-LER2,,Ethernet3,point_to_point_service,,,,True
1518
pe,SITE1-LER2,,Ethernet4,point_to_point_service,,,,True
1619
pe,SITE1-LER2,,Ethernet5,l3_interface,,,,True
1720
pe,SITE1-LER2,,Ethernet5.100,l3_interface,,,,True
1821
pe,SITE1-LER2,,Ethernet8,cpe,CPE_TENANT_A_SITE1,,Ethernet2,True
22+
pe,SITE1-LER2,,Ethernet10,cpe,CPE2_TENANT_A_SITE1_SUBINTERFACES,,Ethernet2,True
23+
pe,SITE1-LER2,,Ethernet10.11,,,,,True
24+
pe,SITE1-LER2,,Ethernet10.12,,,,,True
1925
p,SITE1-LSR1,,Ethernet1,pe,SITE1-LER1,,Ethernet1,True
2026
p,SITE1-LSR1,,Ethernet3,p,SITE2-LSR1,,Ethernet3,True
2127
p,SITE1-LSR1,,Ethernet4,rr,SITE1-RR1,,Ethernet4,True

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER1.cfg‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,38 @@ interface Ethernet9.101
207207
encapsulation vlan
208208
client dot1q 101 network client
209209
!
210+
interface Ethernet10
211+
description CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet1
212+
no shutdown
213+
no switchport
214+
!
215+
evpn ethernet-segment
216+
identifier 0000:0000:0303:0202:0201
217+
redundancy single-active
218+
designated-forwarder election algorithm preference 100
219+
route-target import 03:03:02:02:02:01
220+
!
221+
interface Ethernet10.11
222+
!! Testing structured config on subinterface.
223+
vlan id 11
224+
encapsulation vlan
225+
client dot1q 11 network client
226+
!
227+
evpn ethernet-segment
228+
identifier 0000:0000:0303:0202:0211
229+
route-target import 03:03:02:02:02:11
230+
storm-control broadcast level 12
231+
!
232+
interface Ethernet10.12
233+
description Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
234+
vlan id 112
235+
encapsulation vlan
236+
client dot1q 211 network client
237+
!
238+
evpn ethernet-segment
239+
identifier 0000:0000:0303:0202:0212
240+
route-target import 03:03:02:02:02:12
241+
!
210242
interface Loopback0
211243
description ROUTER_ID
212244
no shutdown

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE1-LER2.cfg‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,38 @@ interface Ethernet8
188188
no shutdown
189189
channel-group 8 mode active
190190
!
191+
interface Ethernet10
192+
description CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet2
193+
no shutdown
194+
no switchport
195+
!
196+
evpn ethernet-segment
197+
identifier 0000:0000:0303:0202:0201
198+
redundancy single-active
199+
designated-forwarder election algorithm preference 0
200+
route-target import 03:03:02:02:02:01
201+
!
202+
interface Ethernet10.11
203+
!! Testing structured config on subinterface.
204+
vlan id 11
205+
encapsulation vlan
206+
client dot1q 11 network client
207+
!
208+
evpn ethernet-segment
209+
identifier 0000:0000:0303:0202:0211
210+
route-target import 03:03:02:02:02:11
211+
storm-control broadcast level 12
212+
!
213+
interface Ethernet10.12
214+
description Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
215+
vlan id 112
216+
encapsulation vlan
217+
client dot1q 211 network client
218+
!
219+
evpn ethernet-segment
220+
identifier 0000:0000:0303:0202:0212
221+
route-target import 03:03:02:02:02:12
222+
!
191223
interface Loopback0
192224
description ROUTER_ID
193225
no shutdown

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER1.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,48 @@ ethernet_interfaces:
136136
peer_type: cpe
137137
peer_key: cpes
138138
port_profile: TENANT_A_WAN_SERVICE_10
139+
- name: Ethernet10
140+
description: CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet1
141+
shutdown: false
142+
evpn_ethernet_segment:
143+
identifier: 0000:0000:0303:0202:0201
144+
redundancy: single-active
145+
designated_forwarder_election:
146+
algorithm: preference
147+
preference_value: 100
148+
route_target: 03:03:02:02:02:01
149+
metadata:
150+
peer: CPE2_TENANT_A_SITE1_SUBINTERFACES
151+
peer_interface: Ethernet1
152+
peer_type: cpe
153+
peer_key: cpes
154+
switchport:
155+
enabled: false
156+
- name: Ethernet10.11
157+
comment: Testing structured config on subinterface.
158+
evpn_ethernet_segment:
159+
identifier: 0000:0000:0303:0202:0211
160+
route_target: 03:03:02:02:02:11
161+
encapsulation_vlan:
162+
client:
163+
encapsulation: dot1q
164+
vlan: 11
165+
network:
166+
encapsulation: client
167+
vlan_id: 11
168+
eos_cli: storm-control broadcast level 12
169+
- name: Ethernet10.12
170+
description: Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
171+
evpn_ethernet_segment:
172+
identifier: 0000:0000:0303:0202:0212
173+
route_target: 03:03:02:02:02:12
174+
encapsulation_vlan:
175+
client:
176+
encapsulation: dot1q
177+
vlan: 211
178+
network:
179+
encapsulation: client
180+
vlan_id: 112
139181
- name: Ethernet9
140182
shutdown: false
141183
metadata:

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/intended/structured_configs/SITE1-LER2.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,48 @@ ethernet_interfaces:
102102
peer_type: cpe
103103
peer_key: cpes
104104
port_profile: TENANT_A_WAN_SERVICE_10
105+
- name: Ethernet10
106+
description: CPE_CPE2_TENANT_A_SITE1_SUBINTERFACES_Ethernet2
107+
shutdown: false
108+
evpn_ethernet_segment:
109+
identifier: 0000:0000:0303:0202:0201
110+
redundancy: single-active
111+
designated_forwarder_election:
112+
algorithm: preference
113+
preference_value: 0
114+
route_target: 03:03:02:02:02:01
115+
metadata:
116+
peer: CPE2_TENANT_A_SITE1_SUBINTERFACES
117+
peer_interface: Ethernet2
118+
peer_type: cpe
119+
peer_key: cpes
120+
switchport:
121+
enabled: false
122+
- name: Ethernet10.11
123+
comment: Testing structured config on subinterface.
124+
evpn_ethernet_segment:
125+
identifier: 0000:0000:0303:0202:0211
126+
route_target: 03:03:02:02:02:11
127+
encapsulation_vlan:
128+
client:
129+
encapsulation: dot1q
130+
vlan: 11
131+
network:
132+
encapsulation: client
133+
vlan_id: 11
134+
eos_cli: storm-control broadcast level 12
135+
- name: Ethernet10.12
136+
description: Ethernet10.12-12-112-211-cpe-CPE2_TENANT_A_SITE1_SUBINTERFACES
137+
evpn_ethernet_segment:
138+
identifier: 0000:0000:0303:0202:0212
139+
route_target: 03:03:02:02:02:12
140+
encapsulation_vlan:
141+
client:
142+
encapsulation: dot1q
143+
vlan: 211
144+
network:
145+
encapsulation: client
146+
vlan_id: 112
105147
- name: Ethernet5
106148
shutdown: false
107149
metadata:

‎ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/inventory/group_vars/SITE1_CONNECTED_ENDPOINTS.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,30 @@ cpes:
3333
encapsulation_vlan:
3434
client_dot1q: 333
3535
rack: Undefined
36+
37+
- name: CPE2_TENANT_A_SITE1_SUBINTERFACES
38+
adapters:
39+
- endpoint_ports:
40+
- Ethernet1
41+
- Ethernet2
42+
switch_ports:
43+
- Ethernet10
44+
- Ethernet10
45+
switches:
46+
- SITE1-LER1
47+
- SITE1-LER2
48+
ethernet_segment:
49+
short_esi: 0303:0202:0201
50+
subinterfaces:
51+
- number: 11
52+
short_esi: 0303:0202:0211
53+
raw_eos_cli: |-
54+
storm-control broadcast level 12
55+
structured_config:
56+
comment: Testing structured config on subinterface.
57+
- number: 12
58+
description: "{subinterface}-{subinterface_number}-{vlan_id}-{dot1q_client_vlan}-{endpoint_type}-{endpoint}"
59+
short_esi: 0303:0202:0212
60+
vlan_id: 112
61+
encapsulation_vlan:
62+
client_dot1q: 211

0 commit comments

Comments
 (0)