From: Jozef Behran Date: Wed, 4 Nov 2015 10:28:22 +0000 (+0100) Subject: Fixed MININET_PROMPT usage X-Git-Tag: release/lithium-sr3~49 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c0898372f1b515a1d4a7a82dbcf054f207d182a7;p=integration%2Ftest.git Fixed MININET_PROMPT usage It is not possible to use these variables on the Library import statement because these are processed before Variables.py gets imported. Move to suite init and while at it, the variable shall be named TOOLS_SYSTEM_PROMPT instead. Change-Id: Id873de41793248f3000d4f26ae8624ed8beadafd Signed-off-by: Jozef Behran --- diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot index 2629259256..3f36a12b98 100644 --- a/csit/suites/netconf/CRUD/CRUD.robot +++ b/csit/suites/netconf/CRUD/CRUD.robot @@ -18,7 +18,7 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library String -Library SSHLibrary prompt=${MININET_PROMPT} timeout=10s +Library SSHLibrary timeout=10s Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KarafKeywords.robot Resource ${CURDIR}/../../../libraries/NetconfKeywords.robot @@ -109,7 +109,7 @@ Setup_Everything RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} NetconfKeywords.Setup_Netconf_Keywords # Connect to the Mininet machine - SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} + SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} prompt=${TOOLS_SYSTEM_PROMPT} Utils.Flexible_Mininet_Login NetconfKeywords.Install_And_Start_Testtool device-count=10 schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas