Merge "[COMMON] Add and run pre-commit linters via tox"

7 files changed, 262 insertions, 274 deletions

diff --git a/kubernetes/aai/components/aai-babel/resources/config/logback.xml b/kubernetes/aai/components/aai-babel/resources/config/logback.xml
index 878d8c05d0..c29da77d84 100644
--- a/kubernetes/aai/components/aai-babel/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-babel/resources/config/logback.xml
@@ -28,20 +28,20 @@
   <property name="debugLogName" value="debug" />
 
   <property name="errorLogPattern"
-	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" />
+        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" />
 
   <property name="auditLogPattern"
-	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
+        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
 
   <property name="metricsLogPattern"
-	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
+        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
 
   <!-- ============================================================================ -->
   <!-- EELF Appenders -->
   <!-- ============================================================================ -->
 
   <appender name="EELF"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${generalLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
@@ -66,7 +66,7 @@
        from other components, or it can be eliminated to record these events as part of the application root log. -->
 
   <appender name="EELFAudit"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${auditLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
@@ -83,7 +83,7 @@
   </appender>
 
   <appender name="EELFMetrics"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${metricsLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
@@ -101,7 +101,7 @@
   </appender>
 
   <appender name="EELFDebug"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>
       ${logDirectory}/${debugLogName}.log
     </file>
@@ -119,9 +119,9 @@
     <!-- allow only events with a level below INFO, that is TRACE and DEBUG -->
     <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-	<expression>
-	  e.level.toInt() &lt; INFO.toInt()
-	</expression>
+        <expression>
+          e.level.toInt() &lt; INFO.toInt()
+        </expression>
       </evaluator>
       <OnMismatch>DENY</OnMismatch>
       <OnMatch>NEUTRAL</OnMatch>
diff --git a/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json b/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json
index fa3a9c9952..65798e1972 100644
--- a/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json
+++ b/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json
@@ -1,193 +1,193 @@
 {
-	"instanceGroupTypes": [
-		"org.openecomp.groups.NetworkCollection",
-		"org.openecomp.groups.VfcInstanceGroup",
-		"org.openecomp.groups.ResourceInstanceGroup"
-	],
-	"widgetTypes": [
-		{
-			"type": "SERVICE",
-			"name": "service-instance",
-			"deleteFlag": true,
-			"modelVersionId": "46b92144-923a-4d20-b85a-3cbd847668a9",
-			"modelInvariantId": "82194af1-3c2c-485a-8f44-420e22a9eaa4"
-		},
-		{
-			"type": "VF",
-			"name": "generic-vnf",
-			"deleteFlag": true,
-			"modelVersionId": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9",
-			"modelInvariantId": "acc6edd8-a8d4-4b93-afaa-0994068be14c"
-		},
-		{
-			"type": "VFC",
-			"name": "vnfc",
-			"deleteFlag": true,
-			"modelVersionId": "5761e0a7-c6df-4d8a-9ebd-b8f445054dec",
-			"modelInvariantId": "96129eb9-f0de-4e05-8af2-73146473f766"
-		},
-		{
-			"type": "VSERVER",
-			"name": "vserver",
-			"deleteFlag": true,
-			"modelVersionId": "8ecb2c5d-7176-4317-a255-26274edfdd53",
-			"modelInvariantId": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
-		},
-		{
-			"type": "VOLUME",
-			"name": "volume",
-			"deleteFlag": true,
-			"modelVersionId": "0fbe2e8f-4d91-4415-a772-88387049b38d",
-			"modelInvariantId": "ddd739b4-2b25-46c4-affc-41a32af5cc42"
-		},
-		{
-			"type": "FLAVOR",
-			"name": "flavor",
-			"deleteFlag": false,
-			"modelVersionId": "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b",
-			"modelInvariantId": "bace8d1c-a261-4041-9e37-823117415d0f"
-		},
-		{
-			"type": "TENANT",
-			"name": "tenant",
-			"deleteFlag": false,
-			"modelVersionId": "abcc54bc-bb74-49dc-9043-7f7171707545",
-			"modelInvariantId": "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
-		},
-		{
-			"type": "VOLUME_GROUP",
-			"name": "volume-group",
-			"deleteFlag": true,
-			"modelVersionId": "99d44c90-1f61-4418-b9a6-56586bf38c79",
-			"modelInvariantId": "fcec1b02-b2d0-4834-aef8-d71be04717dd"
-		},
-		{
-			"type": "LINT",
-			"name": "l-interface",
-			"deleteFlag": true,
-			"modelVersionId": "a32613fd-18b9-459e-aab8-fffb3912966a",
-			"modelInvariantId": "cea0a982-8d55-4093-921e-418fbccf7060"
-		},
-		{
-			"type": "L3_NET",
-			"name": "l3-network",
-			"deleteFlag": true,
-			"modelVersionId": "9111f20f-e680-4001-b83f-19a2fc23bfc1",
-			"modelInvariantId": "3d560d81-57d0-438b-a2a1-5334dba0651a"
-		},
-		{
-			"type": "VFMODULE",
-			"name": "vf-module",
-			"deleteFlag": true,
-			"modelVersionId": "c00563ae-812b-4e62-8330-7c4d0f47088a",
-			"modelInvariantId": "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
-		},
-		{
-			"type": "IMAGE",
-			"name": "image",
-			"deleteFlag": false,
-			"modelVersionId": "f6a038c2-820c-42ba-8c2b-375e24e8f932",
-			"modelInvariantId": "3f4c7204-739b-4bbb-87a7-8a6856439c90"
-		},
-		{
-			"type": "OAM_NETWORK",
-			"name": "oam-network",
-			"deleteFlag": true,
-			"modelVersionId": "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79",
-			"modelInvariantId": "2851cf01-9c40-4064-87d4-6184a6fcff35"
-		},
-		{
-			"type": "ALLOTTED_RESOURCE",
-			"name": "allotted-resource",
-			"deleteFlag": true,
-			"modelVersionId": "7ad0915f-25c0-4a70-b9bc-185a75f87564",
-			"modelInvariantId": "f6d6a23d-a1a9-48ff-8419-b6530da2d381"
-		},
-		{
-			"type": "TUNNEL_XCONNECT",
-			"name": "tunnel-xconnect",
-			"deleteFlag": true,
-			"modelVersionId": "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5",
-			"modelInvariantId": "50b9e2fa-005c-4bbe-b651-3251dece4cd8"
-		},
-		{
-			"type": "CONFIGURATION",
-			"name": "configuration",
-			"deleteFlag": true,
-			"modelVersionId": "5a175add-57e4-4a5d-8b02-c36f1d69c52b",
-			"modelInvariantId": "166c050d-f69d-4305-943e-0bc58c3a26cf"
-		},
-		{
-			"type": "CR",
-			"name": "cr",
-			"deleteFlag": true,
-			"modelVersionId": "3f908abc-3a15-40d0-b674-2a639e52884d",
-			"modelInvariantId": "8bac3599-9a1c-4b7f-80e5-c1838f744c23"
-		},
-		{
-			"type": "INSTANCE_GROUP",
-			"name": "instance-group",
-			"deleteFlag": true,
-			"modelVersionId": "8e6ee9dc-9017-444a-83b3-219edb018128",
-			"modelInvariantId": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd"
-		},
-		{
-			"type": "PNF",
-			"name": "pnf",
-			"deleteFlag": true,
-			"modelVersionId": "e9f1fa7d-c839-418a-9601-03dc0d2ad687",
-			"modelInvariantId": "862b25a1-262a-4961-bdaa-cdc55d69785a"
-		}
-	],
-	"widgetMappings": [
-		{
-			"prefix": "org.openecomp.resource.vfc",
-			"type": "widget",
-			"widget": "VSERVER",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.resource.cp",
-			"type": "widget",
-			"widget": "LINT",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.cp",
-			"type": "widget",
-			"widget": "LINT",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.resource.vl",
-			"widget": "L3_NET",
-			"deleteFlag": false
-		},
-		{
-			"prefix": "org.openecomp.resource.vf",
-			"widget": "VF",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.groups.vfmodule",
-			"widget": "VFMODULE",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.groups.VfModule",
-			"widget": "VFMODULE",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.resource.vfc.nodes.heat.cinder",
-			"type": "widget",
-			"widget": "VOLUME",
-			"deleteFlag": true
-		},
-		{
-			"prefix": "org.openecomp.resource.pnf",
-			"widget": "PNF",
-			"deleteFlag": true
-		}
-	]
+    "instanceGroupTypes": [
+        "org.openecomp.groups.NetworkCollection",
+        "org.openecomp.groups.VfcInstanceGroup",
+        "org.openecomp.groups.ResourceInstanceGroup"
+    ],
+    "widgetTypes": [
+        {
+            "type": "SERVICE",
+            "name": "service-instance",
+            "deleteFlag": true,
+            "modelVersionId": "46b92144-923a-4d20-b85a-3cbd847668a9",
+            "modelInvariantId": "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+        },
+        {
+            "type": "VF",
+            "name": "generic-vnf",
+            "deleteFlag": true,
+            "modelVersionId": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9",
+            "modelInvariantId": "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+        },
+        {
+            "type": "VFC",
+            "name": "vnfc",
+            "deleteFlag": true,
+            "modelVersionId": "5761e0a7-c6df-4d8a-9ebd-b8f445054dec",
+            "modelInvariantId": "96129eb9-f0de-4e05-8af2-73146473f766"
+        },
+        {
+            "type": "VSERVER",
+            "name": "vserver",
+            "deleteFlag": true,
+            "modelVersionId": "8ecb2c5d-7176-4317-a255-26274edfdd53",
+            "modelInvariantId": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+        },
+        {
+            "type": "VOLUME",
+            "name": "volume",
+            "deleteFlag": true,
+            "modelVersionId": "0fbe2e8f-4d91-4415-a772-88387049b38d",
+            "modelInvariantId": "ddd739b4-2b25-46c4-affc-41a32af5cc42"
+        },
+        {
+            "type": "FLAVOR",
+            "name": "flavor",
+            "deleteFlag": false,
+            "modelVersionId": "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b",
+            "modelInvariantId": "bace8d1c-a261-4041-9e37-823117415d0f"
+        },
+        {
+            "type": "TENANT",
+            "name": "tenant",
+            "deleteFlag": false,
+            "modelVersionId": "abcc54bc-bb74-49dc-9043-7f7171707545",
+            "modelInvariantId": "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+        },
+        {
+            "type": "VOLUME_GROUP",
+            "name": "volume-group",
+            "deleteFlag": true,
+            "modelVersionId": "99d44c90-1f61-4418-b9a6-56586bf38c79",
+            "modelInvariantId": "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+        },
+        {
+            "type": "LINT",
+            "name": "l-interface",
+            "deleteFlag": true,
+            "modelVersionId": "a32613fd-18b9-459e-aab8-fffb3912966a",
+            "modelInvariantId": "cea0a982-8d55-4093-921e-418fbccf7060"
+        },
+        {
+            "type": "L3_NET",
+            "name": "l3-network",
+            "deleteFlag": true,
+            "modelVersionId": "9111f20f-e680-4001-b83f-19a2fc23bfc1",
+            "modelInvariantId": "3d560d81-57d0-438b-a2a1-5334dba0651a"
+        },
+        {
+            "type": "VFMODULE",
+            "name": "vf-module",
+            "deleteFlag": true,
+            "modelVersionId": "c00563ae-812b-4e62-8330-7c4d0f47088a",
+            "modelInvariantId": "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+        },
+        {
+            "type": "IMAGE",
+            "name": "image",
+            "deleteFlag": false,
+            "modelVersionId": "f6a038c2-820c-42ba-8c2b-375e24e8f932",
+            "modelInvariantId": "3f4c7204-739b-4bbb-87a7-8a6856439c90"
+        },
+        {
+            "type": "OAM_NETWORK",
+            "name": "oam-network",
+            "deleteFlag": true,
+            "modelVersionId": "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79",
+            "modelInvariantId": "2851cf01-9c40-4064-87d4-6184a6fcff35"
+        },
+        {
+            "type": "ALLOTTED_RESOURCE",
+            "name": "allotted-resource",
+            "deleteFlag": true,
+            "modelVersionId": "7ad0915f-25c0-4a70-b9bc-185a75f87564",
+            "modelInvariantId": "f6d6a23d-a1a9-48ff-8419-b6530da2d381"
+        },
+        {
+            "type": "TUNNEL_XCONNECT",
+            "name": "tunnel-xconnect",
+            "deleteFlag": true,
+            "modelVersionId": "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5",
+            "modelInvariantId": "50b9e2fa-005c-4bbe-b651-3251dece4cd8"
+        },
+        {
+            "type": "CONFIGURATION",
+            "name": "configuration",
+            "deleteFlag": true,
+            "modelVersionId": "5a175add-57e4-4a5d-8b02-c36f1d69c52b",
+            "modelInvariantId": "166c050d-f69d-4305-943e-0bc58c3a26cf"
+        },
+        {
+            "type": "CR",
+            "name": "cr",
+            "deleteFlag": true,
+            "modelVersionId": "3f908abc-3a15-40d0-b674-2a639e52884d",
+            "modelInvariantId": "8bac3599-9a1c-4b7f-80e5-c1838f744c23"
+        },
+        {
+            "type": "INSTANCE_GROUP",
+            "name": "instance-group",
+            "deleteFlag": true,
+            "modelVersionId": "8e6ee9dc-9017-444a-83b3-219edb018128",
+            "modelInvariantId": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd"
+        },
+        {
+            "type": "PNF",
+            "name": "pnf",
+            "deleteFlag": true,
+            "modelVersionId": "e9f1fa7d-c839-418a-9601-03dc0d2ad687",
+            "modelInvariantId": "862b25a1-262a-4961-bdaa-cdc55d69785a"
+        }
+    ],
+    "widgetMappings": [
+        {
+            "prefix": "org.openecomp.resource.vfc",
+            "type": "widget",
+            "widget": "VSERVER",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.resource.cp",
+            "type": "widget",
+            "widget": "LINT",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.cp",
+            "type": "widget",
+            "widget": "LINT",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.resource.vl",
+            "widget": "L3_NET",
+            "deleteFlag": false
+        },
+        {
+            "prefix": "org.openecomp.resource.vf",
+            "widget": "VF",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.groups.vfmodule",
+            "widget": "VFMODULE",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.groups.VfModule",
+            "widget": "VFMODULE",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.resource.vfc.nodes.heat.cinder",
+            "type": "widget",
+            "widget": "VOLUME",
+            "deleteFlag": true
+        },
+        {
+            "prefix": "org.openecomp.resource.pnf",
+            "widget": "PNF",
+            "deleteFlag": true
+        }
+    ]
 }
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
index c84cb5a62f..449ea3032c 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
@@ -20,22 +20,22 @@
 */}}
 -->
 <configuration>
-	<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
-	<appender name="ACCESS"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
-			<Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
-		</encoder>
-	</appender>
-	<appender-ref ref="ACCESS" />
+    <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
+    <appender name="ACCESS"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+        </rollingPolicy>
+        <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
+        </encoder>
+    </appender>
+    <appender-ref ref="ACCESS" />
 </configuration>
 
-<!-- 
+<!--
 %a - Remote IP address
 %A - Local IP address
 %b - Bytes sent, excluding HTTP headers, or '-' if no bytes were sent
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
index 7f055cf51f..95b8140e0b 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
@@ -27,13 +27,13 @@
   <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}|%X{serviceName}|%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}|%X{serviceName}|%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}|%X{serviceName}|%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|%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="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%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}|%X{serviceName}|%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}|%X{serviceName}|%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|%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}|%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"/>
@@ -55,8 +55,8 @@
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>
-				%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
-			</pattern>
+                %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
+      </pattern>
     </encoder>
   </appender>
   <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -65,8 +65,7 @@
       <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-			</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
     </encoder>
   </appender>
   <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
@@ -77,8 +76,7 @@
   <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <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>
@@ -128,7 +126,7 @@
     <file>${logDirectory}/rest/audit.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+            </fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${auditPattern}</pattern>
@@ -147,8 +145,7 @@
     </filter>
     <file>${logDirectory}/rest/translog.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${transLogPattern}</pattern>
@@ -165,8 +162,7 @@
     </filter>
     <File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${"errorPattern"}</pattern>
@@ -195,8 +191,7 @@
     </filter>
     <File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${debugPattern}</pattern>
@@ -211,7 +206,7 @@
     <File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+            </fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${metricPattern}</pattern>
@@ -224,7 +219,7 @@
     <file>${logDirectory}/external/external.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+            </fileNamePattern>
     </rollingPolicy>
     <encoder>
       <pattern>${debugPattern}</pattern>
@@ -749,8 +744,7 @@
   <logger name="ajsc.UserDefinedJarService" level="WARN"/>
   <logger name="ajsc.UserDefinedBeansDefService" level="WARN"/>
   <logger name="ajsc.LoggingConfigurationService" level="WARN"/>
-  <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet 
-		logging) -->
+  <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet logging) -->
   <logger name="org.codehaus.groovy" level="WARN"/>
   <logger name="com.att.scamper" level="WARN"/>
   <logger name="ajsc.utils" level="WARN"/>
@@ -770,8 +764,7 @@
   <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) -->
