Merge branch 'main' into t7013-route_maps_integration_tests

vyos · Feb 2, 2025 · 7e21f1d · 7e21f1d
2 parents 48d4c5b + 563ee24
commit 7e21f1d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/changelogs/fragments/T7015_static_routes_integration_tests.yaml b/changelogs/fragments/T7015_static_routes_integration_tests.yaml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - static_routes - Fixed for v1.3- and 1.4+
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml
@@ -2,15 +2,15 @@
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - name: Setup
+  vyos.vyos.vyos_config:
+    lines:
+      - set protocols static route 192.0.2.32/28 next-hop '192.0.2.10'
+      - set protocols static route 192.0.2.32/28 next-hop '192.0.2.9'
+      - set protocols static route 192.0.2.32/28 blackhole
+      - set protocols static route 192.0.2.32/28
+      - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::1'
+      - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::2'
+      - set protocols static route6 2001:db8:1000::/36 blackhole distance '2'
+      - set protocols static route6 2001:db8:1000::/36
   vars:
-    lines: >-
-      "set protocols static route 192.0.2.32/28 next-hop '192.0.2.10'\n
-      set protocols static route 192.0.2.32/28 next-hop '192.0.2.9'\n
-      set protocols static route 192.0.2.32/28 blackhole\n
-      set protocols static route 192.0.2.32/28\n
-      set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::1'\n
-      set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::2'\n
-      set protocols static route6 2001:db8:1000::/36 blackhole distance '2'\n
-      set protocols static route6 2001:db8:1000::/36"
-  ansible.netcommon.cli_config:
-    config: "{{ lines }}"
+    ansible_connection: ansible.netcommon.network_cli