merged commands generalised

vyos · Feb 2, 2025 · a23afb9 · a23afb9
1 parent 2a177f8
commit a23afb9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 31 deletions.
diff --git a/tests/integration/targets/vyos_route_maps/vars/main.yaml b/tests/integration/targets/vyos_route_maps/vars/main.yaml
@@ -1,7 +1,20 @@
 ---
 merged:
   before: []
-  commands: "{{ merged_commands }}"
+  commands:
+    - set policy route-map test1 rule 1 description test
+    - set policy route-map test1 rule 1 action permit
+    - set policy route-map test1 rule 1 continue 2
+    - set policy route-map test3 rule 1 action permit
+    - set policy route-map test3 rule 1 set local-preference 4
+    - set policy route-map test3 rule 1 set metric 5
+    - set policy route-map test3 rule 1 set metric-type type-1
+    - set policy route-map test3 rule 1 set origin egp
+    - set policy route-map test3 rule 1 set originator-id 192.0.2.34
+    - set policy route-map test3 rule 1 set tag 5
+    - set policy route-map test3 rule 1 set weight 4
+    - set policy route-map test3 rule 1 match metric 1
+    - set policy route-map test3 rule 1 match peer 192.0.2.32
   after:
     - route_map: test3
       entries:

diff --git a/tests/integration/targets/vyos_route_maps/vars/pre-v1_4.yaml b/tests/integration/targets/vyos_route_maps/vars/pre-v1_4.yaml
@@ -1,19 +1,4 @@
 ---
-merged_commands:
-  - set policy route-map test1 rule 1 description test
-  - set policy route-map test1 rule 1 action permit
-  - set policy route-map test1 rule 1 continue 2
-  - set policy route-map test3 rule 1 action permit
-  - set policy route-map test3 rule 1 set local-preference 4
-  - set policy route-map test3 rule 1 set metric 5
-  - set policy route-map test3 rule 1 set metric-type type-1
-  - set policy route-map test3 rule 1 set origin egp
-  - set policy route-map test3 rule 1 set originator-id 192.0.2.34
-  - set policy route-map test3 rule 1 set tag 5
-  - set policy route-map test3 rule 1 set weight 4
-  - set policy route-map test3 rule 1 match metric 1
-  - set policy route-map test3 rule 1 match peer 192.0.2.32
-
 replaced_commands:
   - delete policy route-map test3 rule 1 set ip-next-hop 192.0.2.33
   - set policy route-map test3 rule 1 set local-preference 6

diff --git a/tests/integration/targets/vyos_route_maps/vars/v1_4.yaml b/tests/integration/targets/vyos_route_maps/vars/v1_4.yaml
@@ -1,19 +1,4 @@
 ---
-merged_commands:
-  - set policy route-map test1 rule 1 description test
-  - set policy route-map test1 rule 1 action permit
-  - set policy route-map test1 rule 1 continue 2
-  - set policy route-map test3 rule 1 action permit
-  - set policy route-map test3 rule 1 set local-preference 4
-  - set policy route-map test3 rule 1 set metric 5
-  - set policy route-map test3 rule 1 set metric-type type-1
-  - set policy route-map test3 rule 1 set origin egp
-  - set policy route-map test3 rule 1 set originator-id 192.0.2.34
-  - set policy route-map test3 rule 1 set tag 5
-  - set policy route-map test3 rule 1 set weight 4
-  - set policy route-map test3 rule 1 match metric 1
-  - set policy route-map test3 rule 1 match peer 192.0.2.32
-
 replaced_commands:
   - delete policy route-map test3 rule 1 set ip-next-hop 192.0.2.33
   - set policy route-map test3 rule 1 set local-preference 6