diff options
| -rwxr-xr-x | scripts/clamp/clone_clamp_and_change_dockercompose.sh | 3 | ||||
| -rw-r--r-- | tests/clamp/APIs/01__Test_CL_APIs.robot | 7 | ||||
| -rw-r--r-- | tests/clamp/UIs/01__Open_And_Edit_TCA.robot | 4 | ||||
| -rw-r--r-- | tests/clamp/UIs/02__Verify_Modification_In_UI.robot | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh index 0c30b26a..afd60e78 100755 --- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh +++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -39,5 +39,4 @@ sed -i '/image: onap\/clamp-backend/c\ image: nexus3.onap.org:10001\/onap\/cl 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/ -echo 'mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < loop-examples.sql' >> ../../sql/load-sql-files-tests-automation.sh +echo '/docker-entrypoint-initdb.d/dump/load-fake-data.sh' >> $WORKSPACE/archives/clamp-clone/clamp/extra/sql/bootstrap-database.sh diff --git a/tests/clamp/APIs/01__Test_CL_APIs.robot b/tests/clamp/APIs/01__Test_CL_APIs.robot index 3edccefd..9fb9d06d 100644 --- a/tests/clamp/APIs/01__Test_CL_APIs.robot +++ b/tests/clamp/APIs/01__Test_CL_APIs.robot @@ -27,21 +27,20 @@ List TCAs Should Contain Match ${resp} *Name1_tca_3* Open TCA1 - ${resp}= Get Request ${clamp_session} /restservices/clds/v2/loop/LOOP_ejh5S_v1_0_ResourceInstanceName1_tca + ${resp}= Get Request ${clamp_session} /restservices/clds/v2/loop/LOOP_yHsgu_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_ejh5S_v1_0_ResourceInstanceName2_tca_2 + ${resp}= Get Request ${clamp_session} /restservices/clds/v2/loop/LOOP_yHsgu_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_ejh5S_v1_0_ResourceInstanceName1_tca_3 + ${resp}= Get Request ${clamp_session} /restservices/clds/v2/loop/LOOP_yHsgu_v1_0_ResourceInstanceName1_tca_3 Should Contain Match ${resp} *Name1_tca_3* Should Contain Match ${resp} *Operational Policy Item* Should Contain Match ${resp} *1004* diff --git a/tests/clamp/UIs/01__Open_And_Edit_TCA.robot b/tests/clamp/UIs/01__Open_And_Edit_TCA.robot index edf54e81..114c1d46 100644 --- a/tests/clamp/UIs/01__Open_And_Edit_TCA.robot +++ b/tests/clamp/UIs/01__Open_And_Edit_TCA.robot @@ -10,7 +10,7 @@ ${login} admin ${passw} password ${SELENIUM_SPEED_FAST} 1 seconds ${SELENIUM_SPEED_SLOW} 2 seconds -${BASE_URL} https://localhost:8443 +${BASE_URL} https://localhost:443 *** Keywords *** Create the sessions ${auth}= Create List ${login} ${passw} @@ -26,7 +26,7 @@ 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 Set Selenium Speed ${SELENIUM_SPEED_SLOW} - Open Browser ${BASE_URL}/designer/index.html browser=firefox + Open Browser ${BASE_URL}/index.html browser=firefox Reply to authentication popup Run Keyword And Ignore Error Insert into prompt ${login} ${passw} diff --git a/tests/clamp/UIs/02__Verify_Modification_In_UI.robot b/tests/clamp/UIs/02__Verify_Modification_In_UI.robot index 84ea22e8..d50d7976 100644 --- a/tests/clamp/UIs/02__Verify_Modification_In_UI.robot +++ b/tests/clamp/UIs/02__Verify_Modification_In_UI.robot @@ -21,8 +21,6 @@ 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_ejh5S_v1_0_ResourceInstanceName1_tca + ${resp}= Get Request ${clamp_session} /restservices/clds/v2/loop/LOOP_yHsgu_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* |