Merge branch 'devel' into feat/eos_designs/router-general-router-id

ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml

@@ -372,6 +372,7 @@ ethernet_interfaces:
   channel_group:
     id: 3
     mode: active
+  validate_lldp: false
 - name: Ethernet1
   peer: dc2-spine1
   peer_interface: Ethernet5

ansible_collections/arista/avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml

@@ -52,13 +52,6 @@ anta.tests.configuration:
 - VerifyZeroTouch: null
 - VerifyRunningConfigDiffs: null
 anta.tests.connectivity:
-- VerifyLLDPNeighbors:
-    neighbors:
-    - neighbor_device: dc2-leaf3b.arista.com
-      neighbor_port: Ethernet4
-      port: Ethernet4
-    result_overwrite:
-      custom_field: 'Local: Ethernet4 - Remote: dc2-leaf3b.arista.com Ethernet4'
 - VerifyLLDPNeighbors:
     neighbors:
     - neighbor_device: dc2-spine1

ansible_collections/arista/avd/molecule/eos_validate_state/inventory/host_vars/dc2-leaf3a.arista.com.yml

@@ -49,6 +49,10 @@ custom_structured_configuration_ethernet_interfaces:
   - name: Ethernet3
     validate_state: false
 
+    # Test to skip the VerifyLLDPNeighbors testcase via `validate_lldp` key
+  - name: Ethernet4
+    validate_lldp: false
+
 custom_structured_configuration_port_channel_interfaces:
   - name: Port-Channel11
     description: dc2-leaf3-fw1_PortChannel

ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json

@@ -143,15 +143,6 @@
     "description": "Verifies that the provided LLDP neighbors are connected properly.",
     "custom_field": "Local: Ethernet2 - Remote: dc2-spine2 Ethernet5"
   },
-  {
-    "name": "dc2-leaf3a.arista.com",
-    "test": "VerifyLLDPNeighbors",
-    "categories": [
-      "connectivity"
-    ],
-    "description": "Verifies that the provided LLDP neighbors are connected properly.",
-    "custom_field": "Local: Ethernet4 - Remote: dc2-leaf3b.arista.com Ethernet4"
-  },
   {
     "name": "dc2-leaf3a.arista.com",
     "test": "VerifyReachability",

ansible_collections/arista/avd/roles/eos_validate_state/python_modules/tests/avdtestconnectivity.py

@@ -230,6 +230,10 @@ def test_definition(self) -> dict | None:
                 LOGGER.info("Interface '%s' variable 'validate_state' is set to False. %s is skipped.", interface["name"], self.__class__.__name__)
                 continue
 
+            if interface.get("validate_lldp", True) is False:
+                LOGGER.info("Interface '%s' variable 'validate_lldp' is set to False. %s is skipped.", interface["name"], self.__class__.__name__)
+                continue
+
             if self.is_subinterface(interface):
                 LOGGER.info("Interface '%s' is a subinterface. %s is skipped.", interface["name"], self.__class__.__name__)
                 continue

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml

@@ -1600,6 +1600,9 @@ keys:
         validate_state:
           type: bool
           description: Set to false to disable interface state and LLDP topology validation performed by the `eos_validate_state` role.
+        validate_lldp:
+          type: bool
+          description: Set to false to disable the LLDP topology validation performed by the `eos_validate_state` role.
         switchport:
           type: dict
           description: This should not be combined with `ethernet_interfaces[].type = switched/routed`.

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml

@@ -1357,6 +1357,9 @@ keys:
         validate_state:
           type: bool
           description: Set to false to disable interface state and LLDP topology validation performed by the `eos_validate_state` role.
+        validate_lldp:
+          type: bool
+          description: Set to false to disable the LLDP topology validation performed by the `eos_validate_state` role.
         eos_cli:
           type: str
           description: Multiline EOS CLI rendered directly on the port-channel interface in the final EOS configuration.

python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml

@@ -498,6 +498,9 @@ $defs:
       validate_state:
         type: bool
         description: Set to false to disable interface state and LLDP topology validation performed by the `eos_validate_state` role.
+      validate_lldp:
+        type: bool
+        description: Set to false to disable the LLDP topology validation performed by the `eos_validate_state` role.
       raw_eos_cli:
         type: str
         description: EOS CLI rendered directly on the ethernet interface in the final EOS configuration.