Remove AlertSeverity from logback in drools-pdp

Merged severity and AlertSeverity in the MDC, and updated the
logback xml files accordingly.
The logback patterns for the metrics log had a place for
both Severity and AlertSeverity; the latter was replaced with an
empty place-holder so-as to maintain the same position for
the other fields.

Change-Id: Ic0977e1133cc4219394f2d71ca8ebae080620e0b
Issue-ID: POLICY-1989
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 6 insertions, 12 deletions

diff --git a/policy-utils/src/test/java/org/onap/policy/drools/utils/logging/MdcTransactionTest.java b/policy-utils/src/test/java/org/onap/policy/drools/utils/logging/MdcTransactionTest.java
index 9c0cf968..76fee77a 100644
--- a/policy-utils/src/test/java/org/onap/policy/drools/utils/logging/MdcTransactionTest.java
+++ b/policy-utils/src/test/java/org/onap/policy/drools/utils/logging/MdcTransactionTest.java
@@ -66,7 +66,6 @@ public class MdcTransactionTest {
         assertNull(MDC.get(MdcTransactionConstants.RESPONSE_CODE));
         assertNull(MDC.get(MdcTransactionConstants.RESPONSE_DESCRIPTION));
         assertNull(MDC.get(MdcTransactionConstants.SEVERITY));
-        assertNull(MDC.get(MdcTransactionConstants.ALERT_SEVERITY));
         assertNull(MDC.get(MdcTransactionConstants.TARGET_ENTITY));
         assertNull(MDC.get(MdcTransactionConstants.TARGET_SERVICE_NAME));
         assertNull(MDC.get(MdcTransactionConstants.TARGET_VIRTUAL_ENTITY));
@@ -100,7 +99,7 @@ public class MdcTransactionTest {
         assertNull(trans.getProcessKey());
         assertNull(trans.getClientIpAddress());
         assertNull(trans.getRemoteHost());
-        assertNull(trans.getAlertSeverity());
+        assertNull(trans.getSeverity());
         assertNull(trans.getTargetVirtualEntity());
     }
 
@@ -136,7 +135,6 @@ public class MdcTransactionTest {
                 .setResponseCode("response-code")
                 .setResponseDescription("response-description")
                 .setSeverity("severity")
-                .setAlertSeverity("alert-severity")
                 .setTargetEntity("target-entity")
                 .setTargetServiceName("target-service-name")
                 .setTargetVirtualEntity("target-virtual-entity")
@@ -157,7 +155,6 @@ public class MdcTransactionTest {
         assertNotNull(MDC.get(MdcTransactionConstants.RESPONSE_CODE));
         assertNotNull(MDC.get(MdcTransactionConstants.RESPONSE_DESCRIPTION));
         assertNotNull(MDC.get(MdcTransactionConstants.SEVERITY));
-        assertNotNull(MDC.get(MdcTransactionConstants.ALERT_SEVERITY));
         assertNotNull(MDC.get(MdcTransactionConstants.TARGET_ENTITY));
         assertNotNull(MDC.get(MdcTransactionConstants.TARGET_SERVICE_NAME));
         assertNotNull(MDC.get(MdcTransactionConstants.TARGET_VIRTUAL_ENTITY));
@@ -177,7 +174,6 @@ public class MdcTransactionTest {
         assertEquals(trans.getResponseCode(), MDC.get(MdcTransactionConstants.RESPONSE_CODE));
         assertEquals(trans.getResponseDescription(), MDC.get(MdcTransactionConstants.RESPONSE_DESCRIPTION));
         assertEquals(trans.getSeverity(), MDC.get(MdcTransactionConstants.SEVERITY));
-        assertEquals(trans.getAlertSeverity(), MDC.get(MdcTransactionConstants.ALERT_SEVERITY));
         assertEquals(trans.getTargetEntity(), MDC.get(MdcTransactionConstants.TARGET_ENTITY));
         assertEquals(trans.getTargetServiceName(), MDC.get(MdcTransactionConstants.TARGET_SERVICE_NAME));
         assertEquals(trans.getTargetVirtualEntity(), MDC.get(MdcTransactionConstants.TARGET_VIRTUAL_ENTITY));
@@ -190,7 +186,6 @@ public class MdcTransactionTest {
         assertEquals("response-code", trans.getResponseCode());
         assertEquals("response-description", trans.getResponseDescription());
         assertEquals("severity", trans.getSeverity());
-        assertEquals("alert-severity", trans.getAlertSeverity());
         assertEquals("target-entity", trans.getTargetEntity());
         assertEquals("target-service-name", trans.getTargetServiceName());
         assertEquals("target-virtual-entity", trans.getTargetVirtualEntity());
@@ -246,7 +241,6 @@ public class MdcTransactionTest {
             .setResponseCode("response-code")
             .setResponseDescription("response-description")
             .setSeverity("severity")
-            .setAlertSeverity("alert-severity")
             .setTargetEntity("target-entity")
             .setTargetServiceName("target-service-name")
             .setTargetVirtualEntity("target-virtual-entity")
diff --git a/policy-utils/src/test/resources/logback-test.xml b/policy-utils/src/test/resources/logback-test.xml
index 366a5f67..1a19758e 100644
--- a/policy-utils/src/test/resources/logback-test.xml
+++ b/policy-utils/src/test/resources/logback-test.xml
@@ -2,14 +2,14 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 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.
@@ -20,7 +20,7 @@
 
 <configuration>
 
-    <property name="pattern" value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}|%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}|%X{TargetVirtualEntity}|%level|%logger{0}|%thread| %msg%n"/>
+    <property name="pattern" value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}|%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}||%X{TargetVirtualEntity}|%level|%logger{0}|%thread| %msg%n"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <filter class="org.onap.policy.drools.utils.logging.LoggerMarkerFilter$MetricLoggerMarkerFilter" />
@@ -28,7 +28,7 @@
             <Pattern>${pattern}</Pattern>
         </encoder>
     </appender>
-    
+
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>