Fix sporadic genius 3 node CSIT failures

Change-Id: Ia7d97ce22f588c3d091f3d79f7585a4ffe592135
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index 7131ea3d50e81ae4eeedf5c28bfd700844222b2d..fd2323da8bad6a7fe6a6e7a3422ae4dd1a487fb1 100644 (file)
--- a/csit/libraries/Genius.robot
+++ b/csit/libraries/Genius.robot
@@ -220,3 +220,9 @@ Check Table0 Entry For 2 Dpn
     Log    ${check}
     Should Contain    ${check}    in_port=${port-num1}
     [Return]    ${check}
+
+Check ITM Tunnel State
+    [Arguments]    ${tunnel1}    ${tunnel2}
+    [Documentation]    Verifies the Tunnel is deleted from datastore
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_API}/itm-state:tunnels_state/
+    Should Not Contain    ${resp.content}    ${tunnel1}    ${tunnel2}

diff --git a/csit/suites/genius/Configure_ITM.robot b/csit/suites/genius/Configure_ITM.robot
index 7bcda49b3d6ce1e8c1396b1e151842c9e5d7fbb8..ee52337a07e00d97cb120ded535a41a74e25d4d7 100644 (file)
--- a/csit/suites/genius/Configure_ITM.robot
+++ b/csit/suites/genius/Configure_ITM.robot
@@ -179,10 +179,9 @@ Create and Verify VTEP-Vlan
 Delete and Verify VTEP -Vlan
     [Documentation]    This Delete testcase , deletes the ITM tunnel created between 2 dpns.
     Remove All Elements At URI And Verify    ${CONFIG_API}/itm:transport-zones/transport-zone/${itm_created[0]}/
-    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_API}/itm-state:tunnels_state/
-    Should Not Contain    ${resp}    ${tunnel-1}    ${tunnel-2}
-    ${Ovs-del-1}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_1}    ${tunnel-1}
-    ${Ovs-del-2}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_2}    ${tunnel-2}
+    Wait Until Keyword Succeeds    40    10    Genius.Check ITM Tunnel State    ${tunnel-3}    ${tunnel-4}
+    ${Ovs-del-1}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_1}    ${tunnel-3}
+    ${Ovs-del-2}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_2}    ${tunnel-4}
 
 Create VTEP - Vlan and Gateway
     [Documentation]    This testcase creates a Internal Transport Manager - ITM tunnel between 2 DPNs with VLAN and Gateway configured in Json.
@@ -244,10 +243,9 @@ Create VTEP - Vlan and Gateway
 Delete VTEP -Vlan and gateway
     [Documentation]    This testcase deletes the ITM tunnel created between 2 dpns.
     Remove All Elements At URI And Verify    ${CONFIG_API}/itm:transport-zones/transport-zone/${itm_created[0]}/
-    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_API}/itm-state:tunnels_state/
-    Should Not Contain    ${resp}    ${tunnel-1}    ${tunnel-2}
-    ${Ovs-del-1}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_1}    ${tunnel-1}
-    ${Ovs-del-2}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_2}    ${tunnel-2}
+    Wait Until Keyword Succeeds    40    10    Genius.Check ITM Tunnel State    ${tunnel-5}    ${tunnel-6}
+    ${Ovs-del-1}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_1}    ${tunnel-5}
+    ${Ovs-del-2}    Wait Until Keyword Succeeds    40    10    Genius.Check Tunnel Delete On OVS    ${conn_id_2}    ${tunnel-6}
 
 *** Keywords ***
 Create Vteps IPv6