diff options
39 files changed, 79 insertions, 51 deletions
diff --git a/tests/integration/targets/vyos_banner/tasks/cli.yaml b/tests/integration/targets/vyos_banner/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_banner/tasks/cli.yaml +++ b/tests/integration/targets/vyos_banner/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_banner/tasks/main.yaml b/tests/integration/targets/vyos_banner/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_banner/tasks/main.yaml +++ b/tests/integration/targets/vyos_banner/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_command/tasks/cli.yaml b/tests/integration/targets/vyos_command/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_command/tasks/cli.yaml +++ b/tests/integration/targets/vyos_command/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_command/tasks/main.yaml b/tests/integration/targets/vyos_command/tasks/main.yaml index fb74fa1..676b8ec 100644 --- a/tests/integration/targets/vyos_command/tasks/main.yaml +++ b/tests/integration/targets/vyos_command/tasks/main.yaml @@ -1,9 +1,7 @@ --- - include: cli.yaml - tags: - - cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_config/tasks/cli.yaml b/tests/integration/targets/vyos_config/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_config/tasks/cli.yaml +++ b/tests/integration/targets/vyos_config/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_config/tasks/main.yaml b/tests/integration/targets/vyos_config/tasks/main.yaml index 684482c..60fb6bf 100644 --- a/tests/integration/targets/vyos_config/tasks/main.yaml +++ b/tests/integration/targets/vyos_config/tasks/main.yaml @@ -1,13 +1,11 @@ --- - include: cli.yaml - tags: - - cli - include: cli_config.yaml tags: - - cli_config + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_facts/tasks/cli.yaml b/tests/integration/targets/vyos_facts/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_facts/tasks/cli.yaml +++ b/tests/integration/targets/vyos_facts/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_facts/tasks/main.yaml b/tests/integration/targets/vyos_facts/tasks/main.yaml index fb74fa1..676b8ec 100644 --- a/tests/integration/targets/vyos_facts/tasks/main.yaml +++ b/tests/integration/targets/vyos_facts/tasks/main.yaml @@ -1,9 +1,7 @@ --- - include: cli.yaml - tags: - - cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_firewall_global/tasks/main.yaml b/tests/integration/targets/vyos_firewall_global/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_firewall_global/tasks/main.yaml +++ b/tests/integration/targets/vyos_firewall_global/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_firewall_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_firewall_interfaces/tasks/main.yaml index a3db933..b957d2f 100644 --- a/tests/integration/targets/vyos_firewall_interfaces/tasks/main.yaml +++ b/tests/integration/targets/vyos_firewall_interfaces/tasks/main.yaml @@ -1,4 +1,4 @@ --- - include: cli.yaml tags: - - cli + - network_cli diff --git a/tests/integration/targets/vyos_firewall_rules/tasks/main.yaml b/tests/integration/targets/vyos_firewall_rules/tasks/main.yaml index a3db933..b957d2f 100644 --- a/tests/integration/targets/vyos_firewall_rules/tasks/main.yaml +++ b/tests/integration/targets/vyos_firewall_rules/tasks/main.yaml @@ -1,4 +1,4 @@ --- - include: cli.yaml tags: - - cli + - network_cli diff --git a/tests/integration/targets/vyos_interface/tasks/cli.yaml b/tests/integration/targets/vyos_interface/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_interface/tasks/cli.yaml +++ b/tests/integration/targets/vyos_interface/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_interface/tasks/main.yaml b/tests/integration/targets/vyos_interface/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_interface/tasks/main.yaml +++ b/tests/integration/targets/vyos_interface/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_interfaces/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_interfaces/tasks/main.yaml +++ b/tests/integration/targets/vyos_interfaces/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_l3_interface/tasks/cli.yaml b/tests/integration/targets/vyos_l3_interface/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_l3_interface/tasks/cli.yaml +++ b/tests/integration/targets/vyos_l3_interface/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_l3_interface/tasks/main.yaml b/tests/integration/targets/vyos_l3_interface/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_l3_interface/tasks/main.yaml +++ b/tests/integration/targets/vyos_l3_interface/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml +++ b/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml +++ b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_linkagg/tasks/cli.yaml b/tests/integration/targets/vyos_linkagg/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_linkagg/tasks/cli.yaml +++ b/tests/integration/targets/vyos_linkagg/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_linkagg/tasks/main.yaml b/tests/integration/targets/vyos_linkagg/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_linkagg/tasks/main.yaml +++ b/tests/integration/targets/vyos_linkagg/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_lldp/tasks/cli.yaml b/tests/integration/targets/vyos_lldp/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_lldp/tasks/cli.yaml +++ b/tests/integration/targets/vyos_lldp/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_lldp/tasks/main.yaml b/tests/integration/targets/vyos_lldp/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_lldp/tasks/main.yaml +++ b/tests/integration/targets/vyos_lldp/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_lldp_global/tasks/main.yaml b/tests/integration/targets/vyos_lldp_global/tasks/main.yaml index a3db933..b957d2f 100644 --- a/tests/integration/targets/vyos_lldp_global/tasks/main.yaml +++ b/tests/integration/targets/vyos_lldp_global/tasks/main.yaml @@ -1,4 +1,4 @@ --- - include: cli.yaml tags: - - cli + - network_cli diff --git a/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml +++ b/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml +++ b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml +++ b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_logging/tasks/cli.yaml b/tests/integration/targets/vyos_logging/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_logging/tasks/cli.yaml +++ b/tests/integration/targets/vyos_logging/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_logging/tasks/main.yaml b/tests/integration/targets/vyos_logging/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_logging/tasks/main.yaml +++ b/tests/integration/targets/vyos_logging/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_ospfv2/tasks/main.yaml b/tests/integration/targets/vyos_ospfv2/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_ospfv2/tasks/main.yaml +++ b/tests/integration/targets/vyos_ospfv2/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_ospfv3/tasks/main.yaml b/tests/integration/targets/vyos_ospfv3/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_ospfv3/tasks/main.yaml +++ b/tests/integration/targets/vyos_ospfv3/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_static_route/tasks/cli.yaml b/tests/integration/targets/vyos_static_route/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_static_route/tasks/cli.yaml +++ b/tests/integration/targets/vyos_static_route/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_static_route/tasks/main.yaml b/tests/integration/targets/vyos_static_route/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_static_route/tasks/main.yaml +++ b/tests/integration/targets/vyos_static_route/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_static_routes/tasks/main.yaml b/tests/integration/targets/vyos_static_routes/tasks/main.yaml index fb74fa1..6b7d046 100644 --- a/tests/integration/targets/vyos_static_routes/tasks/main.yaml +++ b/tests/integration/targets/vyos_static_routes/tasks/main.yaml @@ -1,9 +1,9 @@ --- - include: cli.yaml tags: - - cli + - network_cli - include: redirection.yaml when: ansible_version.full is version('2.10.0', '>=') tags: - - redirection + - network_cli diff --git a/tests/integration/targets/vyos_system/tasks/cli.yaml b/tests/integration/targets/vyos_system/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_system/tasks/cli.yaml +++ b/tests/integration/targets/vyos_system/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_system/tasks/main.yaml b/tests/integration/targets/vyos_system/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_system/tasks/main.yaml +++ b/tests/integration/targets/vyos_system/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_user/tasks/cli.yaml b/tests/integration/targets/vyos_user/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_user/tasks/cli.yaml +++ b/tests/integration/targets/vyos_user/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_user/tasks/main.yaml b/tests/integration/targets/vyos_user/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_user/tasks/main.yaml +++ b/tests/integration/targets/vyos_user/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli diff --git a/tests/integration/targets/vyos_vlan/tasks/cli.yaml b/tests/integration/targets/vyos_vlan/tasks/cli.yaml index 90f265f..b23cb60 100644 --- a/tests/integration/targets/vyos_vlan/tasks/cli.yaml +++ b/tests/integration/targets/vyos_vlan/tasks/cli.yaml @@ -14,9 +14,13 @@ with_items: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - network_cli - name: run test case (connection=local) include: '{{ test_case_to_run }} ansible_connection=local' with_first_found: '{{ test_items }}' loop_control: loop_var: test_case_to_run + tags: + - local diff --git a/tests/integration/targets/vyos_vlan/tasks/main.yaml b/tests/integration/targets/vyos_vlan/tasks/main.yaml index a3db933..07b0f2e 100644 --- a/tests/integration/targets/vyos_vlan/tasks/main.yaml +++ b/tests/integration/targets/vyos_vlan/tasks/main.yaml @@ -1,4 +1,2 @@ --- - include: cli.yaml - tags: - - cli |