summaryrefslogtreecommitdiffstats
path: root/policy-utils/src/test/java/org
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-08-27 14:37:50 -0400
committerJim Hahn <jrh3@att.com>2019-08-29 17:52:03 -0400
commit60449686fb38104c4232650f7e4423d9d348c221 (patch)
tree2725de3c5967ec2c93c43d1a5a95b9d9997a13ca /policy-utils/src/test/java/org
parent8f8a41dc02eb7f2c4c1e607fc3cb97f2c04c42e0 (diff)
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>
Diffstat (limited to 'policy-utils/src/test/java/org')
-rw-r--r--policy-utils/src/test/java/org/onap/policy/drools/utils/logging/MdcTransactionTest.java8
1 files changed, 1 insertions, 7 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")