+  <!-- 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"/>
@@ -789,11 +782,9 @@
   <!-- logback jms appenders & loggers definition starts here -->
   <appender name="auditLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-    <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log
-		</file>
+    <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>9</maxIndex>
     </rollingPolicy>
@@ -806,11 +797,9 @@
   </appender>
   <appender name="perfLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-    <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log
-		</file>
+    <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>9</maxIndex>
     </rollingPolicy>
@@ -827,8 +816,7 @@
     </filter>
     <file>${logDirectory}/auth/auth.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/auth/auth.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
+      <fileNamePattern>${logDirectory}/auth/auth.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>
diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
index 3c12026407..cd36e799d6 100644
--- a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
@@ -27,7 +27,7 @@
   <property name="debugLogName" value="debug" />
 
   <property name="errorLogPattern"
-	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|ModelLoader|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
+        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|ModelLoader|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
   <property name="auditMetricPattern" value="%m%n" />
 
   <property name="logDirectory" value="${logDir}/${componentName}" />
@@ -47,7 +47,7 @@
        log -->
 
   <appender name="EELF"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${generalLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
@@ -67,7 +67,7 @@
   </appender>
 
   <appender name="EELFAudit"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${auditLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
@@ -83,7 +83,7 @@
   </appender>
 
   <appender name="EELFMetrics"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${metricsLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
@@ -99,7 +99,7 @@
   </appender>
 
   <appender name="EELFDebug"
-	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${logDirectory}/${debugLogName}.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
diff --git a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
index c2099d6b77..d062835849 100644
--- a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
@@ -20,22 +20,22 @@
 -->
 */}}
 <configuration>
-	<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
-	<appender name="ACCESS"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
-			<Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
-		</encoder>
-	</appender>
-	<appender-ref ref="ACCESS" />
+    <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
+    <appender name="ACCESS"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+        </rollingPolicy>
+        <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
+        </encoder>
+    </appender>
+    <appender-ref ref="ACCESS" />
 </configuration>
 {{/*
-<!-- 
+<!--
 %a - Remote IP address
 %A - Local IP address
 %b - Bytes sent, excluding HTTP headers, or '-' if no bytes were sent
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
index 96bb197519..ca9d35bb10 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
@@ -30,10 +30,10 @@
   <jmxConfigurator />
   <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|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
+    <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|%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}" />
@@ -57,7 +57,7 @@
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>
-				%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
+                %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
 </pattern>
     </encoder>
   </appender>