Merge branch 'devel' into isis_authentication

aristanetworks · Jul 30, 2024 · c942dba · c942dba
2 parents 6c2b50d + 132b4fc
commit c942dba
Show file tree

Hide file tree

Showing 433 changed files with 7,434 additions and 1,080 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,14 +1,12 @@
 # Collapsing generated schemas from PR diff by default
-/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml  linguist-generated=true -merge -diff
-/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json  linguist-generated=true -merge -diff
-/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle  linguist-generated=true merge=union -diff -text
-/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml  linguist-generated=true -merge -diff
-/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json  linguist-generated=true -merge -diff
-/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle  linguist-generated=true merge=union -diff -text
+/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml  linguist-generated=true -merge -diff
+/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json  linguist-generated=true -merge -diff
+/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml  linguist-generated=true -merge -diff
+/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json  linguist-generated=true -merge -diff
 
-# Collapsing generated tables from PR diff by default
-/ansible_collections/arista/avd/roles/eos_cli_config_gen/tables/*  linguist-generated=true -merge -diff
-/ansible_collections/arista/avd/roles/eos_designs/tables/*  linguist-generated=true -merge -diff
+# Showing generated tables in PR diff by default by count as generated and automatically use the latest file on merge
+/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/*  linguist-generated=true -merge diff
+/ansible_collections/arista/avd/roles/eos_designs/docs/tables/*  linguist-generated=true -merge diff
 
 # Collapsing generated plugins doc from PR diff by default
 /ansible_collections/arista/avd/docs/plugins/*  linguist-generated=true
@@ -19,3 +17,6 @@
 # Excluding docs from stats for linguist
 /ansible_collections/arista/avd/roles/*/docs/*  linguist-documentation
 /ansible_collections/arista/avd/docs/*  linguist-documentation
+
+# CV API files are generated from proto files
+/python-avd/pyavd/_cv/api  linguist-generated=true
diff --git a/.github/workflows/new-cvp-integration.yml b/.github/workflows/new-cvp-integration.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Run molecule action
         env:
           CVAAS_AAWG_CI: ${{ secrets.CVAAS_AAWG_CI }}
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -62,7 +62,7 @@ jobs:
       - name: Run molecule action
         env:
           CVAAS_AAWG_CI: ${{ secrets.CVAAS_AAWG_CI }}
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'

diff --git a/.github/workflows/pull-request-comment.yml b/.github/workflows/pull-request-comment.yml
@@ -31,6 +31,8 @@ jobs:
             source test-avd-pr-${{ github.event.pull_request.number }}/bin/activate
             # Install all requirements including PyAVD
             pip install "pyavd[ansible] @ git+${{ github.event.pull_request.head.repo.clone_url }}@${{ github.event.pull_request.head.ref }}#subdirectory=python-avd" --force
+            # Point Ansible collections path to the Python virtual environment
+            export ANSIBLE_COLLECTIONS_PATH=$VIRTUAL_ENV/ansible_collections
             # Install Ansible collection
             ansible-galaxy collection install git+${{ github.event.pull_request.head.repo.clone_url }}#/ansible_collections/arista/avd/,${{ github.event.pull_request.head.ref }} --force
             # Optional: Install AVD examples

diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
@@ -95,7 +95,6 @@ jobs:
       fail-fast: true
       matrix:
         python_version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
@@ -141,7 +140,7 @@ jobs:
           echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -176,7 +175,7 @@ jobs:
           echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -247,7 +246,7 @@ jobs:
           cat ${{ matrix.pip_requirements }}
         if: matrix.pip_requirements == 'tmp-requirements-minimum.txt'
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -286,7 +285,7 @@ jobs:
           echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -326,7 +325,7 @@ jobs:
           echo "ANSIBLE_FORCE_COLOR=1" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.7
+        uses: arista-netdevops-community/action-molecule-avd@v1.8.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
@@ -344,8 +343,8 @@ 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'
+    # 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: |
@@ -482,7 +481,7 @@ jobs:
       needs.file-changes.outputs.pyavd == 'true'
     strategy:
       matrix:
-        python: ["3.9", "3.10", "3.11", "3.12"]
+        python: ["3.10", "3.11", "3.12"]
     steps:
       - name: 'Set environment variables'
         run: |

diff --git a/.github/workflows/pull-request-rn-labeler.yml b/.github/workflows/pull-request-rn-labeler.yml
@@ -2,7 +2,6 @@
 # changed post merge
 name: "Label for Release Notes"
 
-
 on:
   pull_request_target:
     types:

diff --git a/.github/yamllintrc b/.github/yamllintrc
@@ -1,4 +1,5 @@
 ---
+# Used by pre-commit. There is a similar file under the Ansible collection used by ansible-lint.
 extends: default
 
 yaml-files:
@@ -8,31 +9,51 @@ yaml-files:
 
 rules:
   braces:
-    level: warning
+    min-spaces-inside: 0
     max-spaces-inside: 1
+    level: error
   brackets:
-    level: warning
     max-spaces-inside: 1
+    level: error
   colons:
-    level: warning
+    max-spaces-after: -1
+    level: error
   commas:
-    level: warning
-  comments: disable
-  comments-indentation: disable
+    max-spaces-after: -1
+    level: error
+  comments:
+    # prettier compatibility
+    min-spaces-from-content: 1
+    level: error
+  comments-indentation: false
   document-start: disable
   empty-lines:
-    level: warning
+    max: 1
+    level: error
+    ignore:
+      - /python-avd/pyavd/**/schema/*.schema.yml
+      - /python-avd/tests/pyavd/schema/
+      - /python-avd/tests/schema_tools/artifacts/*.schema.yml
   hyphens:
-    level: warning
+    level: error
+  key-duplicates:
+    forbid-duplicated-merge-keys: true
+  line-length:
+    max: 160
+    ignore:
+      - /ansible_collections/arista/avd/molecule/**/intended/structured_configs/
+      - /ansible_collections/arista/avd/molecule/**/intended/structured_configs/cvp/
+      - /ansible_collections/arista/avd/examples/**/intended/structured_configs/cvp/
+      - /ansible_collections/arista/avd/changelogs/fragments_backup/
+      - /ansible_collections/arista/avd/tests/inventory/**/expected_output/
+      - /python-avd/pyavd/**/schema/
+      - /.github/workflows/
+  new-lines:
+    type: unix
   indentation:
