data-model-update (#7)

README.md

@@ -24,7 +24,7 @@ This repository contains ansible playbooks which allow the user to quickly:
 1. Deploy cEOS-Lab Leaf Spine topology using [containerlab](https://containerlab.srlinux.dev/).
 2. Configure the Leaf Spine Fabric using Arista Ansible [AVD](https://avd.sh/en/latest/index.html)
 
-The same AVD templates can also be used with vEOS-Lab and physical Lab switches with slight changes to management IP and VRF.
+The same AVD templates can also be used with vEOS-Lab and physical Lab switches with slight changes to lab files.
 
 ## Installation
 
@@ -33,12 +33,12 @@ Clone the repository and ensure to have the required libraries and software inst
 ### Requirements
 
 - Python 3.6.8 or above
-- ansible 2.10.0 or above
-- arista.avd ansible collection
-- containerlab
+- ansible-core from 2.11.3 to 2.12.x
+- arista.avd ansible collection (3.0.0 or above)
+- containerlab (0.15 or above)
 - arista.avd requirements
 - docker
-- Arista cEOS-Lab image
+- Arista cEOS-Lab image (4.21.8M or above)
 - Alpine-host image
 
 For arista.avd installation please refer to the [official](https://avd.sh/en/latest/docs/installation/requirements.html) documenation.
@@ -47,7 +47,11 @@ For containerlab installation please refer to the [official](https://containerla
 
 For Python3, docker and ansible installation please refer to the installation guides based on the host OS.
 
-**NOTE** :warning: Containerlab topology definitions have changed starting v0.15 - [`Release Notes`](https://containerlab.srlinux.dev/rn/0.15/). Latest [`release`](https://github.com/arista-netdevops-community/avd-cEOS-Lab/releases) of this repository is containerlab v0.15 (and above) compatible. For older containerlab compatible syntax download [`v1.1.2`](https://github.com/arista-netdevops-community/avd-cEOS-Lab/releases)
+**NOTE** :warning:
+
+- Containerlab topology definitions have changed starting v0.15 - [`Release Notes`](https://containerlab.srlinux.dev/rn/0.15/). Latest [`release`](https://github.com/arista-netdevops-community/avd-cEOS-Lab/releases) of this repository is containerlab v0.15 (and above) compatible. For older containerlab compatible syntax download [`v1.1.2`](https://github.com/arista-netdevops-community/avd-cEOS-Lab/releases)
+
+- arista.avd v3.0.0 contains breaking changes to data models [`Release Notes`](https://avd.sh/en/latest/docs/release-notes/3.x.x.html). Latest release of this repository is arista.avd v3.0.0 and above compatible. For older avd compatible syntax download older release. [`Releases`](https://github.com/arista-netdevops-community/avd-cEOS-Lab/releases)
 
 ### Installing Arista cEOS-Lab image
 

labs/evpn/avd_asym_irb/group_vars/AVD_LAB.yaml

@@ -9,8 +9,11 @@ name_servers:
   - 1.1.1.1
   - 8.8.8.8
 
-ntp_servers:
-  - time.google.com
+ntp:
+  servers:
+  - name: time.google.com
+    preferred: true
+    vrf: MGMT
 
 service_routing_protocols_model: multi-agent
 

labs/evpn/avd_asym_irb/group_vars/DC1_FABRIC.yaml

@@ -5,16 +5,6 @@ underlay_routing_protocol: EBGP
 
 overlay_routing_protocol: EBGP
 
-underlay_p2p_network_summary: 172.31.255.0/24
-
-overlay_loopback_network_summary: 192.168.255.0/24
-
-vtep_loopback_network_summary: 192.168.254.0/24
-
-mlag_ips:
-  leaf_peer_l3: 10.255.251.0/24
-  mlag_peer: 10.255.252.0/24
-
 vxlan_vlan_aware_bundles: false
 
 # bgp peer groups passwords
@@ -27,8 +17,17 @@ bgp_peer_groups:
       password: "vnEaG8gMeQf3d3cN6PktXQ=="
 
 spine:
-  platform: cEOS-LAB
-  bgp_as: 65001
+  defaults:
+    platform: cEOS-LAB
+    bgp_as: 65001
+    loopback_ipv4_pool: 192.168.255.0/24
+    bgp_defaults:
+        #- update wait-for-convergence
+        #- update wait-install
+        - no bgp default ipv4-unicast
+        - distance bgp 20 200 200
+        #- graceful-restart restart-time 300
+        #- graceful-restart
   leaf_as_range: 65101-65132
   nodes:
     DC1_SPINE1:
@@ -42,49 +41,46 @@ l3leaf:
   defaults:
     platform: cEOS-LAB
     bgp_as: 65100
-    spines: [DC1_SPINE1, DC1_SPINE2]
-    uplink_to_spine_interfaces: [Ethernet1, Ethernet2]
+    uplink_switches: [DC1_SPINE1, DC1_SPINE2]
+    uplink_interfaces: [Ethernet1, Ethernet2]
     mlag_interfaces: [Ethernet3, Ethernet4]
     spanning_tree_mode: mstp
     spanning_tree_priority: 4096
     evpn_services_l2_only: true
+    loopback_ipv4_pool: 192.168.255.0/24
+    uplink_ipv4_pool: 172.31.255.0/24
+    loopback_ipv4_offset: 2
+    vtep_loopback_ipv4_pool: 192.168.254.0/24
+    mlag_peer_ipv4_pool: 10.255.252.0/24
+    mlag_peer_l3_ipv4_pool: 10.255.251.0/24
+    virtual_router_mac_address: 00:00:00:00:00:01
+    bgp_defaults:
+      #- update wait-install
+      - no bgp default ipv4-unicast
+      - distance bgp 20 200 200
+      #- graceful-restart restart-time 300
+      #- graceful-restart
   node_groups:
     DC1_LEAF1:
       bgp_as: 65101
       nodes:
         DC1_LEAF1A:
           id: 1
           mgmt_ip: 172.100.100.4/24
-          spine_interfaces: [Ethernet1, Ethernet1]
+          uplink_switch_interfaces: [Ethernet1, Ethernet1]
         DC1_LEAF1B:
           id: 2
           mgmt_ip: 172.100.100.5/24
-          spine_interfaces: [Ethernet2, Ethernet2]
+          uplink_switch_interfaces: [Ethernet2, Ethernet2]
     DC1_LEAF2:
       bgp_as: 65102
       nodes:
         DC1_LEAF2A:
           id: 3
           mgmt_ip: 172.100.100.6/24
-          spine_interfaces: [Ethernet3, Ethernet3]
+          uplink_switch_interfaces: [Ethernet3, Ethernet3]
         DC1_LEAF2B:
           id: 4
           mgmt_ip: 172.100.100.7/24
-          spine_interfaces: [Ethernet4, Ethernet4]
-
-# Spine BGP Tuning | Optional.
-spine_bgp_defaults:
-  #- update wait-for-convergence
-  #- update wait-install
-  - no bgp default ipv4-unicast
-  - distance bgp 20 200 200
-  #- graceful-restart restart-time 300
-  #- graceful-restart
+          uplink_switch_interfaces: [Ethernet4, Ethernet4]
 
-# Leaf BGP Tuning | Optional.
-leaf_bgp_defaults:
-  #- update wait-install
-  - no bgp default ipv4-unicast
-  - distance bgp 20 200 200
-  #- graceful-restart restart-time 300
-  #- graceful-restart

labs/evpn/avd_asym_irb/group_vars/DC1_LEAFS.yaml

@@ -8,6 +8,4 @@ custom_structured_configuration_vlan_interfaces:
   Vlan111:
     description: Tenant_A_OP_Zone_2
     shutdown: false
-    ip_address_virtual: 10.1.11.1/24
-
-custom_structured_configuration_ip_virtual_router_mac_address: 00:00:00:00:00:01
+    ip_address_virtual: 10.1.11.1/24

labs/evpn/avd_asym_irb/topology.yaml

@@ -4,7 +4,7 @@ topology:
   kinds:
     ceos:
       startup-config: ../../../ceos_lab_template/ceos.cfg.tpl
-      image: ceosimage:4.26.1F
+      image: ceosimage:4.27.0F
     linux:
       image: alpine-host
   nodes:

labs/evpn/avd_asym_multihoming/group_vars/AVD_LAB.yaml

@@ -9,8 +9,11 @@ name_servers:
   - 1.1.1.1
   - 8.8.8.8
 
-ntp_servers:
-  - time.google.com
+ntp:
+  servers:
+  - name: time.google.com
+    preferred: true
+    vrf: MGMT
 
 service_routing_protocols_model: multi-agent
 

labs/evpn/avd_asym_multihoming/group_vars/DC1_FABRIC.yaml

@@ -5,12 +5,6 @@ underlay_routing_protocol: EBGP
 
 overlay_routing_protocol: EBGP
 
-underlay_p2p_network_summary: 172.31.255.0/24
-
-overlay_loopback_network_summary: 192.168.255.0/24
-
-vtep_loopback_network_summary: 192.168.254.0/24
-
 vxlan_vlan_aware_bundles: false
 
 # bgp peer groups passwords
@@ -21,8 +15,17 @@ bgp_peer_groups:
       password: "q+VNViP5i4rVjW1cxFv2wA=="
 
 spine:
-  platform: cEOS-LAB
-  bgp_as: 65001
+  defaults:
+    platform: cEOS-LAB
+    bgp_as: 65001
+    loopback_ipv4_pool: 192.168.255.0/24
+    bgp_defaults:
+      #- update wait-for-convergence
+      #- update wait-install
+      - no bgp default ipv4-unicast
+      - distance bgp 20 200 200
+      #- graceful-restart restart-time 300
+      #- graceful-restart
   leaf_as_range: 65101-65132
   nodes:
     DC1_SPINE1:
@@ -35,11 +38,22 @@ spine:
 l3leaf:
   defaults:
     platform: cEOS-LAB
-    spines: [DC1_SPINE1, DC1_SPINE2]
-    uplink_to_spine_interfaces: [Ethernet1, Ethernet2]
+    uplink_switches: [DC1_SPINE1, DC1_SPINE2]
+    uplink_interfaces: [Ethernet1, Ethernet2]
     spanning_tree_mode: mstp
     spanning_tree_priority: 4096
     evpn_services_l2_only: true
+    loopback_ipv4_pool: 192.168.255.0/24
+    loopback_ipv4_offset: 2
+    vtep_loopback_ipv4_pool: 192.168.254.0/24
+    uplink_ipv4_pool: 172.31.255.0/24
+    virtual_router_mac_address: 00:00:00:00:00:01
+    bgp_defaults:
+      #- update wait-install
+      - no bgp default ipv4-unicast
+      - distance bgp 20 200 200
+      #- graceful-restart restart-time 300
+      #- graceful-restart
   node_groups:
     POD_1:
       mlag: false
@@ -48,42 +62,25 @@ l3leaf:
           id: 1
           bgp_as: 65101
           mgmt_ip: 172.100.100.4/24
-          spine_interfaces: [Ethernet1, Ethernet1]
+          uplink_switch_interfaces: [Ethernet1, Ethernet1]
         DC1_PE12:
           id: 2
           bgp_as: 65102
           mgmt_ip: 172.100.100.5/24
-          spine_interfaces: [Ethernet2, Ethernet2]
+          uplink_switch_interfaces: [Ethernet2, Ethernet2]
     POD_2:
       mlag: false
       nodes:
         DC1_PE21:
           id: 3
           bgp_as: 65103
           mgmt_ip: 172.100.100.6/24
-          spine_interfaces: [Ethernet3, Ethernet3]
+          uplink_switch_interfaces: [Ethernet3, Ethernet3]
         DC1_PE22:
           id: 4
           bgp_as: 65104
           mgmt_ip: 172.100.100.7/24
-          spine_interfaces: [Ethernet4, Ethernet4]
-
-# Spine BGP Tuning | Optional.
-spine_bgp_defaults:
-  #- update wait-for-convergence
-  #- update wait-install
-  - no bgp default ipv4-unicast
-  - distance bgp 20 200 200
-  #- graceful-restart restart-time 300
-  #- graceful-restart
-
-# Leaf BGP Tuning | Optional.
-leaf_bgp_defaults:
-  #- update wait-install
-  - no bgp default ipv4-unicast
-  - distance bgp 20 200 200
-  #- graceful-restart restart-time 300
-  #- graceful-restart
+          uplink_switch_interfaces: [Ethernet4, Ethernet4]
 
 # Enable Route Target Membership Constraint Address Family on EVPN overlay BGP peerings
 evpn_overlay_bgp_rtc: true

labs/evpn/avd_asym_multihoming/group_vars/DC1_PES.yaml

@@ -10,5 +10,3 @@ custom_structured_configuration_vlan_interfaces:
     shutdown: false
     ip_address_virtual: 10.1.11.1/24
 
-custom_structured_configuration_ip_virtual_router_mac_address: 00:00:00:00:00:01
-

labs/evpn/avd_asym_multihoming/topology.yaml

@@ -4,7 +4,7 @@ topology:
   kinds:
     ceos:
       startup-config: ../../../ceos_lab_template/ceos.cfg.tpl
-      image: ceosimage:4.26.2F
+      image: ceosimage:4.27.0F
     linux:
       image: alpine-host
   nodes:

labs/evpn/avd_central_any_gw/group_vars/AVD_LAB.yaml

@@ -9,8 +9,11 @@ name_servers:
   - 1.1.1.1
   - 8.8.8.8
 
-ntp_servers:
-  - time.google.com
+ntp:
+  servers:
+  - name: time.google.com
+    preferred: true
+    vrf: MGMT
 
 service_routing_protocols_model: multi-agent