Move Utils.Flexible_*_Login into SSHKeywords

Change-Id: Ia9ed4957ed349f93913276375eaec769304e3467
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/csit/libraries/AAA/DockerKeystone.robot b/csit/libraries/AAA/DockerKeystone.robot
index f4b4071b188056326c2a00c4ce1538e00a323407..659ba49c7e0f1b90be03e2af7e1ca4d3359ec99b 100644 (file)
--- a/csit/libraries/AAA/DockerKeystone.robot
+++ b/csit/libraries/AAA/DockerKeystone.robot
@@ -83,7 +83,7 @@ Get Admin Role Id
 Run Docker Keystone
     [Documentation]    Run Keystone in a docker container hosted in the SYSTEM TOOL server and define "CSC_user" and "CSC_user_no_admin" users, the former with "admin" role and the latter with "user" role
     ${output}    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    timeout=20s
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHLibrary.Put File    ${CURDIR}/../../suites/aaa/keystone/start_keystone.sh
     SSHLibrary.Execute Command    ./start_keystone.sh
     Wait Until Keyword Succeeds    10x    15    Check Keystone Log File For String    GET

diff --git a/csit/libraries/DaeximKeywords.robot b/csit/libraries/DaeximKeywords.robot
index e666daacd7905688c7642a9a169222a1cb47031b..31e5263393343f109574065cb3165244232a95b8 100644 (file)
--- a/csit/libraries/DaeximKeywords.robot
+++ b/csit/libraries/DaeximKeywords.robot
@@ -6,7 +6,7 @@ Library           RequestsLibrary
 Resource          ClusterManagement.robot
 Resource          ../variables/daexim/DaeximVariables.robot
 Resource          ../variables/Variables.robot
-Resource          Utils.robot
+Resource          SSHKeywords.robot
 
 *** Keywords ***
 Verify Export Files
@@ -106,7 +106,7 @@ Return ConnnectionID
     [Arguments]    ${system}=${ODL_SYSTEM_IP}    ${prompt}=${DEFAULT_LINUX_PROMPT}    ${prompt_timeout}=${DEFAULT_TIMEOUT}    ${user}=${ODL_SYSTEM_USER}    ${password}=${ODL_SYSTEM_PASSWORD}
     [Documentation]    Returns the connection of any host. Defaults to controller
     ${conn_id}    SSHLibrary.Open Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Utils.Flexible SSH Login    ${user}    ${password}
+    SSHKeywords.Flexible SSH Login    ${user}    ${password}
     [Return]    ${conn_id}
 
 Cleanup Directory

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index 24bb1a344b432677c72c74dcc9678b378b650e51..8f08bc55daab4b10dd98ef58b7c362dfe2f60f7b 100644 (file)
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -9,6 +9,7 @@ Library           RequestsLibrary
 Library           ./UtilLibrary.py
 Resource          KarafKeywords.robot
 Resource          OpenStackOperations.robot
+Resource          SSHKeywords.robot
 Variables         ../variables/Variables.py
 
 *** Variables ***
@@ -54,7 +55,7 @@ Devstack Suite Setup
     Set Suite Variable    ${devstack_conn_id}
     Set Suite Variable    ${source_pwd}
     Log    ${devstack_conn_id}
-    Utils.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
+    SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     SSHLibrary.Set Client Configuration    timeout=${default_devstack_prompt_timeout}
 
 Write Commands Until Prompt

diff --git a/csit/libraries/GBP/ConnUtils.robot b/csit/libraries/GBP/ConnUtils.robot
index 8bd83ddc2237ac9278949b049b2b44a925819ff8..4ca15f699db2a5d5564c74a0ecb6ba00c1b4ad43 100755 (executable)
--- a/csit/libraries/GBP/ConnUtils.robot
+++ b/csit/libraries/GBP/ConnUtils.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Library           SSHLibrary
-Resource          ../Utils.robot
+Resource          ../SSHKeywords.robot
 
 *** Variables ***
 ${VE_DIR}         ${WORKSPACE}/GBPSFC_VE
@@ -9,7 +9,7 @@ ${VE_DIR}         ${WORKSPACE}/GBPSFC_VE
 Connect and Login
     [Arguments]    ${ip}    ${timeout}=3s
     SSHLibrary.Open Connection    ${ip}    timeout=${timeout}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
 
 Execute in VE
     [Arguments]    ${cmd}    ${virt_env_path}=${VE_DIR}    ${timeout}=10s

diff --git a/csit/libraries/MininetKeywords.robot b/csit/libraries/MininetKeywords.robot
index 2528d7882f3750dee9a157a35a96a286fe38c96f..f489367ecfbd221062af4b8183b5a188b5500205 100644 (file)
--- a/csit/libraries/MininetKeywords.robot
+++ b/csit/libraries/MininetKeywords.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Documentation     Mininet library. This library is useful for tests using mininet tool to simulate devices.
 Library           SSHLibrary
+Resource          SSHKeywords.robot
 Resource          Utils.robot
 Resource          OVSDB.robot
 Resource          ClusterManagement.robot
@@ -18,7 +19,7 @@ Start Mininet Single Controller
     Utils.Clean Mininet System    ${mininet}
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Run Keyword If    '${custom}' != '${EMPTY}'    Put File    ${custom}
     Log    Start mininet ${options} to ${controller}
     SSHLibrary.Write    sudo mn --controller 'remote,ip=${controller},port=${ofport}' ${options}
@@ -36,7 +37,7 @@ Start Mininet Multiple Controllers
     Utils.Clean Mininet System    ${mininet}
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Run Keyword If    '${custom}' != '${EMPTY}'    Put File    ${custom}
     Log    Start mininet ${options}
     SSHLibrary.Write    sudo mn ${options}
