X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FODLTools.robot;h=38691b5c60aa3df7e6a7de30b0d25418326850b9;hb=c35e89803a9c5593d19215b87da3e305c8293142;hp=ebd26d1512637903c3bb35c60893c9df932c2d3c;hpb=0bb2d7b9d9900c57f9729478ae6ac33245d59ad0;p=integration%2Ftest.git

diff --git a/csit/libraries/ODLTools.robot b/csit/libraries/ODLTools.robot
index ebd26d1512..38691b5c60 100644
--- a/csit/libraries/ODLTools.robot
+++ b/csit/libraries/ODLTools.robot
@@ -1,6 +1,9 @@
 *** Settings ***
-Documentation     Robot wrapper around ODLTools.
-Resource          ../variables/Variables.robot
+Documentation       Robot wrapper around ODLTools.
+
+Library             OperatingSystem
+Resource            ../variables/Variables.robot
+
 
 *** Keywords ***
 Version
@@ -9,45 +12,50 @@ Version
     ${rc}    ${output} =    OperatingSystem.Run And Return Rc And Output    ${cmd}
     BuiltIn.Log    rc: ${rc}, output: ${output}
     BuiltIn.Should Be True    '${rc}' == '0'
-    [Return]    ${output}
+    RETURN    ${output}
 
 Get EOS
-    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get the various ODL entity ownership information
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     ${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}
+    ${cmd} =    BuiltIn.Set Variable
+    ...    odltools show eos -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
     ${rc}    ${output} =    OperatingSystem.Run And Return Rc And Output    ${cmd}
     BuiltIn.Log    rc: ${rc}, output: ${output}
     BuiltIn.Should Be True    '${rc}' == '0'
-    [Return]    ${output}
+    RETURN    ${output}
 
 Get Cluster Info
-    [Arguments]    ${port}=${RESTCONFPORT}
     [Documentation]    Get ODL Cluster related information like transaction counts, commit rates, etc.
-    : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
-    \    ${cmd} =    BuiltIn.Set Variable    odltools show cluster-info -i ${ODL_SYSTEM_${i+1}_IP} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD}
-    \    ${output} =    OperatingSystem.Run    ${cmd}
-    \    BuiltIn.Log    output: ${output}
+    [Arguments]    ${port}=${RESTCONFPORT}
+    FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
+        ${cmd} =    BuiltIn.Set Variable
+        ...    odltools show cluster-info -i ${ODL_SYSTEM_${i+1}_IP} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD}
+        ${output} =    OperatingSystem.Run    ${cmd}
+        BuiltIn.Log    output: ${output}
+    END
 
 Analyze Tunnels
-    [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
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     ${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}
+    ${cmd} =    BuiltIn.Set Variable
+    ...    odltools analyze tunnels -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
     ${rc}    ${output} =    OperatingSystem.Run And Return Rc And Output    ${cmd}
     BuiltIn.Log    rc: ${rc}, output: ${output}
     BuiltIn.Should Be True    '${rc}' == '0'
-    [Return]    ${output}
+    RETURN    ${output}
 
 Get All
-    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get all results provided by ODLTools
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     ODLTools.Get Cluster Info
     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(".","_").replace("(","_").replace(")","_")
-    [Return]    /tmp/${tmpdir}
+    [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    ${tmpdir} =    BuiltIn.Evaluate
+    ...    """${test_name}""".replace(" ","_").replace("/","_").replace(".","_").replace("(","_").replace(")","_")
+    RETURN    /tmp/${tmpdir}