Merge "Fix https issue + create session globally"

5 files changed, 24 insertions, 39 deletions

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