Update labs for AVD 6.1.0 (#336)

mtache · JulioPDX · web-flow · commit daa1f28a1055 · 2026-05-26T08:37:03.000-07:00
* Update AVD variables for AVD 6.0.0

* Update requirements files

* Update .gitignore

* Updated README

* Adding backups to gitignore and Updating build steps to stay with Management0, moved to cleartext_password on user creation

* updating to avd 6.1, anta 1.8,  and reverting gitignore

* Implement review comments

---------

Co-authored-by: juliopdx &lt;julioperez@arista.com&gt;
Co-authored-by: JulioPDX &lt;juliop503@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -1,11 +1,25 @@
-# Arista CI Workshops
+# Arista Automation Workshops
 
-## **ATD Dual Datacenter Topology**
+This repository contains lab materials for learning network automation with **Arista AVD** and **CI/CD practices**. The labs are designed for use with the Arista Test Drive (ATD) environment.
 
-In this example, the ATD lab is used to create the L2LS Dual Data Center topology below. The IP Network cloud (orange area) is pre-provisioned and is comprised of the border and core nodes in the ATD topology. Our focus will be creating the L2LS AVD data models to build and deploy configurations for Site 1 and Site 2 (blue areas) and connect them to the IP Network.
+## **Overview**
 
-![Topologies](images/topologies.png)
+These workshops demonstrate infrastructure-as-code practices for network automation:
 
-## **Lab Instructions**
+- **Configuration Generation** using [Arista AVD](https://avd.arista.com/) with Ansible
+- **Network Validation** using [ANTA (Arista Network Test Automation)](https://anta.arista.com/)
+- **Deployment** via eAPI or CloudVision
+- **CI/CD Integration** with GitHub Actions for automated testing and deployment
 
-The instructions to build and deploy this L2LS Multi-site topology are located in the Lab Guide **[here](https://aristanetworks.github.io/avd-workshops/avd-lab-guide/)**.
+## **Labs**
+
+This repository contains the following labs:
+
+| Lab | Description | Lab Guide |
+|-----|-------------|-----------|
+| [L2LS](labs/L2LS/) | Layer 2 Leaf-Spine Dual Data Center | [CI/AVD L2LS Guide](https://labguides.testdrive.arista.com/2025.3/automation/ci_avd_l2ls/overview/) |
+| [L3LS_EVPN](labs/L3LS_EVPN/) | Layer 3 Leaf-Spine with EVPN/VXLAN | [CI/AVD L3LS EVPN/VXLAN Guide](https://labguides.testdrive.arista.com/2025.3/automation/ci_avd_l3ls/overview/) |
+| [CAMPUS_L2LS](labs/CAMPUS_L2LS/) | Campus Layer 2 Leaf-Spine | [AVD/CV Campus L2LS Guide](https://labguides.testdrive.arista.com/2025.3/automation/avd_cv_campus_l2ls/overview/) |
+| [NET_TESTING](labs/NET_TESTING/) | Network Testing with ANTA | [Arista Network Test Automation Guide](https://labguides.testdrive.arista.com/2025.3/automation/validation/overview/) |
+
+For the full list of automation labs, visit the [Arista ATD Automation Lab Guides](https://labguides.testdrive.arista.com/2025.3/automation/workshops_overview/).
diff --git a/ansible.cfg b/ansible.cfg
@@ -15,12 +15,13 @@ retry_files_enabled = False
 # Path(s) to search for installed Ansible Galaxy Collections
 collections_path = ~/.ansible/collections
 
-# Enable additional Jinja2 Extensions (https://jinja.palletsprojects.com/en/3.1.x/extensions/)
-jinja2_extensions =  jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n
-
 # Enable the YAML callback plugin, providing much easier to read terminal output. (https://docs.ansible.com/ansible/latest/plugins/callback.html#callback-plugins)
 stdout_callback = yaml
 
+# error when a duplicate dict key is encountered in YAML
+# https://avd.arista.com/6.1/docs/installation/collection-installation.html#ansible-configuration-file
+duplicate_dict_key=error
+
 # Permit the use of callback plugins when running ad-hoc commands
 bin_ansible_callbacks = True
 
diff --git a/labs/CAMPUS_L2LS/global_vars/global_campus_vars.yml b/labs/CAMPUS_L2LS/global_vars/global_campus_vars.yml
@@ -13,6 +13,12 @@ ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
 
+# AVD 6.0 defaults to Management1 for cEOS, override
+custom_platform_settings:
+  - platforms:
+      - cEOS
+    management_interface: Management0
+
 # arista.avd.cv_deploy role parameters
 # Export token using 'export CV_TOKEN=<generated token here>'
 cv_token: "{{ lookup('env', 'CV_TOKEN') }}"
@@ -37,7 +43,7 @@ aaa_settings:
     - name: arista
       privilege: 15
       role: network-admin
-      sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista', rounds=5000) }}"
+      cleartext_password: "{{ ansible_password }}"
       ssh_key: "{{ lookup('ansible.builtin.file', '~/.ssh/id_rsa.pub') }}"
 
 # DNS settings
@@ -55,7 +61,10 @@ ntp_settings:
 # OOB Management network default gateway.
 mgmt_gateway: 192.168.0.1
 mgmt_interface_vrf: default
-mgmt_interface: Management0
 
 # Point to Point Links MTU Override for Lab
 p2p_uplinks_mtu: 1500
+
+# eAPI must be explicitly enabled in AVD 6.0.0
+management_eapi:
+  enabled: true
diff --git a/labs/L2LS/complete/global_vars/global_dc_vars.yml b/labs/L2LS/complete/global_vars/global_dc_vars.yml
@@ -13,6 +13,12 @@ ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
 
+# AVD 6.0 defaults to Management1 for cEOS, override
+custom_platform_settings:
+  - platforms:
+      - cEOS
+    management_interface: Management0
+
 # arista.avd.cv_deploy role parameters
 # Export token using 'export CV_TOKEN=<generated token here>'
 cv_token: "{{ lookup('env', 'CV_TOKEN') }}"
@@ -37,12 +43,11 @@ aaa_settings:
     - name: arista
       privilege: 15
       role: network-admin
-      sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista', rounds=5000) }}"
+      cleartext_password: "{{ ansible_password }}"
 
 # OOB Management network default gateway.
 mgmt_gateway: 192.168.0.1
 mgmt_interface_vrf: default
-mgmt_interface: Management0
 
 # NTP Servers IP or DNS name, first NTP server will be preferred, and sourced from Management VRF
 ntp_settings:
@@ -58,3 +63,7 @@ dns_settings:
 
 # Point to Point Links MTU Override for Lab
 p2p_uplinks_mtu: 1500
+
+# eAPI must be explicitly enabled in AVD 6.0.0
+management_eapi:
+  enabled: true
diff --git a/labs/L2LS/global_vars/global_dc_vars.yml b/labs/L2LS/global_vars/global_dc_vars.yml
@@ -13,6 +13,12 @@ ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
 
+# AVD 6.0 defaults to Management1 for cEOS, override
+custom_platform_settings:
+  - platforms:
+      - cEOS
+    management_interface: Management0
+
 # arista.avd.cv_deploy role parameters
 # Export token using 'export CV_TOKEN=<generated token here>'
 cv_token: "{{ lookup('env', 'CV_TOKEN') }}"
@@ -37,13 +43,12 @@ aaa_settings:
     - name: arista
       privilege: 15
       role: network-admin
-      sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista', rounds=5000) }}"
+      cleartext_password: "{{ ansible_password }}"
       ssh_key: "{{ lookup('ansible.builtin.file', '~/.ssh/id_rsa.pub') }}"
 
 # OOB Management network default gateway.
 mgmt_gateway: 192.168.0.1
 mgmt_interface_vrf: default
-mgmt_interface: Management0
 
 # NTP Servers IP or DNS name, first NTP server will be preferred, and sourced from Management VRF
 ntp_settings:
@@ -59,3 +64,7 @@ dns_settings:
 
 # Point to Point Links MTU Override for Lab
 p2p_uplinks_mtu: 1500
+
+# eAPI must be explicitly enabled in AVD 6.0.0
+management_eapi:
+  enabled: true
diff --git a/labs/L3LS_EVPN/global_vars/global_dc_vars.yml b/labs/L3LS_EVPN/global_vars/global_dc_vars.yml
@@ -13,6 +13,12 @@ ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
 
+# AVD 6.0 defaults to Management1 for cEOS, override
+custom_platform_settings:
+  - platforms:
+      - cEOS
+    management_interface: Management0
+
 # arista.avd.cv_deploy role parameters
 # Export token using 'export CV_TOKEN=<generated token here>'
 cv_token: "{{ lookup('env', 'CV_TOKEN') }}"
@@ -37,13 +43,12 @@ aaa_settings:
     - name: arista
       privilege: 15
       role: network-admin
-      sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista', rounds=5000) }}"
+      cleartext_password: "{{ ansible_password }}"
       ssh_key: "{{ lookup('ansible.builtin.file', '~/.ssh/id_rsa.pub') }}"
 
 # OOB Management network default gateway.
 mgmt_gateway: 192.168.0.1
 mgmt_interface_vrf: default
-mgmt_interface: Management0
 
 # NTP Servers IP or DNS name, first NTP server will be preferred, and sourced from Management VRF
 ntp_settings:
@@ -60,6 +65,10 @@ dns_settings:
 # Point to Point Links MTU Override for Lab
 p2p_uplinks_mtu: 1500
 
+# eAPI must be explicitly enabled in AVD 6.0.0
+management_eapi:
+  enabled: true
+
 # Set IPv4 Underlay Routing and EVPN Overlay Routing to use eBGP
 underlay_routing_protocol: ebgp
 overlay_routing_protocol: ebgp
diff --git a/labs/NET_TESTING/global_vars/global_dc_vars.yml b/labs/NET_TESTING/global_vars/global_dc_vars.yml
@@ -14,6 +14,12 @@ ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
 
+# AVD 6.0 defaults to Management1 for cEOS, override
+custom_platform_settings:
+  - platforms:
+      - cEOS
+    management_interface: Management0
+
 # arista.avd.cv_deploy role parameters
 # Export token using 'export CV_TOKEN=<generated token here>'
 cv_token: "{{ lookup('env', 'CV_TOKEN') }}"
@@ -38,13 +44,12 @@ aaa_settings:
     - name: arista
       privilege: 15
       role: network-admin
-      sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista', rounds=5000) }}"
+      cleartext_password: "{{ ansible_password }}"
       ssh_key: "{{ lookup('ansible.builtin.file', '~/.ssh/id_rsa.pub') }}"
 
 # OOB Management network default gateway.
 mgmt_gateway: 192.168.0.1
 mgmt_interface_vrf: default
-mgmt_interface: Management0
 
 # NTP Servers IP or DNS name, first NTP server will be preferred, and sourced from Management VRF
 ntp_settings:
@@ -61,6 +66,10 @@ dns_settings:
 # Point to Point Links MTU Override for Lab
 p2p_uplinks_mtu: 1500
 
+# eAPI must be explicitly enabled in AVD 6.0.0
+management_eapi:
+  enabled: true
+
 # Set IPv4 Underlay Routing and EVPN Overlay Routing to use eBGP
 underlay_routing_protocol: ebgp
 overlay_routing_protocol: ebgp
diff --git a/requirements.txt b/requirements.txt
@@ -1,60 +1,2 @@
-aiocache==0.12.3
-annotated-types==0.7.0
-ansible-core==2.16.14
-anta==1.6.0
-anyio==4.10.0
-aristaproto==0.1.4
-asyncssh==2.21.0
-attrs==25.3.0
-certifi==2025.8.3
-cffi==1.17.1
-charset-normalizer==3.4.3
-click==8.3.0
-cryptography==45.0.6
-cvprac==1.4.1
-deepmerge==2.0
-distlib==0.4.0
-eval_type_backport==0.2.2
-grpclib==0.4.8
-h11==0.16.0
-h2==4.2.0
-hpack==4.1.0
-httpcore==1.0.9
-httpx==0.28.1
-hyperframe==6.1.0
-idna==3.10
-Jinja2==3.1.6
-jsonrpclib-pelix==0.4.3.4
-jsonschema==4.25.0
-jsonschema-specifications==2025.4.1
-markdown-it-py==4.0.0
-MarkupSafe==3.0.2
-mdurl==0.1.2
-multidict==6.6.4
-netaddr==1.3.0
-packaging==25.0
-passlib==1.7.4
-pyavd==5.7.1
-pycparser==2.22
-pydantic==2.11.7
-pydantic-extra-types==2.10.5
-pydantic-settings==2.11.0
-pydantic_core==2.33.2
-pyeapi==1.0.4
-Pygments==2.19.2
-PySocks==1.7.1
-python-dateutil==2.9.0.post0
-python-dotenv==1.2.1
-PyYAML==6.0.2
-referencing==0.36.2
-requests==2.32.4
-resolvelib==1.0.1
-rich==13.9.4
-rpds-py==0.27.0
-shyaml==0.6.2
-six==1.17.0
-sniffio==1.3.1
-treelib==1.8.0
-typing-inspection==0.4.1
-typing_extensions==4.14.1
-urllib3==2.5.0
+pyavd[ansible]==6.1.0
+anta[cli]==1.8.0
diff --git a/requirements.yml b/requirements.yml
@@ -1,11 +1,6 @@
 ---
 collections:
-
   - name: arista.avd
-    version: 5.7.1
-
-  - name: community.general
-    version: 11.2.1
-
+    version: 6.1.0
   - name: ansible.posix
-    version: 2.1.0
+    version: 2.2.0
