Fix integration test connection var (#325)

* Fix integration test connection var

* Fix straggler

21 files changed, 64 insertions, 21 deletions

diff --git a/tests/integration/targets/vyos_banner/tasks/cli.yaml b/tests/integration/targets/vyos_banner/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_banner/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_banner/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_command/tasks/cli.yaml b/tests/integration/targets/vyos_command/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_command/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_command/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_command/tasks/redirection.yaml b/tests/integration/targets/vyos_command/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_command/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_command/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_config/tasks/cli.yaml b/tests/integration/targets/vyos_config/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_config/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_config/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_config/tasks/cli_config.yaml b/tests/integration/targets/vyos_config/tasks/cli_config.yaml
index 358879b..0bee625 100644
--- a/tests/integration/targets/vyos_config/tasks/cli_config.yaml
+++ b/tests/integration/targets/vyos_config/tasks/cli_config.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_config/tasks/redirection.yaml b/tests/integration/targets/vyos_config/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_config/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_config/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_facts/tasks/cli.yaml b/tests/integration/targets/vyos_facts/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_facts/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_facts/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_facts/tasks/redirection.yaml b/tests/integration/targets/vyos_facts/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_facts/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_facts/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_firewall_global/tasks/redirection.yaml b/tests/integration/targets/vyos_firewall_global/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_firewall_global/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_interfaces/tasks/redirection.yaml b/tests/integration/targets/vyos_interfaces/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_interfaces/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_interfaces/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_l3_interfaces/tasks/redirection.yaml b/tests/integration/targets/vyos_l3_interfaces/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_lag_interfaces/tasks/redirection.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/redirection.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_logging/tasks/cli.yaml b/tests/integration/targets/vyos_logging/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_logging/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_logging/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_ospfv2/tasks/redirection.yaml b/tests/integration/targets/vyos_ospfv2/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_ospfv2/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_ospfv3/tasks/redirection.yaml b/tests/integration/targets/vyos_ospfv3/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_ospfv3/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_smoke/tasks/cli.yaml b/tests/integration/targets/vyos_smoke/tasks/cli.yaml
index 93f7455..5237219 100644
--- a/tests/integration/targets/vyos_smoke/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_smoke/tasks/cli.yaml
@@ -11,7 +11,10 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case with single_user_mode (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli ansible_network_single_user_mode=True"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
+    ansible_network_single_user_mode: true
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_static_routes/tasks/redirection.yaml b/tests/integration/targets/vyos_static_routes/tasks/redirection.yaml
index a368b76..7f3fc71 100644
--- a/tests/integration/targets/vyos_static_routes/tasks/redirection.yaml
+++ b/tests/integration/targets/vyos_static_routes/tasks/redirection.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ shortname_test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_system/tasks/cli.yaml b/tests/integration/targets/vyos_system/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_system/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_system/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_user/tasks/cli.yaml b/tests/integration/targets/vyos_user/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_user/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_user/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_vlan/tasks/cli.yaml b/tests/integration/targets/vyos_vlan/tasks/cli.yaml
index d06a647..35c2376 100644
--- a/tests/integration/targets/vyos_vlan/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_vlan/tasks/cli.yaml
@@ -11,7 +11,9 @@
     test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.network_cli)
-  ansible.builtin.include_tasks: "{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli"
+  ansible.builtin.include_tasks: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: ansible.netcommon.network_cli
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run