Make style more consistent in KarafKeywords 39/56939/3
authorVratko Polak <vrpolak@cisco.com>
Fri, 12 May 2017 10:43:35 +0000 (12:43 +0200)
committerLuis Gomez <ecelgp@gmail.com>
Fri, 12 May 2017 19:12:18 +0000 (19:12 +0000)
Change-Id: I9a3df364c1d63066561ba53997846e5fe2020044
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
csit/libraries/KarafKeywords.robot

index 12cc452bf0e8b5f52061cdb312b5d5d9973ba687..e60a517cebc6dff2830feb32e0b4709f439e1e75 100644 (file)
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Karaf library. This library is useful to deal with controller Karaf console for ssh sessions in cluster.
-...               Running Setup Karaf Keywords is necessary. If SetupUtils initialization is called, this gets initialized as well.
+...               Running Setup_Karaf_Keywords is necessary. If SetupUtils initialization is called, this gets initialized as well.
 ...               If this gets initialized, ClusterManagement gets initialized as well.
 Library           SSHLibrary
 Library           OperatingSystem
@@ -13,31 +13,31 @@ ${WORKSPACE}      /tmp
 ${connection_index_dict}    &{EMPTY}
 
 *** Keywords ***
-Setup Karaf Keywords
+Setup_Karaf_Keywords
     [Arguments]    ${http_timeout}=1
     [Documentation]    Initialize ClusterManagement. Open ssh karaf connections to each ODL.
     ClusterManagement.ClusterManagement_Setup    http_timeout=${http_timeout}
     BuiltIn.Comment    First connections to Karaf console may fail, so WUKS is used. TODO: Track as a Bug.
     : FOR    ${index}    IN    @{ClusterManagement__member_index_list}
-    \    BuiltIn.Wait_Until_Keyword_Succeeds    10x    0.2s    Open Controller Karaf Console On Background    member_index=${index}
+    \    BuiltIn.Wait_Until_Keyword_Succeeds    10x    0.2s    Open_Controller_Karaf_Console_On_Background    member_index=${index}
 
-Verify Feature Is Installed
+Verify_Feature_Is_Installed
     [Arguments]    ${feature_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}
     [Documentation]    Will Succeed if the given ${feature_name} is found in the output of "feature:list -i"
-    ${output}=    Issue Command On Karaf Console    feature:list -i | grep ${feature_name}    ${controller}    ${karaf_port}
-    Should Contain    ${output}    ${feature_name}
+    ${output} =    Issue_Command_On_Karaf_Console    feature:list -i | grep ${feature_name}    ${controller}    ${karaf_port}
+    BuiltIn.Should_Contain    ${output}    ${feature_name}
     [Return]    ${output}
 
-Issue Command On Karaf Console
+Issue_Command_On_Karaf_Console
     [Arguments]    ${cmd}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}    ${timeout}=10    ${loglevel}=INFO
     [Documentation]    Will execute the given ${cmd} by ssh'ing to the karaf console running on ${controller}
     ...    Note that this keyword will open&close new SSH connection, without switching back to previously current session.
-    Open Connection    ${controller}    port=${karaf_port}    prompt=${KARAF_PROMPT}    timeout=${timeout}
-    Login    ${KARAF_USER}    ${KARAF_PASSWORD}    loglevel=${loglevel}
-    Write    ${cmd}
-    ${output}    Read Until    ${KARAF_PROMPT}
-    Close Connection
-    Log    ${output}
+    SSHLibrary.Open_Connection    ${controller}    port=${karaf_port}    prompt=${KARAF_PROMPT}    timeout=${timeout}
+    SSHLibrary.Login    ${KARAF_USER}    ${KARAF_PASSWORD}    loglevel=${loglevel}
+    SSHLibrary.Write    ${cmd}
+    ${output}    SSHLibrary.Read_Until    ${KARAF_PROMPT}
+    SSHLibrary.Close_Connection
+    BuiltIn.Log    ${output}
     [Return]    ${output}
 
 Safe_Issue_Command_On_Karaf_Console
