Fix test for clamp-backend and frontend new UI

Signed-off-by: eh552t <eh552t@intl.att.com>
Change-Id: I123876f31dc591184f0986edba4bc9a302779607
Issue-ID: CLAMP-276

5 files changed, 29 insertions, 82 deletions

diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh
index 5970ab2f..0c30b26a 100755
--- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh
+++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh
@@ -35,10 +35,8 @@ git clone --depth 1 http://gerrit.onap.org/r/clamp -b $GERRIT_BRANCH
 cd clamp/extra/docker/clamp/
 
 # Pull the Clamp docker image from nexus instead of local image by default in the docker-compose.yml
-sed -i '/image: onap\/clamp/c\    image: nexus3.onap.org:10001\/onap\/clamp:4.0-STAGING-latest' 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\",\"spring.profiles.active\":\"clamp-default,clamp-default-user,clamp-sdc-controller\",\"server.ssl.client-auth\":\"want\"}/g' clamp.env
+sed -i '/image: onap\/clamp-backend/c\    image: nexus3.onap.org:10001\/onap\/clamp-backend:4.1-STAGING-latest' docker-compose.yml
+sed -i '/image: onap\/clamp-frontend/c\    image: nexus3.onap.org:10001\/onap\/clamp-frontend:4.1-STAGING-latest' docker-compose.yml
 
 # Add the sql to create template so it is played by docker-compose later
 cp ../../../src/test/resources/sql/loop-examples.sql ../../sql/bulkload/
diff --git a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
index 31eb7560..bc796787 100755
--- a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
+++ b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
@@ -19,8 +19,9 @@
 
 echo "This is ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh"
 
-kill-instance.sh clamp_clamp_1
+kill-instance.sh clamp_clamp-backend_1
+kill-instance.sh clamp_clamp-frontend_1
 kill-instance.sh clamp_db_1
-kill-instance.sh clamp_third_party_proxy_1
+kill-instance.sh clamp_third-party-proxy_1
 
 # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
diff --git a/tests/clamp/APIs/01__Test_CL_APIs.robot b/tests/clamp/APIs/01__Test_CL_APIs.robot
index 1a874323..3edccefd 100644
--- a/tests/clamp/APIs/01__Test_CL_APIs.robot
+++ b/tests/clamp/APIs/01__Test_CL_APIs.robot
@@ -22,48 +22,27 @@ Get Requests health check ok
 
 List TCAs
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/getAllNames
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName1_tca*
+    Should Contain Match    ${resp}   *Name1_tca*
     Should Contain Match    ${resp}   *tca_2*
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName1_tca_3*
+    Should Contain Match    ${resp}   *Name1_tca_3*
 
 Open TCA1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName1_tca*
-    Should Contain Match    ${resp}   *GENERATED_POLICY_ID_AT_SUBMIT*
-    Should Contain Match    ${resp}   *onap.policy.monitoring.cdap.tca.hi.lo.app*
-    Should Contain Match    ${resp}   *TCA Policy Scope*
+    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_ejh5S_v1_0_ResourceInstanceName1_tca
+    Should Contain Match    ${resp}   *Name1_tca*
+    Should Contain Match    ${resp}   *Operational Policy Item*
+    Should Contain Match    ${resp}   *Operational policies*
+    Should Contain Match    ${resp}   *Micro Service policies UPDATED*
 
 Open TCA2
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName2_tca_2
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName2_tca_2*
-    Should Contain Match    ${resp}   *GENERATED_POLICY_ID_AT_SUBMIT*
-    Should Contain Match    ${resp}   *dmaap.onap-message-router*
+    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_ejh5S_v1_0_ResourceInstanceName2_tca_2
+    Should Contain Match    ${resp}   *Name2_tca_2*
+    Should Contain Match    ${resp}   *Operational Policy Item*
+    Should Contain Match    ${resp}   *1004*
     Should Contain Match    ${resp}   *TCA Policy Scope*
 
 Open TCA3
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca_3
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName1_tca*
-    Should Contain Match    ${resp}   *GENERATED_POLICY_ID_AT_SUBMIT*
-    Should Contain Match    ${resp}   *onap.policy.monitoring.cdap.tca.hi.lo.app*
-    Should Contain Match    ${resp}   *TCA Policy Scope Version*
-
-Modify MicroService Policy TCA1
-    ${data}=    Get Binary File     ${CURDIR}${/}data${/}microservicePolicyTca1.json
-    &{headers}=  Create Dictionary      Content-Type=application/json
-    ${resp}=    POST Request    ${clamp_session}   /restservices/clds/v2/loop/updateMicroservicePolicy/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca     data=${data}   headers=${headers}
-    Should Be Equal As Strings      ${resp.status_code}     200
-
-Verify Modification MicroService TCA1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca
-    Should Contain Match    ${resp}   *version1.11*
-
-Modify Operational Policy TCA1
-    ${data}=    Get Binary File     ${CURDIR}${/}data${/}operationalPolicyTca1.json
-    &{headers}=  Create Dictionary      Content-Type=application/json
-    ${resp}=    POST Request    ${clamp_session}   /restservices/clds/v2/loop/updateOperationalPolicies/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca     data=${data}   headers=${headers}
-    Should Be Equal As Strings      ${resp.status_code}     200
-
-Verify Modification Operational TCA1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca
-    Should Contain Match    ${resp}   *Test_Field*
-
+    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_ejh5S_v1_0_ResourceInstanceName1_tca_3
+    Should Contain Match    ${resp}   *Name1_tca_3*
+    Should Contain Match    ${resp}   *Operational Policy Item*
+    Should Contain Match    ${resp}   *1004*
+    Should Contain Match    ${resp}   *TCA Policy Scope*
diff --git a/tests/clamp/UIs/01__Open_And_Edit_TCA.robot b/tests/clamp/UIs/01__Open_And_Edit_TCA.robot
index c0070c77..edf54e81 100644
--- a/tests/clamp/UIs/01__Open_And_Edit_TCA.robot
+++ b/tests/clamp/UIs/01__Open_And_Edit_TCA.robot
@@ -5,20 +5,17 @@ Library     OperatingSystem
 Library     json
 Library     ../../../scripts/clamp/python-lib/CustomSeleniumLibrary.py
 Library     XvfbRobot
