diff options
| author | Nathaniel Case <this.is@nathanielca.se> | 2018-01-05 18:39:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 18:39:04 +0100 |
| commit | c371ed8d30423916d6349ad906cc8f53ed88081f (patch) | |
| tree | 0a70d6da0b08245f51f875bd274d656e1348531b /test/integration/targets/nxos_vtp_version | |
| parent | Update httptester.yml to match Dockerfile (#34508) (diff) | |
| download | ansible-c371ed8d30423916d6349ad906cc8f53ed88081f.tar.xz ansible-c371ed8d30423916d6349ad906cc8f53ed88081f.zip | |
nxos tests to use network_cli (#34474)
* Fix over-byte
* Fix nxos_l2_interface docs
* Update connections for tasks
* Add default ssh port
* Only report provider when using connection=local
* Send empty provider when connection=network_cli
* Fix find tasks
Diffstat (limited to 'test/integration/targets/nxos_vtp_version')
3 files changed, 18 insertions, 6 deletions
diff --git a/test/integration/targets/nxos_vtp_version/tasks/cli.yaml b/test/integration/targets/nxos_vtp_version/tasks/cli.yaml index 0ab3f8f908..edbff7dfaf 100644 --- a/test/integration/targets/nxos_vtp_version/tasks/cli.yaml +++ b/test/integration/targets/nxos_vtp_version/tasks/cli.yaml @@ -3,12 +3,14 @@ find: paths: "{{ role_path }}/tests/common" patterns: "{{ testcase }}.yaml" + connection: local register: test_cases - name: collect cli test cases find: paths: "{{ role_path }}/tests/cli" patterns: "{{ testcase }}.yaml" + connection: local register: cli_cases - set_fact: @@ -18,8 +20,14 @@ - name: set test_items set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" -- name: run test case - include: "{{ test_case_to_run }} connection={{ cli }}" +- name: run test cases (connection=network_cli) + include: "{{ test_case_to_run }} ansible_connection=network_cli connection={}" with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run + +- name: run test case (connection=local) + include: "{{ test_case_to_run }} ansible_connection=local connection={{ cli }}" + with_first_found: "{{ test_items }}" + loop_control: + loop_var: test_case_to_run diff --git a/test/integration/targets/nxos_vtp_version/tasks/nxapi.yaml b/test/integration/targets/nxos_vtp_version/tasks/nxapi.yaml index 378db2f016..68e96a2942 100644 --- a/test/integration/targets/nxos_vtp_version/tasks/nxapi.yaml +++ b/test/integration/targets/nxos_vtp_version/tasks/nxapi.yaml @@ -3,12 +3,14 @@ find: paths: "{{ role_path }}/tests/common" patterns: "{{ testcase }}.yaml" + connection: local register: test_cases - name: collect nxapi test cases find: paths: "{{ role_path }}/tests/nxapi" patterns: "{{ testcase }}.yaml" + connection: local register: nxapi_cases - set_fact: @@ -18,8 +20,8 @@ - name: set test_items set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" -- name: run test case - include: "{{ test_case_to_run }} connection={{ nxapi }}" +- name: run test cases (connection=local) + include: "{{ test_case_to_run }} ansible_connection=local connection={{ nxapi }}" with_items: "{{ test_items }}" loop_control: loop_var: test_case_to_run diff --git a/test/integration/targets/nxos_vtp_version/tests/common/sanity.yaml b/test/integration/targets/nxos_vtp_version/tests/common/sanity.yaml index 7b5b0c0c52..79801ab1b6 100644 --- a/test/integration/targets/nxos_vtp_version/tests/common/sanity.yaml +++ b/test/integration/targets/nxos_vtp_version/tests/common/sanity.yaml @@ -1,5 +1,7 @@ --- -- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_vtp_version sanity test" +- debug: msg="START connection={{ ansible_connection }} nxos_vtp_version sanity test" +- debug: msg="Using provider={{ connection.transport }}" + when: ansible_connection == "local" - block: - name: enable feature vtp @@ -33,4 +35,4 @@ state: disabled provider: "{{ connection }}" -- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_vtp_version sanity test" +- debug: msg="END connection={{ ansible_connection }} nxos_vtp_version sanity test" |