cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Do not grep eos_command for filtering virtio (#26972)"

Browse source 
This reverts commit b742930253.
This commit is contained in:
Ricardo Carrillo Cruz 2017-07-18 17:14:28 +02:00
parent b742930253
commit 15eb0d463d
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/integration/targets/vyos_interface/tests/cli/basic.yaml
View file

@ -4,7 +4,7 @@
- name: Run vyos lsmod command - name: Run vyos lsmod command
vyos_command: vyos_command:
commands: commands:
- lsmod - lsmod | grep virtio
register: lsmod_out register: lsmod_out
- name: Set up - delete interface - name: Set up - delete interface
@ -20,7 +20,7 @@
speed: 100 speed: 100
duplex: half duplex: half
mtu: 256 mtu: 256
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
register: result register: result
@ -31,7 +31,7 @@
- '"set interfaces ethernet eth1 speed 100" in result.commands' - '"set interfaces ethernet eth1 speed 100" in result.commands'
- '"set interfaces ethernet eth1 duplex half" in result.commands' - '"set interfaces ethernet eth1 duplex half" in result.commands'
- '"set interfaces ethernet eth1 mtu 256" in result.commands' - '"set interfaces ethernet eth1 mtu 256" in result.commands'
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- name: Configure interface params (idempotent) - name: Configure interface params (idempotent)
vyos_interface: vyos_interface:
@ -42,12 +42,12 @@
duplex: half duplex: half
mtu: 256 mtu: 256
register: result register: result
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- assert: - assert:
that: that:
- 'result.changed == false' - 'result.changed == false'
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- name: Change interface params - name: Change interface params
vyos_interface: vyos_interface:
@ -58,7 +58,7 @@
duplex: full duplex: full
mtu: 512 mtu: 512
register: result register: result
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- assert: - assert:
that: that:
@ -67,7 +67,7 @@
- '"set interfaces ethernet eth1 speed 1000" in result.commands' - '"set interfaces ethernet eth1 speed 1000" in result.commands'
- '"set interfaces ethernet eth1 duplex full" in result.commands' - '"set interfaces ethernet eth1 duplex full" in result.commands'
- '"set interfaces ethernet eth1 mtu 512" in result.commands' - '"set interfaces ethernet eth1 mtu 512" in result.commands'
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- name: Disable interface - name: Disable interface
vyos_interface: vyos_interface:
@ -124,7 +124,7 @@
- { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512} - { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256} - { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
register: result register: result
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- assert: - assert:
that: that:
@ -137,7 +137,7 @@
- '"set interfaces ethernet eth2 speed 1000" in result.commands' - '"set interfaces ethernet eth2 speed 1000" in result.commands'
- '"set interfaces ethernet eth2 duplex full" in result.commands' - '"set interfaces ethernet eth2 duplex full" in result.commands'
- '"set interfaces ethernet eth2 mtu 256" in result.commands' - '"set interfaces ethernet eth2 mtu 256" in result.commands'
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- name: Set interface on aggregate (idempotent) - name: Set interface on aggregate (idempotent)
vyos_interface: vyos_interface:
@ -145,12 +145,12 @@
- { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512} - { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256} - { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
register: result register: result
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- assert: - assert:
that: that:
- 'result.changed == false' - 'result.changed == false'
when: "'virtio_net' not in lsmod_out.stdout" when: "'virtio' not in lsmod_out.stdout"
- name: Disable interface on aggregate - name: Disable interface on aggregate
vyos_interface: vyos_interface: