From ef69f3a3b575a5dc790b7952edf0e64f6c80ba2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Tue, 27 Aug 2019 10:47:38 -0400 Subject: [PATCH] vmware/test: clean up dvswitch_0001 and dvswitch_0002 Ensure `dvswitch_0001` and `dvswitch_0002` won't remain after `vmware_dvswitch` test execution. --- .../targets/prepare_vmware_tests/tasks/teardown.yml | 6 +++++- .../targets/vmware_dvswitch/tasks/main.yml | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/integration/targets/prepare_vmware_tests/tasks/teardown.yml b/test/integration/targets/prepare_vmware_tests/tasks/teardown.yml index 3a5ad11e91d..a16e69b4fd8 100644 --- a/test/integration/targets/prepare_vmware_tests/tasks/teardown.yml +++ b/test/integration/targets/prepare_vmware_tests/tasks/teardown.yml @@ -31,8 +31,12 @@ username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" datacenter_name: '{{ dc1 }}' - switch_name: '{{ dvswitch1 }}' state: absent + switch_name: '{{ item }}' + loop: + - '{{ dvswitch1 }}' + - dvswitch_0001 + - dvswitch_0002 ignore_errors: yes - name: Remove the vSwitches diff --git a/test/integration/targets/vmware_dvswitch/tasks/main.yml b/test/integration/targets/vmware_dvswitch/tasks/main.yml index 9669922be30..b1aa86675b8 100644 --- a/test/integration/targets/vmware_dvswitch/tasks/main.yml +++ b/test/integration/targets/vmware_dvswitch/tasks/main.yml @@ -86,10 +86,15 @@ password: "{{ vcenter_password }}" datacenter_name: "{{ dc1 }}" state: absent - switch_name: dvswitch_0001 - register: dvs_result_0003 + switch_name: '{{ item }}' + loop: + - dvswitch_0001 + - dvswitch_0002 + register: dvswitch_delete + - debug: var=dvswitch_delete - - name: ensure distributed vswitch is present + - name: Ensure the state has changed assert: that: - - dvs_result_0003.changed + - dvswitch_delete.results[0] is changed + - dvswitch_delete.results[1] is changed