X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FGBP%2FConnUtils.robot;h=e8099a4d4977a7bf6a1bebca9c1eb3046fc92dd2;hb=f510b0ccd238bd3068f38571516d9711d403541a;hp=896516769eb45cea53e22eae178540da8d144faa;hpb=8acc7426dc235edd8a5feda014c800dbbd3b48fa;p=integration%2Ftest.git

diff --git a/csit/libraries/GBP/ConnUtils.robot b/csit/libraries/GBP/ConnUtils.robot
old mode 100755
new mode 100644
index 896516769e..e8099a4d49
--- 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}