From: jluhrsen <jluhrsen@gmail.com>
Date: Thu, 9 May 2019 18:33:28 +0000 (-0700)
Subject: Allow to run testtool without installing it first
X-Git-Tag: pre-potassium~335
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=refs%2Fchanges%2F76%2F81976%2F8

Allow to run testtool without installing it first

Change-Id: I43d05bec0e1afdf9c4579788b6aeb5e51fc74355
Signed-off-by: jluhrsen <jluhrsen@gmail.com>
---

diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot
index 82978c38b8..a47c2c6463 100644
--- a/csit/libraries/NetconfKeywords.robot
+++ b/csit/libraries/NetconfKeywords.robot
@@ -153,15 +153,20 @@ NetconfKeywords__Wait_Device_Is_Up_And_Running
 
 Install_And_Start_Testtool
     [Arguments]    ${device-count}=10    ${debug}=true    ${schemas}=none    ${tool_options}=${EMPTY}    ${java_options}=${TESTTOOL_DEFAULT_JAVA_OPTIONS}    ${mdsal}=true
-    [Documentation]    Install and run testtool. Also arrange to collect its output into a log file.
-    ...    When the ${schemas} argument is set to 'none', it signifies that
-    ...    there are no additional schemas to be deployed, so the directory
-    ...    for the additional schemas is deleted on the remote machine and
-    ...    the additional schemas argument is left out.
-    # Install test tool on the machine.
+    [Documentation]    Install and run testtool.
     ${filename}=    NexusKeywords.Deploy_Test_Tool    netconf    netconf-testtool
+    Start_Testtool    ${filename}    ${device-count}    ${debug}    ${schemas}    ${tool_options}    ${java_options}
+    ...    ${mdsal}
+
+Start_Testtool
+    [Arguments]    ${filename}    ${device-count}=10    ${debug}=true    ${schemas}=none    ${tool_options}=${EMPTY}    ${java_options}=${TESTTOOL_DEFAULT_JAVA_OPTIONS}
+    ...    ${mdsal}=true
+    [Documentation]    Arrange to collect tool's output into a log file.
+    ...    Will use specific ${schemas} unless argument resolves to 'none',
+    ...    which signifies that there are no additional schemas to be deployed.
+    ...    If so the directory for the additional schemas is deleted on the
+    ...    remote machine and the additional schemas argument is left out.
     ${schemas_option}=    NetconfKeywords__Deploy_Additional_Schemas    ${schemas}
-    # Start the testtool
     ${command}=    NexusKeywords.Compose_Full_Java_Command    ${java_options} -jar ${filename} ${tool_options} --device-count ${device-count} --debug ${debug} ${schemas_option} --md-sal ${mdsal}
     BuiltIn.Log    Running testtool: ${command}
     ${logfile}=    Utils.Get_Log_File_Name    testtool
diff --git a/csit/suites/netconf/scale/max_devices.robot b/csit/suites/netconf/scale/max_devices.robot
index 120f0734ec..aa051189aa 100644
--- a/csit/suites/netconf/scale/max_devices.robot
+++ b/csit/suites/netconf/scale/max_devices.robot
@@ -33,6 +33,8 @@ ${BASE_PORT}      17830
 ${NUM_WORKERS}    10
 ${TIMEOUT_FACTOR}    5
 ${DEVICES_RESULT_FILE}    devices.csv
+${INSTALL_TESTTOOL}    True
+${TESTTOOL_EXECUTABLE}    ${EMPTY}
 
 *** Test Cases ***
 Find Max Netconf Devices
@@ -47,7 +49,8 @@ Find Max Netconf Devices
     : FOR    ${devices}    IN RANGE    ${start}    ${stop+1}    ${increment}
     \    ${timeout} =    BuiltIn.Evaluate    ${devices}*${TIMEOUT_FACTOR}
     \    Log To Console    Starting Iteration with ${devices} devices
-    \    NetconfKeywords.Install_And_Start_Testtool    device-count=${devices}
+    \    Run Keyword If    "${INSTALL_TESTTOOL}"=="True"    NetconfKeywords.Install_And_Start_Testtool    device-count=${devices}
+    \    ...    ELSE    NetconfKeywords.Start_Testtool    ${TESTTOOL_EXECUTABLE}    device-count=${devices}
     \    ${status}    ${result} =    Run Keyword And Ignore Error    NetconfKeywords.Perform_Operation_On_Each_Device    Configure_Device    timeout=${timeout}
     \    Exit For Loop If    '${status}' == 'FAIL'
     \    ${status}    ${result} =    Run Keyword And Ignore Error    NetconfKeywords.Perform_Operation_On_Each_Device    Wait_Connected    timeout=${timeout}