Removed logXXX() methods from MsoUtils

Following methods has been removed from MsoUtils (.groovy) class:
logContext(requestId, serviceInstanceId)
logMetrics(elapsedTime, logtxt)
logAudit(logtxt)
as no longer required.

Remaining uses of them in other groovy clases has been deleted/replaced by
apropriate use of logback.

Change-Id: I473f01b65c67e90667311cff3b2a671e719f7258
Issue-ID: LOG-631
Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
index c700fa7..dba6a1a 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
@@ -236,7 +236,6 @@ public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcess
                                serviceInstanceId = (String) execution.getVariable("mso-service-instance-id")
                        }
 
-                       utils.logContext(requestId, serviceInstanceId)
                        logDebug('Incoming message: ' + System.lineSeparator() + request, isDebugLogEnabled)
                        logDebug('Exited ' + method, isDebugLogEnabled)
                        return request
@@ -264,13 +263,6 @@ public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcess
                String processKey = getProcessKey(execution);
                def prefix = execution.getVariable("prefix")
 
-               def requestId =getVariable(execution, "mso-request-id")
-               def serviceInstanceId = getVariable(execution, "mso-service-instance-id")
-               if(requestId!=null && serviceInstanceId!=null){
-                       utils.logContext(requestId, serviceInstanceId)
-               }
-
-
                def request = getVariable(execution, prefix + 'Request')
 
                if (request == null) {

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
index 324cc63..ccbd682 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
@@ -308,22 +308,6 @@ class MsoUtils {
                }
        }
 
-       def logContext(requestId, serviceInstanceId){
-//             msoLogger.setLogContext(requestId, serviceInstanceId);
-       }
-       
-       def logMetrics(elapsedTime, logtxt){
-               
-//             msoLogger.recordMetricEvent (elapsedTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
-//                     logtxt, "BPMN", MsoLogger.getServiceName(), null);
-       }
-
-       def logAudit(logtxt){
-               long startTime = System.currentTimeMillis();
-               
-//             msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logtxt);
-       }
-       
        // headers: header - name-value
        def getHeaderNameValue(xmlInput, nameAttribute){
                def rtn=null

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy
index cac7a35..49acf37 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy
@@ -195,7 +195,6 @@ class OofHoming extends AbstractServiceTaskProcessor {
         try {
             String response = execution.getVariable("asyncCallbackResponse")
             logger.debug( "OOF Async Callback Response is: " + response)
-            utils.logAudit("OOF Async Callback Response is: " + response)
 
             oofUtils.validateCallbackResponse(execution, response)
             String placements = jsonUtil.getJsonValue(response, "solutions.placementSolutions")
@@ -378,7 +377,6 @@ class OofHoming extends AbstractServiceTaskProcessor {
         }
         execution.setVariable("DHVCS_requestId", requestId)
         logger.debug( "***** STARTED Homing Subflow for request: " + requestId + " *****")
-        utils.logAudit("***** STARTED Homing Subflow for request: " + requestId + " *****")
     }
 
     /**

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
index 8b04803..9d7ce82 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
@@ -274,9 +274,6 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 
                String prefix = execution.getVariable('prefix')
                String callback = execution.getVariable('SDNCAResponse_MESSAGE')
-               String requestId = execution.getVariable("mso-request-id");
-               String serviceInstanceId = execution.getVariable("mso-service-instance-id")
-               utils.logContext(requestId, serviceInstanceId)
                logger.debug("Incoming SDNC Rest Callback is: " + callback)
 
                try {

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
index bb2116a..65fa051 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
@@ -441,7 +441,6 @@ public class CreateSDNCNetworkResource extends AbstractServiceTaskProcessor {
             }
 
             String sndcTopologyCreateRequesAsString = utils.formatXml(sdncTopologyCreateRequest)
-            utils.logAudit(sndcTopologyCreateRequesAsString)
             execution.setVariable("sdncAdapterWorkflowRequest", sndcTopologyCreateRequesAsString)
             logger.debug("sdncAdapterWorkflowRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
 

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
index ccdb5d7..4233147 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
@@ -328,7 +328,6 @@ public class DeActivateSDNCNetworkResource extends AbstractServiceTaskProcessor
             }
 
             String sdncTopologyDeleteRequesAsString = utils.formatXml(sdncTopologyDeleteRequest)
-            utils.logAudit(sdncTopologyDeleteRequesAsString)
             execution.setVariable("sdncAdapterWorkflowRequest", sdncTopologyDeleteRequesAsString)
             logger.info("sdncAdapterWorkflowRequest - " + "\n" +  sdncTopologyDeleteRequesAsString)
 

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
index 0dc8663..20134a7 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
@@ -354,7 +354,6 @@ public class DeleteSDNCNetworkResource extends AbstractServiceTaskProcessor {
             }
 
             String sdncTopologyDeleteRequesAsString = utils.formatXml(sdncTopologyDeleteRequest)
-            utils.logAudit(sdncTopologyDeleteRequesAsString)
             execution.setVariable("sdncAdapterWorkflowRequest", sdncTopologyDeleteRequesAsString)
             logger.info("sdncAdapterWorkflowRequest - " + "\n" +  sdncTopologyDeleteRequesAsString)
 

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
index 4fe3080..5081312 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
@@ -195,7 +195,6 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
                        payload = utils.formatXml(payload)
                        execution.setVariable("CVFMI_initResOperStatusRequest", payload)
                        logger.info( "Outgoing initResourceOperationStatus: \n" + payload)
-                       utils.logAudit("CreateVfModuleInfra Outgoing initResourceOperationStatus Request: " + payload)
 
         }catch(Exception e){
             logger.info( "Exception Occured Processing preInitResourcesOperStatus. Exception is:\n" + e)

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
index 4e3517e..1168b20 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
@@ -72,7 +72,6 @@ public class UpdateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                try {
 
                        String siRequest = execution.getVariable("bpmnRequest")
-                       utils.logAudit(siRequest)
 
                        String requestId = execution.getVariable("mso-request-id")
                        execution.setVariable("msoRequestId", requestId)
@@ -277,7 +276,6 @@ public class UpdateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        payload = utils.formatXml(payload)
                        execution.setVariable("CVFMI_updateServiceOperStatusRequest", payload)
                        logger.error( "Outgoing updateServiceOperStatusRequest: \n" + payload)
-                       utils.logAudit("CreateVfModuleInfra Outgoing updateServiceOperStatusRequest Request: " + payload)
 
                }catch(Exception e){
                        logger.debug( "Exception Occured Processing prepareInitServiceOperationStatus. Exception is:\n" + e)
@@ -398,7 +396,6 @@ public class UpdateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                                        <aetgt:ErrorCode>${MsoUtils.xmlEscape(errorCode)}</aetgt:ErrorCode>
                                   </aetgt:WorkflowException>"""
 
-                       utils.logAudit(buildworkflowException)
                        sendWorkflowResponse(execution, 500, buildworkflowException)
 
                } catch (Exception ex) {