aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/scripts/clamp
diff options
context:
space:
mode:
Diffstat (limited to 'test/csit/scripts/clamp')
-rwxr-xr-xtest/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh7
-rwxr-xr-xtest/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh2
2 files changed, 3 insertions, 6 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 14619b9f3..e6e12f2d5 100755
--- a/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
+++ b/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
@@ -33,12 +33,9 @@ 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' docker-compose.yml
-# Change config to take localhost:8085 for SDC and Policy simulator
-sed -i 's/classpath:\/clds\/clds-reference.properties/file:.\/config\/clds-reference-sdc_proxy.properties/g' clamp.env
-sed -i 's/classpath:\/clds\/clds-policy-config.properties/file:.\/config\/clds-policy-config-sdc_proxy.properties/g' clamp.env
+# Change config to take third_party_proxy:8085 for SDC, Policy and DCAE simulator
+sed -i 's/\"classpath:\/clds\/clds-policy-config.properties\"/\"file:.\/config\/clds-policy-config-third_party_proxy.properties\",\"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
# 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/
echo 'mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < four_templates_only.sql' >> ../../sql/load-sql-files-tests-automation.sh
-
-
diff --git a/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh b/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
index d59d19407..c94a40bcc 100755
--- a/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
+++ b/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
@@ -21,6 +21,6 @@ echo "This is ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_
kill-instance.sh clamp_clamp_1
kill-instance.sh clamp_db_1
-kill-instance.sh clamp_sdc_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