Align logging to Onap-ELS 2019.11

Change-Id: I1750493d5c9f2eab8c1395f0fbc9ae66cf74b0a6
Issue-ID: SDC-2639
Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>

29 files changed, 152 insertions, 255 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml
index b14ece7012..bd680aff7f 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml
@@ -44,6 +44,11 @@
             <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/AuditData.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/AuditData.java
index b7c4e0d78f..090f680aa7 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/AuditData.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/AuditData.java
@@ -16,6 +16,9 @@
 
 package org.openecomp.sdc.logging.api;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
+import lombok.Getter;
+
 /**
  * Builder to populate <i>audit</i> data. This includes only data known to an application, and not otherwise available
  * to the logging framework. As opposed, for example, to local runtime, host address, etc.
@@ -23,13 +26,14 @@ package org.openecomp.sdc.logging.api;
  * @author KATYR, evitaliy
  * @since February 15, 2018
  */
+@Getter
 public class AuditData {
 
     // don't inherit from MetricsData because it has a very different meaning
 
     private final long startTime;
     private final long endTime;
-    private final StatusCode statusCode;
+    private final ResponseStatus statusCode;
     private final String responseCode;
     private final String responseDescription;
     private final String clientIpAddress;
@@ -43,60 +47,6 @@ public class AuditData {
         this.clientIpAddress = builder.clientIpAddress;
     }
 
-    /**
-     * Begin timestamp of an API invocation.
-     *
-     * @return timestamp
-     */
-    public long getStartTime() {
-        return startTime;
-    }
-
-    /**
-     * End timestamp of an API invocation.
-     *
-     * @return timestamp
-     */
-    public long getEndTime() {
-        return endTime;
-    }
-
-    /**
-     * Result status of an API invocation.
-     *
-     * @return protocol and application agnostic status code
-     */
-    public StatusCode getStatusCode() {
-        return statusCode;
-    }
-
-    /**
-     * Application/protocol specific response status of an API invocation.
-     *
-     * @return response code
-     */
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    /**
-     * Application/protocol specific response in a human-friendly way.
-     *
-     * @return human-friendly response description
-     */
-    public String getResponseDescription() {
-        return responseDescription;
-    }
-
-    /**
-     * IP address of the invoking client when available.
-     *
-     * @return IP address
-     */
-    public String getClientIpAddress() {
-        return clientIpAddress;
-    }
-
     @Override
     public String toString() {
         return "AuditData{startTime=" + startTime + ", endTime=" + endTime + ", statusCode=" + statusCode
@@ -115,7 +65,7 @@ public class AuditData {
 
         private long startTime;
         private long endTime;
-        private StatusCode statusCode;
+        private ResponseStatus statusCode;
         private String responseCode;
         private String responseDescription;
         private String clientIpAddress;
@@ -151,7 +101,7 @@ public class AuditData {
          * @param statusCode invocation status success/failure
          * @return this builder for fluent API
          */
-        public AuditDataBuilder statusCode(final StatusCode statusCode) {
+        public AuditDataBuilder statusCode(final ResponseStatus statusCode) {
             this.statusCode = statusCode;
             return this;
         }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
index ed028e34d5..6fbd25a134 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
@@ -43,7 +43,9 @@ public interface Logger {
 
     boolean isAuditEnabled();
 
-    void audit(AuditData data);
+    void auditEntry(AuditData data);
+
+    void auditExit(AuditData data);
 
     boolean isDebugEnabled();
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/LoggerFactory.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/LoggerFactory.java
index 96debb56b0..6ef57761d8 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/LoggerFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/LoggerFactory.java
@@ -83,7 +83,12 @@ public class LoggerFactory {
             }
 
             @Override
-            public void audit(AuditData data) {
+            public void auditEntry(AuditData data) {
+                // no-op
+            }
+
+            @Override
+            public void auditExit(AuditData data) {
                 // no-op
             }
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/MetricsData.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/MetricsData.java
index c44ab42efa..2fef96d2bb 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/MetricsData.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/MetricsData.java
@@ -16,6 +16,9 @@
 
 package org.openecomp.sdc.logging.api;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
+import lombok.Getter;
+
 /**
  * Builder to populate <i>metrics</i> data. This includes only data known to an application, and not otherwise available
  * to the logging framework.
@@ -23,13 +26,14 @@ package org.openecomp.sdc.logging.api;
  * @author evitaliy
  * @since 26 Mar 2018
  */
+@Getter
 public class MetricsData {
 
     // don't inherit from AuditData because it has a very different meaning
 
     private final long startTime;
     private final long endTime;
-    private final StatusCode statusCode;
+    private final ResponseStatus statusCode;
     private final String responseCode;
     private final String responseDescription;
     private final String clientIpAddress;
@@ -47,78 +51,6 @@ public class MetricsData {
         this.targetVirtualEntity = builder.targetVirtualEntity;
     }
 
-    /**
-     * Begin timestamp of an API invocation.
-     *
-     * @return timestamp
-     */
-    public long getStartTime() {
-        return startTime;
-    }
-
-    /**
-     * End timestamp of an API invocation.
-     *
-     * @return timestamp
-     */
-    public long getEndTime() {
-        return endTime;
-    }
-
-    /**
-     * Result status of an API invocation.
-     *
-     * @return protocol and application agnostic status code
-     */
-    public StatusCode getStatusCode() {
-        return statusCode;
-    }
-
-    /**
-     * Application/protocol specific response status of an API invocation.
-     *
-     * @return response code
-     */
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    /**
-     * Application/protocol specific response in a human-friendly way.
-     *
-     * @return human-friendly response description
-     */
-    public String getResponseDescription() {
-        return responseDescription;
-    }
-
-    /**
-     * IP address of the invoking client when available.
-     *
-     * @return IP address
-     */
-    public String getClientIpAddress() {
-        return clientIpAddress;
-    }
-
-    /**
-     * External entity invoked by the local system.
-     *
-     * @return identifier of an external entity (system, component, sub-component)
-     */
-    public String getTargetEntity() {
-        return targetEntity;
-    }
-
-    /**
-     * External API invoked by the local system.
-     *
-     * @return name of an external API
-     */
-    public String getTargetVirtualEntity() {
-        return targetVirtualEntity;
-    }
-
     @Override
     public String toString() {
         return "AuditData{startTime=" + startTime + ", endTime=" + endTime + ", statusCode=" + statusCode
@@ -137,7 +69,7 @@ public class MetricsData {
 
         private long startTime;
         private long endTime;
-        private StatusCode statusCode;
+        private ResponseStatus statusCode;
         private String responseCode;
         private String responseDescription;
         private String clientIpAddress;
@@ -175,7 +107,7 @@ public class MetricsData {
          * @param statusCode invocation status success/failure
          * @return this builder for fluent API
          */
-        public MetricsDataBuilder statusCode(final StatusCode statusCode) {
+        public MetricsDataBuilder statusCode(final ResponseStatus statusCode) {
             this.statusCode = statusCode;
             return this;
         }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/StatusCode.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/StatusCode.java
deleted file mode 100644
index dd8bd57dcc..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/StatusCode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright © 2016-2018 European Support Limited
- *
- * 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.
- */
-
-package org.openecomp.sdc.logging.api;
-
-/**
- * Protocol-agnostic status codes to indicate the result status (success, failure) of an API invocation.
- *
- * @author EVITALIY
- * @since 04 Mar 18
- */
-public enum StatusCode {
-    COMPLETE, ERROR
-}
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/AuditTracker.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/AuditTracker.java
index af9b5061fd..2aeacf1ad5 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/AuditTracker.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/AuditTracker.java
@@ -22,6 +22,8 @@ import org.openecomp.sdc.logging.api.AuditData;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.COMPLETE;
+
 /**
  * Tracks and logs audit information when a request is being processed. An instance of this class cannot be reused, and
  * the pre- and post-request methods must be called only once.
@@ -62,6 +64,10 @@ public class AuditTracker implements Tracker {
 
         this.started = System.currentTimeMillis();
         this.clientIpAddress = request.getRemoteAddr();
+        AuditData auditData = AuditData.builder().startTime(started).endTime(started).statusCode(COMPLETE)
+                .clientIpAddress(clientIpAddress)
+                .build();
+        logger.auditEntry(auditData);
     }
 
     @Override
@@ -80,6 +86,6 @@ public class AuditTracker implements Tracker {
                                       .responseCode(Integer.toString(result.getStatus()))
                                       .responseDescription(result.getStatusPhrase()).clientIpAddress(clientIpAddress)
                                       .build();
-        logger.audit(auditData);
+        logger.auditExit(auditData);
     }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/ContextTracker.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/ContextTracker.java
index 2334f373bc..2aa5a83818 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/ContextTracker.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/ContextTracker.java
@@ -54,8 +54,9 @@ public class ContextTracker implements Tracker {
         String requestId = requestIdHeaders.getAny(request::getHeader).orElse(UUID.randomUUID().toString());
         ContextData.ContextDataBuilder contextBuilder =
                 ContextData.builder().serviceName(serviceName).requestId(requestId);
+        String partnerName = partnerNameHeaders.getAny(request::getHeader).orElse("UNKNOWN");
+        contextBuilder.partnerName(partnerName);
 
-        partnerNameHeaders.getAny(request::getHeader).ifPresent(contextBuilder::partnerName);
         LoggingContext.put(contextBuilder.build());
     }
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/RequestProcessingResult.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/RequestProcessingResult.java
index d3625ed303..ff77ef8a93 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/RequestProcessingResult.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/RequestProcessingResult.java
@@ -16,7 +16,7 @@
 
 package org.openecomp.sdc.logging.servlet;
 
-import org.openecomp.sdc.logging.api.StatusCode;
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
 
 /**
  * Interpretation of request processing results.
@@ -38,7 +38,7 @@ public interface RequestProcessingResult {
      *
      * @return on of pre-defined status codes
      */
-    StatusCode getStatusCode();
+    ResponseStatus getStatusCode();
 
     /**
      * Human-friendly description of the numeric status.
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingResponseFilter.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingResponseFilter.java
index fa9e815db8..b0ae88ccaa 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingResponseFilter.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/servlet/jaxrs/LoggingResponseFilter.java
@@ -18,8 +18,7 @@ package org.openecomp.sdc.logging.servlet.jaxrs;
 
 import static javax.ws.rs.core.Response.Status.Family.REDIRECTION;
 import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-import static org.openecomp.sdc.logging.api.StatusCode.COMPLETE;
-import static org.openecomp.sdc.logging.api.StatusCode.ERROR;
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.*;
 import static org.openecomp.sdc.logging.servlet.jaxrs.LoggingRequestFilter.LOGGING_TRACKER_KEY;
 
 import javax.ws.rs.container.ContainerRequestContext;
@@ -27,9 +26,10 @@ import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.Provider;
+
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.api.StatusCode;
 import org.openecomp.sdc.logging.servlet.RequestProcessingResult;
 import org.openecomp.sdc.logging.servlet.Tracker;
 
@@ -82,7 +82,7 @@ public class LoggingResponseFilter implements ContainerResponseFilter {
         }
 
         @Override
-        public StatusCode getStatusCode() {
+        public ResponseStatus getStatusCode() {
             Response.Status.Family family = statusInfo.getFamily();
             return family.equals(SUCCESSFUL) || family.equals(REDIRECTION) ? COMPLETE : ERROR;
         }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/AuditDataTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/AuditDataTest.java
index 98da27dcc5..b4e2d96348 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/AuditDataTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/AuditDataTest.java
@@ -18,6 +18,7 @@ package org.openecomp.sdc.logging.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.COMPLETE;
 
 import org.junit.Test;
 
@@ -38,7 +39,7 @@ public class AuditDataTest {
         final String responseDescription = "Response-Description";
         final String ipAddress = "DUMMY.IP.ADDRESS";
 
-        AuditData data = AuditData.builder().startTime(start).endTime(end).statusCode(StatusCode.COMPLETE)
+        AuditData data = AuditData.builder().startTime(start).endTime(end).statusCode(COMPLETE)
                                   .responseCode(responseCode).responseDescription(responseDescription)
                                   .clientIpAddress(ipAddress).build();
 
@@ -47,7 +48,7 @@ public class AuditDataTest {
         assertEquals(start, data.getStartTime());
         assertEquals(responseCode, data.getResponseCode());
         assertEquals(responseDescription, data.getResponseDescription());
-        assertEquals(StatusCode.COMPLETE, data.getStatusCode());
+        assertEquals(COMPLETE, data.getStatusCode());
     }
 
     @Test
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
index 6f860af60a..e6998f35e8 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/LoggerFactoryTest.java
@@ -71,7 +71,7 @@ public class LoggerFactoryTest {
         logger.warn("");
         logger.info("");
         logger.debug("");
-        logger.audit(null);
+        logger.auditExit(null);
         logger.metrics(MetricsData.builder().build());
     }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java
index 43f913ecab..9c9aa81bc7 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/api/MetricsDataTest.java
@@ -18,6 +18,7 @@ package org.openecomp.sdc.logging.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.COMPLETE;
 
 import org.junit.Test;
 
@@ -40,7 +41,7 @@ public class MetricsDataTest {
         final String targetEntity = "Metrics-Target-Entity";
         final String targetVirtualEntity = "Metrics-Target-Virtual-Entity";
 
-        MetricsData data = MetricsData.builder().startTime(start).endTime(end).statusCode(StatusCode.COMPLETE)
+        MetricsData data = MetricsData.builder().startTime(start).endTime(end).statusCode(COMPLETE)
                                       .responseCode(responseCode).responseDescription(responseDescription)
                                       .clientIpAddress(ipAddress).targetEntity(targetEntity)
                                       .targetVirtualEntity(targetVirtualEntity).build();
@@ -50,7 +51,7 @@ public class MetricsDataTest {
         assertEquals(start, data.getStartTime());
         assertEquals(responseCode, data.getResponseCode());
         assertEquals(responseDescription, data.getResponseDescription());
-        assertEquals(StatusCode.COMPLETE, data.getStatusCode());
+        assertEquals(COMPLETE, data.getStatusCode());
         assertEquals(targetEntity, data.getTargetEntity());
         assertEquals(targetVirtualEntity, data.getTargetVirtualEntity());
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/AuditTrackerTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/AuditTrackerTest.java
index 1bd13a9dfd..36c0957069 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/AuditTrackerTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/AuditTrackerTest.java
@@ -27,9 +27,9 @@ import static org.mockito.Mockito.when;
 import javax.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
 import org.openecomp.sdc.logging.api.AuditData;
 import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.StatusCode;
 
 /**
  * Test initialization and of audit tracker and log invocation.
@@ -73,7 +73,7 @@ public class AuditTrackerTest {
         tracker.preRequest(mock(HttpServletRequest.class));
         tracker.postRequest(mock(RequestProcessingResult.class));
 
-        verify(logger, never()).audit(any(AuditData.class));
+        verify(logger, never()).auditExit(any(AuditData.class));
     }
 
     @Test
@@ -87,7 +87,7 @@ public class AuditTrackerTest {
         tracker.postRequest(mock(RequestProcessingResult.class));
 
         ArgumentCaptor<AuditData> auditDataCaptor = ArgumentCaptor.forClass(AuditData.class);
-        verify(logger).audit(auditDataCaptor.capture());
+        verify(logger).auditExit(auditDataCaptor.capture());
         assertTrue(auditDataCaptor.getValue().getEndTime() > 0);
     }
 
@@ -104,7 +104,7 @@ public class AuditTrackerTest {
         tracker.postRequest(result);
 
         ArgumentCaptor<AuditData> auditDataCaptor = ArgumentCaptor.forClass(AuditData.class);
-        verify(logger).audit(auditDataCaptor.capture());
+        verify(logger).auditExit(auditDataCaptor.capture());
 
         AuditData capturedAuditData = auditDataCaptor.getValue();
         assertEquals(Integer.toString(result.getStatus()), capturedAuditData.getResponseCode());
@@ -127,7 +127,7 @@ public class AuditTrackerTest {
         tracker.postRequest(mock(RequestProcessingResult.class));
 
         ArgumentCaptor<AuditData> auditDataCaptor = ArgumentCaptor.forClass(AuditData.class);
-        verify(logger).audit(auditDataCaptor.capture());
+        verify(logger).auditExit(auditDataCaptor.capture());
 
         AuditData capturedAuditData = auditDataCaptor.getValue();
         assertEquals(address, capturedAuditData.getClientIpAddress());
@@ -141,8 +141,8 @@ public class AuditTrackerTest {
         }
 
         @Override
-        public StatusCode getStatusCode() {
-            return StatusCode.ERROR;
+        public ResponseStatus getStatusCode() {
+            return ResponseStatus.ERROR;
         }
 
         @Override
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/ContextTrackerTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/ContextTrackerTest.java
index 59c690d763..f1066c447b 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/ContextTrackerTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/test/java/org/openecomp/sdc/logging/servlet/ContextTrackerTest.java
@@ -119,7 +119,7 @@ public class ContextTrackerTest {
     }
 
     @Test
-    public void partnerNameAbsentWhenNotGiven() {
+    public void partnerNameIsUnknownWhenNotGiven() {
 
         mockStatic(LoggingContext.class);
 
@@ -131,7 +131,7 @@ public class ContextTrackerTest {
 
         LoggingContext.put(contextDataCaptor.capture());
 
-        assertNull(contextDataCaptor.getValue().getPartnerName());
+        assertEquals(contextDataCaptor.getValue().getPartnerName(), "UNKNOWN");
     }
 
     @Test
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminator.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminator.java
index b6f8cfa8ff..aa4657f83e 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminator.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminator.java
@@ -95,7 +95,7 @@ public class EventTypeDiscriminator extends AbstractDiscriminator<ILoggingEvent>
             final Marker marker = event.getMarker();
             if (marker != null) {
 
-                if (marker.contains(Markers.AUDIT)) {
+                if (marker.contains(Markers.ENTRY) ||  marker.contains(Markers.EXIT)){
                     return AUDIT;
                 }
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/AuditField.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/AuditField.java
index 3e44a34722..c4e780fa8f 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/AuditField.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/AuditField.java
@@ -16,6 +16,8 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+
 /**
  * MDC fields that represent audit data.
  *
@@ -24,13 +26,13 @@ package org.openecomp.sdc.logging.slf4j;
  */
 enum AuditField implements MDCField {
 
-    BEGIN_TIMESTAMP("BeginTimestamp"),
+    BEGIN_TIMESTAMP(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP),
     END_TIMESTAMP("EndTimestamp"),
     ELAPSED_TIME("ElapsedTime"),
-    STATUS_CODE("StatusCode"),
-    RESPONSE_CODE("ResponseCode"),
-    RESPONSE_DESCRIPTION("ResponseDescription"),
-    CLIENT_IP_ADDRESS("ClientIpAddress");
+    STATUS_CODE(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE),
+    RESPONSE_CODE(ONAPLogConstants.MDCs.RESPONSE_CODE),
+    RESPONSE_DESCRIPTION(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION),
+    CLIENT_IP_ADDRESS(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS);
 
     private final String key;
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/ContextField.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/ContextField.java
index cce5f44863..87aa0e3a32 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/ContextField.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/ContextField.java
@@ -16,6 +16,8 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+
 /**
  * MDC fields that represent context data.
  *
@@ -24,11 +26,11 @@ package org.openecomp.sdc.logging.slf4j;
  */
 enum ContextField implements MDCField {
 
-    REQUEST_ID("RequestId"),
-    SERVICE_NAME("ServiceName"),
-    PARTNER_NAME("PartnerName"),
-    INSTANCE_ID("InstanceId"),
-    SERVER("Server"),
+    REQUEST_ID(ONAPLogConstants.MDCs.REQUEST_ID),
+    SERVICE_NAME(ONAPLogConstants.MDCs.SERVICE_NAME),
+    PARTNER_NAME(ONAPLogConstants.MDCs.PARTNER_NAME),
+    INSTANCE_ID(ONAPLogConstants.MDCs.INSTANCE_UUID),
+    SERVER(ONAPLogConstants.MDCs.SERVER_FQDN),
     SERVER_IP_ADDRESS("ServerIpAddress");
 
     private final String key;
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/Markers.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/Markers.java
index 17439da161..3d9bbcfa53 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/Markers.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/Markers.java
@@ -16,6 +16,7 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
@@ -41,7 +42,9 @@ import org.slf4j.MarkerFactory;
  */
 public class Markers {
 
-    public static final Marker AUDIT = MarkerFactory.getMarker("AUDIT");
+    public static final Marker ENTRY = MarkerFactory.getMarker(ONAPLogConstants.Markers.ENTRY.getName());
+    public static final Marker EXIT = MarkerFactory.getMarker(ONAPLogConstants.Markers.EXIT.getName());
+
     public static final Marker METRICS = MarkerFactory.getMarker("METRICS");
 
     private Markers() {
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/MetricsField.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/MetricsField.java
index fda0c8b683..c4e8e143af 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/MetricsField.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/MetricsField.java
@@ -16,6 +16,8 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+
 /**
  * DC fields that represent metrics data.
  *
@@ -24,15 +26,15 @@ package org.openecomp.sdc.logging.slf4j;
  */
 public enum MetricsField implements MDCField {
 
-    BEGIN_TIMESTAMP("BeginTimestamp"),
+    BEGIN_TIMESTAMP(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP),
     END_TIMESTAMP("EndTimestamp"),
     ELAPSED_TIME("ElapsedTime"),
-    STATUS_CODE("StatusCode"),
-    RESPONSE_CODE("ResponseCode"),
-    RESPONSE_DESCRIPTION("ResponseDescription"),
-    CLIENT_IP_ADDRESS("ClientIpAddress"),
+    STATUS_CODE(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE),
+    RESPONSE_CODE(ONAPLogConstants.MDCs.RESPONSE_CODE),
+    RESPONSE_DESCRIPTION(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION),
+    CLIENT_IP_ADDRESS(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS),
     TARGET_VIRTUAL_ENTITY("TargetVirtualEntity"),
-    TARGET_ENTITY("TargetEntity");
+    TARGET_ENTITY(ONAPLogConstants.MDCs.TARGET_ENTITY);
 
     private final String key;
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/RequestContextProvider.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/RequestContextProvider.java
index 40684cc132..70e3dd6479 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/RequestContextProvider.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/RequestContextProvider.java
@@ -40,9 +40,9 @@ class RequestContextProvider implements ContextProvider {
 
     static ContextData to(Map<ContextField, String> values) {
         return ContextData.builder()
-                          .requestId(values.get(ContextField.REQUEST_ID))
-                          .serviceName(values.get(ContextField.SERVICE_NAME))
-                          .partnerName(values.get(ContextField.PARTNER_NAME)).build();
+                .requestId(values.get(ContextField.REQUEST_ID))
+                .serviceName(values.get(ContextField.SERVICE_NAME))
+                .partnerName(values.get(ContextField.PARTNER_NAME)).build();
     }
 
     @Override
@@ -58,7 +58,6 @@ class RequestContextProvider implements ContextProvider {
     }
 
     private void putIfNotNull(Map<ContextField, String> values, ContextField field, String value) {
-
         if (value != null) {
             values.put(field, value);
         }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapper.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapper.java
index fbb5fbf1f2..f85a6bbe95 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapper.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapper.java
@@ -114,11 +114,11 @@ class SLF4JLoggerWrapper implements Logger {
 
     @Override
     public boolean isAuditEnabled() {
-        return logger.isInfoEnabled(Markers.AUDIT);
+        return logger.isInfoEnabled(Markers.EXIT);
     }
 
     @Override
-    public void audit(AuditData data) {
+    public void auditEntry(AuditData data) {
 
         if (data == null) {
             return; // not failing if null
@@ -126,7 +126,23 @@ class SLF4JLoggerWrapper implements Logger {
 
         try {
             putAuditOnMdc(data);
-            logger.info(Markers.AUDIT, "");
+            logger.info(Markers.ENTRY, "");
+        } finally {
+            clearAuditFromMdc();
+        }
+    }
+
+
+    @Override
+    public void auditExit(AuditData data) {
+
+        if (data == null) {
+            return; // not failing if null
+        }
+
+        try {
+            putAuditOnMdc(data);
+            logger.info(Markers.EXIT, "");
         } finally {
             clearAuditFromMdc();
         }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/RoutingTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/RoutingTest.java
index 7be90264d6..d2e75b1ac1 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/RoutingTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/RoutingTest.java
@@ -113,7 +113,7 @@ public class RoutingTest {
     @Test
     public void testAudit() {
         String msg = "This is a test audit";
-        logger.info(Markers.AUDIT, msg);
+        logger.info(Markers.EXIT, msg);
         TestAppender appender = result.get(AUDIT);
         Assert.assertTrue(appender.contains(
                 (event) -> Level.INFO.equals(event.getLevel()) && msg.equals(event.getFormattedMessage())));
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminatorTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminatorTest.java
index 2a71f72063..2001e16264 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminatorTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/logback/EventTypeDiscriminatorTest.java
@@ -79,7 +79,7 @@ public class EventTypeDiscriminatorTest {
         EventTypeDiscriminator discriminator = new EventTypeDiscriminator();
         LoggingEvent event = new LoggingEvent();
         event.setLevel(Level.ERROR);
-        event.setMarker(Markers.AUDIT);
+        event.setMarker(Markers.EXIT);
         assertEquals(ERROR, discriminator.getDiscriminatingValue(event));
     }
 
@@ -97,7 +97,7 @@ public class EventTypeDiscriminatorTest {
         EventTypeDiscriminator discriminator = new EventTypeDiscriminator();
         LoggingEvent event = new LoggingEvent();
         event.setLevel(Level.WARN);
-        event.setMarker(Markers.AUDIT);
+        event.setMarker(Markers.EXIT);
         assertEquals(ERROR, discriminator.getDiscriminatingValue(event));
     }
 
@@ -115,7 +115,7 @@ public class EventTypeDiscriminatorTest {
         EventTypeDiscriminator discriminator = new EventTypeDiscriminator();
         LoggingEvent event = new LoggingEvent();
         event.setLevel(Level.DEBUG);
-        event.setMarker(Markers.AUDIT);
+        event.setMarker(Markers.EXIT);
         assertEquals(DEBUG, discriminator.getDiscriminatingValue(event));
     }
 
@@ -133,7 +133,7 @@ public class EventTypeDiscriminatorTest {
         EventTypeDiscriminator discriminator = new EventTypeDiscriminator();
         LoggingEvent event = new LoggingEvent();
         event.setLevel(Level.TRACE);
-        event.setMarker(Markers.AUDIT);
+        event.setMarker(Markers.EXIT);
         assertEquals(DEBUG, discriminator.getDiscriminatingValue(event));
     }
 
@@ -196,7 +196,7 @@ public class EventTypeDiscriminatorTest {
         EventTypeDiscriminator discriminator = new EventTypeDiscriminator();
         LoggingEvent event = new LoggingEvent();
         event.setLevel(Level.INFO);
-        event.setMarker(Markers.AUDIT);
+        event.setMarker(Markers.EXIT);
         assertEquals("Audit", discriminator.getDiscriminatingValue(event));
     }
 
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/LoggingContextTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/LoggingContextTest.java
index 1e7cfe834f..9ecd5567e0 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/LoggingContextTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/LoggingContextTest.java
@@ -147,7 +147,7 @@ public class LoggingContextTest {
         String random = UUID.randomUUID().toString();
         ContextData context = ContextData.builder().serviceName(random).build();
         LoggingContext.put(context);
-        assertEquals(context, LoggingContext.get());
+        assertEquals(context.getServiceName(), LoggingContext.get().getServiceName());
     }
 
     @Test
@@ -156,7 +156,7 @@ public class LoggingContextTest {
         String random = UUID.randomUUID().toString();
         ContextData context = ContextData.builder().requestId(random).build();
         LoggingContext.put(context);
-        assertEquals(context, LoggingContext.get());
+        assertEquals(context.getRequestId(), LoggingContext.get().getRequestId());
     }
 
     @Test
@@ -165,7 +165,7 @@ public class LoggingContextTest {
         String random = UUID.randomUUID().toString();
         ContextData context = ContextData.builder().partnerName(random).build();
         LoggingContext.put(context);
-        assertEquals(context, LoggingContext.get());
+        assertEquals(context.getPartnerName(), LoggingContext.get().getPartnerName());
     }
 
 }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/RequestContextProviderTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/RequestContextProviderTest.java
index c4c1677637..e0f8e40e4b 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/RequestContextProviderTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/RequestContextProviderTest.java
@@ -16,16 +16,14 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Map;
 import org.junit.Test;
 import org.openecomp.sdc.logging.api.ContextData;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit-test retrieving values from client-provided request data.
  *
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapperTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapperTest.java
index c8ee347a8b..2b98fc898f 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapperTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggerWrapperTest.java
@@ -19,6 +19,7 @@ package org.openecomp.sdc.logging.slf4j;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.COMPLETE;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -28,7 +29,6 @@ import java.util.Map;
 import org.junit.Test;
 import org.openecomp.sdc.logging.api.AuditData;
 import org.openecomp.sdc.logging.api.MetricsData;
-import org.openecomp.sdc.logging.api.StatusCode;
 import org.slf4j.Logger;
 import org.slf4j.MDC;
 import org.slf4j.Marker;
@@ -44,7 +44,7 @@ public class SLF4JLoggerWrapperTest {
 
     @Test
     public void auditDoesNotFailWhenInputNull() {
-        new SLF4JLoggerWrapper(this.getClass()).audit(null);
+        new SLF4JLoggerWrapper(this.getClass()).auditExit(null);
     }
 
     @Test
@@ -56,7 +56,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditBeginTimeAvailableWhenPassed() {
         SpyLogger spy = createSpy();
         long start = System.currentTimeMillis();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().startTime(start).build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().startTime(start).build());
         assertNotNull(spy.mdc().get(AuditField.BEGIN_TIMESTAMP.asKey()));
     }
 
@@ -72,7 +72,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditEndTimeAvailableWhenPassed() {
         SpyLogger spy = createSpy();
         long end = System.currentTimeMillis();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().endTime(end).build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().endTime(end).build());
         assertNotNull(spy.mdc().get(AuditField.END_TIMESTAMP.asKey()));
     }
 
@@ -88,7 +88,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditElapsedTimeAvailableWhenPassed() {
         SpyLogger spy = createSpy();
         long start = System.currentTimeMillis();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder()
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder()
                                                    .startTime(start).endTime(start + 777).build());
         assertEquals("777", spy.mdc().get(AuditField.ELAPSED_TIME.asKey()));
     }
@@ -105,21 +105,21 @@ public class SLF4JLoggerWrapperTest {
     @Test
     public void auditStatusCodeAvailableWhenPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().statusCode(StatusCode.COMPLETE).build());
-        assertEquals(StatusCode.COMPLETE.name(), spy.mdc().get(AuditField.STATUS_CODE.asKey()));
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().statusCode(COMPLETE).build());
+        assertEquals(COMPLETE.name(), spy.mdc().get(AuditField.STATUS_CODE.asKey()));
     }
 
     @Test
     public void metricsStatusCodeAvailableWhenPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).metrics(MetricsData.builder().statusCode(StatusCode.COMPLETE).build());
-        assertEquals(StatusCode.COMPLETE.name(), spy.mdc().get(MetricsField.STATUS_CODE.asKey()));
+        new SLF4JLoggerWrapper(spy).metrics(MetricsData.builder().statusCode(COMPLETE).build());
+        assertEquals(COMPLETE.name(), spy.mdc().get(MetricsField.STATUS_CODE.asKey()));
     }
 
     @Test
     public void auditStatusCodeEmptyWhenNotPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().build());
         assertNull(spy.mdc().get(AuditField.STATUS_CODE.asKey()));
     }
 
@@ -134,7 +134,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditResponseCodeAvailableWhenPassed() {
         final String responseCode = "AuditSpyResponse";
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().responseCode(responseCode).build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().responseCode(responseCode).build());
         assertEquals(responseCode, spy.mdc().get(AuditField.RESPONSE_CODE.asKey()));
     }
 
@@ -149,7 +149,7 @@ public class SLF4JLoggerWrapperTest {
     @Test
     public void auditResponseCodeEmptyWhenNotPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().build());
         assertNull(spy.mdc().get(AuditField.RESPONSE_CODE.asKey()));
     }
 
@@ -164,7 +164,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditResponseDescriptionAvailableWhenPassed() {
         final String responseDescription = "AuditSpyDescription";
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().responseDescription(responseDescription).build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().responseDescription(responseDescription).build());
         assertEquals(responseDescription, spy.mdc().get(AuditField.RESPONSE_DESCRIPTION.asKey()));
     }
 
@@ -179,7 +179,7 @@ public class SLF4JLoggerWrapperTest {
     @Test
     public void auditResponseDescriptionEmptyWhenNotPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().build());
         assertNull(spy.mdc().get(AuditField.RESPONSE_DESCRIPTION.asKey()));
     }
 
@@ -194,7 +194,7 @@ public class SLF4JLoggerWrapperTest {
     public void auditClientIpAddressAvailableWhenPassed() {
         final String ipAddress = "10.56.20.20";
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().clientIpAddress(ipAddress).build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().clientIpAddress(ipAddress).build());
         assertEquals(ipAddress, spy.mdc().get(AuditField.CLIENT_IP_ADDRESS.asKey()));
     }
 
@@ -209,7 +209,7 @@ public class SLF4JLoggerWrapperTest {
     @Test
     public void auditClientIpAddressEmptyWhenNotPassed() {
         SpyLogger spy = createSpy();
-        new SLF4JLoggerWrapper(spy).audit(AuditData.builder().build());
+        new SLF4JLoggerWrapper(spy).auditExit(AuditData.builder().build());
         assertNull(spy.mdc().get(AuditField.CLIENT_IP_ADDRESS.asKey()));
     }
 
@@ -294,7 +294,7 @@ public class SLF4JLoggerWrapperTest {
         }
 
         private boolean isAuditMethod(Method method, Object[] args) {
-            return isSpecialLogMethod(method, args, Markers.AUDIT);
+            return isSpecialLogMethod(method, args, Markers.EXIT);
         }
 
         private boolean isSpecialLogMethod(Method method, Object[] args, Marker marker) {
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/main/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptor.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/main/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptor.java
index 7ee942a180..393a061987 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/main/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptor.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/main/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptor.java
@@ -16,17 +16,17 @@
 
 package org.openecomp.sdc.logging.servlet.spring;
 
-import static org.openecomp.sdc.logging.api.StatusCode.COMPLETE;
-import static org.openecomp.sdc.logging.api.StatusCode.ERROR;
+import static org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus.*;
 import static org.springframework.http.HttpStatus.Series.REDIRECTION;
 import static org.springframework.http.HttpStatus.Series.SUCCESSFUL;
 
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.api.StatusCode;
 import org.openecomp.sdc.logging.servlet.AuditTracker;
 import org.openecomp.sdc.logging.servlet.CombinedTracker;
 import org.openecomp.sdc.logging.servlet.ContextTracker;
@@ -120,7 +120,7 @@ public class LoggingInterceptor extends HandlerInterceptorAdapter {
         }
 
         @Override
-        public StatusCode getStatusCode() {
+        public ResponseStatus getStatusCode() {
             return statusInfo.getStatusCode();
         }
 
@@ -154,7 +154,7 @@ public class LoggingInterceptor extends HandlerInterceptorAdapter {
             return reasonPhrase;
         }
 
-        private StatusCode getStatusCode() {
+        private ResponseStatus getStatusCode() {
             return series.equals(SUCCESSFUL) || series.equals(REDIRECTION) ? COMPLETE : ERROR;
         }
     }
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/test/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptorTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/test/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptorTest.java
index 406f8b6dbd..86a4318ec9 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/test/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptorTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/src/test/java/org/openecomp/sdc/logging/servlet/spring/LoggingInterceptorTest.java
@@ -22,13 +22,12 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.openecomp.sdc.logging.api.StatusCode.COMPLETE;
-import static org.openecomp.sdc.logging.api.StatusCode.ERROR;
 import static org.openecomp.sdc.logging.servlet.spring.LoggingInterceptor.LOGGING_TRACKER_KEY;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
+import org.onap.logging.ref.slf4j.ONAPLogConstants.ResponseStatus;
 import org.openecomp.sdc.logging.servlet.HttpHeader;
 import org.openecomp.sdc.logging.servlet.RequestProcessingResult;
 import org.openecomp.sdc.logging.servlet.Tracker;
@@ -80,7 +79,7 @@ public class LoggingInterceptorTest {
         final int status = 101;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -88,7 +87,7 @@ public class LoggingInterceptorTest {
         final int status = 404;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -96,7 +95,7 @@ public class LoggingInterceptorTest {
         final int status = 503;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -104,7 +103,7 @@ public class LoggingInterceptorTest {
         final int status = 204;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(COMPLETE, result.getStatusCode());
+        assertEquals(ResponseStatus.COMPLETE, result.getStatusCode());
     }
 
     @Test
@@ -112,7 +111,7 @@ public class LoggingInterceptorTest {
         final int status = 307;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(COMPLETE, result.getStatusCode());
+        assertEquals(ResponseStatus.COMPLETE, result.getStatusCode());
     }
 
     @Test
@@ -120,7 +119,7 @@ public class LoggingInterceptorTest {
         final int status = 133;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -128,7 +127,7 @@ public class LoggingInterceptorTest {
         final int status = 485;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -136,7 +135,7 @@ public class LoggingInterceptorTest {
         final int status = 547;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(ERROR, result.getStatusCode());
+        assertEquals(ResponseStatus.ERROR, result.getStatusCode());
     }
 
     @Test
@@ -144,7 +143,7 @@ public class LoggingInterceptorTest {
         final int status = 277;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(COMPLETE, result.getStatusCode());
+        assertEquals(ResponseStatus.COMPLETE, result.getStatusCode());
     }
 
     @Test
@@ -152,6 +151,6 @@ public class LoggingInterceptorTest {
         final int status = 364;
         LoggingInterceptor.ServletResponseResult result = new LoggingInterceptor.ServletResponseResult(status);
         assertEquals(status, result.getStatus());
-        assertEquals(COMPLETE, result.getStatusCode());
+        assertEquals(ResponseStatus.COMPLETE, result.getStatusCode());
     }
 }