Merge branch 'devel' into cli-restructure-part7

.gitattributes

@@ -1,6 +1,8 @@
 # Collapsing generated schemas from PR diff by default
 /python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml  linguist-generated=true -merge -diff
 /python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml  linguist-generated=true -merge -diff
+/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py  linguist-generated=true -merge -diff
+/python-avd/pyavd/_eos_designs/schema/__init__.py 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

.github/yamllintrc

@@ -47,6 +47,7 @@ rules:
       - /ansible_collections/arista/avd/changelogs/fragments_backup/
       - /ansible_collections/arista/avd/tests/inventory/**/expected_output/
       - /python-avd/pyavd/**/schema/
+      - /python-avd/tests/**/artifacts/
       - /.github/workflows/
   new-lines:
     type: unix

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
         exclude: ansible_collections/arista/avd/molecule
       - id: check-added-large-files
         name: Prevents giant files from being committed.
-        exclude: (ansible_collections/arista/avd/molecule|pickle$)
+        exclude: (ansible_collections/arista/avd/molecule|pickle$|python-avd/pyavd/_(eos_cli_config_gen|eos_designs)/schema/__init__.py)
       - id: check-merge-conflict
         name: Checks for files that contain merge conflict strings.
         exclude: ansible_collections/arista/avd/molecule
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.4
+    rev: v0.8.0
     hooks:
       # Run the linter.
       - id: ruff
@@ -202,7 +202,7 @@ repos:
         language: python
         files: python-avd/pyavd/[a-z_]+/schema
         pass_filenames: false
-        additional_dependencies: ['deepmerge>=1.1.0', 'PyYAML>=6.0.0', 'pydantic>=2.3.0', 'jsonschema-rs>=0.24', 'referencing>=0.35.0']
+        additional_dependencies: ['deepmerge>=1.1.0', 'PyYAML>=6.0.0', 'pydantic>=2.3.0', 'jsonschema-rs>=0.24', 'referencing>=0.35.0', 'ruff==0.7.2']
 
       - id: templates
         name: Precompile Jinja2 templates
@@ -213,7 +213,7 @@ repos:
         additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0']
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         name: Check for Linting errors on Markdown files with settings defined in `.github/.markdownlint.yaml`.

.sonarcloud.properties

@@ -1,6 +1,6 @@
 # Python version
 sonar.python.version=3.10, 3.11, 3.12, 3.13
-# Exclude tests from source
-sonar.exclusions=python-avd/tests/**
+# Exclude generated classes
+sonar.exclusions=python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py,python-avd/pyavd/_eos_designs/schema/__init__.py
 # Path to tests
-sonar.tests=python-avd/tests
+sonar.tests=python-avd/tests/

ansible_collections/arista/avd/docs/release-notes/5.x.x.md

@@ -10,7 +10,33 @@ title: Release Notes for AVD 5.x.x
 
 # Release Notes for AVD 5.x.x
 
-- Documentation for AVD version `5.x.x` [available here](https://avd.arista.com/stable/)
+- Documentation for AVD version `5.x.x` [available here](https://avd.arista.com/5.x/)
+
+## Release 5.2.0
+
+### Fix for merging of node variables if a device is defined twice
+
+With variables like below, where `myswitch1` is specified both under the `nodes` and under `node_groups[].nodes`,
+AVD would wrongfully ignore the variables under the `node_groups[]` and `node_groups[].nodes` in versions below 5.1.
+
+```yaml
+<node_type_key like l3leaf>:
+  nodes:
+    - name: myswitch1
+      id: 1
+
+  # Everything below node_groups would be ignored in older versions for devices found under `nodes`.
+  node_groups:
+    - group: mygroup1
+      filters:
+        tags:
+          - mytag
+      nodes:
+        - name: myswitch1
+          mgmt_ip: 192.168.200.10/24
+```
+
+Starting with version 5.2 AVD follows the [documented behavior](https://avd.arista.com/5.0/roles/eos_designs/docs/input-variables.html#node-type-structure).
 
 ## Release 5.1.0