-
 *** Variables ***
 ${login}                     admin
 ${passw}                     password
-${SELENIUM_SPEED_FAST}       .2 seconds
-${SELENIUM_SPEED_SLOW}       .5 seconds
+${SELENIUM_SPEED_FAST}       1 seconds
+${SELENIUM_SPEED_SLOW}       2 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
     Create the sessions
@@ -35,33 +32,5 @@ Reply to authentication popup
     Run Keyword And Ignore Error    Insert into prompt    ${login} ${passw}
     Confirm action
 
-Good Login to Clamp UI and Verify logged in
-    Set Window Size    1920    1080
-    ${title}=    Get Title
-    Should Be Equal    CLDS    ${title}
-    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
-
-Open TCA1 from Menu
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Open CL       timeout=60
-    Click Element    locator=Open CL
-    Select From List By Label       id=modelName      LOOP_iYTIP_v1_0_ResourceInstanceName1_tca
-    Click Button    locator=OK
-
-Set Properties for HolmesModel1
-    Wait Until Element Is Visible      xpath=//*[@data-element-id="TCA_iYTIP_v1_0_ResourceInstanceName1_tca"]       timeout=60
-    Click Element    xpath=//*[@data-element-id="TCA_iYTIP_v1_0_ResourceInstanceName1_tca"]
-    Wait Until Element Is Visible       xpath=//*[@id="editor"]/div/h3/div[2]/button[1]       timeout=60
-    Click Element    xpath=//*[@id="editor"]/div/h3/div[2]/button[1]
-    Wait Until Element Is Visible       xpath=//*[@id="root.0"]/div[2]/div/div/div[2]/div/h3/div[2]/button[1]/span      timeout=60
-    Click Element    xpath=//*[@id="root.0"]/div[2]/div/div/div[2]/div/h3/div[2]/button[1]/span
-    Input Text      xpath=//*[@name="root[0][metricsPerEventName][0][eventName]"]     text=Event1
-    Input Text      xpath=//*[@name="root[0][metricsPerEventName][0][policyName]"]     text=PolicyScope1
-    Input Text      xpath=//*[@name="root[0][metricsPerEventName][0][policyScope]"]     text=TCAPolicyScope1
-    Input Text      xpath=//*[@name="root[0][metricsPerEventName][0][policyVersion]"]     text=1.2.3
-    Click Button    locator=Done
-
 Close Browser
-    Close Browser
+    Close Browser
\ No newline at end of file
diff --git a/tests/clamp/UIs/02__Verify_Modification_In_UI.robot b/tests/clamp/UIs/02__Verify_Modification_In_UI.robot
index 979547c6..84ea22e8 100644
--- a/tests/clamp/UIs/02__Verify_Modification_In_UI.robot
+++ b/tests/clamp/UIs/02__Verify_Modification_In_UI.robot
@@ -21,8 +21,8 @@ Get Requests health check ok
     Should Be Equal As Strings  ${resp.status_code}     200
 
 Open TCA1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_iYTIP_v1_0_ResourceInstanceName1_tca
-    Should Contain Match    ${resp}   *LOOP_iYTIP_v1_0_ResourceInstanceName1_tca*
-    Should Contain Match    ${resp}   *Event1*
-    Should Contain Match    ${resp}   *1.2.3*
-    Should Contain Match    ${resp}   *PolicyScope1*
+    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v2/loop/LOOP_ejh5S_v1_0_ResourceInstanceName1_tca
+    Should Contain Match    ${resp}   *Name1_tca*
+    Should Contain Match    ${resp}   *Operational Policy*
+    Should Contain Match    ${resp}   *Micro Service policies UPDATED*
+    Should Contain Match    ${resp}   *POLICY SUBMIT request*