From: Vratko Polak Date: Tue, 15 Mar 2016 14:39:43 +0000 (+0100) Subject: Include needed Assure_* keywords in BGP tests X-Git-Tag: release/beryllium-sr1~17 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=4ce4117d71e27d843996a8fa5fb5570f93f5a322 Include needed Assure_* keywords in BGP tests Ubuntu tools system seem to be missing ipaddr installation. This could be fixed on releng/builder side, but this makes it easier to run on onther environments. Also, small improvements in Keyword ordering in BGP suites. Change-Id: Ic863a083d0306ce5c9a7cc8b1f89c061a1e92065 Signed-off-by: Vratko Polak --- diff --git a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot index 1fb1ced9bd..b6a8e90394 100644 --- a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot @@ -39,6 +39,7 @@ Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot Resource ${CURDIR}/../../../libraries/PrefixCounting.robot Resource ${CURDIR}/../../../libraries/SetupUtils.robot +Resource ${CURDIR}/../../../libraries/SSHKeywords.robot *** Variables *** ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ @@ -189,6 +190,8 @@ Setup_Everything # Both TODOs would probably need to update every suite relying on current Variables. Open_BGP_Peer_Console Open_BGP_Aplicationp_Peer_Console + SSHKeywords.Require_Python + SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/bgp_app_peer.py SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/ipv4-routes-template.xml diff --git a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot index 545eca8946..afed3ad3a6 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot @@ -176,16 +176,16 @@ Setup_Everything ChangeCounter.CC_Setup PrefixCounting.PC_Setup KarafKeywords.Open Controller Karaf Console On Background - SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} - Utils.Flexible_Controller_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. # Both TODOs would probably need to update every suite relying on current Variables. + SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} + Utils.Flexible_Controller_Login SSHKeywords.Require_Python - SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py SSHKeywords.Assure_Library_Ipaddr target_dir=. + SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py # Calculate the timeout value based on how many routes are going to be pushed ${period} = DateTime.Convert_Time ${CHECK_PERIOD_CHANGE_COUNT_MANY} result_format=number ${timeout} = BuiltIn.Evaluate ${TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY} * (${COUNT_CHANGE_COUNT_MANY} * 3.0 / 10000 + ${period} * (${REPETITIONS_CHANGE_COUNT_MANY} + 1)) diff --git a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot index 444d4b262c..dbeca8d39a 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot @@ -128,13 +128,13 @@ Setup_Everything SetupUtils.Setup_Utils_For_Setup_And_Teardown ConfigViaRestconf.Setup_Config_Via_Restconf PrefixCounting.PC_Setup - SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} - Utils.Flexible_Controller_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. # Both TODOs would probably need to update every suite relying on current Variables. + SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} + Utils.Flexible_Controller_Login SSHKeywords.Require_Python SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py diff --git a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot index 072ca3969a..abcfc60ec2 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot @@ -157,13 +157,13 @@ Setup_Everything SetupUtils.Setup_Utils_For_Setup_And_Teardown ConfigViaRestconf.Setup_Config_Via_Restconf PrefixCounting.PC_Setup - SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} - Utils.Flexible_Controller_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. # Both TODOs would probably need to update every suite relying on current Variables. + SSHLibrary.Set_Default_Configuration prompt=${ODL_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${ODL_SYSTEM_IP} + Utils.Flexible_Controller_Login SSHKeywords.Require_Python SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot index ff757a4c7d..1adea99aa3 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot @@ -43,6 +43,7 @@ Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot Resource ${CURDIR}/../../../libraries/PrefixCounting.robot Resource ${CURDIR}/../../../libraries/SetupUtils.robot +Resource ${CURDIR}/../../../libraries/SSHKeywords.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info @@ -214,13 +215,15 @@ Setup_Everything ConfigViaRestconf.Setup_Config_Via_Restconf ChangeCounter.CC_Setup PrefixCounting.PC_Setup - SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} - Utils.Flexible_Mininet_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. # Both TODOs would probably need to update every suite relying on current Variables. + SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} + Utils.Flexible_Mininet_Login + SSHKeywords.Require_Python + SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py # Calculate the timeout value based on how many routes are going to be pushed # TODO: Unify formulas with other suites in this directory. diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot index adc3434441..62766e4356 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot @@ -35,6 +35,7 @@ Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot Resource ${CURDIR}/../../../libraries/PrefixCounting.robot Resource ${CURDIR}/../../../libraries/SetupUtils.robot +Resource ${CURDIR}/../../../libraries/SSHKeywords.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info @@ -190,13 +191,15 @@ Setup_Everything SetupUtils.Setup_Utils_For_Setup_And_Teardown ConfigViaRestconf.Setup_Config_Via_Restconf PrefixCounting.PC_Setup - SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} - Utils.Flexible_Mininet_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. # Both TODOs would probably need to update every suite relying on current Variables. + SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} + Utils.Flexible_Mininet_Login + SSHKeywords.Require_Python + SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py # Calculate the timeout value based on how many routes are going to be pushed # TODO: Replace 20 with some formula from period and repetitions. diff --git a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot index 7aca78e9a2..f4ad00ecd7 100644 --- a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot +++ b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot @@ -306,6 +306,8 @@ Setup_Everything SetupUtils.Setup_Utils_For_Setup_And_Teardown SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} Open_BGP_Peer_Console + SSHKeywords.Require_Python + SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py Open_BGP_Aplicationp_Peer_Console SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/bgp_app_peer.py diff --git a/csit/suites/bgpcep/bgpuser/cases.robot b/csit/suites/bgpcep/bgpuser/cases.robot index edb0a8e79a..d00b73f925 100644 --- a/csit/suites/bgpcep/bgpuser/cases.robot +++ b/csit/suites/bgpcep/bgpuser/cases.robot @@ -211,8 +211,6 @@ Setup_Everything ... prepare directories for responses, put Python tool to mininet machine, setup imported resources. SetupUtils.Setup_Utils_For_Setup_And_Teardown SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} - SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} - Utils.Flexible_Mininet_Login RequestsLibrary.Create_Session operational http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_TOPO_API} auth=${AUTH} # TODO: Do not include slash in ${OPERATIONAL_TOPO_API}, having it typed here is more readable. # TODO: Alternatively, create variable in Variables which starts with http. @@ -222,6 +220,10 @@ Setup_Everything # The previous suite may have been using the same directories. OperatingSystem.Create_Directory ${EXPECTED_RESPONSES_FOLDER} OperatingSystem.Create_Directory ${ACTUAL_RESPONSES_FOLDER} + SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} + Utils.Flexible_Mininet_Login + SSHKeywords.Require_Python + SSHKeywords.Assure_Library_Ipaddr target_dir=. SSHLibrary.Put_File ${CURDIR}/../../../../tools/fastbgp/play.py ConfigViaRestconf.Setup_Config_Via_Restconf KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set ${CONTROLLER_LOG_LEVEL}