From: Sathwik Boggarapu Date: Thu, 12 Jul 2018 06:59:54 +0000 (+0530) Subject: Migrate check system status to clustermanagement X-Git-Tag: pre-potassium~694 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=20fe8d97844f1ff5ce4fecef8e3e7def214137ba;p=integration%2Ftest.git Migrate check system status to clustermanagement 1) Migrating keyword genius.check system status to clustermanagement.robot. 2)changed usage of it in genius.robot and coe.robot Change-Id: Ic1056b08497b9cec316b33c176b27b126e79cfb8 Signed-off-by: Sathwik Boggarapu --- diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot index b2e0a87361..89d2f33711 100644 --- a/csit/libraries/ClusterManagement.robot +++ b/csit/libraries/ClusterManagement.robot @@ -846,3 +846,18 @@ Return_Member_IP ${member_int} = BuiltIn.Convert_To_Integer ${member_index} ${member_ip} = Collections.Get_From_Dictionary dictionary=${ClusterManagement__index_to_ip_mapping} key=${member_int} [Return] ${member_ip} + +Check Service Status + [Arguments] ${odl_ip} ${system_ready_state} ${service_state} @{service_list} + [Documentation] Issues the karaf shell command showSvcStatus to verify the ready and service states are the same as the arguments passed + ${service_status_output} = BuiltIn.Run Keyword If ${NUM_ODL_SYSTEM} > 1 KarafKeywords.Issue_Command_On_Karaf_Console showSvcStatus -n ${odl_ip} ${odl_ip} ${KARAF_SHELL_PORT} + ... ELSE KarafKeywords.Issue_Command_On_Karaf_Console showSvcStatus ${odl_ip} ${KARAF_SHELL_PORT} + BuiltIn.Should Contain ${service_status_output} ${system_ready_state} + : FOR ${service} IN @{service_list} + \ BuiltIn.Should Match Regexp ${service_status_output} ${service} +: ${service_state} + +Check Status of Services + [Arguments] @{service_list} + [Documentation] This keyword will verify whether all the services are operational in all the ODL nodes + : FOR ${i} IN RANGE ${NUM_ODL_SYSTEM} + \ ClusterManagement.Check Service Status ${ODL_SYSTEM_${i+1}_IP} ACTIVE OPERATIONAL @{service_list} diff --git a/csit/libraries/Coe.robot b/csit/libraries/Coe.robot index 373cbb877b..1304a2bfbe 100644 --- a/csit/libraries/Coe.robot +++ b/csit/libraries/Coe.robot @@ -37,7 +37,7 @@ Start Suite Coe.Verify Watcher Is Running BuiltIn.Wait Until Keyword Succeeds 40s 2s Coe.Check Node Status Is Ready Coe.Label Nodes - BuiltIn.Wait Until Keyword Succeeds 60 2 Genius.Check System Status @{COE_DIAG_SERVICES} + BuiltIn.Wait Until Keyword Succeeds 60 2 ClusterManagement.Check Status of Services @{COE_DIAG_SERVICES} Genius.Verify Tunnel Status as UP default-transport-zone Coe.Derive Coe Data Models diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot index b8e9991f42..4b1f597056 100644 --- a/csit/libraries/Genius.robot +++ b/csit/libraries/Genius.robot @@ -2,17 +2,18 @@ Documentation This suite is a common keywords file for genius project. Library Collections Library OperatingSystem +Library re Library RequestsLibrary Library SSHLibrary -Library re Library string +Resource ClusterManagement.robot +Resource DataModels.robot Resource KarafKeywords.robot +Resource OVSDB.robot Resource Utils.robot +Resource VpnOperations.robot Resource ../variables/Variables.robot -Resource OVSDB.robot Resource ../variables/netvirt/Variables.robot -Resource VpnOperations.robot -Resource DataModels.robot *** Variables *** @{itm_created} TZA @@ -37,7 +38,7 @@ Genius Suite Teardown Start Suite [Documentation] Initial setup for Genius test suites - Run_Keyword_If_At_Least_Oxygen Wait Until Keyword Succeeds 60 2 Check System Status @{GENIUS_DIAG_SERVICES} + Run_Keyword_If_At_Least_Oxygen Wait Until Keyword Succeeds 60 2 ClusterManagement.Check Status of Services @{GENIUS_DIAG_SERVICES} Log Start the tests ${conn_id_1}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Global Variable ${conn_id_1} @@ -94,15 +95,6 @@ check establishment Should contain ${check_establishment} ESTABLISHED [Return] ${check_establishment} -Check Service Status - [Arguments] ${odl_ip} ${system_ready_state} ${service_state} @{service_list} - [Documentation] Issues the karaf shell command showSvcStatus to verify the ready and service states are the same as the arguments passed - ${service_status_output} = Run Keyword If ${NUM_ODL_SYSTEM} > 1 Issue_Command_On_Karaf_Console showSvcStatus -n ${odl_ip} ${odl_ip} ${KARAF_SHELL_PORT} - ... ELSE Issue_Command_On_Karaf_Console showSvcStatus ${odl_ip} ${KARAF_SHELL_PORT} - Should Contain ${service_status_output} ${system_ready_state} - : FOR ${service} IN @{service_list} - \ Should Match Regexp ${service_status_output} ${service} +: ${service_state} - Create Vteps [Arguments] ${Dpn_id_1} ${Dpn_id_2} ${TOOLS_SYSTEM_IP} ${TOOLS_SYSTEM_2_IP} ${vlan} ${gateway-ip} [Documentation] This keyword creates VTEPs between ${TOOLS_SYSTEM_IP} and ${TOOLS_SYSTEM_2_IP} @@ -248,12 +240,6 @@ Verify Tunnel Status as UP ${Expected_Tunnel_Count} Set Variable ${Expected_Node_Count*${Expected_Node_Count - 1}} Should Be Equal As Strings ${Actual_Tunnel_Count} ${Expected_Tunnel_Count} -Check System Status - [Arguments] @{service_list} - [Documentation] This keyword will verify whether all the services are in operational and all nodes are active based on the number of odl systems - : FOR ${i} IN RANGE ${NUM_ODL_SYSTEM} - \ Check Service Status ${ODL_SYSTEM_${i+1}_IP} ACTIVE OPERATIONAL @{service_list} - Verify Tunnel Status [Arguments] ${tunnel_names} ${tunnel_status} [Documentation] Verifies if all tunnels in the input, has the expected status(UP/DOWN/UNKNOWN) diff --git a/csit/suites/genius/ITM_Direct_Tunnels.robot b/csit/suites/genius/ITM_Direct_Tunnels.robot index 8fa0d1d926..7ed3b1adc0 100644 --- a/csit/suites/genius/ITM_Direct_Tunnels.robot +++ b/csit/suites/genius/ITM_Direct_Tunnels.robot @@ -65,7 +65,7 @@ Verify VTEP After Restarting Controller 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 Genius.Check System Status + Wait Until Keyword Succeeds 60 3 ClusterManagement.Check Status of Services Wait Until Keyword Succeeds 30 3 Genius.Verify Tunnel Status as UP TZA Verify Tunnels By Disabling BFD