@@ -75,7 +76,7 @@ Start Mininet Full Mesh
     [Documentation]    Start a custom mininet topology.
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${mininet_timeout}
     Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     Log    Copying ${topology_file_path} file to Mininet VM and Creating Full Mesh topology
     SSHLibrary.Put File    ${CURDIR}/${topology_file_path}
     SSHLibrary.Write    python ${topology_file} ${switches} ${hosts} 00:00:00:00:00:00 10.0.0.0

diff --git a/csit/libraries/OcpAgentKeywords.robot b/csit/libraries/OcpAgentKeywords.robot
index 4dbd632c1d6d15e4046e38808597a635ea9620df..2c976ac10246542eb792d63ac9e6e3142a079811 100755 (executable)
--- a/csit/libraries/OcpAgentKeywords.robot
+++ b/csit/libraries/OcpAgentKeywords.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     OCP agent library. This library is useful for tests using ocp agent tool to simulate RRH devices.
 Library           SSHLibrary
-Resource          Utils.robot
+Resource          SSHKeywords.robot
 Resource          OVSDB.robot
 Variables         ../variables/Variables.py
 
@@ -12,7 +12,7 @@ Install Agent
     Log    Clear any existing Agent
     ${conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${DEFAULT_TIMEOUT}
     Set Suite Variable    ${conn_id}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Write    rm -rf /tmp/agent
     SSHLibrary.Write    pkill -f OcpAgent
     SSHLibrary.Write    git clone https://git.opendaylight.org/gerrit/ocpplugin.git /tmp/agent
@@ -28,7 +28,7 @@ Start Emulator Single
     [Documentation]    Start Agent with custom topology and connect to controller.
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${DEFAULT_TIMEOUT}
     Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Write    java -cp /tmp/agent/simple-agent/src/main/java/ org.opendaylight.ocpplugin.OcpAgent ${controller} 1033 ${vendorID} ${serialNumber}
     SSHLibrary.Read Until    getParamResp
     [Return]    ${mininet_conn_id}
@@ -38,7 +38,7 @@ Start Emulator Multiple
     [Documentation]    Start Agent with custom topology and connect to controller.
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${mininet}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${DEFAULT_TIMEOUT}
     Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     : FOR    ${NODE_NUM}    IN RANGE    1    ${number}
     \    SSHLibrary.Write    java -cp /tmp/agent/simple-agent/src/main/java/ org.opendaylight.ocpplugin.OcpAgent ${controller} 1033 ${vendorID} ${NODE_NUM} &
     \    SSHLibrary.Read Until    getParamResp

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 20af49570272f328a263dc4c5a50e9115e77bc48..13eb4f2b3e94747f48fd845529a5973cd98abd97 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -4,6 +4,7 @@ Library           Collections
 Library           SSHLibrary
 Resource          DataModels.robot
 Resource          Utils.robot
+Resource          SSHKeywords.robot
 Resource          L2GatewayOperations.robot
 Resource          ../variables/Variables.robot
 Variables         ../variables/netvirt/Modules.py
@@ -645,7 +646,7 @@ Get DumpFlows And Ovsconfig
     [Documentation]    Get the OvsConfig and Flow entries from OVS from the Openstack Node
     Log    ${openstack_node_ip}
     SSHLibrary.Open Connection    ${openstack_node_ip}    prompt=${DEFAULT_LINUX_PROMPT}
-    Utils.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
+    SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     SSHLibrary.Set Client Configuration    timeout=${default_devstack_prompt_timeout}
     Write Commands Until Expected Prompt    ip -o link    ${DEFAULT_LINUX_PROMPT_STRICT}
     Write Commands Until Expected Prompt    ip -o addr    ${DEFAULT_LINUX_PROMPT_STRICT}
@@ -687,7 +688,7 @@ Get Karaf Log Events From Test Start
 
 Get ControlNode Connection
     ${control_conn_id}=    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
-    Utils.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
+    SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     SSHLibrary.Set Client Configuration    timeout=30s
     Source Password    force=yes
     [Return]    ${control_conn_id}

diff --git a/csit/libraries/SSHKeywords.robot b/csit/libraries/SSHKeywords.robot
index 61f972c44110b2fb6f93a74c75c5eb2f48dd7856..eea009d98cb718b2a1daf4308a641d7884844ff0 100644 (file)
--- a/csit/libraries/SSHKeywords.robot
+++ b/csit/libraries/SSHKeywords.robot
@@ -12,9 +12,6 @@ Documentation     Resource enhancing SSHLibrary with Keywords used in multiple s
 ...               When the Keywords assume a SSH session is active,
 ...               and if the Keywords do not fit into a more specific Resource,
 ...               you can place them here.
-...
-...               TODO: Migrate Keywords related to handling SSH here.
-...               That may include Utils.Flexible_SSH_Login, and similar.
 Library           SSHLibrary
 Resource          ${CURDIR}/Utils.robot
 Resource          ../variables/Variables.robot
@@ -28,14 +25,14 @@ Open_Connection_To_ODL_System
     [Arguments]    ${ip_address}=${ODL_SYSTEM_IP}    ${timeout}=10s
     [Documentation]    Open a connection to the ODL system at ${ip_address} and return its identifier.
     ${odl_connection} =    SSHLibrary.Open_Connection    ${ip_address}    prompt=${ODL_SYSTEM_PROMPT}    timeout=${timeout}
-    Utils.Flexible_Controller_Login
+    Flexible_Controller_Login
     [Return]    ${odl_connection}
 
 Open_Connection_To_Tools_System
     [Arguments]    ${ip_address}=${TOOLS_SYSTEM_IP}    ${timeout}=10s
     [Documentation]    Open a connection to the tools system at ${ip_address} and return its identifier.
     ${tools_connection} =    SSHLibrary.Open_Connection    ${ip_address}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${timeout}
-    Utils.Flexible_Mininet_Login
+    Flexible_Mininet_Login
     [Return]    ${tools_connection}
 
 Restore_Current_Ssh_Connection_From_Index
@@ -214,7 +211,7 @@ Unsafe_Copy_File_To_Remote_System
     [Documentation]    Copy the ${source} file to the ${destination} file on the remote ${system}. The keyword opens and closes a single
     ...    ssh connection and does not rely on any existing ssh connection that may be open.
     SSHLibrary.Open_Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Utils.Flexible_SSH_Login    ${user}    ${password}
+    Flexible_SSH_Login    ${user}    ${password}
     SSHLibrary.Put_File    ${source}    ${destination}
     SSHLibrary.Close Connection
 
@@ -235,3 +232,21 @@ Copy_File_To_Tools_System
     [Arguments]    ${system}    ${source}    ${destination}=./
     [Documentation]    Wrapper keyword to make it easier to copy a file to an Tools specific system
     SSHKeywords.Copy_File_To_Remote_System    ${system}    ${source}    ${destination}    ${TOOLS_SYSTEM_USER}    ${TOOLS_SYSTEM_PASSWORD}    ${TOOLS_SYSTEM_PROMPT}
+
+Flexible_SSH_Login
+    [Arguments]    ${user}    ${password}=${EMPTY}    ${delay}=0.5s
+    [Documentation]    On active SSH session: if given non-empty password, do Login, else do Login With Public Key.
+    ${pwd_length} =    BuiltIn.Get Length    ${password}
+    # ${pwd_length} is guaranteed to be an integer, so we are safe to evaluate it as Python expression.
+    BuiltIn.Run Keyword And Return If    ${pwd_length} > 0    SSHLibrary.Login    ${user}    ${password}    delay=${delay}
+    BuiltIn.Run Keyword And Return    SSHLibrary.Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    ${KEYFILE_PASS}    delay=${delay}
+
+Flexible_Mininet_Login
+    [Arguments]    ${user}=${TOOLS_SYSTEM_USER}    ${password}=${TOOLS_SYSTEM_PASSWORD}    ${delay}=0.5s
+    [Documentation]    Call Flexible SSH Login, but with default values suitable for Mininet machine.
+    BuiltIn.Run Keyword And Return    Flexible SSH Login    user=${user}    password=${password}    delay=${delay}
+
+Flexible_Controller_Login
+    [Arguments]    ${user}=${ODL_SYSTEM_USER}    ${password}=${ODL_SYSTEM_PASSWORD}    ${delay}=0.5s
+    [Documentation]    Call Flexible SSH Login, but with default values suitable for Controller machine.
+    BuiltIn.Run Keyword And Return    Flexible SSH Login    user=${user}    password=${password}    delay=${delay}

diff --git a/csit/libraries/Tcpdump.robot b/csit/libraries/Tcpdump.robot
index 6fd11c8f26d26dda381934f462bb16bd64f03048..748a8714d727688d839f05d268e3ff7e96cf96dd 100644 (file)
--- a/csit/libraries/Tcpdump.robot
+++ b/csit/libraries/Tcpdump.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Documentation     Library to catch traffic/packets using linux tcpdump command
 Library           SSHLibrary
+Resource          SSHKeywords.robot
 Resource          Utils.robot
 Resource          RemoteBash.robot
 Variables         ../variables/Variables.py
@@ -19,7 +20,7 @@ Start Tcpdumping
     [Documentation]    Connects to the remote machine via ssh and starts tcpdump linux command
     ${currentcon}=    SSHLibrary.Get Connection    index=True
     SSHLibrary.Open Connection    ${system}    prompt=${prompt}    timeout=${timeout}    alias=${dumpalias}
-    Utils.Flexible SSH Login    ${user}    password=${password}    delay=${timeout}
+    SSHKeywords.Flexible SSH Login    ${user}    password=${password}    delay=${timeout}
     SSHLibrary.Write    ${dumpcmd} -i ${eth} ${more_params}
     Run Keyword If    ${currentcon}==${None}    Return From Keyword
     SSHLibrary.Switch Connection    ${currentcon}
@@ -45,7 +46,7 @@ Start Packet Capture On Node
     [Documentation]    Connects to the remote machine and starts tcpdump
     ${current_ssh_connection}=    SSHLibrary.Get Connection
     ${conn_id}=    SSHLibrary.Open Connection    ${node_ip}    prompt=${prompt}    timeout=${prompt_timeout}
-    Flexible SSH Login    ${user}    ${password}
+    SSHKeywords.Flexible SSH Login    ${user}    ${password}
     ${cmd} =    Set Variable    sudo /usr/sbin/tcpdump -vvv -ni ${networkAdapter} -w /tmp/${file_Name}.pcap
     ${stdout}    ${stderr} =    SSHLibrary.Start Command    ${cmd}
     Log    ${stderr}

diff --git a/csit/libraries/UscUtils.robot b/csit/libraries/UscUtils.robot
index a65548b8e3db13893bc3a0b79f2d625dca18ee56..b96500a248b5e25418874128c2e53816836bd36c 100644 (file)
--- a/csit/libraries/UscUtils.robot
+++ b/csit/libraries/UscUtils.robot
@@ -3,6 +3,7 @@ Library           Collections
 Library           SSHLibrary
 Library           UtilLibrary.py
 Resource          RemoteBash.robot
+Resource          SSHKeywords.robot
 
 *** Variables ***
 ${REST_VIEW_CHANNEL}    /restconf/operations/usc-channel:view-channel

diff --git a/csit/libraries/Utils.robot b/csit/libraries/Utils.robot
index 554306e8285581207da0141ce5a3bf2f62d474fd..d42bc4096f7a318dd4f97b617f4bdc5fa2622328 100644 (file)
--- a/csit/libraries/Utils.robot
+++ b/csit/libraries/Utils.robot
@@ -26,7 +26,7 @@ Start Mininet
     Clean Mininet System
     ${mininet_conn_id}=    Open Connection    ${system}    prompt=${prompt}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
-    Flexible Mininet Login    user=${user}    password=${password}
+    SSHKeywords.Flexible Mininet Login    user=${user}    password=${password}
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Write    ${start}
     Read Until    mininet>
@@ -171,24 +171,6 @@ Strip Quotes
     ${string_to_return}=    Replace String    ${string_to_strip}    "    \    count=-1
     [Return]    ${string_to_return}
 
-Flexible SSH Login
-    [Arguments]    ${user}    ${password}=${EMPTY}    ${delay}=0.5s
-    [Documentation]    On active SSH session: if given non-empty password, do Login, else do Login With Public Key.
-    ${pwd_length} =    BuiltIn.Get Length    ${password}
-    # ${pwd_length} is guaranteed to be an integer, so we are safe to evaluate it as Python expression.
-    BuiltIn.Run Keyword And Return If    ${pwd_length} > 0    SSHLibrary.Login    ${user}    ${password}    delay=${delay}
-    BuiltIn.Run Keyword And Return    SSHLibrary.Login With Public Key    ${user}    ${USER_HOME}/.ssh/${SSH_KEY}    ${KEYFILE_PASS}    delay=${delay}
-
-Flexible Mininet Login
-    [Arguments]    ${user}=${TOOLS_SYSTEM_USER}    ${password}=${TOOLS_SYSTEM_PASSWORD}    ${delay}=0.5s
-    [Documentation]    Call Flexible SSH Login, but with default values suitable for Mininet machine.
-    BuiltIn.Run Keyword And Return    Flexible SSH Login    user=${user}    password=${password}    delay=${delay}
-
-Flexible Controller Login
-    [Arguments]    ${user}=${ODL_SYSTEM_USER}    ${password}=${ODL_SYSTEM_PASSWORD}    ${delay}=0.5s
-    [Documentation]    Call Flexible SSH Login, but with default values suitable for Controller machine.
-    BuiltIn.Run Keyword And Return    Flexible SSH Login    user=${user}    password=${password}    delay=${delay}
-
 Run Command On Remote System
     [Arguments]    ${system}    ${cmd}    ${user}=${DEFAULT_USER}    ${password}=${EMPTY}    ${prompt}=${DEFAULT_LINUX_PROMPT}    ${prompt_timeout}=${DEFAULT_TIMEOUT}
     [Documentation]    Reduces the common work of running a command on a remote system to a single higher level
@@ -198,7 +180,7 @@ Run Command On Remote System
     BuiltIn.Log    Attempting to execute command "${cmd}" on remote system "${system}" by user "${user}" with keyfile pass "${keyfile_pass}" and prompt "${prompt}"
     BuiltIn.Log    ${password}
     ${conn_id}=    SSHLibrary.Open Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Flexible SSH Login    ${user}    ${password}
+    SSHKeywords.Flexible SSH Login    ${user}    ${password}
     ${stdout}    ${stderr}    SSHLibrary.Execute Command    ${cmd}    return_stderr=True
     SSHLibrary.Close Connection
     Log    ${stderr}
@@ -221,7 +203,7 @@ Verify File Exists On Remote System
     [Documentation]    Will create connection with public key and will PASS if the given ${file} exists,
     ...    otherwise will FAIL
     ${conn_id}=    Open Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Flexible SSH Login    ${user}    ${password}
+    SSHKeywords.Flexible SSH Login    ${user}    ${password}
     SSHLibrary.File Should Exist    ${file}
     Close Connection
 
@@ -480,7 +462,7 @@ Install Package On Ubuntu System
     [Documentation]    Keyword to install packages for testing to Ubuntu Mininet VM
     Log    Keyword to install package to Mininet Ubuntu VM
     Open Connection    ${system}    prompt=${prompt}    timeout=${prompt_timeout}
-    Flexible Mininet Login    user=${user}    password=${password}
+    SSHKeywords.Flexible Mininet Login    user=${user}    password=${password}
     Write    sudo apt-get install -y ${package_name}
     Read Until    ${prompt}
 

diff --git a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
index fd496dc1e0eb3d0f4ce3f7de219e3357190c0773..28f704af7de4afee1f4add816c301f45edcbd1a4 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
@@ -106,7 +106,7 @@ Setup_Everything
     ClusterManagement.ClusterManagement_Setup
     ${tools_system_conn_id}=    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${tools_system_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     Upload_Config_Files

diff --git a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot
index 6e3c9dcaa40a59658ef59368c46a645d2fe199ce..c172fdf7e680607f47a07d40786616cc86e3384c 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot
+++ b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot
@@ -106,7 +106,7 @@ Setup_Everything
     ClusterManagement.ClusterManagement_Setup
     ${tools_system_conn_id}=    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${tools_system_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     Upload_Config_Files

diff --git a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
index 1ca0116ae5325035c3755987d6e6f7d72637f9bb..6caa2e4b5a9d36a58bd472fea242ea7fec5a8c8e 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
+++ b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
@@ -69,7 +69,7 @@ Setup_Everything
     BuiltIn.Set_Suite_Variable    ${pc_all_indices}    ${indices}
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable.
     # TODO: Alternatively, create variable in Variables which starts with http.
     # Both TODOs would probably need to update every suite relying on current Variables.

diff --git a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
index dfe9251d78d1528b6ba73160440d95c1fa0f4da7..728315cb877b727f2493718a191f333b32cb65dc 100644 (file)
--- a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
+++ b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
@@ -13,7 +13,7 @@ Library           SSHLibrary
 Variables         ${CURDIR}/../../../variables/Variables.py
 Variables         ${CURDIR}/../../../variables/bgpuser/variables.py    ${TOOLS_SYSTEM_IP}    ${ODL_STREAM}
 Resource          ${CURDIR}/../../../libraries/ExaBgpLib.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
+Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
@@ -68,7 +68,7 @@ Start Suite
     [Documentation]    Suite setup keyword
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
     ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    ls    return_stdout=True    return_stderr=True
     ...    return_rc=True
     ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    sudo apt-get install -y python-pip    return_stdout=True    return_stderr=True

diff --git a/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot b/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
index 446a8fa6fb06a8e1d8f1901f189ab95b84fda3fa..81e0ddea256ab95d33d89873ee759e739c42623c 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
@@ -87,7 +87,7 @@ Start_Suite
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     ${tools_system_conn_id}=    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${tools_system_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}

diff --git a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
index 0f839725c710419b0139503ff3fcfd82ced8101d..6972621016ab72c32de5e2a8d780f0356dda920f 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
+++ b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
@@ -86,7 +86,7 @@ Start_Suite
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     ${tools_system_conn_id}=    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${tools_system_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}

diff --git a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
index 4a0e16407e774e51997c9cf0eca898887993eece..580f403a756369d355a8cec5bbd006d6ae4d634c 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
@@ -19,7 +19,6 @@ Test Setup        Run Keywords    SetupUtils.Setup_Test_With_Logging_And_Without
 Library           RequestsLibrary
 Library           SSHLibrary
 Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Library           ${CURDIR}/../../../libraries/BgpRpcClient.py    ${TOOLS_SYSTEM_IP}
@@ -316,7 +315,7 @@ Start_Suite
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
     RequestsLibrary.Create Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
     SSHLibrary.Put File    ${PLAY_SCRIPT}    .
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.

diff --git a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
index ac23699fd4b32aa1e3c227324e67ab9a269b3f7d..3bfa2199f4af82e82ebaa3f09a5471776d799c89 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
+++ b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
@@ -21,7 +21,6 @@ Library           RequestsLibrary
 Library           SSHLibrary
 Variables         ${CURDIR}/../../../variables/Variables.py
 Resource          ${CURDIR}/../../../libraries/ExaBgpLib.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
@@ -92,7 +91,7 @@ Start_Suite
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${mininet_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}

diff --git a/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot b/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
index 5e4cfc1bacd68ceedabb83e7aa308b14fc69cb28..e9acf134bbc4b1c9664a8156081da60c52ae4e95 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
+++ b/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
@@ -23,7 +23,6 @@ Resource          ${CURDIR}/../../../libraries/ExaBgpLib.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
 *** Variables ***
@@ -58,7 +57,7 @@ Start_Suite
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     ${tools_system_conn_id}=    SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set_Suite_Variable    ${tools_system_conn_id}
-    Utils.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible_Mininet_Login    ${TOOLS_SYSTEM_USER}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.17
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}

diff --git a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
index 5b63932010d0a80a30abce037ac8797a3e82c325..23a41cb8ede11237a3ec0b8ce47f4d9fda4c87a8 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
+++ b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
@@ -229,9 +229,9 @@ Teardown_Everything
 Open_BGP_Peer_Console
     [Documentation]    Create a session for BGP peer.
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=bgp_peer_console
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
 
 Open_BGP_Aplicationp_Peer_Console
     [Documentation]    Create a session for BGP peer.
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=bgp_app_peer_console
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login

diff --git a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot
index 66762dda4fb64763cc03a937a48e5d103396063f..7cc679de26f5068273717602c5cece5e30ef77b9 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot
+++ b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot
@@ -211,7 +211,7 @@ Setup_Everything
     # Both TODOs would probably need to update every suite relying on current Variables.
     SSHLibrary.Set_Default_Configuration    prompt=${ODL_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot
index 24bfa7a1682ee85d4c903efb62292ad1fdf7e00e..088661921a8661222aa3fc9be946b3df69e21743 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot
+++ b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot
@@ -147,7 +147,7 @@ Setup_Everything
     # Both TODOs would probably need to update every suite relying on current Variables.
     SSHLibrary.Set_Default_Configuration    prompt=${ODL_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot
index d2e517f99520c289128a7e157f40183a2e401b38..51d89b551d618dcf0e23490f4e0e644eef7af6af 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot
+++ b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot
@@ -176,7 +176,7 @@ Setup_Everything
     # Both TODOs would probably need to update every suite relying on current Variables.
     SSHLibrary.Set_Default_Configuration    prompt=${ODL_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot
index bfe6ce14d0035b01f941b67765b3f42f151de4f2..f7c3105e0563cf786c604eb42a7e6ec69f7f1c78 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot
+++ b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot
@@ -249,7 +249,7 @@ Setup_Everything
     # Both TODOs would probably need to update every suite relying on current Variables.
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot
index 6f577bcb3b7a0aedd86fbca6412e02fa0bfce6fe..92e333f15d518cd8bcc1e73e683b66f8385d3aa8 100644 (file)
--- a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot
+++ b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot
@@ -209,7 +209,7 @@ Setup_Everything
     # Both TODOs would probably need to update every suite relying on current Variables.
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
index c41fff94c061b622177c5e6b7a306c7309260605..099f0944d45df5c613a00cbb85e053d98dcb5637 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
+++ b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
@@ -64,7 +64,6 @@ Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 
@@ -346,12 +345,12 @@ Teardown_Everything
 Open_BGP_Peer_Console
     [Documentation]    Create a session for BGP peer.
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=bgp_peer_console
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
 
 Open_BGP_Aplicationp_Peer_Console
     [Documentation]    Create a session for BGP peer.
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=bgp_app_peer_console
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
 
 Switch_To_BGP_Peer_Console
     SSHLibrary.Switch Connection    bgp_peer_console

diff --git a/csit/suites/bgpcep/bgpuser/cases.robot b/csit/suites/bgpcep/bgpuser/cases.robot
index 1e4e103f8e5d63b72610e552b779b6fe0b459dc3..8da00f31b57c5f46f25d0779b20095f656ac2ab5 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/cases.robot
+++ b/csit/suites/bgpcep/bgpuser/cases.robot
@@ -228,7 +228,7 @@ Setup_Everything
     OperatingSystem.Create_Directory    ${EXPECTED_RESPONSES_FOLDER}
     OperatingSystem.Create_Directory    ${ACTUAL_RESPONSES_FOLDER}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot b/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
index bca748e859bdbd3cfece870deb178ec6090c5d33..a5dfe409b44bc069f8f736feee8841fb6b41e2d2 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
+++ b/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
@@ -33,7 +33,6 @@ Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
 *** Variables ***
@@ -202,11 +201,11 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     SSHLibrary.Set_Default_Configuration    prompt=${ODL_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    alias=ibgp_peer1_console
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    alias=ebgp_peer1_console
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    alias=ebgp_peer2_console
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
index b1bef4e7c9f08e968fa710a7615669e517fa868d..288de3337024500bbd219736f59c3aaeebe27bf0 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
+++ b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
@@ -27,7 +27,6 @@ Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
 *** Variables ***
@@ -133,7 +132,7 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=bgp_peer_console
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot b/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
index 3cf7b7047573ccca566ac0c81865fa7dda1ef1e0..e69ad294ac5b0fd1ecc5bca686437d0921b58485 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
+++ b/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
@@ -301,9 +301,9 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     SSHLibrary.Set_Default_Configuration    prompt=${ODL_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    alias=bgp_peer1_console
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}    alias=bgp_peer2_console
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     SSHKeywords.Require_Python
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py

diff --git a/csit/suites/bgpcep/throughpcep/cases.robot b/csit/suites/bgpcep/throughpcep/cases.robot
index 96d77298bcea844c48ba0e89191aa02d796587c6..aa551f40b2ea625bc8b89e80ea144140e0f337e9 100644 (file)
--- a/csit/suites/bgpcep/throughpcep/cases.robot
+++ b/csit/suites/bgpcep/throughpcep/cases.robot
@@ -119,8 +119,7 @@ Library           RequestsLibrary
 Library           ${CURDIR}/../../../libraries/AuthStandalone.py
 Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/NexusKeywords.robot    # for Deploy_Artifact
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot    # for Require_* and Assure_*
-Resource          ${CURDIR}/../../../libraries/Utils.robot    # for Flexible_SSH_Login
+Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot    # for Require_* and Assure_*, Flexible_SSH_Login
 
 *** Variables ***
 # This table acts as an exhaustive list of variables users can modify on pybot invocation.
@@ -167,7 +166,7 @@ Download_Pcc_Mock
     SSHLibrary.Open_Connection    ${PCCMOCKVM_IP}    alias=pccmock
     SSHLibrary.Set_Client_Configuration    timeout=10s
     SSHLibrary.Set_Client_Configuration    prompt=${PCCMOCKVM_PROMPT}
-    Utils.Flexible_SSH_Login    ${PCCMOCKVM_USER}    ${PCCMOCKVM_PASSWORD}    delay=4s
+    SSHKeywords.Flexible_SSH_Login    ${PCCMOCKVM_USER}    ${PCCMOCKVM_PASSWORD}    delay=4s
     ${file_name} =    NexusKeywords.Deploy_Test_Tool    bgpcep    pcep-pcc-mock
     BuiltIn.Set_Suite_Variable    ${mock_location}    ${file_name}
 
@@ -177,7 +176,7 @@ Put_Updater
     SSHLibrary.Open_Connection    ${UPDATERVM_IP}    alias=updater
     SSHLibrary.Set_Client_Configuration    timeout=20s
     SSHLibrary.Set_Client_Configuration    prompt=${UPDATERVM_PROMPT}
-    Utils.Flexible_SSH_Login    ${UPDATERVM_USER}    ${UPDATERVM_PASSWORD}    delay=4s
+    SSHKeywords.Flexible_SSH_Login    ${UPDATERVM_USER}    ${UPDATERVM_PASSWORD}    delay=4s
     SSHKeywords.Require_Python
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/pcep_updater/updater.py    ${UPDATERVM_WORKSPACE}/
     SSHLibrary.Put_File    ${CURDIR}/../../../libraries/AuthStandalone.py    ${UPDATERVM_WORKSPACE}/

diff --git a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
index 808a7977fb3dd30651c141ed88388d76b9e8f95d..7576a6b509f3ff9930116f7668d084a816ea7c93 100644 (file)
--- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
@@ -24,6 +24,7 @@ Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/RemoteBash.robot
+Resource          ../../../libraries/SSHKeywords.robot
 
 *** Variables ***
 ${ITEM_COUNT}     ${10000}
@@ -106,7 +107,7 @@ Start Suite
     KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=6s
     Builtin.Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
     SSHLibrary.Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/scripts/cluster_rest_script.py    .
     ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    ls    return_stdout=True    return_stderr=True
     ...    return_rc=True

diff --git a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
index 16a3067fe9213ac6e160c34258681dcedf57c5fe..aa8a9418235df0036277be44d6a50294fec32e14 100644 (file)
--- a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
@@ -24,6 +24,7 @@ Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/RemoteBash.robot
+Resource          ../../../libraries/SSHKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
 Resource          ../../../libraries/CarPeople.robot
 
@@ -110,7 +111,7 @@ Start Suite
     KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${CONTROLLER_LOG_LEVEL}
     ${mininet_conn_id}=    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
     Builtin.Set Suite Variable    ${mininet_conn_id}
-    Utils.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
+    SSHKeywords.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
     SSHLibrary.Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/scripts/cluster_rest_script.py    .
     ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    ls    return_stdout=True    return_stderr=True
     ...    return_rc=True

diff --git a/csit/suites/controller/benchmark/dsbenchmark.robot b/csit/suites/controller/benchmark/dsbenchmark.robot
index f51d192b20212b943e208bfe3eba58ea5fa42dda..9b88360317bf26409d5ada3742f1c6c092c47ae4 100644 (file)
--- a/csit/suites/controller/benchmark/dsbenchmark.robot
+++ b/csit/suites/controller/benchmark/dsbenchmark.robot
@@ -42,6 +42,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/RemoteBash.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
+Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
@@ -244,7 +245,7 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/mdsal_benchmark/${tool}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    requests

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/Connections.robot b/csit/suites/groupbasedpolicy/GBP/3-node/Connections.robot
index 785d0362f4c5def5fc60593f9ce8b9b58e4b2c8b..13ff8a6ad218c08eec2522129639dbc05af6a7f2 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/Connections.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/Connections.robot
@@ -2,18 +2,18 @@
 Documentation     Creates/closes SSH connections to all GBP nodes. Existing connections
 ...               can be identified by aliases.
 Library           SSHLibrary
-Resource          ../../../../libraries/Utils.robot
+Resource          ../../../../libraries/SSHKeywords.robot
 Resource          Variables.robot
 
 *** Keywords ***
 Start Connections
     [Documentation]    Establishes connections to remote VMs.
     SSHLibrary.Open Connection    ${GBP1}    alias=GBP1_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBP2}    alias=GBP2_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBP3}    alias=GBP3_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
 
 Close Connections
     [Documentation]    Closes connections to remote VMs.

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Connections.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Connections.robot
index a918e8e04e8e69f438252cc909a613cd46cd3202..d3916667b3136f9ac9bb9bc36d16a997ec2c63de 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Connections.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Connections.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Library           SSHLibrary
-Resource          ../../../../libraries/Utils.robot
+Resource          ../../../../libraries/SSHKeywords.robot
 Resource          ../../../../libraries/GBP/ConnUtils.robot
 Variables         ../../../../variables/Variables.py
 Resource          Variables.robot
@@ -9,17 +9,17 @@ Resource          Variables.robot
 Start Connections
     [Documentation]    Establishes connections to remote VMs.
     SSHLibrary.Open Connection    ${GBPSFC1}    alias=GPSFC1_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBPSFC2}    alias=GPSFC2_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBPSFC3}    alias=GPSFC3_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBPSFC4}    alias=GPSFC4_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBPSFC5}    alias=GPSFC5_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     SSHLibrary.Open Connection    ${GBPSFC6}    alias=GPSFC6_CONNECTION
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
 
 Close Connections
     [Documentation]    Closes connections to remote VMs.

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
index eed92160c9dd14ba37ab964087d3c10d4be41485..ff88a0d7bc36195b6bdba1f704d550828e45edda 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
@@ -5,7 +5,7 @@ Suite Teardown    Delete All Sessions
 Library           RequestsLibrary
 Library           OperatingSystem
 Variables         ../../../../../variables/Variables.py