@@ -50,146 +50,146 @@ Check For Elements On Karaf Command Output Message
     [Arguments]    ${cmd}    ${elements}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}    ${timeout}=5
     [Documentation]    Will execute the command using Issue Command On Karaf Console then check for the given elements
     ...    in the command output message
-    ${output}    Issue Command On Karaf Console    ${cmd}    ${controller}    ${karaf_port}    ${timeout}
+    ${output}    Issue_Command_On_Karaf_Console    ${cmd}    ${controller}    ${karaf_port}    ${timeout}
     : FOR    ${i}    IN    @{elements}
-    \    Should Contain    ${output}    ${i}
+    \    BuiltIn.Should_Contain    ${output}    ${i}
 
-Verify Bundle Is Installed
+Verify_Bundle_Is_Installed
     [Arguments]    ${bundle_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}
     [Documentation]    Will succeed if the given ${bundle name} is present in the output of "bundle:list -s "
-    ${output}=    Issue Command On Karaf Console    bundle:list -s | grep ${bundle_name}    ${controller}    ${karaf_port}
-    Should Contain    ${output}    ${bundle_name}
+    ${output} =    Issue_Command_On_Karaf_Console    bundle:list -s | grep ${bundle_name}    ${controller}    ${karaf_port}
+    BuiltIn.Should_Contain    ${output}    ${bundle_name}
     [Return]    ${output}
 
-Verify Bundle Is Not Installed
+Verify_Bundle_Is_Not_Installed
     [Arguments]    ${bundle_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}
     [Documentation]    Will succeed if the given ${bundle_name} is NOT found in the output of "bundle:list -s"
-    ${output}=    Issue Command On Karaf Console    bundle:list -i | grep ${bundle_name}    ${controller}    ${karaf_port}
-    Should Not Contain    ${output}    ${bundle_name}
+    ${output} =    Issue_Command_On_Karaf_Console    bundle:list -i | grep ${bundle_name}    ${controller}    ${karaf_port}
+    BuiltIn.Should_Not_Contain    ${output}    ${bundle_name}
     [Return]    ${output}
 
-Check Karaf Log Has Messages
+Check_Karaf_Log_Has_Messages
     [Arguments]    ${filter_string}    @{message_list}
     [Documentation]    Will succeed if the @{messages} are found in \ the output of "log:display"
-    ${output}=    Issue Command On Karaf Console    log:display | grep ${filter_string}
+    ${output} =    Issue_Command_On_Karaf_Console    log:display | grep ${filter_string}
     : FOR    ${message}    IN    @{message_list}
-    \    Should Contain    ${output}    ${message}
+    \    BuiltIn.Should_Contain    ${output}    ${message}
     [Return]    ${output}
 
-Install a Feature
+Install_A_Feature
     [Arguments]    ${feature_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}    ${timeout}=180
     [Documentation]    Will Install the given ${feature_name}
-    Log    ${timeout}
-    ${output}=    Issue Command On Karaf Console    feature:install ${feature_name}    ${controller}    ${karaf_port}    ${timeout}
-    Log    ${output}
+    BuiltIn.Log    ${timeout}
+    ${output} =    Issue_Command_On_Karaf_Console    feature:install ${feature_name}    ${controller}    ${karaf_port}    ${timeout}
+    BuiltIn.Log    ${output}
     [Return]    ${output}
 
-Install a Feature Using Active Connection
+Install_A_Feature_Using_Active_Connection
     [Arguments]    ${feature_name}
     [Documentation]    Will Install the given ${feature_name} using active connection
-    ${cmd}=    BuiltIn.Set_Variable    feature:install ${feature_name}
-    Write    ${cmd}
+    ${cmd} =    BuiltIn.Set_Variable    feature:install ${feature_name}
+    SSHLibrary.Write    ${cmd}
     ${output}    SSHLibrary.Read_Until    ${KARAF_PROMPT}
-    Log    ${output}
+    BuiltIn.Log    ${output}
     [Return]    ${output}
 
-Uninstall a Feature
+Uninstall_A_Feature
     [Arguments]    ${feature_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}    ${timeout}=180
     [Documentation]    Will UnInstall the given ${feature_name}
-    ${output}=    Issue Command On Karaf Console    feature:uninstall ${feature_name}    ${controller}    ${karaf_port}    ${timeout}
-    Log    ${output}
+    ${output} =    Issue_Command_On_Karaf_Console    feature:uninstall ${feature_name}    ${controller}    ${karaf_port}    ${timeout}
+    BuiltIn.Log    ${output}
     [Return]    ${output}
 
-Open Controller Karaf Console On Background
+Open_Controller_Karaf_Console_On_Background
     [Arguments]    ${member_index}=${1}    ${timeout}=10    ${loglevel}=INFO
     [Documentation]    If there is a stored ssh connection index of connection to the controller's karaf console for ${member_index},
     ...    close the previous connection. In any case create a new connection
     ...    to karaf console for ${member_index}, set correct prompt set and login to karaf console.
     ...    Store connection index for ${member_index} and restore the previous active connection.
-    ${current_ssh_connection_object}=    SSHLibrary.Get Connection
+    ${current_ssh_connection_object}=    SSHLibrary.Get_Connection
     BuiltIn.Log    ${connection_index_dict}
     BuiltIn.Log    ${member_index}
-    ${status}    ${old_connection_index} =    BuiltIn.Run Keyword And Ignore Error    Get From Dictionary    ${connection_index_dict}    ${member_index}
-    BuiltIn.Run Keyword If    '${status}'=='PASS'    BuiltIn.Run Keywords    SSHLibrary.Switch Connection    ${old_connection_index}
-    ...    AND    SSHLibrary.Close Connection
-    ${odl_ip}=    ClusterManagement.Resolve_IP_Address_For_Member    ${member_index}
-    SSHLibrary.Open Connection    ${odl_ip}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_DETAILED_PROMPT}    timeout=${timeout}
-    ${karaf_connection_object}=    SSHLibrary.Get Connection
-    Collections.Set To Dictionary    ${connection_index_dict}    ${member_index}    ${karaf_connection_object.index}
+    ${status}    ${old_connection_index} =    BuiltIn.Run_Keyword_And_Ignore_Error    Get From Dictionary    ${connection_index_dict}    ${member_index}
+    BuiltIn.Run_Keyword_If    '${status}'=='PASS'    BuiltIn.Run_Keywords    SSHLibrary.Switch_Connection    ${old_connection_index}
+    ...    AND    SSHLibrary.Close_Connection
+    ${odl_ip} =    ClusterManagement.Resolve_IP_Address_For_Member    ${member_index}
+    SSHLibrary.Open_Connection    ${odl_ip}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_DETAILED_PROMPT}    timeout=${timeout}
+    ${karaf_connection_object} =    SSHLibrary.Get_Connection
+    Collections.Set_To_Dictionary    ${connection_index_dict}    ${member_index}    ${karaf_connection_object.index}
     SSHLibrary.Login    ${KARAF_USER}    ${KARAF_PASSWORD}    loglevel=${loglevel}
-    [Teardown]    SSHKeywords.Restore Current SSH Connection From Index    ${current_ssh_connection_object.index}
+    [Teardown]    SSHKeywords.Restore_Current_Ssh_Connection_From_Index    ${current_ssh_connection_object.index}
 
-Open Controller Karaf Console With Timeout
+Open_Controller_Karaf_Console_With_Timeout
     [Arguments]    ${member_index}=${1}    ${timeout}=3s
     [Documentation]    Open new connection to karaf console for member index with specified timeout.
     BuiltIn.Log    ${member_index}
