From 4a80aa11d6d6ce9637e509186a0473433d8fab97 Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Fri, 7 Sep 2018 09:46:30 +0200 Subject: [PATCH] SXP: Fix session creating in test suites Change-Id: I45d02ee9e4b9561c6382fcd90e7dd0bc5b7d48ba Signed-off-by: Ivan Hrasko --- csit/libraries/SxpLib.robot | 2 +- csit/suites/sxp/basic/040_Custom_Passwords.robot | 2 +- csit/suites/sxp/basic/040_SSL_Passwords.robot | 1 + .../010_Binding_Origins_Configuration.robot | 4 ++-- .../binding-origin/020_Binding_Origins_Checks.robot | 12 ++---------- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/csit/libraries/SxpLib.robot b/csit/libraries/SxpLib.robot index 1af5567d95..806a13cf70 100644 --- a/csit/libraries/SxpLib.robot +++ b/csit/libraries/SxpLib.robot @@ -308,7 +308,7 @@ Check Binding Range Negative Setup SXP Environment [Arguments] ${node_range}=2 [Documentation] Create session to Controller, node_range parameter specifies number of nodes to be created plus one - Setup SXP Session + RequestsLibrary.Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} timeout=${DEFAULT_TIMEOUT_HTTP} max_retries=0 : FOR ${num} IN RANGE 1 ${node_range} \ ${ip} = Sxp.Get Ip From Number ${num} \ ${rnd_retry_time} = BuiltIn.Evaluate random.randint(1, 10) modules=random diff --git a/csit/suites/sxp/basic/040_Custom_Passwords.robot b/csit/suites/sxp/basic/040_Custom_Passwords.robot index 81954737e7..aac626b858 100644 --- a/csit/suites/sxp/basic/040_Custom_Passwords.robot +++ b/csit/suites/sxp/basic/040_Custom_Passwords.robot @@ -44,7 +44,7 @@ Version 4 *** Keywords *** Setup SXP Environment Local [Documentation] Create session to Controller - Setup SXP Session + RequestsLibrary.Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} timeout=${DEFAULT_TIMEOUT_HTTP} max_retries=0 Add Node 127.0.0.1 ${EMPTY} Add Node 127.0.0.2 ${EMPTY} Add Node 127.0.0.3 CUSTOM diff --git a/csit/suites/sxp/basic/040_SSL_Passwords.robot b/csit/suites/sxp/basic/040_SSL_Passwords.robot index 92e48e753f..ab21813cf1 100644 --- a/csit/suites/sxp/basic/040_SSL_Passwords.robot +++ b/csit/suites/sxp/basic/040_SSL_Passwords.robot @@ -129,6 +129,7 @@ SSL ConectivityCase 4 Setup SXP Environment Local [Arguments] ${node_range} [Documentation] Create session to Controller, copy keystores to ODL machines and setup topology for testing + RequestsLibrary.Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} timeout=${DEFAULT_TIMEOUT_HTTP} max_retries=0 SSHKeywords.Open_Connection_To_ODL_System ${ODL_SYSTEM_JAVA_HOME} SSHLibrary.Execute_Command java -XshowSettings:properties -version 2>&1 | grep java.home | sed 's/.*= //' : FOR ${node} IN RANGE 1 ${node_range} diff --git a/csit/suites/sxp/binding-origin/010_Binding_Origins_Configuration.robot b/csit/suites/sxp/binding-origin/010_Binding_Origins_Configuration.robot index f4fa8fade6..de4da57e6c 100644 --- a/csit/suites/sxp/binding-origin/010_Binding_Origins_Configuration.robot +++ b/csit/suites/sxp/binding-origin/010_Binding_Origins_Configuration.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation Test suite to verify binding origins configuration possibilities (CRUD) -Suite Setup RequestsLibrary.Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown RequestsLibrary.Delete All Sessions +Suite Setup SxpLib.Setup SXP Environment 0 +Suite Teardown SxpLib.Clean SXP Environment 0 Test Setup SxpBindingOriginsLib.Revert To Default Binding Origins Configuration Library RequestsLibrary Resource ../../../libraries/SxpBindingOriginsLib.robot diff --git a/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot b/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot index 5b97776a71..b5dad252c8 100644 --- a/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot +++ b/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation Test suite to verify binding origins checks are performed in master database -Suite Setup Create Session And Node -Suite Teardown Delete Node And Close Session +Suite Setup SxpLib.Setup SXP Environment +Suite Teardown SxpLib.Clean SXP Environment Test Setup Clean Bindings Library RequestsLibrary Resource ../../../libraries/SxpLib.robot @@ -69,14 +69,6 @@ Test Get Bindings Verify All Bindings Content 10 1.1.1.1/32 20 2.2.2.2/32 *** Keywords *** -Create Session And Node - RequestsLibrary.Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} - SxpLib.Setup SXP Environment - -Delete Node And Close Session - SxpLib.Clean SXP Environment - RequestsLibrary.Delete All Sessions - Clean Bindings SxpLib.Clean Bindings scope=all SxpLib.Clean Bindings domain=guest scope=all -- 2.36.6