From cac6c19a633fbd0c00c12cb8306f871f609cc189 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Tue, 20 Feb 2018 04:45:09 +0100 Subject: [PATCH] aci_encap_pool: Fix vxlan integration tests (#36418) Missing cleanup would cause subsequent runs to fail when interrupted. --- .../targets/aci_encap_pool/tasks/vxlan.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/aci_encap_pool/tasks/vxlan.yml b/test/integration/targets/aci_encap_pool/tasks/vxlan.yml index 502c47ae4fa..b268199bbe7 100644 --- a/test/integration/targets/aci_encap_pool/tasks/vxlan.yml +++ b/test/integration/targets/aci_encap_pool/tasks/vxlan.yml @@ -1,5 +1,5 @@ --- -- name: ensure vxlan pool does not exist for tests to kick off +- name: ensure vxlan pool anstest does not exist for tests to kick off aci_encap_pool: &aci_vxlan_absent host: "{{ aci_hostname }}" username: "{{ aci_username }}" @@ -12,6 +12,16 @@ pool: anstest pool_type: vxlan +- name: ensure vxlan pool anstest_2 does not exist for tests to kick off + aci_encap_pool: + <<: *aci_vxlan_absent + pool: anstest_2 + +- name: ensure vxlan pool anstest_3 does not exist for tests to kick off + aci_encap_pool: + <<: *aci_vxlan_absent + pool: anstest_3 + - name: create vxlan pool - check mode works aci_encap_pool: &aci_vxlan_present <<: *aci_vxlan_absent @@ -85,7 +95,7 @@ assert: that: - create_vxlan_alloc_mode.failed == true - - 'create_vxlan_alloc_mode.msg == "vxlan pools do not support setting the pool_allocation_mode; please remove this parameter from the task"' + - "create_vxlan_alloc_mode.msg == 'vxlan pools do not support setting the \\'pool_allocation_mode\\'; please remove this parameter from the task'" - name: get vxlan pool - get object works aci_encap_pool: &aci_vxlan_query