-Resource          ../../../../../libraries/Utils.robot
+Resource          ../../../../../libraries/SSHKeywords.robot
 Resource          ../Variables.robot
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 
@@ -27,14 +27,14 @@ Put Service Function Forwarders
 Wait For Manager and Switch Connected on GBPSFC2
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC2}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw2
     SSHLibrary.Close Connection
 
 Wait For Manager and Switch Connected on GBPSFC4
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC4}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw4
     SSHLibrary.Close Connection
 

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
index d9987854119576351758e8f02e51f2c356ae60fc..20778b087713b3f544ced0ce63404debe0c7ef8c 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
@@ -5,7 +5,7 @@ Suite Teardown    Delete All Sessions
 Library           RequestsLibrary
 Library           OperatingSystem
 Variables         ../../../../../variables/Variables.py
-Resource          ../../../../../libraries/Utils.robot
+Resource          ../../../../../libraries/SSHKeywords.robot
 Resource          ../Variables.robot
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 
@@ -27,14 +27,14 @@ Put Service Function Forwarders
 Wait For Manager and Switch Connected on GBPSFC2
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC2}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw2
     SSHLibrary.Close Connection
 
 Wait For Manager and Switch Connected on GBPSFC4
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC4}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw4
     SSHLibrary.Close Connection
 

diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot
index dcf55789ab2d91233124435b1690eb5264c653c7..1904bcd65c772d524afd0f94adeacd186a42c9de 100644 (file)
--- a/csit/suites/netconf/MDSAL/northbound.robot
+++ b/csit/suites/netconf/MDSAL/northbound.robot
@@ -340,10 +340,10 @@ Create_ODL_Netconf_Connection
     #    global variables. This will allow for tracking more Netconf
     #    connections, increasing utility.
     ${control}=    SSHLibrary.Open_Connection    ${host}    prompt=${ODL_SYSTEM_PROMPT}    timeout=10s
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     BuiltIn.Set_Suite_Variable    ${ssh_control}    ${control}
     ${netconf}=    SSHLibrary.Open_Connection    ${host}    prompt=${ODL_SYSTEM_PROMPT}    timeout=10s
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     BuiltIn.Set_Suite_Variable    ${ssh_netconf}    ${netconf}
     BuiltIn.Set_Suite_Variable    ${ssh_port}    ${port}
     BuiltIn.Set_Suite_Variable    ${ssh_user}    ${user}

diff --git a/csit/suites/netconf/notifications/notifications_basic.robot b/csit/suites/netconf/notifications/notifications_basic.robot
index ebb3bbe4d8cd702982c81cf6cd7ca6bbc53b0f0d..155bfce1f9846412a621ae16d7389fbc2950a7f4 100644 (file)
--- a/csit/suites/netconf/notifications/notifications_basic.robot
+++ b/csit/suites/netconf/notifications/notifications_basic.robot
@@ -37,7 +37,6 @@ Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/KarafKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
@@ -139,7 +138,7 @@ Setup_Everything
     TemplatedRequests.Create_Default_Session
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}    alias=receiver
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/wstools/wsreceiver.py
     ${output_log}    ${error_log} =    SSHLibrary.Execute Command    sudo apt-get install -y python-pip    return_stdout=True    return_stderr=True
     BuiltIn.Log    ${output_log}

