aboutsummaryrefslogtreecommitdiffstats
path: root/runtime/src/test/resources
diff options
context:
space:
mode:
authorAjith Sreekumar <ajith.sreekumar@bell.ca>2021-08-09 12:50:31 +0000
committerGerrit Code Review <gerrit@onap.org>2021-08-09 12:50:31 +0000
commit8a2f14ae90528454c4aa2351f8f4c1e04eaed2b6 (patch)
treeed0435840f311deb55b5744a64fcb1b4fde78a9d /runtime/src/test/resources
parent522f98830955eeef3a2e602b855d2af01bafe941 (diff)
parent4aa0eb0bae6353408e9a82d8f07af1703ccaf9d3 (diff)
Merge "Use slf4j instead of EELFLogger in Clamp"
Diffstat (limited to 'runtime/src/test/resources')
-rw-r--r--runtime/src/test/resources/application.properties3
-rw-r--r--runtime/src/test/resources/https/https-test.properties7
-rw-r--r--runtime/src/test/resources/logback.xml6
-rw-r--r--runtime/src/test/resources/robotframework/robotframework-test.properties5
4 files changed, 6 insertions, 15 deletions
diff --git a/runtime/src/test/resources/application.properties b/runtime/src/test/resources/application.properties
index 54a89078d..bc0c290db 100644
--- a/runtime/src/test/resources/application.properties
+++ b/runtime/src/test/resources/application.properties
@@ -124,8 +124,7 @@ async.core.pool.size=10
async.max.pool.size=20
async.queue.capacity=500
-#For EELF logback file
-#com.att.eelf.logging.path=
+#For logback file
clamp.config.logback.filename=logback-default.xml
#The log folder that will be used in logback.xml file
clamp.config.log.path=log
diff --git a/runtime/src/test/resources/https/https-test.properties b/runtime/src/test/resources/https/https-test.properties
index 14079a78e..19069cebc 100644
--- a/runtime/src/test/resources/https/https-test.properties
+++ b/runtime/src/test/resources/https/https-test.properties
@@ -102,9 +102,8 @@ camel.springboot.backlog-tracing=true
camel.springboot.tracing=true
camel.springboot.message-history=true
-#For EELF logback file
-#com.att.eelf.logging.path=
-com.att.eelf.logging.file=logback-default.xml
+#For logback file
+clamp.config.logback.filename=logback-default.xml
#The log folder that will be used in logback.xml file
clamp.config.log.path=log
@@ -132,4 +131,4 @@ clamp.config.cadi.oauthTokenUrl= https://AAF_LOCATE_URL/locate/onap.org.osaaf.aa
clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.introspect:2.1/introspect
clamp.config.cadi.aafEnv=DEV
clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US \ No newline at end of file
+clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
diff --git a/runtime/src/test/resources/logback.xml b/runtime/src/test/resources/logback.xml
index 97a8982a9..d4cec3851 100644
--- a/runtime/src/test/resources/logback.xml
+++ b/runtime/src/test/resources/logback.xml
@@ -71,12 +71,6 @@
<!-- CLDS related loggers -->
<logger
- name="com.att.eelf.error"
- level="OFF">
- <appender-ref ref="STDOUT" />
- </logger>
-
- <logger
name="ch.qos.logback.classic"
level="INFO" >
<appender-ref ref="STDOUT" />
diff --git a/runtime/src/test/resources/robotframework/robotframework-test.properties b/runtime/src/test/resources/robotframework/robotframework-test.properties
index fed074198..499719aa6 100644
--- a/runtime/src/test/resources/robotframework/robotframework-test.properties
+++ b/runtime/src/test/resources/robotframework/robotframework-test.properties
@@ -121,8 +121,7 @@ async.core.pool.size=10
async.max.pool.size=20
async.queue.capacity=500
-#For EELF logback file
-#com.att.eelf.logging.path=
+#For logback file
clamp.config.logback.filename=logback-default.xml
#The log folder that will be used in logback.xml file
clamp.config.log.path=log
@@ -177,4 +176,4 @@ clamp.config.cds.password=ccsdkapps
## Tosca converter
clamp.config.tosca.converter.json.schema.templates=classpath:/clds/tosca-converter/templates.json
clamp.config.tosca.converter.default.datatypes=classpath:/clds/tosca-converter/default-tosca-types.yaml
-clamp.config.tosca.converter.dictionary.support.enabled=true \ No newline at end of file
+clamp.config.tosca.converter.dictionary.support.enabled=true