SXP: Fix session creating in test suites

Change-Id: I45d02ee9e4b9561c6382fcd90e7dd0bc5b7d48ba
Signed-off-by: Ivan Hrasko <ihrasko@cisco.com>

diff --git a/csit/libraries/SxpLib.robot b/csit/libraries/SxpLib.robot
index 1af5567d951cb86f3fd84aa7947f6030847ae715..806a13cf70e3345d7be7c8b9d253bff46914884f 100644 (file)
--- 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 81954737e72dee576a2dd22a634b8f9579594fc7..aac626b85837471a44a8a5397e7b6c07d0c1bb5d 100644 (file)
--- 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 92e48e753f3a408ed2c1c6873747d7944b289a0f..ab21813cf176730498df201b178e6890bf522796 100644 (file)
--- 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 f4fa8fade65243c569462bf9a79c97b2d1970ea0..de4da57e6c6a838516fc78417162ade845236e6e 100644 (file)
--- 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 5b97776a717c44512d4d580c041677fe78f80630..b5dad252c89f47d940805cf2cabf2c72e732a112 100644 (file)
--- 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