diff --git a/csit/suites/netconf/scale/getmulti.robot b/csit/suites/netconf/scale/getmulti.robot
index 792b0e0373f137214fb8a20cee5fb0138d1c8d84..f62ed43f6da5cba0676db13158eaab07e52aef4e 100644 (file)
--- a/csit/suites/netconf/scale/getmulti.robot
+++ b/csit/suites/netconf/scale/getmulti.robot
@@ -24,7 +24,6 @@ Resource          ${CURDIR}/../../../libraries/KarafKeywords.robot
 Resource          ${CURDIR}/../../../libraries/NetconfKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/Utils.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
 *** Variables ***
@@ -54,7 +53,7 @@ Issue_Requests_On_Devices
     [Documentation]    Spawn the specified count of worker threads to issue a GET request to each of the devices.
     ${current_ssh_connection}=    SSHLibrary.Get Connection
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHLibrary.Write    python getter.py --odladdress=${ODL_SYSTEM_IP} --count=${DEVICE_COUNT} --name=${device_name_base} --workers=${WORKER_COUNT}
     : FOR    ${number}    IN RANGE    1    ${DEVICE_COUNT}+1
     \    Read_Python_Tool_Operation_Result    ${number}

diff --git a/csit/suites/openstack/tempest/tempest.robot b/csit/suites/openstack/tempest/tempest.robot
index 2907ac57e408521df327a9b5a1e505825c16bcc9..4315238ba0c015a521c48570d789336fbd074bfa 100644 (file)
--- a/csit/suites/openstack/tempest/tempest.robot
+++ b/csit/suites/openstack/tempest/tempest.robot
@@ -11,7 +11,7 @@ Library           SSHLibrary
 Resource          ../../../libraries/DevstackUtils.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
