aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authoreh552t <eh552t@intl.att.com>2018-07-04 14:43:49 +0200
committereh552t <eh552t@intl.att.com>2018-07-04 16:02:11 +0200
commitbc1d800f3ddce555de9c17518ef7e74126fb028f (patch)
tree217152e788f2cf7b5e3f401dc346cbb50355b6d3 /test
parentbc76450dfae26da5364b4ef79535314598e04a1c (diff)
Fix https issue + create session globally
Change-Id: I94ef9a15a04f969ae036794f99d44c9d3d57564a Signed-off-by: eh552t <eh552t@intl.att.com> Issue-ID: CLAMP-194
Diffstat (limited to 'test')
-rwxr-xr-xtest/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh2
-rwxr-xr-xtest/csit/scripts/clamp/start_clamp_containers.sh8
-rw-r--r--test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot26
-rw-r--r--test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot19
-rw-r--r--test/csit/tests/clamp/APIs/03__VariousApis.robot16
-rw-r--r--test/csit/tests/clamp/APIs/04__Verify_API_Models.robot20
-rw-r--r--test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot20
-rw-r--r--test/csit/tests/clamp/UIs/02__Create_TCA_model.robot13
-rw-r--r--test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot12
-rw-r--r--test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot9
-rw-r--r--test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot9
11 files changed, 56 insertions, 98 deletions
diff --git a/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
index 92e2f02ff..baffc17d1 100755
--- a/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
+++ b/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
@@ -34,7 +34,7 @@ cd clamp/extra/docker/clamp/
sed -i '/image: onap\/clamp/c\ image: nexus3.onap.org:10001\/onap\/clamp' docker-compose.yml
# Change config to take third_party_proxy:8085 for SDC, Policy and DCAE simulator
-sed -i 's/}/,\"clamp.config.policy.pdpUrl1\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.pdpUrl2\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.papUrl\":\"http:\/\/third_party_proxy:8085\/pap\/ , testpap, alpha123\",\"clamp.config.policy.clientId\":\"python\",\"clamp.config.policy.clientKey\":\"dGVzdA==\",\"clamp.config.sdc.catalog.url\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/\",\"clamp.config.sdc.hostUrl\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.sdc.serviceUrl\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/services\",\"clamp.config.dcae.inventory.url\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.dcae.dispatcher.url\":\"http:\/\/third_party_proxy:8085\"}/g' clamp.env
+sed -i 's/}/,\"clamp.config.policy.pdpUrl1\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.pdpUrl2\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.papUrl\":\"http:\/\/third_party_proxy:8085\/pap\/ , testpap, alpha123\",\"clamp.config.policy.clientId\":\"python\",\"clamp.config.policy.clientKey\":\"dGVzdA==\",\"clamp.config.sdc.catalog.url\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/\",\"clamp.config.sdc.hostUrl\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.sdc.serviceUrl\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/services\",\"clamp.config.dcae.inventory.url\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.dcae.dispatcher.url\":\"http:\/\/third_party_proxy:8085\",\"spring.profiles.active\":\"clamp-default,clamp-default-user,clamp-sdc-controller\"}/g' clamp.env
# Add the sql to create template so it is played by docker-compose later
cp ../../../src/test/resources/sql/four_templates_only.sql ../../sql/bulkload/
diff --git a/test/csit/scripts/clamp/start_clamp_containers.sh b/test/csit/scripts/clamp/start_clamp_containers.sh
index 11ddda1e4..dc0b4fe41 100755
--- a/test/csit/scripts/clamp/start_clamp_containers.sh
+++ b/test/csit/scripts/clamp/start_clamp_containers.sh
@@ -28,11 +28,11 @@ echo "This is ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh"
docker-compose up -d
# WAIT 5 minutes maximum and test every 5 seconds if Clamp up using HealthCheck API
-TIME_OUT=1200
+TIME_OUT=600
INTERVAL=5
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/restservices/clds/v1/clds/healthcheck); echo $response
+ response=$(curl --write-out '%{http_code}' --silent --output /dev/null -vk --key config/org.onap.clamp.keyfile https://localhost:8443/restservices/clds/v1/clds/healthcheck); echo $response
if [ "$response" == "200" ]; then
echo Clamp and its database well started in $TIME seconds
@@ -46,12 +46,13 @@ done
if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests...
+ exit 1;
fi
# To avoid some problem because templates not yet read
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null -u admin:password http://localhost:8080/restservices/clds/v1/cldsTempate/template-names); echo $response
+ response=$(curl --write-out '%{http_code}' --silent --output /dev/null -u admin:password -vk --key config/org.onap.clamp.keyfile https://localhost:8443/restservices/clds/v1/cldsTempate/template-names); echo $response
if [ "$response" == "200" ]; then
echo Templates well available
@@ -65,4 +66,5 @@ done
if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: Templates not available in $TIME_OUT seconds... Could cause problems for tests...
+ exit 1;
fi
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*
diff --git a/test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot b/test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot
index 3f87179cb..c9b7d8c06 100644
--- a/test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot
+++ b/test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot
@@ -11,26 +11,30 @@ ${login} admin
${passw} password
${SELENIUM_SPEED_FAST} .2 seconds
${SELENIUM_SPEED_SLOW} .5 seconds
+${BASE_URL} https://localhost:8443
+
+*** Keywords ***
+Create the sessions
+ ${auth}= Create List ${login} ${passw}
+ Create Session clamp ${BASE_URL} 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
Open Browser
# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
Start Virtual Display 1920 1080
- Open Browser http://localhost:8080/designer/index.html browser=firefox
+ Open Browser ${BASE_URL}/designer/index.html browser=firefox
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Set Window Size 1920 1080
${title}= Get Title
Should Be Equal CLDS ${title}
Good Login to Clamp UI and Verify logged in
- Input Text locator=username text=${login}
- Input Text locator=password text=${passw}
- Press Key locator=password key=\\13
Wait Until Element Is Visible xpath=//*[@class="navbar-brand logo_name ng-binding"] timeout=60
Element Text Should Be xpath=//*[@class="navbar-brand logo_name ng-binding"] expected=Hello:admin
@@ -86,8 +90,6 @@ Close Browser
Close Browser
Verify Holmes CL well created
- ${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} *HolmesModel1*
Should Not Contain Match ${resp} *HolmesModel99*
diff --git a/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot b/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot
index af77e8665..7ee275773 100644
--- a/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot
+++ b/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot
@@ -11,26 +11,23 @@ ${login} admin
${passw} password
${SELENIUM_SPEED_FAST} .2 seconds
${SELENIUM_SPEED_SLOW} .5 seconds
+${BASE_URL} https://localhost:8443
*** 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
Open Browser
# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
Start Virtual Display 1920 1080
- Open Browser http://localhost:8080/designer/index.html browser=firefox
+ Open Browser ${BASE_URL}/designer/index.html browser=firefox
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Set Window Size 1920 1080
${title}= Get Title
Should Be Equal CLDS ${title}
Good Login to Clamp UI and Verify logged in
- Input Text locator=username text=${login}
- Input Text locator=password text=${passw}
- Press Key locator=password key=\\13
Wait Until Element Is Visible xpath=//*[@class="navbar-brand logo_name ng-binding"] timeout=60
Element Text Should Be xpath=//*[@class="navbar-brand logo_name ng-binding"] expected=Hello:admin
@@ -93,8 +90,6 @@ Close Browser
Close Browser
Verify TCA CL well create
- ${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} *TCAModel1*
Should Not Contain Match ${resp} *TCAModel99*
diff --git a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot b/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot
index 8bbf7c85e..9116964b6 100644
--- a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot
+++ b/test/csit/tests/clamp/UIs/03__Verify_UI_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/HolmesModel1
+ ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/HolmesModel1
Should Contain Match ${resp} *templateHolmes1*
Should Contain Match ${resp} *DC2*
Should Contain Match ${resp} *DC3*
@@ -25,9 +23,7 @@ Verify HolmesModel1
Should Contain Match ${resp} *config Policy Name1*
Verify TCAModel1
- ${auth}= Create List ${login} ${passw}
- Create Session clamp http://localhost:8080 auth=${auth}
- ${resp}= Get Request clamp /restservices/clds/v1/clds/model/TCAModel1
+ ${resp}= Get Request ${clamp_session} /restservices/clds/v1/clds/model/TCAModel1
Should Contain Match ${resp} *templateTCA1*
Should Contain Match ${resp} *c95b0e7c-c1f0-4287-9928-7964c5377a46*
Should Contain Match ${resp} *vnfRecipe*
@@ -39,9 +35,7 @@ Verify TCAModel1
Should Contain Match ${resp} *400*
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} *HolmesModel1*
Should Contain Match ${resp} *TCAModel1*
Should Not Contain Match ${resp} *TCAModel99*
diff --git a/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot b/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
index 32b4ce7ec..a6ccb9947 100644
--- a/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
+++ b/test/csit/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
@@ -11,26 +11,23 @@ ${login} admin
${passw} password
${SELENIUM_SPEED_FAST} .2 seconds
${SELENIUM_SPEED_SLOW} .5 seconds
+${BASE_URL} https://localhost:8443
*** 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
Open Browser
# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
Start Virtual Display 1920 1080
- Open Browser http://localhost:8080/designer/index.html browser=firefox
+ Open Browser ${BASE_URL}/designer/index.html browser=firefox
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Set Window Size 1920 1080
${title}= Get Title
Should Be Equal CLDS ${title}
Good Login to Clamp UI and Verify logged in
- Input Text locator=username text=${login}
- Input Text locator=password text=${passw}
- Press Key locator=password key=\\13
Wait Until Element Is Visible xpath=//*[@class="navbar-brand logo_name ng-binding"] timeout=60
Element Text Should Be xpath=//*[@class="navbar-brand logo_name ng-binding"] expected=Hello:admin
diff --git a/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot b/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
index db72f3bbd..6330ead92 100644
--- a/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
+++ b/test/csit/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
@@ -11,26 +11,23 @@ ${login} admin
${passw} password
${SELENIUM_SPEED_FAST} .2 seconds
${SELENIUM_SPEED_SLOW} .5 seconds
+${BASE_URL} https://localhost:8443
*** 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
Open Browser
# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
Start Virtual Display 1920 1080
- Open Browser http://localhost:8080/designer/index.html browser=firefox
+ Open Browser ${BASE_URL}/designer/index.html browser=firefox
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Set Window Size 1920 1080
${title}= Get Title
Should Be Equal CLDS ${title}
Good Login to Clamp UI and Verify logged in
- Input Text locator=username text=${login}
- Input Text locator=password text=${passw}
- Press Key locator=password key=\\13
Wait Until Element Is Visible xpath=//*[@class="navbar-brand logo_name ng-binding"] timeout=60
Element Text Should Be xpath=//*[@class="navbar-brand logo_name ng-binding"] expected=Hello:admin