From f76dded9c62f6ae8424df99206f8b286c5037d59 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 17 Dec 2019 14:10:52 -0500 Subject: [PATCH] Split ios tests into network_cli and local connections (#65921) This allows to group tests by connections, which allow us to disable local connection testing in collections for the moment. Signed-off-by: Paul Belanger --- test/integration/targets/ios_banner/tasks/cli.yaml | 2 ++ test/integration/targets/ios_bgp/tasks/cli.yaml | 1 + test/integration/targets/ios_command/tasks/cli.yaml | 2 ++ test/integration/targets/ios_config/tasks/cli.yaml | 1 + test/integration/targets/ios_config/tasks/cli_config.yaml | 1 + test/integration/targets/ios_facts/tasks/cli.yaml | 2 ++ test/integration/targets/ios_file/tasks/cli.yaml | 1 + test/integration/targets/ios_interface/tasks/cli.yaml | 2 ++ test/integration/targets/ios_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_l2_interface/tasks/cli.yaml | 2 ++ test/integration/targets/ios_l2_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_l3_interface/tasks/cli.yaml | 2 ++ test/integration/targets/ios_l3_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_lacp/tasks/cli.yaml | 1 + test/integration/targets/ios_lacp_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_lag_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_linkagg/tasks/cli.yaml | 2 ++ test/integration/targets/ios_lldp/tasks/cli.yaml | 2 ++ test/integration/targets/ios_lldp_global/tasks/cli.yaml | 1 + test/integration/targets/ios_lldp_interfaces/tasks/cli.yaml | 1 + test/integration/targets/ios_logging/tasks/cli.yaml | 2 ++ test/integration/targets/ios_ntp/tasks/cli.yaml | 2 ++ test/integration/targets/ios_ping/tasks/cli.yaml | 2 ++ test/integration/targets/ios_smoke/tasks/cli.yaml | 2 ++ test/integration/targets/ios_static_route/tasks/cli.yaml | 2 ++ test/integration/targets/ios_system/tasks/cli.yaml | 2 ++ test/integration/targets/ios_user/tasks/cli.yaml | 2 ++ test/integration/targets/ios_vlan/tasks/cli.yaml | 2 ++ test/integration/targets/ios_vlans/tasks/cli.yaml | 1 + 29 files changed, 45 insertions(+) diff --git a/test/integration/targets/ios_banner/tasks/cli.yaml b/test/integration/targets/ios_banner/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_banner/tasks/cli.yaml +++ b/test/integration/targets/ios_banner/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_bgp/tasks/cli.yaml b/test/integration/targets/ios_bgp/tasks/cli.yaml index ea5c8c3742f..575f5d0a8e0 100644 --- a/test/integration/targets/ios_bgp/tasks/cli.yaml +++ b/test/integration/targets/ios_bgp/tasks/cli.yaml @@ -14,3 +14,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_command/tasks/cli.yaml b/test/integration/targets/ios_command/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_command/tasks/cli.yaml +++ b/test/integration/targets/ios_command/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_config/tasks/cli.yaml b/test/integration/targets/ios_config/tasks/cli.yaml index 87a42971bbc..82d196e4edc 100644 --- a/test/integration/targets/ios_config/tasks/cli.yaml +++ b/test/integration/targets/ios_config/tasks/cli.yaml @@ -14,3 +14,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_config/tasks/cli_config.yaml b/test/integration/targets/ios_config/tasks/cli_config.yaml index cb96d05e5f7..a3c82d63844 100644 --- a/test/integration/targets/ios_config/tasks/cli_config.yaml +++ b/test/integration/targets/ios_config/tasks/cli_config.yaml @@ -14,3 +14,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_facts/tasks/cli.yaml b/test/integration/targets/ios_facts/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_facts/tasks/cli.yaml +++ b/test/integration/targets/ios_facts/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_file/tasks/cli.yaml b/test/integration/targets/ios_file/tasks/cli.yaml index ea5c8c3742f..575f5d0a8e0 100644 --- a/test/integration/targets/ios_file/tasks/cli.yaml +++ b/test/integration/targets/ios_file/tasks/cli.yaml @@ -14,3 +14,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_interface/tasks/cli.yaml b/test/integration/targets/ios_interface/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_interface/tasks/cli.yaml +++ b/test/integration/targets/ios_interface/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_interfaces/tasks/cli.yaml b/test/integration/targets/ios_interfaces/tasks/cli.yaml index 337e34133b0..242420aa7f5 100644 --- a/test/integration/targets/ios_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_interfaces/tasks/cli.yaml @@ -18,3 +18,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_l2_interface/tasks/cli.yaml b/test/integration/targets/ios_l2_interface/tasks/cli.yaml index 6d2dbcbd6f9..a71aef3f53b 100644 --- a/test/integration/targets/ios_l2_interface/tasks/cli.yaml +++ b/test/integration/targets/ios_l2_interface/tasks/cli.yaml @@ -14,6 +14,7 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli - name: run test case (connection=local) include: "{{ test_case_to_run }} ansible_connection=local" @@ -22,3 +23,4 @@ skip: true loop_control: loop_var: test_case_to_run + tags: connection_local diff --git a/test/integration/targets/ios_l2_interfaces/tasks/cli.yaml b/test/integration/targets/ios_l2_interfaces/tasks/cli.yaml index 55d04130400..3bafcd702f4 100644 --- a/test/integration/targets/ios_l2_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_l2_interfaces/tasks/cli.yaml @@ -22,3 +22,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_l3_interface/tasks/cli.yaml b/test/integration/targets/ios_l3_interface/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_l3_interface/tasks/cli.yaml +++ b/test/integration/targets/ios_l3_interface/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_l3_interfaces/tasks/cli.yaml b/test/integration/targets/ios_l3_interfaces/tasks/cli.yaml index 337e34133b0..242420aa7f5 100644 --- a/test/integration/targets/ios_l3_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_l3_interfaces/tasks/cli.yaml @@ -18,3 +18,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_lacp/tasks/cli.yaml b/test/integration/targets/ios_lacp/tasks/cli.yaml index 55d04130400..3bafcd702f4 100644 --- a/test/integration/targets/ios_lacp/tasks/cli.yaml +++ b/test/integration/targets/ios_lacp/tasks/cli.yaml @@ -22,3 +22,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_lacp_interfaces/tasks/cli.yaml b/test/integration/targets/ios_lacp_interfaces/tasks/cli.yaml index 55d04130400..3bafcd702f4 100644 --- a/test/integration/targets/ios_lacp_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_lacp_interfaces/tasks/cli.yaml @@ -22,3 +22,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_lag_interfaces/tasks/cli.yaml b/test/integration/targets/ios_lag_interfaces/tasks/cli.yaml index 55d04130400..3bafcd702f4 100644 --- a/test/integration/targets/ios_lag_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_lag_interfaces/tasks/cli.yaml @@ -22,3 +22,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_linkagg/tasks/cli.yaml b/test/integration/targets/ios_linkagg/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_linkagg/tasks/cli.yaml +++ b/test/integration/targets/ios_linkagg/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_lldp/tasks/cli.yaml b/test/integration/targets/ios_lldp/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_lldp/tasks/cli.yaml +++ b/test/integration/targets/ios_lldp/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_lldp_global/tasks/cli.yaml b/test/integration/targets/ios_lldp_global/tasks/cli.yaml index 337e34133b0..242420aa7f5 100644 --- a/test/integration/targets/ios_lldp_global/tasks/cli.yaml +++ b/test/integration/targets/ios_lldp_global/tasks/cli.yaml @@ -18,3 +18,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_lldp_interfaces/tasks/cli.yaml b/test/integration/targets/ios_lldp_interfaces/tasks/cli.yaml index 337e34133b0..242420aa7f5 100644 --- a/test/integration/targets/ios_lldp_interfaces/tasks/cli.yaml +++ b/test/integration/targets/ios_lldp_interfaces/tasks/cli.yaml @@ -18,3 +18,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli diff --git a/test/integration/targets/ios_logging/tasks/cli.yaml b/test/integration/targets/ios_logging/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_logging/tasks/cli.yaml +++ b/test/integration/targets/ios_logging/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_ntp/tasks/cli.yaml b/test/integration/targets/ios_ntp/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_ntp/tasks/cli.yaml +++ b/test/integration/targets/ios_ntp/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_ping/tasks/cli.yaml b/test/integration/targets/ios_ping/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_ping/tasks/cli.yaml +++ b/test/integration/targets/ios_ping/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_smoke/tasks/cli.yaml b/test/integration/targets/ios_smoke/tasks/cli.yaml index 826f6a844fe..d696cc518d9 100644 --- a/test/integration/targets/ios_smoke/tasks/cli.yaml +++ b/test/integration/targets/ios_smoke/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli - name: run test case (connection=local) include: "{{ test_case_to_run }} ansible_connection=local" with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_local diff --git a/test/integration/targets/ios_static_route/tasks/cli.yaml b/test/integration/targets/ios_static_route/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_static_route/tasks/cli.yaml +++ b/test/integration/targets/ios_static_route/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_system/tasks/cli.yaml b/test/integration/targets/ios_system/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_system/tasks/cli.yaml +++ b/test/integration/targets/ios_system/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_user/tasks/cli.yaml b/test/integration/targets/ios_user/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_user/tasks/cli.yaml +++ b/test/integration/targets/ios_user/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_vlan/tasks/cli.yaml b/test/integration/targets/ios_vlan/tasks/cli.yaml index 303af407622..6b93fd5400e 100644 --- a/test/integration/targets/ios_vlan/tasks/cli.yaml +++ b/test/integration/targets/ios_vlan/tasks/cli.yaml @@ -14,9 +14,11 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_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: connection_local diff --git a/test/integration/targets/ios_vlans/tasks/cli.yaml b/test/integration/targets/ios_vlans/tasks/cli.yaml index 55d04130400..3bafcd702f4 100644 --- a/test/integration/targets/ios_vlans/tasks/cli.yaml +++ b/test/integration/targets/ios_vlans/tasks/cli.yaml @@ -22,3 +22,4 @@ with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + tags: connection_network_cli