diff options
author | Bradley A. Thornton <bthornto@thethorntons.net> | 2019-08-08 12:29:41 -0700 |
---|---|---|
committer | Bradley A. Thornton <bthornto@thethorntons.net> | 2019-08-08 12:29:41 -0700 |
commit | a330106b2e2c811db49477d71b8a472c964d2aeb (patch) | |
tree | ae05d893d8bed2d04db942d4c103996b26b10be7 /test/integration/targets/vyos_interface | |
parent | 5472435af823398fc63e049d7efe0938b532f3c9 (diff) | |
download | vyos.vyos-a330106b2e2c811db49477d71b8a472c964d2aeb.tar.gz vyos.vyos-a330106b2e2c811db49477d71b8a472c964d2aeb.zip |
fixed
Diffstat (limited to 'test/integration/targets/vyos_interface')
-rw-r--r-- | test/integration/targets/vyos_interface/aliases (renamed from test/integration/targets/vyos_interface/vyos_interface/aliases) | 0 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/defaults/main.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml) | 0 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/tasks/cli.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml) | 0 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/tasks/main.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/tests/cli/basic.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml) | 34 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/tests/cli/intent.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml) | 26 | ||||
-rw-r--r-- | test/integration/targets/vyos_interface/tests/cli/net_interface.yaml (renamed from test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml) | 2 |
7 files changed, 31 insertions, 31 deletions
diff --git a/test/integration/targets/vyos_interface/vyos_interface/aliases b/test/integration/targets/vyos_interface/aliases index e69de29b..e69de29b 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/aliases +++ b/test/integration/targets/vyos_interface/aliases diff --git a/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml b/test/integration/targets/vyos_interface/defaults/main.yaml index 9ef5ba51..9ef5ba51 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml +++ b/test/integration/targets/vyos_interface/defaults/main.yaml diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml b/test/integration/targets/vyos_interface/tasks/cli.yaml index 890d3acf..890d3acf 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml +++ b/test/integration/targets/vyos_interface/tasks/cli.yaml diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml b/test/integration/targets/vyos_interface/tasks/main.yaml index 415c99d8..415c99d8 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml +++ b/test/integration/targets/vyos_interface/tasks/main.yaml diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_interface/tests/cli/basic.yaml index 2b9ce129..22957e14 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml +++ b/test/integration/targets/vyos_interface/tests/cli/basic.yaml @@ -2,18 +2,18 @@ - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}" - name: Run vyos lsmod command - vyos_command: + vyos.vyos.vyos_command: commands: - lsmod register: lsmod_out - name: Set up - delete interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: absent - name: Set up - Create interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: present description: test-interface @@ -26,7 +26,7 @@ - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands' - name: Configure interface params - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: present description: test-interface-1 @@ -46,7 +46,7 @@ when: "'virtio_net' not in lsmod_out.stdout[0]" - name: Configure interface params (idempotent) - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: present description: test-interface-1 @@ -62,7 +62,7 @@ when: "'virtio' not in lsmod_out.stdout[0]" - name: Change interface params - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: present description: test-interface-2 @@ -82,7 +82,7 @@ when: "'virtio_net' not in lsmod_out.stdout[0]" - name: Disable interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 enabled: False register: result @@ -93,7 +93,7 @@ - '"set interfaces ethernet eth1 disable" in result.commands' - name: Enable interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 enabled: True register: result @@ -104,7 +104,7 @@ - '"delete interfaces ethernet eth1 disable" in result.commands' - name: Delete interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: absent register: result @@ -115,7 +115,7 @@ - '"delete interfaces ethernet eth1" in result.commands' - name: Delete interface (idempotent) - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: absent register: result @@ -125,13 +125,13 @@ - 'result.changed == false' - name: Aggregate setup- delete interface - vyos_interface: + vyos.vyos.vyos_interface: name: eth2 state: absent register: result - name: Set interface on aggregate - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512} - { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256} @@ -152,7 +152,7 @@ when: "'virtio_net' not in lsmod_out.stdout[0]" - name: Set interface on aggregate (idempotent) - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512} - { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256} @@ -165,7 +165,7 @@ when: "'virtio_net' not in lsmod_out.stdout[0]" - name: Disable interface on aggregate - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth1 - name: eth2 @@ -180,7 +180,7 @@ - '"set interfaces ethernet eth2 disable" in result.commands' - name: Enable interface on aggregate - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth1 - name: eth2 @@ -194,7 +194,7 @@ - '"delete interfaces ethernet eth2 disable" in result.commands' - name: Delete interface aggregate - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth1 - name: eth2 @@ -208,7 +208,7 @@ - '"delete interfaces ethernet eth2" in result.commands' - name: Delete interface aggregate (idempotent) - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth1 - name: eth2 diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml b/test/integration/targets/vyos_interface/tests/cli/intent.yaml index 008dd56b..946728db 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml +++ b/test/integration/targets/vyos_interface/tests/cli/intent.yaml @@ -7,7 +7,7 @@ # https://github.com/ansible/ansible/issues/39667 - name: Detect if we have existing lldp neighbors configured - vyos_command: + vyos.vyos.vyos_command: commands: - show lldp neighbors detail register: neighbors_out @@ -17,25 +17,25 @@ run_lldp_tests: "'PortDescr: eth0' in neighbors_out.stdout[0]" - name: Enable LLDP service - vyos_lldp: + vyos.vyos.vyos_lldp: state: present when: run_lldp_tests - name: Create LLDP configuration - vyos_lldp_interface: + vyos.vyos.vyos_lldp_interface: name: eth1 state: present when: run_lldp_tests - name: Setup (interface is up) - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 enabled: True state: present register: result - name: Check intent arguments - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: up register: result @@ -45,7 +45,7 @@ - "result.failed == false" - name: Check lldp neighbors intent arguments - vyos_interface: + vyos.vyos.vyos_interface: name: eth0 neighbors: - port: eth0 @@ -58,7 +58,7 @@ when: run_lldp_tests - name: Check intent arguments (failed condition) - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 state: down ignore_errors: yes @@ -70,7 +70,7 @@ - "'state eq(down)' in result.failed_conditions" - name: Check lldp neighbors intent arguments (failed) - vyos_interface: + vyos.vyos.vyos_interface: name: eth0 neighbors: - port: dummy_port @@ -87,7 +87,7 @@ when: run_lldp_tests - name: Config + intent - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 enabled: False state: down @@ -98,7 +98,7 @@ - "result.failed == false" - name: Config + intent (fail) - vyos_interface: + vyos.vyos.vyos_interface: name: eth1 enabled: False state: up @@ -111,7 +111,7 @@ - "'state eq(up)' in result.failed_conditions" - name: Aggregate config + intent (pass) - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth1 enabled: True @@ -124,7 +124,7 @@ - "result.failed == false" - name: Check lldp neighbors intent aggregate arguments - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth0 neighbors: @@ -138,7 +138,7 @@ when: run_lldp_tests - name: Check lldp neighbors intent aggregate arguments (failed) - vyos_interface: + vyos.vyos.vyos_interface: aggregate: - name: eth0 neighbors: diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml b/test/integration/targets/vyos_interface/tests/cli/net_interface.yaml index ced273d5..4bdb6ecc 100644 --- a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml +++ b/test/integration/targets/vyos_interface/tests/cli/net_interface.yaml @@ -5,7 +5,7 @@ # implementation module and module run is successful. - name: Run vyos lsmod command - vyos_command: + vyos.vyos.vyos_command: commands: - lsmod register: lsmod_out |