X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FSwitchUtils.robot;h=902c07bd5374c18278f842286b1d8f4776657234;hb=9481d21ef0f8ae7747d78de305c41ee7850c24f7;hp=4058ff0549a29df480bc0952f68d305242d2144a;hpb=44648ca63082d8c518385ce5b3b23ee162402f1c;p=integration%2Ftest.git diff --git a/csit/libraries/SwitchUtils.robot b/csit/libraries/SwitchUtils.robot index 4058ff0549..902c07bd53 100644 --- a/csit/libraries/SwitchUtils.robot +++ b/csit/libraries/SwitchUtils.robot @@ -22,14 +22,14 @@ Get Switch Datapath ID Verify Switch In Operational Data Store [Arguments] ${switch} [Documentation] Verifies the existence of the switch.datapath_id in the operational datastore. - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Log ${resp.content} Should Match Regexp ${resp.content} openflow:${switch.datapath_id} Verify Switch Not In Operational Data Store [Arguments] ${switch} [Documentation] Verifies that the given switch.datapath_id is not in the operational datastore. - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} Log ${resp.content} Should Not Match Regexp ${resp.content} openflow:${switch.datapath_id} @@ -89,7 +89,7 @@ Open Connection Wrapper ... switch.mgmt_protocol, the connection open will be handled by the right robot ... library (Telnet or SSHLibrary). \ The connection_index is returned. Run Keyword If "${switch.mgmt_protocol}" == "ssh" Call Method ${switch} set_ssh_key ${USER_HOME}/.ssh/${SSH_KEY} - Run Keyword If "${switch.mgmt_protocol}" == "ssh" Call Method ${switch} set_mgmt_user ${MININET_USER} + Run Keyword If "${switch.mgmt_protocol}" == "ssh" Call Method ${switch} set_mgmt_user ${TOOLS_SYSTEM_USER} ${connection_index}= Run Keyword If "${switch.mgmt_protocol}" == "ssh" SSHLibrary.Open Connection ${switch.mgmt_ip} prompt=${switch.mgmt_prompt} timeout=30s Run Keyword If "${switch.mgmt_protocol}" == "ssh" Login With Public Key ${switch.mgmt_user} ${switch.ssh_key} any ${connection_index}= Run Keyword If "${switch.mgmt_protocol}" == "telnet" Telnet.Open Connection ${switch.mgmt_ip}