Addressed review comments: updated unit tests, updated strict check f…

…ailure msg
aristanetworks · Jan 22, 2025 · eaf1a2d · eaf1a2d
1 parent c873c25
commit eaf1a2d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/anta/input_models/routing/generic.py b/anta/input_models/routing/generic.py
@@ -25,7 +25,7 @@ class IPv4Routes(BaseModel):
     nexthops: list[IPv4Address] | None = None
     """A list of the next-hop IP addresses for the route. Required field in the `VerifyIPv4RouteNextHops` test."""
     strict: bool = False
-    """If True, requires exact matching of provided nexthop(s). Defaults to False.
+    """If True, requires exact matching of provided nexthop(s).
 
     Can be enabled in `VerifyIPv4RouteNextHops` test."""
 

diff --git a/anta/tests/routing/generic.py b/anta/tests/routing/generic.py
@@ -296,6 +296,7 @@ class VerifyIPv4RouteNextHops(AntaTest):
             route_entries:
                 - prefix: 10.10.0.1/32
                   vrf: default
+                  strict: False
                   nexthops:
                     - 10.100.0.8
                     - 10.100.0.10
@@ -340,7 +341,7 @@ def test(self) -> None:
 
             if entry.strict and expected_nexthops != actual_nexthops:
                 exp_nexthops = ", ".join([str(nexthop) for nexthop in entry.nexthops])
-                self.result.is_failure(f"{entry} - Exact nexthop not listed - Expected: {exp_nexthops} Actual: {', '.join(actual_nexthops)}")
+                self.result.is_failure(f"{entry} - List of next-hops not matching - Expected: {exp_nexthops} - Actual: {', '.join(actual_nexthops)}")
                 continue
 
             for nexthop in entry.nexthops:

diff --git a/examples/tests.yaml b/examples/tests.yaml
@@ -564,6 +564,7 @@ anta.tests.routing.generic:
       route_entries:
           - prefix: 10.10.0.1/32
             vrf: default
+            strict: False
             nexthops:
               - 10.100.0.8
               - 10.100.0.10

diff --git a/tests/units/anta_tests/routing/test_generic.py b/tests/units/anta_tests/routing/test_generic.py
@@ -447,7 +447,7 @@
                     "MGMT": {
                         "routes": {
                             "10.100.0.128/31": {
-                                "vias": [{"nexthopAddr": "10.100.0.8", "interface": "Ethernet1"}, {"nexthopAddr": "10.100.0.10", "interface": "Ethernet2"}],
+                                "vias": [{"nexthopAddr": "10.100.0.8", "interface": "Ethernet1"}, {"nexthopAddr": "10.100.0.11", "interface": "Ethernet2"}],
                             }
                         }
                     },
@@ -457,14 +457,15 @@
         "inputs": {
             "route_entries": [
                 {"prefix": "10.10.0.1/32", "vrf": "default", "strict": True, "nexthops": ["10.100.0.8", "10.100.0.10", "10.100.0.11"]},
-                {"prefix": "10.100.0.128/31", "vrf": "MGMT", "strict": True, "nexthops": ["10.100.0.8", "10.100.0.10", "10.100.0.11"]},
+                {"prefix": "10.100.0.128/31", "vrf": "MGMT", "strict": True, "nexthops": ["10.100.0.8", "10.100.0.10"]},
             ]
         },
         "expected": {
             "result": "failure",
             "messages": [
-                "Prefix: 10.10.0.1/32 VRF: default - Exact nexthop not listed - Expected: 10.100.0.8, 10.100.0.10, 10.100.0.11 Actual: 10.100.0.10, 10.100.0.8",
-                "Prefix: 10.100.0.128/31 VRF: MGMT - Exact nexthop not listed - Expected: 10.100.0.8, 10.100.0.10, 10.100.0.11 Actual: 10.100.0.10, 10.100.0.8",
+                "Prefix: 10.10.0.1/32 VRF: default - List of next-hops not matching - Expected: 10.100.0.8, 10.100.0.10, 10.100.0.11 - "
+                "Actual: 10.100.0.10, 10.100.0.8",
+                "Prefix: 10.100.0.128/31 VRF: MGMT - List of next-hops not matching - Expected: 10.100.0.8, 10.100.0.10 - Actual: 10.100.0.11, 10.100.0.8",
             ],
         },
     },

diff --git a/tests/units/input_models/routing/test_generic.py b/tests/units/input_models/routing/test_generic.py
@@ -22,7 +22,7 @@ class TestVerifyRouteEntryInput:
     @pytest.mark.parametrize(
         ("route_entries"),
         [
-            pytest.param([{"prefix": "10.10.0.1/32", "vrf": "default", "nexthops": ["10.100.0.8", "10.100.0.10"]}], id="valid"),
+            pytest.param([{"prefix": "10.10.0.1/32", "vrf": "default", "strict": True, "nexthops": ["10.100.0.8", "10.100.0.10"]}], id="valid"),
         ],
     )
     def test_valid(self, route_entries: list[IPv4Routes]) -> None: