From a330106b2e2c811db49477d71b8a472c964d2aeb Mon Sep 17 00:00:00 2001 From: "Bradley A. Thornton" Date: Thu, 8 Aug 2019 12:29:41 -0700 Subject: fixed --- .../targets/vyos_lldp_interface/aliases | 0 .../targets/vyos_lldp_interface/defaults/main.yaml | 3 + .../targets/vyos_lldp_interface/tasks/cli.yaml | 22 +++ .../targets/vyos_lldp_interface/tasks/main.yaml | 2 + .../vyos_lldp_interface/tests/cli/basic.yaml | 167 +++++++++++++++++++++ .../tests/cli/net_lldp_interface.yaml | 26 ++++ .../vyos_lldp_interface/aliases | 0 .../vyos_lldp_interface/defaults/main.yaml | 3 - .../vyos_lldp_interface/tasks/cli.yaml | 22 --- .../vyos_lldp_interface/tasks/main.yaml | 2 - .../vyos_lldp_interface/tests/cli/basic.yaml | 167 --------------------- .../tests/cli/net_lldp_interface.yaml | 26 ---- 12 files changed, 220 insertions(+), 220 deletions(-) create mode 100644 test/integration/targets/vyos_lldp_interface/aliases create mode 100644 test/integration/targets/vyos_lldp_interface/defaults/main.yaml create mode 100644 test/integration/targets/vyos_lldp_interface/tasks/cli.yaml create mode 100644 test/integration/targets/vyos_lldp_interface/tasks/main.yaml create mode 100644 test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml create mode 100644 test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml delete mode 100644 test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml (limited to 'test/integration/targets/vyos_lldp_interface') diff --git a/test/integration/targets/vyos_lldp_interface/aliases b/test/integration/targets/vyos_lldp_interface/aliases new file mode 100644 index 00000000..e69de29b diff --git a/test/integration/targets/vyos_lldp_interface/defaults/main.yaml b/test/integration/targets/vyos_lldp_interface/defaults/main.yaml new file mode 100644 index 00000000..9ef5ba51 --- /dev/null +++ b/test/integration/targets/vyos_lldp_interface/defaults/main.yaml @@ -0,0 +1,3 @@ +--- +testcase: "*" +test_items: [] diff --git a/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml b/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml new file mode 100644 index 00000000..890d3acf --- /dev/null +++ b/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml @@ -0,0 +1,22 @@ +--- +- name: collect all cli test cases + find: + paths: "{{ role_path }}/tests/cli" + patterns: "{{ testcase }}.yaml" + register: test_cases + delegate_to: localhost + +- name: set test_items + set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" + +- name: run test case (connection=network_cli) + include: "{{ test_case_to_run }} ansible_connection=network_cli" + 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" + with_first_found: "{{ test_items }}" + loop_control: + loop_var: test_case_to_run diff --git a/test/integration/targets/vyos_lldp_interface/tasks/main.yaml b/test/integration/targets/vyos_lldp_interface/tasks/main.yaml new file mode 100644 index 00000000..415c99d8 --- /dev/null +++ b/test/integration/targets/vyos_lldp_interface/tasks/main.yaml @@ -0,0 +1,2 @@ +--- +- { include: cli.yaml, tags: ['cli'] } diff --git a/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml new file mode 100644 index 00000000..e91091b4 --- /dev/null +++ b/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml @@ -0,0 +1,167 @@ +--- +- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}" + +- name: Make sure LLDP is not running before tests + vyos.vyos.vyos_config: + lines: delete service lldp + +- name: Create LLDP configuration + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: present + register: result + +- assert: + that: + - 'result.changed == true' + - '"set service lldp interface eth1" in result.commands' + +- name: Create LLDP configuration again (idempotent) + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: present + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Disable LLDP configuration + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: disabled + register: result + +- assert: + that: + - 'result.changed == true' + - '"set service lldp interface eth1 disable" in result.commands' + +- name: Disable LLDP configuration again (idempotent) + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: disabled + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Enable LLDP configuration + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: enabled + register: result + +- assert: + that: + - 'result.changed == true' + - '"delete service lldp interface eth1 disable" in result.commands' + +- name: Enable LLDP configuration again (idempotent) + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: enabled + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Delete LLDP configuration + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: absent + register: result + +- assert: + that: + - 'result.changed == true' + - '"delete service lldp interface eth1" in result.commands' + +- name: Delete LLDP configuration again (idempotent) + vyos.vyos.vyos_lldp_interface: + name: eth1 + state: absent + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Create aggregate of LLDP interface configurations + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - name: eth2 + state: present + register: result + +- assert: + that: + - 'result.changed == true' + - '"set service lldp interface eth1" in result.commands' + - '"set service lldp interface eth2" in result.commands' + +- name: Create aggregate of LLDP interface configurations again (idempotent) + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - name: eth2 + state: present + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Override LLDP interface configuration on aggregate + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - { name: eth2, state: disabled } + state: present + register: result + +- assert: + that: + - 'result.changed == true' + - '"set service lldp interface eth2 disable" in result.commands' + +- name: Override LLDP interface configuration on aggregate again (idempotent) + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - { name: eth2, state: disabled } + state: present + register: result + +- assert: + that: + - 'result.changed == false' + +- name: Delete aggregate of LLDP interface configurations + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - name: eth2 + state: absent + register: result + +- assert: + that: + - 'result.changed == true' + - '"delete service lldp interface eth1" in result.commands' + - '"delete service lldp interface eth2" in result.commands' + +- name: Delete aggregate of LLDP interface configurations (idempotent) + vyos.vyos.vyos_lldp_interface: + aggregate: + - name: eth1 + - name: eth2 + state: absent + register: result + +- assert: + that: + - 'result.changed == false' diff --git a/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml new file mode 100644 index 00000000..1710b7e2 --- /dev/null +++ b/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml @@ -0,0 +1,26 @@ +--- +- debug: msg="START vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}" + +# Add minimal testcase to check args are passed correctly to +# implementation module and module run is successful. + +- name: Make sure LLDP is not running - setup + vyos.vyos.vyos_config: + lines: delete service lldp + +- name: Create LLDP configuration using platform agnostic module + net_lldp_interface: + name: eth1 + state: present + register: result + +- assert: + that: + - 'result.changed == true' + - '"set service lldp interface eth1" in result.commands' + +- name: Make sure LLDP is not running - teardown + vyos.vyos.vyos_config: + lines: delete service lldp + +- debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}" diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases deleted file mode 100644 index e69de29b..00000000 diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml deleted file mode 100644 index 9ef5ba51..00000000 --- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -testcase: "*" -test_items: [] diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml deleted file mode 100644 index 890d3acf..00000000 --- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: collect all cli test cases - find: - paths: "{{ role_path }}/tests/cli" - patterns: "{{ testcase }}.yaml" - register: test_cases - delegate_to: localhost - -- name: set test_items - set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}" - -- name: run test case (connection=network_cli) - include: "{{ test_case_to_run }} ansible_connection=network_cli" - 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" - with_first_found: "{{ test_items }}" - loop_control: - loop_var: test_case_to_run diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml deleted file mode 100644 index 415c99d8..00000000 --- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- { include: cli.yaml, tags: ['cli'] } diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml deleted file mode 100644 index 362d1817..00000000 --- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml +++ /dev/null @@ -1,167 +0,0 @@ ---- -- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}" - -- name: Make sure LLDP is not running before tests - vyos_config: - lines: delete service lldp - -- name: Create LLDP configuration - vyos_lldp_interface: - name: eth1 - state: present - register: result - -- assert: - that: - - 'result.changed == true' - - '"set service lldp interface eth1" in result.commands' - -- name: Create LLDP configuration again (idempotent) - vyos_lldp_interface: - name: eth1 - state: present - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Disable LLDP configuration - vyos_lldp_interface: - name: eth1 - state: disabled - register: result - -- assert: - that: - - 'result.changed == true' - - '"set service lldp interface eth1 disable" in result.commands' - -- name: Disable LLDP configuration again (idempotent) - vyos_lldp_interface: - name: eth1 - state: disabled - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Enable LLDP configuration - vyos_lldp_interface: - name: eth1 - state: enabled - register: result - -- assert: - that: - - 'result.changed == true' - - '"delete service lldp interface eth1 disable" in result.commands' - -- name: Enable LLDP configuration again (idempotent) - vyos_lldp_interface: - name: eth1 - state: enabled - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Delete LLDP configuration - vyos_lldp_interface: - name: eth1 - state: absent - register: result - -- assert: - that: - - 'result.changed == true' - - '"delete service lldp interface eth1" in result.commands' - -- name: Delete LLDP configuration again (idempotent) - vyos_lldp_interface: - name: eth1 - state: absent - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Create aggregate of LLDP interface configurations - vyos_lldp_interface: - aggregate: - - name: eth1 - - name: eth2 - state: present - register: result - -- assert: - that: - - 'result.changed == true' - - '"set service lldp interface eth1" in result.commands' - - '"set service lldp interface eth2" in result.commands' - -- name: Create aggregate of LLDP interface configurations again (idempotent) - vyos_lldp_interface: - aggregate: - - name: eth1 - - name: eth2 - state: present - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Override LLDP interface configuration on aggregate - vyos_lldp_interface: - aggregate: - - name: eth1 - - { name: eth2, state: disabled } - state: present - register: result - -- assert: - that: - - 'result.changed == true' - - '"set service lldp interface eth2 disable" in result.commands' - -- name: Override LLDP interface configuration on aggregate again (idempotent) - vyos_lldp_interface: - aggregate: - - name: eth1 - - { name: eth2, state: disabled } - state: present - register: result - -- assert: - that: - - 'result.changed == false' - -- name: Delete aggregate of LLDP interface configurations - vyos_lldp_interface: - aggregate: - - name: eth1 - - name: eth2 - state: absent - register: result - -- assert: - that: - - 'result.changed == true' - - '"delete service lldp interface eth1" in result.commands' - - '"delete service lldp interface eth2" in result.commands' - -- name: Delete aggregate of LLDP interface configurations (idempotent) - vyos_lldp_interface: - aggregate: - - name: eth1 - - name: eth2 - state: absent - register: result - -- assert: - that: - - 'result.changed == false' diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml deleted file mode 100644 index 49cd8b00..00000000 --- a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- debug: msg="START vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}" - -# Add minimal testcase to check args are passed correctly to -# implementation module and module run is successful. - -- name: Make sure LLDP is not running - setup - vyos_config: - lines: delete service lldp - -- name: Create LLDP configuration using platform agnostic module - net_lldp_interface: - name: eth1 - state: present - register: result - -- assert: - that: - - 'result.changed == true' - - '"set service lldp interface eth1" in result.commands' - -- name: Make sure LLDP is not running - teardown - vyos_config: - lines: delete service lldp - -- debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}" -- cgit v1.2.3