Fix no AAF config

Add missing config for no AAF properties file

Issue-ID: CLAMP-252
Change-Id: Iba8b0ed7119460a192cf30fcadb6e1b7b7e50b5d
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/README.md b/README.md
index 08c2b20..783501a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -173,4 +173,9 @@ Passwords should be hashed using Bcrypt :
 \r
 Default credentials are admin/password and cs0008/password.\r
 \r
+There is a spring file that disables the AAF and enable the Spring authentication by default. \r
+To use it just add\r
 \r
+--spring.config.name=application-noaaf\r
+\r
+to the jvm parameters. This file is available by default in the java classpath resource folder. 
\ No newline at end of file

diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index bf837ff..2d34fba 100644 (file)
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -82,7 +82,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:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
+spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost: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
@@ -101,7 +101,7 @@ async.max.pool.size=20
 async.queue.capacity=500
 
 #For EELF logback file
-#com.att.eelf.logging.path=
+#clamp.config.logback.path=
 clamp.config.logback.filename=logback-default.xml
 #The log folder that will be used in logback.xml file
 clamp.config.log.path=/var/log/onap/clamp
@@ -147,6 +147,9 @@ clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_
 clamp.config.policy.base.policyNamePrefix=Config_
 clamp.config.policy.op.type=BRMS_Param
 
+clamp.config.import.tosca.model=true
+clamp.config.tosca.policyTypes=tca
+clamp.config.tosca.filePath=/tmp/tosca-models
 
 # TCA MicroService Policy request build properties
 #
@@ -159,7 +162,7 @@ clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-te
 #
 # Operational Policy request build properties
 #
-clamp.config.op.policyDescription=from clds
+clamp.config.op.policyDescription=from CLAMP
 # default
 clamp.config.op.templateName=ClosedLoopControlName
 clamp.config.op.operationTopic=APPC-CL
@@ -212,3 +215,4 @@ clamp.config.security.permission.type.template=org.onap.clamp.clds.template
 clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
\ No newline at end of file