From: Sam Hague <shague@redhat.com>
Date: Wed, 19 Sep 2018 15:55:39 +0000 (-0400)
Subject: Remove nitrogen test workarounds
X-Git-Tag: pre-potassium~548
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=777be07918626408ddbdcf4ce3693caaf44c739c

Remove nitrogen test workarounds

Change-Id: I28827a734c01cb2c5ef224d34b54abced66f34e6
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index 82f24be785..5c01710e8b 100644
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -296,5 +296,4 @@ Verify Elan Flow Entries
 
 Cleanup L2GW Optional Resources
     [Documentation]    Cleanup resources that are only allocated on certain combos...
-    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 91c41e99d8..07ef46e56e 100644
--- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
@@ -151,13 +151,11 @@ TC14 Create, Update And Attach 2nd Neutron Port to Hwvtep Namespace 1
 
 TC15 Update Existing L2Gateway With 2nd Port And Verify
     [Documentation]    Add the new port ${NS_PORT3} to existing L2GW ${L2GW_NAME1} that has an existing connection. ${NS_PORT1} is already attached, adding ${NS_PORT3}
-    CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     ${output}=    Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Update And Verify L2Gateway    ${HWVTEP_BRIDGE}    ${L2GW_NAME1}
     ...    ${NS_PORT1}    ${NS_PORT3}
 
 TC16 Verify L2Gateway Connection
     [Documentation]    Verify the L2GW connection has the 2nd port. Verify db in hardware vtep emulator tables.
-    CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Verify L2Gateway Connection    ${L2GW_NAME1}    ${NET_1}
     Wait Until Keyword Succeeds    30s    2s    L2GatewayOperations.Verify Ovs Tunnel    ${HWVTEP_IP}    ${OVS_IP}
     ${output}=    ITM Get Tunnels
@@ -173,12 +171,10 @@ TC16 Verify L2Gateway Connection
 
 TC17 Dhcp Ip Allocation For Hwvtep Tap Port
     [Documentation]    Verify the 2nd HWVTEP port was able to get an IP address
-    CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     Wait Until Keyword Succeeds    180s    10s    L2GatewayOperations.Namespace Dhclient Verify    ${HWVTEP_NS1}    ${NS_TAP1}    ${port_ip_list[4]}
 
 TC18 Verify Ping From Compute Node Vm To Hwvtep Port 2
     [Documentation]    Verify IP connectivity between VM in net1 and 2nd HWVTEP port in net 1
-    CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     ${output}=    Wait Until Keyword Succeeds    60s    10s    Execute Command on VM Instance    ${NET_1}    ${port_ip_list[0]}
     ...    ping -c 3 ${port_ip_list[4]}
     Log    ${output}
@@ -189,7 +185,6 @@ TC18 Verify Ping From Compute Node Vm To Hwvtep Port 2
 
 TC19 Ping Verification From Namespace Tap To Ovs Vm
     [Documentation]    Verify IP connectivity between 2nd HWVTEP port and VM in compute node
-    CompareStream.Run_Keyword_If_At_Most_Nitrogen    BuiltIn.Pass_Execution    Only run on oxygen and later
     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