From: Jamo Luhrsen Date: Thu, 11 Jan 2018 06:05:06 +0000 (-0800) Subject: Add ability/flag to clean OS in suite setup X-Git-Tag: pre-potassium~1000 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=e70b662451a3509deda2f888effa5de9f3abf6ac;p=integration%2Ftest.git Add ability/flag to clean OS in suite setup it will make it easier for other environments to adopt our upstream CSIT if we can also easily provide the ability to clean up the environment from any left overs that their previous tests may have left over. Change-Id: I0b8347b98f864c70298647049836d128997fb7c4 Signed-off-by: Jamo Luhrsen --- diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index d079f83ddb..9ed3806d84 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -1155,6 +1155,7 @@ Cleanup Router OpenStack Suite Setup [Documentation] Wrapper teardown keyword that can be used in any suite running in an openstack environement SetupUtils.Setup_Utils_For_Setup_And_Teardown + Run Keyword If "${PRE_CLEAN_OPENSTACK_ALL}"=="True" OpenStack Cleanup All DevstackUtils.Devstack Suite Setup Add OVS Logging On All OpenStack Nodes diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot index 0868e93f9a..81b57dfa80 100644 --- a/csit/variables/netvirt/Variables.robot +++ b/csit/variables/netvirt/Variables.robot @@ -7,6 +7,7 @@ ${CIRROS_stable/newton} cirros-0.3.4-x86_64-uec ${CIRROS_stable/ocata} cirros-0.3.4-x86_64-uec ${CIRROS_stable/pike} cirros-0.3.5-x86_64-disk ${CIRROS_master} cirros-0.3.5-x86_64-disk +${PRE_CLEAN_OPENSTACK_ALL} False ${NET1_IPV6_ADDR_POOL} --allocation-pool start=2001:db8:0:2::2,end=2001:db8:0:2:ffff:ffff:ffff:fffe ${NET2_IPV6_ADDR_POOL} --allocation-pool start=2001:db8:0:3::2,end=2001:db8:0:3:ffff:ffff:ffff:fffe ${RESP_CODE} 200