-    level: warning
+    level: error
     indent-sequences: consistent
-  line-length:
-    max: 350
-    level: warning
-    allow-non-breakable-inline-mappings: true
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true
   truthy: disable
-
-ignore: |
-  ansible_collections/arista/avd/molecule/Makefile
-  ansible_collections/arista/avd/molecule/README.md
diff --git a/.gitignore b/.gitignore
@@ -8,14 +8,16 @@ __pycache__/
 *.pickle
 
 # pyavd ignores
-python-avd/build/
-python-avd/dist/
-python-avd/vendor/
-python-avd/tests/pyavd/artifacts/
-python-avd/pyavd.egg-info/
-python-avd/.tox/
-python-avd/.coverage
-python-avd/.mypy_cache/
+/python-avd/build/
+/python-avd/dist/
+/python-avd/vendor/
+/python-avd/tests/pyavd/artifacts/
+/python-avd/pyavd.egg-info/
+/python-avd/.tox/
+/python-avd/.coverage
+/python-avd/.mypy_cache/
+# Ignore cloned cloudvision-python repo created during generation of _cv/api
+/python-avd/pyavd/_cv/cloudvision-apis/
 
 # top level installers
 /*.tar.gz
@@ -30,9 +32,6 @@ python-avd/.mypy_cache/
 # ansible_collections/arista/avd/tests ignores
 ansible_collections/arista/avd/tests/.mypy_cache/
 
-# Ignore cloned cloudvision-python repo created during generation of cv_client/api
-ansible_collections/arista/avd/plugins/plugin_utils/cv_client/cloudvision-apis/
-
 # Development
 ## pyenv
 .python-version

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -170,15 +170,19 @@ repos:
 
       - id: docs-plugin-modules
         name: Build documentation for collection modules and action plugins.
-        entry: ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2 --markdown "ansible_collections/arista/avd/docs/plugins/Modules_and_action_plugins/"
+        entry: >-
+          ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2
+          --markdown "ansible_collections/arista/avd/docs/plugins/Modules_and_action_plugins/"
         language: python
         types: [python]
         additional_dependencies: ['ansible-doc-extractor>=0.1.10', 'ansible-core>=2.15.0,<2.18.0']
         files: ansible_collections/arista/avd/plugins/modules/
 
       - id: docs-plugin-filter
         name: Build documentation for collection filter plugins.
-        entry: ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2 --markdown "ansible_collections/arista/avd/docs/plugins/Filter_plugins/"
+        entry: >-
+          ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2
+          --markdown "ansible_collections/arista/avd/docs/plugins/Filter_plugins/"
         language: python
         types_or: [python, yaml]
         additional_dependencies: ['ansible-doc-extractor>=0.1.10', 'ansible-core>=2.15.0,<2.18.0']
@@ -187,23 +191,29 @@ repos:
 
       - id: docs-plugin-lookup
         name: Build documentation for collection lookup plugins.
-        entry: ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2 --markdown "ansible_collections/arista/avd/docs/plugins/Lookup_plugins/"
+        entry: >-
+          ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2
+          --markdown "ansible_collections/arista/avd/docs/plugins/Lookup_plugins/"
         language: python
         types: [python]
         additional_dependencies: ['ansible-doc-extractor>=0.1.10', 'ansible-core>=2.15.0,<2.18.0']
         files: ansible_collections/arista/avd/plugins/lookup/
 
       - id: docs-plugin-test
         name: Build documentation for collection test plugins.
-        entry: ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2 --markdown "ansible_collections/arista/avd/docs/plugins/Test_plugins/"
+        entry: >-
+          ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2
+          --markdown "ansible_collections/arista/avd/docs/plugins/Test_plugins/"
         language: python
         types: [python]
         additional_dependencies: ['ansible-doc-extractor>=0.1.10', 'ansible-core>=2.15.0,<2.18.0']
         files: ansible_collections/arista/avd/plugins/test/
 
       - id: docs-plugin-vars
         name: Build documentation for collection var plugins.
-        entry: ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2 --markdown "ansible_collections/arista/avd/docs/plugins/Vars_plugins/"
+        entry: >-
+          ansible-doc-extractor --template ansible_collections/arista/avd/docs/templates/plugin-docs.j2
+          --markdown "ansible_collections/arista/avd/docs/plugins/Vars_plugins/"
         language: python
         types: [python]
         additional_dependencies: ['ansible-doc-extractor>=0.1.10', 'ansible-core>=2.15.0,<2.18.0']
@@ -223,7 +233,7 @@ repos:
         language: python
         files: python-avd/pyavd/_eos_cli_config_gen/j2templates/
         pass_filenames: false
-        additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0', 'PyYAML>=6.0.0', 'pydantic>=2.3.0', 'jsonschema>=4.10.3', 'referencing>=0.35.0']
+        additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0', 'jsonschema>=4.10.3']
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.41.0

diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1,5 +1,5 @@
 # Python version
-sonar.python.version=3.9, 3.10, 3.11, 3.12
+sonar.python.version=3.10, 3.11, 3.12
 # Exclude tests from source
 sonar.exclusions=python-avd/tests/**
 # Path to tests

diff --git a/ansible_collections/arista/avd/.yamllint b/ansible_collections/arista/avd/.yamllint
@@ -1,9 +1,10 @@
 ---
-# Based on ansible-lint config
+# Based on ansible-lint config - https://ansible.readthedocs.io/projects/lint/rules/yaml/#yamllint-configuration
 extends: default
 
 rules:
   braces:
+    min-spaces-inside: 0
     max-spaces-inside: 1
     level: error
   brackets:
@@ -15,19 +16,33 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
-  comments-indentation: disable
+  comments:
+    # prettier compatibility
+    min-spaces-from-content: 1
+    level: error
+  comments-indentation: false
   document-start: disable
   empty-lines:
-    max: 3
+    max: 1
     level: error
   hyphens:
     level: error
-  indentation: disable
-  key-duplicates: enable
-  line-length: disable
-  new-line-at-end-of-file: disable
+  key-duplicates:
+    forbid-duplicated-merge-keys: true
+  line-length:
+    max: 160
+    ignore:
+      - /molecule/**/intended/structured_configs/
+      - /molecule/**/intended/structured_configs/cvp/
+      - /examples/**/intended/structured_configs/cvp/
+      - /changelogs/fragments_backup/
+      - /tests/inventory/**/expected_output
   new-lines:
     type: unix
-  trailing-spaces: disable
+  indentation:
+    level: error
+    indent-sequences: consistent
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true
   truthy: disable