X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fgenius%2FITM_Direct_Tunnels.robot;h=ffc6cb5c81eb5534f5ea91582e3c66fc1ec931d9;hb=b8faf142c7e90dd3237787ac635c9918f3b11f76;hp=7b85b061a39656b9e0ff872faafa2dd5cf2a62c3;hpb=595e79e43cbaaf7151e55420adeec9ef87525139;p=integration%2Ftest.git

diff --git a/csit/suites/genius/ITM_Direct_Tunnels.robot b/csit/suites/genius/ITM_Direct_Tunnels.robot
index 7b85b061a3..ffc6cb5c81 100644
--- a/csit/suites/genius/ITM_Direct_Tunnels.robot
+++ b/csit/suites/genius/ITM_Direct_Tunnels.robot
@@ -2,7 +2,7 @@
 Documentation     This test suite is to by-pass interface manager and create/delete the tunnels between the switches directly inorder for ITM to scale and build mesh among more number of switches.
 Suite Setup       ITM Direct Tunnels Start Suite
 Suite Teardown    ITM Direct Tunnels Stop Suite
-Test Teardown     Get Model Dump    ${ODL_SYSTEM_IP}    ${data_models}
+Test Teardown     Genius Test Teardown    ${data_models}
 Library           OperatingSystem
 Library           String
 Library           RequestsLibrary
@@ -53,26 +53,36 @@ Create and Verify VTEP
     ${check-4}    Wait Until Keyword Succeeds    40    10    Genius.Check Table0 Entry For 2 Dpn    ${conn_id_2}    ${Bridge-2}
     ...    ${Port_num2}
 
-Verify Tunnels By Enabling BFD
-    [Documentation]    This test case will check the tunnel exists by bringing up/down a switch and check tunnels exist by enabling BFD
-    ${result}    Run Keyword And Return Status    Verify Tunnel Monitoring is on
-    Run Keyword If    '${result}' == 'False'    Enable_Tunnel_monitoring
-    Verify Tunnel State    ${TOOLS_SYSTEM_1_IP}
-    Verify Tunnel State    ${TOOLS_SYSTEM_2_IP}
-
 Verify VTEP After Restarting OVS
     [Documentation]    Verify Testcase, Verifying tunnel state by restarting OVS
-    Verify Tunnel Status as UP
-    OVSDB.Restart OVSDB    ${TOOLS_SYSTEM_1_IP}
-    Wait Until Keyword Succeeds    30    3    Verify Tunnel Status as UP
+    Wait Until Keyword Succeeds    20    2    Genius.Verify Tunnel Status as UP    TZA
+    OVSDB.Restart OVSDB    ${TOOLS_SYSTEM_IP}
+    Wait Until Keyword Succeeds    20    2    Genius.Verify Tunnel Status as UP    TZA
 
 Verify VTEP After Restarting Controller
     [Documentation]    Verify Testcase, Verifying tunnel state by restarting CONTROLLER
-    Verify Tunnel Status as UP
+    Genius.Verify Tunnel Status as UP    TZA
     ClusterManagement.Stop_Members_From_List_Or_All
     ClusterManagement.Start_Members_From_List_Or_All
-    Wait Until Keyword Succeeds    10    2    Check Service Status    ACTIVE    OPERATIONAL
-    Wait Until Keyword Succeeds    30    3    Verify Tunnel Status as UP
+    Wait Until Keyword Succeeds    60    3    Genius.Check System Status
+    Wait Until Keyword Succeeds    30    3    Genius.Verify Tunnel Status as UP    TZA
+
+Verify Tunnels By Disabling BFD
+    [Documentation]    This test case will verify tunnels after disabling BFD and verifies tunnel status as unknown after stopping OVS.
+    ${result} =    Run Keyword And Return Status    Verify Tunnel Monitoring is on
+    Run Keyword If    '${result}' == 'True'    Disable_Tunnel_Monitoring
+    ${tunnels_on_OVS} =    Genius.Get Tunnels On OVS    ${conn_id_1}
+    OVSDB.Stop OVS    ${TOOLS_SYSTEM_IP}
+    Genius.Verify Tunnel Status    ${tunnels_on_OVS}    UNKNOWN
+    OVSDB.Start OVS    ${TOOLS_SYSTEM_IP}
+    Wait Until Keyword Succeeds    20    2    Genius.Verify Tunnel Status as UP    TZA
+
+Verify Tunnels By Enabling BFD
+    [Documentation]    This test case will check the tunnel exists by bringing up/down a switch and check tunnels exist by enabling BFD
+    ${result}    Run Keyword And Return Status    Verify Tunnel Monitoring is on
+    Run Keyword If    '${result}' == 'False'    Enable_Tunnel_monitoring
+    Verify Tunnel State After OVS Restart    ${TOOLS_SYSTEM_IP}
+    Verify Tunnel State After OVS Restart    ${TOOLS_SYSTEM_2_IP}
 
 Delete and Verify VTEP
     [Documentation]    This Delete testcase , deletes the ITM tunnel created between 2 dpns.
@@ -112,13 +122,13 @@ Enable_Tunnel_Monitoring
     [Documentation]    In this we will enable tunnel monitoring by tep:enable command running in karaf console
     ${output}    Issue_Command_On_Karaf_Console    tep:enable-tunnel-monitor true
 
-Verify Tunnel State
+Verify Tunnel State After OVS Restart
     [Arguments]    ${TOOLS_SYSTEM_IP}
     [Documentation]    In this we will Verify Tunnel State by Stopping/Starting Switch
     OVSDB.Stop OVS    ${TOOLS_SYSTEM_IP}
     Wait Until Keyword Succeeds    2min    20 sec    Verify Tunnel Down
     OVSDB.Start OVS    ${TOOLS_SYSTEM_IP}
-    Wait Until Keyword Succeeds    2min    20 sec    Verify Tunnel Status as UP
+    Wait Until Keyword Succeeds    2min    20 sec    Genius.Verify Tunnel Status as UP    TZA
 
 Verify Tunnel Down
     [Documentation]    In this we will check whether tunnel is in down or not
@@ -137,3 +147,7 @@ Get Port Number
     ${port_num}    Get From List    ${port}    0
     Should Contain    ${check-1}    ${port_num}
     [Return]    ${port_num}
+
+Disable_Tunnel_Monitoring
+    [Documentation]    In this we will disable tunnel monitoring by tep:enable command running in karaf console
+    ${output}    Issue_Command_On_Karaf_Console    tep:enable-tunnel-monitor false