From bc1d800f3ddce555de9c17518ef7e74126fb028f Mon Sep 17 00:00:00 2001 From: eh552t Date: Wed, 4 Jul 2018 14:43:49 +0200 Subject: Fix https issue + create session globally Change-Id: I94ef9a15a04f969ae036794f99d44c9d3d57564a Signed-off-by: eh552t Issue-ID: CLAMP-194 --- .../tests/clamp/APIs/01__Create_CL_Holmes.robot | 26 ++++++++++------------ test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot | 19 +++++----------- test/csit/tests/clamp/APIs/03__VariousApis.robot | 16 ++++--------- .../tests/clamp/APIs/04__Verify_API_Models.robot | 20 +++++------------ 4 files changed, 26 insertions(+), 55 deletions(-) (limited to 'test/csit/tests/clamp/APIs') diff --git a/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot b/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot index f820ef632..1f5473833 100644 --- a/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot +++ b/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot @@ -8,41 +8,39 @@ Library json ${login} admin ${passw} password +*** Keywords *** +Create the sessions + ${auth}= Create List ${login} ${passw} + Create Session clamp https://localhost:8443 auth=${auth} disable_warnings=1 + Set Global Variable ${clamp_session} clamp + *** Test Cases *** Get Requests health check ok - CreateSession clamp http://localhost:8080 - ${resp}= Get Request clamp /restservices/clds/v1/clds/healthcheck + Create the sessions + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/healthcheck Should Be Equal As Strings ${resp.status_code} 200 Get Requests verify test template found - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/cldsTempate/template-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/cldsTempate/template-names Should Be Equal As Strings ${resp.status_code} 200 Should Contain Match ${resp} *templateHolmes1* Should Contain Match ${resp} *templateHolmes2* Should Not Contain Match ${resp} *templateHolmes99* Put Requests to add Close Loop ClHolmes1 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} ${data}= Get Binary File ${CURDIR}${/}data${/}createClHolmes1.json &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Put Request clamp /restservices/clds/v1/clds/model/ClHolmes1 data=${data} headers=${headers} + ${resp}= Put Request ${clamp_session} /restservices/clds/v1/clds/model/ClHolmes1 data=${data} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Put Requests to add Close Loop ClHolmes2 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} ${data}= Get Binary File ${CURDIR}${/}data${/}createClHolmes2.json &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Put Request clamp /restservices/clds/v1/clds/model/ClHolmes2 data=${data} headers=${headers} + ${resp}= Put Request ${clamp_session} /restservices/clds/v1/clds/model/ClHolmes2 data=${data} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Get Requests verify CL1 found - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model-names Should Be Equal As Strings ${resp.status_code} 200 Should Contain Match ${resp} *ClHolmes1* Should Contain Match ${resp} *ClHolmes2* diff --git a/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot b/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot index 5dfa87904..213c231b8 100644 --- a/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot +++ b/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot @@ -10,39 +10,30 @@ ${passw} password *** Test Cases *** Get Requests health check ok - CreateSession clamp http://localhost:8080 - ${resp}= Get Request clamp /restservices/clds/v1/clds/healthcheck + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/healthcheck Should Be Equal As Strings ${resp.status_code} 200 Get Requests verify test template found - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/cldsTempate/template-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/cldsTempate/template-names Should Be Equal As Strings ${resp.status_code} 200 Should Contain Match ${resp} *templateTCA1* Should Contain Match ${resp} *templateTCA2* Should Not Contain Match ${resp} *templateTCA99* Put Requests to add Close Loop ClHolmes1 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} ${data}= Get Binary File ${CURDIR}${/}data${/}createClTCA1.json &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Put Request clamp /restservices/clds/v1/clds/model/ClTCA1 data=${data} headers=${headers} + ${resp}= Put Request ${clamp_session} /restservices/clds/v1/clds/model/ClTCA1 data=${data} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Put Requests to add Close Loop ClHolmes2 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} ${data}= Get Binary File ${CURDIR}${/}data${/}createClTCA2.json &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Put Request clamp /restservices/clds/v1/clds/model/ClTCA2 data=${data} headers=${headers} + ${resp}= Put Request ${clamp_session} /restservices/clds/v1/clds/model/ClTCA2 data=${data} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Get Requests verify CL1 found - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model-names Should Be Equal As Strings ${resp.status_code} 200 Should Contain Match ${resp} *ClTCA1* Should Contain Match ${resp} *ClTCA2* diff --git a/test/csit/tests/clamp/APIs/03__VariousApis.robot b/test/csit/tests/clamp/APIs/03__VariousApis.robot index fb671ca41..50dd78e16 100644 --- a/test/csit/tests/clamp/APIs/03__VariousApis.robot +++ b/test/csit/tests/clamp/APIs/03__VariousApis.robot @@ -10,23 +10,17 @@ ${passw} password *** Test Cases *** Get Clamp properties - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/properties + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/properties Dictionary Should Contain Key ${resp.json()} global Dictionary Should Contain Key ${resp.json()['global']} location Get Clamp Info - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/cldsInfo + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/cldsInfo Dictionary Should Contain Key ${resp.json()} userName Dictionary Should Contain Key ${resp.json()} cldsVersion Get model bpmn by name - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model/bpmn/ClHolmes1 + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/bpmn/ClHolmes1 Should Contain Match ${resp} *StartEvent_* Should Contain Match ${resp} *VesCollector_* Should Contain Match ${resp} *Holmes_* @@ -34,9 +28,7 @@ Get model bpmn by name Should Contain Match ${resp} *EndEvent_* Get model names - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model-names Should Contain Match ${resp} *ClHolmes1* Should Contain Match ${resp} *ClHolmes2* Should Contain Match ${resp} *ClTCA1* diff --git a/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot b/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot index 3ae6aeeb9..7b9e2bc16 100644 --- a/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot +++ b/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot @@ -10,9 +10,7 @@ ${passw} password *** Test Cases *** Verify HolmesModel1 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model/ClHolmes1 + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/ClHolmes1 Should Contain Match ${resp} *templateHolmes1* Should Contain Match ${resp} *DC1* Should Contain Match ${resp} *DC2* @@ -23,9 +21,7 @@ Verify HolmesModel1 Should Contain Match ${resp} *Config Policy name1* Verify HolmesModel2 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model/ClHolmes2 + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/ClHolmes2 Should Contain Match ${resp} *templateHolmes2* Should Contain Match ${resp} *DC2* Should Contain Match ${resp} *DC3* @@ -37,9 +33,7 @@ Verify HolmesModel2 Should Contain Match ${resp} *Config Policy Name2* Verify TCAModel1 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model/ClTCA1 + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/ClTCA1 Should Contain Match ${resp} *templateTCA1* Should Contain Match ${resp} *enbRecipe* Should Contain Match ${resp} *DC1* @@ -50,9 +44,7 @@ Verify TCAModel1 Should Contain Match ${resp} *ONSET* Verify TCAModel2 - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model/ClTCA2 + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/ClTCA2 Should Contain Match ${resp} *templateTCA2* Should Contain Match ${resp} *enbRecipe* Should Contain Match ${resp} *DC1* @@ -65,9 +57,7 @@ Verify TCAModel2 Should Contain Match ${resp} *VM* Get model names - ${auth}= Create List ${login} ${passw} - Create Session clamp http://localhost:8080 auth=${auth} - ${resp}= Get Request clamp /restservices/clds/v1/clds/model-names + ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model-names Should Contain Match ${resp} *ClHolmes1* Should Contain Match ${resp} *ClHolmes2* Should Contain Match ${resp} *ClTCA1* -- cgit 1.2.3-korg