X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FNetconfKeywords.robot;h=422e436fa678620dcd487fb9fe378f9bc104dd89;hb=a735c6ab080b16db82f58d867431474a029a4727;hp=1d01d25366c6e85dc62f43977bf3c33a143da361;hpb=e084fad0389b0e10ca73ec53414c9adaa8e55fec;p=integration%2Ftest.git diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot index 1d01d25366..422e436fa6 100644 --- a/csit/libraries/NetconfKeywords.robot +++ b/csit/libraries/NetconfKeywords.robot @@ -22,7 +22,6 @@ Resource SSHKeywords.robot Resource TemplatedRequests.robot Resource Utils.robot Resource RemoteBash.robot -Resource CompareStream.robot *** Variables *** ${TESTTOOL_DEFAULT_JAVA_OPTIONS} -Xmx1G -XX:MaxPermSize=256M -Dorg.apache.sshd.registerBouncyCastle=false @@ -30,7 +29,6 @@ ${DIRECTORY_WITH_DEVICE_TEMPLATES} ${CURDIR}/../variables/netconf/device ${FIRST_TESTTOOL_PORT} 17830 ${BASE_NETCONF_DEVICE_PORT} 17830 ${DEVICE_NAME_BASE} netconf-scaling-device -${TESTTOOL_DEFAULT_URL} https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/netconf/netconf-testtool/1.3.2/netconf-testtool-1.3.2-executable.jar ${TESTTOOL_BOOT_TIMEOUT} 60s ${ENABLE_NETCONF_TEST_TIMEOUT} ${ENABLE_GLOBAL_TEST_DEADLINES} @@ -161,9 +159,7 @@ Install_And_Start_Testtool ... for the additional schemas is deleted on the remote machine and ... the additional schemas argument is left out. # Install test tool on the machine. - # Note that after nitrogen we have to use nitrogen release version because tool is broken in oxygen onwards. - ${explicit_url}= CompareStream.Set_Variable_If_At_Most_Nitrogen ${EMPTY} ${TESTTOOL_DEFAULT_URL} - ${filename}= NexusKeywords.Deploy_Test_Tool netconf netconf-testtool explicit_url=${explicit_url} + ${filename}= NexusKeywords.Deploy_Test_Tool netconf netconf-testtool ${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}