-    ${odl_ip}=    ClusterManagement.Resolve_IP_Address_For_Member    ${member_index}
-    SSHLibrary.Open Connection    ${odl_ip}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_DETAILED_PROMPT}    timeout=${timeout}
+    ${odl_ip} =    ClusterManagement.Resolve_IP_Address_For_Member    ${member_index}
+    SSHLibrary.Open_Connection    ${odl_ip}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_DETAILED_PROMPT}    timeout=${timeout}
     SSHLibrary.Login    ${KARAF_USER}    ${KARAF_PASSWORD}
 
-Configure Timeout For Karaf Console
+Configure_Timeout_For_Karaf_Console
     [Arguments]    ${timeout}    ${member_index_list}=${EMPTY}
     [Documentation]    Configure a different timeout for each Karaf console.
-    ${index_list} =    ClusterManagement.List Indices Or All    given_list=${member_index_list}
-    ${current_connection_object}=    SSHLibrary.Get Connection
+    ${index_list} =    ClusterManagement.List_Indices_Or_All    given_list=${member_index_list}
+    ${current_connection_object} =    SSHLibrary.Get_Connection
     : FOR    ${member_index}    IN    @{index_list}    # usually: 1, 2, 3
-    \    ${karaf_connection_index}=    Collections.Get From Dictionary    ${connection_index_dict}    ${member_index}
-    \    SSHLibrary.Switch Connection    ${karaf_connection_index}
+    \    ${karaf_connection_index} =    Collections.Get_From_Dictionary    ${connection_index_dict}    ${member_index}
+    \    SSHLibrary.Switch_Connection    ${karaf_connection_index}
     \    SSHLibrary.Set_Client_Configuration    timeout=${timeout}
-    [Teardown]    SSHKeywords.Restore Current SSH Connection From Index    ${current_connection_object.index}
+    [Teardown]    SSHKeywords.Restore_Current_Ssh_Connection_From_Index    ${current_connection_object.index}
 
-Execute Controller Karaf Command On Background
+Execute_Controller_Karaf_Command_On_Background
     [Arguments]    ${command}    ${member_index}=${1}
     [Documentation]    Send command to karaf without affecting current SSH connection. Read, log and return response.
-    ${karaf_connection_index}=    Collections.Get From Dictionary    ${connection_index_dict}    ${member_index}
-    ${current_connection_index}=    SSHLibrary.Switch Connection    ${karaf_connection_index}
-    ${status_write}    ${message_write}=    BuiltIn.Run Keyword And Ignore Error    SSHLibrary.Write    ${command}
-    ${status_wait}    ${message_wait}=    BuiltIn.Run Keyword And Ignore Error    SSHLibrary.Read Until Prompt
+    ${karaf_connection_index} =    Collections.Get_From_Dictionary    ${connection_index_dict}    ${member_index}
+    ${current_connection_index} =    SSHLibrary.Switch_Connection    ${karaf_connection_index}
+    ${status_write}    ${message_write} =    BuiltIn.Run_Keyword_And_Ignore_Error    SSHLibrary.Write    ${command}
+    ${status_wait}    ${message_wait} =    BuiltIn.Run_Keyword_And_Ignore_Error    SSHLibrary.Read_Until_Prompt
     BuiltIn.Run Keyword If    '${status_write}' != 'PASS'    BuiltIn.Fail    Failed to send the command: ${command}
     BuiltIn.Log    ${message_wait}
-    BuiltIn.Run Keyword If    '${status_wait}' != 'PASS'    BuiltIn.Fail    Failed to see prompt after sending the command: ${command}
-    [Teardown]    SSHKeywords.Restore Current SSH Connection From Index    ${current_connection_index}
+    BuiltIn.Run_Keyword_If    '${status_wait}' != 'PASS'    BuiltIn.Fail    Failed to see prompt after sending the command: ${command}
+    [Teardown]    SSHKeywords.Restore_Current_Ssh_Connection_From_Index    ${current_connection_index}
     [Return]    ${message_wait}
 
