Refactored SDNCAdapterUtils (groovy)

[so.git] / bpmn / so-bpmn-infrastructure-common / src / main / groovy / org / onap / so / bpmn / infrastructure / scripts / UpdateVfModuleVolumeInfraV1.groovy

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
index 49da398..ab7b659 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -21,6 +23,7 @@
 package org.onap.so.bpmn.infrastructure.scripts
 
 import groovy.json.JsonException
+import groovy.json.JsonSlurper
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.onap.aai.domain.yang.GenericVnf
@@ -38,16 +41,17 @@ import org.onap.so.client.aai.entities.Relationships
 import org.onap.so.client.aai.entities.uri.AAIResourceUri
 import org.onap.so.client.aai.entities.uri.AAIUriFactory
 import org.onap.so.constants.Defaults
+import org.onap.so.logger.ErrorCode
 import org.onap.so.logger.MessageEnum
-import org.onap.so.logger.MsoLogger
-import static org.apache.cxf.common.util.CollectionUtils.isEmpty
-
-import groovy.json.JsonSlurper
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import javax.ws.rs.core.UriBuilder
 
+import static org.apache.cxf.common.util.CollectionUtils.isEmpty
+
 class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
-    private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, UpdateVfModuleVolumeInfraV1.class)
+    private static final Logger logger = LoggerFactory.getLogger(UpdateVfModuleVolumeInfraV1.class)
     private ExceptionUtil exceptionUtil = new ExceptionUtil()
 
     /**
@@ -108,11 +112,11 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
             def modelInvariantId = reqMap.requestDetails.modelInfo.modelInvariantUuid ?: ''
             execution.setVariable('UPDVfModVol_modelInvariantId', modelInvariantId)
 
-            msoLogger.debug("modelInvariantId from request: " + modelInvariantId)
-            msoLogger.debug("XML request:\n" + request)
+            logger.debug("modelInvariantId from request: {}", modelInvariantId)
+            logger.debug("XML request:\n{}", request)
         }
         catch (JsonException je) {
-            msoLogger.debug(" Request is in XML format.")
+            logger.debug(" Request is in XML format.")
             // assume request is in XML format - proceed as usual to process XML request
         }
 
@@ -131,6 +135,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
         execution.setVariable('UPDVfModVol_vnfVersion', getRequiredNodeText(execution, volumeInputs, 'asdc-service-model-version'))
         execution.setVariable('UPDVfModVol_serviceId', utils.getNodeText(volumeInputs, 'service-id'))
         execution.setVariable('UPDVfModVol_aicCloudRegion', getRequiredNodeText(execution, volumeInputs, 'aic-cloud-region'))
+        execution.setVariable('UPDVfModVol_cloudRegion', getRequiredNodeText(execution, volumeInputs, 'cloud-owner'))
         execution.setVariable('UPDVfModVol_tenantId', getRequiredNodeText(execution, volumeInputs, 'tenant-id'))
         //execution.setVariable('UPDVfModVol_modelCustomizationId', getRequiredNodeText(execution, volumeInputs, 'model-customization-id'))
 
@@ -186,7 +191,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
             syncResponse = utils.formatXml(xmlSyncResponse)
         }
 
-        msoLogger.debug('Sync response: ' + syncResponse)
+        logger.debug('Sync response: {}', syncResponse)
         execution.setVariable('UPDVfModVol_syncResponseSent', true)
         sendWorkflowResponse(execution, 200, syncResponse)
     }
@@ -213,7 +218,8 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                     if (!isEmpty(tenantURIList)) {
                         String volumeGroupTenantId = tenantURIList.get(0).getURIKeys().get("tenant-id")
                         execution.setVariable('UPDVfModVol_volumeGroupTenantId', volumeGroupTenantId)
-                        msoLogger.debug("Received Tenant Id " + volumeGroupTenantId + " from AAI for Volume Group with Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion)
+                        logger.debug("Received Tenant Id {} from AAI for Volume Group with Volume Group Id {}, AIC Cloud Region ",
+                                volumeGroupTenantId, volumeGroupId, aicCloudRegion)
                     } else {
                         exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Could not find Tenant Id element in Volume Group with Volume Group Id " + volumeGroupId
                                 + ", AIC Cloud Region " + aicCloudRegion)
@@ -323,6 +329,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
         String vnfAdapterRestRequest = """
                        <updateVolumeGroupRequest>
                                <cloudSiteId>${MsoUtils.xmlEscape(aicCloudRegion)}</cloudSiteId>
+                               <cloudOwner>${MsoUtils.xmlEscape(cloudOwner)}</cloudOwner>
                                <tenantId>${MsoUtils.xmlEscape(tenantId)}</tenantId>
                                <vnfId>${MsoUtils.xmlEscape(vnfId)}</vnfId>
                                <vnfName>${MsoUtils.xmlEscape(vnfName)}</vnfName>
@@ -363,7 +370,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                """
         vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
         execution.setVariable('UPDVfModVol_vnfAdapterRestRequest', vnfAdapterRestRequest)
-        msoLogger.debug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest)
+        logger.debug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest)
     }
 
     /**
@@ -392,7 +399,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
 
         updateInfraRequest = utils.formatXml(updateInfraRequest)
         execution.setVariable('UPDVfModVol_updateInfraRequest', updateInfraRequest)
-        msoLogger.debug('Request for Update Infra Request:\n' + updateInfraRequest)
+        logger.debug('Request for Update Infra Request:\n' + updateInfraRequest)
     }
 
     /**
@@ -414,7 +421,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                """
 
         content = utils.formatXml(content)
-        msoLogger.debug('Request for Completion Handler:\n' + content)
+        logger.debug('Request for Completion Handler:\n' + content)
         execution.setVariable('UPDVfModVol_CompletionHandlerRequest', content)
     }
 
@@ -454,7 +461,7 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                        </sdncadapterworkflow:FalloutHandlerRequest>
                """
         content = utils.formatXml(content)
-        msoLogger.debug('Request for Fallout Handler:\n' + content)
+        logger.debug('Request for Fallout Handler:\n' + content)
         execution.setVariable('UPDVfModVol_FalloutHandlerRequest', content)
     }
 
@@ -474,7 +481,8 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                 " retrieved from AAI for Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion
 
         ExceptionUtil exceptionUtil = new ExceptionUtil()
-        msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Error in UpdateVfModuleVol: ' + errorMessage, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception")
+        logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), 'Error in ' +
+                'UpdateVfModuleVol: ' + errorMessage, "BPMN", ErrorCode.UnknownError.getValue(), "Exception")
         exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
     }
 
@@ -492,7 +500,8 @@ class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
                 " retrieved from AAI for Volume Group Id "
 
         ExceptionUtil exceptionUtil = new ExceptionUtil()
-        msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Error in UpdateVfModuleVol: ' + errorMessage, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception")
+        logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), 'Error in ' +
+                'UpdateVfModuleVol: ' + errorMessage, "BPMN", ErrorCode.UnknownError.getValue(), "Exception")
         exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
     }