feat: Optimize VerifyRoutingTableEntry by quering all routes for a vrf.

aristanetworks · May 16, 2024 · 93be1ef · 93be1ef
1 parent 28ba8e1
commit 93be1ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 43 deletions.
diff --git a/anta/tests/routing/generic.py b/anta/tests/routing/generic.py
@@ -131,7 +131,7 @@ class VerifyRoutingTableEntry(AntaTest):
     name = "VerifyRoutingTableEntry"
     description = "Verifies that the provided routes are present in the routing table of a specified VRF."
     categories: ClassVar[list[str]] = ["routing"]
-    commands: ClassVar[list[AntaCommand | AntaTemplate]] = [AntaTemplate(template="show ip route vrf {vrf} {route}", revision=4)]
+    commands: ClassVar[list[AntaCommand | AntaTemplate]] = [AntaTemplate(template="show ip route vrf {vrf}", revision=4)]
 
     class Input(AntaTest.Input):
         """Input model for the VerifyRoutingTableEntry test."""
@@ -143,17 +143,14 @@ class Input(AntaTest.Input):
 
     def render(self, template: AntaTemplate) -> list[AntaCommand]:
         """Render the template for each route in the input list."""
-        return [template.render(vrf=self.inputs.vrf, route=route) for route in self.inputs.routes]
+        return [template.render(vrf=self.inputs.vrf)]
 
     @AntaTest.anta_test
     def test(self) -> None:
         """Main test function for VerifyRoutingTableEntry."""
-        missing_routes = []
-
-        for command in self.instance_commands:
-            vrf, route = command.params.vrf, command.params.route
-            if len(routes := command.json_output["vrfs"][vrf]["routes"]) == 0 or route != ip_interface(next(iter(routes))).ip:
-                missing_routes.append(str(route))
+        command_output_vrf = self.instance_commands[0].json_output["vrfs"][self.inputs.vrf]
+        command_output_route_ips = [ip_interface(route).ip for route in command_output_vrf["routes"]]
+        missing_routes = [str(route) for route in self.inputs.routes if route not in command_output_route_ips]
 
         if not missing_routes:
             self.result.is_success()

diff --git a/tests/units/anta_tests/routing/test_generic.py b/tests/units/anta_tests/routing/test_generic.py
@@ -99,18 +99,6 @@
                                 "metric": 0,
                                 "vias": [{"nexthopAddr": "10.1.255.4", "interface": "Ethernet1"}],
                             },
-                        },
-                    },
-                },
-            },
-            {
-                "vrfs": {
-                    "default": {
-                        "routingDisabled": False,
-                        "allRoutesProgrammedHardware": True,
-                        "allRoutesProgrammedKernel": True,
-                        "defaultRouteState": "notSet",
-                        "routes": {
                             "10.1.0.2/32": {
                                 "hardwareProgrammed": True,
                                 "routeType": "eBGP",
@@ -134,17 +122,6 @@
         "name": "failure-missing-route",
         "test": VerifyRoutingTableEntry,
         "eos_data": [
-            {
-                "vrfs": {
-                    "default": {
-                        "routingDisabled": False,
-                        "allRoutesProgrammedHardware": True,
-                        "allRoutesProgrammedKernel": True,
-                        "defaultRouteState": "notSet",
-                        "routes": {},
-                    },
-                },
-            },
             {
                 "vrfs": {
                     "default": {
@@ -195,18 +172,6 @@
                                 "metric": 0,
                                 "vias": [{"nexthopAddr": "10.1.255.4", "interface": "Ethernet1"}],
                             },
-                        },
-                    },
-                },
-            },
-            {
-                "vrfs": {
-                    "default": {
-                        "routingDisabled": False,
-                        "allRoutesProgrammedHardware": True,
-                        "allRoutesProgrammedKernel": True,
-                        "defaultRouteState": "notSet",
-                        "routes": {
                             "10.1.0.55/32": {
                                 "hardwareProgrammed": True,
                                 "routeType": "eBGP",