Merge branch 'devel' into bump-5.1.0

aristanetworks · Nov 20, 2024 · 1f7a8b8 · 1f7a8b8
2 parents f22371f + 71a101e
commit 1f7a8b8
Show file tree

Hide file tree

Showing 135 changed files with 2,714 additions and 963 deletions.
diff --git a/.github/workflows/new-cvp-integration.yml b/.github/workflows/new-cvp-integration.yml
@@ -12,6 +12,8 @@ env:
   # Apparently it is set in secrets when running with debug
   ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
   AVD_NEVER_RUN_FROM_SOURCE: 1
+  PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
+  ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
 
 jobs:
   # ----------------------------------------------- #
@@ -26,12 +28,8 @@ jobs:
         avd_scenario:
           - 'cv_workflow'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:
@@ -59,12 +57,8 @@ jobs:
         avd_scenario:
           - 'cv_deploy'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:

diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
@@ -12,6 +12,8 @@ env:
   # Apparently it is set in secrets when running with debug
   ANSIBLE_VERBOSITY: ${{ secrets.ACTIONS_STEP_DEBUG && 3 || 0 }}
   AVD_NEVER_RUN_FROM_SOURCE: 1
+  PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
+  ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
 
 jobs:
   file-changes:
@@ -101,10 +103,6 @@ jobs:
           - "3.12"
           - "3.13"
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -136,10 +134,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.config_gen == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -171,10 +165,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.dhcp == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -240,10 +230,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.config_gen == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Build minimum requirements
         run: |
@@ -285,10 +271,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.cloudvision == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -325,10 +307,6 @@ jobs:
     needs: [ file-changes ]
     if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.validate_state == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
-          echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
         uses: arista-netdevops-community/[email protected]
@@ -349,12 +327,7 @@ jobs:
     name: Run ansible-test sanity validation
     runs-on: ubuntu-latest
     needs: [ file-changes ]
-    # needs: [ molecule_eos_designs, molecule_cloudvision ]
-    # if: needs.cloudvision.status != 'failed' && needs.molecule_eos_designs.status != 'failed' && needs.file-changes.outputs.plugins == 'true'
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -363,7 +336,7 @@ jobs:
             3.10
             3.11
             3.12
-          # 3.13 - Still waiting for support in ansible-test
+            3.13
       - name: 'Install Python requirements'
         run: |
           pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
@@ -377,9 +350,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -399,16 +369,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
           python-version: |
             3.12
-          # 3.13 - Still waiting for support in ansible-test
+            3.13
       - name: 'Install Python requirements'
         run: |
           pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
@@ -422,9 +389,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ file-changes ]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5
@@ -449,8 +413,6 @@ jobs:
     name: Test galaxy-importer
     runs-on: ubuntu-20.04 # Older version to be compatible with old python
     env:
-      PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
-      ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
       GALAXY_IMPORTER_CONFIG: galaxy-importer/galaxy-importer.cfg
     steps:
       - uses: actions/setup-python@v5
@@ -492,9 +454,6 @@ jobs:
       matrix:
         python: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - name: 'Set environment variables'
-        run: |
-          echo "PY_COLORS=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up Python 3
         uses: actions/setup-python@v5

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.3
+    rev: v0.7.4
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1c.yml b/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf1c.yml
@@ -73,7 +73,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2c.yml b/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc1-leaf2c.yml
@@ -73,7 +73,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1c.yml b/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf1c.yml
@@ -73,7 +73,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2c.yml b/...e_collections/arista/avd/examples/dual-dc-l3ls/intended/structured_configs/dc2-leaf2c.yml
@@ -73,7 +73,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF1.yml
@@ -146,7 +146,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '10'
+    access_vlan: 10
   spanning_tree_portfast: edge
 mlag_configuration:
   domain_id: RACK1

diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF2.yml
@@ -146,7 +146,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '20'
+    access_vlan: 20
   spanning_tree_portfast: edge
 mlag_configuration:
   domain_id: RACK1

diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF3.yml
@@ -146,7 +146,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '10'
+    access_vlan: 10
   spanning_tree_portfast: edge
 mlag_configuration:
   domain_id: RACK2

diff --git a/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml b/ansible_collections/arista/avd/examples/l2ls-fabric/intended/structured_configs/LEAF4.yml
@@ -146,7 +146,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '30'
+    access_vlan: 30
   spanning_tree_portfast: edge
 mlag_configuration:
   domain_id: RACK2

diff --git a/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1c.yml b/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1c.yml
@@ -94,7 +94,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2c.yml b/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2c.yml
@@ -94,7 +94,7 @@ ethernet_interfaces:
   switchport:
     enabled: true
     mode: access
-    access_vlan: '11'
+    access_vlan: 11
   spanning_tree_portfast: edge
 port_channel_interfaces:
 - name: Port-Channel1