-Execute Controller Karaf Command With Retry On Background
+Execute_Controller_Karaf_Command_With_Retry_On_Background
     [Arguments]    ${command}    ${member_index}=${1}
     [Documentation]    Attemp to send command to karaf for ${member_index}, if fail then open connection and try again.
-    ${status}    ${message}=    BuiltIn.Run Keyword And Ignore Error    Execute Controller Karaf Command On Background    ${command}    ${member_index}
+    ${status}    ${message} =    BuiltIn.Run_Keyword_And_Ignore_Error    Execute_Controller_Karaf_Command_On_Background    ${command}    ${member_index}
     BuiltIn.Return_From_Keyword_If    '${status}' == 'PASS'    ${message}
     # TODO: Verify this does not leak connections indices.
-    Open Controller Karaf Console On Background    ${member_index}
-    ${message}=    Execute Controller Karaf Command On Background    ${command}    ${member_index}
+    Open_Controller_Karaf_Console_On_Background    ${member_index}
+    ${message} =    Execute_Controller_Karaf_Command_On_Background    ${command}    ${member_index}
     [Return]    ${message}
 
-Log Message To Controller Karaf
+Log_Message_To_Controller_Karaf
     [Arguments]    ${message}    ${member_index_list}=${EMPTY}    ${tolerate_failure}=True
     [Documentation]    Make sure this resource is initialized. Send a message into the controller's karaf log file on every node listed (or all).
     ...    By default, failure while processing a node is silently ignored, unless ${tolerate_failure} is False.
-    ${index_list} =    ClusterManagement.List Indices Or All    given_list=${member_index_list}
+    ${index_list} =    ClusterManagement.List_Indices_Or_All    given_list=${member_index_list}
     : FOR    ${index}    IN    @{index_list}    # usually: 1, 2, 3.
-    \    ${status}    ${output}=    BuiltIn.Run Keyword And Ignore Error    Execute Controller Karaf Command With Retry On Background    log:log "ROBOT MESSAGE: ${message}"    member_index=${index}
+    \    ${status}    ${output} =    BuiltIn.Run_Keyword_And_Ignore_Error    Execute_Controller_Karaf_Command_With_Retry_On_Background    log:log "ROBOT MESSAGE: ${message}"    member_index=${index}
     \    BuiltIn.Run_Keyword_Unless    ${tolerate_failure} or "${status}" == "PASS"    BuiltIn.Fail    ${output}
 
-Log Test Suite Start To Controller Karaf
+Log_Test_Suite_Start_To_Controller_Karaf
     [Arguments]    ${member_index_list}=${EMPTY}
     [Documentation]    Log suite name to karaf log, useful in suite setup.
-    Log Message To Controller Karaf    Starting suite ${SUITE_SOURCE}    ${member_index_list}
+    Log_Message_To_Controller_Karaf    Starting suite ${SUITE_SOURCE}    ${member_index_list}
 
-Log Testcase Start To Controller Karaf
+Log_Testcase_Start_To_Controller_Karaf
     [Arguments]    ${member_index_list}=${EMPTY}
     [Documentation]    Log test case name to karaf log, useful in test case setup.
-    Log Message To Controller Karaf    Starting test ${TEST_NAME}    ${member_index_list}
+    Log_Message_To_Controller_Karaf    Starting test ${TEST_NAME}    ${member_index_list}
 
-Set Bgpcep Log Levels
+Set_Bgpcep_Log_Levels
     [Arguments]    ${bgpcep_level}=${DEFAULT_BGPCEP_LOG_LEVEL}    ${protocol_level}=${DEFAULT_PROTOCOL_LOG_LEVEL}    ${member_index_list}=${EMPTY}
     [Documentation]    Assuming OCKCOB was used, set logging level on bgpcep and protocol loggers without affecting current SSH session.
     # FIXME: Move to appropriate Resource
-    ${index_list} =    ClusterManagement.List Indices Or All    given_list=${member_index_list}
+    ${index_list} =    ClusterManagement.List_Indices_Or_All    given_list=${member_index_list}
     : FOR    ${index}    IN    @{index_list}    # usually: 1, 2, 3.
