[AAI] Revert commits that are breaking the master branch

This reverts:
b31e250091cd68edb77f3158691844decda82fc8
46961c4794a17f72643bd491af6c159ea7e53380

which are our main suspects for breaking testing in the master branch.
As this issue prevents many SO related patches from being merged let's
first revert those to make master work once again.

Issue-ID: SO-3216
Change-Id: I7f7daaaef3f7911afb5c8729c296773a630b5fb6
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>

7 files changed, 190 insertions, 251 deletions

diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml
index 6396259..6f2c033 100644
--- a/components/aai-babel/values.yaml
+++ b/components/aai-babel/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 
 # application image
-image: onap/babel:1.7.1
+image: onap/babel:1.6.2
 
 flavor: small
 
diff --git a/components/aai-data-router/resources/config/schemaIngest.properties b/components/aai-data-router/resources/config/schemaIngest.properties
index b94ce51..f98ddce 100644
--- a/components/aai-data-router/resources/config/schemaIngest.properties
+++ b/components/aai-data-router/resources/config/schemaIngest.properties
@@ -1,65 +1,65 @@
-#
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2017-2018 Amdocs
-# Modifications Copyright © 2018 Bell Canada
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-#
-
-
-# Properties for the SchemaLocationsBean
-# Files named aai_oxm_v*.xml are unpacked here:
-nodeDir=/opt/app/data-router/onap/oxm
-# Dummy folder/directory:
-edgeDir=
-
-# Properties required by the aai-common - aai-schema-ingest lib as of 1.3.0
-schema.configuration.location=N/A
-schema.nodes.location=/opt/app/data-router/onap/oxm/
-schema.edges.location=
-# These versions need to exist if they are included in the list
-schema.version.list={{ .Values.config.schemaVersionList }}
-# Decalares the oxm version to load
-schema.version.api.default={{ .Values.config.schemaApiDefault }}
-
-# Don't use these properties in our application, need to be set to prevent an exception on startup (see SchemaVersions bean)
-schema.version.depth.start={{.Values.global.config.schema.version.depth}}
-schema.version.related.link.start={{.Values.global.config.schema.version.related.link}}
-schema.version.app.root.start={{.Values.global.config.schema.version.app.root}}
-schema.version.namespace.change.start={{.Values.global.config.schema.version.namespace.change}}
-schema.version.edge.label.start={{.Values.global.config.schema.version.edge.label}}
-
-#This property is used to enable or disable schema service, possible values are: schema-service  or config
-schema.translator.list={{.Values.config.schemaTranslatorList}}
-
-#These properties are needed when schema service is  enabled
-schema.service.base.url=https://aai-schema-service:8452/aai/schema-service/v1/
-schema.service.nodes.endpoint=nodes?version=
-schema.service.edges.endpoint=edgerules?version=
-schema.service.versions.endpoint=versions
-schema.local=true
-schema.filename=mockrequests
-#Default rest client is the two-way-ssl
-#schema.service.client=two-way-ssl
-#Replace the below with the A&AI client key store
-schema.service.ssl.key-store=${CONFIG_HOME}/auth/{{.Values.global.config.keystore.filename}}
-#Replace the below with the A&AI tomcat trust store
-schema.service.ssl.trust-store=${CONFIG_HOME}/auth/{{.Values.global.config.truststore.filename}}
-schema.service.ssl.key-store-password={{.Values.global.config.keystore.passwd}}
-schema.service.ssl.trust-store-password={{.Values.global.config.truststore.passwd}}
-
-spring.application.name=datarouter
+#

+# ============LICENSE_START=======================================================

+# org.onap.aai

+# ================================================================================

+# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.

+# Copyright © 2017-2018 Amdocs

+# Modifications Copyright © 2018 Bell Canada

+# ================================================================================

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#       http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+# ============LICENSE_END=========================================================

+#

+

+

+# Properties for the SchemaLocationsBean

+# Files named aai_oxm_v*.xml are unpacked here:

+nodeDir=/opt/app/data-router/onap/oxm

+# Dummy folder/directory:

+edgeDir=

+

+# Properties required by the aai-common - aai-schema-ingest lib as of 1.3.0

+schema.configuration.location=N/A

+schema.nodes.location=/opt/app/data-router/onap/oxm/

+schema.edges.location=

+# These versions need to exist if they are included in the list

+schema.version.list={{.Values.global.config.schema.version.list}}

+# Decalares the oxm version to load

+schema.version.api.default={{.Values.global.config.schema.version.api.default}}

+

+# Don't use these properties in our application, need to be set to prevent an exception on startup (see SchemaVersions bean)

+schema.version.depth.start={{.Values.global.config.schema.version.depth}}

+schema.version.related.link.start={{.Values.global.config.schema.version.related.link}}

+schema.version.app.root.start={{.Values.global.config.schema.version.app.root}}

+schema.version.namespace.change.start={{.Values.global.config.schema.version.namespace.change}}

+schema.version.edge.label.start={{.Values.global.config.schema.version.edge.label}}

+

+#This property is used to enable or disable schema service, possible values are: schema-service  or config

+schema.translator.list={{.Values.config.schemaTranslatorList}}

+

+#These properties are needed when schema service is  enabled

+schema.service.base.url=https://aai-schema-service:8452/aai/schema-service/v1/

+schema.service.nodes.endpoint=nodes?version=

+schema.service.edges.endpoint=edgerules?version=

+schema.service.versions.endpoint=versions

+schema.local=true

+schema.filename=mockrequests

+#Default rest client is the two-way-ssl

+#schema.service.client=two-way-ssl

+#Replace the below with the A&AI client key store

+schema.service.ssl.key-store=${CONFIG_HOME}/auth/{{.Values.global.config.keystore.filename}}

+#Replace the below with the A&AI tomcat trust store

+schema.service.ssl.trust-store=${CONFIG_HOME}/auth/{{.Values.global.config.truststore.filename}}

+schema.service.ssl.key-store-password={{.Values.global.config.keystore.passwd}}

+schema.service.ssl.trust-store-password={{.Values.global.config.truststore.passwd}}

+

+spring.application.name=datarouter

diff --git a/components/aai-data-router/values.yaml b/components/aai-data-router/values.yaml
index 53f25e7..245735d 100644
--- a/components/aai-data-router/values.yaml
+++ b/components/aai-data-router/values.yaml
@@ -33,8 +33,6 @@ config:
   keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
   keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
   schemaTranslatorList: config
-  schemaVersionList: "v11,v12,v13,v14,v15,v16,v17,v18,v19"
-  schemaApiDefault: "v19"
 
 
 # default number of instances
diff --git a/components/aai-schema-service/config/application.properties b/components/aai-schema-service/config/application.properties
index a639c41..7b9312f 100644
--- a/components/aai-schema-service/config/application.properties
+++ b/components/aai-schema-service/config/application.properties
@@ -21,11 +21,10 @@ info.build.version=1.1.0
 spring.application.name=aai-schema-service
 spring.jersey.type=filter
 
-spring.main.allow-bean-definition-overriding=true
-server.servlet.context-path=/
-
+server.contextPath=/
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
 
+spring.profiles.active={{ .Values.global.config.profiles.active }}
 spring.jersey.application-path=${schema.uri.base.path}
 server.tomcat.max-threads=200
 server.tomcat.min-Spare-Threads=25
diff --git a/components/aai-schema-service/config/logback.xml b/components/aai-schema-service/config/logback.xml
index 9cfffe9..f10546a 100644
--- a/components/aai-schema-service/config/logback.xml
+++ b/components/aai-schema-service/config/logback.xml
@@ -1,63 +1,18 @@
-<!--
-
-  ============LICENSE_START=======================================================
-  org.onap.aai
-  ================================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
-  <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
-
-  <property resource="application.properties"/>
-
-  <property name="namespace" value="aai-schema-service"/>
-
-  <property name="AJSC_HOME" value="${AJSC_HOME:-.}"/>
-  <property name="logDirectory" value="${AJSC_HOME}/logs"/>
-  <!-- Old patterns
-  <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-  <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-  <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-  //<property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-  <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-  <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>
-  -->
-  <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
-  <property name="p_lvl" value="%level"/>
-  <property name="p_log" value="%logger"/>
-  <property name="p_mdc" value="%replace(%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}){'\\|', '!'}"/>
-  <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-  <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-  <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-  <property name="p_thr" value="%thread"/>
-  <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
-  <!-- Patterns from onap demo -->
-  <property name="errorPattern" value="%X{LogTimestamp}|%X{RequestID}|%thread|%replace(%X{ServiceName}){'\\|', '!'}|%X{PartnerName}|%X{TargetEntity}|%replace(%X{TargetServiceName}){'\\|', '!'}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
-  <property name="debugPattern" value="%X{LogTimestamp}|%X{RequestID}|%msg\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t|^%n" />
-
-  <property name="auditPattern" value="%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%thread||%replace(%X{ServiceName}){'\\|', '!'}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||${p_mak}|${p_mdc}|||%msg%n" />
-  <property name="metricPattern" value="%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%thread||%replace(%X{ServiceName}){'\\|', '!'}|%X{PartnerName}|%X{TargetEntity}|%replace(%X{TargetServiceName}){'\\|', '!'}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|${p_mak}|${p_mdc}|||%msg%n" />
-  <property name="transLogPattern" value="%X{LogTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{RequestID}|%X{ServiceInstanceID}|%-10t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%replace(%replace(%X{ResponseDesc}){'\\|', '!'}){'\r|\n', '^'}|%X{InstanceUUID}|%level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{clientIpAddress}||%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{PartnerName}:%m%n"/>
-
-  <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-  <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-  <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+  <property resource="application.properties" />
+  <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
+  <jmxConfigurator />
+  <property name="logDirectory" value="${AJSC_HOME}/logs" />
+  <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
+  <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
+  <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
+  <!--  <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/> -->
+  <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
+  <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>
+  <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+  <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+  <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>
@@ -65,7 +20,6 @@
       </pattern>
     </encoder>
   </appender>
-
   <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/rest/sane.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -76,30 +30,34 @@
       </pattern>
     </encoder>
   </appender>
-
   <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
     <includeCallerData>true</includeCallerData>
-    <appender-ref ref="SANE"/>
+    <appender-ref ref="SANE" />
   </appender>
-
-  <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="METRIC"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>INFO</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
     <file>${logDirectory}/rest/metrics.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}
+      </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>${metricPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfMetricLogPattern}</pattern>
     </encoder>
   </appender>
   <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
     <includeCallerData>true</includeCallerData>
-    <appender-ref ref="METRIC"/>
+    <appender-ref ref="METRIC" />
   </appender>
-
   <appender name="DEBUG"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
     <filter class="ch.qos.logback.classic.filter.LevelFilter">
       <level>DEBUG</level>
       <onMatch>ACCEPT</onMatch>
@@ -110,57 +68,52 @@
       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfLogPattern}</pattern>
     </encoder>
   </appender>
-
   <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
-    <appender-ref ref="DEBUG"/>
     <includeCallerData>true</includeCallerData>
+    <appender-ref ref="DEBUG" />
   </appender>
-
   <appender name="ERROR"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>WARN</level>
+    </filter>
     <file>${logDirectory}/rest/error.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfErrorLogPattern}</pattern>
     </encoder>
   </appender>
-
   <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
-    <appender-ref ref="ERROR"/>
+    <includeCallerData>true</includeCallerData>
+    <appender-ref ref="ERROR" />
   </appender>
-
   <appender name="AUDIT"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/rest/audit.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfAuditLogPattern}</pattern>
     </encoder>
   </appender>
-
   <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
     <includeCallerData>true</includeCallerData>
-    <appender-ref ref="AUDIT"/>
+    <appender-ref ref="AUDIT" />
   </appender>
-
   <appender name="translog"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
     <filter class="ch.qos.logback.classic.filter.LevelFilter">
       <level>DEBUG</level>
       <onMatch>ACCEPT</onMatch>
@@ -171,125 +124,114 @@
       <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>${transLogPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfTransLogPattern}</pattern>
     </encoder>
   </appender>
-
   <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
     <queueSize>1000</queueSize>
     <includeCallerData>true</includeCallerData>
-    <appender-ref ref="translog"/>
+    <appender-ref ref="translog" />
   </appender>
-
-  <appender name="external"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="dmaapAAIEventConsumer"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
       <level>WARN</level>
     </filter>
-    <file>${logDirectory}/external/external.log</file>
+    <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
+      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfLogPattern}</pattern>
     </encoder>
   </appender>
-
-  <appender name="auth"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+  <appender name="dmaapAAIEventConsumerDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
       <level>DEBUG</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
     </filter>
-    <file>${logDirectory}/auth/auth.log</file>
+    <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}
+      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
       </fileNamePattern>
     </rollingPolicy>
-    <encoder>
-      <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n</pattern>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfLogPattern}</pattern>
     </encoder>
   </appender>
-  <appender name="asyncAUTH" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>1000</queueSize>
-    <includeCallerData>true</includeCallerData>
-    <appender-ref ref="auth" />
+  <appender name="dmaapAAIEventConsumerMetric"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>INFO</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
+    <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+      </fileNamePattern>
+    </rollingPolicy>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfMetricLogPattern}</pattern>
+    </encoder>
   </appender>
-
-  <logger name="org.onap.aai" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncDEBUG"/>
-    <appender-ref ref="asyncSANE"/>
-    <appender-ref ref="STDOUT"/>
+  <appender name="external"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>WARN</level>
+    </filter>
+    <file>${logDirectory}/external/external.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
+      </fileNamePattern>
+    </rollingPolicy>
+    <encoder class="org.onap.aai.logging.EcompEncoder">
+      <pattern>${eelfLogPattern}</pattern>
+    </encoder>
+  </appender>
+  <logger name="org.onap.aai.schemaservice" level="DEBUG" additivity="false">
+    <appender-ref ref="asyncDEBUG" />
+    <appender-ref ref="asyncERROR" />
+    <appender-ref ref="asyncMETRIC" />
+    <appender-ref ref="asyncSANE" />
+    <appender-ref ref="STDOUT" />
   </logger>
-
   <!-- Spring related loggers -->
-  <logger name="org.springframework" level="WARN"/>
-  <logger name="org.springframework.beans" level="WARN"/>
-  <logger name="org.springframework.web" level="WARN"/>
-  <logger name="com.blog.spring.jms" level="WARN"/>
-  <logger name="com.jayway.jsonpath" level="WARN"/>
-
-  <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
-    logging) -->
-  <logger name="org.codehaus.groovy" level="WARN"/>
-  <logger name="com.netflix.loadbalancer" level="WARN"/>
-
-  <logger name="org.apache.zookeeper" level="OFF"/>
-
-  <!-- Other Loggers that may help troubleshoot -->
-  <logger name="net.sf" level="WARN"/>
-  <logger name="org.apache.commons.httpclient" level="WARN"/>
-  <logger name="org.apache.commons" level="WARN"/>
-  <logger name="org.apache.coyote" level="WARN"/>
-  <logger name="org.apache.jasper" level="WARN"/>
-
-  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
-    May aid in troubleshooting) -->
-  <logger name="org.apache.camel" level="WARN"/>
-  <logger name="org.apache.cxf" level="WARN"/>
-  <logger name="org.apache.camel.processor.interceptor" level="WARN"/>
-  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN"/>
-  <logger name="org.apache.cxf.service" level="WARN"/>
-  <logger name="org.restlet" level="WARN"/>
-  <logger name="org.apache.camel.component.restlet" level="WARN"/>
-
-  <logger name="org.hibernate.validator" level="WARN"/>
-  <logger name="org.hibernate" level="WARN"/>
-  <logger name="org.hibernate.ejb" level="OFF"/>
-
+  <logger name="org.springframework" level="WARN" />
+  <logger name="org.springframework.beans" level="WARN" />
+  <logger name="org.springframework.web" level="WARN" />
+  <logger name="com.blog.spring.jms" level="WARN" />
   <!-- logback internals logging -->