-Resource          ../../../libraries/Utils.robot
+Resource          ../../../libraries/SSHKeywords.robot
 Variables         ../../../variables/Variables.py
 Resource          ../../../variables/netvirt/Variables.robot
 
@@ -109,7 +109,7 @@ Log In To Tempest Executor And Setup Test Environment
     Create Subnet    ${external_net_name}    ${external_subnet_name}    ${external_subnet}    --gateway ${external_gateway} --allocation-pool ${external_subnet_allocation_pool}
     List Networks
     ${control_node_conn_id}=    SSHLibrary.Open Connection    ${OS_CONTROL_NODE_IP}    prompt=${DEFAULT_LINUX_PROMPT_STRICT}
-    Utils.Flexible SSH Login    ${OS_USER}
+    SSHKeywords.Flexible SSH Login    ${OS_USER}
     Write Commands Until Prompt    source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin
     Write Commands Until Prompt    sudo rm -rf /opt/stack/tempest/.testrepository
     ${net_id}=    Get Net Id    ${external_net_name}    ${control_node_conn_id}

diff --git a/csit/suites/sfc/Full_Deploy/010__sfc_full_deploy.robot b/csit/suites/sfc/Full_Deploy/010__sfc_full_deploy.robot
index db874745af5816c977ac3837d4c163064e2cf59f..a0507c5d8f8d2860acf47cd197b8cb0f3e40e566 100644 (file)
--- a/csit/suites/sfc/Full_Deploy/010__sfc_full_deploy.robot
+++ b/csit/suites/sfc/Full_Deploy/010__sfc_full_deploy.robot
@@ -9,7 +9,7 @@ Library           RequestsLibrary
 Library           ../../../libraries/SFC/SfcUtils.py
 Variables         ../../../variables/Variables.py
 Resource          ../../../variables/sfc/Variables.robot
