Support only Fluorine+ distributions

[integration/test.git] / csit / libraries / GBP / ConnUtils.robot

diff --git a/csit/libraries/GBP/ConnUtils.robot b/csit/libraries/GBP/ConnUtils.robot
old mode 100755 (executable)
new mode 100644 (file)
index 8965167..e8099a4
--- a/csit/libraries/GBP/ConnUtils.robot
+++ b/csit/libraries/GBP/ConnUtils.robot
@@ -1,21 +1,25 @@
 *** Settings ***
-Library           SSHLibrary
-Resource          ../Utils.robot
+Library     SSHLibrary
+Resource    ../SSHKeywords.robot
+
 
 *** Variables ***
-${VE_DIR}    ${WORKSPACE}/GBPSFC_VE
+${VE_DIR}       ${WORKSPACE}/GBPSFC_VE
+
 
 *** Keywords ***
 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
     [Documentation]    Wrapper method for executing commands in python virtual environment.
+    [Arguments]    ${cmd}    ${virt_env_path}=${VE_DIR}    ${timeout}=10s
     Set Client Configuration    timeout=${timeout}
-    ${stdout}    ${stderr}    ${rc}    SSHLibrary.Execute Command    source ${virt_env_path}/bin/activate;${cmd}
-    ...    return_stderr=True    return_stdout=True    return_rc=True
-    [Return]    ${stdout}    ${stderr}    ${rc}
-
+    ${stdout}    ${stderr}    ${rc}    SSHLibrary.Execute Command
+    ...    source ${virt_env_path}/bin/activate;${cmd}
+    ...    return_stderr=True
+    ...    return_stdout=True
+    ...    return_rc=True
+    RETURN    ${stdout}    ${stderr}    ${rc}