-  <logger name="ch.qos.logback.classic" level="WARN"/>
-  <logger name="ch.qos.logback.core" level="WARN"/>
-
-  <logger name="org.eclipse.jetty" level="WARN"/>
+  <logger name="ch.qos.logback.classic" level="WARN" />
+  <logger name="ch.qos.logback.core" level="WARN" />
+  <logger name="org.eclipse.jetty" level="WARN" />
 
-  <logger name="org.onap.aai.aaf.auth" level="DEBUG" additivity="false">
-    <appender-ref ref="asyncAUTH" />
+  <logger name="org.onap.aai.schemaservice.interceptors.post" level="DEBUG"
+      additivity="false">
+    <appender-ref ref="asynctranslog" />
   </logger>
-  <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO">
+  <logger name="org.onap.aai.schemaservice.interceptors.pre.SetLoggingContext" level="DEBUG">
     <appender-ref ref="asyncAUDIT"/>
   </logger>
-
-  <logger name="org.onap.logging.filter.base.AbstractAuditLogFilter" level="INFO">
+  <logger name="org.onap.aai.schemaservice.interceptors.post.ResetLoggingContext" level="DEBUG">
     <appender-ref ref="asyncAUDIT"/>
   </logger>
-
-  <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
-    <appender-ref ref="asyncERROR"/>
+  <!-- ============================================================================ -->
+  <!-- General EELF logger -->
+  <!-- ============================================================================ -->
+  <logger name="com.att.eelf" level="WARN" additivity="false">
+    <appender-ref ref="asyncDEBUG" />
+    <appender-ref ref="asyncERROR" />
+    <appender-ref ref="asyncMETRIC" />
   </logger>
-  <logger name="org.onap.aai.schemaservice.interceptors.post" level="DEBUG" additivity="false">
-    <appender-ref ref="asynctranslog" />
-  </logger>
-
-  <logger name="org.apache" level="OFF"/>
-  <logger name="org.zookeeper" level="OFF"/>
-  <logger name="org.janusgraph" level="WARN"/>
-  <logger name="com.att.aft.dme2" level="WARN"/>
-
-
   <root level="DEBUG">
+    <appender-ref ref="external" />
+    {{ if .Values.global.config.logback.console.enabled }}
     <appender-ref ref="STDOUT" />
-    <appender-ref ref="external"/>
+    {{ end }}
   </root>
 </configuration>
diff --git a/components/aai-schema-service/values.yaml b/components/aai-schema-service/values.yaml
index e1abbe8..6842eb3 100644
--- a/components/aai-schema-service/values.yaml
+++ b/components/aai-schema-service/values.yaml
@@ -20,7 +20,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aai-schema-service:1.7.6
+image: onap/aai-schema-service:1.6.9
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
diff --git a/values.yaml b/values.yaml
index 9f4b6b2..58d9512 100644
--- a/values.yaml
+++ b/values.yaml
@@ -249,11 +249,11 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v20
+          default: v19
         # Specifies which version the depth parameter is configurable
         depth: v11
         # List of all the supported versions of the API
-        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
+        list: v11,v12,v13,v14,v15,v16,v17,v18,v19
         # Specifies from which version related link should appear
         related:
           link: v11