X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FJsonrpcKeywords.robot;h=070a56f15cc13d631898846e8a65eb27ad90e907;hb=a2f6aa23e240c9a70eef3d44b76c42147acbb2ca;hp=5eedc9047c5eddfcccb8db29b955d2e6d6c36f9f;hpb=465ab1905acb623f90b442c1f7c0d30fff0ceee1;p=integration%2Ftest.git

diff --git a/csit/libraries/JsonrpcKeywords.robot b/csit/libraries/JsonrpcKeywords.robot
index 5eedc9047c..070a56f15c 100644
--- a/csit/libraries/JsonrpcKeywords.robot
+++ b/csit/libraries/JsonrpcKeywords.robot
@@ -1,61 +1,67 @@
 *** Settings ***
-Library           OperatingSystem
-Library           SSHLibrary
-Library           Collections
-Library           RequestsLibrary
-Resource          ClusterManagement.robot
-Resource          ../variables/jsonrpc/JsonrpcVariables.robot
-Resource          ../variables/Variables.robot
-Resource          Utils.robot
+Library     OperatingSystem
+Library     SSHLibrary
+Library     Collections
+Library     RequestsLibrary
+Resource    ClusterManagement.robot
+Resource    ../variables/jsonrpc/JsonrpcVariables.robot
+Resource    ../variables/Variables.robot
+Resource    SSHKeywords.robot
+Resource    Utils.robot
+
 
 *** Keywords ***
 Run Read Service Python Script on Controller Vm
-    [Arguments]    ${host_index}=${FIRST_CONTROLLER_INDEX}    ${ub_system}=${FALSE}
-    [Documentation]    This keyword installs pip,zmq,pyzmq and starts the read service on controller vm
-    ${cmd}    Builtin.Set Variable If    ${ub_system}    ${UB_PIP}    ${CENTOS_PIP}
+    [Documentation]    This keyword creates a new virtual environment, installs pyzmq & zmq and starts the read service on controller vm
+    [Arguments]    ${host_index}=${FIRST_CONTROLLER_INDEX}
     ${host_index}    Builtin.Convert To Integer    ${host_index}
     ${host}    ClusterManagement.Resolve IP Address For Member    ${host_index}
     ${connections}    SSHKeywords.Open_Connection_To_ODL_System    ${host}
     SSHLibrary.Switch Connection    ${connections}
     SSHLibrary.Put File    ${READ_SERVICE_SCRIPT}    ${WORKSPACE}/${BUNDLEFOLDER}/    mode=664
-    ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    ${cmd}    return_stdout=True    return_stderr=True
-    ...    return_rc=True
-    Log    ${stdout}
-    ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    sudo pip install --upgrade pip    return_stdout=True    return_stderr=True
-    ...    return_rc=True
-    Log    ${stdout}
-    ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    sudo pip install zmq pyzmq    return_stdout=True    return_stderr=True
-    ...    return_rc=True
-    Log    ${stdout}
     ${module}    OperatingSystem.Get File    ${JSONRPCCONFIG_MODULE_JSON}
     ${data}    OperatingSystem.Get File    ${JSONRPCCONFIG_DATA_JSON}
-    ${cmd}    Builtin.Set Variable    nohup python ${WORKSPACE}/${BUNDLEFOLDER}/odl-jsonrpc-test-read tcp://0.0.0.0:${DEFAULT_PORT} 'config' ${DEFAULT_ENDPOINT} '${module}' '${data}'
+    ${cmd}    Builtin.Set Variable
+    ...    nohup python ${WORKSPACE}/${BUNDLEFOLDER}/odl-jsonrpc-test-read tcp://0.0.0.0:${DEFAULT_PORT} 'config' ${DEFAULT_ENDPOINT} '${module.replace("\n","").replace(" ","")}' '${data.replace("\n","").replace(" ","")}'
     Log    ${cmd}
-    ${stdout}    SSHLibrary.Write    echo | rm -rf nohup.out
-    ${stdout}    SSHLibrary.Write    echo | nohup python ${WORKSPACE}/${BUNDLEFOLDER}/odl-jsonrpc-test-read tcp://0.0.0.0:${DEFAULT_PORT} 'config' ${DEFAULT_ENDPOINT} '${module}' '${data}' &
+    SSHKeywords.Virtual_Env_Set_Path    /tmp/jsonrpc_venv
+    SSHKeywords.Virtual_Env_Create_Python3    True
+    SSHKeywords.Virtual_Env_Install_Package    pyzmq
+    SSHKeywords.Virtual_Env_Install_Package    zmq
+    SSHKeywords.Virtual_Env_Activate_On_Current_Session    True
+    ${stdout}    SSHLibrary.Write    rm -rf nohup.out
+    ${stdout}    SSHLibrary.Write    ${cmd} &
     ${stdout}    SSHLibrary.Write    echo
     Log    ${stdout}
+    BuiltIn.Sleep    2s
+    ${stdout}    SSHLibrary.Execute Command    /usr/sbin/ss -nlt
+    Log    ${stdout}
     ${stdout}    SSHLibrary.Execute Command    cat nohup.out
     Log    ${stdout}
     SSHLibrary.Close_Connection
 
 Mount Read Service Endpoint
-    [Arguments]    ${controller_index}=${FIRST_CONTROLLER_INDEX}    ${file}=${READ_SERVICE_PEER_PAYLOAD}    ${endpoint}=${DEFAULT_ENDPOINT}
     [Documentation]    This keyword mounts an endpoint after starting service
+    [Arguments]    ${controller_index}=${FIRST_CONTROLLER_INDEX}    ${file}=${READ_SERVICE_PEER_PAYLOAD}    ${endpoint}=${DEFAULT_ENDPOINT}
     ${JSON1}    OperatingSystem.Get File    ${file}
     Log    ${JSON1}
-    ${response_json}    ClusterManagement.Put_As_Json_To_Member    ${READ_SERVICE_PEER_PUT_URL}${endpoint}    ${JSON1}    ${controller_index}
+    ${response_json}    ClusterManagement.Put_As_Json_To_Member
+    ...    ${READ_SERVICE_PEER_URL}=${endpoint}
+    ...    ${JSON1}
+    ...    ${controller_index}
     Builtin.Log    ${response_json}
 
 Verify Data On Mounted Endpoint
-    [Arguments]    ${controller_index}=${FIRST_CONTROLLER_INDEX}    ${endpoint}=${DEFAULT_ENDPOINT}
     [Documentation]    This keyword verifies if the data we get on the mount point is same as what we put
-    ${resp}    ClusterManagement.Get_From_Member    ${READ_SERVICE_PEER_GET_1}${endpoint}${READ_SERVICE_PEER_GET_2}    ${controller_index}
+    [Arguments]    ${controller_index}=${FIRST_CONTROLLER_INDEX}    ${endpoint}=${DEFAULT_ENDPOINT}
+    ${resp}    ClusterManagement.Get_From_Member
+    ...    ${READ_SERVICE_PEER_URL}=${endpoint}${READ_SERVICE_PEER_MOUNT_PATH}?content=config
+    ...    ${controller_index}
     ${response_json}    Builtin.Convert To String    ${resp}
     Log    ${response_json}
     Verify Restconf Get On Mounted Endpoint    ${response_json}    ${READSERVICE_NAME}
 
 Verify Restconf Get On Mounted Endpoint
-    [Arguments]    ${output}    ${name}
     [Documentation]    This keyword parses restconf get of mountpoint
+    [Arguments]    ${output}    ${name}
     Builtin.Should Match Regexp    ${output}    "name":"${name}"