-Resource          ../../../libraries/Utils.robot
+Resource          ../../../libraries/SSHKeywords.robot
 Resource          ../../../libraries/TemplatedRequests.robot
 Resource          ../../../libraries/KarafKeywords.robot
 Resource          ../../../libraries/SFC/DockerSfc.robot
@@ -75,7 +75,7 @@ Switch Ips In Json Files
 Init Suite
     [Documentation]    Connect Create session and initialize ODL version specific variables
     SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    timeout=3s
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     ${docker_cidr}=    DockerSfc.Get Docker Bridge Subnet
     ${docker_nw}=    SfcUtils.Get Network From Cidr    ${docker_cidr}
     ${docker_mask}=    SfcUtils.Get Mask From Cidr    ${docker_cidr}

diff --git a/csit/suites/test/freeze.robot b/csit/suites/test/freeze.robot
index e32a585829e52dabe94efd89a572f10167aa3886..1045cee9e999fa531849149996e6e9e083a06c78 100644 (file)
--- a/csit/suites/test/freeze.robot
+++ b/csit/suites/test/freeze.robot
@@ -3,7 +3,7 @@ Documentation     Not a test, it just logs versions of installed Python modules.
 ...               Useful when library documentation mentions version-specific behavior.
 Library           OperatingSystem
 Library           SSHLibrary
-Resource          ${CURDIR}/../../libraries/Utils.robot
+Resource          ${CURDIR}/../../libraries/SSHKeywords.robot
 
 *** Test Cases ***
 Freeze
@@ -16,13 +16,13 @@ Ulimit_On_Robot
 
 Ulimit_On_Controller
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     ${limits} =    SSHLibrary.Execute_Command    bash -c "ulimit -a"
     BuiltIn.Log    ${limits}
 
 Ulimit_On_Mininet
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     ${limits} =    SSHLibrary.Execute_Command    bash -c "ulimit -a"
     BuiltIn.Log    ${limits}
 
@@ -32,12 +32,12 @@ DiskFree_On_Robot
 
 DiskFree_On_Controller
     SSHLibrary.Open_Connection    ${ODL_SYSTEM_IP}
-    Utils.Flexible_Controller_Login
+    SSHKeywords.Flexible_Controller_Login
     ${sizes} =    SSHLibrary.Execute_Command    bash -c "df -h"
     BuiltIn.Log    ${sizes}
 
 DiskFree_On_Mininet
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     ${sizes} =    SSHLibrary.Execute_Command    bash -c "df -h"
     BuiltIn.Log    ${sizes}