From: Karthika Panneer Date: Tue, 22 May 2018 10:41:06 +0000 (-0700) Subject: Update Verify Tunnel Status As Up X-Git-Tag: pre-potassium~787 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=b0ee238416d3fa3da67a7b04334b005b5367222a Update Verify Tunnel Status As Up Updation of this keyword is done to add a transport zone variable and pass it as an argument, instead of hard coding it. Change-Id: I0d13688dd97cdd4d198772399ee0c63abf35ae8a Signed-off-by: Karthika Panneer --- diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot index 8b3a54b1d0..033718604d 100644 --- a/csit/libraries/Genius.robot +++ b/csit/libraries/Genius.robot @@ -229,9 +229,10 @@ Check ITM Tunnel State Should Not Contain ${resp.content} ${tunnel1} ${tunnel2} Verify Tunnel Status as UP + [Arguments] ${Transport_zone} [Documentation] Verify that the number of tunnels are UP ${No_of_Teps} Issue_Command_On_Karaf_Console ${TEP_SHOW} - ${Lines_of_TZA} Get Lines Containing String ${No_of_Teps} TZA + ${Lines_of_TZA} Get Lines Containing String ${No_of_Teps} ${Transport_zone} ${Expected_Node_Count} Get Line Count ${Lines_of_TZA} ${no_of_tunnels} Issue_Command_On_Karaf_Console ${TEP_SHOW_STATE} ${lines_of_VXLAN} Get Lines Containing String ${no_of_tunnels} VXLAN diff --git a/csit/suites/genius/BFD_monitoring.robot b/csit/suites/genius/BFD_monitoring.robot index 5e07e465ed..c772dc9257 100644 --- a/csit/suites/genius/BFD_monitoring.robot +++ b/csit/suites/genius/BFD_monitoring.robot @@ -48,7 +48,7 @@ BFD_TC00 Create ITM between DPNs Verify_BFD_Enablement ${vlan}= Set Variable 0 ${gateway-ip}= Set Variable 0.0.0.0 Genius.Create Vteps ${Dpn_id_1} ${Dpn_id_2} ${TOOLS_SYSTEM_IP} ${TOOLS_SYSTEM_2_IP} ${vlan} ${gateway-ip} - Wait Until Keyword Succeeds 30s 5s Genius.Verify Tunnel Status as UP + Wait Until Keyword Succeeds 30s 5s Genius.Verify Tunnel Status as UP TZA BFD_TC01 Verify by default BFD monitoring is enabled on Controller [Documentation] Verify by default BFD monitoring is enabled on Controller @@ -64,7 +64,7 @@ BFD_TC02 Verify that BFD tunnel monitoring interval is set with appropriate defa BFD_TC04 Verify that in controller tunnel status is up when ITM tunnel interface is brought up. [Documentation] Verify that in controller tunnel status is up when ITM tunnel interface is brought up. Wait Until Keyword Succeeds 10s 2s Verify Tunnel Monitoring Is On - Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP + Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP TZA Wait Until Keyword Succeeds 10s 2s Verify Config Ietf Interface Output ${INTERFACE_DS_MONI_TRUE} ${INTERFACE_DS_MONI_INT_1000} ${TUNNEL_MONI_PROTO} BFD_TC05 Verify BFD tunnel monitoring interval can be changed. @@ -107,7 +107,7 @@ BFD_TC06 Verify that the tunnel state goes to UNKNOWN when DPN is disconnected Log "After connecting CSS with controller" Issue Command On Karaf Console ${TEP_SHOW} Issue Command On Karaf Console ${TEP_SHOW_STATE} - Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP + Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP TZA Wait Until Keyword Succeeds 10s 2s Verify Config Ietf Interface Output ${INTERFACE_DS_MONI_TRUE} ${INTERFACE_DS_MONI_INT_5000} ${TUNNEL_MONI_PROTO} BFD_TC07 Verify that BFD monitoring is disabled on Controller @@ -118,7 +118,7 @@ BFD_TC07 Verify that BFD monitoring is disabled on Controller ${output}= Issue Command On Karaf Console ${TEP_SHOW} Should Contain ${output} ${TUNNEL_MONITOR_OFF} Wait Until Keyword Succeeds 10s 2s Verify Config Ietf Interface Output ${INTERFACE_DS_MONI_FALSE} ${INTERFACE_DS_MONI_INT_5000} ${TUNNEL_MONI_PROTO} - Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP + Wait Until Keyword Succeeds 10s 1s Genius.Verify Tunnel Status as UP TZA ${resp} RequestsLibrary.Put Request session ${CONFIG_API}/itm-config:tunnel-monitor-params/ data=${ENABLE_MONITORING} Should Be Equal As Strings ${resp.status_code} 200 Wait Until Keyword Succeeds 10s 2s Verify Tunnel Monitoring Params ${TUNNEL_MONI_PARAMS_TRUE} diff --git a/csit/suites/genius/ITM_Direct_Tunnels.robot b/csit/suites/genius/ITM_Direct_Tunnels.robot index 950fc2faa4..5af43ca212 100644 --- a/csit/suites/genius/ITM_Direct_Tunnels.robot +++ b/csit/suites/genius/ITM_Direct_Tunnels.robot @@ -55,23 +55,23 @@ Create and Verify VTEP Verify VTEP After Restarting OVS [Documentation] Verify Testcase, Verifying tunnel state by restarting OVS - Genius.Verify Tunnel Status as UP + Genius.Verify Tunnel Status as UP TZA OVSDB.Restart OVSDB ${TOOLS_SYSTEM_IP} - Wait Until Keyword Succeeds 30 3 Genius.Verify Tunnel Status as UP + Wait Until Keyword Succeeds 30 3 Genius.Verify Tunnel Status as UP TZA Verify VTEP After Restarting Controller [Documentation] Verify Testcase, Verifying tunnel state by restarting CONTROLLER - Genius.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 60 3 Check Service Status ACTIVE OPERATIONAL - Wait Until Keyword Succeeds 30 3 Genius.Verify Tunnel Status as UP + 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. ${result} Run Keyword And Return Status Verify Tunnel Monitoring is on Run Keyword If '${result}' == 'True' Disable_Tunnel_Monitoring - Genius.Verify Tunnel Status as UP + 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 @@ -124,7 +124,7 @@ Verify Tunnel State After OVS Restart 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 Genius.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