From fdfde2175da045760b356548203131480ae9d601 Mon Sep 17 00:00:00 2001 From: sebdet Date: Thu, 12 Sep 2019 10:59:15 +0200 Subject: Add scritp for DB Add scripts to load/save the db + add autogeneration of the test data used by the CSIT Issue-ID: CLAMP-496 Change-Id: I90cc4d1860562c0325038e6b8e900d99b64d201a Signed-off-by: sebdet --- src/main/resources/application-noaaf.properties | 20 ++++++-------------- src/test/resources/application.properties | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index cec02579a..ce4a76fff 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -97,7 +97,7 @@ camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml #clds datasource connection details spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 +spring.datasource.cldsdb.url=jdbc:mariadb:sequential://third-party-proxy:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 spring.datasource.cldsdb.username=clds spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067 spring.datasource.cldsdb.validationQuery=SELECT 1 @@ -149,21 +149,13 @@ clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment- # # # Configuration Settings for Policy Engine Components -clamp.config.policy.api.url=http4://policy.api.simpledemo.onap.org:6969 +clamp.config.policy.api.url=http4://third-party-proxy:8085 clamp.config.policy.api.userName=healthcheck clamp.config.policy.api.password=zb!XztG34 -clamp.config.policy.pap.url=http4://policy.api.simpledemo.onap.org:6969 +clamp.config.policy.pap.url=http4://third-party-proxy:8085 clamp.config.policy.pap.userName=healthcheck clamp.config.policy.pap.password=zb!XztG34 -clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 -clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 -clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123 -clamp.config.policy.notificationType=websocket -clamp.config.policy.notificationUebServers=localhost -clamp.config.policy.notificationTopic=PDPD-CONFIGURATION -clamp.config.policy.clientId=python -# base64 encoding clamp.config.policy.clientKey=dGVzdA== #DEVL for development @@ -216,17 +208,17 @@ clamp.config.action.insert.test.event=false clamp.config.clds.service.cache.invalidate.after.seconds=120 #DCAE Inventory Url Properties -clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080 +clamp.config.dcae.inventory.url=http://third-party-proxy:8085 clamp.config.dcae.intentory.retry.interval=10000 clamp.config.dcae.intentory.retry.limit=5 #DCAE Dispatcher Url Properties -clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8188 +clamp.config.dcae.dispatcher.url=http://third-party-proxy:8085 clamp.config.dcae.dispatcher.retry.interval=20000 clamp.config.dcae.dispatcher.retry.limit=30 #DCAE Deployment Url Properties -clamp.config.dcae.deployment.url=http4://dcae.api.simpledemo.onap.org:8188 +clamp.config.dcae.deployment.url=http4://third-party-proxy:8085 clamp.config.dcae.deployment.userName=test clamp.config.dcae.deployment.password=test diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 7b29e179f..b23f77ace 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -104,7 +104,7 @@ spring.datasource.cldsdb.initialSize=0 spring.datasource.cldsdb.testOnBorrow=true spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true -spring.jpa.properties.javax.persistence.schema-generation.database.action=drop-and-create +spring.jpa.properties.javax.persistence.schema-generation.database.action=none #spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata #spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create #spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql -- cgit 1.2.3-korg