-    \    Execute Controller Karaf Command On Background    log:set ${bgpcep_level} org.opendaylight.bgpcep    member_index=${index}
-    \    Execute Controller Karaf Command On Background    log:set ${protocol_level} org.opendaylight.protocol    member_index=${index}
+    \    Execute_Controller_Karaf_Command_On_Background    log:set ${bgpcep_level} org.opendaylight.bgpcep    member_index=${index}
+    \    Execute_Controller_Karaf_Command_On_Background    log:set ${protocol_level} org.opendaylight.protocol    member_index=${index}
 
-Wait For Karaf Log
+Wait_For_Karaf_Log
     [Arguments]    ${message}    ${timeout}=60    ${member_index}=${1}
     [Documentation]    Read karaf logs until message appear
     # TODO: refactor this keyword to use the new workflow to account for multiple controllers.    Initial work was done
@@ -197,30 +197,30 @@ Wait For Karaf Log
     # however, the consumers of this keyword were breaking after that change.    Initial theory is that a previous
     # keyword used before this "Wait For Karaf Log" keyword was closing the karaf console connection, so the
     # "Flexible SSH Login" keyword from the patch above (45596) was failing.
-    Log    Waiting for '${message}' in karaf log
-    Open Connection    ${ODL_SYSTEM_IP}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_PROMPT}    timeout=${timeout}
-    Login    ${KARAF_USER}    ${KARAF_PASSWORD}    loglevel=${loglevel}
-    Write    log:tail
-    Read Until    ${message}
-    Close Connection
-
-Restart Bundle
+    BuiltIn.Log    Waiting for '${message}' in karaf log
+    SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    port=${KARAF_SHELL_PORT}    prompt=${KARAF_PROMPT}    timeout=${timeout}
+    BuiltIn.Login    ${KARAF_USER}    ${KARAF_PASSWORD}    loglevel=${loglevel}
+    SSHLibrary.Write    log:tail
+    SSHLibrary.Read_Until    ${message}
+    SSHLibrary.Close_Connection
+
+Restart_Bundle
     [Arguments]    ${bundle_id}
     [Documentation]    Restarts bundle passed as argument. Note this operation is only for testing and not production environments
     # TODO: prepare this for cluster environment and multiple controllers
     Safe_Issue_Command_On_Karaf_Console    bundle:restart -f $(bundle:id '${bundle_id}')
 
-Restart Karaf
+Restart_Karaf
     [Documentation]    Restarts Karaf and polls log to detect when Karaf is up and running again
     # TODO: prepare this for cluster environment and multiple controllers
     Safe_Issue_Command_On_Karaf_Console    log:clear
     Issue_Command_On_Karaf_Console    shutdown -r -f
-    Run Keyword And Return Status    Wait Until Keyword Succeeds    240s    60s    Wait For Karaf Log    Karaf started in
+    BuiltIn.Run_Keyword_And_Return_Status    BuiltIn.Wait_Until_Keyword_Succeeds    240s    60s    Wait_For_Karaf_Log    Karaf started in
 
-Restart Jetty
+Restart_Jetty
     [Documentation]    Restarts jetty bundle (to reload certificates or key/truststore information)
     Safe_Issue_Command_On_Karaf_Console    log:clear
-    Restart Bundle    OPS4J Pax Web - Jetty
-    Wait For Karaf Log    Instantiated the Application class org.opendaylight.restconf.RestconfApplication
-    Wait For Karaf Log    Instantiated the Application class org.opendaylight.netconf.sal.rest.impl.RestconfApplication
-    Wait For Karaf Log    Instantiated the Application class org.opendaylight.aaa.idm.IdmLightApplication
+    Restart_Bundle    OPS4J Pax Web - Jetty
+    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.restconf.RestconfApplication
+    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.netconf.sal.rest.impl.RestconfApplication
+    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.aaa.idm.IdmLightApplication