Feat(eos_designs): Allow VLAN Aware Bundles even if common evpn_vlan_…

…aware_bundles is false (#3827) Co-authored-by: Claus Holbech <[email protected]> Co-authored-by: Guillaume Mulocher <[email protected]>
aristanetworks · Apr 24, 2024 · 0922df1 · 0922df1
1 parent 61da4a2
commit 0922df1
Show file tree

Hide file tree

Showing 14 changed files with 543 additions and 82 deletions.
diff --git a/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg b/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle_svi_l2vlan.cfg
@@ -0,0 +1,149 @@
+!RANCID-CONTENT-TYPE: arista
+!
+vlan internal order ascending range 1006 1199
+!
+transceiver qsfp default-mode 4x10G
+!
+service routing protocols model multi-agent
+!
+hostname evpn_vlan_bundle_svi_l2vlan
+!
+no enable password
+no aaa root
+!
+vlan 10
+   name storage_prod
+!
+vlan 20
+   name storage_prod
+!
+vlan 90
+   name vlan90
+!
+vlan 100
+   name vlan100
+!
+vlan 1008
+   name SVI_1
+!
+vlan 1009
+   name SVI_2
+!
+vlan 1010
+   name SVI_3
+!
+vrf instance MGMT
+!
+vrf instance SIT_VRF
+!
+interface Loopback0
+   description EVPN_Overlay_Peering
+   no shutdown
+   ip address 10.10.0.3/32
+!
+interface Loopback1
+   description VTEP_VXLAN_Tunnel_Source
+   no shutdown
+   ip address 10.11.0.3/32
+!
+interface Vlan1008
+   description SVI_1
+   no shutdown
+   vrf SIT_VRF
+!
+interface Vlan1009
+   description SVI_2
+   no shutdown
+   vrf SIT_VRF
+!
+interface Vlan1010
+   description SVI_3
+   no shutdown
+   vrf SIT_VRF
+!
+interface Vxlan1
+   description evpn_vlan_bundle_svi_l2vlan_VTEP
+   vxlan source-interface Loopback1
+   vxlan udp-port 4789
+   vxlan vlan 10 vni 20010
+   vxlan vlan 20 vni 20020
+   vxlan vlan 90 vni 20090
+   vxlan vlan 100 vni 20100
+   vxlan vlan 1008 vni 21008
+   vxlan vlan 1009 vni 21009
+   vxlan vlan 1010 vni 21010
+   vxlan vrf SIT_VRF vni 789654
+!
+ip routing
+no ip routing vrf MGMT
+ip routing vrf SIT_VRF
+!
+ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
+   seq 10 permit 10.10.0.0/24 eq 32
+   seq 20 permit 10.11.0.0/24 eq 32
+!
+route-map RM-CONN-2-BGP permit 10
+   match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
+!
+router bfd
+   multihop interval 300 min-rx 300 multiplier 3
+!
+router bgp 65101
+   router-id 10.10.0.3
+   maximum-paths 4 ecmp 4
+   update wait-install
+   no bgp default ipv4-unicast
+   neighbor EVPN-OVERLAY-PEERS peer group
+   neighbor EVPN-OVERLAY-PEERS update-source Loopback0
+   neighbor EVPN-OVERLAY-PEERS bfd
+   neighbor EVPN-OVERLAY-PEERS ebgp-multihop 3
+   neighbor EVPN-OVERLAY-PEERS send-community
+   neighbor EVPN-OVERLAY-PEERS maximum-routes 0
+   neighbor IPv4-UNDERLAY-PEERS peer group
+   neighbor IPv4-UNDERLAY-PEERS send-community
+   neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
+   redistribute connected route-map RM-CONN-2-BGP
+   !
+   vlan 10
+      rd 10.10.0.3:20010
+      route-target both 20010:20010
+      redistribute learned
+   !
+   vlan 1010
+      rd 10.10.0.3:21010
+      route-target both 21010:21010
+      redistribute learned
+   !
+   vlan 20
+      rd 10.10.0.3:20020
+      route-target both 20020:20020
+      redistribute learned
+   !
+   vlan-aware-bundle bundle3
+      rd 1.1.1.1:333
+      route-target both 303:333
+      redistribute learned
+      vlan 90,100,1008-1009
+   !
+   address-family evpn
+      neighbor EVPN-OVERLAY-PEERS activate
+   !
+   address-family ipv4
+      no neighbor EVPN-OVERLAY-PEERS activate
+      neighbor IPv4-UNDERLAY-PEERS activate
+   !
+   vrf SIT_VRF
+      rd 10.10.0.3:789654
+      route-target import evpn 789654:789654
+      route-target export evpn 789654:789654
+      router-id 10.10.0.3
+      redistribute connected
+!
+management api http-commands
+   protocol https
+   no shutdown
+   !
+   vrf MGMT
+      no shutdown
+!
+end
diff --git a/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml b/...lecule/eos_designs_unit_tests/intended/structured_configs/evpn_vlan_bundle_svi_l2vlan.yml
@@ -0,0 +1,202 @@
+hostname: evpn_vlan_bundle_svi_l2vlan
+is_deployed: true
+router_bgp:
+  as: '65101'
+  router_id: 10.10.0.3
+  bgp:
+    default:
+      ipv4_unicast: false
+  maximum_paths:
+    paths: 4
+    ecmp: 4
+  updates:
+    wait_install: true
+  peer_groups:
+  - name: IPv4-UNDERLAY-PEERS
+    type: ipv4
+    maximum_routes: 12000
+    send_community: all
+  - name: EVPN-OVERLAY-PEERS
+    type: evpn
+    update_source: Loopback0
+    bfd: true
+    send_community: all
+    maximum_routes: 0
+    ebgp_multihop: 3
+  address_family_ipv4:
+    peer_groups:
+    - name: IPv4-UNDERLAY-PEERS
+      activate: true
+    - name: EVPN-OVERLAY-PEERS
+      activate: false
+  redistribute_routes:
+  - source_protocol: connected
+    route_map: RM-CONN-2-BGP
+  address_family_evpn:
+    peer_groups:
+    - name: EVPN-OVERLAY-PEERS
+      activate: true
+  vrfs:
+  - name: SIT_VRF
+    router_id: 10.10.0.3
+    rd: 10.10.0.3:789654
+    route_targets:
+      import:
+      - address_family: evpn
+        route_targets:
+        - 789654:789654
+      export:
+      - address_family: evpn
+        route_targets:
+        - 789654:789654
+    redistribute_routes:
+    - source_protocol: connected
+  vlans:
+  - id: 1010
+    tenant: SIT
+    rd: 10.10.0.3:21010
+    route_targets:
+      both:
+      - 21010:21010
+    redistribute_routes:
+    - learned
+  - id: 10
+    tenant: SIT
+    rd: 10.10.0.3:20010
+    route_targets:
+      both:
+      - 20010:20010
+    redistribute_routes:
+    - learned
+  - id: 20
+    tenant: SIT
+    rd: 10.10.0.3:20020
+    route_targets:
+      both:
+      - 20020:20020
+    redistribute_routes:
+    - learned
+  vlan_aware_bundles:
+  - name: bundle3
+    rd: 1.1.1.1:333
+    route_targets:
+      both:
+      - 303:333
+    redistribute_routes:
+    - learned
+    vlan: 90,100,1008-1009
+service_routing_protocols_model: multi-agent
+ip_routing: true
+vlan_internal_order:
+  allocation: ascending
+  range:
+    beginning: 1006
+    ending: 1199
+vrfs:
+- name: MGMT
+  ip_routing: false
+- name: SIT_VRF
+  tenant: SIT
+  ip_routing: true
+management_api_http:
+  enable_vrfs:
+  - name: MGMT
+  enable_https: true
+loopback_interfaces:
+- name: Loopback0
+  description: EVPN_Overlay_Peering
+  shutdown: false
+  ip_address: 10.10.0.3/32
+- name: Loopback1
+  description: VTEP_VXLAN_Tunnel_Source
+  shutdown: false
+  ip_address: 10.11.0.3/32
+prefix_lists:
+- name: PL-LOOPBACKS-EVPN-OVERLAY
+  sequence_numbers:
+  - sequence: 10
+    action: permit 10.10.0.0/24 eq 32
+  - sequence: 20
+    action: permit 10.11.0.0/24 eq 32
+route_maps:
+- name: RM-CONN-2-BGP
+  sequence_numbers:
+  - sequence: 10
+    type: permit
+    match:
+    - ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY
+router_bfd:
+  multihop:
+    interval: 300
+    min_rx: 300
+    multiplier: 3
+vlans:
+- id: 1008
+  name: SVI_1
+  tenant: SIT
+- id: 1009
+  name: SVI_2
+  tenant: SIT
+- id: 1010
+  name: SVI_3
+  tenant: SIT
+- id: 10
+  name: storage_prod
+  tenant: SIT
+- id: 20
+  name: storage_prod
+  tenant: SIT
+- id: 90
+  name: vlan90
+  tenant: SIT
+- id: 100
+  name: vlan100
+  tenant: SIT
+ip_igmp_snooping:
+  globally_enabled: true
+vlan_interfaces:
+- name: Vlan1008
+  tenant: SIT
+  tags:
+  - sit
+  description: SVI_1
+  shutdown: false
+  vrf: SIT_VRF
+- name: Vlan1009
+  tenant: SIT
+  tags:
+  - sit
+  description: SVI_2
+  shutdown: false
+  vrf: SIT_VRF
+- name: Vlan1010
+  tenant: SIT
+  tags:
+  - sit
+  description: SVI_3
+  shutdown: false
+  vrf: SIT_VRF
+vxlan_interface:
+  Vxlan1:
+    description: evpn_vlan_bundle_svi_l2vlan_VTEP
+    vxlan:
+      udp_port: 4789
+      source_interface: Loopback1
+      vlans:
+      - id: 1008
+        vni: 21008
+      - id: 1009
+        vni: 21009
+      - id: 1010
+        vni: 21010
+      - id: 10
+        vni: 20010
+      - id: 20
+        vni: 20020
+      - id: 90
+        vni: 20090
+      - id: 100
+        vni: 20100
+      vrfs:
+      - name: SIT_VRF
+        vni: 789654