X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FODLTools.robot;h=5b76bbe6d9d23f7b95d8346700854523272e6402;hb=4820c2ad8b40e6973ecd3c98b4b24de870b7db34;hp=df41eb04347d59d6f91f134f08e125ff969ed45b;hpb=7de53bd14ab23688a0c9b0457bef6b0ac1a58d2d;p=integration%2Ftest.git

diff --git a/csit/libraries/ODLTools.robot b/csit/libraries/ODLTools.robot
index df41eb0434..5b76bbe6d9 100644
--- a/csit/libraries/ODLTools.robot
+++ b/csit/libraries/ODLTools.robot
@@ -1,5 +1,6 @@
 *** Settings ***
 Documentation     Robot wrapper around ODLTools.
+Library           OperatingSystem
 Resource          ../variables/Variables.robot
 
 *** Keywords ***
@@ -12,7 +13,7 @@ Version
     [Return]    ${output}
 
 Get EOS
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get the various ODL entity ownership information
     ${dstdir} =    Get Path    ${test_name}
     ${cmd} =    BuiltIn.Set Variable    odltools show eos -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
@@ -30,7 +31,7 @@ Get Cluster Info
     \    BuiltIn.Log    output: ${output}
 
 Analyze Tunnels
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Analyze Tunnel Mesh creation for any errors and log results
     ${dstdir} =    Get Path    ${test_name}
     ${cmd} =    BuiltIn.Set Variable    odltools analyze tunnels -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
@@ -40,14 +41,14 @@ Analyze Tunnels
     [Return]    ${output}
 
 Get All
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get all results provided by ODLTools
     ODLTools.Get Cluster Info
-    BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${HA_PROXY_IP}    test_name=${test_name}
-    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${HA_PROXY_IP}    test_name=${test_name}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${node_ip}    test_name=${test_name}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${node_ip}    test_name=${test_name}
 
 Get Path
     [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get odltools path for a given test case
-    ${tmpdir} =    BuiltIn.Evaluate    """${test_name}""".replace(" ","_").replace("/","_").replace(".","_")
+    ${tmpdir} =    BuiltIn.Evaluate    """${test_name}""".replace(" ","_").replace("/","_").replace(".","_").replace("(","_").replace(")","_")
     [Return]    /tmp/${tmpdir}