Merge branch 'main' into feat/issue-1173-bgp

Author: geetanjalimanegslab

.arista/secret_allowlist.yaml

@@ -47,7 +47,7 @@ repos:
           - "<!--|  ~|  -->"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.5
+    rev: v0.11.6
     hooks:
       - id: ruff
         name: Run Ruff linter

.github/workflows/secret-scanner.yml

@@ -627,8 +627,10 @@ def test(self) -> None:
                 self.result.is_failure(f"{peer} - Not found")
                 continue
 
-            # Fetching the multiprotocol capabilities
-            act_mp_caps = get_value(peer_data, "neighborCapabilities.multiprotocolCaps")
+            # Check if the multiprotocol capabilities are found
+            if (act_mp_caps := get_value(peer_data, "neighborCapabilities.multiprotocolCaps")) is None:
+                self.result.is_failure(f"{peer} - Multiprotocol capabilities not found")
+                continue
 
             # If strict is True, check if only the specified capabilities are configured
             if peer.strict and sorted(peer.capabilities) != sorted(act_mp_caps):

.pre-commit-config.yaml

@@ -17,7 +17,6 @@ maintainers = [
   { name = "Carl Baillargeon", email = "carl.baillargeon@arista.com" },
 ]
 description = "Arista Network Test Automation (ANTA) Framework"
-license = { file = "LICENSE" }
 dependencies = [
   "asyncssh>=2.16",
   "cvprac>=1.3.1",
@@ -32,8 +31,9 @@ dependencies = [
   "typing_extensions>=4.12"  # required for deprecated before Python 3.13
 ]
 keywords = ["test", "anta", "Arista", "network", "automation", "networking", "devops", "netdevops"]
+license = "Apache-2.0"
+license-files = ["LICENSE"]
 classifiers = [
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",

anta/tests/routing/bgp.py

@@ -1945,6 +1945,39 @@ def test_check_bgp_neighbor_capability(input_dict: dict[str, bool], expected: bo
             ],
         },
     },
+    {
+        "name": "failure-capabilities-not-found",
+        "test": VerifyBGPPeerMPCaps,
+        "eos_data": [
+            {
+                "vrfs": {
+                    "default": {
+                        "peerList": [
+                            {
+                                "peerAddress": "172.30.11.1",
+                                "neighborCapabilities": {},
+                            }
+                        ]
+                    },
+                }
+            }
+        ],
+        "inputs": {
+            "bgp_peers": [
+                {
+                    "peer_address": "172.30.11.1",
+                    "vrf": "default",
+                    "capabilities": ["ipv4Unicast", "l2-vpn-EVPN"],
+                },
+            ]
+        },
+        "expected": {
+            "result": "failure",
+            "messages": [
+                "Peer: 172.30.11.1 VRF: default - Multiprotocol capabilities not found",
+            ],
+        },
+    },
     {
         "name": "failure-missing-capabilities",
         "test": VerifyBGPPeerMPCaps,