X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=csit%2Flibraries%2FL2GatewayOperations.robot;h=fa17b848348314f1742ae991afe213f1433ec61f;hb=2a2ea82aecb3113751eac008e076a5643b67a649;hp=e4724a076b43026beca0b83a789039b06329a7d9;hpb=d97e0d0b28ab1932984d1c9322aea43249fceedb;p=integration%2Ftest.git

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index e4724a076b..fa17b84834 100644
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -59,7 +59,7 @@ Add Vtep Manager And Verify
     ${output}=    Exec Command    ${conn_id}    ${NETSTAT}
     Should Contain    ${output}    ${OVSDBPORT}
     @{list_to_check}=    Create List    ${odl_ip}
-    Utils.Check For Elements At URI    ${HWVTEP_NETWORK_TOPOLOGY}    ${list_to_check}    session
+    Wait Until Keyword Succeeds    30s    2s    Utils.Check For Elements At URI    ${HWVTEP_NETWORK_TOPOLOGY}    ${list_to_check}    session
 
 Create Verify L2Gateway
     [Arguments]    ${bridge_name}    ${intf_name}    ${gw_name}
@@ -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}