From f56ec54f1ef86575e430d80d07b90da3624c7113 Mon Sep 17 00:00:00 2001 From: Victor Pickard Date: Fri, 16 Feb 2018 09:18:37 -0500 Subject: [PATCH] Fix L2GW cleanup test case Enhance cleanup test case to cleanup optional resources only when appropriate. Change-Id: If55d227450b03add22d18cfde5a7b506fc67ecde Signed-off-by: Victor Pickard --- csit/libraries/L2GatewayOperations.robot | 6 ++++++ csit/suites/l2gw/01_Configure_verify_l2gateway.robot | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot index e4724a076b..01ab61b229 100644 --- a/csit/libraries/L2GatewayOperations.robot +++ b/csit/libraries/L2GatewayOperations.robot @@ -294,3 +294,9 @@ Verify Elan Flow Entries Should Contain ${flow_output} table=52 ${sMac_output} = Get Lines Containing String ${flow_output} table=52 Log ${sMac_output} + +Cleanup L2GW Optional Resources + [Documentation] Cleanup resources that are only allocated on certain combos... + BuiltIn.Pass_Execution_If "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS} Not supported in Ocata/Pike + CompareStream.Run_Keyword_If_At_Most_Nitrogen BuiltIn.Pass_Execution Only run on oxygen and later + OpenStackOperations.Delete Port ${HWVTEP_PORT_3} diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot index 4edb99669a..d90f0a3566 100644 --- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot +++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot @@ -206,6 +206,7 @@ TC19 Ping Verification From Namespace Tap To Ovs Vm Wait Until Keyword Succeeds 30s 5s L2GatewayOperations.Verify Ping In Namespace Extra Timeout ${HWVTEP_NS1} ${port_mac_list[4]} ${port_ip_list[0]} TC99 Cleanup L2Gateway Connection Itm Tunnel Port Subnet And Network + [Tags] skip_if_stable/ocata skip_if_stable/pike L2GatewayOperations.Delete L2Gateway Connection ${L2GW_NAME1} L2GatewayOperations.Delete L2Gateway Connection ${L2GW_NAME2} L2GatewayOperations.Delete L2Gateway ${L2GW_NAME1} @@ -216,11 +217,11 @@ TC99 Cleanup L2Gateway Connection Itm Tunnel Port Subnet And Network OpenStackOperations.Delete Port ${OVS_PORT_2} OpenStackOperations.Delete Port ${HWVTEP_PORT_1} OpenStackOperations.Delete Port ${HWVTEP_PORT_2} - OpenStackOperations.Delete Port ${HWVTEP_PORT_3} OpenStackOperations.Delete SubNet ${SUBNET_1} OpenStackOperations.Delete SubNet ${SUBNET_2} OpenStackOperations.Delete Network ${NET_1} OpenStackOperations.Delete Network ${NET_2} + Cleanup L2GW Optional Resources *** Keywords *** Basic Suite Setup -- 2.36.6