[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

35 files changed, 10672 insertions, 7630 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
index b48e07f..88e2396 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
@@ -1,749 +1,752 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.json.JSONObject;
-import org.json.JSONArray;
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils;
-
-/**
- * This groovy class supports the <class>CreateGenericMacroServiceNetworkVnf.bpmn</class> process.
- *
- */
-public class CreateGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {
-
-	String Prefix="CREVAS_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils()
-	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable("createGenericMacroServiceNetworkVnfRequest", "")
-		execution.setVariable("globalSubscriberId", "")
-		execution.setVariable("serviceInstanceName", "")
-		execution.setVariable("msoRequestId", "")
-		execution.setVariable("CREVAS_NetworksCreatedCount", 0)
-		execution.setVariable("CREVAS_VnfsCreatedCount", 0)
-		execution.setVariable("productFamilyId", "")
-		
-		
-		//TODO
-		execution.setVariable("sdncVersion", "1702")
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// check for incoming json message/input
-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("bpmnRequest")
-			utils.logAudit(createGenericMacroServiceNetworkVnfRequest)
-			execution.setVariable("createGenericMacroServiceNetworkVnfRequest", createGenericMacroServiceNetworkVnfRequest);
-			println 'createGenericMacroServiceNetworkVnfRequest - ' + createGenericMacroServiceNetworkVnfRequest
-
-			// extract requestId
-			String requestId = execution.getVariable("mso-request-id")
-			execution.setVariable("msoRequestId", requestId)
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {
-				serviceInstanceId = UUID.randomUUID().toString()
-				utils.log("DEBUG", " Generated new Service Instance: " + serviceInstanceId , isDebugEnabled)
-			} else {
-				utils.log("DEBUG", "Using provided Service Instance ID: " + serviceInstanceId , isDebugEnabled)
-			}
-
-			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
-			execution.setVariable("serviceInstanceId", serviceInstanceId)
-			
-			String requestAction = execution.getVariable("requestAction")
-			execution.setVariable("requestAction", requestAction)
-
-			String source = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.source")
-			if ((source == null) || (source.isEmpty())) {
-				execution.setVariable("source", "VID")
-			} else {
-				execution.setVariable("source", source)
-			}
-
-			// extract globalSubscriberId
-			String globalSubscriberId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.subscriberInfo.globalSubscriberId")
-
-			// verify element global-customer-id is sent from JSON input, throw exception if missing
-			if ((globalSubscriberId == null) || (globalSubscriberId.isEmpty())) {
-				String dataErrorMessage = " Element 'globalSubscriberId' is missing. "
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-			} else {
-				execution.setVariable("globalSubscriberId", globalSubscriberId)
-				execution.setVariable("globalCustomerId", globalSubscriberId)
-			}
-			
-			// extract subscriptionServiceType
-			String subscriptionServiceType = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
-
-			String suppressRollback = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.suppressRollback")
-			execution.setVariable("disableRollback", suppressRollback)
-			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
-			
-			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")
-			execution.setVariable("productFamilyId", productFamilyId)
-			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
-			
-			//For Completion Handler & Fallout Handler
-			String requestInfo =
-			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>
-					<action>CREATE</action>
-					<source>${source}</source>
-				   </request-info>"""
-
-			execution.setVariable("CREVAS_requestInfo", requestInfo)
-			
-			utils.log("DEBUG", " ***** Completed preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex){
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-		try {
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			String requestId = execution.getVariable("mso-request-id")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-
-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
-			sendWorkflowResponse(execution, 202, syncResponse)
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	// *******************************
-	//     
-	// *******************************
-	public void prepareCreateServiceInstance(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")
-			String serviceModelInfo = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo")
-			execution.setVariable("serviceModelInfo", serviceModelInfo)
-
-			String serviceInputParams = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters")
-			execution.setVariable("serviceInputParams", serviceInputParams)
-			
-			String serviceInstanceName = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.instanceName")
-			execution.setVariable("serviceInstanceName", serviceInstanceName)
-
-			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareCreateService() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	
-	public void postProcessServiceInstanceCreate (Execution execution){
-		def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-		
-		String source = execution.getVariable("source")
-		String requestId = execution.getVariable("mso-request-id")
-		String serviceInstanceId = execution.getVariable("serviceInstanceId")
-		String serviceInstanceName = execution.getVariable("serviceInstanceName")
-		
-		try {
-
-			String payload = """
-			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
-			<soapenv:Header/>
-			<soapenv:Body>
-			<req:updateInfraRequest>
-				<requestId>${requestId}</requestId>
-				<lastModifiedBy>BPEL</lastModifiedBy>
-				<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
-				<serviceInstanceName>${serviceInstanceName}</serviceInstanceName>
-			</req:updateInfraRequest>
-			</soapenv:Body>
-			</soapenv:Envelope>
-			"""
-			execution.setVariable("CREVAS_setUpdateDbInstancePayload", payload)
-			utils.logAudit("CREVAS_setUpdateDbInstancePayload: " + payload)
-			logDebug('Exited ' + method, isDebugLogEnabled)
-			//println("CMSO_updateDBStatusToSuccessPayload --> " + execution.getVariable("CMSO_updateDBStatusToSuccessPayload"))
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
-		}
-	}
-	
-	
-	public void callDBCatalog (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		utils.log("DEBUG", " ***** Inside callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		
-		try {
-			
-			// get variable within incoming json
-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest");
-			
-			String catalog_db_endpoint = execution.getVariable("URN_mso_catalog_db_endpoint")
-			utils.log("DEBUG", "catalog_db_endpoint: "+catalog_db_endpoint, isDebugEnabled)
-			
-			String serviceModelInvariantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelInvariantId")
-			String serviceModelVersion = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelVersion")
-			utils.log("DEBUG", "getting network list ", isDebugEnabled)
-			
-			JSONArray networkList = catalogDbUtils.getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)
-
-			//utils.log("DEBUG", "got network list: "+ networkList.toString(), isDebugEnabled)
-			execution.setVariable("networkList", networkList)
-			execution.setVariable("networkListString", networkList.toString())
-			
-			if (networkList != null && networkList.length() > 0) {
-
-				execution.setVariable("CREVAS_NetworksCount", networkList.length())
-				utils.log("DEBUG", "networks to create: "+ networkList.length(), isDebugEnabled)
-			} else {
-				execution.setVariable("CREVAS_NetworksCount", 0)
-				utils.log("DEBUG", "no networks to create based upon Catalog DB response", isDebugEnabled)
-			}	
-			
-			// VNFs
-			JSONArray vnfList = catalogDbUtils.getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)
-			execution.setVariable("vnfList", vnfList)			
-			
-			String vnfModelInfoString = ""
-			if (vnfList != null && vnfList.length() > 0) {
-				execution.setVariable("CREVAS_VNFsCount", vnfList.length())
-				utils.log("DEBUG", "vnfs to create: "+ vnfList.length(), isDebugEnabled)
-				JSONObject vnfModelInfo = vnfList.getJSONObject(0).getJSONObject("modelInfo")
-				vnfModelInfoString = vnfModelInfo.toString()
-			} else {
-					execution.setVariable("CREVAS_VNFsCount", 0)
-					utils.log("DEBUG", "no vnfs to create based upon Catalog DB response", isDebugEnabled)
-			}
-				
-			execution.setVariable("vnfModelInfo", vnfModelInfoString)
-			//utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
-
-			utils.log("DEBUG", " ***** Completed callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			sendSyncError(execution)
-		   String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. callDBCatalog() - " + ex.getMessage()
-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-	
-	// *******************************
-	//     Generate Network request Section
-	// *******************************
-	public void prepareNetworkCreate (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-//			String disableRollback = execution.getVariable("disableRollback")
-//			def backoutOnFailure = ""
-//			if(disableRollback != null){
-//				if ( disableRollback == true) {
-//					backoutOnFailure = "false"
-//				} else if ( disableRollback == false) {
-//					backoutOnFailure = "true"
-//				}
-//			}
-			//failIfExists - optional
-
-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")
-			
-			JSONArray networkList = execution.getVariable("networkList")
-			utils.log("DEBUG", "array networkList: "+ networkList, isDebugEnabled)
-			
-			if (networkList == null || networkList.length() < 1){
-				networkList = new JSONArray(execution.getVariable("networkListString"))
-				utils.log("DEBUG", "array from string networkList: "+ networkList, isDebugEnabled)
-			}
-			
-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")
-			String networkModelInfoString = ""
-			
-			if (networkList != null) {
-				utils.log("DEBUG", " getting model info for network # :" + networksCreatedCount, isDebugEnabled)
-				JSONObject networkModelInfo = networkList.getJSONObject(networksCreatedCount.intValue()).getJSONObject("modelInfo")
-				networkModelInfoString = networkModelInfo.toString()
-			} else {
-				String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected number of networks to create - " + ex.getMessage()
-				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-			}
-			
-			execution.setVariable("networkModelInfo", networkModelInfoString)
-			utils.log("DEBUG", " networkModelInfoString :" + networkModelInfoString, isDebugEnabled)
-			
-//			String networkModelInfo = execution.getVariable("networkModelInfo")
-			// extract cloud configuration
-			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
-			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")
-			execution.setVariable("tenantId", tenantId)
-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
-			
-			String sdncVersion = execution.getVariable("sdncVersion")
-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
-			
-			JSONArray vnfList = execution.getVariable("vnfList")
-			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)
-			
-			String vnfModelInfo = execution.getVariable("vnfModelInfo")
-			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)
-			
-			networkList = execution.getVariable("networkList")
-			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)
-			
-			utils.log("DEBUG", " ***** Completed preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareNetworkCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Validate Network request Section -> increment count
-	// *******************************
-	public void validateNetworkCreate (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")
-			networksCreatedCount++
-			
-			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)
-			
-			execution.setVariable("DCRENI_rollbackData"+networksCreatedCount, execution.getVariable("DCRENI_rollbackData"))
-
-			utils.log("DEBUG", "networksCreatedCount: "+ networksCreatedCount, isDebugEnabled)
-			utils.log("DEBUG", "DCRENI_rollbackData N : "+ execution.getVariable("DCRENI_rollbackData"+networksCreatedCount), isDebugEnabled)
-			
-			JSONArray vnfList = execution.getVariable("vnfList")
-			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)
-			
-			String vnfModelInfo = execution.getVariable("vnfModelInfo")
-			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)
-			
-			JSONArray networkList = execution.getVariable("networkList")
-			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)
-			
-			utils.log("DEBUG", " ***** Completed validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Generate Network request Section
-	// *******************************
-	public void prepareVnfAndModulesCreate (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-			//			String disableRollback = execution.getVariable("disableRollback")
-			//			def backoutOnFailure = ""
-			//			if(disableRollback != null){
-			//				if ( disableRollback == true) {
-			//					backoutOnFailure = "false"
-			//				} else if ( disableRollback == false) {
-			//					backoutOnFailure = "true"
-			//				}
-			//			}
-						//failIfExists - optional
-
-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")
-			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")
-			execution.setVariable("productFamilyId", productFamilyId)
-			utils.log("DEBUG","productFamilyId: "+ productFamilyId, isDebugEnabled)
-
-			JSONArray vnfList = execution.getVariable("vnfList")
-
-			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")
-			String vnfModelInfoString = null;
-			
-			if (vnfList != null && vnfList.length() > 0 ) {
-				utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)
-				JSONObject vnfModelInfo1 = vnfList.getJSONObject(0).getJSONObject("modelInfo")
-				utils.log("DEBUG", "got 0 ", isDebugEnabled)
-				JSONObject vnfModelInfo = vnfList.getJSONObject(vnfsCreatedCount.intValue()).getJSONObject("modelInfo")
-				vnfModelInfoString = vnfModelInfo.toString()
-			} else {
-				//TODO: vnfList does not contain data. Need to investigate why ... . Fro VIPR use model stored
-				vnfModelInfoString = execution.getVariable("vnfModelInfo")
-			}
-							
-			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
-			
-			// extract cloud configuration
-			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
-			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")
-			execution.setVariable("tenantId", tenantId)
-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
-						
-			String sdncVersion = execution.getVariable("sdncVersion")
-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
-
-			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	// *******************************
-	//     Validate Vnf request Section -> increment count
-	// *******************************
-	public void validateVnfCreate (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")
-			vnfsCreatedCount++
-			
-			execution.setVariable("CREVAS_VnfsCreatedCount", vnfsCreatedCount)
-			
-			utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** "+" vnf # "+vnfsCreatedCount, isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Validate Network request Section -> decrement count
-	// *******************************
-	public void validateNetworkRollback (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")
-			networksCreatedCount--
-			
-			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)
-			
-			execution.setVariable("DCRENI_rollbackData", execution.getVariable("DCRENI_rollbackData"+networksCreatedCount))
-			
-			utils.log("DEBUG", " ***** Completed validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkRollback() - " + ex.getMessage()
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			execution.setVariable("CREVAS_NetworksCreatedCount", 0)
-			utils.log("ERROR", exceptionMessage, true)
-		}
-	 }
-	// *******************************
-	//     Build DB request Section
-	// *******************************
-//	public void prepareDBRequest (Execution execution) {
-//		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-//
-//		try {
-//			utils.log("DEBUG", " ***** Inside prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-//
-//			String requestId = execution.getVariable("CREVAS_requestId")
-//			String statusMessage = "vIPR ATM Service Instance successfully created."
-//			String serviceInstanceId = execution.getVariable("CREVAS_serviceInstanceId")
-//
-//			//TODO - verify the format for Service Instance Create,
-//			String dbRequest =
-//					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-//						<soapenv:Header/>
-//						<soapenv:Body>
-//							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
-//								<requestId>${requestId}</requestId>
-//								<lastModifiedBy>BPMN</lastModifiedBy>
-//								<statusMessage>${statusMessage}</statusMessage>
-//								<responseBody></responseBody>
-//								<requestStatus>COMPLETED</requestStatus>
-//								<progress>100</progress>
-//								<vnfOutputs/>
-//								<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
-//							</ns:updateInfraRequest>
-//						   </soapenv:Body>
-//					   </soapenv:Envelope>"""
-//
-//		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
-//		   execution.setVariable("CREVAS_createDBRequest", buildDeleteDBRequestAsString)
-//		   utils.logAudit(buildDeleteDBRequestAsString)
-//
-//		   utils.log("DEBUG", " ***** Completed prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-//		} catch (Exception ex) {
-//			// try error in method block
-//			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()
-//			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-//
-//		}
-//
-//	 }
-
-
-	// *****************************************
-	//     Prepare Completion request Section
-	// *****************************************
-	public void postProcessResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		utils.log("DEBUG", " ***** Inside postProcessResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-
-		try {
-			String source = execution.getVariable("source")
-			String requestId = execution.getVariable("mso-request-id")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			String msoCompletionRequest =
-					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-									xmlns:ns="http://org.openecomp/mso/request/types/v1">
-							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-								<request-id>${requestId}</request-id>
-								<action>CREATE</action>
-								<source>${source}</source>
-							</request-info>
-							<status-message>Service Instance has been created successfully via macro orchestration</status-message>
-							<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
-							<mso-bpel-name>BPMN macro create</mso-bpel-name>
-						</aetgt:MsoCompletionRequest>"""
-
-			// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			utils.logAudit(xmlMsoCompletionRequest)
-			execution.setVariable("CREVAS_Success", true)
-			execution.setVariable("CREVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void preProcessRollback (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		try {
-			
-			Object workflowException = execution.getVariable("WorkflowException");
-
-			if (workflowException instanceof WorkflowException) {
-				utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)
-				execution.setVariable("prevWorkflowException", workflowException);
-				//execution.setVariable("WorkflowException", null);
-			}
-		} catch (BpmnError e) {
-			utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)
-		} catch(Exception ex) {
-			String msg = "Exception in preProcessRollback. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-		}
-		utils.log("DEBUG"," *** Exit preProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)
-	}
-
-	public void postProcessRollback (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
-		String msg = ""
-		try {
-			Object workflowException = execution.getVariable("prevWorkflowException");
-			if (workflowException instanceof WorkflowException) {
-				utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)
-				execution.setVariable("WorkflowException", workflowException);
-			}
-		} catch (BpmnError b) {
-			utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)
-			throw b;
-		} catch(Exception ex) {
-			msg = "Exception in postProcessRollback. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-		}
-		utils.log("DEBUG"," *** Exit postProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)
-	}
-
-	public void prepareFalloutRequest(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		utils.log("DEBUG", " *** STARTED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process *** ", isDebugEnabled)
-
-		try {
-			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
-			String requestInfo = execution.getVariable("CREVAS_requestInfo")
-			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)
-			
-			//TODO. hmmm. there is no way to UPDATE error message.
-//			String errorMessage = wfex.getErrorMessage()
-//			boolean successIndicator = execution.getVariable("DCRESI_rollbackSuccessful")
-//			if (successIndicator){
-//				errorMessage = errorMessage + ". Rollback successful."
-//			} else {
-//				errorMessage = errorMessage + ". Rollback not completed."
-//			}
-			
-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
-
-			execution.setVariable("CREVAS_falloutRequest", falloutRequest)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Error Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process")
-		}
-		utils.log("DEBUG", "*** COMPLETED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process ***", isDebugEnabled)
-	}
-
-
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside sendSyncError() of CreateServiceInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			String errorMessage = ""
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				WorkflowException wfe = execution.getVariable("WorkflowException")
-				errorMessage = wfe.getErrorMessage()
-			} else {
-				errorMessage = "Sending Sync Error."
-			}
-
-			String buildworkflowException =
-				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-				   </aetgt:WorkflowException>"""
-
-			utils.logAudit(buildworkflowException)
-			sendWorkflowResponse(execution, 500, buildworkflowException)
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
-		}
-	}
-
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		try{
-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("CRESI_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")
-		}catch(BpmnError b){
-			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)
-			throw b
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("CRESI_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")
-		}
-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
-	}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.json.JSONObject;

+import org.json.JSONArray;

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils;

+

+/**

+ * This groovy class supports the <class>CreateGenericMacroServiceNetworkVnf.bpmn</class> process.

+ *

+ */

+public class CreateGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {

+

+	String Prefix="CREVAS_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils()

+	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()

+

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

+	 * @param execution

+	 */

+	public InitializeProcessVariables(Execution execution){

+		/* Initialize all the process variables in this block */

+

+		execution.setVariable("createGenericMacroServiceNetworkVnfRequest", "")

+		execution.setVariable("globalSubscriberId", "")

+		execution.setVariable("serviceInstanceName", "")

+		execution.setVariable("msoRequestId", "")

+		execution.setVariable("CREVAS_NetworksCreatedCount", 0)

+		execution.setVariable("CREVAS_VnfsCreatedCount", 0)

+		execution.setVariable("productFamilyId", "")

+		

+		

+		//TODO

+		execution.setVariable("sdncVersion", "1702")

+	}

+

+	// **************************************************

+	//     Pre or Prepare Request Section

+	// **************************************************

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

+	 * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)

+

+		try {

+			// initialize flow variables

+			InitializeProcessVariables(execution)

+

+			// check for incoming json message/input

+			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("bpmnRequest")

+			utils.logAudit(createGenericMacroServiceNetworkVnfRequest)

+			execution.setVariable("createGenericMacroServiceNetworkVnfRequest", createGenericMacroServiceNetworkVnfRequest);

+			println 'createGenericMacroServiceNetworkVnfRequest - ' + createGenericMacroServiceNetworkVnfRequest

+

+			// extract requestId

+			String requestId = execution.getVariable("mso-request-id")

+			execution.setVariable("msoRequestId", requestId)

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {

+				serviceInstanceId = UUID.randomUUID().toString()

+				utils.log("DEBUG", " Generated new Service Instance: " + serviceInstanceId , isDebugEnabled)

+			} else {

+				utils.log("DEBUG", "Using provided Service Instance ID: " + serviceInstanceId , isDebugEnabled)

+			}

+

+			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")

+			execution.setVariable("serviceInstanceId", serviceInstanceId)

+			

+			String requestAction = execution.getVariable("requestAction")

+			execution.setVariable("requestAction", requestAction)

+

+			String source = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.source")

+			if ((source == null) || (source.isEmpty())) {

+				execution.setVariable("source", "VID")

+			} else {

+				execution.setVariable("source", source)

+			}

+

+			// extract globalSubscriberId

+			String globalSubscriberId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.subscriberInfo.globalSubscriberId")

+

+			// verify element global-customer-id is sent from JSON input, throw exception if missing

+			if ((globalSubscriberId == null) || (globalSubscriberId.isEmpty())) {

+				String dataErrorMessage = " Element 'globalSubscriberId' is missing. "

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+

+			} else {

+				execution.setVariable("globalSubscriberId", globalSubscriberId)

+				execution.setVariable("globalCustomerId", globalSubscriberId)

+			}

+			

+			// extract subscriptionServiceType

+			String subscriptionServiceType = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters.subscriptionServiceType")

+			execution.setVariable("subscriptionServiceType", subscriptionServiceType)

+			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)

+

+			String suppressRollback = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.suppressRollback")

+			execution.setVariable("disableRollback", suppressRollback)

+			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)

+			

+			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")

+			execution.setVariable("productFamilyId", productFamilyId)

+			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)

+			

+			//For Completion Handler & Fallout Handler

+			String requestInfo =

+			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					<request-id>${requestId}</request-id>

+					<action>CREATE</action>

+					<source>${source}</source>

+				   </request-info>"""

+

+			execution.setVariable("CREVAS_requestInfo", requestInfo)

+			

+			utils.log("DEBUG", " ***** Completed preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)

+

+		} catch (BpmnError e) {

+			throw e;

+

+		} catch (Exception ex){

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method preProcessRequest() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	public void sendSyncResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+		try {

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			String requestId = execution.getVariable("mso-request-id")

+

+			// RESTResponse (for API Handler (APIH) Reply Task)

+			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+

+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

+			sendWorkflowResponse(execution, 202, syncResponse)

+

+		} catch (Exception ex) {

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	// *******************************

+	//     

+	// *******************************

+	public void prepareCreateServiceInstance(Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

+			String serviceModelInfo = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo")

+			execution.setVariable("serviceModelInfo", serviceModelInfo)

+

+			String serviceInputParams = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters")

+			execution.setVariable("serviceInputParams", serviceInputParams)

+			

+			String serviceInstanceName = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.instanceName")

+			execution.setVariable("serviceInstanceName", serviceInstanceName)

+

+			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareCreateService() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	

+	public void postProcessServiceInstanceCreate (Execution execution){

+		def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' +'execution=' + execution.getId() +')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+		

+		String source = execution.getVariable("source")

+		String requestId = execution.getVariable("mso-request-id")

+		String serviceInstanceId = execution.getVariable("serviceInstanceId")

+		String serviceInstanceName = execution.getVariable("serviceInstanceName")

+		

+		try {

+

+			String payload = """

+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">

+			<soapenv:Header/>

+			<soapenv:Body>

+			<req:updateInfraRequest>

+				<requestId>${requestId}</requestId>

+				<lastModifiedBy>BPEL</lastModifiedBy>

+				<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

+				<serviceInstanceName>${serviceInstanceName}</serviceInstanceName>

+			</req:updateInfraRequest>

+			</soapenv:Body>

+			</soapenv:Envelope>

+			"""

+			execution.setVariable("CREVAS_setUpdateDbInstancePayload", payload)

+			utils.logAudit("CREVAS_setUpdateDbInstancePayload: " + payload)

+			logDebug('Exited ' + method, isDebugLogEnabled)

+			//println("CMSO_updateDBStatusToSuccessPayload --> " + execution.getVariable("CMSO_updateDBStatusToSuccessPayload"))

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)

+		}

+	}

+	

+	

+	public void callDBCatalog (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		utils.log("DEBUG", " ***** Inside callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		

+		try {

+			

+			// get variable within incoming json

+			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest");

+			

+			String catalog_db_endpoint = execution.getVariable("URN_mso_catalog_db_endpoint")

+			utils.log("DEBUG", "catalog_db_endpoint: "+catalog_db_endpoint, isDebugEnabled)

+			

+			String serviceModelInvariantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelInvariantId")

+			String serviceModelVersion = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelVersion")

+			utils.log("DEBUG", "getting network list ", isDebugEnabled)

+			

+			JSONArray networkList = catalogDbUtils.getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)

+

+			//utils.log("DEBUG", "got network list: "+ networkList.toString(), isDebugEnabled)

+			execution.setVariable("networkList", networkList)

+			execution.setVariable("networkListString", networkList.toString())

+			

+			networkList = execution.getVariable("networkList");

+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

+

+			if (networkList != null && networkList.length() > 0) {

+

+				execution.setVariable("CREVAS_NetworksCount", networkList.length())

+				utils.log("DEBUG", "networks to create: "+ networkList.length(), isDebugEnabled)

+			} else {

+				execution.setVariable("CREVAS_NetworksCount", 0)

+				utils.log("DEBUG", "no networks to create based upon Catalog DB response", isDebugEnabled)

+			}	

+			

+			// VNFs

+			JSONArray vnfList = catalogDbUtils.getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)

+			execution.setVariable("vnfList", vnfList)			

+			

+			String vnfModelInfoString = ""

+			if (vnfList != null && vnfList.length() > 0) {

+				execution.setVariable("CREVAS_VNFsCount", vnfList.length())

+				utils.log("DEBUG", "vnfs to create: "+ vnfList.length(), isDebugEnabled)

+				JSONObject vnfModelInfo = vnfList.getJSONObject(0).getJSONObject("modelInfo")

+				vnfModelInfoString = vnfModelInfo.toString()

+			} else {

+					execution.setVariable("CREVAS_VNFsCount", 0)

+					utils.log("DEBUG", "no vnfs to create based upon Catalog DB response", isDebugEnabled)

+			}

+				

+			execution.setVariable("vnfModelInfo", vnfModelInfoString)

+			//utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)

+

+			utils.log("DEBUG", " ***** Completed callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			sendSyncError(execution)

+		   String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. callDBCatalog() - " + ex.getMessage()

+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+	

+	// *******************************

+	//     Generate Network request Section

+	// *******************************

+	public void prepareNetworkCreate (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+//			String disableRollback = execution.getVariable("disableRollback")

+//			def backoutOnFailure = ""

+//			if(disableRollback != null){

+//				if ( disableRollback == true) {

+//					backoutOnFailure = "false"

+//				} else if ( disableRollback == false) {

+//					backoutOnFailure = "true"

+//				}

+//			}

+			//failIfExists - optional

+

+			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

+			

+			JSONArray networkList = execution.getVariable("networkList")

+			utils.log("DEBUG", "array networkList: "+ networkList, isDebugEnabled)

+			

+			if (networkList == null || networkList.length() < 1){

+				networkList = new JSONArray(execution.getVariable("networkListString"))

+				utils.log("DEBUG", "array from string networkList: "+ networkList, isDebugEnabled)

+			}

+			

+			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

+			String networkModelInfoString = ""

+			

+			if (networkList != null) {

+				utils.log("DEBUG", " getting model info for network # :" + networksCreatedCount, isDebugEnabled)

+				JSONObject networkModelInfo = networkList.getJSONObject(networksCreatedCount.intValue()).getJSONObject("modelInfo")

+				networkModelInfoString = networkModelInfo.toString()

+			} else {

+				String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected number of networks to create - " + ex.getMessage()

+				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+			}

+			

+			execution.setVariable("networkModelInfo", networkModelInfoString)

+			utils.log("DEBUG", " networkModelInfoString :" + networkModelInfoString, isDebugEnabled)

+			

+//			String networkModelInfo = execution.getVariable("networkModelInfo")

+			// extract cloud configuration

+			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

+			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")

+			execution.setVariable("tenantId", tenantId)

+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

+			

+			String sdncVersion = execution.getVariable("sdncVersion")

+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

+			

+			JSONArray vnfList = execution.getVariable("vnfList")

+			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)

+			

+			String vnfModelInfo = execution.getVariable("vnfModelInfo")

+			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)

+			

+			networkList = execution.getVariable("networkList")

+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

+			

+			utils.log("DEBUG", " ***** Completed preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareNetworkCreate() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Validate Network request Section -> increment count

+	// *******************************

+	public void validateNetworkCreate (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

+			networksCreatedCount++

+			

+			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)

+			

+			execution.setVariable("DCRENI_rollbackData"+networksCreatedCount, execution.getVariable("DCRENI_rollbackData"))

+

+			utils.log("DEBUG", "networksCreatedCount: "+ networksCreatedCount, isDebugEnabled)

+			utils.log("DEBUG", "DCRENI_rollbackData N : "+ execution.getVariable("DCRENI_rollbackData"+networksCreatedCount), isDebugEnabled)

+			

+			JSONArray vnfList = execution.getVariable("vnfList")

+			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)

+			

+			String vnfModelInfo = execution.getVariable("vnfModelInfo")

+			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)

+			

+			JSONArray networkList = execution.getVariable("networkList")

+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

+			

+			utils.log("DEBUG", " ***** Completed validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkCreate() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Generate Network request Section

+	// *******************************

+	public void prepareVnfAndModulesCreate (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+			//			String disableRollback = execution.getVariable("disableRollback")

+			//			def backoutOnFailure = ""

+			//			if(disableRollback != null){

+			//				if ( disableRollback == true) {

+			//					backoutOnFailure = "false"

+			//				} else if ( disableRollback == false) {

+			//					backoutOnFailure = "true"

+			//				}

+			//			}

+						//failIfExists - optional

+

+			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

+			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")

+			execution.setVariable("productFamilyId", productFamilyId)

+			utils.log("DEBUG","productFamilyId: "+ productFamilyId, isDebugEnabled)

+

+			JSONArray vnfList = execution.getVariable("vnfList")

+

+			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")

+			String vnfModelInfoString = null;

+			

+			if (vnfList != null && vnfList.length() > 0 ) {

+				utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)

+				JSONObject vnfModelInfo1 = vnfList.getJSONObject(0).getJSONObject("modelInfo")

+				utils.log("DEBUG", "got 0 ", isDebugEnabled)

+				JSONObject vnfModelInfo = vnfList.getJSONObject(vnfsCreatedCount.intValue()).getJSONObject("modelInfo")

+				vnfModelInfoString = vnfModelInfo.toString()

+			} else {

+				//TODO: vnfList does not contain data. Need to investigate why ... . Fro VIPR use model stored

+				vnfModelInfoString = execution.getVariable("vnfModelInfo")

+			}

+							

+			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)

+			

+			// extract cloud configuration

+			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

+			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")

+			execution.setVariable("tenantId", tenantId)

+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

+						

+			String sdncVersion = execution.getVariable("sdncVersion")

+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

+

+			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+

+	// *******************************

+	//     Validate Vnf request Section -> increment count

+	// *******************************

+	public void validateVnfCreate (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")

+			vnfsCreatedCount++

+			

+			execution.setVariable("CREVAS_VnfsCreatedCount", vnfsCreatedCount)

+			

+			utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** "+" vnf # "+vnfsCreatedCount, isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Validate Network request Section -> decrement count

+	// *******************************

+	public void validateNetworkRollback (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

+			networksCreatedCount--

+			

+			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)

+			

+			execution.setVariable("DCRENI_rollbackData", execution.getVariable("DCRENI_rollbackData"+networksCreatedCount))

+			

+			utils.log("DEBUG", " ***** Completed validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkRollback() - " + ex.getMessage()

+			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			execution.setVariable("CREVAS_NetworksCreatedCount", 0)

+			utils.log("ERROR", exceptionMessage, true)

+		}

+	 }

+	// *******************************

+	//     Build DB request Section

+	// *******************************

+//	public void prepareDBRequest (Execution execution) {

+//		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+//

+//		try {

+//			utils.log("DEBUG", " ***** Inside prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+//

+//			String requestId = execution.getVariable("CREVAS_requestId")

+//			String statusMessage = "vIPR ATM Service Instance successfully created."

+//			String serviceInstanceId = execution.getVariable("CREVAS_serviceInstanceId")

+//

+//			//TODO - verify the format for Service Instance Create,

+//			String dbRequest =

+//					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

+//						<soapenv:Header/>

+//						<soapenv:Body>

+//							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+//								<requestId>${requestId}</requestId>

+//								<lastModifiedBy>BPMN</lastModifiedBy>

+//								<statusMessage>${statusMessage}</statusMessage>

+//								<responseBody></responseBody>

+//								<requestStatus>COMPLETED</requestStatus>

+//								<progress>100</progress>

+//								<vnfOutputs/>

+//								<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

+//							</ns:updateInfraRequest>

+//						   </soapenv:Body>

+//					   </soapenv:Envelope>"""

+//

+//		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

+//		   execution.setVariable("CREVAS_createDBRequest", buildDeleteDBRequestAsString)

+//		   utils.logAudit(buildDeleteDBRequestAsString)

+//

+//		   utils.log("DEBUG", " ***** Completed prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+//		} catch (Exception ex) {

+//			// try error in method block

+//			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()

+//			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+//

+//		}

+//

+//	 }

+

+

+	// *****************************************

+	//     Prepare Completion request Section

+	// *****************************************

+	public void postProcessResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		utils.log("DEBUG", " ***** Inside postProcessResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+

+		try {

+			String source = execution.getVariable("source")

+			String requestId = execution.getVariable("mso-request-id")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+			String msoCompletionRequest =

+					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+									xmlns:ns="http://org.openecomp/mso/request/types/v1">

+							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+								<request-id>${requestId}</request-id>

+								<action>CREATE</action>

+								<source>${source}</source>

+							</request-info>

+							<status-message>Service Instance has been created successfully via macro orchestration</status-message>

+							<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

+							<mso-bpel-name>BPMN macro create</mso-bpel-name>

+						</aetgt:MsoCompletionRequest>"""

+

+			// Format Response

+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+			utils.logAudit(xmlMsoCompletionRequest)

+			execution.setVariable("CREVAS_Success", true)

+			execution.setVariable("CREVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)

+			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in CreateServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	public void preProcessRollback (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** preProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		try {

+			

+			Object workflowException = execution.getVariable("WorkflowException");

+

+			if (workflowException instanceof WorkflowException) {

+				utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)

+				execution.setVariable("prevWorkflowException", workflowException);

+				//execution.setVariable("WorkflowException", null);

+			}

+		} catch (BpmnError e) {

+			utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)

+		} catch(Exception ex) {

+			String msg = "Exception in preProcessRollback. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+		}

+		utils.log("DEBUG"," *** Exit preProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)

+	}

+

+	public void postProcessRollback (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** postProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

+		String msg = ""

+		try {

+			Object workflowException = execution.getVariable("prevWorkflowException");

+			if (workflowException instanceof WorkflowException) {

+				utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)

+				execution.setVariable("WorkflowException", workflowException);

+			}

+		} catch (BpmnError b) {

+			utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)

+			throw b;

+		} catch(Exception ex) {

+			msg = "Exception in postProcessRollback. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+		}

+		utils.log("DEBUG"," *** Exit postProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)

+	}

+

+	public void prepareFalloutRequest(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		utils.log("DEBUG", " *** STARTED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process *** ", isDebugEnabled)

+

+		try {

+			WorkflowException wfex = execution.getVariable("WorkflowException")

+			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)

+			String requestInfo = execution.getVariable("CREVAS_requestInfo")

+			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)

+			

+			//TODO. hmmm. there is no way to UPDATE error message.

+//			String errorMessage = wfex.getErrorMessage()

+//			boolean successIndicator = execution.getVariable("DCRESI_rollbackSuccessful")

+//			if (successIndicator){

+//				errorMessage = errorMessage + ". Rollback successful."

+//			} else {

+//				errorMessage = errorMessage + ". Rollback not completed."

+//			}

+			

+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

+

+			execution.setVariable("CREVAS_falloutRequest", falloutRequest)

+

+		} catch (Exception ex) {

+			utils.log("DEBUG", "Error Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process")

+		}

+		utils.log("DEBUG", "*** COMPLETED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process ***", isDebugEnabled)

+	}

+

+

+	public void sendSyncError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		utils.log("DEBUG", " ***** Inside sendSyncError() of CreateServiceInstanceInfra ***** ", isDebugEnabled)

+

+		try {

+			String errorMessage = ""

+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

+				WorkflowException wfe = execution.getVariable("WorkflowException")

+				errorMessage = wfe.getErrorMessage()

+			} else {

+				errorMessage = "Sending Sync Error."

+			}

+

+			String buildworkflowException =

+				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+				   </aetgt:WorkflowException>"""

+

+			utils.logAudit(buildworkflowException)

+			sendWorkflowResponse(execution, 500, buildworkflowException)

+		} catch (Exception ex) {

+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

+		}

+	}

+

+	public void processJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		try{

+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

+			execution.setVariable("CRESI_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")

+		}catch(BpmnError b){

+			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

+			execution.setVariable("CRESI_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")

+		}

+		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)

+	}

 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
index b9b97c7..11de8d9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateNetworkInstance.groovy
@@ -1,32 +1,32 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

  */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

 
 import groovy.xml.XmlUtil
 import groovy.json.*
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.rest.APIResponse

 
 import java.util.UUID;
 
@@ -105,12 +105,12 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
 			}	
 			
-			// get/set 'msoRequestId' and 'mso-request-id'
+			// get/set 'msoRequestId' and 'mso-request-id'

 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
+				execution.setVariable("mso-request-id", requestId)

 			} else {
-				requestId = execution.getVariable("mso-request-id")
+				requestId = execution.getVariable("mso-request-id")

 			}
 			execution.setVariable(Prefix + "requestId", requestId)
 			
@@ -161,7 +161,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 		utils.log("DEBUG", " ***** Inside sendSyncResponse() of CreateNetworkInstance ***** ", isDebugEnabled)
 
 		try {
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			String createNetworkRestRequest = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
@@ -214,7 +214,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 		
 		try {
 
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 
 			// REST Error (for API Handler (APIH) Reply Task)
 			String syncError = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
@@ -248,7 +248,7 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
 						<soapenv:Header/>
 						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

 								<requestId>${requestId}</requestId>
 								<lastModifiedBy>BPMN</lastModifiedBy>
 								<statusMessage>${statusMessage}</statusMessage>
@@ -280,13 +280,13 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 
 		try {
 
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 			String source = execution.getVariable(Prefix + "source")
 
 			String msoCompletionRequest =
-				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-								xmlns:ns="http://org.openecomp/mso/request/types/v1">
-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+								xmlns:ns="http://org.openecomp/mso/request/types/v1">

+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 							<request-id>${requestId}</request-id>
 							<action>CREATE</action>
 							<source>VID</source>
@@ -382,22 +382,22 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
 
 		String falloutHandlerRequest = ""
-		String requestId = execution.getVariable("mso-request-id")
+		String requestId = execution.getVariable("mso-request-id")

 
 		try {
 			WorkflowException wfe = execution.getVariable("WorkflowException")
 			String errorCode = String.valueOf(wfe.getErrorCode())
 			String errorMessage = wfe.getErrorMessage()
 			falloutHandlerRequest =
-				"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+				"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 					      <request-id>${requestId}</request-id>
 					      <action>CREATE</action>
 					      <source>VID</source>
 					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

 							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
 							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
 						</aetgt:WorkflowException>
@@ -411,15 +411,15 @@ public class CreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String errorException = "  Bpmn error encountered in CreateNetworkInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
 			utils.log("DEBUG", errorException, isDebugEnabled)
 			falloutHandlerRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 					      <request-id>${requestId}</request-id>
 					      <action>CREATE</action>
 					      <source>VID</source>
 					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

 							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
 							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
 						</aetgt:WorkflowException>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy
index 202829d..2205ffd 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy
@@ -1,262 +1,262 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import static org.apache.commons.lang3.StringUtils.*;
-import groovy.xml.XmlUtil
-import groovy.json.*
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.rest.APIResponse
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-/**
- * This groovy class supports the <class>CreateServiceInstance.bpmn</class> process.
- * AlaCarte flow for 1702 ServiceInstance Create
- *
- */
-public class CreateServiceInstance extends AbstractServiceTaskProcessor {
-	String Prefix="CRESI_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils()
-
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		String msg = ""
-		utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
-
-		try {
-
-			String siRequest = execution.getVariable("bpmnRequest")
-			utils.logAudit(siRequest)
-
-			String requestId = execution.getVariable("mso-request-id")
-			execution.setVariable("msoRequestId", requestId)
-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			if (isBlank(serviceInstanceId)) {
-				serviceInstanceId = UUID.randomUUID().toString()
-			}
-			utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)
-			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
-			execution.setVariable("serviceInstanceId", serviceInstanceId)
-
-			//subscriberInfo
-			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
-			if (isBlank(globalSubscriberId)) {
-				msg = "Input globalSubscriberId' is null"
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("globalSubscriberId", globalSubscriberId)
-			}
-
-			//requestInfo
-			execution.setVariable("source", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source"))
-			execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.instanceName"))
-			execution.setVariable("disableRollback", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.suppressRollback"))
-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
-			if (isBlank(productFamilyId))
-			{
-				msg = "Input productFamilyId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("productFamilyId", productFamilyId)
-			}
-
-			//modelInfo
-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
-			if (isBlank(serviceModelInfo)) {
-				msg = "Input serviceModelInfo is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else
-			{
-				execution.setVariable("serviceModelInfo", serviceModelInfo)
-			}
-
-			utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
-
-			//requestParameters
-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			if (isBlank(subscriptionServiceType)) {
-				msg = "Input subscriptionServiceType is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			}
-
-			//TODO
-			//execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))
-			//execution.setVariable("failExists", true)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
-	}
-
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("msoRequestId")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			// RESTResponse for API Handler (APIH) Reply Task
-			String createServiceRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-			utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)
-			sendWorkflowResponse(execution, 202, createServiceRestRequest)
-			execution.setVariable("sentSyncResponse", true)
-
-		} catch (Exception ex) {
-			String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
-	}
-
-
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
-
-		try {
-			String errorMessage = ""
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				WorkflowException wfe = execution.getVariable("WorkflowException")
-				errorMessage = wfe.getErrorMessage()
-			} else {
-				errorMessage = "Sending Sync Error."
-			}
-
-			String buildworkflowException =
-					"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-				   </aetgt:WorkflowException>"""
-
-			utils.logAudit(buildworkflowException)
-			sendWorkflowResponse(execution, 500, buildworkflowException)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
-		}
-
-	}
-
-	public void prepareCompletionRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("msoRequestId")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			String source = execution.getVariable("source")
-			
-			String msoCompletionRequest =
-					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-								xmlns:ns="http://org.openecomp/mso/request/types/v1">
-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-							<request-id>${requestId}</request-id>
-							<action>CREATE</action>
-							<source>${source}</source>
-			   			</request-info>
-						<status-message>Service Instance was created successfully.</status-message>
-						<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
-			   			<mso-bpel-name>CreateServiceInstance</mso-bpel-name>
-					</aetgt:MsoCompletionRequest>"""
-
-			// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-
-		} catch (Exception ex) {
-			String msg = " Exception in prepareCompletion:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
-	}
-
-	public void prepareFalloutRequest(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
-
-		try {
-			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
-			String requestId = execution.getVariable("msoRequestId")
-			String source = execution.getVariable("source")
-			String requestInfo =
-					"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>
-					<action>CREATE</action>
-					<source>${source}</source>
-				   </request-info>"""
-
-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
-			execution.setVariable("falloutRequest", falloutRequest)
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
-			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
-			String requestId = execution.getVariable("msoRequestId")
-			String falloutRequest =
-					"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					      <request-id>${requestId}</request-id>
-					      <action>CREATE</action>
-					      <source>VID</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-
-			execution.setVariable("falloutRequest", falloutRequest)
-		}
-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
-	}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import static org.apache.commons.lang3.StringUtils.*;

+import groovy.xml.XmlUtil

+import groovy.json.*

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.rest.APIResponse

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils

+

+/**

+ * This groovy class supports the <class>CreateServiceInstance.bpmn</class> process.

+ * AlaCarte flow for 1702 ServiceInstance Create

+ *

+ */

+public class CreateServiceInstance extends AbstractServiceTaskProcessor {

+	String Prefix="CRESI_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils()

+

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		String msg = ""

+		utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)

+

+		try {

+

+			String siRequest = execution.getVariable("bpmnRequest")

+			utils.logAudit(siRequest)

+

+			String requestId = execution.getVariable("mso-request-id")

+			execution.setVariable("msoRequestId", requestId)

+			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			if (isBlank(serviceInstanceId)) {

+				serviceInstanceId = UUID.randomUUID().toString()

+			}

+			utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)

+			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")

+			execution.setVariable("serviceInstanceId", serviceInstanceId)

+

+			//subscriberInfo

+			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")

+			if (isBlank(globalSubscriberId)) {

+				msg = "Input globalSubscriberId' is null"

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else {

+				execution.setVariable("globalSubscriberId", globalSubscriberId)

+			}

+

+			//requestInfo

+			execution.setVariable("source", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source"))

+			execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.instanceName"))

+			execution.setVariable("disableRollback", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.suppressRollback"))

+			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")

+			if (isBlank(productFamilyId))

+			{

+				msg = "Input productFamilyId is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else {

+				execution.setVariable("productFamilyId", productFamilyId)

+			}

+

+			//modelInfo

+			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")

+			if (isBlank(serviceModelInfo)) {

+				msg = "Input serviceModelInfo is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else

+			{

+				execution.setVariable("serviceModelInfo", serviceModelInfo)

+			}

+

+			utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)

+

+			//requestParameters

+			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")

+			if (isBlank(subscriptionServiceType)) {

+				msg = "Input subscriptionServiceType is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else {

+				execution.setVariable("subscriptionServiceType", subscriptionServiceType)

+			}

+

+			//TODO

+			//execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))

+			//execution.setVariable("failExists", true)

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			msg = "Exception in preProcessRequest " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

+	}

+

+	public void sendSyncResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("msoRequestId")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			// RESTResponse for API Handler (APIH) Reply Task

+			String createServiceRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+			utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)

+			sendWorkflowResponse(execution, 202, createServiceRestRequest)

+			execution.setVariable("sentSyncResponse", true)

+

+		} catch (Exception ex) {

+			String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)

+	}

+

+

+	public void sendSyncError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)

+

+		try {

+			String errorMessage = ""

+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

+				WorkflowException wfe = execution.getVariable("WorkflowException")

+				errorMessage = wfe.getErrorMessage()

+			} else {

+				errorMessage = "Sending Sync Error."

+			}

+

+			String buildworkflowException =

+					"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+				   </aetgt:WorkflowException>"""

+

+			utils.logAudit(buildworkflowException)

+			sendWorkflowResponse(execution, 500, buildworkflowException)

+

+		} catch (Exception ex) {

+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

+		}

+

+	}

+

+	public void prepareCompletionRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("msoRequestId")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			String source = execution.getVariable("source")

+			

+			String msoCompletionRequest =

+					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+								xmlns:ns="http://org.openecomp/mso/request/types/v1">

+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+							<request-id>${requestId}</request-id>

+							<action>CREATE</action>

+							<source>${source}</source>

+			   			</request-info>

+						<status-message>Service Instance was created successfully.</status-message>

+						<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

+			   			<mso-bpel-name>CreateServiceInstance</mso-bpel-name>

+					</aetgt:MsoCompletionRequest>"""

+

+			// Format Response

+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+			execution.setVariable("completionRequest", xmlMsoCompletionRequest)

+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+

+		} catch (Exception ex) {

+			String msg = " Exception in prepareCompletion:" + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)

+	}

+

+	public void prepareFalloutRequest(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)

+

+		try {

+			WorkflowException wfex = execution.getVariable("WorkflowException")

+			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)

+			String requestId = execution.getVariable("msoRequestId")

+			String source = execution.getVariable("source")

+			String requestInfo =

+					"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					<request-id>${requestId}</request-id>

+					<action>CREATE</action>

+					<source>${source}</source>

+				   </request-info>"""

+

+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

+			execution.setVariable("falloutRequest", falloutRequest)

+		} catch (Exception ex) {

+			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)

+			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()

+			String requestId = execution.getVariable("msoRequestId")

+			String falloutRequest =

+					"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					      <request-id>${requestId}</request-id>

+					      <action>CREATE</action>

+					      <source>VID</source>

+					   </request-info>

+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>

+							<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+						</aetgt:WorkflowException>

+					</aetgt:FalloutHandlerRequest>"""

+

+			execution.setVariable("falloutRequest", falloutRequest)

+		}

+		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)

+	}

 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
index 7f5bd61..573deb4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
@@ -1,39 +1,41 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

 
 import groovy.json.JsonSlurper
 
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.apache.commons.lang3.*
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.RollbackData
-import org.openecomp.mso.bpmn.core.WorkflowException
-
-public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;

+import org.openecomp.mso.bpmn.common.scripts.VidUtils;

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+
+public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {

+	
+	ExceptionUtil exceptionUtil = new ExceptionUtil()

 	
 	/**
 	 * Validates the request message and sets up the workflow.
@@ -51,68 +53,68 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		execution.setVariable('prefix', prefix)
 		logDebug('Entered 2' + method, isDebugLogEnabled)
 		execution.setVariable("isVidRequest", "false")
-		
-		logDebug("Set variables", isDebugLogEnabled)	
-		
+
+		logDebug("Set variables", isDebugLogEnabled)
+
 		def rollbackData = execution.getVariable("RollbackData")
 		if (rollbackData == null) {
 			rollbackData = new RollbackData()
 		}
 		execution.setVariable("RollbackData", rollbackData)
-		
+
 		logDebug("Set rollback data", isDebugLogEnabled)
 		def incomingRequest = execution.getVariable('bpmnRequest')
-		
+
 		utils.log("DEBUG", "Incoming Infra Request: " + incomingRequest, isDebugLogEnabled)
 		utils.logAudit("CreateVfModule Infra incoming Request: " + incomingRequest)
-		
+
 		// check if request is xml or json
 		try {
 			def jsonSlurper = new JsonSlurper()
 			Map reqMap = jsonSlurper.parseText(incomingRequest)
 			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)
-			
+
 			def serviceInstanceId = execution.getVariable('serviceInstanceId')
 			def vnfId = execution.getVariable('vnfId')
-			
+
 			def vidUtils = new VidUtils(this)
-			
+
 			String requestInXmlFormat = vidUtils.createXmlVfModuleRequest(execution, reqMap, 'CREATE_VF_MODULE', serviceInstanceId)
-			
+
 			utils.log("DEBUG", " Request in XML format: " + requestInXmlFormat, isDebugLogEnabled)
-			
+
 			execution.setVariable(prefix + 'Request', requestInXmlFormat)
 			execution.setVariable(prefix+'vnfId', vnfId)
-			execution.setVariable("isVidRequest", "true")			
-			
+			execution.setVariable("isVidRequest", "true")
+
 		}
 		catch(groovy.json.JsonException je) {
 			utils.log("DEBUG", " Request is not in JSON format.", isDebugLogEnabled)
-			workflowException(execution, "Invalid request format", 400)
-			
+			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
+
 		}
 		catch(Exception e) {
 			String restFaultMessage = e.getMessage()
 			//execution.setVariable("CVFMODVOL2_RESTFault", restFaultMessage)
 			//execution.setVariable("CVFMODVOL2_isDataOk", false)
 			utils.log("ERROR", " Exception Encountered - " + "\n" + restFaultMessage, isDebugLogEnabled)
-			workflowException(execution, restFaultMessage, 400)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
 		}
 
 		try {
 			String request = validateInfraRequest(execution)
-			
+
 			execution.setVariable("CreateVfModuleInfraSuccessIndicator", false)
 			execution.setVariable("RollbackCompleted", false)
 			execution.setVariable("DoCreateVfModuleRequest", request)
 			execution.setVariable("isDebugLogEnabled", isDebugLogEnabled)
-			execution.setVariable("CVFMI_requestInfo",utils.getNodeXml(request,"request-info"))	
+			execution.setVariable("CVFMI_requestInfo",utils.getNodeXml(request,"request-info"))
 			execution.setVariable("CVFMI_requestId",utils.getNodeText1(request,"request-id"))
 			execution.setVariable("CVFMI_source",utils.getNodeText1(request,"source"))
-			execution.setVariable("CVFMI_serviceInstanceId", utils.getNodeText1(request, "service-instance-id"))		
+			execution.setVariable("CVFMI_serviceInstanceId", utils.getNodeText1(request, "service-instance-id"))
 			execution.setVariable("CVFMI_vnfInputs",utils.getNodeXml(request,"vnf-inputs"))
 			//backoutOnFailure
-			
+
 			NetworkUtils networkUtils = new NetworkUtils()
 			execution.setVariable("CVFMI_rollbackEnabled", networkUtils.isRollbackEnabled(execution,request))
 			execution.setVariable("CVFMI_originalWorkflowException", null)
@@ -121,22 +123,21 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 				vnfParams = utils.getNodeXml(request,"vnf-params")
 			}
 			execution.setVariable("CVFMI_vnfParams", vnfParams)
-			
+
 			def newVfModuleId = UUID.randomUUID().toString()
 			execution.setVariable("newVfModuleId", newVfModuleId)
-			
+
 			logDebug('RequestInfo: ' + execution.getVariable("CVFMI_requestInfo"), isDebugLogEnabled)
 			logDebug('VnfInputs: ' + execution.getVariable("CVFMI_vnfInputs"), isDebugLogEnabled)
 			logDebug('VnfParams: ' + execution.getVariable("CVFMI_vnfParams"), isDebugLogEnabled)
 			logDebug('rollbackEnabled: ' + execution.getVariable("CVFMI_rollbackEnabled"), isDebugLogEnabled)
-			
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError bpmnError) {
-			buildErrorResponse(execution,bpmnError.getMessage(),"400")
 			throw bpmnError
 		} catch (Exception exception) {
-			workflowException(execution, exception.getMessage(), 400)
-		}		 
+			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
+		}
 	}
 
 	/**
@@ -175,45 +176,57 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			def startTime = getNodeTextForce(requestInfo, 'start-time')
 			if (startTime.isEmpty()) {
 				startTime = System.currentTimeMillis()
-			}			
-				
+			}
+
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			def newVfModuleId = execution.getVariable("newVfModuleId")
 			String synchResponse = """{"requestReferences":{"instanceId":"${newVfModuleId}","requestId":"${requestId}"}}""".trim()
-			
+
 			sendWorkflowResponse(execution, 200, synchResponse)
-			
+
 			utils.logAudit("CreateVfModule Infra Response: " + synchResponse)
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
 		}
 	}
 
 	/**
-	 * 
+	 *
 	 * @param execution the execution
 	 */
 	public void postProcessResponse(Execution execution){
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		
+
 		utils.log("DEBUG", " ======== STARTED PostProcessResponse Process ======== ", isDebugEnabled)
 		try{
 			def request = execution.getVariable("DoCreateVfModuleRequest")
 			def requestInfo = utils.getNodeXml(request, 'request-info', false)
 			def action = utils.getNodeText1(requestInfo, "action")
-			
-			utils.log("DEBUG", "requestInfo is: " + requestInfo, isDebugEnabled)			
+
+			utils.log("DEBUG", "requestInfo is: " + requestInfo, isDebugEnabled)
 			utils.log("DEBUG", "action is: " + action, isDebugEnabled)
 
+			try {

+				String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+				utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+				

+				def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+				execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+			} catch (IOException ex) {

+				String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+				utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+			}

+			

 			String payload =
-					"""  <aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-                               xmlns:ns="http://org.openecomp/mso/request/types/v1"
-                               xmlns:ns8="http://org.openecomp/mso/workflow/schema/v1">
-			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					"""  <aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+                               xmlns:ns="http://org.openecomp/mso/request/types/v1"

+                               xmlns:ns8="http://org.openecomp/mso/workflow/schema/v1">

+			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 			${requestInfo}
 			</request-info>
 			<ns8:status-message>Vf Module has been created successfully.</ns8:status-message>
@@ -233,10 +246,10 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		utils.log("DEBUG", "======== COMPLETED PostProcessResponse Process ======== ", isDebugEnabled)
 	}
 
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * Validates the request, request id and service instance id.  If a problem is found,
 	 * a WorkflowException is generated and an MSOWorkflowException event is thrown. This
@@ -255,7 +268,7 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		def prefix = execution.getVariable("prefix")
 
 		if (prefix == null) {
-			createWorkflowException(execution, 1002, processKey + " prefix is null")
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " prefix is null")
 		}
 
 		try {
@@ -263,34 +276,34 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 			if (request == null) {
 				request = execution.getVariable(processKey + 'Request')
-	
+
 				if (request == null) {
 					request = execution.getVariable('bpmnRequest')
 				}
-	
+
 				setVariable(execution, processKey + 'Request', null);
 				setVariable(execution, 'bpmnRequest', null);
 				setVariable(execution, prefix + 'Request', request);
 			}
 
 			if (request == null) {
-				createWorkflowException(execution, 1002, processKey + " request is null")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request is null")
 			}
-			
+
 			/*
 
-			def requestId = execution.getVariable("mso-request-id")
-			
+			def requestId = execution.getVariable("mso-request-id")

+
 			if (requestId == null) {
-				createWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
 			}
-			
+
 			setVariable(execution, prefix + 'requestId', requestId)
 
-			def serviceInstanceId = execution.getVariable("mso-service-instance-id")
+			def serviceInstanceId = execution.getVariable("mso-service-instance-id")

 
 			if (serviceInstanceId == null) {
-				createWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
 			}
 
 			utils.logContext(requestId, serviceInstanceId)
@@ -303,14 +316,13 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, "Invalid Message")
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Invalid Message")
 		}
 	}
-	
+
 	public void prepareUpdateInfraRequest(Execution execution){
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		
+
 		utils.log("DEBUG", " ======== STARTED prepareUpdateInfraRequest Process ======== ", isDebugEnabled)
 		try{
 
@@ -325,34 +337,34 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			def dbAdapterEndpoint = execution.getVariable("URN_mso_adapters_db_endpoint")
 			execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
 			utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
-			
-			try {
-				String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
-				utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)
-				
-				def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
-				execution.setVariable("BasicAuthHeaderValueDB",encodedString)
-			} catch (IOException ex) {
-				String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
-				utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-			
+
+			try {

+				String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+				utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+				

+				def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+				execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+			} catch (IOException ex) {

+				String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+				utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+			}

+			

 			String payload =
 				"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:ns="http://org.openecomp.mso/requestsdb">
+						xmlns:ns="http://org.openecomp.mso/requestsdb">

 						<soapenv:Header/>
 						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

 							<requestId>${requestId}</requestId>
 							<lastModifiedBy>BPMN</lastModifiedBy>
 							<statusMessage>VF Module successfully created</statusMessage>
 							<responseBody></responseBody>
 							<requestStatus>COMPLETE</requestStatus>
 							<progress>100</progress>
-							<vnfOutputs>&lt;vnf-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"&gt;&lt;vnf-id&gt;${vnfId}&lt;/vnf-id&gt;&lt;vf-module-id&gt;${vfModuleId}&lt;/vf-module-id&gt;&lt;/vnf-outputs&gt;</vnfOutputs>
+							<vnfOutputs>&lt;vnf-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"&gt;&lt;vnf-id&gt;${vnfId}&lt;/vnf-id&gt;&lt;vf-module-id&gt;${vfModuleId}&lt;/vf-module-id&gt;&lt;/vnf-outputs&gt;</vnfOutputs>

 							<vfModuleId>${vfModuleId}</vfModuleId>
-						</ns:updateInfraRequest> 
+						</ns:updateInfraRequest>
 					</soapenv:Body>
 				</soapenv:Envelope>"""
 
@@ -360,17 +372,17 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			execution.setVariable("CVFMI_updateInfraRequest", payload)
 			utils.log("DEBUG", "Outgoing UpdateInfraRequest: \n" + payload, isDebugEnabled)
 			utils.logAudit("CreateVfModuleInfra Outgoing UpdateInfra Request: " + payload)
-			
+
 		}catch(Exception e){
 			utils.log("ERROR", "Exception Occured Processing prepareUpdateInfraRequest. Exception is:\n" + e, isDebugEnabled)
 			execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during prepareUpdateInfraRequest Method:\n" + e.getMessage())
 		}
 		utils.log("DEBUG", "======== COMPLETED prepareUpdateInfraRequest Process ======== ", isDebugEnabled)
 	}
-	
+
 	/**
 	 * Builds a "FalloutHandler" request and stores it in the specified execution variable.
-	 * 
+	 *
 	 * @param execution the execution
 	 * @param resultVar the execution variable in which the result will be stored
 	 */
@@ -381,8 +393,8 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
-		
+
+
 		try {
 			def WorkflowException workflowException = execution.getVariable("WorkflowException")
 			def request = execution.getVariable("DoCreateVfModuleRequest")
@@ -395,18 +407,18 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			}
 
 			String content = """
-				<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
-						${requestInformation}										
+				<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

+						${requestInformation}
 					<aetgt:WorkflowException>
 						<aetgt:ErrorMessage>${encErrorResponseMsg}</aetgt:ErrorMessage>
 						<aetgt:ErrorCode>${errorResponseCode}</aetgt:ErrorCode>
-					</aetgt:WorkflowException>	
+					</aetgt:WorkflowException>
 				</aetgt:FalloutHandlerRequest>
 			"""
-			
+
 			logDebug("CONTENT before translation: " + content, isDebugLogEnabled)
 			content = utils.formatXml(content)
 			logDebug(resultVar + ' = ' + System.lineSeparator() + content, isDebugLogEnabled)
@@ -418,34 +430,34 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
-	
+
 	public void logAndSaveOriginalException(Execution execution) {
 		def method = getClass().getSimpleName() + '.validateRollbackResponse(' +
 			'execution=' + execution.getId() +
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		logWorkflowException(execution, 'CreateVfModuleInfra caught an event')
 		saveWorkflowException(execution, 'CVFMI_originalWorkflowException')
 	}
-	
+
 	public void validateRollbackResponse(Execution execution) {
 		def method = getClass().getSimpleName() + '.validateRollbackResponse(' +
 			'execution=' + execution.getId() +
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		def originalException = execution.getVariable("CVFMI_originalWorkflowException")
 		execution.setVariable("WorkflowException", originalException)
-		
+
 		execution.setVariable("RollbackCompleted", true)
-	
+
 	}
-	
-		
+
+
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
index 385e9e9..289e185 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
@@ -1,304 +1,304 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse
-
-import groovy.json.JsonSlurper
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution;
-import org.apache.commons.lang3.*
-
-class CreateVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {
-
-	public static final String  prefix='CVMVINFRAV1_'
-
-	/**
-	 * Perform initial processing, such as request validation, initialization of variables, etc.
-	 * * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		preProcessRequest(execution, isDebugEnabled)
-	}
-
-
-	/**
-	 * Perform initial processing, such as request validation, initialization of variables, etc.
-	 * @param execution
-	 * @param isDebugEnabled
-	 */
-	public void preProcessRequest (Execution execution, isDebugEnabled) {
-
-		execution.setVariable("prefix",prefix)
-		setSuccessIndicator(execution, false)
-		execution.setVariable(prefix+'syncResponseSent', false)
-
-		String createVolumeIncoming = validateRequest(execution, 'vnfId')
-		utils.logAudit(createVolumeIncoming)
-
-		try {
-			def jsonSlurper = new JsonSlurper()
-			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)
-
-			def serviceInstanceId = execution.getVariable('serviceInstanceId')
-			def vnfId = execution.getVariable('vnfId')
-
-			def vidUtils = new VidUtils(this)
-			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'CREATE_VF_MODULE_VOL', serviceInstanceId)
-
-			execution.setVariable(prefix+'Request', createVolumeIncoming)
-			execution.setVariable(prefix+'vnfId', vnfId)
-			execution.setVariable(prefix+'isVidRequest', true)
-
-			utils.log("DEBUG", "XML request:\n" + createVolumeIncoming, isDebugEnabled)
-
-		}
-		catch(groovy.json.JsonException je) {
-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, 'Request is not a valid JSON document')
-		}
-
-		execution.setVariable(prefix+'source', utils.getNodeText1(createVolumeIncoming, "source"))
-		execution.setVariable(prefix+'volumeGroupName', utils.getNodeText1(createVolumeIncoming, 'volume-group-name'))
-		execution.setVariable(prefix+'volumeOutputs', utils.getNodeXml(createVolumeIncoming, 'volume-outputs', false))
-
-		execution.setVariable(prefix+'serviceType', 'service-instance')
-		execution.setVariable(prefix+'serviceInstanceId', utils.getNodeText1(createVolumeIncoming, "service-instance-id"))
-
-		// Generate volume group id
-		String volumeGroupId = UUID.randomUUID()
-		utils.log("DEBUG", "Generated volume group id: " + volumeGroupId, isDebugEnabled)
-
-		def testGroupId = execution.getVariable('test-volume-group-id')
-		if (testGroupId != null && testGroupId.trim() != '') {
-			volumeGroupId = testGroupId
-		}
-
-		execution.setVariable(prefix+'volumeGroupId', volumeGroupId)
-
-	}
-
-
-	public void sendSyncResponse (Execution execution, isDebugEnabled) {
-		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')
-		def requestId = execution.getVariable("mso-request-id")
-		def serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-		String syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()
-
-		utils.log("DEBUG", "Sync Response: " + "\n" + syncResponse, isDebugEnabled)
-		sendWorkflowResponse(execution, 200, syncResponse)
-
-		execution.setVariable(prefix+'syncResponseSent', true)
-	}
-
-
-	public void sendSyncError (Execution execution, isDebugEnabled) {
-		WorkflowException we = execution.getVariable('WorkflowException')
-		def errorCode = we?.getErrorCode()
-		def errorMessage = we?.getErrorMessage()
-		//default to 400 since only invalid request will trigger this method
-		sendWorkflowResponse(execution, 400, errorMessage)
-	}
-
-
-	/**
-	 * Create a WorkflowException
-	 * @param execution
-	 * @param isDebugEnabled
-	 */
-	public void buildWorkflowException(Execution execution, int errorCode, errorMessage, isDebugEnabled) {
-		utils.log("DEBUG", errorMessage, isDebugEnabled)
-		(new ExceptionUtil()).buildWorkflowException(execution, 2500, errorMessage)
-	}
-
-
-	public void prepareDbInfraSuccessRequest(Execution execution, isDebugEnabled) {
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		def dbVnfOutputs = execution.getVariable(prefix+'volumeOutputs')
-		def requestId = execution.getVariable('mso-request-id')
-		def statusMessage = "VolumeGroup successfully created."
-		def requestStatus = "COMPLETED"
-		def progress = "100"
-
-		try {
-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)
-			
-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
-		} catch (IOException ex) {
-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-		
-		/*
-		from: $gVolumeGroup/aai:volume-group-id/text()
-		to: vnfreq:volume-outputs/vnfreq:volume-group-id
-		*/
-		// for now assume, generated volumeGroupId is accepted
-		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')
-
-		String dbRequest =
-			"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-				<soapenv:Header/>
-				<soapenv:Body>
-					<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
-						<requestId>${requestId}</requestId>
-						<lastModifiedBy>BPMN</lastModifiedBy>
-						<statusMessage>${statusMessage}</statusMessage>
-						<responseBody></responseBody>
-						<requestStatus>${requestStatus}</requestStatus>
-						<progress>${progress}</progress>
-						<vnfOutputs>${dbVnfOutputs}</vnfOutputs>
-						<volumeGroupId>${volumeGroupId}</volumeGroupId>
-					</ns:updateInfraRequest>
-			   	</soapenv:Body>
-			   </soapenv:Envelope>"""
-
-		String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
-		execution.setVariable(prefix+"createDBRequest", buildDeleteDBRequestAsString)
-
-		utils.logAudit(buildDeleteDBRequestAsString)
-	}
-
-
-
-
-
-	public void postProcessResponse (Execution execution, isDebugEnabled) {
-
-		def dbReturnCode = execution.getVariable(prefix+'dbReturnCode')
-		def createDBResponse =  execution.getVariable(prefix+'createDBResponse')
-
-		utils.logAudit('DB return code: ' + dbReturnCode)
-		utils.logAudit('DB response: ' + createDBResponse)
-
-		def requestId = execution.getVariable("mso-request-id")
-		def source = execution.getVariable(prefix+'source')
-
-		String msoCompletionRequest =
-			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-							xmlns:ns="http://org.openecomp/mso/request/types/v1">
-					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-						<request-id>${requestId}</request-id>
-						<action>CREATE</action>
-						<source>${source}</source>
-		   			</request-info>
-					<aetgt:status-message>Volume Group has been created successfully.</aetgt:status-message>
-		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: CREATE</aetgt:mso-bpel-name>
-				</aetgt:MsoCompletionRequest>"""
-
-		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-		utils.logAudit(createDBResponse)
-		utils.logAudit(xmlMsoCompletionRequest)
-		execution.setVariable(prefix+'Success', true)
-		execution.setVariable(prefix+'CompleteMsoProcessRequest', xmlMsoCompletionRequest)
-		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-
-	}
-
-	public void prepareFalloutHandlerRequest(Execution execution, isDebugEnabled) {
-
-		WorkflowException we = execution.getVariable('WorkflowException')
-		def errorCode = we?.getErrorCode()
-		def errorMessage = we?.getErrorMessage()
-
-		def requestId = execution.getVariable("mso-request-id")
-		def source = execution.getVariable(prefix+'source')
-
-		String falloutHandlerRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-				      <request-id>${requestId}</request-id>
-				      <action>CREATE</action>
-				      <source>${source}</source>
-				   </request-info>
-					   <aetgt:WorkflowException>
-					      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-					      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-
-				</aetgt:FalloutHandlerRequest>"""
-
-		// Format Response
-		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)
-		utils.logAudit(xmlHandlerRequest)
-
-		execution.setVariable(prefix+'FalloutHandlerRequest', xmlHandlerRequest)
-		utils.log("ERROR", "Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)
-	}
-
-
-	/**
-	 * Query AAI service instance
-	 * @param execution
-	 * @param isDebugEnabled
-	 */
-	public void callRESTQueryAAIServiceInstance(Execution execution, isDebugEnabled) {
-
-		def request = execution.getVariable(prefix+"Request")
-		def serviceInstanceId = utils.getNodeText1(request, "service-instance-id")
-
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aaiEndpoint = aaiUtil.getSearchNodesQueryEndpoint(execution)
-
-		def String queryAAIRequest = aaiEndpoint + "?search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId
-		utils.logAudit("AAI query service instance request: " + queryAAIRequest)
-
-		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)
-
-		String returnCode = response.getStatusCode()
-		String aaiResponseAsString = response.getResponseBodyAsString()
-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-
-		utils.logAudit("AAI query service instance return code: " + returnCode)
-		utils.logAudit("AAI query service instance response: " + aaiResponseAsString)
-
-		utils.log("DEBUG", "AAI query service instance return code: " + returnCode, isDebugEnabled)
-		utils.log("DEBUG", "AAI query service instance response: " + aaiResponseAsString, isDebugEnabled)
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-
-		if (returnCode=='200') {
-			utils.log("DEBUG", 'Service instance ' + serviceInstanceId + ' found in AAI.', isDebugEnabled)
-		} else {
-			if (returnCode=='404') {
-				def message = 'Service instance ' + serviceInstanceId + ' was not found in AAI. Return code: 404.'
-				utils.log("DEBUG", message, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)
-			} else {
-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		}
-	}
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

+import org.openecomp.mso.bpmn.common.scripts.VidUtils;

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse

+

+import groovy.json.JsonSlurper

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution;

+import org.apache.commons.lang3.*

+

+class CreateVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {

+

+	public static final String  prefix='CVMVINFRAV1_'

+

+	/**

+	 * Perform initial processing, such as request validation, initialization of variables, etc.

+	 * * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		preProcessRequest(execution, isDebugEnabled)

+	}

+

+

+	/**

+	 * Perform initial processing, such as request validation, initialization of variables, etc.

+	 * @param execution

+	 * @param isDebugEnabled

+	 */

+	public void preProcessRequest (Execution execution, isDebugEnabled) {

+

+		execution.setVariable("prefix",prefix)

+		setSuccessIndicator(execution, false)

+		execution.setVariable(prefix+'syncResponseSent', false)

+

+		String createVolumeIncoming = validateRequest(execution, 'vnfId')

+		utils.logAudit(createVolumeIncoming)

+

+		try {

+			def jsonSlurper = new JsonSlurper()

+			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)

+

+			def serviceInstanceId = execution.getVariable('serviceInstanceId')

+			def vnfId = execution.getVariable('vnfId')

+

+			def vidUtils = new VidUtils(this)

+			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'CREATE_VF_MODULE_VOL', serviceInstanceId)

+

+			execution.setVariable(prefix+'Request', createVolumeIncoming)

+			execution.setVariable(prefix+'vnfId', vnfId)

+			execution.setVariable(prefix+'isVidRequest', true)

+

+			utils.log("DEBUG", "XML request:\n" + createVolumeIncoming, isDebugEnabled)

+

+		}

+		catch(groovy.json.JsonException je) {

+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, 'Request is not a valid JSON document')

+		}

+

+		execution.setVariable(prefix+'source', utils.getNodeText1(createVolumeIncoming, "source"))

+		execution.setVariable(prefix+'volumeGroupName', utils.getNodeText1(createVolumeIncoming, 'volume-group-name'))

+		execution.setVariable(prefix+'volumeOutputs', utils.getNodeXml(createVolumeIncoming, 'volume-outputs', false))

+

+		execution.setVariable(prefix+'serviceType', 'service-instance')

+		execution.setVariable(prefix+'serviceInstanceId', utils.getNodeText1(createVolumeIncoming, "service-instance-id"))

+

+		// Generate volume group id

+		String volumeGroupId = UUID.randomUUID()

+		utils.log("DEBUG", "Generated volume group id: " + volumeGroupId, isDebugEnabled)

+

+		def testGroupId = execution.getVariable('test-volume-group-id')

+		if (testGroupId != null && testGroupId.trim() != '') {

+			volumeGroupId = testGroupId

+		}

+

+		execution.setVariable(prefix+'volumeGroupId', volumeGroupId)

+

+	}

+

+

+	public void sendSyncResponse (Execution execution, isDebugEnabled) {

+		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')

+		def requestId = execution.getVariable("mso-request-id")

+		def serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+		String syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()

+

+		utils.log("DEBUG", "Sync Response: " + "\n" + syncResponse, isDebugEnabled)

+		sendWorkflowResponse(execution, 200, syncResponse)

+

+		execution.setVariable(prefix+'syncResponseSent', true)

+	}

+

+

+	public void sendSyncError (Execution execution, isDebugEnabled) {

+		WorkflowException we = execution.getVariable('WorkflowException')

+		def errorCode = we?.getErrorCode()

+		def errorMessage = we?.getErrorMessage()

+		//default to 400 since only invalid request will trigger this method

+		sendWorkflowResponse(execution, 400, errorMessage)

+	}

+

+

+	/**

+	 * Create a WorkflowException

+	 * @param execution

+	 * @param isDebugEnabled

+	 */

+	public void buildWorkflowException(Execution execution, int errorCode, errorMessage, isDebugEnabled) {

+		utils.log("DEBUG", errorMessage, isDebugEnabled)

+		(new ExceptionUtil()).buildWorkflowException(execution, 2500, errorMessage)

+	}

+

+

+	public void prepareDbInfraSuccessRequest(Execution execution, isDebugEnabled) {

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		def dbVnfOutputs = execution.getVariable(prefix+'volumeOutputs')

+		def requestId = execution.getVariable('mso-request-id')

+		def statusMessage = "VolumeGroup successfully created."

+		def requestStatus = "COMPLETED"

+		def progress = "100"

+

+		try {

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		

+		/*

+		from: $gVolumeGroup/aai:volume-group-id/text()

+		to: vnfreq:volume-outputs/vnfreq:volume-group-id

+		*/

+		// for now assume, generated volumeGroupId is accepted

+		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')

+

+		String dbRequest =

+			"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

+				<soapenv:Header/>

+				<soapenv:Body>

+					<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+						<requestId>${requestId}</requestId>

+						<lastModifiedBy>BPMN</lastModifiedBy>

+						<statusMessage>${statusMessage}</statusMessage>

+						<responseBody></responseBody>

+						<requestStatus>${requestStatus}</requestStatus>

+						<progress>${progress}</progress>

+						<vnfOutputs>${dbVnfOutputs}</vnfOutputs>

+						<volumeGroupId>${volumeGroupId}</volumeGroupId>

+					</ns:updateInfraRequest>

+			   	</soapenv:Body>

+			   </soapenv:Envelope>"""

+

+		String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

+		execution.setVariable(prefix+"createDBRequest", buildDeleteDBRequestAsString)

+

+		utils.logAudit(buildDeleteDBRequestAsString)

+	}

+

+

+

+

+

+	public void postProcessResponse (Execution execution, isDebugEnabled) {

+

+		def dbReturnCode = execution.getVariable(prefix+'dbReturnCode')

+		def createDBResponse =  execution.getVariable(prefix+'createDBResponse')

+

+		utils.logAudit('DB return code: ' + dbReturnCode)

+		utils.logAudit('DB response: ' + createDBResponse)

+

+		def requestId = execution.getVariable("mso-request-id")

+		def source = execution.getVariable(prefix+'source')

+

+		String msoCompletionRequest =

+			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+							xmlns:ns="http://org.openecomp/mso/request/types/v1">

+					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+						<request-id>${requestId}</request-id>

+						<action>CREATE</action>

+						<source>${source}</source>

+		   			</request-info>

+					<aetgt:status-message>Volume Group has been created successfully.</aetgt:status-message>

+		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: CREATE</aetgt:mso-bpel-name>

+				</aetgt:MsoCompletionRequest>"""

+

+		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+		utils.logAudit(createDBResponse)

+		utils.logAudit(xmlMsoCompletionRequest)

+		execution.setVariable(prefix+'Success', true)

+		execution.setVariable(prefix+'CompleteMsoProcessRequest', xmlMsoCompletionRequest)

+		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+

+	}

+

+	public void prepareFalloutHandlerRequest(Execution execution, isDebugEnabled) {

+

+		WorkflowException we = execution.getVariable('WorkflowException')

+		def errorCode = we?.getErrorCode()

+		def errorMessage = we?.getErrorMessage()

+

+		def requestId = execution.getVariable("mso-request-id")

+		def source = execution.getVariable(prefix+'source')

+

+		String falloutHandlerRequest =

+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+				      <request-id>${requestId}</request-id>

+				      <action>CREATE</action>

+				      <source>${source}</source>

+				   </request-info>

+					   <aetgt:WorkflowException>

+					      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+					      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>

+						</aetgt:WorkflowException>

+

+				</aetgt:FalloutHandlerRequest>"""

+

+		// Format Response

+		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)

+		utils.logAudit(xmlHandlerRequest)

+

+		execution.setVariable(prefix+'FalloutHandlerRequest', xmlHandlerRequest)

+		utils.log("ERROR", "Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)

+	}

+

+

+	/**

+	 * Query AAI service instance

+	 * @param execution

+	 * @param isDebugEnabled

+	 */

+	public void callRESTQueryAAIServiceInstance(Execution execution, isDebugEnabled) {

+

+		def request = execution.getVariable(prefix+"Request")

+		def serviceInstanceId = utils.getNodeText1(request, "service-instance-id")

+

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aaiEndpoint = aaiUtil.getSearchNodesQueryEndpoint(execution)

+

+		def String queryAAIRequest = aaiEndpoint + "?search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId

+		utils.logAudit("AAI query service instance request: " + queryAAIRequest)

+

+		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)

+

+		String returnCode = response.getStatusCode()

+		String aaiResponseAsString = response.getResponseBodyAsString()

+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+

+		utils.logAudit("AAI query service instance return code: " + returnCode)

+		utils.logAudit("AAI query service instance response: " + aaiResponseAsString)

+

+		utils.log("DEBUG", "AAI query service instance return code: " + returnCode, isDebugEnabled)

+		utils.log("DEBUG", "AAI query service instance response: " + aaiResponseAsString, isDebugEnabled)

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+

+		if (returnCode=='200') {

+			utils.log("DEBUG", 'Service instance ' + serviceInstanceId + ' found in AAI.', isDebugEnabled)

+		} else {

+			if (returnCode=='404') {

+				def message = 'Service instance ' + serviceInstanceId + ' was not found in AAI. Return code: 404.'

+				utils.log("DEBUG", message, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)

+			} else {

+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		}

+	}

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy
index 6e346d2..aad0693 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy
@@ -1,353 +1,353 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-
-import java.util.UUID;
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.json.JSONObject;
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-import org.w3c.dom.NodeList
-import org.xml.sax.InputSource
-import static org.apache.commons.lang3.StringUtils.*;
-
-import org.springframework.web.util.UriUtils;
-
-/**
- * This groovy class supports the <class>DelServiceInstance.bpmn</class> process.
- *
- */
-public class DelServiceInstance extends AbstractServiceTaskProcessor {
-
-	String Prefix="DELSI_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils()
-	
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		String msg = ""
-		
-		utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)
-
-		try {
-			// check for incoming json message/input
-			String siRequest = execution.getVariable("bpmnRequest")
-			utils.logAudit(siRequest)
-			
-
-			String requestId = execution.getVariable("mso-request-id")
-			execution.setVariable("msoRequestId", requestId)
-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
-			
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			if (isBlank(serviceInstanceId)) {
-				msg = "Input serviceInstanceId' is null"
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-		
-			//String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)
-			//execution.setVariable("requestDetails", xmlRequestDetails)
-			
-			//modelInfo
-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
-			if (isBlank(serviceModelInfo)) {
-				msg = "Input serviceModelInfo is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-			} else
-			{
-				execution.setVariable("serviceModelInfo", serviceModelInfo)
-				//utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
-			}
-			
-			//requestInfo
-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
-			if (isBlank(productFamilyId))
-			{
-				msg = "Input productFamilyId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("productFamilyId", productFamilyId)
-			}
-			String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")
-			execution.setVariable("source", source)
-			
-			//subscriberInfo
-			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
-			if (isBlank(globalSubscriberId)) {
-				msg = "Input globalSubscriberId' is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-			} else {
-				execution.setVariable("globalSubscriberId", globalSubscriberId)
-			}
-			
-			//requestParameters
-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			if (isBlank(subscriptionServiceType)) {
-				msg = "Input subscriptionServiceType is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
-	}
-
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("msoRequestId")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String syncResponse = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
-			sendWorkflowResponse(execution, 202, syncResponse)
-
-		} catch (Exception ex) {
-			String msg  = "Exception in sendSyncResponse: " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
-	}
-	
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
-
-		try {
-			String errorMessage = ""
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				WorkflowException wfe = execution.getVariable("WorkflowException")
-				errorMessage = wfe.getErrorMessage()
-			} else {
-				errorMessage = "Sending Sync Error."
-			}
-
-			String buildworkflowException =
-				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-				   </aetgt:WorkflowException>"""
-
-			utils.logAudit(buildworkflowException)
-			sendWorkflowResponse(execution, 500, buildworkflowException)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
-		}
-
-	}
-	
-	public void prepareCompletionRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("msoRequestId")
-			String source = execution.getVariable("source")
-			String msoCompletionRequest =
-			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-								xmlns:ns="http://org.openecomp/mso/request/types/v1">
-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-							<request-id>${requestId}</request-id>
-							<action>DELETE</action>
-							<source>${source}</source>
-			   			</request-info>
-						<aetgt:status-message>Service Instance was deleted successfully.</aetgt:status-message>
-			   			<aetgt:mso-bpel-name>DelServiceInstance</aetgt:mso-bpel-name>
-					</aetgt:MsoCompletionRequest>"""
-
-			// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-
-		} catch (Exception ex) {
-			String msg = " Exception in prepareCompletion:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
-	}
-	
-	public void prepareFalloutRequest(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
-
-		try {
-			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
-			String requestId = execution.getVariable("msoRequestId")
-			String source = execution.getVariable("source")
-			String requestInfo =
-			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>
-					<action>DELETE</action>
-					<source>${source}</source>
-				   </request-info>"""
-
-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
-			execution.setVariable("falloutRequest", falloutRequest)
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
-			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
-			String requestId = execution.getVariable("msoRequestId")
-			String falloutRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					      <request-id>${requestId}</request-id>
-					      <action>DELETE</action>
-					      <source>VID</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-
-			execution.setVariable("falloutRequest", falloutRequest)
-		}
-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
-	}
-	
-
-	// *******************************
-	//     Build DB request Section
-	// *******************************
-	public void prepareDBRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteServiceInstance ***** ", isDebugEnabled)
-
-			String requestId = execution.getVariable("DELSI_requestId")
-			String statusMessage = "Service Instance successfully deleted."
-
-			//TODO - verify the format for Service Instance Delete,
-			String dbRequest =
-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-						<soapenv:Header/>
-						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
-								<requestId>${requestId}</requestId>
-								<lastModifiedBy>BPMN</lastModifiedBy>
-								<statusMessage>${statusMessage}</statusMessage>
-								<responseBody></responseBody>
-								<requestStatus>COMPLETED</requestStatus>
-								<progress>100</progress>
-							</ns:updateInfraRequest>
-						   </soapenv:Body>
-					   </soapenv:Envelope>"""
-
-		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
-		   execution.setVariable("DELSI_createDBRequest", buildDeleteDBRequestAsString)
-		   utils.logAudit(buildDeleteDBRequestAsString)
-
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	 }
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-	public void prepareDBRequestError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteServiceInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("DELSI_requestId")
-			String statusMessage = ""
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				WorkflowException wfe = execution.getVariable("WorkflowException")
-				statusMessage = wfe.getErrorMessage()
-
-			} else {
-				statusMessage = "Encountered Error during DeleteServiceInstanceInfra proccessing. "
-			}
-
-			//TODO - verify the format for Service Instance Create,
-			String dbRequest =
-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-						<soapenv:Header/>
-						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
-								<requestId>${requestId}</requestId>
-								<lastModifiedBy>BPMN</lastModifiedBy>
-								<statusMessage>${statusMessage}</statusMessage>
-								<responseBody></responseBody>
-								<requestStatus>FAILED</requestStatus>
-							</ns:updateInfraRequest>
-						   </soapenv:Body>
-					   </soapenv:Envelope>"""
-
-		   String buildDBRequestAsString = utils.formatXml(dbRequest)
-		   execution.setVariable("DELSI_createDBInfraErrorRequest", buildDBRequestAsString)
-		   utils.logAudit(buildDBRequestAsString)
-
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceInfra flow. Unexpected Error from method prepareDBRequestError() - " + ex.getMessage()
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	 }
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+

+import java.util.UUID;

+import javax.xml.parsers.DocumentBuilder

+import javax.xml.parsers.DocumentBuilderFactory

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.json.JSONObject;

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.w3c.dom.Document

+import org.w3c.dom.Element

+import org.w3c.dom.Node

+import org.w3c.dom.NodeList

+import org.xml.sax.InputSource

+import static org.apache.commons.lang3.StringUtils.*;

+

+import org.springframework.web.util.UriUtils;

+

+/**

+ * This groovy class supports the <class>DelServiceInstance.bpmn</class> process.

+ *

+ */

+public class DelServiceInstance extends AbstractServiceTaskProcessor {

+

+	String Prefix="DELSI_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils()

+	

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		String msg = ""

+		

+		utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)

+

+		try {

+			// check for incoming json message/input

+			String siRequest = execution.getVariable("bpmnRequest")

+			utils.logAudit(siRequest)

+			

+

+			String requestId = execution.getVariable("mso-request-id")

+			execution.setVariable("msoRequestId", requestId)

+			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)

+			

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			if (isBlank(serviceInstanceId)) {

+				msg = "Input serviceInstanceId' is null"

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			}

+		

+			//String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)

+			//execution.setVariable("requestDetails", xmlRequestDetails)

+			

+			//modelInfo

+			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")

+			if (isBlank(serviceModelInfo)) {

+				msg = "Input serviceModelInfo is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+			} else

+			{

+				execution.setVariable("serviceModelInfo", serviceModelInfo)

+				//utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)

+			}

+			

+			//requestInfo

+			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")

+			if (isBlank(productFamilyId))

+			{

+				msg = "Input productFamilyId is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else {

+				execution.setVariable("productFamilyId", productFamilyId)

+			}

+			String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")

+			execution.setVariable("source", source)

+			

+			//subscriberInfo

+			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")

+			if (isBlank(globalSubscriberId)) {

+				msg = "Input globalSubscriberId' is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+			} else {

+				execution.setVariable("globalSubscriberId", globalSubscriberId)

+			}

+			

+			//requestParameters

+			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")

+			if (isBlank(subscriptionServiceType)) {

+				msg = "Input subscriptionServiceType is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			} else {

+				execution.setVariable("subscriptionServiceType", subscriptionServiceType)

+			}

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			msg = "Exception in preProcessRequest " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

+	}

+

+	public void sendSyncResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("msoRequestId")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+			// RESTResponse (for API Handler (APIH) Reply Task)

+			String syncResponse = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

+			sendWorkflowResponse(execution, 202, syncResponse)

+

+		} catch (Exception ex) {

+			String msg  = "Exception in sendSyncResponse: " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)

+	}

+	

+	public void sendSyncError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)

+

+		try {

+			String errorMessage = ""

+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

+				WorkflowException wfe = execution.getVariable("WorkflowException")

+				errorMessage = wfe.getErrorMessage()

+			} else {

+				errorMessage = "Sending Sync Error."

+			}

+

+			String buildworkflowException =

+				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+				   </aetgt:WorkflowException>"""

+

+			utils.logAudit(buildworkflowException)

+			sendWorkflowResponse(execution, 500, buildworkflowException)

+

+		} catch (Exception ex) {

+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

+		}

+

+	}

+	

+	public void prepareCompletionRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("msoRequestId")

+			String source = execution.getVariable("source")

+			String msoCompletionRequest =

+			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+								xmlns:ns="http://org.openecomp/mso/request/types/v1">

+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+							<request-id>${requestId}</request-id>

+							<action>DELETE</action>

+							<source>${source}</source>

+			   			</request-info>

+						<aetgt:status-message>Service Instance was deleted successfully.</aetgt:status-message>

+			   			<aetgt:mso-bpel-name>DelServiceInstance</aetgt:mso-bpel-name>

+					</aetgt:MsoCompletionRequest>"""

+

+			// Format Response

+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+			execution.setVariable("completionRequest", xmlMsoCompletionRequest)

+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+

+		} catch (Exception ex) {

+			String msg = " Exception in prepareCompletion:" + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)

+	}

+	

+	public void prepareFalloutRequest(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)

+

+		try {

+			WorkflowException wfex = execution.getVariable("WorkflowException")

+			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)

+			String requestId = execution.getVariable("msoRequestId")

+			String source = execution.getVariable("source")

+			String requestInfo =

+			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					<request-id>${requestId}</request-id>

+					<action>DELETE</action>

+					<source>${source}</source>

+				   </request-info>"""

+

+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

+			execution.setVariable("falloutRequest", falloutRequest)

+		} catch (Exception ex) {

+			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)

+			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()

+			String requestId = execution.getVariable("msoRequestId")

+			String falloutRequest =

+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					      <request-id>${requestId}</request-id>

+					      <action>DELETE</action>

+					      <source>VID</source>

+					   </request-info>

+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>

+							<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+						</aetgt:WorkflowException>

+					</aetgt:FalloutHandlerRequest>"""

+

+			execution.setVariable("falloutRequest", falloutRequest)

+		}

+		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)

+	}

+	

+

+	// *******************************

+	//     Build DB request Section

+	// *******************************

+	public void prepareDBRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteServiceInstance ***** ", isDebugEnabled)

+

+			String requestId = execution.getVariable("DELSI_requestId")

+			String statusMessage = "Service Instance successfully deleted."

+

+			//TODO - verify the format for Service Instance Delete,

+			String dbRequest =

+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

+						<soapenv:Header/>

+						<soapenv:Body>

+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+								<requestId>${requestId}</requestId>

+								<lastModifiedBy>BPMN</lastModifiedBy>

+								<statusMessage>${statusMessage}</statusMessage>

+								<responseBody></responseBody>

+								<requestStatus>COMPLETED</requestStatus>

+								<progress>100</progress>

+							</ns:updateInfraRequest>

+						   </soapenv:Body>

+					   </soapenv:Envelope>"""

+

+		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

+		   execution.setVariable("DELSI_createDBRequest", buildDeleteDBRequestAsString)

+		   utils.logAudit(buildDeleteDBRequestAsString)

+

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	 }

+

+	// *******************************

+	//     Build Error Section

+	// *******************************

+	public void prepareDBRequestError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteServiceInstanceInfra ***** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("DELSI_requestId")

+			String statusMessage = ""

+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

+				WorkflowException wfe = execution.getVariable("WorkflowException")

+				statusMessage = wfe.getErrorMessage()

+

+			} else {

+				statusMessage = "Encountered Error during DeleteServiceInstanceInfra proccessing. "

+			}

+

+			//TODO - verify the format for Service Instance Create,

+			String dbRequest =

+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

+						<soapenv:Header/>

+						<soapenv:Body>

+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+								<requestId>${requestId}</requestId>

+								<lastModifiedBy>BPMN</lastModifiedBy>

+								<statusMessage>${statusMessage}</statusMessage>

+								<responseBody></responseBody>

+								<requestStatus>FAILED</requestStatus>

+							</ns:updateInfraRequest>

+						   </soapenv:Body>

+					   </soapenv:Envelope>"""

+

+		   String buildDBRequestAsString = utils.formatXml(dbRequest)

+		   execution.setVariable("DELSI_createDBInfraErrorRequest", buildDBRequestAsString)

+		   utils.logAudit(buildDBRequestAsString)

+

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceInfra flow. Unexpected Error from method prepareDBRequestError() - " + ex.getMessage()

+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	 }

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
index f1513c6..e49de0b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
@@ -1,476 +1,468 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.json.JSONObject;
-import org.json.JSONArray;
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils;
-
-/**
- * This groovy class supports the <class>DeleteViprAtmService.bpmn</class> process.
- *
- */
-public class DeleteGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {
-
-	String Prefix="DELVAS_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils()
-	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()
-	NetworkUtils networkUtils = new NetworkUtils()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DeleteViprAtmService.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable("deleteViprAtmServiceRequest", "")
-		execution.setVariable("msoRequestId", "")
-		execution.setVariable("DELVAS_vnfsDeletedCount", 0)
-		execution.setVariable("DELVAS_vnfsCount", 0)
-		execution.setVariable("DELVAS_networksCount", 0)
-		execution.setVariable("DELVAS_networksDeletedCount", 0)
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// check for incoming json message/input
-			String deleteViprAtmServiceRequest = execution.getVariable("bpmnRequest")
-			utils.logAudit(deleteViprAtmServiceRequest)
-			execution.setVariable("deleteViprAtmServiceRequest", deleteViprAtmServiceRequest);
-			println 'deleteViprAtmServiceRequest - ' + deleteViprAtmServiceRequest
-
-			// extract requestId
-			String requestId = execution.getVariable("mso-request-id")
-			execution.setVariable("msoRequestId", requestId)
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {
-				String dataErrorMessage = " Element 'serviceInstanceId' is missing. "
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-			
-			String requestAction = execution.getVariable("requestAction")
-			execution.setVariable("requestAction", requestAction)
-
-			String source = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.source")
-			if ((source == null) || (source.isEmpty())) {
-				execution.setVariable("source", "VID")
-			} else {
-				execution.setVariable("source", source)
-			}
-
-			// extract globalSubscriberId
-			String globalSubscriberId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.subscriberInfo.globalSubscriberId")
-
-			// global-customer-id is optional on Delete
-
-			execution.setVariable("globalSubscriberId", globalSubscriberId)
-			execution.setVariable("globalCustomerId", globalSubscriberId)
-			
-			String suppressRollback = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.suppressRollback")
-			execution.setVariable("disableRollback", suppressRollback)
-			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
-			
-			String productFamilyId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.productFamilyId")
-			execution.setVariable("productFamilyId", productFamilyId)
-			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
-			
-			// extract subscriptionServiceType
-			String subscriptionServiceType = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
-			
-			// extract cloud configuration
-			String lcpCloudRegionId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
-			String tenantId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.tenantId")
-			execution.setVariable("tenantId", tenantId)
-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
-
-			String sdncVersion = "1702"
-			execution.setVariable("sdncVersion", sdncVersion)
-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
-			
-			//For Completion Handler & Fallout Handler
-			String requestInfo =
-			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>
-					<action>DELETE</action>
-					<source>${source}</source>
-				   </request-info>"""
-
-			execution.setVariable("DELVAS_requestInfo", requestInfo)
-			
-			//Setting for Generic Sub Flows
-			execution.setVariable("GENGS_type", "service-instance")
-			
-			utils.log("DEBUG", " ***** Completed preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		utils.log("DEBUG", " ***** Inside sendSyncResponse of DeleteViprAtmService ***** ", isDebugEnabled)
-
-		try {
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			String requestId = execution.getVariable("mso-request-id")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-
-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
-			sendWorkflowResponse(execution, 202, syncResponse)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void prepareServiceInstanceDelete (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " ***** Inside prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)
-		
-		try {
-			
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			
-			// confirm if ServiceInstance was found
-			if ( !execution.getVariable("GENGS_FoundIndicator") )
-			{
-				String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Service Instance was not found in AAI by id: " + serviceInstanceId
-				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-			}
-			
-			// get variable within incoming json
-			String deleteViprAtmServiceRequest = execution.getVariable("deleteViprAtmServiceRequest");
-			
-			// get SI extracted by GenericGetService
-			String serviceInstanceAaiRecord = execution.getVariable("GENGS_service");
-			
-			utils.log("DEBUG", "serviceInstanceAaiRecord: "+serviceInstanceAaiRecord, isDebugEnabled)
-			
-			String relationship = ""
-			try {
-				relationship = networkUtils.getFirstNodeXml(serviceInstanceAaiRecord, "relationship-list")
-			} catch (Exception ex) {
-				//no relationships found
-			}
-			utils.log("DEBUG", " relationship string - " + relationship, isDebugEnabled)
-			
-			int vnfsCount = 0
-			int networksCount = 0
-			
-			if (relationship != null && relationship.length() > 0){
-				relationship = relationship.trim().replace("tag0:","").replace(":tag0","")
-				
-				// Check if Network TableREf is present, then build a List of network policy
-				List relatedVnfIdList = networkUtils.getRelatedVnfIdList(relationship)
-				vnfsCount = relatedVnfIdList.size()
-				execution.setVariable("DELVAS_vnfsCount", vnfsCount)
-				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)
-				execution.setVariable("DELVAS_relatedVnfIdList", relatedVnfIdList)
-				
-				// Check if Network TableREf is present, then build a List of network policy
-				List relatedNetworkIdList = networkUtils.getRelatedNetworkIdList(relationship)
-				networksCount = relatedNetworkIdList.size()
-				execution.setVariable("DELVAS_networksCount", networksCount)
-				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)
-				execution.setVariable("DELVAS_relatedNetworkIdList", relatedNetworkIdList)
-				execution.setVariable("relatedNetworkIdListString", relatedNetworkIdList.toString())
-			} else {
-				execution.setVariable("DELVAS_vnfsCount", 0)
-				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)
-				execution.setVariable("DELVAS_networksCount", 0)
-				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)
-			}
-			
-			utils.log("DEBUG", " ***** Completed prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			sendSyncError(execution)
-		   String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. prepareServiceInstanceDelete() - " + ex.getMessage()
-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-	
-	
-	// *******************************
-	//     
-	// *******************************
-	public void prepareVnfAndModulesDelete (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)
-
-			List vnfList = execution.getVariable("DELVAS_relatedVnfIdList")
-			Integer vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")
-			String vnfModelInfoString = ""
-			String vnfId = ""
-			if (vnfList.size() > 0 ) {
-				vnfId = vnfList.get(vnfsDeletedCount.intValue())
-			}
-							
-			execution.setVariable("vnfId", vnfId)
-			utils.log("DEBUG", "need to delete vnfId:" + vnfId, isDebugEnabled)
-
-			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceMacro flow. Unexpected Error from method prepareVnfAndModulesDelete() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Validate Vnf request Section -> increment count
-	// *******************************
-	public void validateVnfDelete (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateVnfDelete of DeleteViprAtmService ***** ", isDebugEnabled)
-
-			String vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")
-			vnfsDeletedCount++
-			
-			execution.setVariable("DELVAS_vnfsDeletedCount", vnfsDeletedCount)
-			
-			utils.log("DEBUG", " ***** Completed validateVnfDelete of DeleteViprAtmService ***** "+" vnf # "+vnfsDeletedCount, isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateVnfDelete() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Generate Network request Section
-	// *******************************
-	public void prepareNetworkDelete (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)
-
-			List networkList = execution.getVariable("DELVAS_relatedNetworkIdList")
-			utils.log("DEBUG", "array networkList from execution: "+ networkList, isDebugEnabled)
-			
-			if (networkList == null || networkList.size() < 1){
-				networkList = Arrays.asList(execution.getVariable("relatedNetworkIdListString"))
-				utils.log("DEBUG", "array from string networkList: "+ networkList, isDebugEnabled)
-			}
-
-			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")
-
-			String networkId = ""
-			if (networkList.size() > 0) {
-				networkId = (String) networkList.get(networksDeletedCount.intValue())
-			}
-							
-			execution.setVariable("networkId", networkId)
-			utils.log("DEBUG", "need to delete networkId:" + networkId, isDebugEnabled)
-			
-			utils.log("DEBUG", " ***** Completed prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = q"Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method prepareNetworkDelete() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	
-	// *******************************
-	//     Validate Network request Section
-	// *******************************
-	public void validateNetworkDelete (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)
-
-			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")
-			networksDeletedCount++
-			
-			execution.setVariable("DELVAS_networksDeletedCount", networksDeletedCount)
-			
-			utils.log("DEBUG", " ***** Completed validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateNetworkDelete() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	
-	// *****************************************
-	//     Prepare Completion request Section
-	// *****************************************
-	public void postProcessResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " ***** Inside postProcessResponse of DeleteViprAtmService ***** ", isDebugEnabled)
-
-		try {
-			String source = execution.getVariable("source")
-			String requestId = execution.getVariable("msoRequestId")
-
-			String msoCompletionRequest =
-					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-									xmlns:ns="http://org.openecomp/mso/request/types/v1">
-							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-								<request-id>${requestId}</request-id>
-								<action>DELETE</action>
-								<source>${source}</source>
-							   </request-info>
-							<aetgt:status-message>vIPR ATM Service Instance has been deleted successfully.</aetgt:status-message>
-							   <aetgt:mso-bpel-name>BPMN Service Instance macro action: DELETE</aetgt:mso-bpel-name>
-						</aetgt:MsoCompletionRequest>"""
-
-			// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			utils.logAudit(xmlMsoCompletionRequest)
-			execution.setVariable("DELVAS_Success", true)
-			execution.setVariable("DELVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void prepareFalloutRequest(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** STARTED DeleteViprAtmService prepareFalloutRequest Process *** ", isDebugEnabled)
-
-		try {
-			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
-			String requestInfo = execution.getVariable("DELVAS_requestInfo")
-			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)
-
-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
-
-			execution.setVariable("DELVAS_falloutRequest", falloutRequest)
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Error Occured in DeleteViprAtmService prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DeleteViprAtmService prepareFalloutRequest Process")
-		}
-		utils.log("DEBUG", "*** COMPLETED DeleteViprAtmService prepareFalloutRequest Process ***", isDebugEnabled)
-	}
-
-
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " ***** Inside sendSyncError() of DeleteServiceInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			String errorMessage = ""
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				WorkflowException wfe = execution.getVariable("WorkflowException")
-				errorMessage = wfe.getErrorMessage()
-			} else {
-				errorMessage = "Sending Sync Error."
-			}
-
-			String buildworkflowException =
-				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-				   </aetgt:WorkflowException>"""
-
-			utils.logAudit(buildworkflowException)
-			sendWorkflowResponse(execution, 500, buildworkflowException)
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
-		}
-	}
-
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		try{
-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("DELVAS_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")
-		}catch(BpmnError b){
-			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)
-			throw b
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("DELVAS_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")
-		}
-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
-	}
-
-
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.json.JSONObject;

+import org.json.JSONArray;

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils;

+

+/**

+ * This groovy class supports the <class>DeleteViprAtmService.bpmn</class> process.

+ *

+ */

+public class DeleteGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {

+

+	String Prefix="DELVAS_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils()

+	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()

+	NetworkUtils networkUtils = new NetworkUtils()

+

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DeleteViprAtmService.bpmn</class> process.

+	 * @param execution

+	 */

+	public InitializeProcessVariables(Execution execution){

+		/* Initialize all the process variables in this block */

+

+		execution.setVariable("deleteViprAtmServiceRequest", "")

+		execution.setVariable("msoRequestId", "")

+		execution.setVariable("DELVAS_vnfsDeletedCount", 0)

+		execution.setVariable("DELVAS_vnfsCount", 0)

+		execution.setVariable("DELVAS_networksCount", 0)

+		execution.setVariable("DELVAS_networksDeletedCount", 0)

+	}

+

+	// **************************************************

+	//     Pre or Prepare Request Section

+	// **************************************************

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

+	 * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)

+

+		try {

+			// initialize flow variables

+			InitializeProcessVariables(execution)

+

+			// check for incoming json message/input

+			String deleteViprAtmServiceRequest = execution.getVariable("bpmnRequest")

+			utils.logAudit(deleteViprAtmServiceRequest)

+			execution.setVariable("deleteViprAtmServiceRequest", deleteViprAtmServiceRequest);

+			println 'deleteViprAtmServiceRequest - ' + deleteViprAtmServiceRequest

+

+			// extract requestId

+			String requestId = execution.getVariable("mso-request-id")

+			execution.setVariable("msoRequestId", requestId)

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {

+				String dataErrorMessage = " Element 'serviceInstanceId' is missing. "

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+			}

+			

+			String requestAction = execution.getVariable("requestAction")

+			execution.setVariable("requestAction", requestAction)

+

+			String source = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.source")

+			if ((source == null) || (source.isEmpty())) {

+				execution.setVariable("source", "VID")

+			} else {

+				execution.setVariable("source", source)

+			}

+

+			// extract globalSubscriberId

+			String globalSubscriberId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.subscriberInfo.globalSubscriberId")

+

+			// global-customer-id is optional on Delete

+

+			execution.setVariable("globalSubscriberId", globalSubscriberId)

+			execution.setVariable("globalCustomerId", globalSubscriberId)

+			

+			String suppressRollback = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.suppressRollback")

+			execution.setVariable("disableRollback", suppressRollback)

+			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)

+			

+			String productFamilyId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.productFamilyId")

+			execution.setVariable("productFamilyId", productFamilyId)

+			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)

+			

+			// extract subscriptionServiceType

+			String subscriptionServiceType = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")

+			execution.setVariable("subscriptionServiceType", subscriptionServiceType)

+			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)

+			

+			// extract cloud configuration

+			String lcpCloudRegionId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

+			String tenantId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.tenantId")

+			execution.setVariable("tenantId", tenantId)

+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

+

+			String sdncVersion = "1702"

+			execution.setVariable("sdncVersion", sdncVersion)

+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

+			

+			//For Completion Handler & Fallout Handler

+			String requestInfo =

+			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					<request-id>${requestId}</request-id>

+					<action>DELETE</action>

+					<source>${source}</source>

+				   </request-info>"""

+

+			execution.setVariable("DELVAS_requestInfo", requestInfo)

+			

+			//Setting for Generic Sub Flows

+			execution.setVariable("GENGS_type", "service-instance")

+			

+			utils.log("DEBUG", " ***** Completed preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method preProcessRequest() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	public void sendSyncResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		utils.log("DEBUG", " ***** Inside sendSyncResponse of DeleteViprAtmService ***** ", isDebugEnabled)

+

+		try {

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			String requestId = execution.getVariable("mso-request-id")

+

+			// RESTResponse (for API Handler (APIH) Reply Task)

+			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+

+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

+			sendWorkflowResponse(execution, 202, syncResponse)

+		} catch (Exception ex) {

+			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	public void prepareServiceInstanceDelete (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** Inside prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)

+		

+		try {

+			

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			

+			// confirm if ServiceInstance was found

+			if ( !execution.getVariable("GENGS_FoundIndicator") )

+			{

+				String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Service Instance was not found in AAI by id: " + serviceInstanceId

+				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+			}

+			

+			// get variable within incoming json

+			String deleteViprAtmServiceRequest = execution.getVariable("deleteViprAtmServiceRequest");

+			

+			// get SI extracted by GenericGetService

+			String serviceInstanceAaiRecord = execution.getVariable("GENGS_service");

+			

+			utils.log("DEBUG", "serviceInstanceAaiRecord: "+serviceInstanceAaiRecord, isDebugEnabled)

+			

+			String relationship = ""

+			try {

+				relationship = networkUtils.getFirstNodeXml(serviceInstanceAaiRecord, "relationship-list")

+			} catch (Exception ex) {

+				//no relationships found

+			}

+			utils.log("DEBUG", " relationship string - " + relationship, isDebugEnabled)

+			

+			int vnfsCount = 0

+			int networksCount = 0

+			

+			if (relationship != null && relationship.length() > 0){

+				relationship = relationship.trim().replace("tag0:","").replace(":tag0","")

+				

+				// Check if Network TableREf is present, then build a List of network policy

+				List relatedVnfIdList = networkUtils.getRelatedVnfIdList(relationship)

+				vnfsCount = relatedVnfIdList.size()

+				execution.setVariable("DELVAS_vnfsCount", vnfsCount)

+				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)

+				execution.setVariable("DELVAS_relatedVnfIdList", relatedVnfIdList)

+				

+				// Check if Network TableREf is present, then build a List of network policy

+				List relatedNetworkIdList = networkUtils.getRelatedNetworkIdList(relationship)

+				networksCount = relatedNetworkIdList.size()

+				execution.setVariable("DELVAS_networksCount", networksCount)

+				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)

+				execution.setVariable("DELVAS_relatedNetworkIdList", relatedNetworkIdList)

+			} else {

+				execution.setVariable("DELVAS_vnfsCount", 0)

+				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)

+				execution.setVariable("DELVAS_networksCount", 0)

+				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)

+			}

+			

+			utils.log("DEBUG", " ***** Completed prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			sendSyncError(execution)

+		   String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. prepareServiceInstanceDelete() - " + ex.getMessage()

+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+	

+	

+	// *******************************

+	//     

+	// *******************************

+	public void prepareVnfAndModulesDelete (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)

+

+			List vnfList = execution.getVariable("DELVAS_relatedVnfIdList")

+			Integer vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")

+			String vnfModelInfoString = ""

+			String vnfId = ""

+			if (vnfList.size() > 0 ) {

+				vnfId = vnfList.get(vnfsDeletedCount.intValue())

+			}

+							

+			execution.setVariable("vnfId", vnfId)

+			utils.log("DEBUG", "need to delete vnfId:" + vnfId, isDebugEnabled)

+

+			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceMacro flow. Unexpected Error from method prepareVnfAndModulesDelete() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Validate Vnf request Section -> increment count

+	// *******************************

+	public void validateVnfDelete (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside validateVnfDelete of DeleteViprAtmService ***** ", isDebugEnabled)

+

+			String vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")

+			vnfsDeletedCount++

+			

+			execution.setVariable("DELVAS_vnfsDeletedCount", vnfsDeletedCount)

+			

+			utils.log("DEBUG", " ***** Completed validateVnfDelete of DeleteViprAtmService ***** "+" vnf # "+vnfsDeletedCount, isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateVnfDelete() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Generate Network request Section

+	// *******************************

+	public void prepareNetworkDelete (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

+

+			List networkList = execution.getVariable("DELVAS_relatedNetworkIdList")

+			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")

+

+			String networkId = ""

+			if (networkList.size() > 0) {

+				networkId = networkList.get(networksDeletedCount.intValue())

+			}

+							

+			execution.setVariable("networkId", networkId)

+			utils.log("DEBUG", "need to delete networkId:" + networkId, isDebugEnabled)

+			

+			utils.log("DEBUG", " ***** Completed prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = q"Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method prepareNetworkDelete() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+	

+	// *******************************

+	//     Validate Network request Section

+	// *******************************

+	public void validateNetworkDelete (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+

+		try {

+			utils.log("DEBUG", " ***** Inside validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

+

+			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")

+			networksDeletedCount++

+			

+			execution.setVariable("DELVAS_networksDeletedCount", networksDeletedCount)

+			

+			utils.log("DEBUG", " ***** Completed validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateNetworkDelete() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	 }

+

+	

+	// *****************************************

+	//     Prepare Completion request Section

+	// *****************************************

+	public void postProcessResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** Inside postProcessResponse of DeleteViprAtmService ***** ", isDebugEnabled)

+

+		try {

+			String source = execution.getVariable("source")

+			String requestId = execution.getVariable("msoRequestId")

+

+			String msoCompletionRequest =

+					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+									xmlns:ns="http://org.openecomp/mso/request/types/v1">

+							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+								<request-id>${requestId}</request-id>

+								<action>DELETE</action>

+								<source>${source}</source>

+							   </request-info>

+							<aetgt:status-message>vIPR ATM Service Instance has been deleted successfully.</aetgt:status-message>

+							   <aetgt:mso-bpel-name>BPMN Service Instance macro action: DELETE</aetgt:mso-bpel-name>

+						</aetgt:MsoCompletionRequest>"""

+

+			// Format Response

+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+			utils.logAudit(xmlMsoCompletionRequest)

+			execution.setVariable("DELVAS_Success", true)

+			execution.setVariable("DELVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)

+			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+		} catch (BpmnError e) {

+		throw e;

+

+		} catch (Exception ex) {

+			// try error in method block

+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+	}

+

+	public void prepareFalloutRequest(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** STARTED DeleteViprAtmService prepareFalloutRequest Process *** ", isDebugEnabled)

+

+		try {

+			WorkflowException wfex = execution.getVariable("WorkflowException")

+			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)

+			String requestInfo = execution.getVariable("DELVAS_requestInfo")

+			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)

+

+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

+

+			execution.setVariable("DELVAS_falloutRequest", falloutRequest)

+		} catch (Exception ex) {

+			utils.log("DEBUG", "Error Occured in DeleteViprAtmService prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DeleteViprAtmService prepareFalloutRequest Process")

+		}

+		utils.log("DEBUG", "*** COMPLETED DeleteViprAtmService prepareFalloutRequest Process ***", isDebugEnabled)

+	}

+

+

+	public void sendSyncError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** Inside sendSyncError() of DeleteServiceInstanceInfra ***** ", isDebugEnabled)

+

+		try {

+			String errorMessage = ""

+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

+				WorkflowException wfe = execution.getVariable("WorkflowException")

+				errorMessage = wfe.getErrorMessage()

+			} else {

+				errorMessage = "Sending Sync Error."

+			}

+

+			String buildworkflowException =

+				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

+				   </aetgt:WorkflowException>"""

+

+			utils.logAudit(buildworkflowException)

+			sendWorkflowResponse(execution, 500, buildworkflowException)

+		} catch (Exception ex) {

+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

+		}

+	}

+

+	public void processJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		try{

+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

+			execution.setVariable("DELVAS_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")

+		}catch(BpmnError b){

+			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

+			execution.setVariable("DELVAS_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")

+		}

+		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)

+	}

+

+

 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
index e18af17..9e341da 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
@@ -1,417 +1,417 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.rest.APIResponse
-import java.util.UUID;
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-public class DeleteNetworkInstance extends AbstractServiceTaskProcessor {
-	String Prefix="DELNI_"
-	String groovyClassName = "DeleteNetworkInstance"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-
-
-	public InitializeProcessVariables(Execution execution){
-		
-		execution.setVariable(Prefix + "Success", false)
-		
-		execution.setVariable(Prefix + "CompleteMsoProcessRequest", "")
-		execution.setVariable(Prefix + "FalloutHandlerRequest", "")
-		execution.setVariable(Prefix + "isSilentSuccess", false)
-		
-	}
-	
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + groovyClassName + " ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-							
-			String sdncVersion = execution.getVariable("sdncVersion")
-			if (sdncVersion == null || sdncVersion == '1610') {				
-				// 'a-la-cart' default, sdncVersion = '1610' 
-				execution.setVariable("sdncVersion", "1610")
-				String bpmnRequest = execution.getVariable("bpmnRequest")
-				// set 'disableRollback'
-				if (bpmnRequest != null) {
-					String disableRollback = jsonUtil.getJsonValue(bpmnRequest, "requestDetails.requestInfo.suppressRollback")
-					if (disableRollback != null) {
-						execution.setVariable("disableRollback", disableRollback)
-						utils.log("DEBUG", "Received 'suppressRollback': " + disableRollback , isDebugEnabled)
-					} else {
-					    execution.setVariable("disableRollback", false)
-					}
-					utils.log("DEBUG", " Set 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
-				} else {
-					String dataErrorMessage = " Invalid 'bpmnRequest' request."
-					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-
-			} else {
-			    // 'macro' test ONLY, sdncVersion = '1702'
-			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
-			}	
-			
-			// get/set 'msoRequestId' and 'mso-request-id'
-			String requestId = execution.getVariable("msoRequestId")
-			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
-			} else {
-				requestId = execution.getVariable("mso-request-id")
-			}
-			execution.setVariable(Prefix + "requestId", requestId)
-			
-			// get/set 'requestId' 
-		    if (execution.getVariable("requestId") == null) {
-				execution.setVariable("requestId", requestId)
-			}
-			
-			// set action to "DELETE"
-			execution.setVariable("action", "DELETE")
-			
-			//Place holder for additional code.
-
-			// TODO ???
-			// userParams???  1) pre-loads indicator, 2) 'auto-activation'  
-			// Tag/Value parameters
-			//
-			// Map: 'networkInputParams': 'auto-activation''
-			// Sample format? 
-			// "requestParameters": {
-  			//     "userParams": [	
-            //          {
-			//	         "name": "someUserParam1",
-			//	         "value": "someValue1"
-			//          }
-            //     ]
-		    //   }
-			// 
-			// String userParams = //use json util to extract "userParams"// 
-	        // execution.setVariable("networkInputParams", userParams)
-			// else: execution.setVariable("networkInputParams", null)
-			//
-
-
-		} catch (Exception ex){
-			sendSyncError(execution)
-			String exceptionMessage = "Exception Encountered in " + groovyClassName + ", PreProcessRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void getNetworkModelInfo (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside getNetworkModelInfo() of DeleteNetworkInstance ***** ", isDebugEnabled)
-		
-		try {
-			
-			// "networkModelInfo" is expected to be sent
-			String networkModelInfo = execution.getVariable("networkModelInfo")
-			utils.log("DEBUG", " networkModelInfo - " + networkModelInfo, isDebugEnabled)
-						 
-										 
-		} catch (Exception ex) {
-			sendSyncError(execution)
-		   String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance flow. getNetworkModelInfo() - " + ex.getMessage()
-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-			
-		}
-
-	}
-	
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside sendSyncResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)
-
-		try {
-			String requestId = execution.getVariable("mso-request-id")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String deleteNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-
-			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestRequest, isDebugEnabled)
-
-			sendWorkflowResponse(execution, 202, deleteNetworkRestRequest)
-
-		} catch (Exception ex) {
-			 // caught exception
-			String exceptionMessage = "Exception Encountered in  DeleteNetworkInstance, sendSyncResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareCompletion (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside prepareCompletion() of CreateNetworkInstance ***** ", isDebugEnabled)
-
-		try {
-
-			String requestId = execution.getVariable("mso-request-id")
-			String source = execution.getVariable(Prefix + "source")
-
-			String msoCompletionRequest =
-				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-								xmlns:ns="http://org.openecomp/mso/request/types/v1">
-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-							<request-id>${requestId}</request-id>
-							<action>DELETE</action>
-							<source>VID</source>
-			   			</request-info>
-						<aetgt:status-message>Network has been deleted successfully.</aetgt:status-message>
-			   			<aetgt:mso-bpel-name>BPMN Network action: DELETE</aetgt:mso-bpel-name>
-					</aetgt:MsoCompletionRequest>"""
-
-				// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			// normal path
-			execution.setVariable(Prefix + "CompleteMsoProcessRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-		
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in CreateNetworkInstance flow. prepareCompletion() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-
-	}
-	
-	public void prepareDBRequestError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteNetworkInstance ***** ", isDebugEnabled)
-
-			WorkflowException wfe = execution.getVariable("WorkflowException")
-			String statusMessage = wfe.getErrorMessage()
-			String requestId = execution.getVariable(Prefix +"requestId")
-
-			String dbRequest =
-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-						<soapenv:Header/>
-						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
-								<requestId>${requestId}</requestId>
-								<lastModifiedBy>BPMN</lastModifiedBy>
-								<statusMessage>${statusMessage}</statusMessage>
-								<responseBody></responseBody>
-								<requestStatus>FAILED</requestStatus>
-								<progress></progress>
-								<vnfOutputs>&lt;network-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"/&gt;</vnfOutputs>
-							</ns:updateInfraRequest>
-					   	</soapenv:Body>
-					   </soapenv:Envelope>"""
-
-		   execution.setVariable(Prefix + "deleteDBRequest", dbRequest)
-		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in  DeleteNetworkInstance, prepareDBRequestError() - " + ex.getMessage()
-			logError(exceptionMessage)
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	 }
-
-	// **************************************************
-	//     Post or Validate Response Section
-	// **************************************************
-
-	public void postProcessResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-	
-		utils.log("DEBUG", " ***** Inside postProcessResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)
-		
-		try {
-			if (execution.getVariable("CMSO_ResponseCode") == "200") {
-			   execution.setVariable(Prefix + "Success", true)
-			   utils.log("DEBUG", " ***** DeleteNetworkInstance Success ***** ", isDebugEnabled)
-			   //   Place holder for additional code.
-			   
-			} else {
-			   execution.setVariable(Prefix + "Success", false)
-			   utils.log("DEBUG", " ***** DeleteNetworkInstance Failed in CompletionMsoProces flow!. ***** ", isDebugEnabled)
-			
-			}   
-			
-	
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DeleteNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-	
-	    }
-	
-	}
-
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-	// Prepare for FalloutHandler
-	public void buildErrorResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
-
-		String dbReturnCode = execution.getVariable(Prefix + "dbReturnCode")
-		utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)
-		utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + execution.getVariable(Prefix + "deleteDBResponse"), isDebugEnabled)
-
-		String falloutHandlerRequest = ""
-		String requestId = execution.getVariable("mso-request-id")
-		String source = execution.getVariable(Prefix + "source")
-		execution.setVariable(Prefix + "Success", false)
-		try {
-			WorkflowException wfe = execution.getVariable("WorkflowException")
-			String errorCode = String.valueOf(wfe.getErrorCode())
-			String errorMessage = wfe.getErrorMessage()
-
-			falloutHandlerRequest =
-			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					      <request-id>${requestId}</request-id>
-					      <action>DELETE</action>
-					      <source>${source}</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-
-			utils.logAudit(falloutHandlerRequest)
-			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
-			utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance, buildErrorResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			falloutHandlerRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					      <request-id>${requestId}</request-id>
-					      <action>DELEtE</action>
-					      <source>${source}</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-							<aetgt:ErrorMessage>${exceptionMessage}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>9999</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
-			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
-		}
-	}
-
-
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			String requestId = execution.getVariable("mso-request-id")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String deleteNetworkRestError = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-
-			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestError, isDebugEnabled)
-
-			sendWorkflowResponse(execution, 500, deleteNetworkRestError)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed -  DeleteNetworkInstance, sendSyncError(): " + "\n" + ex.getMessage(), isDebugEnabled)
-		}
-	}
-
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		try{
-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-			
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")
-		}
-		utils.log("DEBUG", "Completed processJavaException Method of " + Prefix, isDebugEnabled)
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils;

+import org.openecomp.mso.rest.APIResponse

+import java.util.UUID;

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+public class DeleteNetworkInstance extends AbstractServiceTaskProcessor {

+	String Prefix="DELNI_"

+	String groovyClassName = "DeleteNetworkInstance"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)

+	NetworkUtils networkUtils = new NetworkUtils()

+

+

+	public InitializeProcessVariables(Execution execution){

+		

+		execution.setVariable(Prefix + "Success", false)

+		

+		execution.setVariable(Prefix + "CompleteMsoProcessRequest", "")

+		execution.setVariable(Prefix + "FalloutHandlerRequest", "")

+		execution.setVariable(Prefix + "isSilentSuccess", false)

+		

+	}

+	

+	// **************************************************

+	//     Pre or Prepare Request Section

+	// **************************************************

+

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + groovyClassName + " ***** ", isDebugEnabled)

+

+		try {

+			// initialize flow variables

+			InitializeProcessVariables(execution)

+							

+			String sdncVersion = execution.getVariable("sdncVersion")

+			if (sdncVersion == null || sdncVersion == '1610') {				

+				// 'a-la-cart' default, sdncVersion = '1610' 

+				execution.setVariable("sdncVersion", "1610")

+				String bpmnRequest = execution.getVariable("bpmnRequest")

+				// set 'disableRollback'

+				if (bpmnRequest != null) {

+					String disableRollback = jsonUtil.getJsonValue(bpmnRequest, "requestDetails.requestInfo.suppressRollback")

+					if (disableRollback != null) {

+						execution.setVariable("disableRollback", disableRollback)

+						utils.log("DEBUG", "Received 'suppressRollback': " + disableRollback , isDebugEnabled)

+					} else {

+					    execution.setVariable("disableRollback", false)

+					}

+					utils.log("DEBUG", " Set 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)

+				} else {

+					String dataErrorMessage = " Invalid 'bpmnRequest' request."

+					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+				}

+

+			} else {

+			    // 'macro' test ONLY, sdncVersion = '1702'

+			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)

+			}	

+			

+			// get/set 'msoRequestId' and 'mso-request-id'

+			String requestId = execution.getVariable("msoRequestId")

+			if (requestId != null) {

+				execution.setVariable("mso-request-id", requestId)

+			} else {

+				requestId = execution.getVariable("mso-request-id")

+			}

+			execution.setVariable(Prefix + "requestId", requestId)

+			

+			// get/set 'requestId' 

+		    if (execution.getVariable("requestId") == null) {

+				execution.setVariable("requestId", requestId)

+			}

+			

+			// set action to "DELETE"

+			execution.setVariable("action", "DELETE")

+			

+			//Place holder for additional code.

+

+			// TODO ???

+			// userParams???  1) pre-loads indicator, 2) 'auto-activation'  

+			// Tag/Value parameters

+			//

+			// Map: 'networkInputParams': 'auto-activation''

+			// Sample format? 

+			// "requestParameters": {

+  			//     "userParams": [	

+            //          {

+			//	         "name": "someUserParam1",

+			//	         "value": "someValue1"

+			//          }

+            //     ]

+		    //   }

+			// 

+			// String userParams = //use json util to extract "userParams"// 

+	        // execution.setVariable("networkInputParams", userParams)

+			// else: execution.setVariable("networkInputParams", null)

+			//

+

+

+		} catch (Exception ex){

+			sendSyncError(execution)

+			String exceptionMessage = "Exception Encountered in " + groovyClassName + ", PreProcessRequest() - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	}

+

+	public void getNetworkModelInfo (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		utils.log("DEBUG", " ***** Inside getNetworkModelInfo() of DeleteNetworkInstance ***** ", isDebugEnabled)

+		

+		try {

+			

+			// "networkModelInfo" is expected to be sent

+			String networkModelInfo = execution.getVariable("networkModelInfo")

+			utils.log("DEBUG", " networkModelInfo - " + networkModelInfo, isDebugEnabled)

+						 

+										 

+		} catch (Exception ex) {

+			sendSyncError(execution)

+		   String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance flow. getNetworkModelInfo() - " + ex.getMessage()

+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+			

+		}

+

+	}

+	

+	public void sendSyncResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside sendSyncResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)

+

+		try {

+			String requestId = execution.getVariable("mso-request-id")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+			// RESTResponse (for API Handler (APIH) Reply Task)

+			String deleteNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+

+			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestRequest, isDebugEnabled)

+

+			sendWorkflowResponse(execution, 202, deleteNetworkRestRequest)

+

+		} catch (Exception ex) {

+			 // caught exception

+			String exceptionMessage = "Exception Encountered in  DeleteNetworkInstance, sendSyncResponse() - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	}

+

+	public void prepareCompletion (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside prepareCompletion() of CreateNetworkInstance ***** ", isDebugEnabled)

+

+		try {

+

+			String requestId = execution.getVariable("mso-request-id")

+			String source = execution.getVariable(Prefix + "source")

+

+			String msoCompletionRequest =

+				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+								xmlns:ns="http://org.openecomp/mso/request/types/v1">

+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+							<request-id>${requestId}</request-id>

+							<action>DELETE</action>

+							<source>VID</source>

+			   			</request-info>

+						<aetgt:status-message>Network has been deleted successfully.</aetgt:status-message>

+			   			<aetgt:mso-bpel-name>BPMN Network action: DELETE</aetgt:mso-bpel-name>

+					</aetgt:MsoCompletionRequest>"""

+

+				// Format Response

+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+

+			// normal path

+			execution.setVariable(Prefix + "CompleteMsoProcessRequest", xmlMsoCompletionRequest)

+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

+		

+		} catch (Exception ex) {

+			String exceptionMessage = " Bpmn error encountered in CreateNetworkInstance flow. prepareCompletion() - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+

+	}

+	

+	public void prepareDBRequestError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		try {

+			utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteNetworkInstance ***** ", isDebugEnabled)

+

+			WorkflowException wfe = execution.getVariable("WorkflowException")

+			String statusMessage = wfe.getErrorMessage()

+			String requestId = execution.getVariable(Prefix +"requestId")

+

+			String dbRequest =

+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

+						<soapenv:Header/>

+						<soapenv:Body>

+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+								<requestId>${requestId}</requestId>

+								<lastModifiedBy>BPMN</lastModifiedBy>

+								<statusMessage>${statusMessage}</statusMessage>

+								<responseBody></responseBody>

+								<requestStatus>FAILED</requestStatus>

+								<progress></progress>

+								<vnfOutputs>&lt;network-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"/&gt;</vnfOutputs>

+							</ns:updateInfraRequest>

+					   	</soapenv:Body>

+					   </soapenv:Envelope>"""

+

+		   execution.setVariable(Prefix + "deleteDBRequest", dbRequest)

+		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)

+

+		} catch (Exception ex) {

+			// caught exception

+			String exceptionMessage = "Bpmn error encountered in  DeleteNetworkInstance, prepareDBRequestError() - " + ex.getMessage()

+			logError(exceptionMessage)

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	 }

+

+	// **************************************************

+	//     Post or Validate Response Section

+	// **************************************************

+

+	public void postProcessResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+	

+		utils.log("DEBUG", " ***** Inside postProcessResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)

+		

+		try {

+			if (execution.getVariable("CMSO_ResponseCode") == "200") {

+			   execution.setVariable(Prefix + "Success", true)

+			   utils.log("DEBUG", " ***** DeleteNetworkInstance Success ***** ", isDebugEnabled)

+			   //   Place holder for additional code.

+			   

+			} else {

+			   execution.setVariable(Prefix + "Success", false)

+			   utils.log("DEBUG", " ***** DeleteNetworkInstance Failed in CompletionMsoProces flow!. ***** ", isDebugEnabled)

+			

+			}   

+			

+	

+		} catch (Exception ex) {

+			String exceptionMessage = " Bpmn error encountered in DeleteNetworkInstance flow. postProcessResponse() - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+	

+	    }

+	

+	}

+

+

+	// *******************************

+	//     Build Error Section

+	// *******************************

+

+	// Prepare for FalloutHandler

+	public void buildErrorResponse (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)

+

+		String dbReturnCode = execution.getVariable(Prefix + "dbReturnCode")

+		utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)

+		utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + execution.getVariable(Prefix + "deleteDBResponse"), isDebugEnabled)

+

+		String falloutHandlerRequest = ""

+		String requestId = execution.getVariable("mso-request-id")

+		String source = execution.getVariable(Prefix + "source")

+		execution.setVariable(Prefix + "Success", false)

+		try {

+			WorkflowException wfe = execution.getVariable("WorkflowException")

+			String errorCode = String.valueOf(wfe.getErrorCode())

+			String errorMessage = wfe.getErrorMessage()

+

+			falloutHandlerRequest =

+			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					      <request-id>${requestId}</request-id>

+					      <action>DELETE</action>

+					      <source>${source}</source>

+					   </request-info>

+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>

+						</aetgt:WorkflowException>

+					</aetgt:FalloutHandlerRequest>"""

+

+			utils.logAudit(falloutHandlerRequest)

+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)

+			utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)

+

+		} catch (Exception ex) {

+			// caught exception

+			String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance, buildErrorResponse() - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			falloutHandlerRequest =

+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					      <request-id>${requestId}</request-id>

+					      <action>DELEtE</action>

+					      <source>${source}</source>

+					   </request-info>

+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

+							<aetgt:ErrorMessage>${exceptionMessage}</aetgt:ErrorMessage>

+							<aetgt:ErrorCode>9999</aetgt:ErrorCode>

+						</aetgt:WorkflowException>

+					</aetgt:FalloutHandlerRequest>"""

+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)

+			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)

+		}

+	}

+

+

+	public void sendSyncError (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+

+		try {

+			String requestId = execution.getVariable("mso-request-id")

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+

+			// RESTResponse (for API Handler (APIH) Reply Task)

+			String deleteNetworkRestError = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

+

+			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestError, isDebugEnabled)

+

+			sendWorkflowResponse(execution, 500, deleteNetworkRestError)

+

+		} catch (Exception ex) {

+			utils.log("DEBUG", " Sending Sync Error Activity Failed -  DeleteNetworkInstance, sendSyncError(): " + "\n" + ex.getMessage(), isDebugEnabled)

+		}

+	}

+

+	public void processJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		try{

+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")

+			

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")

+		}

+		utils.log("DEBUG", "Completed processJavaException Method of " + Prefix, isDebugEnabled)

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleInfra.groovy
index 93890be..f8b3b47 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleInfra.groovy
@@ -41,7 +41,7 @@ import org.openecomp.mso.bpmn.core.json.JsonUtils;
 
 
 public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
-	
+
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 	JsonUtils jsonUtil = new JsonUtils()
 	/**
@@ -78,20 +78,20 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 		logDebug('Entered ' + method, isDebugLogEnabled)
 		execution.setVariable("isVidRequest", "false")
 		initProcessVariables(execution)
-		
+
 		def prefix = execution.getVariable('prefix')
-		
+
 		def incomingRequest = execution.getVariable('bpmnRequest')
-		
+
 		utils.log("DEBUG", "Incoming Infra Request: " + incomingRequest, isDebugLogEnabled)
 		utils.logAudit("DeleteVfModule Infra incoming Request: " + incomingRequest)
-		
+
 		// check if request is xml or json
 		try {
 			def jsonSlurper = new JsonSlurper()
 			Map reqMap = jsonSlurper.parseText(incomingRequest)
 			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)
-			
+
 			def serviceInstanceId = execution.getVariable('serviceInstanceId')
 			utils.log("DEBUG", "serviceInstanceId is: " + serviceInstanceId, isDebugLogEnabled)
 			def vnfId = execution.getVariable('vnfId')
@@ -100,16 +100,16 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			execution.setVariable("cloudConfiguration", cloudConfiguration)
 			utils.log("DEBUG", "CloudConfiguration is: " + cloudConfiguration, isDebugLogEnabled)
 			def vfModuleModelInfo = jsonUtil.getJsonValue(incomingRequest, "requestDetails.modelInfo")
-			
+
 			execution.setVariable("vfModuleModelInfo", vfModuleModelInfo)
 			utils.log("DEBUG", "VfModuleModelInfo is: " + vfModuleModelInfo, isDebugLogEnabled)
-			
+
 			def vidUtils = new VidUtils(this)
-			
+
 			String requestInXmlFormat = vidUtils.createXmlVfModuleRequest(execution, reqMap, 'DELETE_VF_MODULE', serviceInstanceId)
-			
+
 			utils.log("DEBUG", " Request in XML format: " + requestInXmlFormat, isDebugLogEnabled)
-			
+
 			try {
 				// Catalog DB headers Authorization
 				String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
@@ -126,31 +126,31 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			execution.setVariable(prefix + 'Request', requestInXmlFormat)
 			execution.setVariable(prefix+'vnfId', vnfId)
 			execution.setVariable("isVidRequest", "true")
-			
+
 		}
 		catch(groovy.json.JsonException je) {
 			utils.log("DEBUG", " Request is not in JSON format.", isDebugLogEnabled)
-			workflowException(execution, "Invalid request format", 400)
-			
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - During PreProcess Request")
+
 		}
 		catch(Exception e) {
 			String restFaultMessage = e.getMessage()
 			utils.log("ERROR", " Exception Encountered - " + "\n" + restFaultMessage, isDebugLogEnabled)
-			workflowException(execution, restFaultMessage, 400)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - During PreProcess Request")
 		}
-		
-	
+
+
 		try {
-			
+
 			String request = validateRequest(execution)
 			execution.setVariable('DeleteVfModuleRequest', request)
 			utils.logAudit("DeleteVfModuleInfra Request: " + request)
-			
+
 			def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
 			execution.setVariable('DELVfModI_requestInfo', requestInfo)
 			execution.setVariable('DELVfModI_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
 			execution.setVariable('DELVfModI_source', getNodeTextForce(requestInfo, 'source'))
-			
+
 			def vnfInputs = getRequiredNodeXml(execution, request, 'vnf-inputs')
 			execution.setVariable('DELVfModI_vnfInputs', vnfInputs)
 			execution.setVariable('DELVfModI_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))
@@ -158,16 +158,16 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			execution.setVariable('DELVfModI_vfModuleName', getNodeTextForce(vnfInputs, 'vf-module-name'))
 			execution.setVariable('DELVfModI_tenantId', getRequiredNodeText(execution, vnfInputs, 'tenant-id'))
 			execution.setVariable('DELVfModI_volumeGroupId', getNodeTextForce(vnfInputs, 'volume-group-id'))
-			
+
 			def vnfParams = utils.getNodeXml(request, 'vnf-params')
 			execution.setVariable('DELVfModI_vnfParams', vnfParams)
-	
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
 		}
 	}
 
@@ -182,7 +182,7 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-	
+
 		try {
 			def requestInfo = execution.getVariable('DELVfModI_requestInfo')
 			def requestId = execution.getVariable('DELVfModI_requestId')
@@ -195,11 +195,11 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			if (startTime.isEmpty()) {
 				startTime = System.currentTimeMillis()
 			}
-				
+
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			def vfModuleId = execution.getVariable('DELVfModI_vfModuleId')
 			String synchResponse = """{"requestReferences":{"instanceId":"${vfModuleId}","requestId":"${requestId}"}}""".trim()
-				
+
 			utils.logAudit("DeleteVfModuleInfra Synch Response: " + synchResponse)
 			sendWorkflowResponse(execution, 200, synchResponse)
 
@@ -208,10 +208,10 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
 		}
 	}
-		
+
 	/**
 	 * Currently passing the entire DELETE_VF_MODULE vnf-request to DoDeleteVfModule.
 	 * 'DeleteVfModuleRequest' is now being set in preProcessRequest().
@@ -233,10 +233,10 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepDoDeleteVfModule(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepDoDeleteVfModule(): ' + e.getMessage())
 		}
 	}
-		
+
 	/**
 	 * Prepare the DB update to add an entry for the Vf Module request.
 	 *
@@ -257,19 +257,19 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			def volumeGroupId = execution.getVariable('DELVfModI_volumeGroupId')
 
 			String updateInfraRequest = """
-			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
 					xmlns:req="http://org.openecomp.mso/requestsdb">
-				<soapenv:Header/>
-				<soapenv:Body>
-					<req:updateInfraRequest>
-						<requestId>${requestId}</requestId>
-						<lastModifiedBy>BPMN</lastModifiedBy>
-						<requestStatus>COMPLETED</requestStatus>
-						<progress>100</progress>
-					</req:updateInfraRequest>
-				</soapenv:Body>
-			</soapenv:Envelope>
-		"""
+					<soapenv:Header/>
+					<soapenv:Body>
+						<req:updateInfraRequest>
+							<requestId>${requestId}</requestId>
+							<lastModifiedBy>BPMN</lastModifiedBy>
+							<requestStatus>COMPLETED</requestStatus>
+							<progress>100</progress>
+						</req:updateInfraRequest>
+					</soapenv:Body>
+				</soapenv:Envelope>
+			"""
 
 			updateInfraRequest = utils.formatXml(updateInfraRequest)
 			execution.setVariable('DELVfModI_updateInfraRequest', updateInfraRequest)
@@ -281,7 +281,7 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepInfraRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepInfraRequest(): ' + e.getMessage())
 		}
 	}
 
@@ -303,18 +303,18 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			def request = execution.getVariable("DeleteVfModuleRequest")
 			def requestInfo = utils.getNodeXml(request, 'request-info', false)
 			def action = utils.getNodeText1(requestInfo, "action")
-			
+
 			String content =
 					"""  <aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
 						   xmlns:ns="http://org.openecomp/mso/request/types/v1"
 						   xmlns:ns8="http://org.openecomp/mso/workflow/schema/v1">
 		<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-		${requestInfo}
-		</request-info>
-		<ns8:status-message>Vf Module has been deleted successfully.</ns8:status-message>
-		<ns8:mso-bpel-name>BPMN</ns8:mso-bpel-name>
-		</aetgt:MsoCompletionRequest>"""
-			
+			${requestInfo}
+			</request-info>
+			<ns8:status-message>Vf Module has been deleted successfully.</ns8:status-message>
+			<ns8:mso-bpel-name>BPMN</ns8:mso-bpel-name>
+			</aetgt:MsoCompletionRequest>"""
+
 			content = utils.formatXml(content)
 			logDebug(resultVar + ' = ' + System.lineSeparator() + content, isDebugLogEnabled)
 			utils.logAudit("DeleteVfModule Infra Completion Handler Request: " + content)
@@ -325,7 +325,7 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
 
@@ -342,7 +342,7 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def prefix = execution.getVariable('prefix')
 			def request = execution.getVariable("DeleteVfModuleRequest")
@@ -360,13 +360,13 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 					xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
 					xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
 					xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
-				${requestInfo}
-				<sdncadapterworkflow:WorkflowException>
-					<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
-					<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
-				</sdncadapterworkflow:WorkflowException>
-			</sdncadapterworkflow:FalloutHandlerRequest>
-		"""
+					${requestInfo}
+					<sdncadapterworkflow:WorkflowException>
+						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
+						<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
+					</sdncadapterworkflow:WorkflowException>
+				</sdncadapterworkflow:FalloutHandlerRequest>
+			"""
 			content = utils.formatXml(content)
 			utils.logAudit("DeleteVfModuleInfra Fallout Handler Request: " + content)
 			logDebug(resultVar + ' = ' + System.lineSeparator() + content, isDebugLogEnabled)
@@ -377,7 +377,7 @@ public class DeleteVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleVolumeInfraV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleVolumeInfraV1.groovy
index 0a3af33..7bda7b4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleVolumeInfraV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVfModuleVolumeInfraV1.groovy
@@ -1,560 +1,560 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.json.JsonSlurper
-
-import java.util.concurrent.ExecutionException;
-
-import org.springframework.web.util.UriUtils
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse
-
-/**
- * This groovy class supports the <class>DeleteVfModuleVolume.bpmn</class> process.
- */
-public class DeleteVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {
-
-	private XmlParser xmlParser = new XmlParser()
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DeleteVfModuleVolume.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		execution.setVariable('prefix', 'DELVfModVol_')
-		execution.setVariable("DELVfModVol_volumeRequest", null)
-		execution.setVariable('DELVfModVol_requestInfo', null)
-		execution.setVariable('DELVfModVol_requestId', null)
-		execution.setVariable('DELVfModVol_source', null)
-		execution.setVariable('DELVfModVol_volumeInputs', null)
-		execution.setVariable('DELVfModVol_volumeOutputs', null)
-		execution.setVariable('DELVfModVol_volumeGroupId', null)
-		execution.setVariable('DELVfModVol_vnfType', null)
-		execution.setVariable('DELVfModVol_serviceId', null)
-		execution.setVariable('DELVfModVol_cloudRegion', null)
-		execution.setVariable('DELVfModVol_tenantId', null)
-		execution.setVariable('DELVfModVol_volumeParams', null)
-		execution.setVariable('DELVfModVol_volumeGroupHeatStackId', null)
-		execution.setVariable('DELVfModVol_volumeGroupTenantId', null)
-		execution.setVariable("DELVfModVol_queryAAIVolGrpResponse", null)
-		execution.setVariable('DELVfModVol_messageId', null)
-		execution.setVariable('DELVfModVol_deleteVnfARequest', null)
-		execution.setVariable('DELVfModVol_updateInfraRequest', null)
-		execution.setVariable('DELVfModVol_CompleteMsoProcessRequest', null)
-		execution.setVariable('DELVfModVol_WorkflowException', null)
-		execution.setVariable('DELVfModVol_TransactionSuccessIndicator', false)
-		execution.setVariable("DELVfModVol_isErrorMessageException", false)
-		execution.setVariable('DELVfModVol_syncResponseSent', false)
-	}
-
-	/**
-	 * Perform initial processing, such as request validation, initialization of variables, etc.
-	 * * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		preProcessRequest(execution, isDebugEnabled)
-	}
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DeleteVfModuleVolume.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution, isDebugLogEnabled) {
-
-		InitializeProcessVariables(execution)
-
-		String createVolumeIncoming = validateRequest(execution)
-		utils.logAudit(createVolumeIncoming)
-
-		// check if request is xml or json
-		try {
-			def jsonSlurper = new JsonSlurper()
-			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)
-			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)
-
-			def serviceInstanceId = execution.getVariable('serviceInstanceId')
-			def volumeGroupId = execution.getVariable('volumeGroupId')
-			def vidUtils = new VidUtils(this)
-			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'DELETE_VF_MODULE_VOL', serviceInstanceId, volumeGroupId)
-			execution.setVariable("DELVfModVol_isVidRequest", true)
-		}
-		catch(groovy.json.JsonException je) {
-			utils.log("DEBUG", " Request is in XML format.", isDebugLogEnabled)
-			// assume request is in XML format - proceed as usual to process XML request
-		}
-
-		String request = utils.getNodeXml(createVolumeIncoming, "volume-request").drop(38).trim().replace("tag0:","").replace(":tag0","")
-		execution.setVariable("DELVfModVol_volumeRequest", request)
-
-		def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
-		execution.setVariable('DELVfModVol_requestInfo', requestInfo)
-		String requestId = execution.getVariable("mso-request-id")
-		if (requestId == null || requestId == "") {
-			requestId = getRequiredNodeText(execution, requestInfo, 'request-id')
-		}
-		execution.setVariable('DELVfModVol_requestId', requestId)
-		execution.setVariable('DELVfModVol_source', getNodeTextForce(requestInfo, 'source'))
-
-		def volumeInputs = getRequiredNodeXml(execution, request, 'volume-inputs')
-		execution.setVariable('DELVfModVol_volumeInputs', volumeInputs)
-		execution.setVariable('DELVfModVol_volumeGroupId', getRequiredNodeText(execution, volumeInputs, 'volume-group-id'))
-		execution.setVariable('DELVfModVol_vnfType', getRequiredNodeText(execution, volumeInputs, 'vnf-type'))
-		execution.setVariable('DELVfModVol_serviceId', getRequiredNodeText(execution, volumeInputs, 'service-id'))
-		execution.setVariable('DELVfModVol_tenantId', getRequiredNodeText(execution, volumeInputs, 'tenant-id'))
-		execution.setVariable('DELVfModVol_messageId', UUID.randomUUID().toString())
-		execution.setVariable('DELVfModVol_volumeOutputs', utils.getNodeXml(request, 'volume-outputs', false))
-		execution.setVariable('DELVfModVol_volumeParams', utils.getNodeXml(request, 'volume-params'))
-		execution.setVariable('DELVfModVol_cloudRegion', utils.getNodeText1(request, 'aic-cloud-region'))
-
-		try {
-			// Catalog DB headers Authorization
-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)
-			
-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
-		} catch (IOException ex) {
-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-		
-		logDebug('Request: ' + createVolumeIncoming, isDebugLogEnabled)
-	}
-
-	public void sendSyncResponse (Execution execution, isDebugEnabled) {
-
-		String volumeRequest = execution.getVariable("DELVfModVol_volumeRequest")
-		utils.log("DEBUG", " DELVfModVol_volumeRequest - " + "\n" + volumeRequest, isDebugEnabled)
-		// RESTResponse (for API Handler (APIH) Reply Task)
-		String deleteVolumeRequest =
-				"""<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd" statusCode="200">
-                <rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
-                          contentType="text/xml">
-			        ${volumeRequest}
-                </rest:payload>
-		       </rest:RESTResponse>""".trim()
-
-		def isVidRequest = execution.getVariable('DELVfModVol_isVidRequest')
-		def syncResponse = ''
-
-		if(isVidRequest) {
-			def serviceInstanceId = execution.getVariable('serviceInstanceId')
-			def volumeGroupId = execution.getVariable('volumeGroupId')
-			def requestId = execution.getVariable('DELVfModVol_requestId')
-			syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()
-		}
-		else {
-			syncResponse = utils.formatXml(deleteVolumeRequest)
-		}
-
-		execution.setVariable('DELVfModVol_syncResponseSent', true)
-
-		sendWorkflowResponse(execution, 200, syncResponse)
-	}
-
-
-	public void sendSyncError (Execution execution, isDebugEnabled) {
-		WorkflowException we = execution.getVariable('WorkflowException')
-		def errorCode = we?.getErrorCode()
-		def errorMessage = we?.getErrorMessage()
-		//default to 400 since only invalid request will trigger this method
-		sendWorkflowResponse(execution, 400, errorMessage)
-	}
-
-
-	public void callRESTQueryAAICloudRegion (Execution execution, isDebugEnabled) {
-
-		String cloudRegion = execution.getVariable('DELVfModVol_cloudRegion')
-
-		String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aai_uri = aaiUtil.getCloudInfrastructureCloudRegionUri(execution)
-		String queryCloudRegionRequest = "${aai_endpoint}${aai_uri}/" + cloudRegion
-		utils.logAudit(queryCloudRegionRequest)
-		execution.setVariable("DELVfModVol_queryCloudRegionRequest", queryCloudRegionRequest)
-		utils.log("DEBUG", " DELVfModVol_queryCloudRegionRequest - " + "\n" + queryCloudRegionRequest, isDebugEnabled)
-
-		cloudRegion = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-
-		if ((cloudRegion != "ERROR")) {
-			if(execution.getVariable("DELVfModVol_queryCloudRegionReturnCode") == "404"){
-				execution.setVariable("DELVfModVol_aicCloudRegion", "AAIAIC25")
-			}else{
-				execution.setVariable("DELVfModVol_aicCloudRegion", cloudRegion)
-			}
-			execution.setVariable("DELVfModVol_cloudRegion", cloudRegion)
-			execution.setVariable("DELVfModVol_isCloudRegionGood", true)
-
-		} else {
-			utils.log("DEBUG", "AAI Query Cloud Region Unsuccessful.", isDebugEnabled)
-			execution.setVariable("DELVfModVol_isCloudRegionGood", false)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "AAI Query Cloud Region Unsuccessful. Return Code: " + execution.getVariable("DELVfModVol_queryCloudRegionReturnCode"))
-		}
-
-		utils.log("DEBUG", " is Cloud Region Good: " + execution.getVariable("DELVfModVol_isCloudRegionGood"), isDebugEnabled)
-	}
-
-	/**
-	 * Query volume group by id
-	 * @param execution
-	 */
-	public void queryAAIForVolumeGroup(Execution execution, isDebugLogEnabled) {
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-
-		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')
-		if(volumeGroupId == null) {
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, 'volume-group-id is not provided in the request')
-			throw new Exception('volume-group-id is not provided in the request')
-		}
-		String cloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')
-
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)
-		String queryAAIVolumeGroupRequest = aaiEndpoint + '/' + URLEncoder.encode(cloudRegion, "UTF-8") + "/volume-groups/volume-group/" + UriUtils.encode(volumeGroupId, "UTF-8")
-
-		utils.logAudit('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest)
-		logDebug('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest, isDebugLogEnabled)
-
-		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVolumeGroupRequest)
-
-		String returnCode = response.getStatusCode()
-		String aaiResponseAsString = response.getResponseBodyAsString()
-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-
-		utils.logAudit("AAI query volume group by id return code: " + returnCode)
-		utils.logAudit("AAI query volume group by id response: " + aaiResponseAsString)
-
-		execution.setVariable("DELVfModVol_queryAAIVolGrpResponse", aaiResponseAsString)
-
-		if (returnCode=='200' || returnCode == '204') {
-
-			def heatStackId = getNodeTextForce(aaiResponseAsString, 'heat-stack-id')
-			execution.setVariable('DELVfModVol_volumeGroupHeatStackId', heatStackId)
-
-			if(hasVfModuleRelationship(aaiResponseAsString)){
-				utils.log("DEBUG", 'Volume Group ' + volumeGroupId + ' currently in use', isDebugLogEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group ${volumeGroupId} currently in use - found vf-module relationship.")
-			}
-
-			def volumeGroupTenantId = getTenantIdFromVolumeGroup(aaiResponseAsString)
-			if (volumeGroupTenantId == null) {
-				utils.log("DEBUG", "Could not find Tenant Id element in Volume Group with Volume Group Id ${volumeGroupId}", isDebugLogEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Could not find Tenant Id element in Volume Group with Volume Group Id ${volumeGroupId}")
-			}
-
-			execution.setVariable('DELVfModVol_volumeGroupTenantId', volumeGroupTenantId)
-			logDebug('Received Tenant Id ' + volumeGroupTenantId + ' from AAI for Volume Group with Volume Group Id ' + volumeGroupId , isDebugLogEnabled)
-		}
-		else {
-			if (returnCode=='404') {
-				utils.log("DEBUG", "Volume Group ${volumeGroupId} not found in AAI", isDebugLogEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group ${volumeGroupId} not found in AAI. Response code: 404")
-			}
-			else {
-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		}
-	}
-
-	/**
-	 * Extract the Tenant Id from the Volume Group information returned by AAI.
-	 *
-	 * @param volumeGroupXml Volume Group XML returned by AAI.
-	 * @return the Tenant Id extracted from the Volume Group information. 'null' is returned if
-	 * the Tenant Id is missing or could not otherwise be extracted.
-	 */
-	private String getTenantIdFromVolumeGroup(String volumeGroupXml) {
-		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)
-		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')
-		if (relationshipList != null) {
-			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
-			for (Node relationship in relationships) {
-				def Node relatedTo = utils.getChildNode(relationship, 'related-to')
-				if ((relatedTo != null) && (relatedTo.text().equals('tenant'))) {
-					def NodeList relationshipDataList = utils.getIdenticalChildren(relationship, 'relationship-data')
-					for (Node relationshipData in relationshipDataList) {
-						def Node relationshipKey = utils.getChildNode(relationshipData, 'relationship-key')
-						if ((relationshipKey != null) && (relationshipKey.text().equals('tenant.tenant-id'))) {
-							def Node relationshipValue = utils.getChildNode(relationshipData, 'relationship-value')
-							if (relationshipValue != null) {
-								return relationshipValue.text()
-							}
-						}
-					}
-				}
-			}
-		}
-		return null
-	}
-
-	private boolean hasVnfRelationship(String volumeGroupXml) {
-		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)
-		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')
-		if (relationshipList != null) {
-			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
-			for (Node relationship in relationships) {
-				def Node relatedTo = utils.getChildNode(relationship, 'related-to')
-				if ((relatedTo != null) && (relatedTo.text().equals('generic-vnf'))) {
-					def Node relatedLink = utils.getChildNode(relationship, 'related-link')
-					if (relatedLink !=null && relatedLink.text() != null){
-						return true
-					}
-				}
-			}
-		}
-		return false
-	}
-
-	private boolean hasVfModuleRelationship(String volumeGroupXml) {
-		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)
-		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')
-		if (relationshipList != null) {
-			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
-			for (Node relationship in relationships) {
-				def Node relatedTo = utils.getChildNode(relationship, 'related-to')
-				if ((relatedTo != null) && (relatedTo.text().equals('vf-module'))) {
-					def Node relatedLink = utils.getChildNode(relationship, 'related-link')
-					if (relatedLink !=null && relatedLink.text() != null){
-						return true
-					}
-				}
-			}
-		}
-		return false
-	}
-
-	public void prepareVnfAdapterDeleteRequest(Execution execution, isDebugLogEnabled) {
-		def cloudRegion = execution.getVariable('DELVfModVol_cloudRegion')
-		def tenantId = execution.getVariable('DELVfModVol_tenantId')
-		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')
-		def volumeGroupHeatStackId = execution.getVariable('DELVfModVol_volumeGroupHeatStackId')
-		def requestId = execution.getVariable('DELVfModVol_requestId')
-		def serviceId = execution.getVariable('DELVfModVol_serviceId')
-
-		def messageId = execution.getVariable('DELVfModVol_messageId')
-		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId) 
-		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
-		if ('true'.equals(useQualifiedHostName)) {
-				notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
-		}
-
-		String vnfAdapterRestRequest = """
-			<deleteVolumeGroupRequest>
-				<cloudSiteId>${cloudRegion}</cloudSiteId>
-				<tenantId>${tenantId}</tenantId>
-				<volumeGroupId>${volumeGroupId}</volumeGroupId>
-				<volumeGroupStackId>${volumeGroupHeatStackId}</volumeGroupStackId>
-				<skipAAI>true</skipAAI>
-			    <msoRequest>
-			        <requestId>${requestId}</requestId>
-			        <serviceInstanceId>${serviceId}</serviceInstanceId>
-			    </msoRequest>
-			    <messageId>${messageId}</messageId>
-			    <notificationUrl>${notificationUrl}</notificationUrl>
-			</deleteVolumeGroupRequest>
-		"""
-		vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
-		execution.setVariable('DELVfModVol_deleteVnfARequest', vnfAdapterRestRequest)
-		logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)
-	}
-
-
-	public void deleteVolGrpId(Execution execution, isDebugEnabled) {
-
-		// get variables
-		String queryAAIVolGrpIdResponse = execution.getVariable("DELVfModVol_queryAAIVolGrpResponse")
-		String groupId = utils.getNodeText(queryAAIVolGrpIdResponse, "volume-group-id")
-		String resourceVersion = utils.getNodeText(queryAAIVolGrpIdResponse, "resource-version")
-		String messageId = execution.getVariable('DELVfModVol_messageId')
-		String cloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')
-
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)
-		String deleteAAIVolumeGrpIdRequest = aaiEndpoint + '/' + URLEncoder.encode(cloudRegion, "UTF-8")  + "/volume-groups/volume-group/" +  UriUtils.encode(groupId, "UTF-8")
-
-		if(resourceVersion !=null){
-			deleteAAIVolumeGrpIdRequest = deleteAAIVolumeGrpIdRequest +'?resource-version=' + UriUtils.encode(resourceVersion, 'UTF-8')
-		}
-
-		utils.logAudit('Delete AAI volume group : ' + deleteAAIVolumeGrpIdRequest)
-		utils.log("DEBUG", "Delete AAI volume group : " + deleteAAIVolumeGrpIdRequest, isDebugEnabled)
-
-		APIResponse response = aaiUtil.executeAAIDeleteCall(execution, deleteAAIVolumeGrpIdRequest)
-
-		String returnCode = response.getStatusCode()
-		String aaiResponseAsString = response.getResponseBodyAsString()
-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-
-		utils.logAudit("AAI delete volume group return code: " + returnCode)
-		utils.logAudit("AAI delete volume group response: " + aaiResponseAsString)
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		if (returnCode=='200' || (returnCode == '204')) {
-			utils.log("DEBUG", "Volume group $groupId deleted.", isDebugEnabled)
-		} else {
-			if (returnCode=='404') {
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume group $groupId not found for delete in AAI Response code: 404")
-			} else {
-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		}
-	}
-
-
-	public void prepareDBRequest (Execution execution, isDebugLogEnabled) {
-
-		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")
-
-		def requestId = execution.getVariable('DELVfModVol_requestId')
-		def volOutputs = execution.getVariable('DELVfModVol_volumeOutputs')
-		def statusMessage = "VolumeGroup successfully deleted"
-		def progress = "100"
-		def requestStatus = "COMPLETE"
-
-		if (workflowExceptionObj != null) {
-			statusMessage = (workflowExceptionObj.getErrorMessage()).replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
-			execution.setVariable("DELVfModVol_WorkflowExceptionMessage", statusMessage)
-			execution.setVariable("DELVfModVol_WorkflowExceptionCode", workflowExceptionObj.getErrorCode())
-			requestStatus = "FAILURE"
-			progress = ""
-		}
-
-		String updateInfraRequest = """
-			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-					xmlns:req="http://org.openecomp.mso/requestsdb">
-				<soapenv:Header/>
-				<soapenv:Body>
-					<req:updateInfraRequest>
-						<requestId>${requestId}</requestId>
-						<lastModifiedBy>BPMN</lastModifiedBy>
-						<statusMessage>${statusMessage}</statusMessage>
-						<requestStatus>${requestStatus}</requestStatus>
-						<progress>${progress}</progress>
-						<vnfOutputs>${volOutputs}</vnfOutputs>
-					</req:updateInfraRequest>
-				</soapenv:Body>
-			</soapenv:Envelope>
-		"""
-
-		updateInfraRequest = utils.formatXml(updateInfraRequest)
-		execution.setVariable('DELVfModVol_updateInfraRequest', updateInfraRequest)
-		logDebug('Request for Update Infra Request:\n' + updateInfraRequest, isDebugLogEnabled)
-
-	}
-
-
-	public void prepareCompletionHandlerRequest (Execution execution, isDebugLogEnabled) {
-		def requestId = execution.getVariable("mso-request-id")
-		def source = execution.getVariable("DELVfModVol_source")
-
-		String msoCompletionRequest =
-			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-							xmlns:ns="http://org.openecomp/mso/request/types/v1">
-					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-						<request-id>${requestId}</request-id>
-						<action>DELETE</action>
-						<source>${source}</source>
-		   			</request-info>
-					<aetgt:status-message>Volume Group has been deleted successfully.</aetgt:status-message>
-		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: DELETE</aetgt:mso-bpel-name>
-				</aetgt:MsoCompletionRequest>"""
-
-		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-		execution.setVariable('DELVfModVol_CompleteMsoProcessRequest', xmlMsoCompletionRequest)
-		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugLogEnabled)
-
-	}
-
-
-
-	public void prepareFalloutHandler (Execution execution, isDebugEnabled) {
-
-		execution.setVariable("DELVfModVol_Success", false)
-		String requestId = execution.getVariable("DELVfModVol_requestId")
-		String source = execution.getVariable("DELVfModVol_source")
-
-		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")
-		def errorMessage = workflowExceptionObj.getErrorMessage()
-		def errorCode =  workflowExceptionObj.getErrorCode()
-
-		String falloutHandlerRequest =
-		    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-				      <request-id>${requestId}</request-id>
-				      <action>DELETE</action>
-				      <source>${source}</source>
-				   </request-info>
-					<aetgt:WorkflowException>
-				      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-				      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
-					</aetgt:WorkflowException>
-				</aetgt:FalloutHandlerRequest>"""
-
-		// Format Response
-		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)
-		utils.logAudit(xmlHandlerRequest)
-
-		execution.setVariable("DELVfModVol_FalloutHandlerRequest", xmlHandlerRequest)
-		utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)
-
-	}
-
-
-	/**
-	 * Create a WorkflowException for the error case where the Tenant Id from
-	 * AAI did not match the Tenant Id in the incoming request.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void handleTenantIdMismatch(Execution execution, isDebugLogEnabled) {
-
-		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')
-		def aicCloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')
-		def tenantId = execution.getVariable('DELVfModVol_tenantId')
-		def volumeGroupTenantId = execution.getVariable('DELVfModVol_volumeGroupTenantId')
-
-		def String errorMessage = 'TenantId ' + tenantId + ' in incoming request does not match Tenant Id ' + volumeGroupTenantId +
-			' retrieved from AAI for Volume Group Id ' + volumeGroupId
-
-		logError('Error in DeleteVfModuleVolume: ' + errorMessage)
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		exceptionUtil.buildWorkflowException(execution, 5000, errorMessage)
-
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.json.JsonSlurper

+

+import java.util.concurrent.ExecutionException;

+

+import org.springframework.web.util.UriUtils

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

+import org.openecomp.mso.bpmn.common.scripts.VidUtils;

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse

+

+/**

+ * This groovy class supports the <class>DeleteVfModuleVolume.bpmn</class> process.

+ */

+public class DeleteVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {

+

+	private XmlParser xmlParser = new XmlParser()

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DeleteVfModuleVolume.bpmn</class> process.

+	 * @param execution

+	 */

+	public InitializeProcessVariables(Execution execution){

+		execution.setVariable('prefix', 'DELVfModVol_')

+		execution.setVariable("DELVfModVol_volumeRequest", null)

+		execution.setVariable('DELVfModVol_requestInfo', null)

+		execution.setVariable('DELVfModVol_requestId', null)

+		execution.setVariable('DELVfModVol_source', null)

+		execution.setVariable('DELVfModVol_volumeInputs', null)

+		execution.setVariable('DELVfModVol_volumeOutputs', null)

+		execution.setVariable('DELVfModVol_volumeGroupId', null)

+		execution.setVariable('DELVfModVol_vnfType', null)

+		execution.setVariable('DELVfModVol_serviceId', null)

+		execution.setVariable('DELVfModVol_cloudRegion', null)

+		execution.setVariable('DELVfModVol_tenantId', null)

+		execution.setVariable('DELVfModVol_volumeParams', null)

+		execution.setVariable('DELVfModVol_volumeGroupHeatStackId', null)

+		execution.setVariable('DELVfModVol_volumeGroupTenantId', null)

+		execution.setVariable("DELVfModVol_queryAAIVolGrpResponse", null)

+		execution.setVariable('DELVfModVol_messageId', null)

+		execution.setVariable('DELVfModVol_deleteVnfARequest', null)

+		execution.setVariable('DELVfModVol_updateInfraRequest', null)

+		execution.setVariable('DELVfModVol_CompleteMsoProcessRequest', null)

+		execution.setVariable('DELVfModVol_WorkflowException', null)

+		execution.setVariable('DELVfModVol_TransactionSuccessIndicator', false)

+		execution.setVariable("DELVfModVol_isErrorMessageException", false)

+		execution.setVariable('DELVfModVol_syncResponseSent', false)

+	}

+

+	/**

+	 * Perform initial processing, such as request validation, initialization of variables, etc.

+	 * * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		preProcessRequest(execution, isDebugEnabled)

+	}

+

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DeleteVfModuleVolume.bpmn</class> process.

+	 * @param execution

+	 */

+	public void preProcessRequest (Execution execution, isDebugLogEnabled) {

+

+		InitializeProcessVariables(execution)

+

+		String createVolumeIncoming = validateRequest(execution)

+		utils.logAudit(createVolumeIncoming)

+

+		// check if request is xml or json

+		try {

+			def jsonSlurper = new JsonSlurper()

+			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)

+			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)

+

+			def serviceInstanceId = execution.getVariable('serviceInstanceId')

+			def volumeGroupId = execution.getVariable('volumeGroupId')

+			def vidUtils = new VidUtils(this)

+			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'DELETE_VF_MODULE_VOL', serviceInstanceId, volumeGroupId)

+			execution.setVariable("DELVfModVol_isVidRequest", true)

+		}

+		catch(groovy.json.JsonException je) {

+			utils.log("DEBUG", " Request is in XML format.", isDebugLogEnabled)

+			// assume request is in XML format - proceed as usual to process XML request

+		}

+

+		String request = utils.getNodeXml(createVolumeIncoming, "volume-request").drop(38).trim().replace("tag0:","").replace(":tag0","")

+		execution.setVariable("DELVfModVol_volumeRequest", request)

+

+		def requestInfo = getRequiredNodeXml(execution, request, 'request-info')

+		execution.setVariable('DELVfModVol_requestInfo', requestInfo)

+		String requestId = execution.getVariable("mso-request-id")

+		if (requestId == null || requestId == "") {

+			requestId = getRequiredNodeText(execution, requestInfo, 'request-id')

+		}

+		execution.setVariable('DELVfModVol_requestId', requestId)

+		execution.setVariable('DELVfModVol_source', getNodeTextForce(requestInfo, 'source'))

+

+		def volumeInputs = getRequiredNodeXml(execution, request, 'volume-inputs')

+		execution.setVariable('DELVfModVol_volumeInputs', volumeInputs)

+		execution.setVariable('DELVfModVol_volumeGroupId', getRequiredNodeText(execution, volumeInputs, 'volume-group-id'))

+		execution.setVariable('DELVfModVol_vnfType', getRequiredNodeText(execution, volumeInputs, 'vnf-type'))

+		execution.setVariable('DELVfModVol_serviceId', utils.getNodeText1(volumeInputs, 'service-id'))

+		execution.setVariable('DELVfModVol_tenantId', getRequiredNodeText(execution, volumeInputs, 'tenant-id'))

+		execution.setVariable('DELVfModVol_messageId', UUID.randomUUID().toString())

+		execution.setVariable('DELVfModVol_volumeOutputs', utils.getNodeXml(request, 'volume-outputs', false))

+		execution.setVariable('DELVfModVol_volumeParams', utils.getNodeXml(request, 'volume-params'))

+		execution.setVariable('DELVfModVol_cloudRegion', utils.getNodeText1(request, 'aic-cloud-region'))

+

+		try {

+			// Catalog DB headers Authorization

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		

+		logDebug('Request: ' + createVolumeIncoming, isDebugLogEnabled)

+	}

+

+	public void sendSyncResponse (Execution execution, isDebugEnabled) {

+

+		String volumeRequest = execution.getVariable("DELVfModVol_volumeRequest")

+		utils.log("DEBUG", " DELVfModVol_volumeRequest - " + "\n" + volumeRequest, isDebugEnabled)

+		// RESTResponse (for API Handler (APIH) Reply Task)

+		String deleteVolumeRequest =

+				"""<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd" statusCode="200">

+                <rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

+                          contentType="text/xml">

+			        ${volumeRequest}

+                </rest:payload>

+		       </rest:RESTResponse>""".trim()

+

+		def isVidRequest = execution.getVariable('DELVfModVol_isVidRequest')

+		def syncResponse = ''

+

+		if(isVidRequest) {

+			def serviceInstanceId = execution.getVariable('serviceInstanceId')

+			def volumeGroupId = execution.getVariable('volumeGroupId')

+			def requestId = execution.getVariable('DELVfModVol_requestId')

+			syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()

+		}

+		else {

+			syncResponse = utils.formatXml(deleteVolumeRequest)

+		}

+

+		execution.setVariable('DELVfModVol_syncResponseSent', true)

+

+		sendWorkflowResponse(execution, 200, syncResponse)

+	}

+

+

+	public void sendSyncError (Execution execution, isDebugEnabled) {

+		WorkflowException we = execution.getVariable('WorkflowException')

+		def errorCode = we?.getErrorCode()

+		def errorMessage = we?.getErrorMessage()

+		//default to 400 since only invalid request will trigger this method

+		sendWorkflowResponse(execution, 400, errorMessage)

+	}

+

+

+	public void callRESTQueryAAICloudRegion (Execution execution, isDebugEnabled) {

+

+		String cloudRegion = execution.getVariable('DELVfModVol_cloudRegion')

+

+		String aai_endpoint = execution.getVariable("URN_aai_endpoint")

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aai_uri = aaiUtil.getCloudInfrastructureCloudRegionUri(execution)

+		String queryCloudRegionRequest = "${aai_endpoint}${aai_uri}/" + cloudRegion

+		utils.logAudit(queryCloudRegionRequest)

+		execution.setVariable("DELVfModVol_queryCloudRegionRequest", queryCloudRegionRequest)

+		utils.log("DEBUG", " DELVfModVol_queryCloudRegionRequest - " + "\n" + queryCloudRegionRequest, isDebugEnabled)

+

+		cloudRegion = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+

+		if ((cloudRegion != "ERROR")) {

+			if(execution.getVariable("DELVfModVol_queryCloudRegionReturnCode") == "404"){

+				execution.setVariable("DELVfModVol_aicCloudRegion", "AAIAIC25")

+			}else{

+				execution.setVariable("DELVfModVol_aicCloudRegion", cloudRegion)

+			}

+			execution.setVariable("DELVfModVol_cloudRegion", cloudRegion)

+			execution.setVariable("DELVfModVol_isCloudRegionGood", true)

+

+		} else {

+			utils.log("DEBUG", "AAI Query Cloud Region Unsuccessful.", isDebugEnabled)

+			execution.setVariable("DELVfModVol_isCloudRegionGood", false)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "AAI Query Cloud Region Unsuccessful. Return Code: " + execution.getVariable("DELVfModVol_queryCloudRegionReturnCode"))

+		}

+

+		utils.log("DEBUG", " is Cloud Region Good: " + execution.getVariable("DELVfModVol_isCloudRegionGood"), isDebugEnabled)

+	}

+

+	/**

+	 * Query volume group by id

+	 * @param execution

+	 */

+	public void queryAAIForVolumeGroup(Execution execution, isDebugLogEnabled) {

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+

+		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')

+		if(volumeGroupId == null) {

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, 'volume-group-id is not provided in the request')

+			throw new Exception('volume-group-id is not provided in the request')

+		}

+		String cloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')

+

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)

+		String queryAAIVolumeGroupRequest = aaiEndpoint + '/' + URLEncoder.encode(cloudRegion, "UTF-8") + "/volume-groups/volume-group/" + UriUtils.encode(volumeGroupId, "UTF-8")

+

+		utils.logAudit('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest)

+		logDebug('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest, isDebugLogEnabled)

+

+		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVolumeGroupRequest)

+

+		String returnCode = response.getStatusCode()

+		String aaiResponseAsString = response.getResponseBodyAsString()

+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+

+		utils.logAudit("AAI query volume group by id return code: " + returnCode)

+		utils.logAudit("AAI query volume group by id response: " + aaiResponseAsString)

+

+		execution.setVariable("DELVfModVol_queryAAIVolGrpResponse", aaiResponseAsString)

+

+		if (returnCode=='200' || returnCode == '204') {

+

+			def heatStackId = getNodeTextForce(aaiResponseAsString, 'heat-stack-id')

+			execution.setVariable('DELVfModVol_volumeGroupHeatStackId', heatStackId)

+

+			if(hasVfModuleRelationship(aaiResponseAsString)){

+				utils.log("DEBUG", 'Volume Group ' + volumeGroupId + ' currently in use', isDebugLogEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group ${volumeGroupId} currently in use - found vf-module relationship.")

+			}

+

+			def volumeGroupTenantId = getTenantIdFromVolumeGroup(aaiResponseAsString)

+			if (volumeGroupTenantId == null) {

+				utils.log("DEBUG", "Could not find Tenant Id element in Volume Group with Volume Group Id ${volumeGroupId}", isDebugLogEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Could not find Tenant Id element in Volume Group with Volume Group Id ${volumeGroupId}")

+			}

+

+			execution.setVariable('DELVfModVol_volumeGroupTenantId', volumeGroupTenantId)

+			logDebug('Received Tenant Id ' + volumeGroupTenantId + ' from AAI for Volume Group with Volume Group Id ' + volumeGroupId , isDebugLogEnabled)

+		}

+		else {

+			if (returnCode=='404') {

+				utils.log("DEBUG", "Volume Group ${volumeGroupId} not found in AAI", isDebugLogEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group ${volumeGroupId} not found in AAI. Response code: 404")

+			}

+			else {

+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		}

+	}

+

+	/**

+	 * Extract the Tenant Id from the Volume Group information returned by AAI.

+	 *

+	 * @param volumeGroupXml Volume Group XML returned by AAI.

+	 * @return the Tenant Id extracted from the Volume Group information. 'null' is returned if

+	 * the Tenant Id is missing or could not otherwise be extracted.

+	 */

+	private String getTenantIdFromVolumeGroup(String volumeGroupXml) {

+		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)

+		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')

+		if (relationshipList != null) {

+			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

+			for (Node relationship in relationships) {

+				def Node relatedTo = utils.getChildNode(relationship, 'related-to')

+				if ((relatedTo != null) && (relatedTo.text().equals('tenant'))) {

+					def NodeList relationshipDataList = utils.getIdenticalChildren(relationship, 'relationship-data')

+					for (Node relationshipData in relationshipDataList) {

+						def Node relationshipKey = utils.getChildNode(relationshipData, 'relationship-key')

+						if ((relationshipKey != null) && (relationshipKey.text().equals('tenant.tenant-id'))) {

+							def Node relationshipValue = utils.getChildNode(relationshipData, 'relationship-value')

+							if (relationshipValue != null) {

+								return relationshipValue.text()

+							}

+						}

+					}

+				}

+			}

+		}

+		return null

+	}

+

+	private boolean hasVnfRelationship(String volumeGroupXml) {

+		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)

+		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')

+		if (relationshipList != null) {

+			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

+			for (Node relationship in relationships) {

+				def Node relatedTo = utils.getChildNode(relationship, 'related-to')

+				if ((relatedTo != null) && (relatedTo.text().equals('generic-vnf'))) {

+					def Node relatedLink = utils.getChildNode(relationship, 'related-link')

+					if (relatedLink !=null && relatedLink.text() != null){

+						return true

+					}

+				}

+			}

+		}

+		return false

+	}

+

+	private boolean hasVfModuleRelationship(String volumeGroupXml) {

+		def Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)

+		def Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')

+		if (relationshipList != null) {

+			def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

+			for (Node relationship in relationships) {

+				def Node relatedTo = utils.getChildNode(relationship, 'related-to')

+				if ((relatedTo != null) && (relatedTo.text().equals('vf-module'))) {

+					def Node relatedLink = utils.getChildNode(relationship, 'related-link')

+					if (relatedLink !=null && relatedLink.text() != null){

+						return true

+					}

+				}

+			}

+		}

+		return false

+	}

+

+	public void prepareVnfAdapterDeleteRequest(Execution execution, isDebugLogEnabled) {

+		def cloudRegion = execution.getVariable('DELVfModVol_cloudRegion')

+		def tenantId = execution.getVariable('DELVfModVol_tenantId')

+		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')

+		def volumeGroupHeatStackId = execution.getVariable('DELVfModVol_volumeGroupHeatStackId')

+		def requestId = execution.getVariable('DELVfModVol_requestId')

+		def serviceId = execution.getVariable('DELVfModVol_serviceId')

+

+		def messageId = execution.getVariable('DELVfModVol_messageId')

+		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId) 

+		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")

+		if ('true'.equals(useQualifiedHostName)) {

+				notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)

+		}

+

+		String vnfAdapterRestRequest = """

+			<deleteVolumeGroupRequest>

+				<cloudSiteId>${cloudRegion}</cloudSiteId>

+				<tenantId>${tenantId}</tenantId>

+				<volumeGroupId>${volumeGroupId}</volumeGroupId>

+				<volumeGroupStackId>${volumeGroupHeatStackId}</volumeGroupStackId>

+				<skipAAI>true</skipAAI>

+			    <msoRequest>

+			        <requestId>${requestId}</requestId>

+			        <serviceInstanceId>${serviceId}</serviceInstanceId>

+			    </msoRequest>

+			    <messageId>${messageId}</messageId>

+			    <notificationUrl>${notificationUrl}</notificationUrl>

+			</deleteVolumeGroupRequest>

+		"""

+		vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)

+		execution.setVariable('DELVfModVol_deleteVnfARequest', vnfAdapterRestRequest)

+		logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)

+	}

+

+

+	public void deleteVolGrpId(Execution execution, isDebugEnabled) {

+

+		// get variables

+		String queryAAIVolGrpIdResponse = execution.getVariable("DELVfModVol_queryAAIVolGrpResponse")

+		String groupId = utils.getNodeText(queryAAIVolGrpIdResponse, "volume-group-id")

+		String resourceVersion = utils.getNodeText(queryAAIVolGrpIdResponse, "resource-version")

+		String messageId = execution.getVariable('DELVfModVol_messageId')

+		String cloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')

+

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)

+		String deleteAAIVolumeGrpIdRequest = aaiEndpoint + '/' + URLEncoder.encode(cloudRegion, "UTF-8")  + "/volume-groups/volume-group/" +  UriUtils.encode(groupId, "UTF-8")

+

+		if(resourceVersion !=null){

+			deleteAAIVolumeGrpIdRequest = deleteAAIVolumeGrpIdRequest +'?resource-version=' + UriUtils.encode(resourceVersion, 'UTF-8')

+		}

+

+		utils.logAudit('Delete AAI volume group : ' + deleteAAIVolumeGrpIdRequest)

+		utils.log("DEBUG", "Delete AAI volume group : " + deleteAAIVolumeGrpIdRequest, isDebugEnabled)

+

+		APIResponse response = aaiUtil.executeAAIDeleteCall(execution, deleteAAIVolumeGrpIdRequest)

+

+		String returnCode = response.getStatusCode()

+		String aaiResponseAsString = response.getResponseBodyAsString()

+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+

+		utils.logAudit("AAI delete volume group return code: " + returnCode)

+		utils.logAudit("AAI delete volume group response: " + aaiResponseAsString)

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		if (returnCode=='200' || (returnCode == '204')) {

+			utils.log("DEBUG", "Volume group $groupId deleted.", isDebugEnabled)

+		} else {

+			if (returnCode=='404') {

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume group $groupId not found for delete in AAI Response code: 404")

+			} else {

+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		}

+	}

+

+

+	public void prepareDBRequest (Execution execution, isDebugLogEnabled) {

+

+		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")

+

+		def requestId = execution.getVariable('DELVfModVol_requestId')

+		def volOutputs = execution.getVariable('DELVfModVol_volumeOutputs')

+		def statusMessage = "VolumeGroup successfully deleted"

+		def progress = "100"

+		def requestStatus = "COMPLETE"

+

+		if (workflowExceptionObj != null) {

+			statusMessage = (workflowExceptionObj.getErrorMessage()).replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")

+			execution.setVariable("DELVfModVol_WorkflowExceptionMessage", statusMessage)

+			execution.setVariable("DELVfModVol_WorkflowExceptionCode", workflowExceptionObj.getErrorCode())

+			requestStatus = "FAILURE"

+			progress = ""

+		}

+

+		String updateInfraRequest = """

+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

+					xmlns:req="http://org.openecomp.mso/requestsdb">

+				<soapenv:Header/>

+				<soapenv:Body>

+					<req:updateInfraRequest>

+						<requestId>${requestId}</requestId>

+						<lastModifiedBy>BPMN</lastModifiedBy>

+						<statusMessage>${statusMessage}</statusMessage>

+						<requestStatus>${requestStatus}</requestStatus>

+						<progress>${progress}</progress>

+						<vnfOutputs>${volOutputs}</vnfOutputs>

+					</req:updateInfraRequest>

+				</soapenv:Body>

+			</soapenv:Envelope>

+		"""

+

+		updateInfraRequest = utils.formatXml(updateInfraRequest)

+		execution.setVariable('DELVfModVol_updateInfraRequest', updateInfraRequest)

+		logDebug('Request for Update Infra Request:\n' + updateInfraRequest, isDebugLogEnabled)

+

+	}

+

+

+	public void prepareCompletionHandlerRequest (Execution execution, isDebugLogEnabled) {

+		def requestId = execution.getVariable("mso-request-id")

+		def source = execution.getVariable("DELVfModVol_source")

+

+		String msoCompletionRequest =

+			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+							xmlns:ns="http://org.openecomp/mso/request/types/v1">

+					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+						<request-id>${requestId}</request-id>

+						<action>DELETE</action>

+						<source>${source}</source>

+		   			</request-info>

+					<aetgt:status-message>Volume Group has been deleted successfully.</aetgt:status-message>

+		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: DELETE</aetgt:mso-bpel-name>

+				</aetgt:MsoCompletionRequest>"""

+

+		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

+		execution.setVariable('DELVfModVol_CompleteMsoProcessRequest', xmlMsoCompletionRequest)

+		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugLogEnabled)

+

+	}

+

+

+

+	public void prepareFalloutHandler (Execution execution, isDebugEnabled) {

+

+		execution.setVariable("DELVfModVol_Success", false)

+		String requestId = execution.getVariable("DELVfModVol_requestId")

+		String source = execution.getVariable("DELVfModVol_source")

+

+		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")

+		def errorMessage = workflowExceptionObj.getErrorMessage()

+		def errorCode =  workflowExceptionObj.getErrorCode()

+

+		String falloutHandlerRequest =

+		    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+				      <request-id>${requestId}</request-id>

+				      <action>DELETE</action>

+				      <source>${source}</source>

+				   </request-info>

+					<aetgt:WorkflowException>

+				      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

+				      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>

+					</aetgt:WorkflowException>

+				</aetgt:FalloutHandlerRequest>"""

+

+		// Format Response

+		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)

+		utils.logAudit(xmlHandlerRequest)

+

+		execution.setVariable("DELVfModVol_FalloutHandlerRequest", xmlHandlerRequest)

+		utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)

+

+	}

+

+

+	/**

+	 * Create a WorkflowException for the error case where the Tenant Id from

+	 * AAI did not match the Tenant Id in the incoming request.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void handleTenantIdMismatch(Execution execution, isDebugLogEnabled) {

+

+		def volumeGroupId = execution.getVariable('DELVfModVol_volumeGroupId')

+		def aicCloudRegion = execution.getVariable('DELVfModVol_aicCloudRegion')

+		def tenantId = execution.getVariable('DELVfModVol_tenantId')

+		def volumeGroupTenantId = execution.getVariable('DELVfModVol_volumeGroupTenantId')

+

+		def String errorMessage = 'TenantId ' + tenantId + ' in incoming request does not match Tenant Id ' + volumeGroupTenantId +

+			' retrieved from AAI for Volume Group Id ' + volumeGroupId

+

+		logError('Error in DeleteVfModuleVolume: ' + errorMessage)

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		exceptionUtil.buildWorkflowException(execution, 5000, errorMessage)

+

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
index ed65dbc..2d5ddf0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
@@ -1,37 +1,37 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

  */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+package org.openecomp.mso.bpmn.infrastructure.scripts;

 
 import groovy.xml.XmlUtil
 import groovy.json.*
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

 
 import java.util.HashMap;
 import java.util.Map;
@@ -223,8 +223,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "networkInputs", networkInputs)
 			utils.log("DEBUG", Prefix + "networkInputs - " + '\n' + networkInputs, isDebugEnabled)
 			
-			
-			
 			// prepare messageId
 			String messageId = execution.getVariable("testMessageId")  // for testing
 			if (messageId == null || messageId == "") {
@@ -491,7 +489,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String queryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId
+			String queryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
 			utils.logAudit(queryIdAAIRequest)
 			execution.setVariable(Prefix + "queryIdAAIRequest", queryIdAAIRequest)
 			utils.log("DEBUG", Prefix + "queryIdAAIRequest - " + "\n" + queryIdAAIRequest, isDebugEnabled)
@@ -570,7 +568,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String requeryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId
+			String requeryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
 			utils.logAudit(requeryIdAAIRequest)
 			execution.setVariable(Prefix + "requeryIdAAIRequest", requeryIdAAIRequest)
 			utils.log("DEBUG", Prefix + "requeryIdAAIRequest - " + "\n" + requeryIdAAIRequest, isDebugEnabled)
@@ -1078,7 +1076,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String updateContrailAAIUrlRequest = "${aai_endpoint}${aai_uri}/" + networkId
+			String updateContrailAAIUrlRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
 
 			utils.logAudit(updateContrailAAIUrlRequest)
 			execution.setVariable(Prefix + "updateContrailAAIUrlRequest", updateContrailAAIUrlRequest)
@@ -1092,18 +1090,11 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "updateContrailAAIPayloadRequest", payloadXml)
 			utils.log("DEBUG", " 'payload' to Update Contrail - " + "\n" + payloadXml, isDebugEnabled)
 
-			RESTConfig config = new RESTConfig(updateContrailAAIUrlRequest);
-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-													  .addHeader("X-FromAppId", "MSO")
-													  .addHeader("Content-Type", "application/xml")
-													  .addHeader("Accept","application/xml");
-
-			APIResponse response = client.httpPut(payload)
+			APIResponse response = aaiUriUtil.executeAAIPutCall(execution, updateContrailAAIUrlRequest, payloadXml)
+						
 			String returnCode = response.getStatusCode()
 			execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", returnCode)
-
 			utils.log("DEBUG", " ***** AAI Update Contrail Response Code  : " + returnCode, isDebugEnabled)
-
 			String aaiUpdateContrailResponseAsString = response.getResponseBodyAsString()
 
 			if (returnCode=='200') {
@@ -1117,7 +1108,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 				} else {
 				   execution.setVariable(Prefix + "isPONR", true)
 				}  
-
+				utils.log("DEBUG", Prefix + "isPONR" + ": " + execution.getVariable(Prefix + "isPONR"), isDebugEnabled)
 			} else {
 				if (returnCode=='404') {
 					String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
@@ -1162,7 +1153,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			// get variables
 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId == null) {
-				requestId = execution.getVariable("mso-request-id") 
+				requestId = execution.getVariable("mso-request-id") 

 			}
 			String messageId = execution.getVariable(Prefix + "messageId")
 			String source    = execution.getVariable(Prefix + "source")
@@ -1209,12 +1200,12 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String networkId = execution.getVariable(Prefix + "networkId")
 			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// get/set 'msoRequestId' and 'mso-request-id'
+			// get/set 'msoRequestId' and 'mso-request-id'

 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
+				execution.setVariable("mso-request-id", requestId)

 			} else {
-			    requestId = execution.getVariable("mso-request-id")
+			    requestId = execution.getVariable("mso-request-id")

 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
 			
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
index 0ad42f9..5b9cebc 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
@@ -1,387 +1,387 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-/**
- * This groovy class supports the <class>DoCreateNetworkInstance.bpmn</class> process.
- *
- */
-public class DoCreateNetworkInstanceRollback extends AbstractServiceTaskProcessor {
-	String Prefix="CRENWKIR_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-	
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
-		execution.setVariable(Prefix + "rollbackSDNCRequest", null)
-		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", null)
-		execution.setVariable(Prefix + "WorkflowException", null)
-		
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-		
-		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "fullRollback", false)
-		execution.setVariable(Prefix + "networkId", "")
-		execution.setVariable(Prefix + "urlRollbackPoNetwork", "")
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		
-		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + className + ".groovy ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-			
-			// GET Incoming request/variables
-			String rollbackNetworkRequest = null
-			String rollbackSDNCRequest = null
-			String rollbackActivateSDNCRequest = null
-			
-			// Partial Rollback
-			Map<String, String> rollbackData = execution.getVariable("rollbackData")
-			if (rollbackData != null && rollbackData instanceof Map) {
-
-					if(rollbackData.containsKey("rollbackSDNCRequest")) {
-					   rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
-					}
-					
-					if(rollbackData.containsKey("rollbackNetworkRequest")) {
-						rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
-					}
-
-					if(rollbackData.containsKey("rollbackActivateSDNCRequest")) {
-					   rollbackActivateSDNCRequest = rollbackData["rollbackActivateSDNCRequest"]
-					}
-					
-			}
-			
-			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
-			execution.setVariable(Prefix + "rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)
-			utils.log("DEBUG", "'rollbackData': " + '\n' + execution.getVariable("rollbackData"), isDebugEnabled)
-			
-			String sdncVersion = execution.getVariable("sdncVersion")
-			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-	
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				utils.log("DEBUG", dataErrorMessage , isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			utils.log("DEBUG", "*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)
-			if(execution.getVariable(Prefix + "WorkflowException") != null) {
-				// called by: DoCreateNetworkInstance, partial rollback
-				execution.setVariable(Prefix + "fullRollback", false)
-
-			} else {
-			   // called by: Macro - Full Rollback, WorkflowException = null
-			   execution.setVariable(Prefix + "fullRollback", true)
-			
-			}
-			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
-			
-		
-		} catch (BpmnError e) {
-		throw e;
-		
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		
-		}
-
-	}
-	
-	public void callPONetworkAdapter (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside callPONetworkAdapter() of " + className + " ***** ", isDebugEnabled)
-		
-		try {
-			String poUrl = execution.getVariable("URN_mso_adapters_network_rest_endpoint")
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			String networkId = utils.getNodeText1(rollbackSDNCRequest, "network-id")
-		
-			String rollbackNetworkRequest  = execution.getVariable(Prefix + "rollbackNetworkRequest")
-
-			String urlRollbackPoNetwork = poUrl+ "/" + networkId + "/rollback"
-			utils.log("DEBUG", "'urlRollbackPoNetwork': " + urlRollbackPoNetwork, isDebugEnabled)
-			execution.setVariable(Prefix + "urlRollbackPoNetwork", urlRollbackPoNetwork)
-
-			RESTConfig config = new RESTConfig(urlRollbackPoNetwork)
-			RESTClient client = new RESTClient(config).
-									     addHeader("Content-Type", "application/xml").
-									  addAuthorizationHeader(execution.getVariable("BasicAuthHeaderValuePO"));
-
-		    APIResponse response = client.httpDelete(rollbackNetworkRequest)
-			String responseCode = response.getStatusCode()
-			String responseBody = response.getResponseBodyAsString() 
-		
-			execution.setVariable(Prefix + "rollbackNetworkReturnCode", responseCode)
-			execution.setVariable(Prefix + "rollbackNetworkResponse", responseBody)
-		
-			utils.log("DEBUG", " Network Adapter rollback responseCode: " + responseCode, isDebugEnabled)
-			utils.log("DEBUG", " Network Adapter rollback responseBody: " + responseBody, isDebugEnabled)
-		
-			
-		} catch (Exception ex) {
-			String exceptionMessage = "Exception Encountered in callPONetworkAdapter() of DoCreateNetworkInstanceRollback flow - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-		
-	}
-	
-	
-	public void validateRollbackResponses (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside validateRollbackResponses() of DoCreateNetworkInstanceRollback ***** ", isDebugEnabled)
-		
-		try {
-			// validate PO network rollback response
-			String rollbackNetworkErrorMessages = ""
-			String rollbackNetworkReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
-				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
-				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")
-				utils.log("DEBUG", " NetworkRollback Code - " + rollbackNetworkReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " NetworkRollback Response - " + rollbackNetworkResponse, isDebugEnabled)
-				if (rollbackNetworkReturnCode != "200") {
-					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
-				} else {
-					rollbackNetworkErrorMessages = " + PO Network rollback completed."
-				}
-			}
-			
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			String rollbackSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
-				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
-				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
-				String rollbackSDNCReturnInnerCode = ""
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)
-				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-						    rollbackSdncErrorMessages = " + SNDC assign rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
-						}
-					} else {
-						  rollbackSdncErrorMessages = " + SNDC assign rollback completed."
-					}  
-				 } else {
-					  rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
-			     }
-				utils.log("DEBUG", " SDNC assign rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " SDNC assign rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)
-			}	
-
-			// validate SDNC activate rollback response
-			String rollbackActivateSdncErrorMessages = ""
-			String rollbackActivateSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackActivateSDNCRequest") != null) {
-				rollbackActivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackActivateSDNCReturnCode")
-				String rollbackActivateSDNCResponse = execution.getVariable(Prefix + "rollbackActivateSDNCResponse")
-				String rollbackActivateSDNCReturnInnerCode = ""
-				rollbackActivateSDNCResponse = sdncAdapterUtils.decodeXML(rollbackActivateSDNCResponse)
-				rollbackActivateSDNCResponse = rollbackActivateSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackActivateSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackActivateSDNCResponse, "response-code")) {
-						rollbackActivateSDNCReturnInnerCode = utils.getNodeText1(rollbackActivateSDNCResponse, "response-code")
-						if (rollbackActivateSDNCReturnInnerCode == "200" || rollbackActivateSDNCReturnInnerCode == "" || rollbackActivateSDNCReturnInnerCode == "0") {
-						   rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
-						} else {
-							rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
-						}
-					} else {
-						 rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
-					}
-				} else {
-					  rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
-				}
-				utils.log("DEBUG", " SDNC activate rollback Code - " + rollbackActivateSDNCReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " SDNC activate rollback  Response - " + rollbackActivateSDNCResponse, isDebugEnabled)
-			}	
-
-
-			String statusMessage = ""
-			int errorCode = 7000
-			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
-			if (execution.getVariable(Prefix + "fullRollback") == false) { 
-				// original WorkflowException, 
-				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException") 
-				if (wfe != null) {
-				   // rollback due to failure in DoCreate - Partial rollback
-				   statusMessage = wfe.getErrorMessage()
-				   errorCode = wfe.getErrorCode()
-				} else {
-				   statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-				   errorCode = '7000'
-			    }
-
-				// set if all rolledbacks are successful
-				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
-					execution.setVariable("rolledBack", true)
-					execution.setVariable("wasDeleted", true)
-					
-				} else {
-					execution.setVariable("rolledBack", false)
-					execution.setVariable("wasDeleted", true)
-				}
-
-				statusMessage = statusMessage + rollbackActivateSdncErrorMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-				utils.log("DEBUG", "Final DoCreateNetworkInstanceRollback status message: " + statusMessage, isDebugEnabled)
-				String processKey = getProcessKey(execution);
-				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
-				execution.setVariable("workflowException", exception);
-				
-			} else { 
-				// rollback due to failures in Main flow (Macro) - Full rollback
-				// WorkflowException = null
-			    if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
-					execution.setVariable("rollbackSuccessful", true)
-					execution.setVariable("rollbackError", false)
-			    } else {
-				    String exceptionMessage = "Network Create Rollback was not Successful. "
-                    utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-					execution.setVariable("rollbackSuccessful", false)
-				    execution.setVariable("rollbackError", true)
-					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-					throw new BpmnError("MSOWorkflowException")
-			    }
-				  
-			} 
-			
-
-		} catch (Exception ex) {
-			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-
-	
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		
-		try{
-			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-			
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils

+

+/**

+ * This groovy class supports the <class>DoCreateNetworkInstance.bpmn</class> process.

+ *

+ */

+public class DoCreateNetworkInstanceRollback extends AbstractServiceTaskProcessor {

+	String Prefix="CRENWKIR_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)

+	NetworkUtils networkUtils = new NetworkUtils()

+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()

+

+	def className = getClass().getSimpleName()

+	

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.

+	 * @param execution

+	 */

+	public InitializeProcessVariables(Execution execution){

+		/* Initialize all the process variables in this block */

+

+		execution.setVariable(Prefix + "rollbackNetworkRequest", null)

+		execution.setVariable(Prefix + "rollbackSDNCRequest", null)

+		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", null)

+		execution.setVariable(Prefix + "WorkflowException", null)

+		

+		execution.setVariable(Prefix + "rollbackNetworkRequest", "")

+		execution.setVariable(Prefix + "rollbackNetworkResponse", "")

+		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")

+

+		execution.setVariable(Prefix + "rollbackSDNCRequest", "")

+		execution.setVariable(Prefix + "rollbackSDNCResponse", "")

+		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")

+		

+		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")

+		execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")

+		execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")

+

+		execution.setVariable(Prefix + "Success", false)

+		execution.setVariable(Prefix + "fullRollback", false)

+		execution.setVariable(Prefix + "networkId", "")

+		execution.setVariable(Prefix + "urlRollbackPoNetwork", "")

+

+	}

+

+	// **************************************************

+	//     Pre or Prepare Request Section

+	// **************************************************

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.

+	 * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		

+		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + className + ".groovy ***** ", isDebugEnabled)

+

+		try {

+			// initialize flow variables

+			InitializeProcessVariables(execution)

+			

+			// GET Incoming request/variables

+			String rollbackNetworkRequest = null

+			String rollbackSDNCRequest = null

+			String rollbackActivateSDNCRequest = null

+			

+			// Partial Rollback

+			Map<String, String> rollbackData = execution.getVariable("rollbackData")

+			if (rollbackData != null && rollbackData instanceof Map) {

+

+					if(rollbackData.containsKey("rollbackSDNCRequest")) {

+					   rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]

+					}

+					

+					if(rollbackData.containsKey("rollbackNetworkRequest")) {

+						rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]

+					}

+

+					if(rollbackData.containsKey("rollbackActivateSDNCRequest")) {

+					   rollbackActivateSDNCRequest = rollbackData["rollbackActivateSDNCRequest"]

+					}

+					

+			}

+			

+			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)

+			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)

+			execution.setVariable(Prefix + "rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)

+			utils.log("DEBUG", "'rollbackData': " + '\n' + execution.getVariable("rollbackData"), isDebugEnabled)

+			

+			String sdncVersion = execution.getVariable("sdncVersion")

+			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)

+

+			// PO Authorization Info / headers Authorization=

+			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)

+			try {

+				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))

+				execution.setVariable("BasicAuthHeaderValuePO",encodedString)

+				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)

+	

+			} catch (IOException ex) {

+				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "

+				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()

+				utils.log("DEBUG", dataErrorMessage , isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+			}

+

+			if (execution.getVariable("SavedWorkflowException1") != null) {

+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))

+			} else {

+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))

+			}

+			utils.log("DEBUG", "*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)

+			if(execution.getVariable(Prefix + "WorkflowException") != null) {

+				// called by: DoCreateNetworkInstance, partial rollback

+				execution.setVariable(Prefix + "fullRollback", false)

+

+			} else {

+			   // called by: Macro - Full Rollback, WorkflowException = null

+			   execution.setVariable(Prefix + "fullRollback", true)

+			

+			}

+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)

+			

+		

+		} catch (BpmnError e) {

+		throw e;

+		

+		} catch (Exception ex) {

+			// caught exception

+			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		

+		}

+

+	}

+	

+	public void callPONetworkAdapter (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside callPONetworkAdapter() of " + className + " ***** ", isDebugEnabled)

+		

+		try {

+			String poUrl = execution.getVariable("URN_mso_adapters_network_rest_endpoint")

+			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")

+			String networkId = utils.getNodeText1(rollbackSDNCRequest, "network-id")

+		

+			String rollbackNetworkRequest  = execution.getVariable(Prefix + "rollbackNetworkRequest")

+

+			String urlRollbackPoNetwork = poUrl+ "/" + networkId + "/rollback"

+			utils.log("DEBUG", "'urlRollbackPoNetwork': " + urlRollbackPoNetwork, isDebugEnabled)

+			execution.setVariable(Prefix + "urlRollbackPoNetwork", urlRollbackPoNetwork)

+

+			RESTConfig config = new RESTConfig(urlRollbackPoNetwork)

+			RESTClient client = new RESTClient(config).

+									     addHeader("Content-Type", "application/xml").

+									  addAuthorizationHeader(execution.getVariable("BasicAuthHeaderValuePO"));

+

+		    APIResponse response = client.httpDelete(rollbackNetworkRequest)

+			String responseCode = response.getStatusCode()

+			String responseBody = response.getResponseBodyAsString() 

+		

+			execution.setVariable(Prefix + "rollbackNetworkReturnCode", responseCode)

+			execution.setVariable(Prefix + "rollbackNetworkResponse", responseBody)

+		

+			utils.log("DEBUG", " Network Adapter rollback responseCode: " + responseCode, isDebugEnabled)

+			utils.log("DEBUG", " Network Adapter rollback responseBody: " + responseBody, isDebugEnabled)

+		

+			

+		} catch (Exception ex) {

+			String exceptionMessage = "Exception Encountered in callPONetworkAdapter() of DoCreateNetworkInstanceRollback flow - " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		}

+		

+	}

+	

+	

+	public void validateRollbackResponses (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside validateRollbackResponses() of DoCreateNetworkInstanceRollback ***** ", isDebugEnabled)

+		

+		try {

+			// validate PO network rollback response

+			String rollbackNetworkErrorMessages = ""

+			String rollbackNetworkReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {

+				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")

+				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")

+				utils.log("DEBUG", " NetworkRollback Code - " + rollbackNetworkReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " NetworkRollback Response - " + rollbackNetworkResponse, isDebugEnabled)

+				if (rollbackNetworkReturnCode != "200") {

+					rollbackNetworkErrorMessages = " + PO Network rollback failed. "

+				} else {

+					rollbackNetworkErrorMessages = " + PO Network rollback completed."

+				}

+			}

+			

+			// validate SDNC rollback response

+			String rollbackSdncErrorMessages = ""

+			String rollbackSDNCReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {

+				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")

+				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")

+				String rollbackSDNCReturnInnerCode = ""

+				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)

+				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")

+				if (rollbackSDNCReturnCode == "200") {

+					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {

+						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")

+						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {

+						    rollbackSdncErrorMessages = " + SNDC assign rollback completed."

+						} else {

+							rollbackSdncErrorMessages = " + SDNC assign rollback failed. "

+						}

+					} else {

+						  rollbackSdncErrorMessages = " + SNDC assign rollback completed."

+					}  

+				 } else {

+					  rollbackSdncErrorMessages = " + SDNC assign rollback failed. "

+			     }

+				utils.log("DEBUG", " SDNC assign rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " SDNC assign rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)

+			}	

+

+			// validate SDNC activate rollback response

+			String rollbackActivateSdncErrorMessages = ""

+			String rollbackActivateSDNCReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackActivateSDNCRequest") != null) {

+				rollbackActivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackActivateSDNCReturnCode")

+				String rollbackActivateSDNCResponse = execution.getVariable(Prefix + "rollbackActivateSDNCResponse")

+				String rollbackActivateSDNCReturnInnerCode = ""

+				rollbackActivateSDNCResponse = sdncAdapterUtils.decodeXML(rollbackActivateSDNCResponse)

+				rollbackActivateSDNCResponse = rollbackActivateSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")

+				if (rollbackActivateSDNCReturnCode == "200") {

+					if (utils.nodeExists(rollbackActivateSDNCResponse, "response-code")) {

+						rollbackActivateSDNCReturnInnerCode = utils.getNodeText1(rollbackActivateSDNCResponse, "response-code")

+						if (rollbackActivateSDNCReturnInnerCode == "200" || rollbackActivateSDNCReturnInnerCode == "" || rollbackActivateSDNCReturnInnerCode == "0") {

+						   rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."

+						} else {

+							rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "

+						}

+					} else {

+						 rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."

+					}

+				} else {

+					  rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "

+				}

+				utils.log("DEBUG", " SDNC activate rollback Code - " + rollbackActivateSDNCReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " SDNC activate rollback  Response - " + rollbackActivateSDNCResponse, isDebugEnabled)

+			}	

+

+

+			String statusMessage = ""

+			int errorCode = 7000

+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)

+			if (execution.getVariable(Prefix + "fullRollback") == false) { 

+				// original WorkflowException, 

+				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException") 

+				if (wfe != null) {

+				   // rollback due to failure in DoCreate - Partial rollback

+				   statusMessage = wfe.getErrorMessage()

+				   errorCode = wfe.getErrorCode()

+				} else {

+				   statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."

+				   errorCode = '7000'

+			    }

+

+				// set if all rolledbacks are successful

+				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {

+					execution.setVariable("rolledBack", true)

+					execution.setVariable("wasDeleted", true)

+					

+				} else {

+					execution.setVariable("rolledBack", false)

+					execution.setVariable("wasDeleted", true)

+				}

+

+				statusMessage = statusMessage + rollbackActivateSdncErrorMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages

+				utils.log("DEBUG", "Final DoCreateNetworkInstanceRollback status message: " + statusMessage, isDebugEnabled)

+				String processKey = getProcessKey(execution);

+				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);

+				execution.setVariable("workflowException", exception);

+				

+			} else { 

+				// rollback due to failures in Main flow (Macro) - Full rollback

+				// WorkflowException = null

+			    if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {

+					execution.setVariable("rollbackSuccessful", true)

+					execution.setVariable("rollbackError", false)

+			    } else {

+				    String exceptionMessage = "Network Create Rollback was not Successful. "

+                    utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+					execution.setVariable("rollbackSuccessful", false)

+				    execution.setVariable("rollbackError", true)

+					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+					throw new BpmnError("MSOWorkflowException")

+			    }

+				  

+			} 

+			

+

+		} catch (Exception ex) {

+			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."

+			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	}

+

+	// *******************************

+	//     Build Error Section

+	// *******************************

+

+

+	

+	public void processJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		

+		try{

+			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)

+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")

+			

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)

+		}

+		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
index be26247..e6276a8 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
@@ -1,39 +1,39 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

  */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+package org.openecomp.mso.bpmn.infrastructure.scripts;

 
 import static org.apache.commons.lang3.StringUtils.*;
 import groovy.xml.XmlUtil
 import groovy.json.*
 
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.RollbackData
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

 
 import java.util.UUID;
 
@@ -46,7 +46,7 @@ import org.springframework.web.util.UriUtils;
 
 /**
  * This groovy class supports the <class>DoCreateServiceInstance.bpmn</class> process.
- * 
+ *
  * Inputs:
  * @param - msoRequestId
  * @param - globalSubscriberId
@@ -64,7 +64,7 @@ import org.springframework.web.util.UriUtils;
  * @param - rollbackData (localRB->null)
  * @param - rolledBack (no localRB->null, localRB F->false, localRB S->true)
  * @param - WorkflowException
- * @param - serviceInstanceName - TODO (GET from AAI if null in input)
+ * @param - serviceInstanceName - (GET from AAI if null in input)
  *
  */
 public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
@@ -362,9 +362,9 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			}
 
 			String sdncAssignRequest =
-					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

 				   <sdncadapter:RequestHeader>
 							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>
 							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
@@ -423,7 +423,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 		}
 		utils.log("DEBUG"," *****Exit preProcessSDNCAssignRequest *****", isDebugEnabled)
 	}
-
+	
 	public void postProcessSDNCAssign (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		utils.log("DEBUG"," ***** postProcessSDNCAssign ***** ", isDebugEnabled)
@@ -460,6 +460,49 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 		}
 		utils.log("DEBUG"," *** Exit postProcessSDNCAssign *** ", isDebugEnabled)
 	}
+	
+	public void postProcessAAIGET2(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** postProcessAAIGET2 ***** ", isDebugEnabled)
+		String msg = ""
+
+		try {
+			String serviceInstanceName = execution.getVariable("serviceInstanceName")
+			boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
+			if(succInAAI != true){
+				utils.log("DEBUG","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)
+				WorkflowException workflowException = execution.getVariable("WorkflowException")
+				utils.logAudit("workflowException: " + workflowException)
+				if(workflowException != null){
+					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
+				}
+				else
+				{
+					msg = "Failure in postProcessAAIGET2 GENGS_SuccessIndicator:" + succInAAI
+					utils.log("DEBUG", msg, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
+				}
+			}
+			else
+			{
+				boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
+				if(foundInAAI == true){
+					String aaiService = execution.getVariable("GENGS_service")
+					if (!isBlank(aaiService) && (utils.nodeExists(aaiService, "service-instance-name"))) {
+						execution.setVariable("serviceInstanceName",  utils.getNodeText1(aaiService, "service-instance-name"))
+						utils.log("DEBUG","Found Service-instance in AAI.serviceInstanceName:" + execution.getVariable("serviceInstanceName"), isDebugEnabled)
+					}
+				}
+			}
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex) {
+			msg = "Exception in DoCreateServiceInstance.postProcessAAIGET2 " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," *** Exit postProcessAAIGET2 *** ", isDebugEnabled)
+	}
 
 	public void preProcessRollback (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
index bc34987..1e6541e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
@@ -1,231 +1,231 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-
-import static org.apache.commons.lang3.StringUtils.*;
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.core.RollbackData
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.json.JSONObject;
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils;
-/**
- * This groovy class supports the <class>DoCreateServiceInstanceRollback.bpmn</class> process.
- *
- * Inputs:
- * @param - msoRequestId
- * @param - rollbackData with
- *          globalCustomerId
- * 			subscriptionServiceType
- * 			serviceInstanceId
- * 			disableRollback
- * 			rollbackAAI
- * 			rollbackSDNC
- * 			sdncRollbackRequest
- * 
- *
- * Outputs:
- * @param - rollbackError
- * @param - rolledBack (no localRB->null, localRB F->false, localRB S->true)
- *
- */
-public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcessor{
-
-	String Prefix="DCRESIRB_"
-
-	public void preProcessRequest(Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		String msg = ""
-		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
-		execution.setVariable("rollbackAAI",false)
-		execution.setVariable("rollbackSDNC",false)
-
-		try {
-			def rollbackData = execution.getVariable("rollbackData")
-			utils.log("DEBUG", "RollbackData:" + rollbackData, isDebugEnabled)
-
-			if (rollbackData != null) {
-				if (rollbackData.hasType("SERVICEINSTANCE")) {
-
-					def serviceInstanceId = rollbackData.get("SERVICEINSTANCE", "serviceInstanceId")
-					execution.setVariable("serviceInstanceId", serviceInstanceId)
-
-					def subscriptionServiceType = rollbackData.get("SERVICEINSTANCE", "subscriptionServiceType")
-					execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-
-					def globalSubscriberId  = rollbackData.get("SERVICEINSTANCE", "globalSubscriberId")
-					execution.setVariable("globalSubscriberId", globalSubscriberId)
-
-					def rollbackAAI = rollbackData.get("SERVICEINSTANCE", "rollbackAAI")
-					if ("true".equals(rollbackAAI))
-					{
-						execution.setVariable("rollbackAAI",true)
-					}
-
-					def rollbackSDNC = rollbackData.get("SERVICEINSTANCE", "rollbackSDNC")
-					if ("true".equals(rollbackSDNC))
-					{
-						execution.setVariable("rollbackSDNC", true)
-					}
-
-					if (execution.getVariable("rollbackAAI") != true && execution.getVariable("rollbackSDNC") != true)
-					{
-						execution.setVariable("skipRollback", true)
-					}
-
-					def sdncRollbackRequest = rollbackData.get("SERVICEINSTANCE", "sdncRollbackRequest")
-					execution.setVariable("sdncRollbackRequest", sdncRollbackRequest)
-				}
-				else {
-					execution.setVariable("skipRollback", true)
-				}
-			}
-			else {
-				execution.setVariable("skipRollback", true)
-			}
-			if (execution.getVariable("disableRollback").equals("true" ))
-			{
-				execution.setVariable("skipRollback", true)
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			msg = "Exception in Create ServiceInstance Rollback preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
-	}
-
-	public void validateSDNCResponse(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** validateSDNCResponse ***** ", isDebugEnabled)
-		String msg = ""
-		try {
-			WorkflowException workflowException = execution.getVariable("WorkflowException")
-
-			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-			String response = execution.getVariable("sdncAdapterResponse")
-
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
-				utils.log("DEBUG", "SDNC Adapter for service-instance delete for rollback successful. response", isDebugEnabled)
-			}else{
-				execution.setVariable("rolledBack", false)
-				execution.setVariable("rollbackError", "Error Response from SDNC Adapter for service-instance delete for rollback")
-				utils.log("DEBUG","Error Response from SDNC Adapter for service-instance delete for rollback", isDebugEnabled)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			msg = "Exception in Create ServiceInstance Rollback validateSDNCResponse " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit validateSDNCResponse ***** ", isDebugEnabled)
-	}
-
-	public void postProcessRequest(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessRequest ***** ", isDebugEnabled)
-		String msg = ""
-		try {
-			execution.setVariable("rollbackData", null)
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			boolean rollbackAAI = execution.getVariable("rollbackAAI")
-			boolean rollbackSDNC = execution.getVariable("rollbackSDNC")
-			if (rollbackAAI == true || rollbackSDNC == true)
-			{
-				execution.setVariable("rolledBack", true)
-			}
-			if (rollbackAAI == true)
-			{
-				boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
-				if(succInAAI != true){
-					execution.setVariable("rolledBack", false) //both sdnc and aai must be successful to declare rollback Succesful
-					execution.setVariable("rollbackError", "Error deleting service-instance in AAI for rollback")
-					utils.log("DEBUG","Error deleting service-instance in AAI for rollback", + serviceInstanceId, isDebugEnabled)
-				}
-			}
-			utils.log("DEBUG","*** Exit postProcessRequest ***", isDebugEnabled)
-
-		} catch (BpmnError e) {
-			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-		} catch (Exception ex) {
-			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-		}
-
-	}
-
-	public void processRollbackException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** processRollbackException ***** ", isDebugEnabled)
-		try{
-			utils.log("DEBUG", "Caught an Exception in DoCreateServiceInstanceRollback", isDebugEnabled)
-			execution.setVariable("rollbackData", null)
-			execution.setVariable("rollbackError", "Caught exception in ServiceInstance Create Rollback")
-			execution.setVariable("WorkflowException", null)
-
-		}catch(BpmnError b){
-			utils.log("DEBUG", "BPMN Error during processRollbackExceptions Method: ", isDebugEnabled)
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processRollbackExceptions Method: " + e.getMessage(), isDebugEnabled)
-		}
-
-		utils.log("DEBUG", " Exit processRollbackException", isDebugEnabled)
-	}
-
-	public void processRollbackJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** processRollbackJavaException ***** ", isDebugEnabled)
-		try{
-			execution.setVariable("rollbackData", null)
-			execution.setVariable("rollbackError", "Caught Java exception in ServiceInstance Create Rollback")
-			utils.log("DEBUG", "Caught Exception in processRollbackJavaException", isDebugEnabled)
-
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception in processRollbackJavaException " + e.getMessage(), isDebugEnabled)
-		}
-		utils.log("DEBUG", "***** Exit processRollbackJavaException *****", isDebugEnabled)
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+

+import static org.apache.commons.lang3.StringUtils.*;

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.json.JSONObject;

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils;

+/**

+ * This groovy class supports the <class>DoCreateServiceInstanceRollback.bpmn</class> process.

+ *

+ * Inputs:

+ * @param - msoRequestId

+ * @param - rollbackData with

+ *          globalCustomerId

+ * 			subscriptionServiceType

+ * 			serviceInstanceId

+ * 			disableRollback

+ * 			rollbackAAI

+ * 			rollbackSDNC

+ * 			sdncRollbackRequest

+ * 

+ *

+ * Outputs:

+ * @param - rollbackError

+ * @param - rolledBack (no localRB->null, localRB F->false, localRB S->true)

+ *

+ */

+public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcessor{

+

+	String Prefix="DCRESIRB_"

+

+	public void preProcessRequest(Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		String msg = ""

+		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)

+		execution.setVariable("rollbackAAI",false)

+		execution.setVariable("rollbackSDNC",false)

+

+		try {

+			def rollbackData = execution.getVariable("rollbackData")

+			utils.log("DEBUG", "RollbackData:" + rollbackData, isDebugEnabled)

+

+			if (rollbackData != null) {

+				if (rollbackData.hasType("SERVICEINSTANCE")) {

+

+					def serviceInstanceId = rollbackData.get("SERVICEINSTANCE", "serviceInstanceId")

+					execution.setVariable("serviceInstanceId", serviceInstanceId)

+

+					def subscriptionServiceType = rollbackData.get("SERVICEINSTANCE", "subscriptionServiceType")

+					execution.setVariable("subscriptionServiceType", subscriptionServiceType)

+

+					def globalSubscriberId  = rollbackData.get("SERVICEINSTANCE", "globalSubscriberId")

+					execution.setVariable("globalSubscriberId", globalSubscriberId)

+

+					def rollbackAAI = rollbackData.get("SERVICEINSTANCE", "rollbackAAI")

+					if ("true".equals(rollbackAAI))

+					{

+						execution.setVariable("rollbackAAI",true)

+					}

+

+					def rollbackSDNC = rollbackData.get("SERVICEINSTANCE", "rollbackSDNC")

+					if ("true".equals(rollbackSDNC))

+					{

+						execution.setVariable("rollbackSDNC", true)

+					}

+

+					if (execution.getVariable("rollbackAAI") != true && execution.getVariable("rollbackSDNC") != true)

+					{

+						execution.setVariable("skipRollback", true)

+					}

+

+					def sdncRollbackRequest = rollbackData.get("SERVICEINSTANCE", "sdncRollbackRequest")

+					execution.setVariable("sdncRollbackRequest", sdncRollbackRequest)

+				}

+				else {

+					execution.setVariable("skipRollback", true)

+				}

+			}

+			else {

+				execution.setVariable("skipRollback", true)

+			}

+			if (execution.getVariable("disableRollback").equals("true" ))

+			{

+				execution.setVariable("skipRollback", true)

+			}

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			msg = "Exception in Create ServiceInstance Rollback preProcessRequest " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

+	}

+

+	public void validateSDNCResponse(Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** validateSDNCResponse ***** ", isDebugEnabled)

+		String msg = ""

+		try {

+			WorkflowException workflowException = execution.getVariable("WorkflowException")

+

+			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

+			String response = execution.getVariable("sdncAdapterResponse")

+

+			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

+

+			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

+				utils.log("DEBUG", "SDNC Adapter for service-instance delete for rollback successful. response", isDebugEnabled)

+			}else{

+				execution.setVariable("rolledBack", false)

+				execution.setVariable("rollbackError", "Error Response from SDNC Adapter for service-instance delete for rollback")

+				utils.log("DEBUG","Error Response from SDNC Adapter for service-instance delete for rollback", isDebugEnabled)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			msg = "Exception in Create ServiceInstance Rollback validateSDNCResponse " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit validateSDNCResponse ***** ", isDebugEnabled)

+	}

+

+	public void postProcessRequest(Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** postProcessRequest ***** ", isDebugEnabled)

+		String msg = ""

+		try {

+			execution.setVariable("rollbackData", null)

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			boolean rollbackAAI = execution.getVariable("rollbackAAI")

+			boolean rollbackSDNC = execution.getVariable("rollbackSDNC")

+			if (rollbackAAI == true || rollbackSDNC == true)

+			{

+				execution.setVariable("rolledBack", true)

+			}

+			if (rollbackAAI == true)

+			{

+				boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")

+				if(succInAAI != true){

+					execution.setVariable("rolledBack", false) //both sdnc and aai must be successful to declare rollback Succesful

+					execution.setVariable("rollbackError", "Error deleting service-instance in AAI for rollback")

+					utils.log("DEBUG","Error deleting service-instance in AAI for rollback", + serviceInstanceId, isDebugEnabled)

+				}

+			}

+			utils.log("DEBUG","*** Exit postProcessRequest ***", isDebugEnabled)

+

+		} catch (BpmnError e) {

+			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+		} catch (Exception ex) {

+			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+		}

+

+	}

+

+	public void processRollbackException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** processRollbackException ***** ", isDebugEnabled)

+		try{

+			utils.log("DEBUG", "Caught an Exception in DoCreateServiceInstanceRollback", isDebugEnabled)

+			execution.setVariable("rollbackData", null)

+			execution.setVariable("rollbackError", "Caught exception in ServiceInstance Create Rollback")

+			execution.setVariable("WorkflowException", null)

+

+		}catch(BpmnError b){

+			utils.log("DEBUG", "BPMN Error during processRollbackExceptions Method: ", isDebugEnabled)

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processRollbackExceptions Method: " + e.getMessage(), isDebugEnabled)

+		}

+

+		utils.log("DEBUG", " Exit processRollbackException", isDebugEnabled)

+	}

+

+	public void processRollbackJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** processRollbackJavaException ***** ", isDebugEnabled)

+		try{

+			execution.setVariable("rollbackData", null)

+			execution.setVariable("rollbackError", "Caught Java exception in ServiceInstance Create Rollback")

+			utils.log("DEBUG", "Caught Exception in processRollbackJavaException", isDebugEnabled)

+

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception in processRollbackJavaException " + e.getMessage(), isDebugEnabled)

+		}

+		utils.log("DEBUG", "***** Exit processRollbackJavaException *****", isDebugEnabled)

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
index 739a9dd..269cb80 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
+

 package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
-
+

+import javax.xml.parsers.DocumentBuilder

+import javax.xml.parsers.DocumentBuilderFactory

+

 import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
@@ -37,21 +37,22 @@ import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.openecomp.mso.rest.APIResponse
 import org.openecomp.mso.rest.RESTClient
 import org.openecomp.mso.rest.RESTConfig
-import org.springframework.web.util.UriUtils
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.NamedNodeMap
-import org.w3c.dom.Node
+import org.springframework.web.util.UriUtils

+import org.w3c.dom.Document

+import org.w3c.dom.Element

+import org.w3c.dom.NamedNodeMap

+import org.w3c.dom.Node

 import org.w3c.dom.NodeList
-import org.xml.sax.InputSource
-
-
+import org.xml.sax.InputSource

+

+

 
 public class DoCreateVfModule extends VfModuleBase {
 
 	String Prefix="DCVFM_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 	JsonUtils jsonUtil = new JsonUtils()
+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
 
 	/**
 	 * Validates the request message and sets up the workflow.
@@ -65,36 +66,40 @@ public class DoCreateVfModule extends VfModuleBase {
 		logDebug('Entered ' + method, isDebugLogEnabled)
 
 		execution.setVariable('prefix', Prefix)
-		try{			
+		try{
 			def rollbackData = execution.getVariable("RollbackData")
 			if (rollbackData == null) {
 				rollbackData = new RollbackData()
 			}
-			
+
 			execution.setVariable("DCVFM_vnfParamsExistFlag", false)
 			execution.setVariable("DCVFM_oamManagementV4Address", "")
 			execution.setVariable("DCVFM_oamManagementV6Address", "")
-								
+
 			String request = execution.getVariable("DoCreateVfModuleRequest")
-				
+
 			if (request == null || request.isEmpty()) {
 				// Building Block-type request
+
+				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")		
 				
-				String cloudConfiguration = execution.getVariable("cloudConfiguration")
-				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")
+				def serviceModelInfo = execution.getVariable("serviceModelInfo")
+				logDebug("serviceModelInfo: " + serviceModelInfo, isDebugLogEnabled)
+				def vnfModelInfo = execution.getVariable("vnfModelInfo")
 				
+
 				//tenantId
-				def tenantId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.tenantId")
+				def tenantId = execution.getVariable("tenantId")
 				execution.setVariable("DCVFM_tenantId", tenantId)
 				rollbackData.put("VFMODULE", "tenantid", tenantId)
 				//volumeGroupId
-				def volumeGroupId = execution.getVariable("volumeGroupId")				
+				def volumeGroupId = execution.getVariable("volumeGroupId")
 				execution.setVariable("DCVFM_volumeGroupId", volumeGroupId)
 				//volumeGroupName
-				def volumeGroupName = execution.getVariable("volumeGroupName")				
+				def volumeGroupName = execution.getVariable("volumeGroupName")
 				execution.setVariable("DCVFM_volumeGroupName", volumeGroupName)
 				//cloudSiteId
-				def cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.lcpCloudRegionId")
+				def cloudSiteId = execution.getVariable("lcpCloudRegionId")
 				execution.setVariable("DCVFM_cloudSiteId", cloudSiteId)
 				rollbackData.put("VFMODULE", "aiccloudregion", cloudSiteId)
 				logDebug("cloudSiteId: " + cloudSiteId, isDebugLogEnabled)
@@ -104,50 +109,50 @@ public class DoCreateVfModule extends VfModuleBase {
 				rollbackData.put("VFMODULE", "vnftype", vnfType)
 				logDebug("vnfType: " + vnfType, isDebugLogEnabled)
 				//vnfName
-				def vnfName = execution.getVariable("vnfName")				
+				def vnfName = execution.getVariable("vnfName")
 				execution.setVariable("DCVFM_vnfName", vnfName)
 				rollbackData.put("VFMODULE", "vnfname", vnfName)
 				logDebug("vnfName: " + vnfName, isDebugLogEnabled)
 				//vnfId
-				def vnfId = execution.getVariable("vnfId")				
+				def vnfId = execution.getVariable("vnfId")
 				execution.setVariable("DCVFM_vnfId", vnfId)
 				rollbackData.put("VFMODULE", "vnfid", vnfId)
 				logDebug("vnfId: " + vnfId, isDebugLogEnabled)
 				//vfModuleName
-				def vfModuleName = execution.getVariable("vfModuleName")				
+				def vfModuleName = execution.getVariable("vfModuleName")
 				execution.setVariable("DCVFM_vfModuleName", vfModuleName)
 				rollbackData.put("VFMODULE", "vfmodulename", vfModuleName)
 				logDebug("vfModuleName: " + vfModuleName, isDebugLogEnabled)
 				//vfModuleModelName
-				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelInfo.modelName")				
+				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelName")
 				execution.setVariable("DCVFM_vfModuleModelName", vfModuleModelName)
 				rollbackData.put("VFMODULE", "vfmodulemodelname", vfModuleModelName)
 				logDebug("vfModuleModelName: " + vfModuleModelName, isDebugLogEnabled)
 				//modelCustomizationUuid
-				def modelCustomizationUuid = jsonUtil.getJsonValue(vfModuleModelInfo, "modelInfo.modelCustomizationId")
+				def modelCustomizationUuid = jsonUtil.getJsonValue(vfModuleModelInfo, "modelCustomizationUuid")
 				execution.setVariable("DCVFM_modelCustomizationUuid", modelCustomizationUuid)
 				rollbackData.put("VFMODULE", "modelcustomizationuuid", modelCustomizationUuid)
 				logDebug("modelCustomizationUuid: " + modelCustomizationUuid, isDebugLogEnabled)
 				//vfModuleId
-				def vfModuleId = execution.getVariable("vfModuleId")				
+				def vfModuleId = execution.getVariable("vfModuleId")
 				execution.setVariable("DCVFM_vfModuleId", vfModuleId)
 				logDebug("vfModuleId: " + vfModuleId, isDebugLogEnabled)
-				def requestId = execution.getVariable("requestId")				
+				def requestId = execution.getVariable("msoRequestId")
 				execution.setVariable("DCVFM_requestId", requestId)
 				logDebug("requestId: " + requestId, isDebugLogEnabled)
 				// Set mso-request-id to request-id for VNF Adapter interface				
 				execution.setVariable("mso-request-id", requestId)
 				//serviceId
-				def serviceId = execution.getVariable("serviceId")				
+				def serviceId = execution.getVariable("serviceId")
 				execution.setVariable("DCVFM_serviceId", serviceId)
 				logDebug("serviceId: " + serviceId, isDebugLogEnabled)
 				//serviceInstanceId
-				def serviceInstanceId = execution.getVariable("serviceInstanceId")				
+				def serviceInstanceId = execution.getVariable("serviceInstanceId")
 				execution.setVariable("DCVFM_serviceInstanceId", serviceInstanceId)
 				rollbackData.put("VFMODULE", "serviceInstanceId", serviceInstanceId)
 				logDebug("serviceInstanceId: " + serviceInstanceId, isDebugLogEnabled)
 				//source - HARDCODED
-				def source = "VID"				
+				def source = "VID"
 				execution.setVariable("DCVFM_source", source)
 				rollbackData.put("VFMODULE", "source", source)
 				logDebug("source: " + source, isDebugLogEnabled)
@@ -156,21 +161,27 @@ public class DoCreateVfModule extends VfModuleBase {
 				def backoutOnFailure = true
 				if (disableRollback != null && disableRollback.equals("true")) {
 					backoutOnFailure = false
-				}				
+				}
 				execution.setVariable("DCVFM_backoutOnFailure", backoutOnFailure)
 				logDebug("backoutOnFailure: " + backoutOnFailure, isDebugLogEnabled)
 				//isBaseVfModule
-				def isBaseVfModule = execution.getVariable("isBaseVfModule")				
+				def isBaseVfModule = execution.getVariable("isBaseVfModule")
 				execution.setVariable("DCVFM_isBaseVfModule", isBaseVfModule)
-				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)		
+				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)
 				//asdcServiceModelVersion
-				def asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")				
+				def asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")
 				execution.setVariable("DCVFM_asdcServiceModelVersion", asdcServiceModelVersion)
-				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)				
+				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)
 				//personaModelId
-				execution.setVariable("DCVFM_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInfo.modelInvariantId"))
+				execution.setVariable("DCVFM_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInvariantId"))
 				//personaModelVersion
-				execution.setVariable("DCVFM_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInfo.modelVersion"))		
+				execution.setVariable("DCVFM_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersion"))
+				//vfModuleLabel
+				def vfModuleLabel = execution.getVariable("vfModuleLabel")
+				if (vfModuleLabel != null) {
+					execution.setVariable("DCVFM_vfModuleLabel", vfModuleLabel)
+					logDebug("vfModuleLabel: " + vfModuleLabel, isDebugLogEnabled)
+				}
 				//Get or Generate UUID
 				String uuid = execution.getVariable("DCVFM_uuid")
 				if(uuid == null){
@@ -185,14 +196,25 @@ public class DoCreateVfModule extends VfModuleBase {
 				if (isVidRequest == null || isVidRequest.isEmpty()) {
 					execution.setVariable("isVidRequest", "true")
 				}
-				
-				String vnfParamsChildNodes = execution.getVariable("vfModuleInputParams")
-				
+				//globalSubscriberId
+				String globalSubscriberId = execution.getVariable("globalSubscriberId")
+				execution.setVariable("DCVFM_globalSubscriberId", globalSubscriberId)
+				logDebug("globalSubsrciberId: " + globalSubscriberId, isDebugLogEnabled)				
+				Map<String,String> vfModuleInputParams = execution.getVariable("vfModuleInputParams")
+				if (vfModuleInputParams != null) {
+					execution.setVariable("DCVFM_vnfParamsMap", vfModuleInputParams)
+					execution.setVariable("DCVFM_vnfParamsExistFlag", true)
+				}
+				//usePreload
+				def usePreload = execution.getVariable("usePreload")
+				execution.setVariable("DCVFM_usePreload", usePreload)
+				logDebug("usePreload: " + usePreload, isDebugLogEnabled)
+
 			}
 			else {
-				// The info is inside the request
+				// The info is inside the request - DEAD CODE
 				utils.logAudit("DoCreateVfModule request: " + request)
-								
+
 				//tenantId
 				def tenantId = ""
 				if (utils.nodeExists(request, "tenant-id")) {
@@ -316,15 +338,15 @@ public class DoCreateVfModule extends VfModuleBase {
 				}
 				execution.setVariable("DCVFM_isBaseVfModule", isBaseVfModule)
 				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)
-		
+
 				//asdcServiceModelVersion
 				def asdcServiceModelVersion = ""
 				if (utils.nodeExists(request, "asdc-service-model-version")) {
 					asdcServiceModelVersion = utils.getNodeText(request, "asdc-service-model-version")
 				}
 				execution.setVariable("DCVFM_asdcServiceModelVersion", asdcServiceModelVersion)
-				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)	
-				
+				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)
+
 				//personaModelId
 				def personaModelId = ""
 				if (utils.nodeExists(request, "persona-model-id")) {
@@ -332,7 +354,7 @@ public class DoCreateVfModule extends VfModuleBase {
 				}
 				execution.setVariable("DCVFM_personaModelId", personaModelId)
 				logDebug("personaModelId: " + personaModelId, isDebugLogEnabled)
-				
+
 				//personaModelVersion
 				def personaModelVersion = ""
 				if (utils.nodeExists(request, "persona-model-version")) {
@@ -340,16 +362,16 @@ public class DoCreateVfModule extends VfModuleBase {
 				}
 				execution.setVariable("DCVFM_personaModelVersion", personaModelVersion)
 				logDebug("personaModelVersion: " + personaModelVersion, isDebugLogEnabled)
-				
+
 				// Process the parameters
-				
+
 						String vnfParamsChildNodes = utils.getChildNodes(request, "vnf-params")
 						if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){
 								utils.log("DEBUG", "Request contains NO VNF Params", isDebugLogEnabled)
 						}else{
 								utils.log("DEBUG", "Request does contain VNF Params", isDebugLogEnabled)
 								execution.setVariable("DCVFM_vnfParamsExistFlag", true)
-				
+
 								InputSource xmlSource = new InputSource(new StringReader(request));
 								DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
 								docFactory.setNamespaceAware(true)
@@ -358,7 +380,7 @@ public class DoCreateVfModule extends VfModuleBase {
 								//Get params, build map
 								Map<String, String> paramsMap = new HashMap<String, String>()
 								NodeList paramsList = xml.getElementsByTagNameNS("*", "param")
-				
+
 								for (int z = 0; z < paramsList.getLength(); z++) {
 									Node node = paramsList.item(z)
 									String paramValue = node.getTextContent()
@@ -369,7 +391,7 @@ public class DoCreateVfModule extends VfModuleBase {
 								execution.setVariable("DCVFM_vnfParamsMap", paramsMap)
 							}
 			}
-			
+
 			//Get or Generate UUID
 			String uuid = execution.getVariable("DCVFM_uuid")
 			if(uuid == null){
@@ -378,6 +400,14 @@ public class DoCreateVfModule extends VfModuleBase {
 			}else{
 				logDebug("Found messageId (UUID) is: " + uuid, isDebugLogEnabled)
 			}
+			// Get sdncVersion, default to empty
+			String sdncVersion = execution.getVariable("sdncVersion")
+			if (sdncVersion == null) {
+				sdncVersion = ""
+			}
+			logDebug("sdncVersion: " + sdncVersion, isDebugLogEnabled)
+			execution.setVariable("DCVFM_sdncVersion", sdncVersion)
+			
 			execution.setVariable("DCVFM_uuid", uuid)
 			execution.setVariable("DCVFM_baseVfModuleId", "")
 			execution.setVariable("DCVFM_baseVfModuleHeatStackId", "")
@@ -386,6 +416,7 @@ public class DoCreateVfModule extends VfModuleBase {
 			execution.setVariable("DCVFM_volumeGroupStackId", "")
 			execution.setVariable("DCVFM_cloudRegionForVolume", "")
 			execution.setVariable("DCVFM_contrailNetworkPolicyFqdnList", "")
+			execution.setVariable("DCVFM_vnfTypeToQuery", "generic-vnf")
 			rollbackData.put("VFMODULE", "rollbackPrepareUpdateVfModule", "false")
 			rollbackData.put("VFMODULE", "rollbackUpdateAAIVfModule", "false")
 			rollbackData.put("VFMODULE", "rollbackVnfAdapterCreate", "false")
@@ -394,7 +425,7 @@ public class DoCreateVfModule extends VfModuleBase {
 			rollbackData.put("VFMODULE", "rollbackCreateAAIVfModule", "false")
 			rollbackData.put("VFMODULE", "rollbackCreateNetworkPoliciesAAI", "false")
 			rollbackData.put("VFMODULE", "rollbackUpdateVnfAAI", "false")
-	
+
 			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
 				if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
 					def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
@@ -403,9 +434,9 @@ public class DoCreateVfModule extends VfModuleBase {
 				}
 				execution.setVariable("DCVFM_sdncCallbackUrl", sdncCallbackUrl)
 				utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)
-			    logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugLogEnabled)	
-			
-	
+			    logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugLogEnabled)
+
+
 			execution.setVariable("RollbackData", rollbackData)
 		}catch(BpmnError b){
 			throw b
@@ -442,7 +473,7 @@ public class DoCreateVfModule extends VfModuleBase {
 		logDebug('Entered ' + method, isDebugLogEnabled)
 
 		try {
-			buildResponse(execution, "", 200)
+			sendWorkflowResponse(execution, 200, "")
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
@@ -483,6 +514,9 @@ public class DoCreateVfModule extends VfModuleBase {
 			String vfModuleId = utils.getNodeText1(createResponse, 'vf-module-id')
 			execution.setVariable('DCVFM_vfModuleId', vfModuleId)
 			logDebug("vfModuleId is: " + vfModuleId, isDebugLogEnabled)
+			String vfModuleIndex= utils.getNodeText1(createResponse, 'vf-module-index')
+			execution.setVariable('DCVFM_vfModuleIndex', vfModuleIndex)
+			logDebug("vfModuleIndex is: " + vfModuleIndex, isDebugLogEnabled)
 			rollbackData.put("VFMODULE", "vnfid", vnfId)
 			rollbackData.put("VFMODULE", "vfmoduleid", vfModuleId)
 			rollbackData.put("VFMODULE", "rollbackCreateAAIVfModule", "true")
@@ -621,30 +655,24 @@ public class DoCreateVfModule extends VfModuleBase {
 		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
 	}
 
-	public void preProcessSDNCGetRequest(Execution execution){
+	public void preProcessSDNCGetRequest(Execution execution, String element){
 		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		String sdncVersion = execution.getVariable("DCVFM_sdncVersion")
 		execution.setVariable("prefix", Prefix)
 		utils.log("DEBUG", " ======== STARTED preProcessSDNCGetRequest Process ======== ", isDebugLogEnabled)
 		try{
-			String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")
-			utils.logAudit("DCVFM_assignSDNCAdapterResponse is: \n" + response)
-
-			String data = utils.getNodeXml(response, "response-data")
-			data = data.replaceAll("&lt;", "<")
-			data = data.replaceAll("&gt;", ">")
-			String vnfId = utils.getNodeText1(data, "vnf-id")
-			def vfModuleId = execution.getVariable('DCVFM_vfModuleId')
 			def serviceInstanceId = execution.getVariable('DCVFM_serviceInstanceId')
-
+			
 			String uuid = execution.getVariable('testReqId') // for junits
 			if(uuid==null){
-				uuid = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+				uuid = execution.getVariable("mso-request-id") + "-" + System.currentTimeMillis()
 			}
-
-			String serviceOperation = "/VNF-API:vnfs/vnf-list/" + vfModuleId
+					
 			def callbackUrl = execution.getVariable("DCVFM_sdncCallbackUrl")
 			utils.logAudit("callbackUrl:" + callbackUrl)
-
+			
+			def vfModuleId = execution.getVariable('DCVFM_vfModuleId')
+			
 			def svcInstId = ""
 			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {
 				svcInstId = vfModuleId
@@ -652,6 +680,35 @@ public class DoCreateVfModule extends VfModuleBase {
 			else {
 				svcInstId = serviceInstanceId
 			}
+			// For VNF, serviceOperation (URI for topology GET) will be retrieved from "selflink" element 
+			// in the response from GenericGetVnf
+			// For VF Module, in 1707 serviceOperation will be retrieved from "object-path" element
+			// in SDNC Assign Response
+			// For VF Module for older versions, serviceOperation is constructed using vfModuleId
+			
+			String serviceOperation = ""
+			if (element.equals("vnf")) {
+				def vnfQueryResponse = execution.getVariable("DCVFM_vnfQueryResponse")
+				serviceOperation = utils.getNodeText1(vnfQueryResponse, "selflink")
+				utils.log("DEBUG", "VNF - service operation: " + serviceOperation, isDebugLogEnabled)
+			}
+			else if (element.equals("vfmodule")) {
+				String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")
+				utils.logAudit("DCVFM_assignSDNCAdapterResponse is: \n" + response)							
+			
+				if (!sdncVersion.equals("1707")) {
+					serviceOperation = "/VNF-API:vnfs/vnf-list/" + vfModuleId
+					utils.log("DEBUG", "VF Module with sdncVersion before 1707 - service operation: " + serviceOperation, isDebugLogEnabled)
+				}
+				else {				
+					String data = utils.getNodeXml(response, "response-data")					
+					data = data.replaceAll("&lt;", "<")
+					data = data.replaceAll("&gt;", ">")
+					utils.log("DEBUG", "responseData: " + data, isDebugLogEnabled)
+					serviceOperation = utils.getNodeText1(data, "object-path")
+					utils.log("DEBUG", "VF Module with sdncVersion of 1707 - service operation: " + serviceOperation, isDebugLogEnabled)
+				}				
+			}		
 
 			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE
 			sleep(5000)
@@ -710,6 +767,8 @@ public class DoCreateVfModule extends VfModuleBase {
 		def vfModuleModelName = execution.getVariable("DCVFM_vfModuleModelName")
 		//vfModuleId
 		def vfModuleId = execution.getVariable("DCVFM_vfModuleId")
+		//vfModuleIndex
+		def vfModuleIndex = execution.getVariable("DCVFM_vfModuleIndex")
 		//requestId
 		def requestId = execution.getVariable("DCVFM_requestId")
 		//serviceId
@@ -744,34 +803,14 @@ public class DoCreateVfModule extends VfModuleBase {
 			notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
 		}
 
-		String vnfParams
-			if(execution.getVariable("DCVFM_vnfParamsExistFlag") == true){
-				StringBuilder sbParams = new StringBuilder()
-				Map<String, String> paramsMap = execution.getVariable("DCVFM_vnfParamsMap")
-
-				for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
-					String paramsXml
-					String paramName = entry.getKey();
-					String paramValue = entry.getValue()
-					paramsXml =
-							"""	<entry>
-							<key>${paramName}</key>
-						<value>${paramValue}</value>
-						</entry>
-					"""
-
-					vnfParams = sbParams.append(paramsXml)
-				}
-			}else{
-				vnfParams = ""
-			}
-
+		Map<String, String> vnfParamsMap = execution.getVariable("DCVFM_vnfParamsMap")
+		
 		//Get SDNC Response Data for VnfSubCreate Request
 		String sdncGetResponse = execution.getVariable('DCVFM_getSDNCAdapterResponse')
 		utils.logAudit("sdncGetResponse: " + sdncGetResponse)
 
-		String vfModuleParams = buildVfModuleParams(vnfParams, sdncGetResponse, vnfId, vnfName,
-				vfModuleId, vfModuleName)
+		String vfModuleParams = buildVfModuleParams(vnfParamsMap, sdncGetResponse, vnfId, vnfName,
+				vfModuleId, vfModuleName, vfModuleIndex)
 
 		def svcInstId = ""
 		if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {
@@ -781,7 +820,6 @@ public class DoCreateVfModule extends VfModuleBase {
 			svcInstId = serviceInstanceId
 		}
 
-
 		def createVnfARequest = """
 		<createVfModuleRequest>
 		<cloudSiteId>${cloudSiteId}</cloudSiteId>
@@ -864,13 +902,13 @@ public class DoCreateVfModule extends VfModuleBase {
 			def requestId = execution.getVariable("mso-request-id")
 
 			if (requestId == null) {
-				createWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")

 			}
 
 			def serviceInstanceId = execution.getVariable("mso-service-instance-id")
 
 			if (serviceInstanceId == null) {
-				createWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")

 			}
 
 			utils.logContext(requestId, serviceInstanceId)
@@ -947,6 +985,21 @@ public class DoCreateVfModule extends VfModuleBase {
 		def vfModuleModelName = execution.getVariable("DCVFM_vfModuleModelName")
 		def vnfId = execution.getVariable("DCVFM_vnfId")
 		def cloudSiteId = execution.getVariable("DCVFM_cloudSiteId")
+		def sdncVersion = execution.getVariable("DCVFM_sdncVersion")
+		def serviceModelInfo = execution.getVariable("serviceModelInfo")
+		def vnfModelInfo = execution.getVariable("vnfModelInfo")
+		def vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")
+		String serviceEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(serviceModelInfo)
+		String vnfEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vnfModelInfo)
+		String vfModuleEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vfModuleModelInfo)
+		def globalSubscriberId = execution.getVariable("DCVFM_globalSubscriberId")
+		boolean usePreload = execution.getVariable("DCVFM_usePreload")
+		String usePreloadToSDNC = usePreload ? "Y" : "N"
+		def modelCustomizationUuid = execution.getVariable("DCVFM_modelCustomizationUuid")
+		def modelCustomizationUuidString = ""
+		if (!usePreload) {
+			modelCustomizationUuidString = "<modelCustomizationUuid>" + modelCustomizationUuid + "</modelCustomizationUuid>"
+		}
 
 		String sdncVNFParamsXml = ""
 
@@ -955,11 +1008,15 @@ public class DoCreateVfModule extends VfModuleBase {
 		}else{
 			sdncVNFParamsXml = ""
 		}
+		
+		String sdncRequest = ""
+		
+		if (!sdncVersion.equals("1707")) {
 
-		String sdncRequest =
-		"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+			sdncRequest =
+        """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+                                                    xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+                                                    xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

 	   <sdncadapter:RequestHeader>
 				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
 				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
@@ -989,10 +1046,114 @@ public class DoCreateVfModule extends VfModuleBase {
 			<generic-vnf-type>${vnfType}</generic-vnf-type>
 			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>
 			<tenant>${tenantId}</tenant>
+			${modelCustomizationUuidString}
+			<use-preload>${usePreloadToSDNC}</use-preload>
 		${sdncVNFParamsXml}
 		</vnf-request-information>
 	</sdncadapterworkflow:SDNCRequestData>
 	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+		
+		}
+		else {	
+			
+			sdncRequest =
+        """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+                                                    xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+                                                    xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+	   <sdncadapter:RequestHeader>
+				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
+				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
+				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
+		</sdncadapter:RequestHeader>
+	<sdncadapterworkflow:SDNCRequestData>
+		<request-information>
+			<request-id>${requestId}</request-id>
+			<request-action>CreateVfModuleInstance</request-action>
+			<source>${source}</source>
+			<notification-url/>
+		</request-information>
+		<service-information>
+			<service-id>${serviceId}</service-id>
+			<subscription-service-type>${serviceId}</subscription-service-type>
+			${serviceEcompModelInformation}
+			<service-instance-id>${svcInstId}</service-instance-id>
+			<global-customer-id>${globalSubscriberId}</global-customer-id>			
+		</service-information>
+		<vnf-request-information>
+			<vnf-type>${vfModuleModelName}</vnf-type>
+		</vnf-request-information>
+		<vnf-information>
+			<vnf-id>${vnfId}</vnf-id>
+			<vnf-type>${vnfType}</vnf-type>
+			${vnfEcompModelInformation}			
+		</vnf-information>
+		<vf-module-information>
+			<vf-module-id>${vfModuleId}</vf-module-id>
+			<vf-module-type>${vfModuleModelName}</vf-module-type>
+			${vfModuleEcompModelInformation}			
+		</vf-module-information>
+		<vf-module-request-input>
+			<request-version>${sdncVersion}</request-version>
+			<vf-module-name>${vfModuleName}</vf-module-name>
+			<tenant>${tenantId}</tenant>
+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>				
+		${sdncVNFParamsXml}
+		</vf-module-request-input>
+	  </sdncadapterworkflow:SDNCRequestData>
+	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+			
+			
+			/*
+			sdncRequest =
+			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+	   <sdncadapter:RequestHeader>
+				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
+				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
+		</sdncadapter:RequestHeader>
+	<sdncadapterworkflow:SDNCRequestData>
+		<request-information>
+			<request-id>${requestId}</request-id>
+			<request-action>CreateVfModuleInstance</request-action>
+			<source>${source}</source>
+			<notification-url/>
+		</request-information>
+		<service-information>
+			<service-id>${serviceId}</service-id>
+			<service-type>${serviceId}</service-type>
+			${serviceEcompModelInformation}			
+			<service-instance-id>${svcInstId}</service-instance-id>
+			<global-customer-id>${globalSubscriberId}</global-customer-id>
+		</service-information>
+		<vnf-information>
+			<vnf-id>${vnfId}</vnf-id>
+			<vnf-type>${vnfType}</vnf-type>
+			${vnfEcompModelInformation}			
+		</vnf-information>
+		<vf-module-information>
+			<vf-module-id>${vfModuleId}</vf-module-id>
+			<vf-module-type>${vfModuleModelName}</vf-module-type>
+			${vfModuleEcompModelInformation}			
+		</vf-module-information>
+		<vf-module-request-input>
+			<request-version>${sdncVersion}</request-version>
+			<vf-module-name>${vfModuleName}</vf-module-name>
+			<tenant>${tenantId}</tenant>
+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>				
+		${sdncVNFParamsXml}
+		</vf-module-request-input>		
+	</sdncadapterworkflow:SDNCRequestData>
+	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+			*/
+			
+		}
 
 	utils.logAudit("sdncRequest:  " + sdncRequest)
 	return sdncRequest
@@ -1080,20 +1241,20 @@ public class DoCreateVfModule extends VfModuleBase {
 							else if (key.endsWith("contrail_network_policy_fqdn")) {
 								String contrailNetworkPolicyFqdn = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
 								logDebug("Obtained contrailNetworkPolicyFqdn: " + contrailNetworkPolicyFqdn, isDebugLogEnabled)
-								contrailNetworkPolicyFqdnList.add(contrailNetworkPolicyFqdn)								
+								contrailNetworkPolicyFqdnList.add(contrailNetworkPolicyFqdn)
 							}
 							else if (key.equals("oam_management_v4_address")) {
 								String oamManagementV4Address = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
 								logDebug("Obtained oamManagementV4Address: " + oamManagementV4Address, isDebugLogEnabled)
-								execution.setVariable("DCVFM_oamManagementV4Address", oamManagementV4Address)							
+								execution.setVariable("DCVFM_oamManagementV4Address", oamManagementV4Address)
 							}
 							else if (key.equals("oam_management_v6_address")) {
 								String oamManagementV6Address = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
 								logDebug("Obtained oamManagementV6Address: " + oamManagementV6Address, isDebugLogEnabled)
 								execution.setVariable("DCVFM_oamManagementV6Address", oamManagementV6Address)
 							}
-						
-						}						
+
+						}
 					}
 					if (!contrailNetworkPolicyFqdnList.isEmpty()) {
 						execution.setVariable("DCVFM_contrailNetworkPolicyFqdnList", contrailNetworkPolicyFqdnList)
@@ -1435,7 +1596,7 @@ public class DoCreateVfModule extends VfModuleBase {
 		logDebug("======== COMPLETED  prepareCreateAAIVfModuleVolumeGroupRequest ======== ", isDebugLogEnabled)
 
 	}
-   
+
    public void createNetworkPoliciesInAAI(Execution execution) {
 	   def method = getClass().getSimpleName() + '.createNetworkPoliciesInAAI(' +
 	   'execution=' + execution.getId() +
@@ -1444,13 +1605,13 @@ public class DoCreateVfModule extends VfModuleBase {
 	   logDebug('Entered ' + method, isDebugLogEnabled)
 	   execution.setVariable("prefix", Prefix)
 	   logDebug(" ======== STARTED createNetworkPoliciesInAAI ======== ", isDebugLogEnabled)
-	  
+
 	   try {
 		   // get variables
 		   List fqdnList = execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList")
 		   int fqdnCount = fqdnList.size()
 		   def rollbackData = execution.getVariable("RollbackData")
-		  
+
 		   execution.setVariable("DCVFM_networkPolicyFqdnCount", fqdnCount)
 		   logDebug("DCVFM_networkPolicyFqdnCount - " + fqdnCount, isDebugLogEnabled)
 
@@ -1458,8 +1619,8 @@ public class DoCreateVfModule extends VfModuleBase {
 		   AaiUtil aaiUriUtil = new AaiUtil(this)
 		   String aai_uri = aaiUriUtil.getNetworkPolicyUri(execution)
 
-		   if (fqdnCount > 0) {			   		  
-			   
+		   if (fqdnCount > 0) {
+
 			   // AII loop call over contrail network policy fqdn list
 			   for (i in 0..fqdnCount-1) {
 
@@ -1467,10 +1628,10 @@ public class DoCreateVfModule extends VfModuleBase {
 				   String fqdn = fqdnList[i]
 
 				   // Query AAI for this network policy FQDN
-				  
+
 				   String queryNetworkPolicyByFqdnAAIRequest = "${aai_endpoint}${aai_uri}?network-policy-fqdn=" + UriUtils.encode(fqdn, "UTF-8")
 				   utils.logAudit("AAI request endpoint: " + queryNetworkPolicyByFqdnAAIRequest)
-				   
+
 				   def aaiRequestId = UUID.randomUUID().toString()
 				   RESTConfig config = new RESTConfig(queryNetworkPolicyByFqdnAAIRequest);
 				   RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId)
@@ -1489,32 +1650,32 @@ public class DoCreateVfModule extends VfModuleBase {
 					   // This network policy FQDN already exists in AAI
 					   utils.logAudit(aaiResponseAsString)
 					   execution.setVariable("DCVFM_queryNetworkPolicyByFqdnAAIResponse", aaiResponseAsString)
-					   logDebug(" QueryAAINetworkPolicyByFQDN Success REST Response, , NetworkPolicy #" + counting + " : " + "\n" + aaiResponseAsString, isDebugLogEnabled)					  
+					   logDebug(" QueryAAINetworkPolicyByFQDN Success REST Response, , NetworkPolicy #" + counting + " : " + "\n" + aaiResponseAsString, isDebugLogEnabled)
 
 				   } else {
 					   if (returnCode == 404) {
 						   // This network policy FQDN is not in AAI yet. Add it now
 						   logDebug("The return code is: "  + returnCode, isDebugLogEnabled)
 						   logDebug("This network policy FQDN is not in AAI yet: " + fqdn, isDebugLogEnabled)
-						   utils.logAudit("Network policy FQDN is not in AAI yet")						   
+						   utils.logAudit("Network policy FQDN is not in AAI yet")
 						   // Add the network policy with this FQDN to AAI
 						   def networkPolicyId = UUID.randomUUID().toString()
-						   logDebug("Adding network-policy with network-policy-id " + networkPolicyId, isDebugLogEnabled)						
-						   						   
+						   logDebug("Adding network-policy with network-policy-id " + networkPolicyId, isDebugLogEnabled)
+
 						   String aaiNamespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
 						   logDebug('AAI namespace is: ' + aaiNamespace, isDebugLogEnabled)
 						   String payload = """<network-policy xmlns="${aaiNamespace}">
 							   	<network-policy-id>${networkPolicyId}</network-policy-id>
 								<network-policy-fqdn>${fqdn}</network-policy-fqdn>
-								<heat-stack-id>${execution.getVariable("DCVFM_heatStackId")}</heat-stack-id>								
+								<heat-stack-id>${execution.getVariable("DCVFM_heatStackId")}</heat-stack-id>
 								</network-policy>""" as String
-								
+
 						   execution.setVariable("DCVFM_addNetworkPolicyAAIRequestBody", payload)
-						   
+
 						   String addNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(networkPolicyId, "UTF-8")
 						   utils.logAudit("AAI request endpoint: " + addNetworkPolicyAAIRequest)
 						   logDebug("AAI request endpoint: " + addNetworkPolicyAAIRequest, isDebugLogEnabled)
-						   
+
 						   def aaiRequestIdPut = UUID.randomUUID().toString()
 						   RESTConfig configPut = new RESTConfig(addNetworkPolicyAAIRequest);
 						   RESTClient clientPut = new RESTClient(configPut).addHeader("X-TransactionId", aaiRequestIdPut)
@@ -1527,8 +1688,8 @@ public class DoCreateVfModule extends VfModuleBase {
 						   int returnCodePut = responsePut.getStatusCode()
 						   execution.setVariable("DCVFM_aaiAddNetworkPolicyReturnCode", returnCodePut)
 						   logDebug(" ***** AAI add network policy Response Code, NetworkPolicy #" + counting + " : " + returnCodePut, isDebugLogEnabled)
-		
-						   String aaiResponseAsStringPut = responsePut.getResponseBodyAsString()	
+
+						   String aaiResponseAsStringPut = responsePut.getResponseBodyAsString()
 						   if (isOneOf(returnCodePut, 200, 201)) {
 							   logDebug("The return code from adding network policy is: "  + returnCodePut, isDebugLogEnabled)
 							   // This network policy was created in AAI successfully
@@ -1538,14 +1699,14 @@ public class DoCreateVfModule extends VfModuleBase {
 							   rollbackData.put("VFMODULE", "rollbackCreateNetworkPoliciesAAI", "true")
 							   rollbackData.put("VFMODULE", "contrailNetworkPolicyFqdn" + i, fqdn)
 							   execution.setVariable("RollbackData", rollbackData)
-							   		
+
 						   } else {
 						   		// aai all errors
 						   		String putErrorMessage = "Unable to add network-policy to AAI createNetworkPoliciesInAAI - " + returnCodePut
 								logDebug(putErrorMessage, isDebugLogEnabled)
-								exceptionUtil.buildAndThrowWorkflowException(execution, 2500, putErrorMessage)					   
+								exceptionUtil.buildAndThrowWorkflowException(execution, 2500, putErrorMessage)
 						   }
-						   						   
+
 					   } else {
 						  if (aaiResponseAsString.contains("RESTFault")) {
 							  WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
@@ -1564,7 +1725,7 @@ public class DoCreateVfModule extends VfModuleBase {
 
 			   } // end loop
 
-			  
+
 		   } else {
 		   	   logDebug("No contrail network policies to query/create", isDebugLogEnabled)
 
@@ -1580,7 +1741,7 @@ public class DoCreateVfModule extends VfModuleBase {
 	   }
 
    }
-   
+
    /**
 	* Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
 	*
@@ -1600,18 +1761,18 @@ public class DoCreateVfModule extends VfModuleBase {
 		   def oamManagementV6Address = execution.getVariable("DCVFM_oamManagementV6Address")
 		   def ipv4OamAddressElement = ''
 		   def managementV6AddressElement = ''
-		   
+
 		   if (oamManagementV4Address != null && !oamManagementV4Address.isEmpty()) {
-			   ipv4OamAddressElement = '<ipv4-oam-address>' + oamManagementV4Address + '</ipv4-oam-address>'			  
+			   ipv4OamAddressElement = '<ipv4-oam-address>' + oamManagementV4Address + '</ipv4-oam-address>'
 		   }
-		   
+
 		   if (oamManagementV6Address != null && !oamManagementV6Address.isEmpty()) {
 			   managementV6AddressElement = '<management-v6-address>' + oamManagementV6Address + '</management-v6-address>'
 		   }
-		   
+
 		   rollbackData.put("VFMODULE", "oamManagementV4Address", oamManagementV4Address)
-		   
-		  	   
+
+
 		   String updateAAIGenericVnfRequest = """
 					<UpdateAAIGenericVnfRequest>
 						<vnf-id>${vnfId}</vnf-id>
@@ -1623,17 +1784,17 @@ public class DoCreateVfModule extends VfModuleBase {
 			   execution.setVariable('DCVM_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
 			   utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
 			   logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
-		
+
 
 		   logDebug('Exited ' + method, isDebugLogEnabled)
 	   } catch (BpmnError e) {
 		   throw e;
 	   } catch (Exception e) {
 		   logError('Caught exception in ' + method, e)
-		   createWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
 	   }
    }
-   
+
    /**
 	* Post process a result from invoking the UpdateAAIGenericVnf subflow.
 	*
@@ -1648,31 +1809,33 @@ public class DoCreateVfModule extends VfModuleBase {
 
 	   try {
 		   def rollbackData = execution.getVariable("RollbackData")
-		   
+
 		   rollbackData.put("VFMODULE", "rollbackUpdateVnfAAI", "true")
-		   
+
 		   def vnfId = execution.getVariable('DCVFM_vnfId')
 		   def oamManagementV4Address = execution.getVariable("DCVFM_oamManagementV4Address")
 		   def oamManagementV6Address = execution.getVariable("DCVFM_oamManagementV6Address")
 		   def ipv4OamAddressElement = ''
 		   def managementV6AddressElement = ''
-		   
-		   if (oamManagementV4Address != null && !oamManagementV4Address.isEmpty()) {			   
+
+		   if (oamManagementV4Address != null && !oamManagementV4Address.isEmpty()) {
 			   rollbackData.put("VFMODULE", "oamManagementV4Address", oamManagementV4Address)
 		   }
-		   
+
 		   if (oamManagementV6Address != null && !oamManagementV6Address.isEmpty()) {
-			   rollbackData.put("VFMODULE", "oamManagementV6Address", oamManagementV6Address)			   
+			   rollbackData.put("VFMODULE", "oamManagementV6Address", oamManagementV6Address)
 		   }
-		   
-		   execution.setVariable("RollbackData", rollbackData)		   
-			
+
+		   execution.setVariable("RollbackData", rollbackData)
+
 		   logDebug('Exited ' + method, isDebugLogEnabled)
 	   } catch (BpmnError e) {
 		   throw e;
 	   } catch (Exception e) {
 		   logError('Caught exception in ' + method, e)
-		   createWorkflowException(execution, 1002, 'Error in postProcessUpdateAAIGenericVnf(): ' + e.getMessage())
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in postProcessUpdateAAIGenericVnf(): ' + e.getMessage())
 	   }
    }
+
+
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
index 391b76a..8ca749d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
@@ -1,38 +1,38 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+
+package org.openecomp.mso.bpmn.infrastructure.scripts

 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse
-import org.springframework.web.util.UriUtils
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse

+import org.springframework.web.util.UriUtils

 
 
 
 public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
-	
+
 	def Prefix="DCVFMR_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 
@@ -72,7 +72,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		execution.setVariable("DCVFMR_cloudSiteId", cloudSiteId)
 		String heatStackId = rollbackData.get("VFMODULE", "heatstackid")
 		execution.setVariable("DCVFMR_heatStackId", heatStackId)
-		String requestId = rollbackData.get("VFMODULE", "msorequestid")
+		String requestId = rollbackData.get("VFMODULE", "msorequestid")

 		execution.setVariable("DCVFMR_requestId", requestId)
 		List createdNetworkPolicyFqdnList = []
 		int i = 0
@@ -84,15 +84,15 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 			createdNetworkPolicyFqdnList.add(fqdn)
 			logDebug("got fqdn # " + i + ": " + fqdn, isDebugEnabled)
 			i = i + 1
-		
+
 		}
-		
+
 		execution.setVariable("DCVFMR_createdNetworkPolicyFqdnList", createdNetworkPolicyFqdnList)
 		String oamManagementV4Address = rollbackData.get("VFMODULE", "oamManagementV4Address")
 		execution.setVariable("DCVFMR_oamManagementV4Address", oamManagementV4Address)
 		String oamManagementV6Address = rollbackData.get("VFMODULE", "oamManagementV6Address")
 		execution.setVariable("DCVFMR_oamManagementV6Address", oamManagementV6Address)
-		//String serviceInstanceId = rollbackData.get("VFMODULE", "msoserviceinstanceid")
+		//String serviceInstanceId = rollbackData.get("VFMODULE", "msoserviceinstanceid")

 		//execution.setVariable("DCVFMR_serviceInstanceId", serviceInstanceId)
 		execution.setVariable("DCVFMR_rollbackPrepareUpdateVfModule", rollbackData.get("VFMODULE", "rollbackPrepareUpdateVfModule"))
 		execution.setVariable("DCVFMR_rollbackUpdateAAIVfModule", rollbackData.get("VFMODULE", "rollbackUpdateAAIVfModule"))
@@ -105,10 +105,10 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 
 		// formulate the request for PrepareUpdateAAIVfModule
 		String request = """<PrepareUpdateAAIVfModuleRequest>
-							<vnf-id>${vnfId}</vnf-id>
-							<vf-module-id>${vfModuleId}</vf-module-id>
-							<orchestration-status>pending-delete</orchestration-status>
-						</PrepareUpdateAAIVfModuleRequest>""" as String
+								<vnf-id>${vnfId}</vnf-id>
+								<vf-module-id>${vfModuleId}</vf-module-id>
+								<orchestration-status>pending-delete</orchestration-status>
+							</PrepareUpdateAAIVfModuleRequest>""" as String
 		utils.log("DEBUG", "PrepareUpdateAAIVfModuleRequest :" + request, isDebugEnabled)
 		utils.logAudit("DoCreateVfModuleRollback PrepareUpdateAAIVfModule Request: " + request)
 		execution.setVariable("PrepareUpdateAAIVfModuleRequest", request)
@@ -119,7 +119,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 	public void prepSDNCAdapterRequest(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		String srvInstId = execution.getVariable("DCVFMR_serviceInstanceId")
-		
+
 		def callbackUrl = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
 
 		String source = execution.getVariable("DCVFMR_source")
@@ -133,12 +133,12 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		String vfModuleModelName = execution.getVariable("DCVFMR_vfModuleModelName")
 		String cloudSiteId = execution.getVariable("DCVFMR_cloudSiteId")
 		String requestId = execution.getVariable("DCVFMR_requestId")
-		
+
 		String serviceInstanceIdToSdnc = ""
 		if (srvInstId != null && !srvInstId.isEmpty()) {
 			serviceInstanceIdToSdnc = srvInstId
 		} else {
-			serviceInstanceIdToSdnc = vfModuleId
+		    serviceInstanceIdToSdnc = vfModuleId
 		}
 
 		def doSDNCActivateRollback = execution.getVariable("DCVFMR_rollbackSDNCRequestActivate")
@@ -159,43 +159,43 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 			return
 
 
-		String request = """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-												xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-												xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-					      <sdncadapter:RequestHeader>
-					         <sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
-					         <sdncadapter:SvcInstanceId>${vfModuleId}</sdncadapter:SvcInstanceId>
-					         <sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
-					         <sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
-					         <sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
-					      </sdncadapter:RequestHeader>
-					      <sdncadapterworkflow:SDNCRequestData>
-					         <request-information>
-					            <request-id>${requestId}</request-id>
-					            <request-action>${requestAction}</request-action>
-					            <source>${source}</source>
-					            <notification-url/>
-					            <order-number/>
-					            <order-version/>
-					         </request-information>
-					         <service-information>
-					            <service-id>${serviceId}</service-id>
-								<service-type>${serviceId}</service-type>
-					            <service-instance-id>${serviceInstanceIdToSdnc}</service-instance-id>
-					            <subscriber-name>notsurewecare</subscriber-name>
-					         </service-information>
-					         <vnf-request-information>
-					         	<vnf-id>${vfModuleId}</vnf-id>
-								<vnf-type>${vfModuleModelName}</vnf-type>
-                                <vnf-name>${vfModuleName}</vnf-name>
-								<generic-vnf-id>${vnfId}</generic-vnf-id>
-                                <generic-vnf-name>${vnfName}</generic-vnf-name>
-								<generic-vnf-type>${vnfType}</generic-vnf-type>
-								<aic-cloud-region>${cloudSiteId}</aic-cloud-region>
-								<tenant>${tenantId}</tenant>
-					         </vnf-request-information>
-					      </sdncadapterworkflow:SDNCRequestData>
-					   </sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+		String request = """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

+												xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+												xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+						      <sdncadapter:RequestHeader>
+						         <sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+						         <sdncadapter:SvcInstanceId>${vfModuleId}</sdncadapter:SvcInstanceId>
+						         <sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
+						         <sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+						         <sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
+						      </sdncadapter:RequestHeader>
+						      <sdncadapterworkflow:SDNCRequestData>
+						         <request-information>
+						            <request-id>${requestId}</request-id>
+						            <request-action>${requestAction}</request-action>
+						            <source>${source}</source>
+						            <notification-url/>
+						            <order-number/>
+						            <order-version/>
+						         </request-information>
+						         <service-information>
+						            <service-id>${serviceId}</service-id>
+									<service-type>${serviceId}</service-type>
+						            <service-instance-id>${serviceInstanceIdToSdnc}</service-instance-id>
+						            <subscriber-name>notsurewecare</subscriber-name>
+						         </service-information>
+						         <vnf-request-information>
+						         	<vnf-id>${vfModuleId}</vnf-id>
+									<vnf-type>${vfModuleModelName}</vnf-type>
+                                    <vnf-name>${vfModuleName}</vnf-name>
+									<generic-vnf-id>${vnfId}</generic-vnf-id>
+                                    <generic-vnf-name>${vnfName}</generic-vnf-name>
+									<generic-vnf-type>${vnfType}</generic-vnf-type>
+									<aic-cloud-region>${cloudSiteId}</aic-cloud-region>
+									<tenant>${tenantId}</tenant>
+						         </vnf-request-information>
+						      </sdncadapterworkflow:SDNCRequestData>
+						   </sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
 
 		utils.log("DEBUG", "sdncAdapterWorkflowRequest: " + request, isDebugEnabled)
 		utils.logAudit("DoCreateVfModuleRollback sdncAdapterWorkflow Request: " + request)
@@ -214,7 +214,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		String vfModuleId = execution.getVariable("DCVFMR_vfModuleId")
 		String vfModuleStackId = execution.getVariable("DCVFMR_heatStackId")
 		String tenantId = execution.getVariable("DCVFMR_tenantId")
-		def messageId = execution.getVariable('mso-request-id') + '-' +
+		def messageId = execution.getVariable('mso-request-id') + '-' +

 			System.currentTimeMillis()
 		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
 		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
@@ -223,21 +223,21 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		}
 
 		String request = """
-		<deleteVfModuleRequest>
-		    <cloudSiteId>${aicCloudRegion}</cloudSiteId>
-		    <tenantId>${tenantId}</tenantId>
-		    <vnfId>${vnfId}</vnfId>
-		    <vfModuleId>${vfModuleId}</vfModuleId>
-		    <vfModuleStackId>${vfModuleStackId}</vfModuleStackId>
-		    <skipAAI>true</skipAAI>
-		    <msoRequest>
-		        <requestId>${origRequestId}</requestId>
-		        <serviceInstanceId>${srvInstId}</serviceInstanceId>
-		    </msoRequest>
-		    <messageId>${messageId}</messageId>
-		    <notificationUrl>${notificationUrl}</notificationUrl>
-		</deleteVfModuleRequest>
-		""" as String
+			<deleteVfModuleRequest>
+			    <cloudSiteId>${aicCloudRegion}</cloudSiteId>
+			    <tenantId>${tenantId}</tenantId>
+			    <vnfId>${vnfId}</vnfId>
+			    <vfModuleId>${vfModuleId}</vfModuleId>
+			    <vfModuleStackId>${vfModuleStackId}</vfModuleStackId>
+			    <skipAAI>true</skipAAI>
+			    <msoRequest>
+			        <requestId>${origRequestId}</requestId>
+			        <serviceInstanceId>${srvInstId}</serviceInstanceId>
+			    </msoRequest>
+			    <messageId>${messageId}</messageId>
+			    <notificationUrl>${notificationUrl}</notificationUrl>
+			</deleteVfModuleRequest>
+			""" as String
 
 		utils.log("DEBUG", "vnfAdapterRestV1Request: " + request, isDebugEnabled)
 		utils.logAudit("PrepareUpdateAAIVfModule vnfAdapterRestV1 Request: " + request)
@@ -252,11 +252,11 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		String vfModuleId = execution.getVariable("DCVFMR_vfModuleId")
 		// formulate the request for UpdateAAIVfModule
 		String request = """<UpdateAAIVfModuleRequest>
-							<vnf-id>${vnfId}</vnf-id>
-							<vf-module-id>${vfModuleId}</vf-module-id>
-							<heat-stack-id>DELETE</heat-stack-id>
-							<orchestration-status>deleted</orchestration-status>
-						</UpdateAAIVfModuleRequest>""" as String
+								<vnf-id>${vnfId}</vnf-id>
+								<vf-module-id>${vfModuleId}</vf-module-id>
+								<heat-stack-id>DELETE</heat-stack-id>
+								<orchestration-status>deleted</orchestration-status>
+							</UpdateAAIVfModuleRequest>""" as String
 		utils.log("DEBUG", "UpdateAAIVfModuleRequest :" + request, isDebugEnabled)
 		utils.logAudit("UpdateAAIVfModule Request: " + request)
 		execution.setVariable("UpdateAAIVfModuleRequest", request)
@@ -270,9 +270,9 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		String vfModuleId = execution.getVariable("DCVFMR_vfModuleId")
 		// formulate the request for UpdateAAIVfModule
 		String request = """<DeleteAAIVfModuleRequest>
-							<vnf-id>${vnfId}</vnf-id>
-							<vf-module-id>${vfModuleId}</vf-module-id>
-						</DeleteAAIVfModuleRequest>""" as String
+								<vnf-id>${vnfId}</vnf-id>
+								<vf-module-id>${vfModuleId}</vf-module-id>
+							</DeleteAAIVfModuleRequest>""" as String
 		utils.log("DEBUG", "DeleteAAIVfModuleRequest :" + request, isDebugEnabled)
 		utils.logAudit("DeleteAAIVfModule Request: " + request)
 		execution.setVariable("DeleteAAIVfModuleRequest", request)
@@ -305,7 +305,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 			throw new BpmnError("MSOWorkflowException")
 		}
 	}
-	
+
 	public void deleteNetworkPoliciesFromAAI(Execution execution) {
 		def method = getClass().getSimpleName() + '.deleteNetworkPoliciesFromAAI(' +
 		'execution=' + execution.getId() +
@@ -314,7 +314,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		logDebug('Entered ' + method, isDebugLogEnabled)
 		execution.setVariable("prefix", Prefix)
 		logDebug(" ======== STARTED deleteNetworkPoliciesFromAAI ======== ", isDebugLogEnabled)
-	   
+
 		try {
 			// get variables
 			List fqdnList = execution.getVariable(Prefix + "createdNetworkPolicyFqdnList")
@@ -323,35 +323,35 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 				return
 			}
 			int fqdnCount = fqdnList.size()
-		   
+
 			execution.setVariable(Prefix + "networkPolicyFqdnCount", fqdnCount)
 			logDebug("networkPolicyFqdnCount - " + fqdnCount, isDebugLogEnabled)
- 
+
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getNetworkPolicyUri(execution)
- 
+
 			if (fqdnCount > 0) {
 				// AII loop call over contrail network policy fqdn list
 				for (i in 0..fqdnCount-1) {
- 
+
 					int counting = i+1
 					String fqdn = fqdnList[i]
- 
+
 					// Query AAI for this network policy FQDN
-				   
+
 					String queryNetworkPolicyByFqdnAAIRequest = "${aai_endpoint}${aai_uri}?network-policy-fqdn=" + UriUtils.encode(fqdn, "UTF-8")
 					utils.logAudit("AAI request endpoint: " + queryNetworkPolicyByFqdnAAIRequest)
 					logDebug("AAI request endpoint: "  + queryNetworkPolicyByFqdnAAIRequest, isDebugLogEnabled)
-					
+
 					def aaiRequestId = UUID.randomUUID().toString()
 					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkPolicyByFqdnAAIRequest)
 					int returnCode = response.getStatusCode()
 					execution.setVariable(Prefix + "aaiQueryNetworkPolicyByFqdnReturnCode", returnCode)
 					logDebug(" ***** AAI query network policy Response Code, NetworkPolicy #" + counting + " : " + returnCode, isDebugLogEnabled)
- 
+
 					String aaiResponseAsString = response.getResponseBodyAsString()
- 
+
 					if (isOneOf(returnCode, 200, 201)) {
 						logDebug("The return code is: "  + returnCode, isDebugLogEnabled)
 						// This network policy FQDN exists in AAI - need to delete it now
@@ -361,32 +361,32 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 						// Retrieve the network policy id for this FQDN
 						def networkPolicyId = utils.getNodeText1(aaiResponseAsString, "network-policy-id")
 						logDebug("Deleting network-policy with network-policy-id " + networkPolicyId, isDebugLogEnabled)
-						
+
 						// Retrieve the resource version for this network policy
 						def resourceVersion = utils.getNodeText1(aaiResponseAsString, "resource-version")
 						logDebug("Deleting network-policy with resource-version " + resourceVersion, isDebugLogEnabled)
-												
+
 						String delNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(networkPolicyId, "UTF-8") +
 							"?resource-version=" + UriUtils.encode(resourceVersion, "UTF-8")
-												
+
 						utils.logAudit("AAI request endpoint: " + delNetworkPolicyAAIRequest)
 						logDebug("AAI request endpoint: " + delNetworkPolicyAAIRequest, isDebugLogEnabled)
-						
+
 						def aaiRequestIdDel = UUID.randomUUID().toString()
 						logDebug("invoking DELETE call to AAI", isDebugLogEnabled)
 						utils.logAudit("Sending DELETE call to AAI with Endpoint /n" + delNetworkPolicyAAIRequest)
-						
+
 						APIResponse responseDel = aaiUriUtil.executeAAIDeleteCall(execution, delNetworkPolicyAAIRequest)
-						
+
 						int returnCodeDel = responseDel.getStatusCode()
 						execution.setVariable(Prefix + "aaiDeleteNetworkPolicyReturnCode", returnCodeDel)
 						logDebug(" ***** AAI delete network policy Response Code, NetworkPolicy #" + counting + " : " + returnCodeDel, isDebugLogEnabled)
-	 
+
 						if (isOneOf(returnCodeDel, 200, 201, 204)) {
 							logDebug("The return code from deleting network policy is: "  + returnCodeDel, isDebugLogEnabled)
 							// This network policy was deleted from AAI successfully
 							logDebug(" DelAAINetworkPolicy Success REST Response, , NetworkPolicy #" + counting + " : ", isDebugLogEnabled)
-	 
+
 						} else {
 								// aai all errors
 								String delErrorMessage = "Unable to delete network-policy to AAI deleteNetworkPoliciesFromAAI - " + returnCodeDel
@@ -412,29 +412,29 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 
 						  }
 					}
- 
-					
- 
+
+
+
 				} // end loop
- 
-			   
+
+
 			} else {
 				   logDebug("No contrail network policies to query/create", isDebugLogEnabled)
- 
+
 			}
- 
+
 		} catch (BpmnError e) {
 			throw e;
- 
+
 		} catch (Exception ex) {
 			String exceptionMessage = "Bpmn error encountered in DoCreateVfModuleRollback flow. deleteNetworkPoliciesFromAAI() - " + ex.getMessage()
 			logDebug(exceptionMessage, isDebugLogEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 		}
- 
+
 	}
-	
-	
+
+
 	/**
 	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
 	 *
@@ -446,42 +446,42 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
- 
+
 		try {
 			def vnfId = execution.getVariable('DCVFMR_vnfId')
 			def oamManagementV4Address = execution.getVariable(Prefix + 'oamManagementV4Address')
 			def oamManagementV6Address = execution.getVariable(Prefix + 'oamManagementV6Address')
 			def ipv4OamAddressElement = ''
 			def managementV6AddressElement = ''
-			
+
 			if (oamManagementV4Address != null) {
 				ipv4OamAddressElement = '<ipv4-oam-address>' + 'DELETE' + '</ipv4-oam-address>'
 			}
-			
+
 			if (oamManagementV6Address != null) {
 				managementV6AddressElement = '<management-v6-address>' + 'DELETE' + '</management-v6-address>'
 			}
-			
-				  
+
+
 			String updateAAIGenericVnfRequest = """
-				<UpdateAAIGenericVnfRequest>
-					<vnf-id>${vnfId}</vnf-id>
-					${ipv4OamAddressElement}
-					${managementV6AddressElement}
-				</UpdateAAIGenericVnfRequest>
-			"""
+					<UpdateAAIGenericVnfRequest>
+						<vnf-id>${vnfId}</vnf-id>
+						${ipv4OamAddressElement}
+						${managementV6AddressElement}
+					</UpdateAAIGenericVnfRequest>
+				"""
 				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)
 				execution.setVariable(Prefix + 'updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
 				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
 				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
-		 
- 
+
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessUpdateAAIGenericVnf((): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessUpdateAAIGenericVnf((): ' + e.getMessage())
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
index 23763c6..55d56a6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- */
+ */

 package org.openecomp.mso.bpmn.infrastructure.scripts
-
+

 import static org.apache.commons.lang3.StringUtils.*
-
-import org.camunda.bpm.engine.delegate.BpmnError
+import org.openecomp.mso.bpmn.core.RollbackData

+import org.camunda.bpm.engine.delegate.BpmnError

 import org.camunda.bpm.engine.runtime.Execution
 import org.openecomp.mso.bpmn.common.scripts.AaiUtil
 import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
@@ -30,385 +30,429 @@ import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
 import org.openecomp.mso.bpmn.common.scripts.VidUtils
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.core.json.JsonUtils
-
-
-/**
- * This class supports the DoCreateVnf building block subflow
- * with the creation of a generic vnf for
- * infrastructure.
- *
- */
-class DoCreateVnf extends AbstractServiceTaskProcessor {
-
-	String Prefix="DoCVNF_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-
-	/**
-	 * This method gets and validates the incoming
-	 * request.
-	 *
-	 * @param - execution
-	 *
-	 */
-	public void preProcessRequest(Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED DoCreateVnf PreProcessRequest Process*** ", isDebugEnabled)
-
-		// DISABLE SDNC INTERACTION FOR NOW
-		execution.setVariable("SDNCInteractionEnabled", false)
-
-
-		/*******************/
-		try{
-			// Get Variables
-
-			String cloudConfiguration = execution.getVariable("cloudConfiguration")
-			String vnfModelInfo = execution.getVariable("vnfModelInfo")
-
-			String requestId = execution.getVariable("requestId")
-			execution.setVariable("DoCVNF_requestId", requestId)
+

+

+/**

+ * This class supports the DoCreateVnf building block subflow

+ * with the creation of a generic vnf for

+ * infrastructure.

+ *

+ */

+class DoCreateVnf extends AbstractServiceTaskProcessor {

+

+	String Prefix="DoCVNF_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)

+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+

+	/**

+	 * This method gets and validates the incoming

+	 * request.

+	 *

+	 * @param - execution

+	 *

+	 */

+	public void preProcessRequest(Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		utils.log("DEBUG", " *** STARTED DoCreateVnf PreProcessRequest Process*** ", isDebugEnabled)

+	

+		// DISABLE SDNC INTERACTION FOR NOW

+		execution.setVariable("SDNCInteractionEnabled", false)

+		

+		

+		/*******************/

+		try{

+			// Get Variables

+			

+			String cloudConfiguration = execution.getVariable("cloudConfiguration")

+			String vnfModelInfo = execution.getVariable("vnfModelInfo")			

+			String serviceModelInfo = execution.getVariable("serviceModelInfo")

+			

+			String requestId = execution.getVariable("requestId")

+			execution.setVariable("DoCVNF_requestId", requestId)

 			execution.setVariable("mso-request-id", requestId)
-			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			execution.setVariable("DoCVNF_serviceInstanceId", serviceInstanceId)
-			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-
-			String vnfType = execution.getVariable("vnfType")
-			execution.setVariable("DoCVNF_vnfType", vnfType)
-			utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)
-
-			String vnfName = execution.getVariable("vnfName")
-			execution.setVariable("DoCVNF_vnfName", vnfName)
-			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)
-
-			String serviceId = execution.getVariable("productFamilyId")
-			execution.setVariable("DoCVNF_serviceId", serviceId)
-			utils.log("DEBUG", "Incoming Service Id is: " + serviceId, isDebugEnabled)
-
-			String source = "VID"
-			execution.setVariable("DoCVNF_source", source)
-			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
-
-			String suppressRollback = execution.getVariable("disableRollback")
-			execution.setVariable("DoCVNF_suppressRollback", suppressRollback)
-			utils.log("DEBUG", "Incoming Suppress Rollback is: " + suppressRollback, isDebugEnabled)
-
-			String modelInvariantId = jsonUtil.getJsonValue(vnfModelInfo, "modelInvariantId")
-			execution.setVariable("DoCVNF_modelInvariantId", modelInvariantId)
-			utils.log("DEBUG", "Incoming Invariant Id is: " + modelInvariantId, isDebugEnabled)
-
-			String modelVersionId = jsonUtil.getJsonValue(vnfModelInfo, "modelVersionId")
-			if (modelVersionId == null) {
-				modelVersionId = ""
-			}
-			execution.setVariable("DoCVNF_modelVersionId", modelVersionId)
-			utils.log("DEBUG", "Incoming Version Id is: " + modelVersionId, isDebugEnabled)
-
-			String modelVersion = jsonUtil.getJsonValue(vnfModelInfo, "modelVersion")
-			execution.setVariable("DoCVNF_modelVersion", modelVersion)
-			utils.log("DEBUG", "Incoming Model Version is: " + modelVersion, isDebugEnabled)
-
-			String modelName = jsonUtil.getJsonValue(vnfModelInfo, "modelName")
-			execution.setVariable("DoCVNF_modelName", modelName)
-			utils.log("DEBUG", "Incoming Model Name is: " + modelName, isDebugEnabled)
-
-			String modelCustomizationId = jsonUtil.getJsonValue(vnfModelInfo, "modelCustomizationId")
-			if (modelCustomizationId == null) {
-				modelCustomizationId = ""
-			}
-			execution.setVariable("DoCVNF_modelCustomizationId", modelCustomizationId)
-			utils.log("DEBUG", "Incoming Model Customization Id is: " + modelCustomizationId, isDebugEnabled)
-
-			String cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "lcpCloudRegionId")
-			execution.setVariable("DoCVNF_cloudSiteId", cloudSiteId)
-			utils.log("DEBUG", "Incoming Cloud Site Id is: " + cloudSiteId, isDebugEnabled)
-
-			String tenantId = jsonUtil.getJsonValue(cloudConfiguration, "tenantId")
-			execution.setVariable("DoCVNF_tenantId", tenantId)
-			utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId, isDebugEnabled)
-
-			//For Completion Handler & Fallout Handler
-			String requestInfo =
+			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			execution.setVariable("DoCVNF_serviceInstanceId", serviceInstanceId)

+			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

+

+			String vnfType = execution.getVariable("vnfType")

+			execution.setVariable("DoCVNF_vnfType", vnfType)

+			utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)

+

+			String vnfName = execution.getVariable("vnfName")

+			execution.setVariable("DoCVNF_vnfName", vnfName)

+			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)

+

+			String serviceId = execution.getVariable("productFamilyId")

+			execution.setVariable("DoCVNF_serviceId", serviceId)

+			utils.log("DEBUG", "Incoming Service Id is: " + serviceId, isDebugEnabled)

+

+			String source = "VID"

+			execution.setVariable("DoCVNF_source", source)

+			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

+

+			String suppressRollback = execution.getVariable("disableRollback")

+			execution.setVariable("DoCVNF_suppressRollback", suppressRollback)

+			utils.log("DEBUG", "Incoming Suppress Rollback is: " + suppressRollback, isDebugEnabled)

+			

+			String modelInvariantId = jsonUtil.getJsonValue(vnfModelInfo, "modelInvariantId")

+			execution.setVariable("DoCVNF_modelInvariantId", modelInvariantId)

+			utils.log("DEBUG", "Incoming Invariant Id is: " + modelInvariantId, isDebugEnabled)

+			

+			String modelVersionId = jsonUtil.getJsonValue(vnfModelInfo, "modelVersionId")

+			if (modelVersionId == null) {

+				modelVersionId = ""

+			}

+			execution.setVariable("DoCVNF_modelVersionId", modelVersionId)

+			utils.log("DEBUG", "Incoming Version Id is: " + modelVersionId, isDebugEnabled)

+

+			String modelVersion = jsonUtil.getJsonValue(vnfModelInfo, "modelVersion")

+			execution.setVariable("DoCVNF_modelVersion", modelVersion)

+			utils.log("DEBUG", "Incoming Model Version is: " + modelVersion, isDebugEnabled)

+			

+			String modelName = jsonUtil.getJsonValue(vnfModelInfo, "modelName")

+			execution.setVariable("DoCVNF_modelName", modelName)

+			utils.log("DEBUG", "Incoming Model Name is: " + modelName, isDebugEnabled)

+			

+			String modelCustomizationId = jsonUtil.getJsonValue(vnfModelInfo, "modelCustomizationId")

+			if (modelCustomizationId == null) {

+				modelCustomizationId = ""

+			}

+			execution.setVariable("DoCVNF_modelCustomizationId", modelCustomizationId)

+			utils.log("DEBUG", "Incoming Model Customization Id is: " + modelCustomizationId, isDebugEnabled)

+				

+			String cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "lcpCloudRegionId")

+			execution.setVariable("DoCVNF_cloudSiteId", cloudSiteId)

+			utils.log("DEBUG", "Incoming Cloud Site Id is: " + cloudSiteId, isDebugEnabled)

+				

+			String tenantId = jsonUtil.getJsonValue(cloudConfiguration, "tenantId")

+			execution.setVariable("DoCVNF_tenantId", tenantId)

+			utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId, isDebugEnabled)			

+			

+			String globalSubscriberId = execution.getVariable("globalSubscriberId")

+			if (globalSubscriberId == null) {

+				globalSubscriberId = ""

+			}

+			execution.setVariable("DoCVNF_globalSubscriberId", globalSubscriberId)

+			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)

+			

+			String sdncVersion = execution.getVariable("sdncVersion")

+			if (sdncVersion == null) {

+				sdncVersion = "1702"

+			}

+			execution.setVariable("DoCVNF_sdncVersion", sdncVersion)

+			utils.log("DEBUG", "Incoming Sdnc Version is: " + sdncVersion, isDebugEnabled)

+

+			//For Completion Handler & Fallout Handler

+			String requestInfo =

 				"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>
-					<action>CREATE</action>
-					<source>${source}</source>
-				   </request-info>"""
-
-			execution.setVariable("DoCVNF_requestInfo", requestInfo)
-			//TODO: Orch Status - TBD, will come from SDN-C Response in 1702
-			String orchStatus = "Created"
-			execution.setVariable("DoCVNF_orchStatus", orchStatus)
-
-			//TODO: Equipment Role - Should come from SDN-C Response in 1702
-			String equipmentRole = " "
-			execution.setVariable("DoCVNF_equipmentRole", equipmentRole)
-			String vnfId = execution.getVariable("testVnfId") // for junits
-			if(isBlank(vnfId)){
-				vnfId = execution.getVariable("vnfId")
-				if (isBlank(vnfId)) {
-					vnfId = UUID.randomUUID().toString()
-					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)
-				}
-			}
-			execution.setVariable("DoCVNF_vnfId", vnfId)
-
-			// Setting for Sub Flow Calls
-			execution.setVariable("DoCVNF_type", "generic-vnf")
-			execution.setVariable("GENGS_type", "service-instance")
-
-			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
-				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
-				logError(msg)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
-			}
-			execution.setVariable("DoCVNF_sdncCallbackUrl", sdncCallbackUrl)
-			utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)
-			logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugEnabled)
-
-		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
-			throw b
-		}catch(Exception e){
-			utils.log("DEBUG", " Error Occured in DoCreateVnf PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
-
-		}
-		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PreProcessRequest Process ***", isDebugEnabled)
-	}
-
-
-	public void prepareCreateGenericVnf (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " *** STARTED DoCreateVnf PrepareCreateGenericVnf Process *** ", isDebugEnabled)
-		try {
-			//Get Vnf Info
-			String vnfId = execution.getVariable("DoCVNF_vnfId")
-			def vnfName = execution.getVariable("DoCVNF_vnfName")
-			def vnfType = execution.getVariable("DoCVNF_vnfType")
-			def serviceId = execution.getVariable("DoCVNF_serviceId")
-			def orchStatus = execution.getVariable("DoCVNF_orchStatus")
-			def modelInvariantId = execution.getVariable("DoCVNF_modelInvariantId")
-			def modelVersion = execution.getVariable("DoCVNF_modelVersion")
-			def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")
-			// TODO: 1702 Variable
-			def equipmentRole = execution.getVariable("DoCVNF_equipmentRole")
-
-			//Get Service Instance Info
-			def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
-			String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
-
-			int custStart = siRelatedLink.indexOf("customer/")
-			int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)
-			int serviceStart = siRelatedLink.indexOf("service-subscription/")
-			int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
-
-			//Get Namespace
-			AaiUtil aaiUtil = new AaiUtil(this)
-			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)
-			String namespace = aaiUtil.getNamespaceFromUri(aai_uri)
-
-			String payload =
-					"""<generic-vnf xmlns="${namespace}">
-				<vnf-id>${vnfId}</vnf-id>
-				<vnf-name>${vnfName}</vnf-name>
-				<service-id>${serviceId}</service-id>
-				<vnf-type>${vnfType}</vnf-type>
-				<orchestration-status>${orchStatus}</orchestration-status>
-				<persona-model-id>${modelInvariantId}</persona-model-id>
-				<persona-model-version>${modelVersion}</persona-model-version>
-				<persona-model-customization-id>${modelCustomizationId}</persona-model-customization-id>
-				<relationship-list>
-					<relationship>
-               		<related-to>service-instance</related-to>
-               		<related-link>${siRelatedLink}</related-link>
-               		<relationship-data>
-                  		<relationship-key>customer.global-customer-id</relationship-key>
-                  		<relationship-value>${globalCustId}</relationship-value>
-              		</relationship-data>
-               		<relationship-data>
-                  		<relationship-key>service-subscription.service-type</relationship-key>
-                  		<relationship-value>${serviceType}</relationship-value>
-               		</relationship-data>
-					<relationship-data>
-                  		<relationship-key>service-instance.service-instance-id</relationship-key>
-                  		<relationship-value>${serviceInstanceId}</relationship-value>
-               		</relationship-data>
-            		</relationship>
-				</relationship-list>
-			</generic-vnf>"""
-
-			execution.setVariable("DoCVNF_genericVnfPayload", payload)
-
-		}catch(Exception ex) {
-			utils.log("DEBUG", "Error Occured in DoCreateVnf PrepareCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PrepareCreateGenericVnf Process")
-		}
-		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PrepareCreateGenericVnf Process ***", isDebugEnabled)
-	}
-
-	public void preProcessSDNCAssignRequest(Execution execution){
-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-		logDebug(" ======== STARTED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
-		def vnfId = execution.getVariable("DoCVNF_vnfId")
-		def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
-		logDebug("NEW VNF ID: " + vnfId, isDebugLogEnabled)
-		utils.logAudit("NEW VNF ID: " + vnfId)
-
-		try{
-			//Build SDNC Request
-
-			String assignSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "assign")
-
-			assignSDNCRequest = utils.formatXml(assignSDNCRequest)
-			execution.setVariable("DoCVNF_assignSDNCRequest", assignSDNCRequest)
-			logDebug("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest, isDebugLogEnabled)
-			utils.logAudit("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest)
-
-		}catch(Exception e){
-			utils.log("ERROR", "Exception Occured Processing preProcessSDNCAssignRequest. Exception is:\n" + e, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during prepareProvision Method:\n" + e.getMessage())
-		}
-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
-	}
-
-	public void preProcessSDNCActivateRequest(Execution execution) {
-		def method = getClass().getSimpleName() + '.preProcessSDNCActivateRequest(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-		execution.setVariable("prefix", Prefix)
-		logDebug(" ======== STARTED preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)
-		try{
-			String vnfId = execution.getVariable("DoCVNF_vnfId")
-			String serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
-
-			String activateSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "activate")
-
-			execution.setVariable("DoCVNF_activateSDNCRequest", activateSDNCRequest)
-			logDebug("Outgoing CommitSDNCRequest is: \n" + activateSDNCRequest, isDebugLogEnabled)
-			utils.logAudit("Outgoing CommitSDNCRequest is: \n"  + activateSDNCRequest)
-
-		}catch(Exception e){
-			log.debug("Exception Occured Processing preProcessSDNCActivateRequest. Exception is:\n" + e, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during  preProcessSDNCActivateRequest Method:\n" + e.getMessage())
-		}
-		logDebug("======== COMPLETED  preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)
-	}
-
-	public String buildSDNCRequest(Execution execution, String svcInstId, String action){
-
-				String uuid = execution.getVariable('testReqId') // for junits
-				if(uuid==null){
+					<request-id>${requestId}</request-id>

+					<action>CREATE</action>

+					<source>${source}</source>

+				   </request-info>"""

+

+			execution.setVariable("DoCVNF_requestInfo", requestInfo)

+			//TODO: Orch Status - TBD, will come from SDN-C Response in 1702

+			String orchStatus = "Created"

+			execution.setVariable("DoCVNF_orchStatus", orchStatus)

+

+			//TODO: Equipment Role - Should come from SDN-C Response in 1702

+			String equipmentRole = " "

+			execution.setVariable("DoCVNF_equipmentRole", equipmentRole)

+			String vnfId = execution.getVariable("testVnfId") // for junits

+			if(isBlank(vnfId)){

+				vnfId = execution.getVariable("vnfId")

+				if (isBlank(vnfId)) {

+					vnfId = UUID.randomUUID().toString()

+					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)

+				}

+			}

+			execution.setVariable("DoCVNF_vnfId", vnfId)

+

+			// Setting for Sub Flow Calls

+			execution.setVariable("DoCVNF_type", "generic-vnf")

+			execution.setVariable("GENGS_type", "service-instance")

+				

+			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {

+				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'

+				logError(msg)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

+			}

+			execution.setVariable("DoCVNF_sdncCallbackUrl", sdncCallbackUrl)

+			utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)

+			logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugEnabled)

+			

+			def rollbackData = execution.getVariable("RollbackData")

+			if (rollbackData == null) {

+				rollbackData = new RollbackData()

+			}

+			

+			execution.setVariable("RollbackData", rollbackData)

+			

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", " Error Occured in DoCreateVnf PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

+

+		}

+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PreProcessRequest Process ***", isDebugEnabled)

+	}

+

+	

+	public void prepareCreateGenericVnf (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " *** STARTED DoCreateVnf PrepareCreateGenericVnf Process *** ", isDebugEnabled)

+		try {

+			//Get Vnf Info

+			String vnfId = execution.getVariable("DoCVNF_vnfId")

+			def vnfName = execution.getVariable("DoCVNF_vnfName")

+			def vnfType = execution.getVariable("DoCVNF_vnfType")

+			def serviceId = execution.getVariable("DoCVNF_serviceId")

+			def orchStatus = execution.getVariable("DoCVNF_orchStatus")

+			def modelInvariantId = execution.getVariable("DoCVNF_modelInvariantId")

+			def modelVersion = execution.getVariable("DoCVNF_modelVersion")

+			def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")

+			// TODO: 1702 Variable

+			def equipmentRole = execution.getVariable("DoCVNF_equipmentRole")

+

+			//Get Service Instance Info

+			def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

+			String siRelatedLink = execution.getVariable("GENGS_siResourceLink")

+

+			int custStart = siRelatedLink.indexOf("customer/")

+			int custEnd = siRelatedLink.indexOf("/service-subscriptions")

+			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)

+			int serviceStart = siRelatedLink.indexOf("service-subscription/")

+			int serviceEnd = siRelatedLink.indexOf("/service-instances/")

+			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)

+

+			//Get Namespace

+			AaiUtil aaiUtil = new AaiUtil(this)

+			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)

+			String namespace = aaiUtil.getNamespaceFromUri(aai_uri)

+

+			String payload =

+					"""<generic-vnf xmlns="${namespace}">

+				<vnf-id>${vnfId}</vnf-id>

+				<vnf-name>${vnfName}</vnf-name>

+				<service-id>${serviceId}</service-id>

+				<vnf-type>${vnfType}</vnf-type>

+				<prov-status>PREPROV</prov-status>

+				<orchestration-status>${orchStatus}</orchestration-status>

+				<persona-model-id>${modelInvariantId}</persona-model-id>

+				<persona-model-version>${modelVersion}</persona-model-version>

+				<persona-model-customization-id>${modelCustomizationId}</persona-model-customization-id>

+				<relationship-list>

+					<relationship>

+               		<related-to>service-instance</related-to>

+               		<related-link>${siRelatedLink}</related-link>

+               		<relationship-data>

+                  		<relationship-key>customer.global-customer-id</relationship-key>

+                  		<relationship-value>${globalCustId}</relationship-value>

+              		</relationship-data>

+               		<relationship-data>

+                  		<relationship-key>service-subscription.service-type</relationship-key>

+                  		<relationship-value>${serviceType}</relationship-value>

+               		</relationship-data>

+					<relationship-data>

+                  		<relationship-key>service-instance.service-instance-id</relationship-key>

+                  		<relationship-value>${serviceInstanceId}</relationship-value>

+               		</relationship-data>

+            		</relationship>

+				</relationship-list>

+			</generic-vnf>"""

+

+			execution.setVariable("DoCVNF_genericVnfPayload", payload)

+

+		}catch(Exception ex) {

+			utils.log("DEBUG", "Error Occured in DoCreateVnf PrepareCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PrepareCreateGenericVnf Process")

+		}

+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PrepareCreateGenericVnf Process ***", isDebugEnabled)

+	}

+	

+	public void postProcessCreateGenericVnf (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " *** STARTED DoCreateVnf PostProcessCreateGenericVnf Process *** ", isDebugEnabled)

+		try {

+			//Get Vnf Info

+			String vnfId = execution.getVariable("DoCVNF_vnfId")

+			def rollbackData = execution.getVariable("RollbackData")

+			rollbackData.put("VNF", "vnfId", vnfId)

+			execution.setVariable("RollbackData", rollbackData)

+		}catch(Exception ex) {

+			utils.log("DEBUG", "Error Occured in DoCreateVnf PostProcessCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PostProcessCreateGenericVnf Process")

+		}

+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PostProcessCreateGenericVnf Process ***", isDebugEnabled)

+	}

+	

+	

+	public void preProcessSDNCAssignRequest(Execution execution){

+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+		def vnfId = execution.getVariable("DoCVNF_vnfId")

+		def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

+		logDebug("NEW VNF ID: " + vnfId, isDebugLogEnabled)

+		utils.logAudit("NEW VNF ID: " + vnfId)

+

+		try{

+			//Build SDNC Request

+			

+			String assignSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "assign")

+

+			assignSDNCRequest = utils.formatXml(assignSDNCRequest)

+			execution.setVariable("DoCVNF_assignSDNCRequest", assignSDNCRequest)

+			logDebug("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest, isDebugLogEnabled)

+			utils.logAudit("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest)

+

+		}catch(Exception e){

+			utils.log("ERROR", "Exception Occured Processing preProcessSDNCAssignRequest. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessSDNCAssignRequest Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+	}

+	

+	public void preProcessSDNCActivateRequest(Execution execution) {

+		def method = getClass().getSimpleName() + '.preProcessSDNCActivateRequest(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)

+		try{

+			String vnfId = execution.getVariable("DoCVNF_vnfId")

+			String serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

+

+			String activateSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "activate")

+

+			execution.setVariable("DoCVNF_activateSDNCRequest", activateSDNCRequest)

+			logDebug("Outgoing CommitSDNCRequest is: \n" + activateSDNCRequest, isDebugLogEnabled)

+			utils.logAudit("Outgoing CommitSDNCRequest is: \n"  + activateSDNCRequest)

+

+		}catch(Exception e){

+			log.debug("Exception Occured Processing preProcessSDNCActivateRequest. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during  preProcessSDNCActivateRequest Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED  preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)

+	}

+	

+	public String buildSDNCRequest(Execution execution, String svcInstId, String action){

+		

+				String uuid = execution.getVariable('testReqId') // for junits

+				if(uuid==null){

 					uuid = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
-				}
-				def callbackURL = execution.getVariable("DoCVNF_sdncCallbackUrl")
-				def requestId = execution.getVariable("DoCVNF_requestId")
-				def serviceId = execution.getVariable("DoCVNF_serviceId")
-				def vnfType = execution.getVariable("DoCVNF_vnfType")
-				def vnfName = execution.getVariable("DoCVNF_vnfName")
-				def tenantId = execution.getVariable("DoCVNF_tenantId")
-				def source = execution.getVariable("DoCVNF_source")
-				def vnfId = execution.getVariable("DoCVNF_vnfId")
-				def cloudSiteId = execution.getVariable("DoCVNF_cloudSiteId")
-				def modelInvariantId = execution.getVariable("DoCVNF_modelInvariantId")
-				def modelVersionId = execution.getVariable("DoCVNF_modelVersionId")
-				def modelVersion = execution.getVariable("DoCVNF_modelVersion")
-				def modelName = execution.getVariable("DoCVNF_modelName")
-
-				String sdncVNFParamsXml = ""
-
-				if(execution.getVariable("DoCVNF_vnfParamsExistFlag") == true){
-					sdncVNFParamsXml = buildSDNCParamsXml(execution)
-				}else{
-					sdncVNFParamsXml = ""
-				}
-
-				String sdncRequest =
+				}

+				def callbackURL = execution.getVariable("DoCVNF_sdncCallbackUrl")

+				def requestId = execution.getVariable("DoCVNF_requestId")

+				def serviceId = execution.getVariable("DoCVNF_serviceId")

+				def vnfType = execution.getVariable("DoCVNF_vnfType")

+				def vnfName = execution.getVariable("DoCVNF_vnfName")

+				def tenantId = execution.getVariable("DoCVNF_tenantId")

+				def source = execution.getVariable("DoCVNF_source")

+				def vnfId = execution.getVariable("DoCVNF_vnfId")

+				def cloudSiteId = execution.getVariable("DoCVNF_cloudSiteId")				

+				def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")

+				def serviceModelInfo = execution.getVariable("serviceModelInfo")

+				def vnfModelInfo = execution.getVariable("vnfModelInfo")

+				String serviceEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(serviceModelInfo)

+				String vnfEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vnfModelInfo)				

+				def globalSubscriberId = execution.getVariable("DoCVNF_globalSubscriberId")

+				def sdncVersion = execution.getVariable("DoCVNF_sdncVersion")

+						

+				String sdncVNFParamsXml = ""

+		

+				if(execution.getVariable("DoCVNF_vnfParamsExistFlag") == true){

+					sdncVNFParamsXml = buildSDNCParamsXml(execution)

+				}else{

+					sdncVNFParamsXml = ""

+				}

+		

+				String sdncRequest =

 				"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
 													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
 													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	   <sdncadapter:RequestHeader>
-				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
-				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
-				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
-				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
-				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
-		</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-		<request-information>
-			<request-id>${requestId}</request-id>
-			<request-action>VNFActivateRequest</request-action>
-			<source>${source}</source>
-			<notification-url/>
-			<order-number/>
-			<order-version/>
-		</request-information>
-		<service-information>
-			<service-id>${serviceId}</service-id>
-			<service-type>${serviceId}</service-type>
-			<service-instance-id>${svcInstId}</service-instance-id>
-			<subscriber-name>notsurewecare</subscriber-name>
-		</service-information>
-		<vnf-information>
-			<vnf-id>${vnfId}</vnf-id>
-			<vnf-type>${vnfType}</vnf-type>
-			<ecomp-model-information>
-					         <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
-					         <model-uuid>${modelVersionId}</model-uuid>
-					         <model-version>${modelVersion}</model-version>
-					         <model-name>${modelName}</model-name>
-			</ecomp-model-information>
-		</vnf-information>
-		<vnf-request-information>		
-			<vnf-name>${vnfName}</vnf-name>			
-			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>
-			<tenant>${tenantId}</tenant>
-		${sdncVNFParamsXml}
-		</vnf-request-information>
-	</sdncadapterworkflow:SDNCRequestData>
-	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
-
-			utils.logAudit("sdncRequest:  " + sdncRequest)
-			return sdncRequest
-	}
-
-	public void validateSDNCResponse(Execution execution, String response, String method){
-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
-
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-
-		utils.logAudit("workflowException: " + workflowException)
-
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-		utils.logAudit("SDNCResponse: " + response)
-
-		String sdncResponse = response
-		if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
-			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)
-
-		}else{
-			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)
-			throw new BpmnError("MSOWorkflowException")
-		}
-		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
-	}
-
-
-}
+	   <sdncadapter:RequestHeader>

+				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

+				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>

+				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

+				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

+				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

+				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>

+		</sdncadapter:RequestHeader>

+	<sdncadapterworkflow:SDNCRequestData>

+		<request-information>

+			<request-id>${requestId}</request-id>

+			<request-action>CreateVnfInstance</request-action>

+			<source>${source}</source>

+			<notification-url/>

+			<order-number/>

+			<order-version/>

+		</request-information>

+		<service-information>

+			<service-id>${serviceId}</service-id>

+			<subscription-service-type>${serviceId}</subscription-service-type>

+			${serviceEcompModelInformation}			

+			<service-instance-id>${svcInstId}</service-instance-id>

+			<global-customer-id>${globalSubscriberId}</global-customer-id>			

+		</service-information>

+		<vnf-information>

+			<vnf-id>${vnfId}</vnf-id>

+			<vnf-type>${vnfType}</vnf-type>

+			${vnfEcompModelInformation}			

+		</vnf-information>

+		<vnf-request-input>

+			<request-version>${sdncVersion}</request-version>

+			<vnf-name></vnf-name>

+			<tenant>${tenantId}</tenant>		

+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>			

+			${sdncVNFParamsXml}

+		</vnf-request-input>

+	</sdncadapterworkflow:SDNCRequestData>

+	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""

+		

+			utils.logAudit("sdncRequest:  " + sdncRequest)

+			return sdncRequest

+	}

+		

+	public void validateSDNCResponse(Execution execution, String response, String method){

+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

+

+		WorkflowException workflowException = execution.getVariable("WorkflowException")

+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

+

+		utils.logAudit("workflowException: " + workflowException)

+

+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

+

+		utils.logAudit("SDNCResponse: " + response)

+

+		String sdncResponse = response

+		if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

+			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)

+			

+		}else{

+			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)

+			throw new BpmnError("MSOWorkflowException")

+		}

+		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

+	}

+

+	

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
index e1fca3d..861da52 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
@@ -1,241 +1,285 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-import java.util.UUID;
-
-import org.json.JSONObject;
-import org.json.JSONArray;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution;
-
-import static org.apache.commons.lang3.StringUtils.*;
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.RollbackData
-import org.openecomp.mso.bpmn.core.WorkflowException
-
-
-
-/**
- * This class supports the macro VID Flow
- * with the creation of a generic vnf and related VF modules.
- */
-class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
-
-	String Prefix="DCVAM_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	CatalogDbUtils cutils = new CatalogDbUtils()
-
-	/**
-	 * This method gets and validates the incoming
-	 * request.
-	 *
-	 * @param - execution
-	 */
-	public void preProcessRequest(Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)
-
-		try{
-			// Get Variables	
-			
-			
-			String cloudConfiguration = execution.getVariable("cloudConfiguration")
-			String vnfModelInfo = execution.getVariable("vnfModelInfo")
-			
-			String requestId = execution.getVariable("requestId")
-			execution.setVariable("mso-request-id", requestId)
-			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")			
-			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-
-			String vnfType = execution.getVariable("vnfType")			
-			utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)
-
-			String vnfName = execution.getVariable("vnfName")
-			execution.setVariable("CREVI_vnfName", vnfName)
-			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)
-
-			String productFamilyId = execution.getVariable("productFamilyId")			
-			utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugEnabled)
-
-			String source = "VID"
-			execution.setVariable("source", source)
-			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
-
-			String disableRollback = execution.getVariable("disableRollback")			
-			utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugEnabled)
-			
-			String asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")
-			utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugEnabled)
-
-			String vnfId = execution.getVariable("testVnfId") // for junits
-			if(isBlank(vnfId)){
-				vnfId = execution.getVariable("vnfId")
-				if (isBlank(vnfId)) {
-					vnfId = UUID.randomUUID().toString()
-					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)
-				}
-			}
-			execution.setVariable("vnfId", vnfId)			
-			
-		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
-			throw b
-		}catch(Exception e){
-			utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
-
-		}
-		utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)
-	}	
-
-	
-	public void queryCatalogDB (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugEnabled)
-		try {
-			//Get Vnf Info
-			String vnfModelInfo = execution.getVariable("vnfModelInfo")
-			String vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationId")
-			utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid)
-			String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")
-			
-			JSONArray vnfs = cutils.getAllVnfsByVnfModelCustomizationUuid(catalogDbEndpoint, 
-							vnfModelCustomizationUuid)
-			utils.log("DEBUG", "obtained VNF list")
-			// Only one match here
-			JSONObject vnf = vnfs[0]
-			JSONArray vfModules = vnf.getJSONArray("vfModules")
-			JSONArray addOnModules = new JSONArray()
-			
-			// Set up base Vf Module info
-			for (int i = 0; i < vfModules.length(); i++) {
-				utils.log("DEBUG", "handling VF Module ")
-				JSONObject vfModule = vfModules[i]
-				String isBase = jsonUtil.getJsonValueForKey(vfModule, "isBase")
-				if (isBase.equals("true")) {
-					JSONObject baseVfModuleModelInfoObject = vfModule.getJSONObject("modelInfo")
-					String baseVfModuleModelInfo = baseVfModuleModelInfoObject.toString()
-					execution.setVariable("baseVfModuleModelInfo", baseVfModuleModelInfo)
-					String baseVfModuleLabel = jsonUtil.getJsonValueForKey(vfModule, "vfModuleLabel")
-					execution.setVariable("baseVfModuleLabel", baseVfModuleLabel)
-					String basePersonaModelId = jsonUtil.getJsonValueForKey(baseVfModuleModelInfoObject, "modelInvariantId")
-					execution.setVariable("basePersonaModelId", basePersonaModelId)					
-				}
-				else {
-					addOnModules.add(vfModules[i])
-				}			
-			}
-			
-			execution.setVariable("addOnModules", addOnModules)
-			execution.setVariable("addOnModulesToDeploy", addOnModules.length())
-			execution.setVariable("addOnModulesDeployed", 0)			
-			
-		}catch(Exception ex) {
-			utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModules QueryCatalogDB Process")
-		}
-		
-		// Generate vfModuleId for base VF Module
-		def baseVfModuleId = UUID.randomUUID().toString()
-		execution.setVariable("baseVfModuleId", baseVfModuleId)
-		utils.log("DEBUG", "*** COMPLETED CreateVnfInfra PrepareCreateGenericVnf Process ***", isDebugEnabled)
-	}
-	
-	public void preProcessAddOnModule(Execution execution){
-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-		logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)
-		
-		try {			
-			JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")
-			int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")
-			
-			JSONObject addOnModule = addOnModules[addOnIndex]
-			
-			def newVfModuleId = UUID.randomUUID().toString()
-			execution.setVariable("addOnVfModuleId", newVfModuleId)
-			
-			execution.setVariable("instancesOfThisModelDeployed", 0)
-			
-			JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")
-			String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()
-			execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)
-			String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")
-			execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)
-			String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")
-			execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)
-			String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")
-			execution.setVariable("initialCount", addOnInitialCount)
-					
-		
-		}catch(Exception e){
-			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
-		}
-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
-	}
-	
-	public void validateAddOnModule(Execution execution){
-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-		logDebug(" ======== STARTED validateAddOnModule ======== ", isDebugLogEnabled)
-		
-		try {
-			int instancesOfThisModuleDeployed = execution.getVariable("instancesOfThisModuleDeployed")
-			execution.setVariable("instancesOfThisModuleDeployed", instancesOfThisModuleDeployed + 1)
-		}catch(Exception e){
-			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
-		}
-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
-	}
-	
-	public void finishProcessingInitialCountDeployment(Execution execution){
-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-		logDebug(" ======== STARTED finishProcessingInitialCountDeployment ======== ", isDebugLogEnabled)
-		
-		try {
-			int addOnModulesDeployed = execution.getVariable("addOnModulesDeployed")
-			execution.setVariable("addOnModulesDeployed", addOnModulesDeployed + 1)			
-		}catch(Exception e){
-			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
-		}
-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
-	}
-	
-	
-	
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import java.util.UUID;

+

+import org.json.JSONObject;

+import org.json.JSONArray;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution;

+

+import static org.apache.commons.lang3.StringUtils.*;

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+

+

+

+/**

+* This class supports the macro VID Flow

+* with the creation of a generic vnf and related VF modules.

+*/

+class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {

+

+   String Prefix="DCVAM_"

+   ExceptionUtil exceptionUtil = new ExceptionUtil()

+   JsonUtils jsonUtil = new JsonUtils()

+   VidUtils vidUtils = new VidUtils(this)

+   CatalogDbUtils cutils = new CatalogDbUtils()

+

+   /**

+	* This method gets and validates the incoming

+	* request.

+	*

+	* @param - execution

+	*/

+   public void preProcessRequest(Execution execution) {

+	   def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix",Prefix)

+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)

+

+	   try{

+		   // Get Variables

+		   

+		   

+		   String cloudConfiguration = execution.getVariable("cloudConfiguration")

+		   String vnfModelInfo = execution.getVariable("vnfModelInfo")

+		   

+		   String requestId = execution.getVariable("requestId")

+			execution.setVariable("mso-request-id", requestId)

+		   utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

+

+		   String serviceInstanceId = execution.getVariable("serviceInstanceId")

+		   utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

+

+		   String vnfType = execution.getVariable("vnfType")

+		   utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)

+

+		   String vnfName = execution.getVariable("vnfName")

+		   execution.setVariable("CREVI_vnfName", vnfName)

+		   utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)

+

+		   String productFamilyId = execution.getVariable("productFamilyId")

+		   utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugEnabled)

+

+		   String source = "VID"

+		   execution.setVariable("source", source)

+		   utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

+

+		   String disableRollback = execution.getVariable("disableRollback")

+		   utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugEnabled)

+		   

+		   String asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")

+		   utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugEnabled)

+

+		   String vnfId = execution.getVariable("testVnfId") // for junits

+		   if(isBlank(vnfId)){

+			   vnfId = execution.getVariable("vnfId")

+			   if (isBlank(vnfId)) {

+				   vnfId = UUID.randomUUID().toString()

+				   utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)

+			   }

+		   }

+		   execution.setVariable("vnfId", vnfId)

+		   

+		   def rollbackData = execution.getVariable("RollbackData")

+		   if (rollbackData == null) {

+			   rollbackData = new RollbackData()

+		   }

+		   

+		   execution.setVariable("numOfCreatedAddOnModules", 0)

+		   

+		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", 0)

+		   execution.setVariable("RollbackData", rollbackData)

+		   

+	   }catch(BpmnError b){

+		   utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+		   throw b

+	   }catch(Exception e){

+		   utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

+

+	   }

+	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)

+   }

+

+   

+   public void queryCatalogDB (Execution execution) {

+	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix",Prefix)

+

+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugEnabled)

+	   try {

+		   //Get Vnf Info

+		   String vnfModelInfo = execution.getVariable("vnfModelInfo")

+		   String vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationId")

+		   utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid)

+		   String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")

+		   

+		   JSONArray vnfs = cutils.getAllVnfsByVnfModelCustomizationUuid(catalogDbEndpoint,

+						   vnfModelCustomizationUuid)

+		   utils.log("DEBUG", "obtained VNF list")

+		   // Only one match here

+		   JSONObject vnf = vnfs[0]

+		   JSONArray vfModules = vnf.getJSONArray("vfModules")

+		   JSONArray addOnModules = new JSONArray()

+		   

+		   // Set up base Vf Module info

+		   for (int i = 0; i < vfModules.length(); i++) {

+			   utils.log("DEBUG", "handling VF Module ")

+			   JSONObject vfModule = vfModules[i]

+			   String isBase = jsonUtil.getJsonValueForKey(vfModule, "isBase")

+			   if (isBase.equals("true")) {

+				   JSONObject baseVfModuleModelInfoObject = vfModule.getJSONObject("modelInfo")

+				   String baseVfModuleModelInfo = baseVfModuleModelInfoObject.toString()

+				   execution.setVariable("baseVfModuleModelInfo", baseVfModuleModelInfo)

+				   String baseVfModuleLabel = jsonUtil.getJsonValueForKey(vfModule, "vfModuleLabel")

+				   execution.setVariable("baseVfModuleLabel", baseVfModuleLabel)

+				   String basePersonaModelId = jsonUtil.getJsonValueForKey(baseVfModuleModelInfoObject, "modelInvariantId")

+				   execution.setVariable("basePersonaModelId", basePersonaModelId)

+			   }

+			   else {

+				   addOnModules.add(vfModules[i])

+			   }

+		   }

+		   

+		   execution.setVariable("addOnModules", addOnModules)

+		   execution.setVariable("addOnModulesToDeploy", addOnModules.length())

+		   execution.setVariable("addOnModulesDeployed", 0)

+		   

+	   }catch(Exception ex) {

+		   utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModules QueryCatalogDB Process")

+	   }

+	   

+	   // Generate vfModuleId for base VF Module

+	   def baseVfModuleId = UUID.randomUUID().toString()

+	   execution.setVariable("baseVfModuleId", baseVfModuleId)

+	   utils.log("DEBUG", "*** COMPLETED CreateVnfInfra PrepareCreateGenericVnf Process ***", isDebugEnabled)

+   }

+   

+   public void preProcessAddOnModule(Execution execution){

+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix", Prefix)

+	   logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)

+	   

+	   try {

+		   JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")

+		   int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")

+		   

+		   JSONObject addOnModule = addOnModules[addOnIndex]

+		   

+		   def newVfModuleId = UUID.randomUUID().toString()

+		   execution.setVariable("addOnVfModuleId", newVfModuleId)

+		   

+		   execution.setVariable("instancesOfThisModelDeployed", 0)

+		   

+		   JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")

+		   String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()

+		   execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)

+		   String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")

+		   execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)

+		   String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")

+		   execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)

+		   String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")

+		   execution.setVariable("initialCount", addOnInitialCount)

+				   

+	   

+	   }catch(Exception e){

+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

+	   }

+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+   }

+   

+   public void validateBaseModule(Execution execution){

+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix", Prefix)

+	   logDebug(" ======== STARTED validateBaseModule ======== ", isDebugLogEnabled)

+	   

+	   try {

+		   def baseRollbackData = execution.getVariable("DCVAM_baseRollbackData")

+		   def rollbackData = execution.getVariable("RollbackData")

+		   

+		   def baseModuleMap = baseRollbackData.get("VFMODULE")

+		   baseModuleMap.each{ k, v -> rollbackData.put("VFMODULE_BASE", "${k}","${v}") }

+		   execution.setVariable("RollbackData", rollbackData)

+		   

+	   }catch(Exception e){

+		   utils.log("ERROR", "Exception Occured Processing validateBaseModule. Exception is:\n" + e, isDebugLogEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during validateBaseModule Method:\n" + e.getMessage())

+	   }

+	   logDebug("======== COMPLETED validateBaseModule ======== ", isDebugLogEnabled)

+   }

+   

+   public void validateAddOnModule(Execution execution){

+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix", Prefix)

+	   logDebug(" ======== STARTED validateAddOnModule ======== ", isDebugLogEnabled)

+	   

+	   try {

+		   int instancesOfThisModuleDeployed = execution.getVariable("instancesOfThisModuleDeployed")

+		   int numOfCreatedAddOnModules = execution.getVariable("numOfCreatedAddOnModules")

+		   def addOnRollbackData = execution.getVariable("DCVAM_addOnRollbackData")

+		   def rollbackData = execution.getVariable("RollbackData")

+		   

+		   def addOnModuleMap = addOnRollbackData.get("VFMODULE")

+		   numOfCreatedAddOnModules = numOfCreatedAddOnModules + 1

+		   addOnModuleMap.each{ k, v -> rollbackData.put("VFMODULE_ADDON_" + numOfCreatedAddOnModules, "${k}","${v}") }

+		   

+		   execution.setVariable("DCVAM_addOnRollbackData", null)

+		   

+		   execution.setVariable("instancesOfThisModuleDeployed", instancesOfThisModuleDeployed + 1)

+		   

+		   execution.setVariable("numOfCreatedAddOnModules", numOfCreatedAddOnModules)

+		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", numOfCreatedAddOnModules)

+		   execution.setVariable("RollbackData", rollbackData)

+	   }catch(Exception e){

+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

+	   }

+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+   }

+   

+   public void finishProcessingInitialCountDeployment(Execution execution){

+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+	   execution.setVariable("prefix", Prefix)

+	   logDebug(" ======== STARTED finishProcessingInitialCountDeployment ======== ", isDebugLogEnabled)

+	   

+	   try {

+		   int addOnModulesDeployed = execution.getVariable("addOnModulesDeployed")

+		   execution.setVariable("addOnModulesDeployed", addOnModulesDeployed + 1)

+	   }catch(Exception e){

+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

+	   }

+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+   }

+   

+   

+   

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
new file mode 100644
index 0000000..7b9bed3
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
@@ -0,0 +1,153 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import java.util.UUID;

+

+import org.json.JSONObject;

+import org.json.JSONArray;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution;

+

+import static org.apache.commons.lang3.StringUtils.*;

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+

+/**

+ * This class supports the macro VID Flow

+ * with the rollback of a creation of a generic vnf and related VF modules.

+ */

+class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {

+

+	String Prefix="DCVAMR_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	

+

+	/**

+	 * This method gets and validates the incoming

+	 * request.

+	 *

+	 * @param - execution

+	 *

+	 */

+	public void preProcessRequest(Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		utils.log("DEBUG", " *** STARTED DoCreateVnfAndModulesRollback PreProcessRequest Process*** ", isDebugEnabled)

+

+		try{

+			// Get Rollback Variables

+			

+			def rollbackData = execution.getVariable("RollbackData")

+			utils.log("DEBUG", "Incoming RollbackData is: " + rollbackData.toString(), isDebugEnabled)

+			String vnfId = rollbackData.get("VNF", "vnfId")

+			utils.log("DEBUG", "Rollback vnfId is: " + vnfId, isDebugEnabled)

+			execution.setVariable("DCVAMR_vnfId", vnfId)

+			

+			def numOfAddOnModulesString = rollbackData.get("VNFANDMODULES", "numOfCreatedAddOnModules")

+			int numOfAddOnModules = 0

+			if (numOfAddOnModulesString != null) {

+				numOfAddOnModules = Integer.parseInt(numOfAddOnModulesString)				

+			}

+			execution.setVariable("DCVAMR_numOfAddOnModules", numOfAddOnModules)

+			

+			def baseVfModuleRollbackMap = rollbackData.get("VFMODULE_BASE")

+			if (baseVfModuleRollbackMap == null) {

+				// there are no VF Modules to delete

+				execution.setVariable("DCVAMR_numOfModulesToDelete", 0)

+			}

+			else {

+				execution.setVariable("DCVAMR_numOfModulesToDelete", numOfAddOnModules + 1)				

+			}			

+			

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", " Error Occured in DoCreateVnfAndModulesRollback PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModulesRollback PreProcessRequest")

+

+		}

+		utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModulesRollback PreProcessRequest Process ***", isDebugEnabled)

+	}

+

+	

+	

+	public void preProcessCreateVfModuleRollback(Execution execution){

+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED preProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)

+		

+		try {

+			

+			def rollbackData = execution.getVariable("RollbackData")

+			

+			def vfModuleRollbackData = new RollbackData()

+			

+			def numOfModulesToDelete = execution.getVariable("DCVAMR_numOfModulesToDelete")

+			logDebug("numOfModulesToDelete: " + numOfModulesToDelete, isDebugLogEnabled)

+			def moduleMap = null

+			

+			if (numOfModulesToDelete > 1) {

+				int addOnModuleIndex = numOfModulesToDelete - 1

+				moduleMap = rollbackData.get("VFMODULE_ADDON_" + addOnModuleIndex)

+				logDebug("Removing ADDON VF module # " + addOnModuleIndex, isDebugLogEnabled)

+			}

+			else {

+				moduleMap = rollbackData.get("VFMODULE_BASE")

+				logDebug("Removing BASE VF module", isDebugLogEnabled)

+			}

+			moduleMap.each{ k, v -> vfModuleRollbackData.put("VFMODULE", "${k}","${v}") }

+			execution.setVariable("DCVAMR_RollbackData", vfModuleRollbackData)								

+			

+		}catch(Exception e){

+			utils.log("ERROR", "Exception Occured Processing preProcessCreateVfModuleRollback. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessCreateVfModuleRollback Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED preProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)

+	}

+	

+	

+	public void postProcessCreateVfModuleRollback(Execution execution){

+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED postProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)

+		

+		try {			

+			def numOfModulesToDelete = execution.getVariable("DCVAMR_numOfModulesToDelete")

+			execution.setVariable("DCVAMR_numOfModulesToDelete", numOfModulesToDelete - 1)		

+		}catch(Exception e){

+			utils.log("ERROR", "Exception Occured Processing postProcessCreateVfModuleRollback. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during postProcessCreateVfModuleRollback Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED postProcessCreateVfModuleRollback ======== ", isDebugLogEnabled)

+	}

+	

+	

+	

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
index dbe3152..76a86ff 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
@@ -1,35 +1,35 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

 
 import java.util.UUID;
 
@@ -179,7 +179,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			// lcpCloudRegion or tenantId not sent, will be extracted from query AA&I
 			def lcpCloudRegion = null
 			if (utils.nodeExists(networkInputs, "aic-cloud-region")) {
-				lcpCloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
+				lcpCloudRegion = utils.getNodeText1(networkInputs, "aic-cloud-region")
 				if (lcpCloudRegion == 'null') {
 					lcpCloudRegion = null
 				}
@@ -245,7 +245,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 		String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 		AaiUtil aaiUriUtil = new AaiUtil(this)
 		String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-		String queryAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId
+		String queryAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
 		utils.logAudit(queryAAIRequest)
 		execution.setVariable(Prefix + "queryAAIRequest", queryAAIRequest)
 		utils.log("DEBUG", Prefix + "AAIRequest - " + "\n" + queryAAIRequest, isDebugEnabled)
@@ -388,7 +388,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 		ExceptionUtil exceptionUtil = new ExceptionUtil()
 		try {
 			// get variables
-			String networkInputs = execution.getVariable(Prefix + "networkInputs")
+			String networkRequest = execution.getVariable(Prefix + "networkRequest")
 			String cloudSiteId = execution.getVariable(Prefix + "cloudRegionPo")
 			String tenantId = execution.getVariable(Prefix + "tenantId")
 
@@ -399,11 +399,16 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			
 			String networkStackId = ""
 			networkStackId = utils.getNodeText1(queryAAIResponse, "heat-stack-id")
-			if (networkStackId == 'null' || networkStackId == "") {
+			if (networkStackId == 'null' || networkStackId == "" || networkStackId == null) {
 				networkStackId = "force_delete"
 			}
 
-			String requestId = execution.getVariable(Prefix + "requestId")
+			String requestId = execution.getVariable("msoRequestId")
+			if (requestId != null) {
+				execution.setVariable("mso-request-id", requestId)
+			} else {
+				requestId = execution.getVariable("mso-request-id")
+			}
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 
 			// Added new Elements
@@ -411,6 +416,12 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			String notificationUrl = ""                                   //TODO - is this coming from URN? What variable/value to use?
 			//String notificationUrl = execution.getVariable("URN_?????") //TODO - is this coming from URN? What variable/value to use?
 
+			String modelCustomizationUuid = ""			
+			if (utils.nodeExists(networkRequest, "networkModelInfo")) {
+				String networkModelInfo = utils.getNodeXml(networkRequest, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
+				modelCustomizationUuid = utils.getNodeText1(networkModelInfo, "modelCustomizationUuid")
+			}
+			
 			String deleteNetworkRequest = """
 					  <deleteNetworkRequest>
 					    <cloudSiteId>${cloudSiteId}</cloudSiteId>
@@ -418,6 +429,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 					    <networkId>${networkId}</networkId>
 						<networkStackId>${networkStackId}</networkStackId>
 					    <networkType>${networkType}</networkType>
+						<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>
 						<skipAAI>true</skipAAI>
 					    <msoRequest>
 					       <requestId>${requestId}</requestId>
@@ -508,15 +520,16 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			
 			String serviceInstanceId = utils.getNodeText1(deleteNetworkInput, "service-instance-id")
 
-			// get/set 'msoRequestId' and 'mso-request-id'
+			// get/set 'msoRequestId' and 'mso-request-id'

 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
+				execution.setVariable("mso-request-id", requestId)

 			} else {
-			    requestId = execution.getVariable("mso-request-id")
+			    requestId = execution.getVariable("mso-request-id")

 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
-			
+			

+			utils.log("DEBUG", Prefix + "requestId " + requestId, isDebugEnabled)
 			String queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
 			
 			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
@@ -642,7 +655,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 					execution.setVariable(Prefix + "rollbackNetworkRequest", "")
 				} else {
 				    String rollbackNetwork =
-					  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">
+					  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">

 						  	${rollbackData}
 						 </NetworkAdapter:rollbackNetwork>"""
 				    String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
@@ -847,8 +860,14 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			       if (execution.getVariable(Prefix + "WorkflowException") != null) {
 				      WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
 				      exceptionMessage = pwfex.getErrorMessage()
-			       }   
+			       } else {
+				      if (execution.getVariable("WorkflowException") != null) {
+					     WorkflowException pwfex = execution.getVariable("WorkflowException")
+					     exceptionMessage = pwfex.getErrorMessage()
+					  }
+			       }
    				}
+				   
 				// going to the Main flow: a-la-carte or macro
 				utils.log("DEBUG", " ***** postProcessResponse(), BAD !!!", isDebugEnabled)
 				exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
@@ -977,12 +996,12 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			
 			String serviceInstanceId = utils.getNodeText1(deleteNetworkInput, "service-instance-id")
 
-			// get/set 'msoRequestId' and 'mso-request-id'
+			// get/set 'msoRequestId' and 'mso-request-id'

 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
+				execution.setVariable("mso-request-id", requestId)

 			} else {
-			    requestId = execution.getVariable("mso-request-id")
+			    requestId = execution.getVariable("mso-request-id")

 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
 			
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy
index 5863fdc..58c6f68 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy
@@ -1,335 +1,335 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-/**
- * This groovy class supports the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
- *
- */
-public class DoDeleteNetworkInstanceRollback extends AbstractServiceTaskProcessor {
-	String Prefix="DELNWKIR_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-	
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		/* Initialize all the process variables in this block */
-		
-		execution.setVariable(Prefix + "WorkflowException", null)
-	
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", null)
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-		
-		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
-		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-				
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "fullRollback", false)
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		
-		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + className + ".groovy ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-			
-			// GET Incoming request/variables
-			String rollbackDeactivateSDNCRequest = null
-			String rollbackSDNCRequest = null
-			String rollbackNetworkRequest = null
-
-			Map<String, String> rollbackData = execution.getVariable("rollbackData")
-			if (rollbackData != null && rollbackData instanceof Map) {
-				
-				if(rollbackData.containsKey("rollbackDeactivateSDNCRequest")) {
-				   rollbackDeactivateSDNCRequest = rollbackData["rollbackDeactivateSDNCRequest"]
-				}
-				
-				if(rollbackData.containsKey("rollbackSDNCRequest")) {
-					rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
-				 }
-				
-				if(rollbackData.containsKey("rollbackNetworkRequest")) {
-					rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
-				 }
-			}
-			
-			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
-			execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", rollbackDeactivateSDNCRequest)
-			utils.log("DEBUG", "'rollbackData': " + '\n' + execution.getVariable("rollbackData"), isDebugEnabled)
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)
-				
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-	
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				utils.log("DEBUG", dataErrorMessage , isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			utils.log("DEBUG", "*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)
-			if(execution.getVariable(Prefix + "WorkflowException") != null) {
-				// called by: DoCreateNetworkInstance, partial rollback
-				execution.setVariable(Prefix + "fullRollback", false)
-
-			} else {
-			   // called by: Macro - Full Rollback, WorkflowException = null
-			   execution.setVariable(Prefix + "fullRollback", true)
-			
-			}
-			
-			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
-			
-		} catch (BpmnError e) {
-		throw e;
-		
-		} catch (Exception ex) {
-			sendSyncError(execution)
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		
-		}
-
-	}
-	
-	public void validateRollbackResponses (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside validateRollbackResponses() of DoDeleteNetworkInstanceRollback ***** ", isDebugEnabled)
-		
-		try {
-
-			// validate SDNC activate response
-			String rollbackDeactivateSDNCMessages = ""
-			String rollbackDeactivateSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest") != null) {
-				rollbackDeactivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackDeactivateSDNCReturnCode")
-				String rollbackDeactivateSDNCResponse = execution.getVariable(Prefix + "rollbackDeactivateSDNCResponse")
-				String rollbackDeactivateSDNCReturnInnerCode = ""
-				rollbackDeactivateSDNCResponse = sdncAdapterUtils.decodeXML(rollbackDeactivateSDNCResponse)
-				rollbackDeactivateSDNCResponse = rollbackDeactivateSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackDeactivateSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackDeactivateSDNCResponse, "response-code")) {
-						rollbackDeactivateSDNCReturnInnerCode = utils.getNodeText1(rollbackDeactivateSDNCResponse, "response-code")
-						if (rollbackDeactivateSDNCReturnInnerCode == "200" || rollbackDeactivateSDNCReturnInnerCode == "" || rollbackDeactivateSDNCReturnInnerCode == "0") {
-						   rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."
-						} else {
-							rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "
-						}
-					} else {
-						 rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."
-					}
-				} else {
-					  rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "
-				}
-				utils.log("DEBUG", " SDNC deactivate rollback Code - " + rollbackDeactivateSDNCReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " SDNC deactivate rollback  Response - " + rollbackDeactivateSDNCResponse, isDebugEnabled)
-			}
-		
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			String rollbackSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
-				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
-				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
-				String rollbackSDNCReturnInnerCode = ""
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)
-				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-							rollbackSdncErrorMessages = " + SNDC unassign rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "
-						}
-					} else {
-						  rollbackSdncErrorMessages = " + SNDC unassign rollback completed."
-					}
-				 } else {
-					  rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "
-				 }
-				utils.log("DEBUG", " SDNC assign rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " SDNC assign rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)
-			}
-			
-			// validate PO network rollback response
-			String rollbackNetworkErrorMessages = ""
-			String rollbackNetworkReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
-				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
-				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")
-				if (rollbackNetworkReturnCode != "200") {
-					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
-				} else {
-					rollbackNetworkErrorMessages = " + PO Network rollback completed."
-				}
-	
-				utils.log("DEBUG", " NetworkRollback Code - " + rollbackNetworkReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " NetworkRollback Response - " + rollbackNetworkResponse, isDebugEnabled)
-			}
-				
-			String statusMessage = ""
-			int errorCode = 7000
-			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
-			if (execution.getVariable(Prefix + "fullRollback") == false) {
-				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException") // original WorkflowException
-				if (wfe != null) {
-					statusMessage = wfe.getErrorMessage()
-					errorCode = wfe.getErrorCode()
-				} else {
-					statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-					errorCode = '7000'
-				}
-
-				// set if all rolledbacks are successful
-				if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-					execution.setVariable("rolledBack", true)
-					execution.setVariable("wasDeleted", true)
-				
-				} else {
-					execution.setVariable("rolledBack", false)
-					execution.setVariable("wasDeleted", true)
-				}
-
-				statusMessage =  statusMessage + rollbackDeactivateSDNCMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-				utils.log("DEBUG", "Final DoDeleteNetworkInstanceRollback status message: " + statusMessage, isDebugEnabled)
-				String processKey = getProcessKey(execution);
-				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
-				execution.setVariable("workflowException", exception);
-			
-			} else {
-				// rollback due to failures in Main flow (Macro or a-ala-carte) - Full rollback
-			    if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-				    execution.setVariable("rollbackSuccessful", true)
-				    execution.setVariable("rollbackError", false) 
-			    } else {
-				    String exceptionMessage = "Network Delete Rollback was not Successful. "
-                    utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-					execution.setVariable("rollbackSuccessful", false)
-				    execution.setVariable("rollbackError", true)
-					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-					throw new BpmnError("MSOWorkflowException")
-			    }  
-			} 			
-			
-		} catch (Exception ex) {
-			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-
-	
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		
-		try{
-			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-			
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+import java.util.UUID;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils

+

+/**

+ * This groovy class supports the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.

+ *

+ */

+public class DoDeleteNetworkInstanceRollback extends AbstractServiceTaskProcessor {

+	String Prefix="DELNWKIR_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)

+	NetworkUtils networkUtils = new NetworkUtils()

+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()

+

+	def className = getClass().getSimpleName()

+	

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.

+	 * @param execution

+	 */

+	public InitializeProcessVariables(Execution execution){

+		/* Initialize all the process variables in this block */

+		

+		execution.setVariable(Prefix + "WorkflowException", null)

+	

+		execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", null)

+		execution.setVariable(Prefix + "rollbackDeactivateSDNCResponse", "")

+		execution.setVariable(Prefix + "rollbackDeactivateSDNCReturnCode", "")

+

+		execution.setVariable(Prefix + "rollbackSDNCRequest", "")

+		execution.setVariable(Prefix + "rollbackSDNCResponse", "")

+		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")

+		

+		execution.setVariable(Prefix + "rollbackNetworkRequest", null)

+		execution.setVariable(Prefix + "rollbackNetworkResponse", "")

+		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")

+				

+		execution.setVariable(Prefix + "Success", false)

+		execution.setVariable(Prefix + "fullRollback", false)

+

+	}

+

+	// **************************************************

+	//     Pre or Prepare Request Section

+	// **************************************************

+	/**

+	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.

+	 * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		

+		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + className + ".groovy ***** ", isDebugEnabled)

+

+		try {

+			// initialize flow variables

+			InitializeProcessVariables(execution)

+			

+			// GET Incoming request/variables

+			String rollbackDeactivateSDNCRequest = null

+			String rollbackSDNCRequest = null

+			String rollbackNetworkRequest = null

+

+			Map<String, String> rollbackData = execution.getVariable("rollbackData")

+			if (rollbackData != null && rollbackData instanceof Map) {

+				

+				if(rollbackData.containsKey("rollbackDeactivateSDNCRequest")) {

+				   rollbackDeactivateSDNCRequest = rollbackData["rollbackDeactivateSDNCRequest"]

+				}

+				

+				if(rollbackData.containsKey("rollbackSDNCRequest")) {

+					rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]

+				 }

+				

+				if(rollbackData.containsKey("rollbackNetworkRequest")) {

+					rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]

+				 }

+			}

+			

+			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)

+			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)

+			execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", rollbackDeactivateSDNCRequest)

+			utils.log("DEBUG", "'rollbackData': " + '\n' + execution.getVariable("rollbackData"), isDebugEnabled)

+

+			String sdncVersion = execution.getVariable("sdncVersion")

+			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)

+				

+			// PO Authorization Info / headers Authorization=

+			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)

+			try {

+				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))

+				execution.setVariable("BasicAuthHeaderValuePO",encodedString)

+				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)

+	

+			} catch (IOException ex) {

+				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "

+				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()

+				utils.log("DEBUG", dataErrorMessage , isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+			}

+

+			if (execution.getVariable("SavedWorkflowException1") != null) {

+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))

+			} else {

+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))

+			}

+			utils.log("DEBUG", "*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)

+			if(execution.getVariable(Prefix + "WorkflowException") != null) {

+				// called by: DoCreateNetworkInstance, partial rollback

+				execution.setVariable(Prefix + "fullRollback", false)

+

+			} else {

+			   // called by: Macro - Full Rollback, WorkflowException = null

+			   execution.setVariable(Prefix + "fullRollback", true)

+			

+			}

+			

+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)

+			

+		} catch (BpmnError e) {

+		throw e;

+		

+		} catch (Exception ex) {

+			sendSyncError(execution)

+			// caught exception

+			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

+		

+		}

+

+	}

+	

+	public void validateRollbackResponses (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+

+		utils.log("DEBUG", " ***** Inside validateRollbackResponses() of DoDeleteNetworkInstanceRollback ***** ", isDebugEnabled)

+		

+		try {

+

+			// validate SDNC activate response

+			String rollbackDeactivateSDNCMessages = ""

+			String rollbackDeactivateSDNCReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest") != null) {

+				rollbackDeactivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackDeactivateSDNCReturnCode")

+				String rollbackDeactivateSDNCResponse = execution.getVariable(Prefix + "rollbackDeactivateSDNCResponse")

+				String rollbackDeactivateSDNCReturnInnerCode = ""

+				rollbackDeactivateSDNCResponse = sdncAdapterUtils.decodeXML(rollbackDeactivateSDNCResponse)

+				rollbackDeactivateSDNCResponse = rollbackDeactivateSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")

+				if (rollbackDeactivateSDNCReturnCode == "200") {

+					if (utils.nodeExists(rollbackDeactivateSDNCResponse, "response-code")) {

+						rollbackDeactivateSDNCReturnInnerCode = utils.getNodeText1(rollbackDeactivateSDNCResponse, "response-code")

+						if (rollbackDeactivateSDNCReturnInnerCode == "200" || rollbackDeactivateSDNCReturnInnerCode == "" || rollbackDeactivateSDNCReturnInnerCode == "0") {

+						   rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."

+						} else {

+							rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "

+						}

+					} else {

+						 rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."

+					}

+				} else {

+					  rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "

+				}

+				utils.log("DEBUG", " SDNC deactivate rollback Code - " + rollbackDeactivateSDNCReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " SDNC deactivate rollback  Response - " + rollbackDeactivateSDNCResponse, isDebugEnabled)

+			}

+		

+			// validate SDNC rollback response

+			String rollbackSdncErrorMessages = ""

+			String rollbackSDNCReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {

+				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")

+				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")

+				String rollbackSDNCReturnInnerCode = ""

+				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)

+				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")

+				if (rollbackSDNCReturnCode == "200") {

+					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {

+						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")

+						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {

+							rollbackSdncErrorMessages = " + SNDC unassign rollback completed."

+						} else {

+							rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "

+						}

+					} else {

+						  rollbackSdncErrorMessages = " + SNDC unassign rollback completed."

+					}

+				 } else {

+					  rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "

+				 }

+				utils.log("DEBUG", " SDNC assign rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " SDNC assign rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)

+			}

+			

+			// validate PO network rollback response

+			String rollbackNetworkErrorMessages = ""

+			String rollbackNetworkReturnCode = "200"

+			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {

+				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")

+				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")

+				if (rollbackNetworkReturnCode != "200") {

+					rollbackNetworkErrorMessages = " + PO Network rollback failed. "

+				} else {

+					rollbackNetworkErrorMessages = " + PO Network rollback completed."

+				}

+	

+				utils.log("DEBUG", " NetworkRollback Code - " + rollbackNetworkReturnCode, isDebugEnabled)

+				utils.log("DEBUG", " NetworkRollback Response - " + rollbackNetworkResponse, isDebugEnabled)

+			}

+				

+			String statusMessage = ""

+			int errorCode = 7000

+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)

+			if (execution.getVariable(Prefix + "fullRollback") == false) {

+				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException") // original WorkflowException

+				if (wfe != null) {

+					statusMessage = wfe.getErrorMessage()

+					errorCode = wfe.getErrorCode()

+				} else {

+					statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."

+					errorCode = '7000'

+				}

+

+				// set if all rolledbacks are successful

+				if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {

+					execution.setVariable("rolledBack", true)

+					execution.setVariable("wasDeleted", true)

+				

+				} else {

+					execution.setVariable("rolledBack", false)

+					execution.setVariable("wasDeleted", true)

+				}

+

+				statusMessage =  statusMessage + rollbackDeactivateSDNCMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages

+				utils.log("DEBUG", "Final DoDeleteNetworkInstanceRollback status message: " + statusMessage, isDebugEnabled)

+				String processKey = getProcessKey(execution);

+				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);

+				execution.setVariable("workflowException", exception);

+			

+			} else {

+				// rollback due to failures in Main flow (Macro or a-ala-carte) - Full rollback

+			    if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {

+				    execution.setVariable("rollbackSuccessful", true)

+				    execution.setVariable("rollbackError", false) 

+			    } else {

+				    String exceptionMessage = "Network Delete Rollback was not Successful. "

+                    utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+					execution.setVariable("rollbackSuccessful", false)

+				    execution.setVariable("rollbackError", true)

+					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+					throw new BpmnError("MSOWorkflowException")

+			    }  

+			} 			

+			

+		} catch (Exception ex) {

+			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."

+			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()

+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

+

+		}

+

+	}

+

+	// *******************************

+	//     Build Error Section

+	// *******************************

+

+

+	

+	public void processJavaException(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		

+		try{

+			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)

+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")

+			

+		}catch(Exception e){

+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

+			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated

+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)

+		}

+		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
index 83fcd33..6daec69 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
@@ -1,420 +1,420 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import static org.apache.commons.lang3.StringUtils.*;
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-import java.util.UUID;
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.json.JSONObject;
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils;
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-import org.w3c.dom.NodeList
-import org.xml.sax.InputSource
-
-/**
- * This groovy class supports the <class>DoDeleteServiceInstance.bpmn</class> process.
- * 
- * Inputs:
- * @param - msoRequestId
- * @param - globalSubscriberId - O
- * @param - subscriptionServiceType - O
- * @param - serviceInstanceId
- * @param - serviceInstanceName - O
- * @param - serviceModelInfo - O
- * @param - productFamilyId
- * @param - sdncVersion 
- * @param - failNotFound - TODO
- * @param - serviceInputParams - TODO
- *
- * Outputs:
- * @param - WorkflowException
- * 
- * Rollback - Deferred
- */
-public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
-
-	String Prefix="DDELSI_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils()
-
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
-		String msg = ""
-
-		try {
-			String requestId = execution.getVariable("msoRequestId")
-			execution.setVariable("prefix",Prefix)
-
-			//Inputs
-			//requestDetails.subscriberInfo. for AAI GET & PUT & SDNC assignToplology
-			String globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
-			if (globalSubscriberId == null)
-			{
-				execution.setVariable("globalSubscriberId", "")
-			}
-
-			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology
-			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-			if (subscriptionServiceType == null)
-			{
-				execution.setVariable("subscriptionServiceType", "")
-			}
-
-			//Generated in parent for AAI PUT
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			if (isBlank(serviceInstanceId)){
-				msg = "Input serviceInstanceId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-
-			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			if (isBlank(sdncCallbackUrl)) {
-				msg = "URN_mso_workflow_sdncadapter_callback is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
-			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex){
-			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
-	}
-
-	public void preProcessSDNCDelete (Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)
-		String msg = ""
-
-		try {
-			/*
-			 String uuid = execution.getVariable('testReqId') // for junits
-			 if(uuid==null){
-			 uuid = execution.getVariable("msoRequestId") + "-" +  	System.currentTimeMillis()
-			 }
-			 */
-			def serviceInstanceId = execution.getVariable("serviceInstanceId")
-			def serviceInstanceName = execution.getVariable("serviceInstanceName")
-			def callbackURL = execution.getVariable("sdncCallbackUrl")
-			def requestId = execution.getVariable("msoRequestId")
-			def serviceId = execution.getVariable("productFamilyId")
-			def subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-			def globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
-
-			String serviceModelInfo = execution.getVariable("serviceModelInfo")
-			def modelInvariantId = ""
-			def modelVersion = ""
-			def modelUUId = ""
-			def modelName = ""
-			if (!isBlank(serviceModelInfo))
-			{
-				modelInvariantId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")
-				modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
-				modelUUId = jsonUtil.getJsonValue(serviceModelInfo, "modelVersionId")
-				modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")
-				
-				if (modelInvariantId == null) {
-					modelInvariantId = ""
-				}
-				if (modelVersion == null) {
-					modelVersion = ""
-				}
-				if (modelUUId == null) {
-					modelUUId = ""
-				}
-				if (modelName == null) {
-					modelName = ""
-				}
-			}
-			if (serviceInstanceName == null) {
-				serviceInstanceName = ""
-			}
-			if (serviceId == null) {
-				serviceId = ""
-			}
-			
-			def sdncRequestId = UUID.randomUUID().toString()
-
-			String sdncDelete =
-			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-				   <sdncadapter:RequestHeader>
-							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>
-							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
-							<sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
-							<sdncadapter:SvcOperation>service-topology-operation</sdncadapter:SvcOperation>
-							<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
-					</sdncadapter:RequestHeader>
-				<sdncadapterworkflow:SDNCRequestData>
-					<request-information>
-						<request-id>${requestId}</request-id>
-						<source>MSO</source>
-						<notification-url/>
-						<order-number/>
-						<order-version/>
-						<request-action>DeleteServiceInstance</request-action>
-					</request-information>
-					<service-information>
-						<service-id>${serviceId}</service-id>
-						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information>
-					         <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
-					         <model-uuid>${modelUUId}</model-uuid>
-					         <model-version>${modelVersion}</model-version>
-					         <model-name>${modelName}</model-name>
-					    </ecomp-model-information>
-						<service-instance-id>${serviceInstanceId}</service-instance-id>
-						<subscriber-name/>
-						<global-customer-id>${globalSubscriberId}</global-customer-id>
-					</service-information>
-					<service-request-input>
-						<service-instance-name>${serviceInstanceName}</service-instance-name>
-					</service-request-input>
-				</sdncadapterworkflow:SDNCRequestData>
-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
-
-			utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)
-			sdncDelete = utils.formatXml(sdncDelete)
-			execution.setVariable("sdncDelete", sdncDelete)
-			utils.logAudit("sdncDelete:  " + sdncDelete)
-
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch(Exception ex) {
-			msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())
-		}
-		utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
-	}
-
-	public void postProcessSDNCDelete(Execution execution) {
-
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessSDNCDelete ***** ", isDebugEnabled)
-		String msg = ""
-
-		try {
-			WorkflowException workflowException = execution.getVariable("WorkflowException")
-			utils.logAudit("workflowException: " + workflowException)
-
-			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-			String response = execution.getVariable("sdncAdapterResponse")
-			utils.logAudit("SDNCResponse: " + response)
-
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
-				utils.log("DEBUG","Good response from SDNC Adapter for service-instance  topology assign: \n" + response, isDebugEnabled)
-
-			}else{
-				msg = "Bad Response from SDNC Adapter for service-instance delete"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)
-			}
-		} catch (BpmnError e) {
-			throw e;
-		} catch(Exception ex) {
-			msg = "Exception in postProcessSDNCDelete. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())
-		}
-		utils.log("DEBUG"," *** Exit postProcessSDNCDelete *** ", isDebugEnabled)
-	}
-
-	public void postProcessAAIGET(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)
-		String msg = ""
-
-		try {
-
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
-
-			if(foundInAAI == true){
-				utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
-
-				//Extract GlobalSubscriberId
-				String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
-				if (isBlank(siRelatedLink))
-				{
-					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-					utils.log("DEBUG", msg, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-				}
-				else
-				{
-					utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)
-					String  globalSubscriberId = execution.getVariable("globalSubscriberId")
-					if(isBlank(globalSubscriberId)){
-						int custStart = siRelatedLink.indexOf("customer/")
-						int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-						globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)
-						execution.setVariable("globalSubscriberId", globalSubscriberId)
-					}
-
-					//Extract Service Type if not provided on request
-					String serviceType = execution.getVariable("subscriptionServiceType")
-					if(isBlank(serviceType)){
-						int serviceStart = siRelatedLink.indexOf("service-subscription/")
-						int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-						String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)
-						serviceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")
-						execution.setVariable("subscriptionServiceType", serviceType)
-					}
-
-					if (isBlank(globalSubscriberId) || isBlank(serviceType))
-					{
-						msg = "Could not retrive global-customer-id & service-type from AAI to delete id:" + serviceInstanceId
-						utils.log("DEBUG", msg, isDebugEnabled)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-					}
-				}
-
-				String siData = execution.getVariable("GENGS_service")
-				utils.log("DEBUG", "SI Data", isDebugEnabled)
-				if (isBlank(siData))
-				{
-					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-					utils.log("DEBUG", msg, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-				}
-				else
-				{
-					utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)
-					//Confirm there are no related service instances (vnf/network or volume)
-					if (utils.nodeExists(siData, "relationship-list")) {
-						utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)
-						InputSource source = new InputSource(new StringReader(siData));
-						DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-						DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
-						Document serviceXml = docBuilder.parse(source)
-
-						NodeList nodeList = serviceXml.getElementsByTagName("relationship")
-						for (int x = 0; x < nodeList.getLength(); x++) {
-							Node node = nodeList.item(x)
-							if (node.getNodeType() == Node.ELEMENT_NODE) {
-								Element eElement = (Element) node
-								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()
-								if(e.equals("generic-vnf") || e.equals("l3-network")){
-									utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs or l3-networks", isDebugEnabled)
-									execution.setVariable("siInUse", true)
-									//there are relationship dependencies to this Service Instance
-									msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId
-									utils.log("DEBUG", msg, isDebugEnabled)
-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-								}else{
-									utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)
-								}
-							}
-						}
-					}
-				}
-			}else{
-				boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-				if(succInAAI != true){
-					utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
-					WorkflowException workflowException = execution.getVariable("WorkflowException")
-					utils.logAudit("workflowException: " + workflowException)
-					if(workflowException != null){
-						exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
-					}
-					else
-					{
-						msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI
-						utils.log("DEBUG", msg, isDebugEnabled)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-					}
-				}
-				utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
-			}
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex) {
-			msg = "Exception in DoDeleteServiceInstance.postProcessAAIGET. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
-	}
-	
-	public void postProcessAAIDEL(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
-		String msg = ""
-		try {
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-			boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
-			if(succInAAI != true){
-				msg = "Error deleting Service-instance in AAI" + serviceInstanceId
-				utils.log("DEBUG", msg, isDebugEnabled)
-				WorkflowException workflowException = execution.getVariable("WorkflowException")
-				utils.logAudit("workflowException: " + workflowException)
-				if(workflowException != null){
-					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
-				}
-				else
-				{
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-				}
-			}
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex) {
-			msg = "Exception in DoDeleteServiceInstance.postProcessAAIDEL. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
-	}
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import static org.apache.commons.lang3.StringUtils.*;

+import groovy.xml.XmlUtil

+import groovy.json.*

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+import java.util.UUID;

+import javax.xml.parsers.DocumentBuilder

+import javax.xml.parsers.DocumentBuilderFactory

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.json.JSONObject;

+import org.apache.commons.lang3.*

+import org.apache.commons.codec.binary.Base64;

+import org.springframework.web.util.UriUtils;

+import org.w3c.dom.Document

+import org.w3c.dom.Element

+import org.w3c.dom.Node

+import org.w3c.dom.NodeList

+import org.xml.sax.InputSource

+

+/**

+ * This groovy class supports the <class>DoDeleteServiceInstance.bpmn</class> process.

+ * 

+ * Inputs:

+ * @param - msoRequestId

+ * @param - globalSubscriberId - O

+ * @param - subscriptionServiceType - O

+ * @param - serviceInstanceId

+ * @param - serviceInstanceName - O

+ * @param - serviceModelInfo - O

+ * @param - productFamilyId

+ * @param - sdncVersion 

+ * @param - failNotFound - TODO

+ * @param - serviceInputParams - TODO

+ *

+ * Outputs:

+ * @param - WorkflowException

+ * 

+ * Rollback - Deferred

+ */

+public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {

+

+	String Prefix="DDELSI_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils()

+

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)

+		String msg = ""

+

+		try {

+			String requestId = execution.getVariable("msoRequestId")

+			execution.setVariable("prefix",Prefix)

+

+			//Inputs

+			//requestDetails.subscriberInfo. for AAI GET & PUT & SDNC assignToplology

+			String globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId

+			if (globalSubscriberId == null)

+			{

+				execution.setVariable("globalSubscriberId", "")

+			}

+

+			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology

+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")

+			if (subscriptionServiceType == null)

+			{

+				execution.setVariable("subscriptionServiceType", "")

+			}

+

+			//Generated in parent for AAI PUT

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			if (isBlank(serviceInstanceId)){

+				msg = "Input serviceInstanceId is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			}

+

+			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			if (isBlank(sdncCallbackUrl)) {

+				msg = "URN_mso_workflow_sdncadapter_callback is null"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+			}

+			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)

+			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex){

+			msg = "Exception in preProcessRequest " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

+	}

+

+	public void preProcessSDNCDelete (Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)

+		String msg = ""

+

+		try {

+			/*

+			 String uuid = execution.getVariable('testReqId') // for junits

+			 if(uuid==null){

+			 uuid = execution.getVariable("msoRequestId") + "-" +  	System.currentTimeMillis()

+			 }

+			 */

+			def serviceInstanceId = execution.getVariable("serviceInstanceId")

+			def serviceInstanceName = execution.getVariable("serviceInstanceName")

+			def callbackURL = execution.getVariable("sdncCallbackUrl")

+			def requestId = execution.getVariable("msoRequestId")

+			def serviceId = execution.getVariable("productFamilyId")

+			def subscriptionServiceType = execution.getVariable("subscriptionServiceType")

+			def globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId

+

+			String serviceModelInfo = execution.getVariable("serviceModelInfo")

+			def modelInvariantId = ""

+			def modelVersion = ""

+			def modelUUId = ""

+			def modelName = ""

+			if (!isBlank(serviceModelInfo))

+			{

+				modelInvariantId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")

+				modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")

+				modelUUId = jsonUtil.getJsonValue(serviceModelInfo, "modelVersionId")

+				modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")

+				

+				if (modelInvariantId == null) {

+					modelInvariantId = ""

+				}

+				if (modelVersion == null) {

+					modelVersion = ""

+				}

+				if (modelUUId == null) {

+					modelUUId = ""

+				}

+				if (modelName == null) {

+					modelName = ""

+				}

+			}

+			if (serviceInstanceName == null) {

+				serviceInstanceName = ""

+			}

+			if (serviceId == null) {

+				serviceId = ""

+			}

+			

+			def sdncRequestId = UUID.randomUUID().toString()

+

+			String sdncDelete =

+			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+				   <sdncadapter:RequestHeader>

+							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>

+							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

+							<sdncadapter:SvcAction>delete</sdncadapter:SvcAction>

+							<sdncadapter:SvcOperation>service-topology-operation</sdncadapter:SvcOperation>

+							<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

+					</sdncadapter:RequestHeader>

+				<sdncadapterworkflow:SDNCRequestData>

+					<request-information>

+						<request-id>${requestId}</request-id>

+						<source>MSO</source>

+						<notification-url/>

+						<order-number/>

+						<order-version/>

+						<request-action>DeleteServiceInstance</request-action>

+					</request-information>

+					<service-information>

+						<service-id>${serviceId}</service-id>

+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>

+						<ecomp-model-information>

+					         <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>

+					         <model-uuid>${modelUUId}</model-uuid>

+					         <model-version>${modelVersion}</model-version>

+					         <model-name>${modelName}</model-name>

+					    </ecomp-model-information>

+						<service-instance-id>${serviceInstanceId}</service-instance-id>

+						<subscriber-name/>

+						<global-customer-id>${globalSubscriberId}</global-customer-id>

+					</service-information>

+					<service-request-input>

+						<service-instance-name>${serviceInstanceName}</service-instance-name>

+					</service-request-input>

+				</sdncadapterworkflow:SDNCRequestData>

+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""

+

+			utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)

+			sdncDelete = utils.formatXml(sdncDelete)

+			execution.setVariable("sdncDelete", sdncDelete)

+			utils.logAudit("sdncDelete:  " + sdncDelete)

+

+

+		} catch (BpmnError e) {

+			throw e;

+		} catch(Exception ex) {

+			msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())

+		}

+		utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)

+	}

+

+	public void postProcessSDNCDelete(Execution execution) {

+

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** postProcessSDNCDelete ***** ", isDebugEnabled)

+		String msg = ""

+

+		try {

+			WorkflowException workflowException = execution.getVariable("WorkflowException")

+			utils.logAudit("workflowException: " + workflowException)

+

+			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

+			String response = execution.getVariable("sdncAdapterResponse")

+			utils.logAudit("SDNCResponse: " + response)

+

+			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

+

+			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

+				utils.log("DEBUG","Good response from SDNC Adapter for service-instance  topology assign: \n" + response, isDebugEnabled)

+

+			}else{

+				msg = "Bad Response from SDNC Adapter for service-instance delete"

+				utils.log("DEBUG", msg, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)

+			}

+		} catch (BpmnError e) {

+			throw e;

+		} catch(Exception ex) {

+			msg = "Exception in postProcessSDNCDelete. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())

+		}

+		utils.log("DEBUG"," *** Exit postProcessSDNCDelete *** ", isDebugEnabled)

+	}

+

+	public void postProcessAAIGET(Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)

+		String msg = ""

+

+		try {

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")

+

+			if(foundInAAI == true){

+				utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)

+

+				//Extract GlobalSubscriberId

+				String siRelatedLink = execution.getVariable("GENGS_siResourceLink")

+				if (isBlank(siRelatedLink))

+				{

+					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId

+					utils.log("DEBUG", msg, isDebugEnabled)

+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+				}

+				else

+				{

+					utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)

+					String  globalSubscriberId = execution.getVariable("globalSubscriberId")

+					if(isBlank(globalSubscriberId)){

+						int custStart = siRelatedLink.indexOf("customer/")

+						int custEnd = siRelatedLink.indexOf("/service-subscriptions")

+						globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)

+						execution.setVariable("globalSubscriberId", globalSubscriberId)

+					}

+

+					//Extract Service Type if not provided on request

+					String serviceType = execution.getVariable("subscriptionServiceType")

+					if(isBlank(serviceType)){

+						int serviceStart = siRelatedLink.indexOf("service-subscription/")

+						int serviceEnd = siRelatedLink.indexOf("/service-instances/")

+						String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)

+						serviceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")

+						execution.setVariable("subscriptionServiceType", serviceType)

+					}

+

+					if (isBlank(globalSubscriberId) || isBlank(serviceType))

+					{

+						msg = "Could not retrive global-customer-id & service-type from AAI to delete id:" + serviceInstanceId

+						utils.log("DEBUG", msg, isDebugEnabled)

+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+					}

+				}

+

+				String siData = execution.getVariable("GENGS_service")

+				utils.log("DEBUG", "SI Data", isDebugEnabled)

+				if (isBlank(siData))

+				{

+					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId

+					utils.log("DEBUG", msg, isDebugEnabled)

+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

+				}

+				else

+				{

+					utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)

+					//Confirm there are no related service instances (vnf/network or volume)

+					if (utils.nodeExists(siData, "relationship-list")) {

+						utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)

+						InputSource source = new InputSource(new StringReader(siData));

+						DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

+						DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

+						Document serviceXml = docBuilder.parse(source)

+

+						NodeList nodeList = serviceXml.getElementsByTagName("relationship")

+						for (int x = 0; x < nodeList.getLength(); x++) {

+							Node node = nodeList.item(x)

+							if (node.getNodeType() == Node.ELEMENT_NODE) {

+								Element eElement = (Element) node

+								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()

+								if(e.equals("generic-vnf") || e.equals("l3-network")){

+									utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs or l3-networks", isDebugEnabled)

+									execution.setVariable("siInUse", true)

+									//there are relationship dependencies to this Service Instance

+									msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId

+									utils.log("DEBUG", msg, isDebugEnabled)

+									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

+								}else{

+									utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)

+								}

+							}

+						}

+					}

+				}

+			}else{

+				boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")

+				if(succInAAI != true){

+					utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)

+					WorkflowException workflowException = execution.getVariable("WorkflowException")

+					utils.logAudit("workflowException: " + workflowException)

+					if(workflowException != null){

+						exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())

+					}

+					else

+					{

+						msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI

+						utils.log("DEBUG", msg, isDebugEnabled)

+						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

+					}

+				}

+				utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)

+			}

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex) {

+			msg = "Exception in DoDeleteServiceInstance.postProcessAAIGET. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)

+	}

+	

+	public void postProcessAAIDEL(Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)

+		String msg = ""

+		try {

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")

+			boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")

+			if(succInAAI != true){

+				msg = "Error deleting Service-instance in AAI" + serviceInstanceId

+				utils.log("DEBUG", msg, isDebugEnabled)

+				WorkflowException workflowException = execution.getVariable("WorkflowException")

+				utils.logAudit("workflowException: " + workflowException)

+				if(workflowException != null){

+					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())

+				}

+				else

+				{

+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

+				}

+			}

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception ex) {

+			msg = "Exception in DoDeleteServiceInstance.postProcessAAIDEL. " + ex.getMessage()

+			utils.log("DEBUG", msg, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

+		}

+		utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)

+	}

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModule.groovy
index dcb70ff..cd9c798 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModule.groovy
@@ -40,7 +40,7 @@ import org.xml.sax.InputSource
 
 /* Subflow for Delete VF Module. When no DoDeleteVfModuleRequest is specified on input,
  * functions as a building block subflow
- 
+
 * Inputs for building block interface:
 * @param - requestId
 * @param - isDebugLogEnabled
@@ -68,7 +68,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 		execution.setVariable("DoDVfMod_contrailNetworkPolicyFqdnList", null)
 		execution.setVariable("DoDVfMod_oamManagementV4Address", null)
 		execution.setVariable("DoDVfMod_oamManagementV6Address", null)
-		
+
 	}
 
 	// parse the incoming DELETE_VF_MODULE request for the Generic Vnf and Vf Module Ids
@@ -76,19 +76,19 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 	public void preProcessRequest(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		initProcessVariables(execution)
-		
+
 		try {
 			def xml = execution.getVariable("DoDeleteVfModuleRequest")
 			String vnfId = ""
 			String vfModuleId = ""
-		
+
 			if (xml == null || xml.isEmpty()) {
 				// Building Block-type request
-				
+
 				// Set mso-request-id to request-id for VNF Adapter interface
 				String requestId = execution.getVariable("requestId")
 				execution.setVariable("mso-request-id", requestId)
-			
+
 				String cloudConfiguration = execution.getVariable("cloudConfiguration")
 				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")
 				String tenantId = jsonUtil.getJsonValue(cloudConfiguration, "tenantId")
@@ -114,14 +114,14 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 				//vfModuleModelName
 				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelName")
 				execution.setVariable("vfModuleModelName", vfModuleModelName)
-				
+
 			}
 			else {
-						
+
 				utils.logAudit("DoDeleteVfModule Request: " + xml)
-		
+
 				utils.log("DEBUG", "input request xml: " + xml, isDebugEnabled)
-				
+
 				vnfId = utils.getNodeText1(xml,"vnf-id")
 				execution.setVariable("vnfId", vnfId)
 				vfModuleId = utils.getNodeText1(xml,"vf-module-id")
@@ -141,7 +141,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 				execution.setVariable("serviceId", serviceId)
 				String tenantId = utils.getNodeText1(xml, "tenant-id")
 				execution.setVariable("tenantId", tenantId)
-				
+
 				String serviceInstanceIdToSdnc = ""
 				if (xml.contains("service-instance-id")) {
 					serviceInstanceIdToSdnc = utils.getNodeText1(xml, "service-instance-id")
@@ -156,7 +156,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 				String cloudSiteId = utils.getNodeText1(xml, "aic-cloud-region")
 				execution.setVariable("cloudSiteId", cloudSiteId)
 			}
-				
+
 			// formulate the request for PrepareUpdateAAIVfModule
 			String request = """<PrepareUpdateAAIVfModuleRequest>
 									<vnf-id>${vnfId}</vnf-id>
@@ -178,7 +178,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 	// (note: the action passed is expected to be 'changedelete' or 'delete')
 	public void prepSDNCAdapterRequest(Execution execution, String action) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-				
+
 		def srvInstId = execution.getVariable("srvInstId")
 		def callbackUrl = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
 		String requestId = execution.getVariable("requestId")
@@ -305,7 +305,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 	// and formulate the outgoing DeleteAAIVfModuleRequest request
 	public void prepDeleteAAIVfModule(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		
+
 		def vnfId = execution.getVariable("vnfId")
 		def vfModuleId = execution.getVariable("vfModuleId")
 		// formulate the request for UpdateAAIVfModule
@@ -346,7 +346,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 			throw new BpmnError("MSOWorkflowException")
 		}
 	}
-	
+
 	public void postProcessVNFAdapterRequest(Execution execution) {
 		def method = getClass().getSimpleName() + '.postProcessVNFAdapterRequest(' +
 			'execution=' + execution.getId() +
@@ -366,15 +366,15 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 			if(vnfResponse.contains("deleteVfModuleResponse")){
 				logDebug("Received a Good Response from VNF Adapter for DELETE_VF_MODULE Call.", isDebugLogEnabled)
 				execution.setVariable("DoDVfMod_vnfVfModuleDeleteCompleted", true)
-				
+
 				// Parse vnfOutputs for contrail network polcy FQDNs
 				if (vnfResponse.contains("vfModuleOutputs")) {
 					def vfModuleOutputsXml = utils.getNodeXml(vnfResponse, "vfModuleOutputs")
 					InputSource source = new InputSource(new StringReader(vfModuleOutputsXml));
-					DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-					docFactory.setNamespaceAware(true)
-					DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
-					Document outputsXml = docBuilder.parse(source)
+			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+			docFactory.setNamespaceAware(true)
+			DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+			Document outputsXml = docBuilder.parse(source)
 
 					NodeList entries = outputsXml.getElementsByTagNameNS("*", "entry")
 					List contrailNetworkPolicyFqdnList = []
@@ -398,7 +398,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 								logDebug("Obtained oamManagementV6Address: " + oamManagementV6Address, isDebugLogEnabled)
 								execution.setVariable(Prefix + "oamManagementV6Address", oamManagementV6Address)
 							}
-						
+
 						}
 					}
 					if (!contrailNetworkPolicyFqdnList.isEmpty()) {
@@ -423,7 +423,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 		}
 		logDebug(" *** COMPLETED postProcessVnfAdapterResponse Process*** ", isDebugLogEnabled)
 	}
-	
+
 	public void deleteNetworkPoliciesFromAAI(Execution execution) {
 		def method = getClass().getSimpleName() + '.deleteNetworkPoliciesFromAAI(' +
 		'execution=' + execution.getId() +
@@ -432,7 +432,7 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 		logDebug('Entered ' + method, isDebugLogEnabled)
 		execution.setVariable("prefix", Prefix)
 		logDebug(" ======== STARTED deleteNetworkPoliciesFromAAI ======== ", isDebugLogEnabled)
-	   
+
 		try {
 			// get variables
 			List fqdnList = execution.getVariable("DoDVfMod_contrailNetworkPolicyFqdnList")
@@ -441,34 +441,34 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 				return
 			}
 			int fqdnCount = fqdnList.size()
-		   
+
 			execution.setVariable("DoDVfMod_networkPolicyFqdnCount", fqdnCount)
 			logDebug("DoDVfMod_networkPolicyFqdnCount - " + fqdnCount, isDebugLogEnabled)
- 
+
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getNetworkPolicyUri(execution)
- 
+
 			if (fqdnCount > 0) {
 				// AII loop call over contrail network policy fqdn list
 				for (i in 0..fqdnCount-1) {
- 
+
 					int counting = i+1
 					String fqdn = fqdnList[i]
- 
+
 					// Query AAI for this network policy FQDN
-				   
+
 					String queryNetworkPolicyByFqdnAAIRequest = "${aai_endpoint}${aai_uri}?network-policy-fqdn=" + UriUtils.encode(fqdn, "UTF-8")
 					utils.logAudit("AAI request endpoint: " + queryNetworkPolicyByFqdnAAIRequest)
 					logDebug("AAI request endpoint: "  + queryNetworkPolicyByFqdnAAIRequest, isDebugLogEnabled)
-					
+
 					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkPolicyByFqdnAAIRequest)
 					int returnCode = response.getStatusCode()
 					execution.setVariable("DCVFM_aaiQueryNetworkPolicyByFqdnReturnCode", returnCode)
 					logDebug(" ***** AAI query network policy Response Code, NetworkPolicy #" + counting + " : " + returnCode, isDebugLogEnabled)
- 
+
 					String aaiResponseAsString = response.getResponseBodyAsString()
- 
+
 					if (isOneOf(returnCode, 200, 201)) {
 						logDebug("The return code is: "  + returnCode, isDebugLogEnabled)
 						// This network policy FQDN exists in AAI - need to delete it now
@@ -478,28 +478,28 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 						// Retrieve the network policy id for this FQDN
 						def networkPolicyId = utils.getNodeText1(aaiResponseAsString, "network-policy-id")
 						logDebug("Deleting network-policy with network-policy-id " + networkPolicyId, isDebugLogEnabled)
-						
+
 						// Retrieve the resource version for this network policy
 						def resourceVersion = utils.getNodeText1(aaiResponseAsString, "resource-version")
 						logDebug("Deleting network-policy with resource-version " + resourceVersion, isDebugLogEnabled)
-												
-						String delNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(networkPolicyId, "UTF-8") + 
+
+						String delNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(networkPolicyId, "UTF-8") +
 							"?resource-version=" + UriUtils.encode(resourceVersion, "UTF-8")
 						utils.logAudit("AAI request endpoint: " + delNetworkPolicyAAIRequest)
 						logDebug("AAI request endpoint: " + delNetworkPolicyAAIRequest, isDebugLogEnabled)
-						
+
 						logDebug("invoking DELETE call to AAI", isDebugLogEnabled)
 						utils.logAudit("Sending DELETE call to AAI with Endpoint /n" + delNetworkPolicyAAIRequest)
 						APIResponse responseDel = aaiUriUtil.executeAAIDeleteCall(execution, delNetworkPolicyAAIRequest)
 						int returnCodeDel = responseDel.getStatusCode()
 						execution.setVariable("DoDVfMod_aaiDeleteNetworkPolicyReturnCode", returnCodeDel)
 						logDebug(" ***** AAI delete network policy Response Code, NetworkPolicy #" + counting + " : " + returnCodeDel, isDebugLogEnabled)
-	 
+
 						if (isOneOf(returnCodeDel, 200, 201, 204)) {
 							logDebug("The return code from deleting network policy is: "  + returnCodeDel, isDebugLogEnabled)
 							// This network policy was deleted from AAI successfully
 							logDebug(" DelAAINetworkPolicy Success REST Response, , NetworkPolicy #" + counting + " : ", isDebugLogEnabled)
-	 
+
 						} else {
 								// aai all errors
 								String delErrorMessage = "Unable to delete network-policy to AAI deleteNetworkPoliciesFromAAI - " + returnCodeDel
@@ -525,28 +525,28 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 
 						  }
 					}
- 
-					
- 
+
+
+
 				} // end loop
- 
-			   
+
+
 			} else {
 				   logDebug("No contrail network policies to query/create", isDebugLogEnabled)
- 
+
 			}
- 
+
 		} catch (BpmnError e) {
 			throw e;
- 
+
 		} catch (Exception ex) {
 			String exceptionMessage = "Bpmn error encountered in DoDeletVfModule flow. deleteNetworkPoliciesFromAAI() - " + ex.getMessage()
 			logDebug(exceptionMessage, isDebugLogEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 		}
- 
+
 	}
-	
+
 	/**
 	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
 	 *
@@ -558,23 +558,23 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
- 
+
 		try {
 			def vnfId = execution.getVariable('vnfId')
 			def oamManagementV4Address = execution.getVariable(Prefix + 'oamManagementV4Address')
 			def oamManagementV6Address = execution.getVariable(Prefix + 'oamManagementV6Address')
 			def ipv4OamAddressElement = ''
 			def managementV6AddressElement = ''
-			
+
 			if (oamManagementV4Address != null) {
 				ipv4OamAddressElement = '<ipv4-oam-address>' + 'DELETE' + '</ipv4-oam-address>'
 			}
-			
+
 			if (oamManagementV6Address != null) {
 				managementV6AddressElement = '<management-v6-address>' + 'DELETE' + '</management-v6-address>'
 			}
-			
-				  
+
+
 			String updateAAIGenericVnfRequest = """
 					<UpdateAAIGenericVnfRequest>
 						<vnf-id>${vnfId}</vnf-id>
@@ -586,14 +586,18 @@ public class DoDeleteVfModule extends AbstractServiceTaskProcessor{
 				execution.setVariable(Prefix + 'updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
 				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
 				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
-		 
- 
+
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
 		}
 	}
-}
+
+
+
+
+}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
index fe98b70..66a3fed 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
@@ -1,136 +1,136 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
-
-import org.apache.commons.lang3.*
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.VidUtils
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-import org.w3c.dom.NodeList
-import org.xml.sax.InputSource
-
-
-/**
- * This class supports the DoDeleteVnf subFlow
- * with the Deletion of a generic vnf for
- * infrastructure.
- *
- */
-class DoDeleteVnf extends AbstractServiceTaskProcessor {
-
-	String Prefix="DoDVNF_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-
-	/**
-	 * This method gets and validates the incoming
-	 * request.
-	 *
-	 * @param - execution
-	 *
-	 */
-	public void preProcessRequest(Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED DoDeleteVnf PreProcessRequest Process*** ", isDebugEnabled)
-
-		execution.setVariable("DoDVNF_SuccessIndicator", false)
-		execution.setVariable("DoDVNF_vnfInUse", false)
-
-		try{
-			// Get Variables
-
-			String vnfId = execution.getVariable("vnfId")
-			execution.setVariable("DoDVNF_vnfId", vnfId)
-			utils.log("DEBUG", "Incoming Vnf(Instance) Id is: " + vnfId, isDebugEnabled)
-
-			// Setting for sub flow calls
-			execution.setVariable("DoDVNF_type", "generic-vnf")
-		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
-			throw b
-		}catch(Exception e){
-			utils.log("DEBUG", " Error Occured in DoDeleteVnf PreProcessRequest method!" + e, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoDeleteVnf PreProcessRequest")
-
-		}
-		utils.log("DEBUG", "*** COMPLETED DoDeleteVnf PreProcessRequest Process ***", isDebugEnabled)
-	}
-
-
-	public void processGetVnfResponse(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED DoDeleteVnf processGetVnfResponse Process *** ", isDebugEnabled)
-		try {
-			String vnf = execution.getVariable("DoDVNF_genericVnf")
-			String resourceVersion = utils.getNodeText1(vnf, "resource-version")
-			execution.setVariable("DoDVNF_resourceVersion", resourceVersion)
-
-			if(utils.nodeExists(vnf, "relationship")){
-				InputSource source = new InputSource(new StringReader(vnf));
-				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
-				Document vnfXml = docBuilder.parse(source)
-
-				NodeList nodeList = vnfXml.getElementsByTagName("relationship")
-				for (int x = 0; x < nodeList.getLength(); x++) {
-					Node node = nodeList.item(x)
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						Element eElement = (Element) node
-						def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()
-						if(e.equals("volume-group") || e.equals("l3-network")){
-							utils.log("DEBUG", "Generic Vnf still has relationship to OpenStack.", isDebugEnabled)
-							execution.setVariable("DoDVNF_vnfInUse", true)
-						}else{
-							utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)
-						}
-					}
-				}
-			}
-
-			if(utils.nodeExists(vnf, "vf-module")){
-				execution.setVariable("DoDVNF_vnfInUse", true)
-				utils.log("DEBUG", "Generic Vnf still has vf-modules.", isDebugEnabled)
-			}
-
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Error Occured in DoDeleteVnf processGetVnfResponse Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoDeleteVnf processGetVnfResponse Process")
-
-		}
-		utils.log("DEBUG", "*** COMPLETED DoDeleteVnf processGetVnfResponse Process ***", isDebugEnabled)
-	}
-
-
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+

+import javax.xml.parsers.DocumentBuilder

+import javax.xml.parsers.DocumentBuilderFactory

+

+import org.apache.commons.lang3.*

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.w3c.dom.Document

+import org.w3c.dom.Element

+import org.w3c.dom.Node

+import org.w3c.dom.NodeList

+import org.xml.sax.InputSource

+

+

+/**

+ * This class supports the DoDeleteVnf subFlow

+ * with the Deletion of a generic vnf for

+ * infrastructure.

+ *

+ */

+class DoDeleteVnf extends AbstractServiceTaskProcessor {

+

+	String Prefix="DoDVNF_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)

+

+	/**

+	 * This method gets and validates the incoming

+	 * request.

+	 *

+	 * @param - execution

+	 *

+	 */

+	public void preProcessRequest(Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		utils.log("DEBUG", " *** STARTED DoDeleteVnf PreProcessRequest Process*** ", isDebugEnabled)

+

+		execution.setVariable("DoDVNF_SuccessIndicator", false)

+		execution.setVariable("DoDVNF_vnfInUse", false)

+

+		try{

+			// Get Variables

+

+			String vnfId = execution.getVariable("vnfId")

+			execution.setVariable("DoDVNF_vnfId", vnfId)

+			utils.log("DEBUG", "Incoming Vnf(Instance) Id is: " + vnfId, isDebugEnabled)

+

+			// Setting for sub flow calls

+			execution.setVariable("DoDVNF_type", "generic-vnf")

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", " Error Occured in DoDeleteVnf PreProcessRequest method!" + e, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoDeleteVnf PreProcessRequest")

+

+		}

+		utils.log("DEBUG", "*** COMPLETED DoDeleteVnf PreProcessRequest Process ***", isDebugEnabled)

+	}

+

+

+	public void processGetVnfResponse(Execution execution){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		utils.log("DEBUG", " *** STARTED DoDeleteVnf processGetVnfResponse Process *** ", isDebugEnabled)

+		try {

+			String vnf = execution.getVariable("DoDVNF_genericVnf")

+			String resourceVersion = utils.getNodeText1(vnf, "resource-version")

+			execution.setVariable("DoDVNF_resourceVersion", resourceVersion)

+

+			if(utils.nodeExists(vnf, "relationship")){

+				InputSource source = new InputSource(new StringReader(vnf));

+				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

+				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

+				Document vnfXml = docBuilder.parse(source)

+

+				NodeList nodeList = vnfXml.getElementsByTagName("relationship")

+				for (int x = 0; x < nodeList.getLength(); x++) {

+					Node node = nodeList.item(x)

+					if (node.getNodeType() == Node.ELEMENT_NODE) {

+						Element eElement = (Element) node

+						def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()

+						if(e.equals("volume-group") || e.equals("l3-network")){

+							utils.log("DEBUG", "Generic Vnf still has relationship to OpenStack.", isDebugEnabled)

+							execution.setVariable("DoDVNF_vnfInUse", true)

+						}else{

+							utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)

+						}

+					}

+				}

+			}

+

+			if(utils.nodeExists(vnf, "vf-module")){

+				execution.setVariable("DoDVNF_vnfInUse", true)

+				utils.log("DEBUG", "Generic Vnf still has vf-modules.", isDebugEnabled)

+			}

+

+

+		} catch (Exception ex) {

+			utils.log("DEBUG", "Error Occured in DoDeleteVnf processGetVnfResponse Process " + ex.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoDeleteVnf processGetVnfResponse Process")

+

+		}

+		utils.log("DEBUG", "*** COMPLETED DoDeleteVnf processGetVnfResponse Process ***", isDebugEnabled)

+	}

+

+

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
new file mode 100644
index 0000000..92456b0
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
@@ -0,0 +1,256 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import java.util.UUID;

+

+import org.json.JSONObject;

+import org.json.JSONArray;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution;

+

+import static org.apache.commons.lang3.StringUtils.*;

+

+import org.openecomp.mso.bpmn.core.json.JsonUtils

+import org.openecomp.mso.rest.APIResponse

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.VidUtils

+import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException

+

+/**

+ * This class supports the macro VID Flow

+ * with the deletion of a generic vnf and related VF modules.

+ */

+class DoDeleteVnfAndModules extends AbstractServiceTaskProcessor {

+

+	String Prefix="DDVAM_"

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+	VidUtils vidUtils = new VidUtils(this)	

+

+	/**

+	 * This method gets and validates the incoming

+	 * request.

+	 *

+	 * @param - execution

+	 *	

+	 */

+	public void preProcessRequest(Execution execution) {

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix",Prefix)

+		utils.log("DEBUG", " *** STARTED DoDeleteVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)

+

+		try{

+			// Get Variables				

+			

+			String cloudConfiguration = execution.getVariable("cloudConfiguration")			

+			

+			String requestId = execution.getVariable("requestId")

+			execution.setVariable("mso-request-id", requestId)

+			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

+

+			String serviceInstanceId = execution.getVariable("serviceInstanceId")			

+			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

+

+			String vnfId = execution.getVariable("vnfId")			

+			utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)			

+			

+			String source = "VID"

+			execution.setVariable("source", source)

+			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

+			

+			execution.setVariable("DDVAM_moduleCount", 0)

+			execution.setVariable("DDVAM_nextModule", 0)

+			

+			

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

+

+		}

+		utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)

+	}	

+

+	

+	

+	public void preProcessAddOnModule(Execution execution){

+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)

+		

+		try {			

+			JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")

+			int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")

+			

+			JSONObject addOnModule = addOnModules[addOnIndex]

+			

+			def newVfModuleId = UUID.randomUUID().toString()

+			execution.setVariable("addOnVfModuleId", newVfModuleId)

+			

+			execution.setVariable("instancesOfThisModelDeployed", 0)

+			

+			JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")

+			String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()

+			execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)

+			String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")

+			execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)

+			String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")

+			execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)

+			String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")

+			execution.setVariable("initialCount", addOnInitialCount)

+					

+		

+		}catch(Exception e){

+			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+	}

+	

+	/**

+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.

+	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void queryAAIVfModule(Execution execution) {

+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

+		def method = getClass().getSimpleName() + '.queryAAIVfModule(' +

+			'execution=' + execution.getId() +

+			')'

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def vnfId = execution.getVariable('DvnfId')

+			

+			AaiUtil aaiUriUtil = new AaiUtil(this)

+			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

+			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

+

+			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"

+			utils.logAudit("AAI endPoint: " + endPoint)

+

+			try {

+				RESTConfig config = new RESTConfig(endPoint);

+				def responseData = ''

+				def aaiRequestId = UUID.randomUUID().toString()

+				RESTClient client = new RESTClient(config).

+					addHeader('X-TransactionId', aaiRequestId).

+					addHeader('X-FromAppId', 'MSO').

+					addHeader('Content-Type', 'application/xml').

+					addHeader('Accept','application/xml');

+				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

+				APIResponse response = client.httpGet()

+				utils.logAudit("createVfModule - invoking httpGet() to AAI")

+

+				responseData = response.getResponseBodyAsString()

+				if (responseData != null) {

+					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)

+

+				}

+

+				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)

+				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())

+

+				execution.setVariable('DCVFM_queryAAIVfModuleResponseCode', response.getStatusCode())

+				execution.setVariable('DCVFM_queryAAIVfModuleResponse', responseData)

+				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

+				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

+				//Map<String, String>[] vfModules = new HashMap<String,String>[]

+				List<Map<String,String>> vfModulesList = new ArrayList<Map<String,String>>();

+				if (response.getStatusCode() == 200) {

+					// Parse the VNF record from A&AI to find base module info

+					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)

+					if (responseData != null) {

+						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")

+						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

+						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

+						execution.setVariable("DDVAM_moduleCount", vfModules.size())

+						int vfModulesSize = 0

+						for (i in 0..vfModules.size()-1) {

+							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

+							

+							Map<String, String> vfModuleEntry = new HashMap<String, String>()

+							def vfModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")

+							vfModuleEntry.put("vfModuleId", vfModuleName)

+							def vfModuleName = utils.getNodeText1(vfModuleXml, "vf-module-name")

+							vfModuleEntry.put("vfModuleName", vfModuleName)		

+							vfModulesList.add(vfModuleEntry)					

+						}

+						

+					}					

+				}

+				execution.setVariable("DDVAM_vfModules", vfModules)

+			} catch (Exception ex) {

+				ex.printStackTrace()

+				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())

+			}

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())

+		}

+	}

+	

+	public void prepareNextModuleToDelete(Execution execution){

+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

+		execution.setVariable("prefix", Prefix)

+		logDebug(" ======== STARTED prepareNextModuleToDelete ======== ", isDebugLogEnabled)

+		

+		try {

+			int i = execution.getVariable("DDVAM_nextModule")

+			def vfModules = execution.getVariable("DDVAM_vfModules")

+			def vfModule = vfModules[i]

+			

+			def vfModuleId = vfModule.get("vfModuleId")

+			execution.setVariable("DDVAM_vfModuleId", vfModuleId)

+			

+			def vfModuleName = vfModule.get("vfModuleName")

+			execution.setVariable("DDVAM_vfModuleName", vfModuleName)

+			

+			

+			// HARDCODED FOR NOW

+			def vfModuleModelInfo = ""

+			execution.setVariable("DDVAM_vfModuleModelInfo", vfModuleModelInfo)			

+			

+		}catch(Exception e){

+			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

+		}

+		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

+	}

+	

+	

+	

+	

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
new file mode 100644
index 0000000..dd35334
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
@@ -0,0 +1,1399 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.rest.APIResponse
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils
+
+/**
+ * This groovy class supports the <class>DoUpdateNetworkInstance.bpmn</class> process.
+ *
+ */
+public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
+	String Prefix="UPDNETI_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils(this)
+	NetworkUtils networkUtils = new NetworkUtils()
+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public InitializeProcessVariables(Execution execution){
+		/* Initialize all the process variables in this block */
+
+		execution.setVariable(Prefix + "messageId", "")
+		execution.setVariable("BasicAuthHeaderValuePO", "")
+		execution.setVariable("BasicAuthHeaderValueSDNC", "")
+		execution.setVariable(Prefix + "networkRequest", "")
+		execution.setVariable(Prefix + "networkInputs", "")
+		execution.setVariable(Prefix + "networkOutputs", "")
+		execution.setVariable(Prefix + "requestId", "")
+		execution.setVariable(Prefix + "source", "")
+		execution.setVariable(Prefix + "networkId", "")
+
+		execution.setVariable(Prefix + "isPONR", false)    // Point-of-no-return, means, rollback is not needed
+
+		// AAI query Cloud Region
+		execution.setVariable(Prefix + "queryCloudRegionRequest","")
+		execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
+		execution.setVariable(Prefix + "queryCloudRegionResponse","")
+		execution.setVariable(Prefix + "cloudRegionPo","")
+		execution.setVariable(Prefix + "cloudRegionSdnc","")
+		execution.setVariable(Prefix + "isCloudRegionGood", false)
+
+		// AAI query Id
+		execution.setVariable(Prefix + "queryIdAAIRequest","")
+		execution.setVariable(Prefix + "queryIdAAIResponse", "")
+		execution.setVariable(Prefix + "aaiIdReturnCode", "")
+
+		// AAI query vpn binding
+		execution.setVariable(Prefix + "queryVpnBindingAAIRequest","")
+		execution.setVariable(Prefix + "queryVpnBindingAAIResponse", "")
+		execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "")
+		execution.setVariable(Prefix + "vpnBindings", null)
+		execution.setVariable(Prefix + "vpnCount", 0)
+		execution.setVariable(Prefix + "routeCollection", "")
+
+		// AAI query network policy
+		execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest","")
+		execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", "")
+		execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "")
+		execution.setVariable(Prefix + "networkPolicyUriList", null)
+		execution.setVariable(Prefix + "networkPolicyCount", 0)
+		execution.setVariable(Prefix + "networkCollection", "")
+
+		// AAI query route table reference
+		execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest","")
+		execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", "")
+		execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "")
+		execution.setVariable(Prefix + "networkTableRefUriList", null)
+		execution.setVariable(Prefix + "networkTableRefCount", 0)
+		execution.setVariable(Prefix + "tableRefCollection", "")
+		
+		// AAI requery Id
+		execution.setVariable(Prefix + "requeryIdAAIRequest","")
+		execution.setVariable(Prefix + "requeryIdAAIResponse", "")
+		execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "")
+
+		// AAI update contrail
+		execution.setVariable(Prefix + "updateContrailAAIUrlRequest","")
+		execution.setVariable(Prefix + "updateContrailAAIPayloadRequest","")
+		execution.setVariable(Prefix + "updateContrailAAIResponse", "")
+		execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", "")
+
+		execution.setVariable(Prefix + "updateNetworkRequest", "")
+		execution.setVariable(Prefix + "updateNetworkResponse", "")
+		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+		execution.setVariable(Prefix + "networkReturnCode", "")
+		execution.setVariable(Prefix + "isNetworkRollbackNeeded", false)
+
+		execution.setVariable(Prefix + "changeAssignSDNCRequest", "")
+		execution.setVariable(Prefix + "changeAssignSDNCResponse", "")
+		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
+		execution.setVariable(Prefix + "sdncReturnCode", "")
+		execution.setVariable(Prefix + "isSdncRollbackNeeded", false)
+		execution.setVariable(Prefix + "sdncResponseSuccess", false)
+
+		execution.setVariable(Prefix + "isVnfBindingPresent", false)
+		execution.setVariable(Prefix + "Success", false)
+		execution.setVariable(Prefix + "serviceInstanceId", "")
+		
+		execution.setVariable(Prefix + "isException", false)
+		
+	}
+
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest DoUpdateNetworkInstance Request ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+	
+			// GET Incoming request & validate 3 kinds of format.
+			execution.setVariable("action", "UPDATE")
+			String networkRequest = execution.getVariable("bpmnRequest")
+			if (networkRequest != null) {
+				if (networkRequest.contains("requestDetails")) {
+					// JSON format request is sent, create xml
+					try {
+						def prettyJson = JsonOutput.prettyPrint(networkRequest.toString())
+						utils.log("DEBUG", " Incoming message formatted . . . : " + '\n' + prettyJson, isDebugEnabled)
+						networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, networkRequest)
+		
+					} catch (Exception ex) {
+						String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
+						utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+					}
+				} else {
+					 // XML format request is sent
+				   
+				}
+			} else {
+				// vIPR format request is sent, create xml from individual variables
+				networkRequest = vidUtils.createXmlNetworkRequestInstance(execution)
+			}
+			
+			networkRequest = utils.formatXml(networkRequest)
+			utils.logAudit(networkRequest)
+			execution.setVariable(Prefix + "networkRequest", networkRequest)
+			utils.log("DEBUG", " network-request - " + '\n' + networkRequest, isDebugEnabled)
+		
+			// validate 'disableRollback'  (aka, 'suppressRollback')
+			boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
+			execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
+			utils.log("DEBUG", Prefix + "rollbackEnabled - " + rollbackEnabled, isDebugEnabled)
+										
+			String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
+			execution.setVariable(Prefix + "networkInputs", networkInputs)
+			utils.log("DEBUG", Prefix + "networkInputs - " + '\n' + networkInputs, isDebugEnabled)
+			
+			// prepare messageId
+			String messageId = execution.getVariable(Prefix + "messageId")  // for testing
+			if (messageId == null || messageId == "") {
+				messageId = UUID.randomUUID()
+				utils.log("DEBUG", " UPDNETI_messageId, random generated: " + messageId, isDebugEnabled)
+			} else {
+				utils.log("DEBUG", " UPDNETI_messageId, pre-assigned: " + messageId, isDebugEnabled)
+			}
+			execution.setVariable(Prefix + "messageId", messageId)
+			
+			String source = utils.getNodeText1(networkRequest, "source")
+			execution.setVariable(Prefix + "source", source)
+			utils.log("DEBUG", Prefix + "source - " + source, isDebugEnabled)
+			
+			String networkId = ""
+			if (utils.nodeExists(networkRequest, "network-id")) {
+				networkId = utils.getNodeText1(networkRequest, "network-id")
+				if (networkId == 'null' || networkId == "") {
+					sendSyncError(execution)
+					// missing value of networkId
+					String dataErrorMessage = "Variable 'network-id' value/element is missing."
+					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+	
+				}
+			}
+	
+			String lcpCloudRegion = ""
+			if (utils.nodeExists(networkRequest, "aic-cloud-region")) {
+				lcpCloudRegion = utils.getNodeText1(networkRequest, "aic-cloud-region")
+				if ((lcpCloudRegion == 'null') || (lcpCloudRegion == "")) {
+					sendSyncError(execution)
+					String dataErrorMessage = "requestDetails has missing 'aic-cloud-region' value/element."
+					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+				}
+			}
+	
+			String serviceInstanceId = ""
+			if (utils.nodeExists(networkRequest, "service-instance-id")) {
+				serviceInstanceId = utils.getNodeText1(networkRequest, "service-instance-id")
+				if ((serviceInstanceId == 'null') || (lcpCloudRegion == "")) {
+					sendSyncError(execution)
+					String dataErrorMessage = "Variable 'serviceInstanceId' value/element is missing."
+					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+				}
+			}
+			
+			// PO Authorization Info / headers Authorization=
+			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")
+			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)
+			try {
+				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))
+				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+	
+			} catch (IOException ex) {
+				String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - "
+				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+				utils.log("DEBUG", dataErrorMessage, , isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+			}
+			
+			// Set variables for Generic Get Sub Flow use
+			execution.setVariable(Prefix + "serviceInstanceId", serviceInstanceId)
+			utils.log("DEBUG", Prefix + "serviceInstanceId - " + serviceInstanceId, isDebugEnabled)
+	
+			execution.setVariable("GENGS_type", "service-instance")
+			utils.log("DEBUG", "GENGS_type - " + "service-instance", isDebugEnabled)
+			utils.log("DEBUG", " Url for SDNC adapter: " + execution.getVariable("URN_mso_adapters_sdnc_endpoint"), isDebugEnabled)
+			
+			String sdncVersion = execution.getVariable("sdncVersion")
+			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)
+			
+			// build 'networkOutputs'			
+			networkId = utils.getNodeText1(networkRequest, "network-id")
+			if ((networkId == null) || (networkId == "null")) {
+				networkId = ""
+			}
+			String networkName = utils.getNodeText1(networkRequest, "network-name")
+			if ((networkName == null) || (networkName == "null")) {
+				networkName = ""
+			}
+			String networkOutputs =
+			   """<network-outputs>
+	                   <network-id>${networkId}</network-id>
+	                   <network-name>${networkName}</network-name>
+	                 </network-outputs>"""
+			execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+			utils.log("DEBUG", Prefix + "networkOutputs - " + '\n' + networkOutputs, isDebugEnabled)
+			execution.setVariable(Prefix + "networkId", networkId)
+			execution.setVariable(Prefix + "networkName", networkName)
+		
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex){
+			sendSyncError(execution)
+			 // caught exception
+			String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+	}
+
+	public void callRESTQueryAAICloudRegion (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTQueryAAICloudRegion of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+			String cloudRegion = utils.getNodeText1(networkInputs, "aic-cloud-region")
+			cloudRegion = UriUtils.encode(cloudRegion,"UTF-8")
+
+			// Prepare AA&I url
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUtil = new AaiUtil(this)
+			String aai_uri = aaiUtil.getCloudInfrastructureCloudRegionUri(execution)
+			String queryCloudRegionRequest = "${aai_endpoint}${aai_uri}/" + cloudRegion
+			utils.logAudit(queryCloudRegionRequest)
+			execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
+			utils.log("DEBUG", " UPDNETI_queryCloudRegionRequest - " + "\n" + queryCloudRegionRequest, isDebugEnabled)
+
+			String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
+			String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
+
+			if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
+				execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
+				execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
+				execution.setVariable(Prefix + "isCloudRegionGood", true)
+
+			} else {
+			    String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
+			    utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+			}
+
+			utils.log("DEBUG", " is Cloud Region Good: " + execution.getVariable(Prefix + "isCloudRegionGood"), isDebugEnabled)
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			// try error
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void callRESTQueryAAINetworkId(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkId of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			// get variables
+			String networkRequest = execution.getVariable(Prefix + "networkRequest")
+			String networkId   = utils.getNodeText1(networkRequest, "network-id")
+			networkId = UriUtils.encode(networkId,"UTF-8")
+			execution.setVariable(Prefix + "networkId", networkId)
+			String messageId = execution.getVariable(Prefix + "messageId")
+
+			// Prepare AA&I url
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+			String queryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
+			utils.logAudit(queryIdAAIRequest)
+			execution.setVariable(Prefix + "queryIdAAIRequest", queryIdAAIRequest)
+			utils.log("DEBUG", Prefix + "queryIdAAIRequest - " + "\n" + queryIdAAIRequest, isDebugEnabled)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryIdAAIRequest)
+			String returnCode = response.getStatusCode()
+			execution.setVariable(Prefix + "aaiIdReturnCode", returnCode)
+			utils.log("DEBUG", " ***** AAI Response Code  : " + returnCode, isDebugEnabled)
+			
+			String aaiResponseAsString = response.getResponseBodyAsString()
+
+			if (returnCode=='200') {
+				utils.logAudit(aaiResponseAsString)
+				execution.setVariable(Prefix + "queryIdAAIResponse", aaiResponseAsString)
+				utils.log("DEBUG", " QueryAAINetworkId Success REST Response - " + "\n" + aaiResponseAsString, isDebugEnabled)
+
+			} else {
+				if (returnCode=='404') {
+					String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
+					utils.log("DEBUG", " AAI Query Failed. " + dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+				} else {
+				   if (aaiResponseAsString.contains("RESTFault")) {
+					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+					   execution.setVariable("WorkflowException", exceptionObject)
+					   throw new BpmnError("MSOWorkflowException")
+
+				   } else {
+							// aai all errors
+							String dataErrorMessage = "Unexpected Response from QueryAAINetworkId - " + returnCode
+							utils.log("DEBUG", "Unexpected Response from QueryAAINetworkId - " + dataErrorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+				  }
+				}
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void callRESTReQueryAAINetworkId(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTReQueryAAINetworkId of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			// get variables
+			String networkRequest = execution.getVariable(Prefix + "networkRequest")
+			String networkId   = utils.getNodeText1(networkRequest, "network-id")
+			networkId = UriUtils.encode(networkId,"UTF-8")
+			String messageId = execution.getVariable(Prefix + "messageId")
+
+			// Prepare AA&I url
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+			String requeryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
+			utils.logAudit(requeryIdAAIRequest)
+			execution.setVariable(Prefix + "requeryIdAAIRequest", requeryIdAAIRequest)
+			utils.log("DEBUG", " UPDNETI_requeryIdAAIRequest - " + "\n" + requeryIdAAIRequest, isDebugEnabled)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, requeryIdAAIRequest)
+			String returnCode = response.getStatusCode()
+			execution.setVariable(Prefix + "aaiRequeryIdReturnCode", returnCode)
+			utils.log("DEBUG", " ***** AAI ReQuery Response Code  : " + returnCode, isDebugEnabled)
+
+			String aaiResponseAsString = response.getResponseBodyAsString()
+
+			if (returnCode=='200') {
+				utils.logAudit(aaiResponseAsString)
+				execution.setVariable(Prefix + "requeryIdAAIResponse", aaiResponseAsString)
+				utils.log("DEBUG", " ReQueryAAINetworkId Success REST Response - " + "\n" + aaiResponseAsString, isDebugEnabled)
+
+				String netId = utils.getNodeText1(aaiResponseAsString, "network-id")
+				String netName = utils.getNodeText1(aaiResponseAsString, "network-name")
+				String networkOutputs =
+				   """<network-outputs>
+                   <network-id>${netId}</network-id>			
+                   <network-name>${netName}</network-name>
+                 </network-outputs>"""
+				execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+				utils.log("DEBUG", " networkOutputs - " + '\n' + networkOutputs, isDebugEnabled)
+				
+			} else {
+				if (returnCode=='404') {
+					String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
+					utils.log("DEBUG", " AAI ReQuery Failed. - " + dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+				} else {
+				   if (aaiResponseAsString.contains("RESTFault")) {
+					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+					   execution.setVariable("WorkflowException", exceptionObject)
+					   throw new BpmnError("MSOWorkflowException")
+
+					   } else {
+							// aai all errors
+							String dataErrorMessage = "Unexpected Response from ReQueryAAINetworkId - " + returnCode
+							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+					}
+				}
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void callRESTQueryAAINetworkVpnBinding(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkVpnBinding of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+
+			// get variables
+			String messageId = execution.getVariable(Prefix + "messageId")
+			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
+			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
+
+			// Check if Vnf Binding is present, then build a List of vnfBinding
+			List vpnBindingUri = networkUtils.getVnfBindingObject(relationship)
+			int vpnCount = vpnBindingUri.size()
+			execution.setVariable(Prefix + "vpnCount", vpnCount)
+			utils.log("DEBUG", " UPDNETI_vpnCount - " + vpnCount, isDebugEnabled)
+
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+
+			if (vpnCount > 0) {
+				execution.setVariable(Prefix + "vpnBindings", vpnBindingUri)
+				utils.log("DEBUG", " vpnBindingUri List - " + vpnBindingUri, isDebugEnabled)
+
+				String routeTargets = ""
+				// AII loop call using list vpnBindings
+				for (i in 0..vpnBindingUri.size()-1) {
+
+					int counting = i+1
+
+					// prepare url using vpnBinding
+					String queryVpnBindingAAIRequest = ""
+					String aai_uri = aaiUriUtil.getNetworkVpnBindingUri(execution)
+
+					// Note: By default, the vpnBinding url is found in 'related-link' of the response,
+					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
+					if (aai_uri == null || aai_uri == "") {
+						// using value of 'related-link' from response
+						if (vpnBindingUri[i].charAt(vpnBindingUri[i].length()-1) == '/') {
+						    queryVpnBindingAAIRequest = "${aai_endpoint}" + vpnBindingUri[i].substring(0, vpnBindingUri[i].length()-1)
+						} else {
+						    queryVpnBindingAAIRequest = "${aai_endpoint}" + vpnBindingUri[i]
+						}
+
+					} else {
+					    // using uri value in URN mapping
+						String vpnBindingId = vpnBindingUri[i].substring(vpnBindingUri[i].indexOf("/vpn-binding/")+13, vpnBindingUri[i].length())
+						if (vpnBindingId.charAt(vpnBindingId.length()-1) == '/') {
+							vpnBindingId = vpnBindingId.substring(0, vpnBindingId.length()-1)
+						}
+					    queryVpnBindingAAIRequest = "${aai_endpoint}${aai_uri}/" + vpnBindingId
+					}
+
+					utils.logAudit(queryVpnBindingAAIRequest)
+					execution.setVariable(Prefix + "queryVpnBindingAAIRequest", queryVpnBindingAAIRequest)
+					utils.log("DEBUG", " UPDNETI_queryVpnBindingAAIRequest, , vpnBinding #" + counting + " : " + "\n" + queryVpnBindingAAIRequest, isDebugEnabled)
+
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryVpnBindingAAIRequest)
+					String returnCode = response.getStatusCode()
+					execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", returnCode)
+					utils.log("DEBUG", " ***** AAI query vpn binding Response Code, vpnBinding #" + counting + " : " + returnCode, isDebugEnabled)
+
+					String aaiResponseAsString = response.getResponseBodyAsString()
+
+					if (returnCode=='200') {
+						utils.logAudit(aaiResponseAsString)
+						execution.setVariable(Prefix + "queryVpnBindingAAIResponse", aaiResponseAsString)
+						utils.log("DEBUG", " AAI Query Vpn Binding Success REST Response, , vpnBinding #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
+
+						String routeTarget = ""
+						if (utils.nodeExists(aaiResponseAsString, "global-route-target")) {
+							routeTarget  = utils.getNodeText1(aaiResponseAsString, "global-route-target")
+							routeTargets += "<routeTargets>" + routeTarget + "</routeTargets>" + '\n'
+						}
+
+					} else {
+						if (returnCode=='404') {
+							String dataErrorMessage = "Response Error from AAINetworkVpnBinding is 404 (Not Found)."
+							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+						} else {
+						   if (aaiResponseAsString.contains("RESTFault")) {
+							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+							   execution.setVariable("WorkflowException", exceptionObject)
+							   throw new BpmnError("MSOWorkflowException")
+
+							   } else {
+									// aai all errors
+									String dataErrorMessage = " Unexpected Response from AAINetworkVpnBinding - " + returnCode
+									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+							  }
+						}
+					}
+
+				} // end loop
+
+				execution.setVariable(Prefix + "routeCollection", routeTargets)
+				utils.log("DEBUG", " UPDNETI_routeCollection - " + '\n' + routeTargets, isDebugEnabled)
+
+			} else {
+				// reset return code to success
+				execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
+				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+			    String aaiStubResponse =
+					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+							<vpn-binding xmlns="${schemaVersion}">
+						      <global-route-target/>
+							</vpn-binding>
+						</rest:payload>"""
+				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+				execution.setVariable(Prefix + "queryVpnBindingAAIResponse", aaiStubResponseAsXml)
+				execution.setVariable(Prefix + "routeCollection", "<routeTargets/>")
+				utils.log("DEBUG", " No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
+
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void callRESTQueryAAINetworkPolicy(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkPolicy of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			// get variables
+			String messageId = execution.getVariable(Prefix + "messageId")
+			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
+			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
+
+			// Check if Network Policy is present, then build a List of network policy
+			List networkPolicyUriList = networkUtils.getNetworkPolicyObject(relationship)
+			int networkPolicyCount = networkPolicyUriList.size()
+			execution.setVariable(Prefix + "networkPolicyCount", networkPolicyCount)
+			utils.log("DEBUG", " UPDNETI_networkPolicyCount - " + networkPolicyCount, isDebugEnabled)
+
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+
+			if (networkPolicyCount > 0) {
+				execution.setVariable(Prefix + "networkPolicyUriList", networkPolicyUriList)
+				utils.log("DEBUG", " networkPolicyUri List - " + networkPolicyUriList, isDebugEnabled)
+
+				String networkPolicies = ""
+				// AII loop call using list vpnBindings
+				for (i in 0..networkPolicyUriList.size()-1) {
+
+					int counting = i+1
+
+					// prepare url using vpnBinding
+					String queryNetworkPolicyAAIRequest = ""
+
+					String aai_uri = aaiUriUtil.getNetworkPolicyUri(execution)
+
+					// Note: By default, the network policy url is found in 'related-link' of the response,
+					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
+					if (aai_uri == null || aai_uri == "") {
+						// using value of 'related-link' from response
+						if (networkPolicyUriList[i].charAt(networkPolicyUriList[i].length()-1) == '/') {
+							queryNetworkPolicyAAIRequest = "${aai_endpoint}" + networkPolicyUriList[i].substring(0, networkPolicyUriList[i].length()-1)
+						} else {
+							queryNetworkPolicyAAIRequest = "${aai_endpoint}" + networkPolicyUriList[i]
+						}
+					} else {
+						// using uri value in URN mapping
+						String networkPolicyId = networkPolicyUriList[i].substring(networkPolicyUriList[i].indexOf("/network-policy/")+16, networkPolicyUriList[i].length())
+						println " networkPolicyId - " + networkPolicyId
+						if (networkPolicyId.charAt(networkPolicyId.length()-1) == '/') {
+							networkPolicyId = networkPolicyId.substring(0, networkPolicyId.length()-1)
+						}
+						queryNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + networkPolicyId
+
+					}
+
+
+					utils.logAudit(queryNetworkPolicyAAIRequest)
+					execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest", queryNetworkPolicyAAIRequest)
+					utils.log("DEBUG", " UPDNETI_queryNetworkPolicyAAIRequest, , NetworkPolicy #" + counting + " : " + "\n" + queryNetworkPolicyAAIRequest, isDebugEnabled)
+
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkPolicyAAIRequest)
+					String returnCode = response.getStatusCode()
+					execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", returnCode)
+					utils.log("DEBUG", " ***** AAI query network policy Response Code, NetworkPolicy #" + counting + " : " + returnCode, isDebugEnabled)
+
+					String aaiResponseAsString = response.getResponseBodyAsString()
+
+					if (returnCode=='200') {
+						utils.logAudit(aaiResponseAsString)
+						execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", aaiResponseAsString)
+						utils.log("DEBUG", " QueryAAINetworkPolicy Success REST Response, , NetworkPolicy #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
+
+						String networkPolicy = ""
+						if (utils.nodeExists(aaiResponseAsString, "network-policy-fqdn")) {
+							networkPolicy  = utils.getNodeText1(aaiResponseAsString, "network-policy-fqdn")
+							networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
+						}
+
+					} else {
+						if (returnCode=='404') {
+							String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
+							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+						} else {
+						   if (aaiResponseAsString.contains("RESTFault")) {
+							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+							   execution.setVariable("WorkflowException", exceptionObject)
+							   throw new BpmnError("MSOWorkflowException")
+
+							   } else {
+									// aai all errors
+									String dataErrorMessage = "Unexpected Response from QueryAAINetworkPolicy - " + returnCode
+									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+							  }
+						}
+					}
+
+				} // end loop
+
+				execution.setVariable(Prefix + "networkCollection", networkPolicies)
+				utils.log("DEBUG", " UPDNETI_networkCollection - " + '\n' + networkPolicies, isDebugEnabled)
+
+			} else {
+				// reset return code to success
+				execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
+				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String aaiStubResponse =
+					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+							<network-policy xmlns="${schemaVersion}">
+							  <network-policy-fqdn/>
+                            </network-policy>
+						</rest:payload>"""
+				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+				execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
+				execution.setVariable(Prefix + "networkCollection", "<policyFqdns/>")
+				utils.log("DEBUG", " No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
+
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void callRESTQueryAAINetworkTableRef(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkTableRef of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			// get variables
+			String messageId = execution.getVariable(Prefix + "messageId")
+			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
+			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
+
+			// Check if Network TableREf is present, then build a List of network policy
+			List networkTableRefUriList = networkUtils.getNetworkTableRefObject(relationship)
+			int networkTableRefCount = networkTableRefUriList.size()
+			execution.setVariable(Prefix + "networkTableRefCount", networkTableRefCount)
+			utils.log("DEBUG", " UPDNETI_networkTableRefCount - " + networkTableRefCount, isDebugEnabled)
+
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+
+			if (networkTableRefCount > 0) {
+				execution.setVariable(Prefix + "networkTableRefUriList", networkTableRefUriList)
+				utils.log("DEBUG", " networkTableRefUri List - " + networkTableRefUriList, isDebugEnabled)
+
+				// AII loop call using list vpnBindings
+				String networkTableRefs = ""
+				for (i in 0..networkTableRefUriList.size()-1) {
+
+					int counting = i+1
+
+					// prepare url using tableRef
+					String queryNetworkTableRefAAIRequest = ""
+
+					String aai_uri = aaiUriUtil.getNetworkTableReferencesUri(execution)
+
+					// Note: By default, the network policy url is found in 'related-link' of the response,
+					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
+					if (aai_uri == null || aai_uri == "") {
+						// using value of 'related-link' from response
+						if (networkTableRefUriList[i].charAt(networkTableRefUriList[i].length()-1) == '/') {
+							queryNetworkTableRefAAIRequest = "${aai_endpoint}" + networkTableRefUriList[i].substring(0, networkTableRefUriList[i].length()-1)
+						} else {
+							queryNetworkTableRefAAIRequest = "${aai_endpoint}" + networkTableRefUriList[i]
+						}
+					} else {
+						// using uri value in URN mapping
+						String networkTableRefId = networkTableRefUriList[i].substring(networkTableRefUriList[i].indexOf("/route-table-reference/")+23, networkTableRefUriList[i].length())
+
+						if (networkTableRefId.charAt(networkTableRefId.length()-1) == '/') {
+							networkTableRefId = networkTableRefId.substring(0, networkTableRefId.length()-1)
+						}
+						queryNetworkTableRefAAIRequest = "${aai_endpoint}${aai_uri}/" + networkTableRefId
+
+					}
+
+
+					utils.logAudit(queryNetworkTableRefAAIRequest)
+					execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest", queryNetworkTableRefAAIRequest)
+					utils.log("DEBUG", " UPDNETI_queryNetworkTableRefAAIRequest, , NetworkTableRef #" + counting + " : " + "\n" + queryNetworkTableRefAAIRequest, isDebugEnabled)
+
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkTableRefAAIRequest)
+					String returnCode = response.getStatusCode()
+					execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", returnCode)
+					utils.log("DEBUG", " ***** AAI query network Table Reference Response Code, NetworkTableRef #" + counting + " : " + returnCode, isDebugEnabled)
+
+					String aaiResponseAsString = response.getResponseBodyAsString()
+
+					if (returnCode=='200') {
+						utils.logAudit(aaiResponseAsString)
+						execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", aaiResponseAsString)
+						utils.log("DEBUG", " QueryAAINetworkTableRef Success REST Response, , NetworkTableRef #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
+
+						String networkTableRef = ""
+						if (utils.nodeExists(aaiResponseAsString, "route-table-reference-fqdn")) {
+							networkTableRef  = utils.getNodeText1(aaiResponseAsString, "route-table-reference-fqdn")
+							networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
+						}
+
+					} else {
+						if (returnCode=='404') {
+							String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
+							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+							
+						} else {
+						   if (aaiResponseAsString.contains("RESTFault")) {
+							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+							   execution.setVariable("WorkflowException", exceptionObject)
+							   throw new BpmnError("MSOWorkflowException")
+		
+							   } else {
+									// aai all errors
+									String dataErrorMessage = "Unexpected Response from QueryAAINetworkTableRef - " + returnCode
+									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+							  }
+						}
+					}
+
+				} // end loop
+
+				execution.setVariable(Prefix + "tableRefCollection", networkTableRefs)
+				utils.log("DEBUG", " UPDNETI_tableRefCollection - " + '\n' + networkTableRefs, isDebugEnabled)
+
+			} else {
+				// reset return code to success
+				execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
+				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String aaiStubResponse =
+					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+							<route-table-references xmlns="${schemaVersion}">
+							  <route-table-reference-fqdn/>
+                            </route-table-references>
+						</rest:payload>"""
+				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+				execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
+				execution.setVariable(Prefix + "tableRefCollection", "<routeTableFqdns/>")
+				utils.log("DEBUG", " No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
+
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+			
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+	
+	public void callRESTUpdateContrailAAINetwork(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside callRESTUpdateContrailAAINetwork of DoUpdateNetworkInstance ***** " , isDebugEnabled)
+
+		try {
+			// get variables
+			String networkRequest = execution.getVariable(Prefix + "networkRequest")
+			String networkId   = utils.getNodeText1(networkRequest, "network-id")
+			networkId = UriUtils.encode(networkId,"UTF-8")
+			String requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
+			String updateNetworkResponse   = execution.getVariable(Prefix + "updateNetworkResponse")
+			String messageId = execution.getVariable(Prefix + "messageId")
+
+			// Prepare url
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
+			String updateContrailAAIUrlRequest = "${aai_endpoint}${aai_uri}/" + networkId + "?depth=1"
+
+			utils.logAudit(updateContrailAAIUrlRequest)
+			execution.setVariable(Prefix + "updateContrailAAIUrlRequest", updateContrailAAIUrlRequest)
+			utils.log("DEBUG", " UPDNETI_updateContrailAAIUrlRequest - " + "\n" + updateContrailAAIUrlRequest, isDebugEnabled)
+
+			//Prepare payload (PUT)
+			String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+			String payload = networkUtils.ContrailNetworkCreatedUpdate(requeryIdAAIResponse, updateNetworkResponse, schemaVersion)
+			String payloadXml = utils.formatXml(payload)
+			utils.logAudit(payloadXml)
+			execution.setVariable(Prefix + "updateContrailAAIPayloadRequest", payloadXml)
+			utils.log("DEBUG", " 'payload' to Update Contrail - " + "\n" + payloadXml, isDebugEnabled)
+
+			APIResponse response = aaiUriUtil.executeAAIPutCall(execution, updateContrailAAIUrlRequest, payload)
+			String returnCode = response.getStatusCode()
+			String aaiUpdateContrailResponseAsString = response.getResponseBodyAsString()
+			
+			execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", returnCode)
+			utils.log("DEBUG", " ***** AAI Update Contrail Response Code  : " + returnCode, isDebugEnabled)
+
+
+			if (returnCode=='200') {
+				utils.logAudit(aaiUpdateContrailResponseAsString)
+				execution.setVariable(Prefix + "updateContrailAAIResponse", aaiUpdateContrailResponseAsString)
+				utils.log("DEBUG", " AAI Update Contrail Success REST Response - " + "\n" + aaiUpdateContrailResponseAsString, isDebugEnabled)
+				// Point-of-no-return is set to false, rollback not needed.
+				execution.setVariable(Prefix + "isPONR", true)
+
+			} else {
+				if (returnCode=='404') {
+					String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
+					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+				} else {
+				   if (aaiUpdateContrailResponseAsString.contains("RESTFault")) {
+					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiUpdateContrailResponseAsString, execution)
+					   execution.setVariable("WorkflowException", exceptionObject)
+					   throw new BpmnError("MSOWorkflowException")
+
+					   } else {
+							// aai all errors
+							String errorMessage = "Unexpected Response from UpdateContrailAAINetwork - " + returnCode
+							utils.log("DEBUG", errorMessage, isDebugEnabled)
+							exceptionUtil.buildAndThrowWorkflowException(execution, "2500", errorMessage)
+					  }
+				}
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void prepareUpdateNetworkRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareUpdateNetworkRequest of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			// get variables
+			String requestId = execution.getVariable(Prefix + "requestId")
+			String messageId = execution.getVariable(Prefix + "messageId")
+			String source    = execution.getVariable(Prefix + "source")
+
+			String requestInput = execution.getVariable(Prefix + "networkRequest")
+			String queryIdResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
+			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionPo")
+			String backoutOnFailure = execution.getVariable(Prefix + "rollbackEnabled")
+			
+			// Prepare Network request
+			String routeCollection = execution.getVariable(Prefix + "routeCollection")
+			String policyCollection = execution.getVariable(Prefix + "networkCollection")
+			String tableCollection = execution.getVariable(Prefix + "tableRefCollection")
+			String updateNetworkRequest = networkUtils.UpdateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyCollection, tableCollection, cloudRegionId, backoutOnFailure, source )
+			// Format Response
+			String buildUpdateNetworkRequestAsString = utils.formatXml(updateNetworkRequest)
+			buildUpdateNetworkRequestAsString = buildUpdateNetworkRequestAsString.replace(":w1aac13n0", "").replace("w1aac13n0:", "")
+			utils.logAudit(buildUpdateNetworkRequestAsString)
+
+			execution.setVariable(Prefix + "updateNetworkRequest", buildUpdateNetworkRequestAsString)
+			utils.log("DEBUG", " UPDNETI_updateNetworkRequest - " + "\n" +  buildUpdateNetworkRequestAsString, isDebugEnabled)
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareUpdateNetworkRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void prepareSDNCRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareSDNCRequest of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			// get variables
+			String sdncCallback = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
+			String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
+			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+
+			String networkId = ""
+			if (utils.nodeExists(updateNetworkInput, "network-id")) {
+			   networkId = utils.getNodeText1(updateNetworkInput, "network-id")
+			}
+			if (networkId == null) {networkId = ""}
+
+			String serviceInstanceId = utils.getNodeText1(updateNetworkInput, "service-instance-id")
+
+			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
+ 		   	String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "changeassign", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
+
+			String sndcTopologyUpdateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
+			utils.logAudit(sndcTopologyUpdateRequesAsString)
+			execution.setVariable(Prefix + "changeAssignSDNCRequest", sndcTopologyUpdateRequesAsString)
+			utils.log("DEBUG", " UPDNETI_changeAssignSDNCRequest - " + "\n" +  sndcTopologyUpdateRequesAsString, isDebugEnabled)
+
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	
+
+
+	// **************************************************
+	//     Post or Validate Response Section
+	// **************************************************
+
+	public void validateUpdateNetworkResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside validateUpdateNetworkResponse of DoUpdateNetworkInstance *****", isDebugEnabled)
+
+		try {
+			String returnCode = execution.getVariable(Prefix + "networkReturnCode")
+			String networkResponse = execution.getVariable(Prefix + "updateNetworkResponse")
+			if (networkResponse==null)	{
+				networkResponse="" // reset
+			}
+
+			utils.log("DEBUG", " Network Adapter update responseCode: " + returnCode, isDebugEnabled)
+
+			String errorMessage = ""
+			if (returnCode == "200") {
+				execution.setVariable(Prefix + "isNetworkRollbackNeeded", true)
+				utils.logAudit(networkResponse)
+				execution.setVariable(Prefix + "updateNetworkResponse", networkResponse)
+				utils.log("DEBUG", " Network Adapter update Success Response - " + "\n" + networkResponse, isDebugEnabled)
+
+				// prepare rollback data
+				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
+				rollbackData = rollbackData.replace("rollback>", "networkRollback>")
+  				String rollbackNetwork =
+					"""<rollbackNetworkRequest>
+							${rollbackData}
+						</rollbackNetworkRequest>"""
+				String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
+				execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkXml)
+				utils.log("DEBUG", " Network Adapter rollback data - " + "\n" + rollbackNetworkXml, isDebugEnabled)
+
+			} else { // network error
+			   if (returnCode.toInteger() > 399 && returnCode.toInteger() < 600) {   //4xx, 5xx
+				   if (networkResponse.contains("updateNetworkError")) {
+					   networkResponse = networkResponse.replace('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>', '')
+					   errorMessage = utils.getNodeText1(networkResponse, "message")
+					   errorMessage  = "Received error from Network Adapter: " + errorMessage
+					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
+
+				   } else { // CatchAll exception
+				   	   if (returnCode == "500") {
+						   errorMessage = "JBWEB000065: HTTP Status 500."
+				       } else {
+					       errorMessage = "Return code is " + returnCode
+				       }
+					   errorMessage  = "Received error from Network Adapter: " + errorMessage
+					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
+
+				   }
+
+			   } else { // CatchAll exception
+				   String dataErrorMessage  = "Received error from Network Adapter. Return code is: " + returnCode
+				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+			   }
+
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. validateUpdateNetworkResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+
+	}
+
+	public void validateSDNCResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside validateSDNCResponse of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+
+		String response = execution.getVariable(Prefix + "changeAssignSDNCResponse")
+		WorkflowException workflowException = null
+		try {
+			workflowException = execution.getVariable(Prefix + "WorkflowException")
+			//execution.setVariable("WorkflowException", workflowException)
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sdnc 'WorkflowException' object is empty or null. ", isDebugEnabled)
+		}
+
+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+
+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+		// reset variable
+		String changeAssignSDNCResponseDecodeXml = sdncAdapterUtils.decodeXML(execution.getVariable(Prefix + "changeAssignSDNCResponse"))
+		changeAssignSDNCResponseDecodeXml = changeAssignSDNCResponseDecodeXml.replace("&", "&amp;").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+		execution.setVariable(Prefix + "changeAssignSDNCResponse", changeAssignSDNCResponseDecodeXml)
+
+		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
+			execution.setVariable(Prefix + "isSdncRollbackNeeded", true)
+			utils.log("DEBUG", "Successfully Validated SDNC Response", isDebugEnabled)
+
+		} else {
+			utils.log("DEBUG", "Did NOT Successfully Validated SDNC Response", isDebugEnabled)
+			throw new BpmnError("MSOWorkflowException")
+		}
+
+	}
+
+
+	public void postProcessResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside postProcessResponse of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			utils.log("DEBUG", " ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"), isDebugEnabled)
+			if (execution.getVariable(Prefix + "isException") == false) {
+				// set rollback data
+				execution.setVariable("orchestrationStatus", "")
+				execution.setVariable("networkId", execution.getVariable(Prefix + "networkId"))
+				execution.setVariable("networkName", execution.getVariable(Prefix + "networkName"))
+				prepareSuccessRollbackData(execution) // populate rollbackData
+				execution.setVariable("WorkflowException", null)
+				execution.setVariable(Prefix + "Success", true)
+				utils.log("DEBUG", " ***** postProcessResponse(), GOOD !!!", isDebugEnabled)
+			} else {
+				execution.setVariable(Prefix + "Success", false) 
+				execution.setVariable("rollbackData", null)
+				String exceptionMessage = " Exception encountered in MSO Bpmn. "
+				if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
+				   utils.log("DEBUG", " ***** workflowException: " + execution.getVariable("workflowException"), isDebugEnabled)
+				   WorkflowException wfex = execution.getVariable("workflowException")
+				   exceptionMessage = wfex.getErrorMessage()
+   				} else {
+			       if (execution.getVariable(Prefix + "WorkflowException") != null) {
+				      WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
+				      exceptionMessage = pwfex.getErrorMessage()
+			       }   
+   				}
+			    // going to the Main flow: a-la-carte or macro
+			    utils.log("DEBUG", " ***** postProcessResponse(), BAD !!!", isDebugEnabled)
+			    exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+				throw new BpmnError("MSOWorkflowException")
+			}
+							
+		} catch(BpmnError b){
+		     utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+		     throw b
+			
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+
+	}
+
+	public void prepareSDNCRollbackRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareSDNCRollbackRequest of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			// for some reason the WorkflowException object is null after the sdnc rollback call task, need to save WorkflowException. 
+			execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+			// get variables
+			String sdncCallback = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
+			String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
+			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+			String changeAssignSDNCResponse = execution.getVariable(Prefix + "changeAssignSDNCResponse")
+			String networkId = utils.getNodeText1(changeAssignSDNCResponse, "network-id")
+
+			String serviceInstanceId = utils.getNodeText1(updateNetworkInput, "service-instance-id")
+
+			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
+			String sndcTopologyRollbackRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "rollback", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
+			String sndcTopologyRollbackRequestAsString = utils.formatXml(sndcTopologyRollbackRequest)
+			execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
+			utils.log("DEBUG", " Preparing request for SDNC Topology assign's rollback/compensation . . . - " + "\n" +  sndcTopologyRollbackRequestAsString, isDebugEnabled)
+
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void prepareRollbackData(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		
+		utils.log("DEBUG", " ***** Inside prepareRollbackData() of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+		
+		try {
+			
+			Map<String, String> rollbackData = new HashMap<String, String>();
+			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+			if (rollbackSDNCRequest != null) {
+				if (rollbackSDNCRequest != "") {
+					rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
+				}
+			}
+			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+			if (rollbackNetworkRequest != null) {
+				if (rollbackNetworkRequest != "") {
+					rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
+				}
+			}
+			execution.setVariable("rollbackData", rollbackData)
+			utils.log("DEBUG", "** rollbackData : " + rollbackData, isDebugEnabled)
+			
+			execution.setVariable("WorkflowException", execution.getVariable(Prefix + "WorkflowException"))
+			utils.log("DEBUG", "** WorkflowException : " + execution.getVariable("WorkflowException"), isDebugEnabled)
+			
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+		
+		}
+		
+	}
+	
+	public void prepareSuccessRollbackData(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		
+		utils.log("DEBUG", " ***** Inside prepareSuccessRollbackData() of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+		
+		try {
+			
+			if (execution.getVariable("sdncVersion") == '1702') {
+				// skip: 1702 for 'changeassign' or equivalent not yet defined in SNDC, so no rollback.
+			} else {
+				prepareSDNCRollbackRequest(execution)
+			}
+			
+			Map<String, String> rollbackData = new HashMap<String, String>();
+			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+			if (rollbackSDNCRequest != null) {
+				if (rollbackSDNCRequest != "") {
+					rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
+				}
+			}
+			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+			if (rollbackNetworkRequest != null) {
+				if (rollbackNetworkRequest != "") {
+					rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
+				}
+			}
+			execution.setVariable("rollbackData", rollbackData)
+			
+			utils.log("DEBUG", "** 'rollbackData' for Full Rollback : " + rollbackData, isDebugEnabled)
+			execution.setVariable("WorkflowException", null)
+
+			
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+		
+		}
+		
+	}
+	
+	public void setExceptionFlag(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		
+		utils.log("DEBUG", " ***** Inside setExceptionFlag() of DoUpdateNetworkInstance ***** ", isDebugEnabled)
+		
+		try {
+			
+			execution.setVariable(Prefix + "isException", true)
+			
+			if (execution.getVariable("SavedWorkflowException1") != null) {
+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+			} else {
+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+			}
+			utils.log("DEBUG", Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)
+			
+		} catch(Exception ex){
+			  String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+		}
+		
+	}
+
+
+	// *******************************
+	//     Build Error Section
+	// *******************************
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		try{
+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - "  + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+			
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")
+		}
+		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
+	}
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy
new file mode 100644
index 0000000..c917711
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy
@@ -0,0 +1,304 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.rest.APIResponse
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils
+
+/**
+ * This groovy class supports the <class>DoCreateNetworkInstance.bpmn</class> process.
+ *
+ */
+public class DoUpdateNetworkInstanceRollback extends AbstractServiceTaskProcessor {
+	String Prefix="UPDNETIR_"
+   	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils(this)
+	NetworkUtils networkUtils = new NetworkUtils()
+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+
+	def className = getClass().getSimpleName()
+
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstanceRollback.bpmn</class> process.
+	 * @param execution
+	 */
+	public InitializeProcessVariables(Execution execution){
+		/* Initialize all the process variables in this block */
+
+		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
+		execution.setVariable(Prefix + "rollbackSDNCRequest", null)
+		execution.setVariable(Prefix + "WorkflowException", null)
+
+		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
+		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
+
+		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
+		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
+		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
+
+		execution.setVariable(Prefix + "Success", false)
+		execution.setVariable(Prefix + "fullRollback", false)
+
+	}
+
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstanceRollback.bpmn</class> process.
+	 * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + className + ".groovy ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+
+			// GET Incoming request/variables
+			String rollbackNetworkRequest = null
+			String rollbackSDNCRequest = null
+
+			// Partial Rollback
+			Map<String, String> rollbackData = execution.getVariable("rollbackData")
+			if (rollbackData != null && rollbackData instanceof Map) {
+
+					if(rollbackData.containsKey("rollbackNetworkRequest")) {
+						rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
+					}
+
+					if(rollbackData.containsKey("rollbackSDNCRequest")) {
+					   rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
+					}
+			}
+
+			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
+			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
+			utils.log("DEBUG", "'rollbackData': " + '\n' + execution.getVariable("rollbackData"), isDebugEnabled)
+
+			String sdncVersion = execution.getVariable("sdncVersion")
+			utils.log("DEBUG", "sdncVersion? : " + sdncVersion, isDebugEnabled)
+
+			// PO Authorization Info / headers Authorization=
+			String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")
+			utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)
+			try {
+				def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))
+				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+
+			} catch (IOException ex) {
+				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
+				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+				utils.log("DEBUG", dataErrorMessage , isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+			}
+
+			if (execution.getVariable("SavedWorkflowException1") != null) {
+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+			} else {
+				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+			}
+			utils.log("DEBUG", "*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"), isDebugEnabled)
+			if(execution.getVariable(Prefix + "WorkflowException") != null) {
+				// called by: DoCreateNetworkInstance, partial rollback
+				execution.setVariable(Prefix + "fullRollback", false)
+
+			} else {
+			   // called by: Macro - Full Rollback, WorkflowException = null
+			   execution.setVariable(Prefix + "fullRollback", true)
+
+			}
+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
+
+
+		} catch (BpmnError e) {
+		throw e;
+
+		} catch (Exception ex) {
+			sendSyncError(execution)
+			// caught exception
+			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void validateRollbackResponses (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside validateRollbackResponses() of DoUpdateNetworkInstanceRollback ***** ", isDebugEnabled)
+
+		try {
+			// validate PO network rollback response
+			String rollbackNetworkErrorMessages = ""
+			String rollbackNetworkReturnCode = "200"
+			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
+				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
+				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")
+				utils.log("DEBUG", " NetworkRollback Code - " + rollbackNetworkReturnCode, isDebugEnabled)
+				utils.log("DEBUG", " NetworkRollback Response - " + rollbackNetworkResponse, isDebugEnabled)
+				if (rollbackNetworkReturnCode != "200") {
+					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
+				} else {
+					rollbackNetworkErrorMessages = " + PO Network rollback completed."
+				}
+			}
+
+			// validate SDNC rollback response
+			String rollbackSdncErrorMessages = ""
+			String rollbackSDNCReturnCode = "200"
+			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
+				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
+				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
+				String rollbackSDNCReturnInnerCode = ""
+				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)
+				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+				if (rollbackSDNCReturnCode == "200") {
+					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
+						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")
+						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
+						    rollbackSdncErrorMessages = " + SNDC changeassign rollback completed."
+						} else {
+							rollbackSdncErrorMessages = " + SDNC changeassign rollback failed. "
+						}
+					} else {
+						  rollbackSdncErrorMessages = " + SNDC changeassign rollback completed."
+					}
+				 } else {
+					  rollbackSdncErrorMessages = " + SDNC changeassign rollback failed. "
+			     }
+				utils.log("DEBUG", " SDNC changeassign rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)
+				utils.log("DEBUG", " SDNC changeassign rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)
+			}
+
+			String statusMessage = ""
+			int errorCode = 7000
+			utils.log("DEBUG", "*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"), isDebugEnabled)
+			if (execution.getVariable(Prefix + "fullRollback") == false) {
+				// original WorkflowException,
+				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException")
+				if (wfe != null) {
+				   // rollback due to failure in DoCreate - Partial rollback
+				   statusMessage = wfe.getErrorMessage()
+				   errorCode = wfe.getErrorCode()
+				} else {
+				   statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
+				   errorCode = '7000'
+				}
+
+				// set if all rolledbacks are successful
+				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
+					execution.setVariable("rolledBack", true)
+
+				} else {
+					execution.setVariable("rolledBack", false)
+
+				}
+
+				statusMessage = statusMessage + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
+				utils.log("DEBUG", "Final DoUpdateNetworkInstanceRollback status message: " + statusMessage, isDebugEnabled)
+				String processKey = getProcessKey(execution);
+				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
+				execution.setVariable("workflowException", exception);
+
+			} else {
+				// rollback due to failures in Main flow (Macro) - Full rollback
+				// WorkflowException = null
+				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
+					execution.setVariable("rollbackSuccessful", true)
+					execution.setVariable("rollbackError", false)
+				} else {
+					String exceptionMessage = "Network Update Rollback was not Successful. "
+					utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+					execution.setVariable("rollbackSuccessful", false)
+					execution.setVariable("rollbackError", true)
+					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+					throw new BpmnError("MSOWorkflowException")
+				}
+
+			}
+
+
+		} catch (Exception ex) {
+			execution.setVariable("WorkflowException", null)
+			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
+			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+			execution.setVariable("WorkflowException", execution.getVariable("WorkflowException"))
+
+		}
+
+	}
+
+	// *******************************
+	//     Build Error Section
+	// *******************************
+
+
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		try{
+			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
+		}
+		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)
+	}
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
index 7d6a21d..5999857 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
@@ -1,789 +1,919 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.common.scripts.VfModule
-import org.openecomp.mso.bpmn.common.scripts.VfModuleBase
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse
-import org.springframework.web.util.UriUtils
-
-public class DoUpdateVfModule extends VfModuleBase {
-
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	
-	/**
-	 * Initialize the flow's variables.
-	 * 
-	 * @param execution The flow's execution instance.
-	 */
-	public void initProcessVariables(Execution execution) {
-		execution.setVariable('prefix', 'DOUPVfMod_')
-		execution.setVariable('DOUPVfMod_requestInfo', null)
-		execution.setVariable('DOUPVfMod_serviceInstanceId', null)
-		execution.setVariable('DOUPVfMod_requestId', null)
-		execution.setVariable('DOUPVfMod_vnfInputs', null)
-		execution.setVariable('DOUPVfMod_vnfId', null)
-		execution.setVariable('DOUPVfMod_vnfName', null)
-		execution.setVariable('DOUPVfMod_vnfNameFromAAI', null)
-		execution.setVariable('DOUPVfMod_vfModuleName', null)
-		execution.setVariable('DOUPVfMod_vfModuleId', null)
-		execution.setVariable('DOUPVfMod_vnfType', null)
-		execution.setVariable('DOUPVfMod_asdcServiceModelVersion', null)
-		execution.setVariable('DOUPVfMod_vfModuleModelName', null)
-		execution.setVariable('DOUPVfMod_modelCustomizationUuid', null)
-		execution.setVariable("DOUPVfMod_isBaseVfModule", "false")
-		execution.setVariable('DOUPVfMod_serviceId', null)
-		execution.setVariable('DOUPVfMod_aicCloudRegion', null)
-		execution.setVariable('DOUPVfMod_tenantId', null)
-		execution.setVariable('DOUPVfMod_volumeGroupId', null)
-		execution.setVariable('DOUPVfMod_vfModule', null)
-		execution.setVariable('DOUPVfMod_vnfParams', null)
-		execution.setVariable("DOUPVfMod_baseVfModuleId", "")
-		execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", "")
-		execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', null)
-		execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', null)
-		execution.setVariable('DOUPVfMod_sdncChangeAssignResponse', null)
-		execution.setVariable('DOUPVfMod_sdncActivateRequest', null)
-		execution.setVariable('DOUPVfMod_sdncActivateResponse', null)
-		execution.setVariable('DOUPVfMod_sdncTopologyRequest', null)
-		execution.setVariable('DOUPVfMod_sdncTopologyResponse', null)
-		execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', null)
-		execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', null)
-		execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', null)
-		execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', false)
-		execution.setVariable('DoUpdateVfModuleSuccessIndicator', false)
-	}	
-	
-	/**
-	 * Check for missing elements in the received request.
-	 * 
-	 * @param execution The flow's execution instance.
-	 */
-	public void preProcessRequest(Execution execution) {
-		def method = getClass().getSimpleName() + '.preProcessRequest(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			initProcessVariables(execution)
-			def xml = getVariable(execution, 'DoUpdateVfModuleRequest')
-			utils.logAudit("DoUpdateVfModule request: " + xml)
-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)
-			
-			def requestInfo = getRequiredNodeXml(execution, xml, 'request-info')
-			execution.setVariable('DOUPVfMod_requestInfo', requestInfo)
-			execution.setVariable('DOUPVfMod_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
-			def serviceInstanceId = execution.getVariable('mso-service-instance-id')
-			if (serviceInstanceId == null) {
-				serviceInstanceId = ''
-			}
-			execution.setVariable('DOUPVfMod_serviceInstanceId', serviceInstanceId)
-			
-			def vnfInputs = getRequiredNodeXml(execution, xml, 'vnf-inputs')
-			execution.setVariable('DOUPVfMod_vnfInputs', vnfInputs)
-			execution.setVariable('DOUPVfMod_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))
-			execution.setVariable('DOUPVfMod_vfModuleId', getRequiredNodeText(execution, vnfInputs, 'vf-module-id'))
-			execution.setVariable('DOUPVfMod_vfModuleName', getNodeTextForce(vnfInputs, 'vf-module-name'))
-			execution.setVariable('DOUPVfMod_vnfType', getNodeTextForce(vnfInputs, 'vnf-type'))
-			execution.setVariable('DOUPVfMod_vnfName', getNodeTextForce(vnfInputs, 'vnf-name'))
-			execution.setVariable('DOUPVfMod_asdcServiceModelVersion', getNodeTextForce(vnfInputs, 'asdc-service-model-version'))
-			execution.setVariable('DOUPVfMod_vfModuleModelName', getRequiredNodeText(execution, vnfInputs, 'vf-module-model-name'))
-			execution.setVariable('DOUPVfMod_modelCustomizationUuid', getNodeTextForce(vnfInputs, 'model-customization-id'))
-			execution.setVariable('DOUPVfMod_serviceId', getRequiredNodeText(execution, vnfInputs, 'service-id'))
-			execution.setVariable('DOUPVfMod_aicCloudRegion', getRequiredNodeText(execution, vnfInputs, 'aic-cloud-region'))
-			execution.setVariable('DOUPVfMod_tenantId', getRequiredNodeText(execution, vnfInputs, 'tenant-id'))
-			//isBaseVfModule
-			def isBaseVfModule = "false"
-			if (utils.nodeExists(xml, "is-base-vf-module")) {
-				isBaseVfModule = utils.getNodeText(xml, "is-base-vf-module")
-				execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)
-			}			
-			logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)
-			
-			NetworkUtils networkUtils = new NetworkUtils()
-			def backoutOnFailure = networkUtils.isRollbackEnabled(execution, xml)
-			execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)
-			
-			def String vgi = getNodeTextForce(vnfInputs, 'volume-group-id')
-			execution.setVariable('DOUPVfMod_volumeGroupId', vgi)
-			
-			execution.setVariable('DOUPVfMod_vnfParams', utils.getNodeXml(xml, 'vnf-params', false))
-			
-			def sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
-				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
-				logError(msg)
-				createWorkflowException(execution, 2000, msg)
-			}
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
-		}
-	}
-	
-	/**
-	 * Prepare a Request for invoking the PrepareUpdateAAIVfModule subflow.  This will
-	 * set the orchestration-status to 'pending-update'.
-	 * 
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepPrepareUpdateAAIVfModule(Execution execution) {
-		def method = getClass().getSimpleName() + '.preparePrepareUpdateAAIVfModule(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			def orchestrationStatus = 'pending-update'
-			
-			String prepareUpdateAAIVfModuleRequest = """
-				<PrepareUpdateAAIVfModuleRequest>
-					<vnf-id>${vnfId}</vnf-id>
-					<vf-module-id>${vfModuleId}</vf-module-id>
-					<orchestration-status>${orchestrationStatus}</orchestration-status>
-				</PrepareUpdateAAIVfModuleRequest>
-			"""
-			prepareUpdateAAIVfModuleRequest = utils.formatXml(prepareUpdateAAIVfModuleRequest)
-			execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', prepareUpdateAAIVfModuleRequest)
-			utils.logAudit("DoUpdateAAIVfModule request: " + prepareUpdateAAIVfModuleRequest)
-			logDebug('Request for PrepareUpdateAAIVfModule:\n' + prepareUpdateAAIVfModuleRequest, isDebugLogEnabled)
-			
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preparePrepareUpdateAAIVfModule(): ' + e.getMessage())
-		}
-	}
-	
-	/**
-	 * Prepare a Request for invoking the ConfirmVolumeGroupTenant subflow.  Currently,
-	 * there is really nothing to do, so we just log that we're passing through.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepConfirmVolumeGroupTenant(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepConfirmVolumeGroupTenant(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			// Nothing to do - just log that we're passing through here
-			
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepConfirmVolumeGroupTenant(): ' + e.getMessage())
-		}
-	}
-
-	/**
-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
-	 * a VNF topology 'changeassign' operation.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepSDNCTopologyChg(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepSDNCTopologyChg(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def requestId = execution.getVariable('DOUPVfMod_requestId')
-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			def serviceId = execution.getVariable('DOUPVfMod_serviceId')
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')			
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')
-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
-			def vfModuleName = vfModule.getElementText('vf-module-name')
-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
-			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')
-			
-			// Retrieve vnf name from AAI response
-			def vnfName = execution.getVariable('DOUPVfMod_vnfNameFromAAI')
-			execution.setVariable('DOUPVfMod_vnfName', vnfName)
-			
-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')
-			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)
-			
-			String sdncTopologyRequest = """
-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-					<sdncadapter:RequestHeader>
-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
-						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>   
-						<sdncadapter:SvcAction>changeassign</sdncadapter:SvcAction>
-						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
-					</sdncadapter:RequestHeader>
-					<sdncadapterworkflow:SDNCRequestData>
-					      <request-information>
-					         <request-id>${requestId}</request-id>
-					         <request-action>ChangeVNFActivateRequest</request-action>
-					         <source>PORTAL</source>
-					         <notification-url/>
-					         <order-number/>
-					         <order-version/>
-					      </request-information>
-					      <service-information>
-					         <service-type>${serviceId}</service-type>
-					         <service-instance-id>${vnfId}</service-instance-id>
-					         <subscriber-name>dontcare</subscriber-name>
-					      </service-information>
-					      <vnf-request-information>
-					         <vnf-id>${vfModuleId}</vnf-id>
-					         <vnf-type>${vfModuleModelName}</vnf-type>					         
-					         <vnf-name>${vfModuleName}</vnf-name>
-					         <generic-vnf-id>${vnfId}</generic-vnf-id>
-					         <generic-vnf-name>${vnfName}</generic-vnf-name>
-							 <generic-vnf-type>${vnfType}</generic-vnf-type>
-					         <tenant>${tenantId}</tenant>
-					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>	
-					         ${vnfNetworks}							
-					      </vnf-request-information>
- 					</sdncadapterworkflow:SDNCRequestData>
-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
-			"""
-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
-			execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', sdncTopologyRequest)
-			utils.logAudit("sdncChangeAssignRequest : " + sdncTopologyRequest)
-			logDebug('Request for SDNCAdapter topology/changeassign:\n' + sdncTopologyRequest, isDebugLogEnabled)
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepSDNCTopologyChg(): ' + e.getMessage())
-		}
-	}
-	
-	/**
-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
-	 * a VNF topology 'query' operation.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepSDNCTopologyQuery(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepSDNCTopologyQuery(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def requestId = execution.getVariable('DOUPVfMod_requestId')
-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			
-			def svcInstId = ""
-			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {
-				svcInstId = vfModuleId
-			}
-			else {
-				svcInstId = serviceInstanceId
-			}
-			
-			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE
-			sleep(5000)		
-
-			String sdncTopologyRequest = """
-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-					<sdncadapter:RequestHeader>
-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
-						<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>   
-						<sdncadapter:SvcAction>query</sdncadapter:SvcAction>
-						<sdncadapter:SvcOperation>/VNF-API:vnfs/vnf-list/${vfModuleId}</sdncadapter:SvcOperation>
-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
-						<sdncadapter:MsoAction>mobility</sdncadapter:MsoAction>
-					</sdncadapter:RequestHeader>
-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
-			"""
-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
-			execution.setVariable('DOUPVfMod_sdncTopologyRequest', sdncTopologyRequest)
-			utils.logAudit("sdncTopologyRequest : " + sdncTopologyRequest)
-			logDebug('Request for SDNCAdapter query:\n' + sdncTopologyRequest, isDebugLogEnabled)
-			
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepSDNCTopologyQuery(): ' + e.getMessage())
-		}
-	}
-
-	/**
-	 * Prepare a Request for invoking the VnfAdapterRest subflow.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepVnfAdapterRest(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepVnfAdapterRest(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def requestId = execution.getVariable('DOUPVfMod_requestId')
-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			def vfModuleName = execution.getVariable('DOUPVfMod_vfModuleName')
-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
-			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')
-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
-			def heatStackId = vfModule.getElementText('heat-stack-id')
-			def cloudId = execution.getVariable('DOUPVfMod_aicCloudRegion')
-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')
-			def vnfName = execution.getVariable('DOUPVfMod_vnfName')
-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')			
-			def baseVfModuleId = execution.getVariable("DOUPVfMod_baseVfModuleId")		
-			def baseVfModuleStackId = execution.getVariable("DOUPVfMod_baseVfModuleHeatStackId")
-			def asdcServiceModelVersion = execution.getVariable('DOUPVfMod_asdcServiceModelVersion')
-			def modelCustomizationUuid = execution.getVariable('DOUPVfMod_modelCustomizationUuid')
-			def backoutOnFailure = execution.getVariable("DOUPVfMod_backoutOnFailure")
-			
-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')
-			def vfModuleParamsEntries = transformParamsToEntries(vnfParamsXml)
-			
-			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()
-			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
-			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
-			if ('true'.equals(useQualifiedHostName)) {
-					notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
-			}
-			
-			String sdncGetResponse = execution.getVariable('DOUPVfMod_sdncTopologyResponse')
-			
-			String vfModuleParams = buildVfModuleParams(vfModuleParamsEntries, sdncGetResponse, vnfId, vnfName,
-					vfModuleId, vfModuleName)		
-			
-			
-			String vnfAdapterRestRequest = """
-				<updateVfModuleRequest>
-					<cloudSiteId>${cloudId}</cloudSiteId>
-					<tenantId>${tenantId}</tenantId>
-					<vnfId>${vnfId}</vnfId>
-					<vfModuleId>${vfModuleId}</vfModuleId>
-					<vfModuleStackId>${heatStackId}</vfModuleStackId>
-					<vnfType>${vnfType}</vnfType>
-					<vnfVersion>${asdcServiceModelVersion}</vnfVersion>
-					<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>
-					<vfModuleType>${vfModuleModelName}</vfModuleType>
-					<volumeGroupId>${volumeGroupId}</volumeGroupId>
-					<baseVfModuleId>${baseVfModuleId}</baseVfModuleId>
-    				<baseVfModuleStackId>${baseVfModuleStackId}</baseVfModuleStackId>
-					<skipAAI>true</skipAAI>
-					<backout>${backoutOnFailure}</backout>
-				    <failIfExists>false</failIfExists>
-					<vfModuleParams>						
-						${vfModuleParams}
-				    </vfModuleParams>
-				    <msoRequest>
-				        <requestId>${requestId}</requestId>
-				        <serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
-				    </msoRequest>
-				    <messageId>${messageId}</messageId>
-				    <notificationUrl>${notificationUrl}</notificationUrl>
-				</updateVfModuleRequest>
-			"""
-			vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
-			execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', vnfAdapterRestRequest)
-			utils.logAudit("vnfAdapterRestRequest : " + vnfAdapterRestRequest)
-			logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())
-		}
-	}
-	
-	/**
-	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepUpdateAAIGenericVnf(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepUpdateAAIGenericVnf(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
-			
-			def personaModelId = utils.getNodeText1(vnfInputs, 'vnf-persona-model-id')
-			def personaModelVersion = utils.getNodeText1(vnfInputs, 'vnf-persona-model-version')
-			if ((personaModelId == null) || (personaModelVersion == null)) {
-				logDebug('Skipping update for Generic VNF ' + vnfId +
-					' because either \'vnf-persona-model-id\' or \'vnf-persona-model-version\' is absent', isDebugLogEnabled)
-				execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', true)
-			} else {
-				def personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'
-				def personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'
-				
-				String updateAAIGenericVnfRequest = """
-					<UpdateAAIGenericVnfRequest>
-						<vnf-id>${vnfId}</vnf-id>
-						${personaModelIdElement}
-						${personaModelVersionElement}
-					</UpdateAAIGenericVnfRequest>
-				"""
-				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)
-				execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
-				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
-				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
-			}
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
-		}
-	}
-
-	/**
-	 * Prepare a Request for invoking the UpdateAAIVfModule subflow.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepUpdateAAIVfModule(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepUpdateAAIVfModule(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			def orchestrationStatus = 'updated'
-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
-			
-			def volumeGroupIdElement = ''
-			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')
-			if (volumeGroupId != null) {
-				volumeGroupIdElement = '<volume-group-id>' + volumeGroupId + '</volume-group-id>'
-			}
-			def personaModelIdElement = ''
-			def personaModelId = utils.getNodeText1(vnfInputs, 'persona-model-id')
-			if (personaModelId != null) {
-				personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'
-			}
-			def personaModelVersionElement = ''
-			def personaModelVersion = utils.getNodeText1(vnfInputs, 'persona-model-version')
-			if (personaModelVersion != null) {
-				personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'
-			}
-			def contrailServiceInstanceFqdnElement = ''
-			def contrailServiceInstanceFqdn = utils.getNodeText1(vnfInputs, 'contrail-service-instance-fqdn')
-			if (contrailServiceInstanceFqdn != null) {
-				contrailServiceInstanceFqdnElement = '<contrail-service-instance-fqdn>' + contrailServiceInstanceFqdn + '</contrail-service-instance-fqdn>'
-			}
-			def personaModelCustomizationIdElement = ''
-			def modelCustomizationId = execution.getVariable('DOUPVfMod_modelCustomizationUuid')
-			if (modelCustomizationId != null) {
-				personaModelCustomizationIdElement = '<persona-model-customization-id>' + modelCustomizationId + '</persona-model-customization-id>'
-			}
-			
-			String updateAAIVfModuleRequest = """
-				<UpdateAAIVfModuleRequest>
-					<vnf-id>${vnfId}</vnf-id>
-					<vf-module-id>${vfModuleId}</vf-module-id>
-					<orchestration-status>${orchestrationStatus}</orchestration-status>
-					${volumeGroupIdElement}
-					${personaModelIdElement}
-					${personaModelVersionElement}
-					${contrailServiceInstanceFqdnElement}
-					${personaModelCustomizationIdElement}
-				</UpdateAAIVfModuleRequest>
-			"""
-			updateAAIVfModuleRequest = utils.formatXml(updateAAIVfModuleRequest)
-			execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', updateAAIVfModuleRequest)
-			utils.logAudit("updateAAIVfModuleRequest : " + updateAAIVfModuleRequest)
-			logDebug('Request for UpdateAAIVfModule:\n' + updateAAIVfModuleRequest, isDebugLogEnabled)
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepUpdateAAIVfModule(): ' + e.getMessage())
-		}
-	}
-
-	/**
-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
-	 * a VNF topology 'activate' operation.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepSDNCTopologyAct(Execution execution) {
-		def method = getClass().getSimpleName() + '.prepSDNCTopologyAct(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def requestId = execution.getVariable('DOUPVfMod_requestId')
-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
-			def serviceId = execution.getVariable('DOUPVfMod_serviceId')
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vnfName = execution.getVariable('DOUPVfMod_vnfName')
-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')
-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
-			def vfModuleName = vfModule.getElementText('vf-module-name')
-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
-			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')
-			
-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')
-			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)
-
-			String sdncTopologyRequest = """
-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-					<sdncadapter:RequestHeader>
-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
-						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>   
-						<sdncadapter:SvcAction>activate</sdncadapter:SvcAction>
-						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
-					</sdncadapter:RequestHeader>
-					<sdncadapterworkflow:SDNCRequestData>
-					      <request-information>
-					         <request-id>${requestId}</request-id>
-					         <request-action>ChangeVNFActivateRequest</request-action>
-					         <source>PORTAL</source>
-					         <notification-url/>
-					         <order-number/>
-					         <order-version/>
-					      </request-information>
-					      <service-information>
-					         <service-type>${serviceId}</service-type>
-					         <service-instance-id>${vnfId}</service-instance-id>
-					         <subscriber-name>dontcare</subscriber-name>
-					      </service-information>
-					      <vnf-request-information>
-					         <vnf-id>${vfModuleId}</vnf-id>
-					         <vnf-type>${vfModuleModelName}</vnf-type>
-					         <vnf-name>${vfModuleName}</vnf-name>
-					         <generic-vnf-id>${vnfId}</generic-vnf-id>
-					         <generic-vnf-name>${vnfName}</generic-vnf-name>
-							 <generic-vnf-type>${vnfType}</generic-vnf-type>
-					         <tenant>${tenantId}</tenant>
-					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>				        
-					      </vnf-request-information>
- 					</sdncadapterworkflow:SDNCRequestData>
-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
-			"""
-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
-			execution.setVariable('DOUPVfMod_sdncActivateRequest', sdncTopologyRequest)
-			utils.logAudit("sdncActivateRequest : " + sdncTopologyRequest)
-			logDebug('Request for SDNCAdapter topology/activate:\n' + sdncTopologyRequest, isDebugLogEnabled)
-			
-
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepSDNCTopologyAct(): ' + e.getMessage())
-		}
-	}
-
-	/**
-	 * Log a WorkflowException that has been created. 
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void handleWorkflowException(Execution execution) {
-		def method = getClass().getSimpleName() + '.handleWorkflowException(' +
-			'execution=' + execution.getId() +
-			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def WorkflowException workflowException = (WorkflowException) execution.getVariable('WorkflowException')
-			logError(method + ' caught WorkflowException: ' + workflowException.getErrorMessage())
-			
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in handleWorkflowException(): ' + e.getMessage())
-		}
-	}
-	
-	public void validateSDNCResponse(Execution execution, String response, String method){
-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
-		def prefix = execution.getVariable("prefix")
-		
-		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
-
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-
-		utils.logAudit("workflowException: " + workflowException)
-
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-		utils.logAudit("SDNCResponse: " + response)
-
-		String sdncResponse = response
-		if(execution.getVariable(prefix + 'sdncResponseSuccess') == true){
-			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)			
-		}else{
-			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)
-			throw new BpmnError("MSOWorkflowException")
-		}
-		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
-	}
-	
-	/**
-	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.
-	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void queryAAIVfModule(Execution execution) {
-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
-		def method = getClass().getSimpleName() + '.getVfModule(' +
-			'execution=' + execution.getId() +
-			')'
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		try {
-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
-
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)
-
-			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
-			utils.logAudit("AAI endPoint: " + endPoint)
-
-			try {
-				def aaiRequestId = UUID.randomUUID().toString()
-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
-				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
-				utils.logAudit("createVfModule - invoking httpGet() to AAI")
-
-				def responseData = response.getResponseBodyAsString()
-				if (responseData != null) {
-					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)
-
-				}
-
-				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)
-				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())
-
-				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponseCode', response.getStatusCode())
-				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponse', responseData)
-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)
-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)
-				if (response.getStatusCode() == 200) {
-					// Parse the VNF record from A&AI to find base module info
-					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)
-					if (responseData != null) {
-						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")
-						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)
-						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}
-						int vfModulesSize = 0
-						for (i in 0..vfModules.size()-1) {
-							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])
-							def isBaseVfModule = utils.getNodeText(vfModuleXml, "is-base-vf-module")
-
-							if (isBaseVfModule == "true") {
-							    String baseModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")
-							    execution.setVariable("DOUPVfMod_baseVfModuleId", baseModuleId)
-							    logDebug('Received baseVfModuleId: ' + baseModuleId, isDebugLogEnabled)
-							    String baseModuleHeatStackId = utils.getNodeText1(vfModuleXml, "heat-stack-id")
-							    execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", baseModuleHeatStackId)
-							    logDebug('Received baseVfModuleHeatStackId: ' + baseModuleHeatStackId, isDebugLogEnabled)
-							}
-						}
-					}
-				}
-			} catch (Exception ex) {
-				ex.printStackTrace()
-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())
-			}
-			logDebug('Exited ' + method, isDebugLogEnabled)
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())
-		}
-	}
-	
-	
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

+import org.openecomp.mso.bpmn.common.scripts.VfModule

+import org.openecomp.mso.bpmn.common.scripts.VfModuleBase

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils;

+import org.openecomp.mso.rest.APIResponse

+import org.springframework.web.util.UriUtils

+

+public class DoUpdateVfModule extends VfModuleBase {

+

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	JsonUtils jsonUtil = new JsonUtils()

+

+	/**

+	 * Initialize the flow's variables.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void initProcessVariables(Execution execution) {

+		execution.setVariable('prefix', 'DOUPVfMod_')

+		execution.setVariable('DOUPVfMod_requestInfo', null)

+		execution.setVariable('DOUPVfMod_serviceInstanceId', null)

+		execution.setVariable('DOUPVfMod_requestId', null)

+		execution.setVariable('DOUPVfMod_vnfInputs', null)

+		execution.setVariable('DOUPVfMod_vnfId', null)

+		execution.setVariable('DOUPVfMod_vnfName', null)

+		execution.setVariable('DOUPVfMod_vnfNameFromAAI', null)

+		execution.setVariable('DOUPVfMod_vfModuleName', null)

+		execution.setVariable('DOUPVfMod_vfModuleId', null)

+		execution.setVariable('DOUPVfMod_vnfType', null)

+		execution.setVariable('DOUPVfMod_asdcServiceModelVersion', null)

+		execution.setVariable('DOUPVfMod_vfModuleModelName', null)

+		execution.setVariable('DOUPVfMod_modelCustomizationUuid', null)

+		execution.setVariable("DOUPVfMod_isBaseVfModule", "false")

+		execution.setVariable('DOUPVfMod_serviceId', null)

+		execution.setVariable('DOUPVfMod_aicCloudRegion', null)

+		execution.setVariable('DOUPVfMod_tenantId', null)

+		execution.setVariable('DOUPVfMod_volumeGroupId', null)

+		execution.setVariable('DOUPVfMod_vfModule', null)

+		execution.setVariable('DOUPVfMod_vnfParams', null)

+		execution.setVariable("DOUPVfMod_baseVfModuleId", "")

+		execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", "")

+		execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', null)

+		execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', null)

+		execution.setVariable('DOUPVfMod_sdncChangeAssignResponse', null)

+		execution.setVariable('DOUPVfMod_sdncActivateRequest', null)

+		execution.setVariable('DOUPVfMod_sdncActivateResponse', null)

+		execution.setVariable('DOUPVfMod_sdncTopologyRequest', null)

+		execution.setVariable('DOUPVfMod_sdncTopologyResponse', null)

+		execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', null)

+		execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', null)

+		execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', null)

+		execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', false)

+		execution.setVariable('DoUpdateVfModuleSuccessIndicator', false)

+	}

+

+	/**

+	 * Check for missing elements in the received request.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void preProcessRequest(Execution execution) {

+		def method = getClass().getSimpleName() + '.preProcessRequest(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			initProcessVariables(execution)

+			def xml = getVariable(execution, 'DoUpdateVfModuleRequest')

+			utils.logAudit("DoUpdateVfModule request: " + xml)

+			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

+			

+			if (xml == null || xml.isEmpty()) {

+				// Building Block-type request

+

+				String cloudConfiguration = execution.getVariable("cloudConfiguration")

+				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")

+				

+				def serviceModelInfo = execution.getVariable("serviceModelInfo")

+				logDebug("serviceModelInfo: " + serviceModelInfo, isDebugLogEnabled)

+				def vnfModelInfo = execution.getVariable("vnfModelInfo")

+				

+

+				//tenantId

+				def tenantId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.tenantId")

+				execution.setVariable("DOUPVfMod_tenantId", tenantId)

+				

+				//volumeGroupId

+				def volumeGroupId = execution.getVariable("volumeGroupId")

+				execution.setVariable("DOUPVfMod_volumeGroupId", volumeGroupId)

+				//volumeGroupName

+				def volumeGroupName = execution.getVariable("volumeGroupName")

+				execution.setVariable("DOUPVfMod_volumeGroupName", volumeGroupName)

+				//cloudSiteId

+				def cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.lcpCloudRegionId")

+				execution.setVariable("DOUPVfMod_cloudSiteId", cloudSiteId)

+				

+				logDebug("cloudSiteId: " + cloudSiteId, isDebugLogEnabled)

+				//vnfType

+				def vnfType = execution.getVariable("vnfType")

+				execution.setVariable("DOUPVfMod_vnfType", vnfType)

+				

+				logDebug("vnfType: " + vnfType, isDebugLogEnabled)

+				//vnfName

+				def vnfName = execution.getVariable("vnfName")

+				execution.setVariable("DOUPVfMod_vnfName", vnfName)

+				

+				logDebug("vnfName: " + vnfName, isDebugLogEnabled)

+				//vnfId

+				def vnfId = execution.getVariable("vnfId")

+				execution.setVariable("DOUPVfMod_vnfId", vnfId)

+				

+				logDebug("vnfId: " + vnfId, isDebugLogEnabled)

+				//vfModuleName

+				def vfModuleName = execution.getVariable("vfModuleName")

+				execution.setVariable("DOUPVfMod_vfModuleName", vfModuleName)

+				

+				logDebug("vfModuleName: " + vfModuleName, isDebugLogEnabled)

+				//vfModuleModelName

+				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelName")

+				execution.setVariable("DOUPVfMod_vfModuleModelName", vfModuleModelName)

+				

+				logDebug("vfModuleModelName: " + vfModuleModelName, isDebugLogEnabled)

+				//modelCustomizationUuid

+				def modelCustomizationUuid = jsonUtil.getJsonValue(vfModuleModelInfo, "modelCustomizationId")

+				execution.setVariable("DOUPVfMod_modelCustomizationUuid", modelCustomizationUuid)

+				

+				logDebug("modelCustomizationUuid: " + modelCustomizationUuid, isDebugLogEnabled)

+				//vfModuleId

+				def vfModuleId = execution.getVariable("vfModuleId")

+				execution.setVariable("DOUPVfMod_vfModuleId", vfModuleId)

+				logDebug("vfModuleId: " + vfModuleId, isDebugLogEnabled)

+				def requestId = execution.getVariable("requestId")

+				execution.setVariable("DOUPVfMod_requestId", requestId)

+				logDebug("requestId: " + requestId, isDebugLogEnabled)

+				// Set mso-request-id to request-id for VNF Adapter interface

+				execution.setVariable("mso-request-id", requestId)

+				//serviceId

+				def serviceId = execution.getVariable("serviceId")

+				execution.setVariable("DOUPVfMod_serviceId", serviceId)

+				logDebug("serviceId: " + serviceId, isDebugLogEnabled)

+				//serviceInstanceId

+				def serviceInstanceId = execution.getVariable("serviceInstanceId")

+				execution.setVariable("DOUPVfMod_serviceInstanceId", serviceInstanceId)

+				

+				logDebug("serviceInstanceId: " + serviceInstanceId, isDebugLogEnabled)

+				//source - HARDCODED

+				def source = "VID"

+				execution.setVariable("DOUPVfMod_source", source)

+				

+				logDebug("source: " + source, isDebugLogEnabled)

+				//backoutOnFailure

+				def disableRollback = execution.getVariable("disableRollback")

+				def backoutOnFailure = true

+				if (disableRollback != null && disableRollback.equals("true")) {

+					backoutOnFailure = false

+				}

+				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)

+				logDebug("backoutOnFailure: " + backoutOnFailure, isDebugLogEnabled)

+				//isBaseVfModule

+				def isBaseVfModule = execution.getVariable("isBaseVfModule")

+				execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)

+				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)

+				//asdcServiceModelVersion

+				def asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")

+				execution.setVariable("DOUPVfMod_asdcServiceModelVersion", asdcServiceModelVersion)

+				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)

+				//personaModelId

+				execution.setVariable("DOUPVfMod_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInvariantId"))

+				//personaModelVersion

+				execution.setVariable("DOUPVfMod_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersion"))

+				//Get or Generate UUID

+				String uuid = execution.getVariable("DOUPVfMod_uuid")

+				if(uuid == null){

+					uuid = UUID.randomUUID()

+					logDebug("Generated messageId (UUID) is: " + uuid, isDebugLogEnabled)

+				}else{

+					logDebug("Found messageId (UUID) is: " + uuid, isDebugLogEnabled)

+				}

+				//isVidRequest

+				String isVidRequest = execution.getVariable("isVidRequest")

+				// default to true

+				if (isVidRequest == null || isVidRequest.isEmpty()) {

+					execution.setVariable("isVidRequest", "true")

+				}

+				//globalSubscriberId

+				String globalSubscriberId = execution.getVariable("globalSubscriberId")

+				execution.setVariable("DOUPVfMod_globalSubscriberId", globalSubscriberId)

+				logDebug("globalSubsrciberId: " + globalSubscriberId, isDebugLogEnabled)

+				//vnfQueryPath

+				String vnfQueryPath = execution.getVariable("vnfQueryPath")

+				execution.setVariable("DOUPVfMod_vnfQueryPath", vnfQueryPath)

+				logDebug("vnfQueryPath: " + vnfQueryPath, isDebugLogEnabled)

+

+				String vnfParamsChildNodes = execution.getVariable("vfModuleInputParams")

+				execution.setVariable('DOUPVfMod_vnfParams', vnfParamsChildNodes)

+			}

+			else {

+

+				def requestInfo = getRequiredNodeXml(execution, xml, 'request-info')

+				execution.setVariable('DOUPVfMod_requestInfo', requestInfo)

+				execution.setVariable('DOUPVfMod_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))

+			def serviceInstanceId = execution.getVariable('mso-service-instance-id')

+				if (serviceInstanceId == null) {

+					serviceInstanceId = ''

+				}

+				execution.setVariable('DOUPVfMod_serviceInstanceId', serviceInstanceId)

+	

+				def vnfInputs = getRequiredNodeXml(execution, xml, 'vnf-inputs')

+				execution.setVariable('DOUPVfMod_vnfInputs', vnfInputs)

+				execution.setVariable('DOUPVfMod_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))

+				execution.setVariable('DOUPVfMod_vfModuleId', getRequiredNodeText(execution, vnfInputs, 'vf-module-id'))

+				execution.setVariable('DOUPVfMod_vfModuleName', getNodeTextForce(vnfInputs, 'vf-module-name'))

+				execution.setVariable('DOUPVfMod_vnfType', getNodeTextForce(vnfInputs, 'vnf-type'))

+				execution.setVariable('DOUPVfMod_vnfName', getNodeTextForce(vnfInputs, 'vnf-name'))

+				execution.setVariable('DOUPVfMod_asdcServiceModelVersion', getNodeTextForce(vnfInputs, 'asdc-service-model-version'))

+				execution.setVariable('DOUPVfMod_vfModuleModelName', getRequiredNodeText(execution, vnfInputs, 'vf-module-model-name'))

+				execution.setVariable('DOUPVfMod_modelCustomizationUuid', getNodeTextForce(vnfInputs, 'model-customization-id'))

+				execution.setVariable('DOUPVfMod_serviceId', getRequiredNodeText(execution, vnfInputs, 'service-id'))

+				execution.setVariable('DOUPVfMod_aicCloudRegion', getRequiredNodeText(execution, vnfInputs, 'aic-cloud-region'))

+				execution.setVariable('DOUPVfMod_tenantId', getRequiredNodeText(execution, vnfInputs, 'tenant-id'))

+				//isBaseVfModule

+				def isBaseVfModule = "false"

+				if (utils.nodeExists(xml, "is-base-vf-module")) {

+					isBaseVfModule = utils.getNodeText(xml, "is-base-vf-module")

+					execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)

+				}

+				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)

+	

+				NetworkUtils networkUtils = new NetworkUtils()

+				def backoutOnFailure = networkUtils.isRollbackEnabled(execution, xml)

+				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)

+	

+				def String vgi = getNodeTextForce(vnfInputs, 'volume-group-id')

+				execution.setVariable('DOUPVfMod_volumeGroupId', vgi)

+	

+				execution.setVariable('DOUPVfMod_vnfParams', utils.getNodeXml(xml, 'vnf-params', false))

+			}

+

+			def sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {

+				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'

+				logError(msg)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

+			}

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the PrepareUpdateAAIVfModule subflow.  This will

+	 * set the orchestration-status to 'pending-update'.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepPrepareUpdateAAIVfModule(Execution execution) {

+		def method = getClass().getSimpleName() + '.preparePrepareUpdateAAIVfModule(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+			def orchestrationStatus = 'pending-update'

+

+			String prepareUpdateAAIVfModuleRequest = """

+				<PrepareUpdateAAIVfModuleRequest>

+					<vnf-id>${vnfId}</vnf-id>

+					<vf-module-id>${vfModuleId}</vf-module-id>

+					<orchestration-status>${orchestrationStatus}</orchestration-status>

+				</PrepareUpdateAAIVfModuleRequest>

+			"""

+			prepareUpdateAAIVfModuleRequest = utils.formatXml(prepareUpdateAAIVfModuleRequest)

+			execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', prepareUpdateAAIVfModuleRequest)

+			utils.logAudit("DoUpdateAAIVfModule request: " + prepareUpdateAAIVfModuleRequest)

+			logDebug('Request for PrepareUpdateAAIVfModule:\n' + prepareUpdateAAIVfModuleRequest, isDebugLogEnabled)

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preparePrepareUpdateAAIVfModule(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the ConfirmVolumeGroupTenant subflow.  Currently,

+	 * there is really nothing to do, so we just log that we're passing through.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepConfirmVolumeGroupTenant(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepConfirmVolumeGroupTenant(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			// Nothing to do - just log that we're passing through here

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepConfirmVolumeGroupTenant(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

+	 * a VNF topology 'changeassign' operation.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepSDNCTopologyChg(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepSDNCTopologyChg(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def requestId = execution.getVariable('DOUPVfMod_requestId')

+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			def serviceId = execution.getVariable('DOUPVfMod_serviceId')

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

+			def vfModuleName = vfModule.getElementText('vf-module-name')

+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

+			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')

+

+			// Retrieve vnf name from AAI response

+			def vnfName = execution.getVariable('DOUPVfMod_vnfNameFromAAI')

+			execution.setVariable('DOUPVfMod_vnfName', vnfName)

+

+			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

+			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)

+

+			String sdncTopologyRequest = """

+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+					<sdncadapter:RequestHeader>

+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

+						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

+						<sdncadapter:SvcAction>changeassign</sdncadapter:SvcAction>

+						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

+					</sdncadapter:RequestHeader>

+					<sdncadapterworkflow:SDNCRequestData>

+					      <request-information>

+					         <request-id>${requestId}</request-id>

+					         <request-action>ChangeVNFActivateRequest</request-action>

+					         <source>PORTAL</source>

+					         <notification-url/>

+					         <order-number/>

+					         <order-version/>

+					      </request-information>

+					      <service-information>

+					         <service-type>${serviceId}</service-type>

+					         <service-instance-id>${vnfId}</service-instance-id>

+					         <subscriber-name>dontcare</subscriber-name>

+					      </service-information>

+					      <vnf-request-information>

+					         <vnf-id>${vfModuleId}</vnf-id>

+					         <vnf-type>${vfModuleModelName}</vnf-type>

+					         <vnf-name>${vfModuleName}</vnf-name>

+					         <generic-vnf-id>${vnfId}</generic-vnf-id>

+					         <generic-vnf-name>${vnfName}</generic-vnf-name>

+							 <generic-vnf-type>${vnfType}</generic-vnf-type>

+					         <tenant>${tenantId}</tenant>

+					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

+					         ${vnfNetworks}

+					      </vnf-request-information>

+ 					</sdncadapterworkflow:SDNCRequestData>

+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

+			"""

+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

+			execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', sdncTopologyRequest)

+			utils.logAudit("sdncChangeAssignRequest : " + sdncTopologyRequest)

+			logDebug('Request for SDNCAdapter topology/changeassign:\n' + sdncTopologyRequest, isDebugLogEnabled)

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyChg(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

+	 * a VNF topology 'query' operation.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepSDNCTopologyQuery(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepSDNCTopologyQuery(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def requestId = execution.getVariable('DOUPVfMod_requestId')

+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+

+			def svcInstId = ""

+			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {

+				svcInstId = vfModuleId

+			}

+			else {

+				svcInstId = serviceInstanceId

+			}

+

+			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE

+			sleep(5000)

+

+			String sdncTopologyRequest = """

+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+					<sdncadapter:RequestHeader>

+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

+						<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>

+						<sdncadapter:SvcAction>query</sdncadapter:SvcAction>

+						<sdncadapter:SvcOperation>/VNF-API:vnfs/vnf-list/${vfModuleId}</sdncadapter:SvcOperation>

+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

+						<sdncadapter:MsoAction>mobility</sdncadapter:MsoAction>

+					</sdncadapter:RequestHeader>

+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

+			"""

+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

+			execution.setVariable('DOUPVfMod_sdncTopologyRequest', sdncTopologyRequest)

+			utils.logAudit("sdncTopologyRequest : " + sdncTopologyRequest)

+			logDebug('Request for SDNCAdapter query:\n' + sdncTopologyRequest, isDebugLogEnabled)

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyQuery(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the VnfAdapterRest subflow.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepVnfAdapterRest(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepVnfAdapterRest(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def requestId = execution.getVariable('DOUPVfMod_requestId')

+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+			def vfModuleName = execution.getVariable('DOUPVfMod_vfModuleName')

+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

+			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')

+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

+			def heatStackId = vfModule.getElementText('heat-stack-id')

+			def cloudId = execution.getVariable('DOUPVfMod_aicCloudRegion')

+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

+			def vnfName = execution.getVariable('DOUPVfMod_vnfName')

+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

+			def baseVfModuleId = execution.getVariable("DOUPVfMod_baseVfModuleId")

+			def baseVfModuleStackId = execution.getVariable("DOUPVfMod_baseVfModuleHeatStackId")

+			def asdcServiceModelVersion = execution.getVariable('DOUPVfMod_asdcServiceModelVersion')

+			def modelCustomizationUuid = execution.getVariable('DOUPVfMod_modelCustomizationUuid')

+			def backoutOnFailure = execution.getVariable("DOUPVfMod_backoutOnFailure")

+

+			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

+			def vfModuleParamsEntries = transformParamsToEntries(vnfParamsXml)

+

+			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()

+			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)

+			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")

+			if ('true'.equals(useQualifiedHostName)) {

+					notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)

+			}

+

+			String sdncGetResponse = execution.getVariable('DOUPVfMod_sdncTopologyResponse')

+

+			String vfModuleParams = buildVfModuleParams(vfModuleParamsEntries, sdncGetResponse, vnfId, vnfName,

+					vfModuleId, vfModuleName, null)

+

+

+			String vnfAdapterRestRequest = """

+				<updateVfModuleRequest>

+					<cloudSiteId>${cloudId}</cloudSiteId>

+					<tenantId>${tenantId}</tenantId>

+					<vnfId>${vnfId}</vnfId>

+					<vfModuleId>${vfModuleId}</vfModuleId>

+					<vfModuleStackId>${heatStackId}</vfModuleStackId>

+					<vnfType>${vnfType}</vnfType>

+					<vnfVersion>${asdcServiceModelVersion}</vnfVersion>

+					<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>

+					<vfModuleType>${vfModuleModelName}</vfModuleType>

+					<volumeGroupId>${volumeGroupId}</volumeGroupId>

+					<baseVfModuleId>${baseVfModuleId}</baseVfModuleId>

+    				<baseVfModuleStackId>${baseVfModuleStackId}</baseVfModuleStackId>

+					<skipAAI>true</skipAAI>

+					<backout>${backoutOnFailure}</backout>

+				    <failIfExists>false</failIfExists>

+					<vfModuleParams>

+						${vfModuleParams}

+				    </vfModuleParams>

+				    <msoRequest>

+				        <requestId>${requestId}</requestId>

+				        <serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

+				    </msoRequest>

+				    <messageId>${messageId}</messageId>

+				    <notificationUrl>${notificationUrl}</notificationUrl>

+				</updateVfModuleRequest>

+			"""

+			vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)

+			execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', vnfAdapterRestRequest)

+			utils.logAudit("vnfAdapterRestRequest : " + vnfAdapterRestRequest)

+			logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepUpdateAAIGenericVnf(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepUpdateAAIGenericVnf(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

+

+			def personaModelId = utils.getNodeText1(vnfInputs, 'vnf-persona-model-id')

+			def personaModelVersion = utils.getNodeText1(vnfInputs, 'vnf-persona-model-version')

+			if ((personaModelId == null) || (personaModelVersion == null)) {

+				logDebug('Skipping update for Generic VNF ' + vnfId +

+					' because either \'vnf-persona-model-id\' or \'vnf-persona-model-version\' is absent', isDebugLogEnabled)

+				execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', true)

+			} else {

+				def personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'

+				def personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'

+

+				String updateAAIGenericVnfRequest = """

+					<UpdateAAIGenericVnfRequest>

+						<vnf-id>${vnfId}</vnf-id>

+						${personaModelIdElement}

+						${personaModelVersionElement}

+					</UpdateAAIGenericVnfRequest>

+				"""

+				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)

+				execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)

+				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)

+				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)

+			}

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the UpdateAAIVfModule subflow.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepUpdateAAIVfModule(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepUpdateAAIVfModule(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+			def orchestrationStatus = 'updated'

+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

+

+			def volumeGroupIdElement = ''

+			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')

+			if (volumeGroupId != null) {

+				volumeGroupIdElement = '<volume-group-id>' + volumeGroupId + '</volume-group-id>'

+			}

+			def personaModelIdElement = ''

+			def personaModelId = utils.getNodeText1(vnfInputs, 'persona-model-id')

+			if (personaModelId != null) {

+				personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'

+			}

+			def personaModelVersionElement = ''

+			def personaModelVersion = utils.getNodeText1(vnfInputs, 'persona-model-version')

+			if (personaModelVersion != null) {

+				personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'

+			}

+			def contrailServiceInstanceFqdnElement = ''

+			def contrailServiceInstanceFqdn = utils.getNodeText1(vnfInputs, 'contrail-service-instance-fqdn')

+			if (contrailServiceInstanceFqdn != null) {

+				contrailServiceInstanceFqdnElement = '<contrail-service-instance-fqdn>' + contrailServiceInstanceFqdn + '</contrail-service-instance-fqdn>'

+			}

+			def personaModelCustomizationIdElement = ''

+			def modelCustomizationId = execution.getVariable('DOUPVfMod_modelCustomizationUuid')

+			if (modelCustomizationId != null) {

+				personaModelCustomizationIdElement = '<persona-model-customization-id>' + modelCustomizationId + '</persona-model-customization-id>'

+			}

+

+			String updateAAIVfModuleRequest = """

+				<UpdateAAIVfModuleRequest>

+					<vnf-id>${vnfId}</vnf-id>

+					<vf-module-id>${vfModuleId}</vf-module-id>

+					<orchestration-status>${orchestrationStatus}</orchestration-status>

+					${volumeGroupIdElement}

+					${personaModelIdElement}

+					${personaModelVersionElement}

+					${contrailServiceInstanceFqdnElement}

+					${personaModelCustomizationIdElement}

+				</UpdateAAIVfModuleRequest>

+			"""

+			updateAAIVfModuleRequest = utils.formatXml(updateAAIVfModuleRequest)

+			execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', updateAAIVfModuleRequest)

+			utils.logAudit("updateAAIVfModuleRequest : " + updateAAIVfModuleRequest)

+			logDebug('Request for UpdateAAIVfModule:\n' + updateAAIVfModuleRequest, isDebugLogEnabled)

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIVfModule(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

+	 * a VNF topology 'activate' operation.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepSDNCTopologyAct(Execution execution) {

+		def method = getClass().getSimpleName() + '.prepSDNCTopologyAct(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def requestId = execution.getVariable('DOUPVfMod_requestId')

+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

+			def serviceId = execution.getVariable('DOUPVfMod_serviceId')

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vnfName = execution.getVariable('DOUPVfMod_vnfName')

+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

+			def vfModuleName = vfModule.getElementText('vf-module-name')

+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

+			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')

+

+			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

+			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)

+

+			String sdncTopologyRequest = """

+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+					<sdncadapter:RequestHeader>

+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

+						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

+						<sdncadapter:SvcAction>activate</sdncadapter:SvcAction>

+						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

+					</sdncadapter:RequestHeader>

+					<sdncadapterworkflow:SDNCRequestData>

+					      <request-information>

+					         <request-id>${requestId}</request-id>

+					         <request-action>ChangeVNFActivateRequest</request-action>

+					         <source>PORTAL</source>

+					         <notification-url/>

+					         <order-number/>

+					         <order-version/>

+					      </request-information>

+					      <service-information>

+					         <service-type>${serviceId}</service-type>

+					         <service-instance-id>${vnfId}</service-instance-id>

+					         <subscriber-name>dontcare</subscriber-name>

+					      </service-information>

+					      <vnf-request-information>

+					         <vnf-id>${vfModuleId}</vnf-id>

+					         <vnf-type>${vfModuleModelName}</vnf-type>

+					         <vnf-name>${vfModuleName}</vnf-name>

+					         <generic-vnf-id>${vnfId}</generic-vnf-id>

+					         <generic-vnf-name>${vnfName}</generic-vnf-name>

+							 <generic-vnf-type>${vnfType}</generic-vnf-type>

+					         <tenant>${tenantId}</tenant>

+					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

+					      </vnf-request-information>

+ 					</sdncadapterworkflow:SDNCRequestData>

+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

+			"""

+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

+			execution.setVariable('DOUPVfMod_sdncActivateRequest', sdncTopologyRequest)

+			utils.logAudit("sdncActivateRequest : " + sdncTopologyRequest)

+			logDebug('Request for SDNCAdapter topology/activate:\n' + sdncTopologyRequest, isDebugLogEnabled)

+

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyAct(): ' + e.getMessage())

+		}

+	}

+

+	/**

+	 * Log a WorkflowException that has been created.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void handleWorkflowException(Execution execution) {

+		def method = getClass().getSimpleName() + '.handleWorkflowException(' +

+			'execution=' + execution.getId() +

+			')'

+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def WorkflowException workflowException = (WorkflowException) execution.getVariable('WorkflowException')

+			logError(method + ' caught WorkflowException: ' + workflowException.getErrorMessage())

+

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildWorkflowException(execution, 1002, 'Error in handleWorkflowException(): ' + e.getMessage())

+		}

+	}

+

+	public void validateSDNCResponse(Execution execution, String response, String method){

+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

+		def prefix = execution.getVariable("prefix")

+

+		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

+

+		WorkflowException workflowException = execution.getVariable("WorkflowException")

+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

+

+		utils.logAudit("workflowException: " + workflowException)

+

+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

+

+		utils.logAudit("SDNCResponse: " + response)

+

+		String sdncResponse = response

+		if(execution.getVariable(prefix + 'sdncResponseSuccess') == true){

+			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)

+		}else{

+			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)

+			throw new BpmnError("MSOWorkflowException")

+		}

+		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

+	}

+

+	/**

+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.

+	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void queryAAIVfModule(Execution execution) {

+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

+		def method = getClass().getSimpleName() + '.getVfModule(' +

+			'execution=' + execution.getId() +

+			')'

+		logDebug('Entered ' + method, isDebugLogEnabled)

+

+		try {

+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

+

+			AaiUtil aaiUriUtil = new AaiUtil(this)

+			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

+			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

+

+			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"

+			utils.logAudit("AAI endPoint: " + endPoint)

+

+			try {

+				def aaiRequestId = UUID.randomUUID().toString()

+				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)

+				utils.logAudit("createVfModule - invoking httpGet() to AAI")

+

+				def responseData = response.getResponseBodyAsString()

+				if (responseData != null) {

+					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)

+

+				}

+

+				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)

+				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())

+

+				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponseCode', response.getStatusCode())

+				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponse', responseData)

+				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

+				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

+				if (response.getStatusCode() == 200) {

+					// Parse the VNF record from A&AI to find base module info

+					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)

+					if (responseData != null) {

+						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")

+						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

+						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

+						int vfModulesSize = 0

+						for (i in 0..vfModules.size()-1) {

+							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

+							def isBaseVfModule = utils.getNodeText(vfModuleXml, "is-base-vf-module")

+

+							if (isBaseVfModule == "true") {

+							    String baseModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")

+							    execution.setVariable("DOUPVfMod_baseVfModuleId", baseModuleId)

+							    logDebug('Received baseVfModuleId: ' + baseModuleId, isDebugLogEnabled)

+							    String baseModuleHeatStackId = utils.getNodeText1(vfModuleXml, "heat-stack-id")

+							    execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", baseModuleHeatStackId)

+							    logDebug('Received baseVfModuleHeatStackId: ' + baseModuleHeatStackId, isDebugLogEnabled)

+							}

+						}

+					}

+				}

+			} catch (Exception ex) {

+				ex.printStackTrace()

+				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())

+			}

+			logDebug('Exited ' + method, isDebugLogEnabled)

+		} catch (BpmnError e) {

+			throw e;

+		} catch (Exception e) {

+			logError('Caught exception in ' + method, e)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())

+		}

+	}

+

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/HealchCheckActivate.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/HealchCheckActivate.groovy
index dd9f94d..c2d394f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/HealchCheckActivate.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/HealchCheckActivate.groovy
@@ -1,54 +1,54 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
-import org.apache.commons.lang3.*
-
-public class HealthCheckActivate extends AbstractServiceTaskProcessor {
-	
-	
-		/**
-	 * Validates the request message and sets up the workflow.
-	 * @param execution the execution
-	 */
-	public void preProcessRequest(Execution execution) {
-
-	}
-	
-	
-	/**
-	 * Sends the synchronous response back to the API Handler.
-	 * @param execution the execution
-	 */
-	public void sendResponse(Execution execution) {
-		def status = execution.getVariable("healthyStatus")
-		def healthcheckmessage = execution.getVariable("healthcheckmessage")
-			if (status == "true") {
-				sendWorkflowResponse(execution, 200, healthcheckmessage)
-			}else{
-				sendWorkflowResponse(execution, 503, healthcheckmessage)
-			}
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

+import org.apache.commons.lang3.*

+

+public class HealthCheckActivate extends AbstractServiceTaskProcessor {

+	

+	

+		/**

+	 * Validates the request message and sets up the workflow.

+	 * @param execution the execution

+	 */

+	public void preProcessRequest(Execution execution) {

+

+	}

+	

+	

+	/**

+	 * Sends the synchronous response back to the API Handler.

+	 * @param execution the execution

+	 */

+	public void sendResponse(Execution execution) {

+		def status = execution.getVariable("healthyStatus")

+		def healthcheckmessage = execution.getVariable("healthcheckmessage")

+			if (status == "true") {

+				sendWorkflowResponse(execution, 200, healthcheckmessage)

+			}else{

+				sendWorkflowResponse(execution, 503, healthcheckmessage)

+			}

+	}

+

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstance.groovy
new file mode 100644
index 0000000..68b0e58
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstance.groovy
@@ -0,0 +1,452 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.rest.APIResponse
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils
+
+/**
+ * This groovy class supports the <class>UpdateNetworkInstance.bpmn</class> process.
+ *
+ */
+public class UpdateNetworkInstance extends AbstractServiceTaskProcessor {
+	String Prefix="UPDNI_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+
+	public InitializeProcessVariables(Execution execution){
+
+		execution.setVariable(Prefix + "source", "")
+		execution.setVariable(Prefix + "Success", false)
+
+		execution.setVariable(Prefix + "CompleteMsoProcessRequest", "")
+		execution.setVariable(Prefix + "FalloutHandlerRequest", "")
+
+	}
+
+
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>UpdateNetworkInstance.bpmn</class> process.
+	 * @param execution
+	 */
+
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>UpdateNetworkInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest() of UpdateNetworkInstance Request ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+
+			String sdncVersion = execution.getVariable("sdncVersion")
+			if (sdncVersion == null || sdncVersion == "1610") {
+				// 'a-la-cart' default, sdncVersion = '1610'
+				execution.setVariable("sdncVersion", "1610")
+				String bpmnRequest = execution.getVariable("bpmnRequest")
+				if (bpmnRequest != null) {                                        
+					String disableRollback = jsonUtil.getJsonValue(bpmnRequest, "requestDetails.requestInfo.suppressRollback")
+					if (disableRollback != null) {
+					   execution.setVariable("disableRollback", disableRollback)
+					   utils.log("DEBUG", "Received 'suppressRollback': " + disableRollback , isDebugEnabled)
+					} else {
+					   execution.setVariable("disableRollback", false)
+					}   
+					utils.log("DEBUG", " Set 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
+				} else {
+					String dataErrorMessage = " Invalid 'bpmnRequest' request."
+					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+				}
+
+			} else {
+			    // 'macro' TEST ONLY, sdncVersion = '1702'
+			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
+			}
+
+			// get/set 'msoRequestId' and 'mso-request-id'
+			String requestId = execution.getVariable("msoRequestId")
+			if (requestId != null) {
+				execution.setVariable("mso-request-id", requestId)
+			} else {
+				requestId = execution.getVariable("mso-request-id")
+			}
+			execution.setVariable(Prefix + "requestId", requestId)
+
+			// get/set 'requestId'
+			if (execution.getVariable("requestId") == null) {
+				execution.setVariable("requestId", requestId)
+			}
+
+			//Place holder for additional code.
+
+			// TODO ???
+			// userParams???  1) pre-loads indicator, 2) 'auto-activation'
+			// Tag/Value parameters
+			//
+			// Map: 'networkInputParams': 'auto-activation''
+			// Sample format?
+			// "requestParameters": {
+  			//     "userParams": [
+            //          {
+			//	         "name": "someUserParam1",
+			//	         "value": "someValue1"
+			//          }
+            //     ]
+		    //   }
+			//
+			// String userParams = //use json util to extract "userParams"//
+	        // execution.setVariable("networkInputParams", userParams)
+			// else: execution.setVariable("networkInputParams", null)
+			//
+
+		} catch (BpmnError e) {
+		    throw e;
+
+		} catch (Exception ex){
+			sendSyncError(execution)
+			 // caught exception
+			String exceptionMessage = "Exception Encountered in UpdateNetworkInstance, PreProcessRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+	}
+
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside sendSyncResponse() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("mso-request-id")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String updateNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + updateNetworkRestRequest, isDebugEnabled)
+			sendWorkflowResponse(execution, 202, updateNetworkRestRequest)
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstance flow. sendSyncResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+
+	}
+
+
+	public void getNetworkModelInfo (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside getNetworkModelInfo() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			// "networkModelInfo" is expected to be sent
+			String networkModelInfo = execution.getVariable("networkModelInfo")
+			utils.log("DEBUG", " networkModelInfo - " + networkModelInfo, isDebugEnabled)
+
+			// "serviceModelInfo" is expected to be sent
+			String serviceModelInfo = execution.getVariable("serviceModelInfo")
+			utils.log("DEBUG", " serviceModelInfo - " + serviceModelInfo, isDebugEnabled)
+
+
+		} catch (Exception ex) {
+			sendSyncError(execution)
+		   String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstance flow. getNetworkModelInfo() - " + ex.getMessage()
+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside sendSyncError() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			String requestId = execution.getVariable("mso-request-id")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			// REST Error (for API Handler (APIH) Reply Task)
+			String syncError = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			sendWorkflowResponse(execution, 500, syncError)
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Bpmn error encountered in UpdateNetworkInstance flow. sendSyncError() - " + ex.getMessage(), isDebugEnabled)
+		}
+
+	}
+
+	public void prepareDBRequestError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareDBRequestError() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+			String statusMessage = ""
+			WorkflowException wfe = null
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				wfe = execution.getVariable("WorkflowException")
+				statusMessage = wfe.getErrorMessage()
+			}
+
+			String requestId = execution.getVariable(Prefix + "requestId")
+			String networkName = execution.getVariable("networkName") !=null ? execution.getVariable("networkName") : ""
+			String networkId = execution.getVariable("networkId") !=null ? execution.getVariable("networkId") : ""
+			String dbRequest =
+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+						<soapenv:Header/>
+						<soapenv:Body>
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+								<requestId>${requestId}</requestId>
+								<lastModifiedBy>BPMN</lastModifiedBy>
+								<statusMessage>${statusMessage}</statusMessage>
+								<responseBody></responseBody>
+								<requestStatus>FAILED</requestStatus>
+								<vnfOutputs>&lt;network-id&gt;${networkId}&lt;/network-id&gt;&lt;network-name&gt;${networkName}&lt;/network-names&gt;</vnfOutputs>
+							</ns:updateInfraRequest>
+					   	</soapenv:Body>
+					   </soapenv:Envelope>"""
+
+		   execution.setVariable(Prefix + "createDBRequest", dbRequest)
+		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)
+		   utils.logAudit(dbRequest)
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstance flow. prepareDBRequestError() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	 }
+
+	public void prepareCompletion (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareCompletion() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			String requestId = execution.getVariable("mso-request-id")
+			String source = execution.getVariable(Prefix + "source")
+
+			String msoCompletionRequest =
+				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+								xmlns:ns="http://org.openecomp/mso/request/types/v1">
+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+							<request-id>${requestId}</request-id>
+							<action>UPDATE</action>
+							<source>VID</source>
+			   			</request-info>
+						<aetgt:status-message>Network has been updated successfully.</aetgt:status-message>
+			   			<aetgt:mso-bpel-name>BPMN Network action: UPDATE</aetgt:mso-bpel-name>
+					</aetgt:MsoCompletionRequest>"""
+
+				// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			// normal path
+			execution.setVariable(Prefix + "Success", true)
+			execution.setVariable(Prefix + "CompleteMsoProcessRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstance flow. prepareCompletion() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+
+	}
+
+
+
+
+	// **************************************************
+	//     Post or Validate Response Section
+	// **************************************************
+
+	public void postProcessResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside postProcessResponse() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			if (execution.getVariable("CMSO_ResponseCode") == "200") {
+				execution.setVariable(Prefix + "Success", true)
+				utils.log("DEBUG", " ***** UpdateNetworkInstance Success ***** ", isDebugEnabled)
+				//   Place holder for additional code.
+
+			 } else {
+				execution.setVariable(Prefix + "Success", false)
+				utils.log("DEBUG", " ***** UpdateNetworkInstance Failed in CompletionMsoProces flow!. ***** ", isDebugEnabled)
+
+			 }
+
+
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+	    }
+
+	}
+
+
+	// *******************************
+	//     Build Error Section
+	// *******************************
+
+	public void processRollbackData (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside processRollbackData() of UpdateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			//execution.getVariable("orchestrationStatus")
+			//execution.getVariable("networkId")
+			//execution.getVariable("networkName")
+			//networkOutputParams
+			//rollbackData
+			//rolledBack
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Bpmn error encountered in UpdateNetworkInstance flow. callDBCatalog() - " + ex.getMessage(), isDebugEnabled)
+		}
+
+	}
+
+	// Prepare for FalloutHandler
+	public void buildErrorResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
+
+		String falloutHandlerRequest = ""
+		String requestId = execution.getVariable("mso-request-id")
+
+		try {
+			WorkflowException wfe = execution.getVariable("WorkflowException")
+			String errorCode = String.valueOf(wfe.getErrorCode())
+			String errorMessage = wfe.getErrorMessage()
+			falloutHandlerRequest =
+				"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					      <request-id>${requestId}</request-id>
+					      <action>UPDATE</action>
+					      <source>VID</source>
+					   </request-info>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+
+			utils.logAudit(falloutHandlerRequest)
+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
+			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			String errorException = "  Bpmn error encountered in UpdateNetworkInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
+			utils.log("DEBUG", errorException, isDebugEnabled)
+			falloutHandlerRequest =
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					      <request-id>${requestId}</request-id>
+					      <action>UPDATE</action>
+					      <source>VID</source>
+					   </request-info>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+
+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
+			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
+
+		}
+
+	}
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		try{
+			utils.log("DEBUG", "Caught a Java Exception in " + Prefix, isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
+		}
+		utils.log("DEBUG", "Completed processJavaException Method in " + Prefix, isDebugEnabled)
+	}
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy
index a682c4d..5f0f65b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy
@@ -1,37 +1,37 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

  */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+

+package org.openecomp.mso.bpmn.infrastructure.scripts;

 
 import groovy.xml.XmlUtil
 import groovy.json.*
 
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;

+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;

+import org.openecomp.mso.bpmn.common.scripts.VidUtils;

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils;

+import org.openecomp.mso.rest.APIResponse

 
 import java.util.UUID;
 
@@ -195,19 +195,19 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 		}
 
 		try {
-			// Catalog DB headers Authorization
-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)
-			
-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
-		} catch (IOException ex) {
-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-		
-		try {
+			// Catalog DB headers Authorization

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		

+		try {

 
 			execution.setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", updateNetworkJsonIncoming)
 
@@ -230,7 +230,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 			execution.setVariable("UPDNETI_networkOutputs", networkOutputs)
 			utils.log("DEBUG", " networkOutputs - " + '\n' + networkOutputs, isDebugEnabled)
 
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 			if (requestId == null || requestId == "") {
 				requestId = execution.getVariable("requestId")
 			}
@@ -309,7 +309,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 
 		try {
 			String serviceInstanceId = execution.getVariable("UPDNETI_serviceInstanceId")
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			String updateNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
@@ -1094,6 +1094,19 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 		execution.setVariable("prefix", Prefix)
 
 		try {
+			// Catalog DB headers Authorization

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		

+		try {

 			utils.log("DEBUG", " ***** Inside prepareDBRequest of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
 
 			String networkOutputs = execution.getVariable("UPDNETI_networkOutputs")
@@ -1121,7 +1134,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
 						<soapenv:Header/>
 						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

 								<requestId>${requestId}</requestId>
 								<lastModifiedBy>BPMN</lastModifiedBy>
 								<statusMessage>${statusMessage}</statusMessage>
@@ -1153,6 +1166,19 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 		execution.setVariable("prefix", Prefix)
 
 		try {
+			// Catalog DB headers Authorization

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		

+		try {

 			utils.log("DEBUG", " ***** Inside prepareDBRequestError of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
 
 			String statusMessage = ""
@@ -1190,7 +1216,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
 						<soapenv:Header/>
 						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

 								<requestId>${requestId}</requestId>
 								<lastModifiedBy>BPMN</lastModifiedBy>
 								<statusMessage>${statusMessage}</statusMessage>
@@ -1244,7 +1270,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 				// prepare rollback data
 				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
   				String rollbackNetwork =
-					"""<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">
+					"""<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">

 							${rollbackData}
 						</NetworkAdapter:rollbackNetwork>"""
 				String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
@@ -1345,9 +1371,9 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 			String requestId = execution.getVariable("UPDNETI_requestId")
 
 			String msoCompletionRequest =
-				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-								xmlns:ns="http://org.openecomp/mso/request/types/v1">
-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+								xmlns:ns="http://org.openecomp/mso/request/types/v1">

+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 							<request-id>${requestId}</request-id>
 							<action>UPDATE</action>
 							<source>${source}</source>
@@ -1528,15 +1554,15 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 			String errorCode = String.valueOf(wfe.getErrorCode())
 			String errorMessage = wfe.getErrorMessage()
 			falloutHandlerRequest =
-			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 					      <request-id>${requestId}</request-id>
 					      <action>UPDATE</action>
 					      <source>${source}</source>
 					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

 							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
 							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
 						</aetgt:WorkflowException>
@@ -1550,15 +1576,15 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 			String errorException = "  Bpmn error encountered in UpdateNetworkInstanceInfra flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
 			utils.log("DEBUG", errorException, isDebugEnabled)
 			falloutHandlerRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 					      <request-id>${requestId}</request-id>
 					      <action>UPDATE</action>
 					      <source>${source}</source>
 					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

 							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
 							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
 						</aetgt:WorkflowException>
@@ -1578,7 +1604,7 @@ public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
 
 		try {
 
-			String requestId = execution.getVariable("mso-request-id")
+			String requestId = execution.getVariable("mso-request-id")

 
 			// REST Error (for API Handler (APIH) Reply Task)
 			String syncError = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
index 8f2eb27..d428cc3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
@@ -1,24 +1,24 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts

 
 import groovy.util.Node
 import groovy.util.XmlParser;
@@ -28,19 +28,21 @@ import java.io.Serializable;
 
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
-
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.rest.APIResponse
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.core.RollbackData
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils;

+import org.openecomp.mso.rest.APIResponse

+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

+import org.openecomp.mso.bpmn.core.RollbackData

 
 
 public class UpdateVfModule extends AbstractServiceTaskProcessor {
-		
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
 	/**
 	 * Initialize the flow's variables.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void initProcessVariables(Execution execution) {
@@ -57,11 +59,11 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 		execution.setVariable('UPDVfMod_vnfParams', null)
 		execution.setVariable('UPDVfMod_updateInfraRequest', null)
 		execution.setVariable('UpdateVfModuleSuccessIndicator', false)
-	}	
-	
+	}
+
 	/**
 	 * Check for missing elements in the received request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void preProcessRequest(Execution execution) {
@@ -74,13 +76,13 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 		try {
 			initProcessVariables(execution)
 			String request = validateRequest(execution)
-			
+
 			utils.logAudit("UpdateVfModule request: " + request)
 			def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
 			execution.setVariable('UPDVfMod_requestInfo', requestInfo)
 			execution.setVariable('UPDVfMod_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
 			execution.setVariable('UPDVfMod_source', getNodeTextForce(requestInfo, 'source'))
-			
+
 			def vnfInputs = getRequiredNodeXml(execution, request, 'vnf-inputs')
 			execution.setVariable('UPDVfMod_vnfInputs', vnfInputs)
 			execution.setVariable('UPDVfMod_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))
@@ -96,13 +98,13 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare and send the synchronous response for this flow.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void sendSynchResponse(Execution execution) {
@@ -125,7 +127,7 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 				startTime = System.currentTimeMillis()
 			}
 			def vnfInputs = execution.getVariable('UPDVfMod_vnfInputs')
-			
+
 			String synchResponse = """
 				<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
 					<request-info>
@@ -142,25 +144,25 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 
 			synchResponse = utils.formatXml(synchResponse)
 			sendWorkflowResponse(execution, 200, synchResponse)
-			
+
 			utils.logAudit("UpdateVfModule Synch Response: " + synchResponse)
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in sendSynchResponse(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in sendSynchResponse(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare the Request for invoking the DoUpdateVfModule subflow.
-	 * 
+	 *
 	 * NOTE: Currently, the method just logs passing through as the
 	 * incoming Request to this main flow is used as the Request to
 	 * the DoUpdateVfModule subflow. No preparation processing is
 	 * necessary.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepDoUpdateVfModule(Execution execution) {
@@ -171,19 +173,19 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 		logDebug('Entered ' + method, isDebugLogEnabled)
 
 		try {
-			
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepDoUpdateVfModule(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepDoUpdateVfModule(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare the Request for updating the DB for this Infra Request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepUpdateInfraRequest(Execution execution) {
@@ -199,10 +201,10 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			def vfModuleId = execution.getVariable('UPDVfMod_vfModuleId')
 			def tenantId = execution.getVariable('UPDVfMod_tenantId')
 			def volumeGroupId = execution.getVariable('UPDVfMod_volumeGroupId')
-			
+
 			String updateInfraRequest = """
 				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:req="http://org.openecomp.mso/requestsdb">
+						xmlns:req="http://org.openecomp.mso/requestsdb">

 					<soapenv:Header/>
 					<soapenv:Body>
 						<req:updateInfraRequest>
@@ -231,13 +233,13 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepUpdateInfraRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateInfraRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Builds a "CompletionHandler" request and stores it in the specified execution variable.
-	 * 
+	 *
 	 * @param execution the execution
 	 * @param resultVar the execution variable in which the result will be stored
 	 */
@@ -251,10 +253,10 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 
 		try {
 			def requestInfo = getVariable(execution, 'UPDVfMod_requestInfo')
-			
+
 			String content = """
-				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">
+				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">

 					${requestInfo}
 					<sdncadapterworkflow:mso-bpel-name>MSO_ACTIVATE_BPEL</sdncadapterworkflow:mso-bpel-name>
 				</sdncadapterworkflow:MsoCompletionRequest>
@@ -270,13 +272,13 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
 
 	/**
 	 * Builds a "FalloutHandler" request and stores it in the specified execution variable.
-	 * 
+	 *
 	 * @param execution the execution
 	 * @param resultVar the execution variable in which the result will be stored
 	 */
@@ -287,12 +289,12 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def prefix = execution.getVariable('prefix')
 			def request = getVariable(execution, prefix+'Request')
 			def requestInformation = utils.getNodeXml(request, 'request-information', false)
-			
+
 			def WorkflowException workflowException = execution.getVariable("WorkflowException")
 			def errorResponseCode = workflowException.getErrorCode()
 			def errorResponseMsg = workflowException.getErrorMessage()
@@ -302,15 +304,15 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			}
 
 			String content = """
-				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
+				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

 					${requestInformation}
 					<sdncadapterworkflow:WorkflowException>
 						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
 						<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
-					</sdncadapterworkflow:WorkflowException>	
+					</sdncadapterworkflow:WorkflowException>
 				</sdncadapterworkflow:FalloutHandlerRequest>
 			"""
 			content = utils.formatXml(content)
@@ -323,7 +325,7 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfra.groovy
index 8d05f41..d0949ae 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleInfra.groovy
@@ -26,7 +26,7 @@ import groovy.util.XmlParser;
 import groovy.xml.QName
 
 import java.io.Serializable;
-
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.openecomp.mso.rest.APIResponse
@@ -39,10 +39,12 @@ import org.openecomp.mso.bpmn.core.WorkflowException
 
 
 public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
-		
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
 	/**
 	 * Initialize the flow's variables.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void initProcessVariables(Execution execution) {
@@ -59,11 +61,11 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 		execution.setVariable('UPDVfModI_vnfParams', null)
 		execution.setVariable('UPDVfModI_updateInfraRequest', null)
 		execution.setVariable('UpdateVfModuleSuccessIndicator', false)
-	}	
-	
+	}
+
 	/**
 	 * Check for missing elements in the received request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void preProcessRequest(Execution execution) {
@@ -72,58 +74,58 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		initProcessVariables(execution)
-		
+
 		def prefix = "UPDVfModI_"
-		
+
 		execution.setVariable("isVidRequest", "false")
-		
+
 		def incomingRequest = execution.getVariable('bpmnRequest')
-		
+
 		utils.log("DEBUG", "Incoming Infra Request: " + incomingRequest, isDebugLogEnabled)
-		
+
 		// check if request is xml or json
 		try {
 			def jsonSlurper = new JsonSlurper()
 			Map reqMap = jsonSlurper.parseText(incomingRequest)
 			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)
-			
+
 			def serviceInstanceId = execution.getVariable('serviceInstanceId')
 			def vnfId = execution.getVariable('vnfId')
-			
+
 			def vidUtils = new VidUtils(this)
-			
+
 			String requestInXmlFormat = vidUtils.createXmlVfModuleRequest(execution, reqMap, 'UPDATE_VF_MODULE', serviceInstanceId)
-			
+
 			utils.log("DEBUG", " Request in XML format: " + requestInXmlFormat, isDebugLogEnabled)
-			
+
 			execution.setVariable(prefix + 'Request', requestInXmlFormat)
 			execution.setVariable(prefix+'vnfId', vnfId)
-			execution.setVariable("isVidRequest", "true")			
-			
+			execution.setVariable("isVidRequest", "true")
+
 		}
 		catch(groovy.json.JsonException je) {
 			utils.log("DEBUG", " Request is not in JSON format.", isDebugLogEnabled)
-			workflowException(execution, "Invalid request format", 400)
-			
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Invalid request format")
+
 		}
 		catch(Exception e) {
-			String restFaultMessage = e.getMessage()			
+			String restFaultMessage = e.getMessage()
 			utils.log("ERROR", " Exception Encountered - " + "\n" + restFaultMessage, isDebugLogEnabled)
-			workflowException(execution, restFaultMessage, 400)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, restFaultMessage)
 		}
-				
+
 
 		try {
-			
+
 			String request = validateInfraRequest(execution)
-			
+
 			def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
 			execution.setVariable('UPDVfModI_requestInfo', requestInfo)
 			execution.setVariable('UPDVfModI_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
 			execution.setVariable('UPDVfModI_source', getNodeTextForce(requestInfo, 'source'))
-			
+
 			def vnfInputs = getRequiredNodeXml(execution, request, 'vnf-inputs')
 			execution.setVariable('UPDVfModI_vnfInputs', vnfInputs)
 			execution.setVariable('UPDVfModI_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))
@@ -139,13 +141,13 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare and send the sychronous response for this flow.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void sendSynchResponse(Execution execution) {
@@ -155,7 +157,7 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
 
-		
+
 		try {
 			def requestInfo = execution.getVariable('UPDVfModI_requestInfo')
 			def requestId = execution.getVariable('UPDVfModI_requestId')
@@ -167,12 +169,12 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			def startTime = getNodeTextForce(requestInfo, 'start-time')
 			if (startTime.isEmpty()) {
 				startTime = System.currentTimeMillis()
-			}			
-				
+			}
+
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			def vfModuleId = execution.getVariable("vfModuleId")
 			String synchResponse = """{"requestReferences":{"instanceId":"${vfModuleId}","requestId":"${requestId}"}}""".trim()
-			
+
 			sendWorkflowResponse(execution, 200, synchResponse)
 
 			logDebug('Exited ' + method, isDebugLogEnabled)
@@ -180,18 +182,18 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in sendResponse(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare the Request for invoking the DoUpdateVfModule subflow.
-	 * 
+	 *
 	 * NOTE: Currently, the method just logs passing through as the
 	 * incoming Request to this main flow is used as the Request to
 	 * the DoUpdateVfModule subflow. No preparation processing is
 	 * necessary.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepDoUpdateVfModule(Execution execution) {
@@ -202,19 +204,19 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 		logDebug('Entered ' + method, isDebugLogEnabled)
 
 		try {
-			
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepDoUpdateVfModule(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepDoUpdateVfModule(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare the Request for updating the DB for this Infra Request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepUpdateInfraRequest(Execution execution) {
@@ -230,7 +232,7 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			def vfModuleId = execution.getVariable('UPDVfModI_vfModuleId')
 			def tenantId = execution.getVariable('UPDVfModI_tenantId')
 			def volumeGroupId = execution.getVariable('UPDVfModI_volumeGroupId')
-			
+
 			String updateInfraRequest = """
 				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
 						xmlns:req="http://org.openecomp.mso/requestsdb">
@@ -261,13 +263,13 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepUpdateInfraRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateInfraRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Builds a "CompletionHandler" request and stores it in the specified execution variable.
-	 * 
+	 *
 	 * @param execution the execution
 	 * @param resultVar the execution variable in which the result will be stored
 	 */
@@ -281,7 +283,7 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 		try {
 			def requestInfo = getVariable(execution, 'UPDVfModI_requestInfo')
-			
+
 			String content = """
 				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
 						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">
@@ -299,13 +301,13 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
 
 	/**
 	 * Builds a "FalloutHandler" request and stores it in the specified execution variable.
-	 * 
+	 *
 	 * @param execution the execution
 	 * @param resultVar the execution variable in which the result will be stored
 	 */
@@ -316,12 +318,12 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def prefix = execution.getVariable('prefix')
 			def request = getVariable(execution, prefix+'Request')
 			def requestInformation = utils.getNodeXml(request, 'request-info', false)
-			
+
 			def WorkflowException workflowException = execution.getVariable("WorkflowException")
 			def errorResponseCode = workflowException.getErrorCode()
 			def errorResponseMsg = workflowException.getErrorMessage()
@@ -339,7 +341,7 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 					<sdncadapterworkflow:WorkflowException>
 						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
 						<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
-					</sdncadapterworkflow:WorkflowException>	
+					</sdncadapterworkflow:WorkflowException>
 				</sdncadapterworkflow:FalloutHandlerRequest>
 			"""
 			content = utils.formatXml(content)
@@ -351,10 +353,10 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 2000, 'Internal Error')
+			exceptionUtil.buildWorkflowException(execution, 2000, 'Internal Error')
 		}
 	}
-	
+
 	/**
 	 * Validates the request, request id and service instance id.  If a problem is found,
 	 * a WorkflowException is generated and an MSOWorkflowException event is thrown. This
@@ -373,7 +375,7 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 		def prefix = execution.getVariable("prefix")
 
 		if (prefix == null) {
-			createWorkflowException(execution, 1002, processKey + " prefix is null")
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " prefix is null")
 		}
 
 		try {
@@ -381,34 +383,34 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 			if (request == null) {
 				request = execution.getVariable(processKey + 'Request')
-	
+
 				if (request == null) {
 					request = execution.getVariable('bpmnRequest')
 				}
-	
+
 				setVariable(execution, processKey + 'Request', null);
 				setVariable(execution, 'bpmnRequest', null);
 				setVariable(execution, prefix + 'Request', request);
 			}
 
 			if (request == null) {
-				createWorkflowException(execution, 1002, processKey + " request is null")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request is null")
 			}
-			
+
 			/*
 
 			def requestId = execution.getVariable("mso-request-id")
-			
+
 			if (requestId == null) {
-				createWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
 			}
-			
+
 			setVariable(execution, prefix + 'requestId', requestId)
 
 			def serviceInstanceId = execution.getVariable("mso-service-instance-id")
 
 			if (serviceInstanceId == null) {
-				createWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
 			}
 
 			utils.logContext(requestId, serviceInstanceId)
@@ -420,8 +422,8 @@ public class UpdateVfModuleInfra extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, "Invalid Message")
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Invalid Message")
 		}
 	}
-	
+
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
index 996fd56..6d53252 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
@@ -1,24 +1,24 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts

 
 import java.util.concurrent.ExecutionException;
 
@@ -26,17 +26,20 @@ import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.apache.commons.lang3.*
 import org.springframework.web.util.UriUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.VfModuleBase
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil

+import org.openecomp.mso.bpmn.common.scripts.VfModuleBase

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.bpmn.core.json.JsonUtils;

+import org.openecomp.mso.rest.APIResponse

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

 
 class UpdateVfModuleVolume extends VfModuleBase {
-	
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
 	/**
 	 * Initialize the flow's variables.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	private void initProcessVariables(Execution execution) {
@@ -56,10 +59,10 @@ class UpdateVfModuleVolume extends VfModuleBase {
 		execution.setVariable('UPDVfModVol_volumeGroupTenantId', null)
 		execution.setVariable('UpdateVfModuleVolumeSuccessIndicator', false)
 	}
-	
+
 	/**
 	 * Check for missing elements in the received request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	@Override
@@ -69,16 +72,16 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			initProcessVariables(execution)
 			String request = validateRequest(execution)
-			
+
 			def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
 			execution.setVariable('UPDVfModVol_requestInfo', requestInfo)
 			execution.setVariable('UPDVfModVol_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
 			execution.setVariable('UPDVfModVol_source', getNodeTextForce(requestInfo, 'source'))
-			
+
 			def volumeInputs = getRequiredNodeXml(execution, request, 'volume-inputs')
 			execution.setVariable('UPDVfModVol_volumeInputs', volumeInputs)
 			execution.setVariable('UPDVfModVol_volumeGroupId', getRequiredNodeText(execution, volumeInputs, 'volume-group-id'))
@@ -96,13 +99,13 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			throw bpmnError
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
 		}
 	}
 
 	/**
 	 * Prepare and send the synchronous response.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void sendSynchResponse(Execution execution) {
@@ -111,7 +114,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
 			def requestId = execution.getVariable('UPDVfModVol_requestId')
@@ -125,9 +128,9 @@ class UpdateVfModuleVolume extends VfModuleBase {
 				startTime = System.currentTimeMillis()
 			}
 			def volumeInputs = execution.getVariable('UPDVfModVol_volumeInputs')
-			
+
 			String synchResponse = """
-				<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+				<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

 					<request-info>
 						<request-id>${requestId}</request-id>
 						<action>UPDATE_VF_MODULE_VOL</action>
@@ -147,14 +150,14 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in sendSynchResponse(): ' + e.getMessage())
-		}		
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in sendSynchResponse(): ' + e.getMessage())
+		}
 	}
-	
+
 	/**
 	 * Prepare a Request for querying AAI for Volume Group information using the
 	 * Volume Group Id and Aic Cloud Region.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void queryAAIForVolumeGroup(Execution execution) {
@@ -173,7 +176,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 
 			logDebug('Sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
 			utils.logAudit("UpdateVfModuleVolume sending GET for quering AAI endpoint: " + endPoint)
-			
+
 			AaiUtil aaiUtil = new AaiUtil(this)
 			APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)
 			def int statusCode = response.getStatusCode()
@@ -181,7 +184,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			logDebug('Response code:' + statusCode, isDebugLogEnabled)
 			logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)
 			utils.logAudit("UpdateVfModuleVolume response data: " + responseData)
-			
+
 			def volumeGroup = responseData
 			def heatStackId = getNodeTextForce(volumeGroup, 'heat-stack-id')
 			execution.setVariable('UPDVfModVol_volumeGroupHeatStackId', heatStackId)
@@ -205,10 +208,10 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in queryAAIForVolumeGroup(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIForVolumeGroup(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare a Request for invoking the VnfAdapterRest subflow to do
 	 * a Volume Group update.
@@ -221,22 +224,22 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')
 			def tenantId = execution.getVariable('UPDVfModVol_tenantId')
 			def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')
 			def volumeGroupHeatStackId = execution.getVariable('UPDVfModVol_volumeGroupHeatStackId')
 			def vnfType = execution.getVariable('UPDVfModVol_vnfType')
-			
+
 			def volumeParamsXml = execution.getVariable('UPDVfModVol_volumeParams')
 			def volumeGroupParams = transformParamsToEntries(volumeParamsXml)
-			
+
 			def requestId = execution.getVariable('UPDVfModVol_requestId')
 			def serviceId = execution.getVariable('UPDVfModVol_serviceId')
-			
-			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()
-			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId) 
+
+			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()

+			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
 			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
 			if ('true'.equals(useQualifiedHostName)) {
 					notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
@@ -266,17 +269,17 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
 			execution.setVariable('UPDVfModVol_vnfAdapterRestRequest', vnfAdapterRestRequest)
 			logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)
-			
+
 			utils.logAudit("UpdateVfModuleVolume Request for VNFAdapter Rest: " + vnfAdapterRestRequest)
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Prepare a Request for updating the DB for this Infra request.
 	 *
@@ -291,10 +294,10 @@ class UpdateVfModuleVolume extends VfModuleBase {
 
 		try {
 			def requestId = execution.getVariable('UPDVfMod_requestId')
-			
+
 			String updateInfraRequest = """
 				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:req="http://org.openecomp.mso/requestsdb">
+						xmlns:req="http://org.openecomp.mso/requestsdb">

 					<soapenv:Header/>
 					<soapenv:Body>
 						<req:updateInfraRequest>
@@ -310,20 +313,20 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			updateInfraRequest = utils.formatXml(updateInfraRequest)
 			execution.setVariable('UPDVfModVol_updateInfraRequest', updateInfraRequest)
 			logDebug('Request for Update Infra Request:\n' + updateInfraRequest, isDebugLogEnabled)
-			
+
 			utils.logAudit("UpdateVfModuleVolume Request for Updating DB for Infra: " + updateInfraRequest)
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepDbInfraDbRequest(): ' + e.getMessage())
+			exceptionUtil.buildWorkflowException(execution, 1002, 'Error in prepDbInfraDbRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Build a "CompletionHandler" request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepCompletionHandlerRequest(Execution execution) {
@@ -332,13 +335,13 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		try {
 			def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
 
 			String content = """
-				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">
+				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">

 					${requestInfo}
 					<sdncadapterworkflow:mso-bpel-name>MSO_ACTIVATE_BPEL</sdncadapterworkflow:mso-bpel-name>
 				</sdncadapterworkflow:MsoCompletionRequest>
@@ -348,19 +351,19 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			logDebug('Request for Completion Handler:\n' + content, isDebugLogEnabled)
 			utils.logAudit("UpdateVfModuleVolume Completion Handler request: " + content)
 			execution.setVariable('UPDVfModVol_CompletionHandlerRequest', content)
-			
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepCompletionHandlerRequest(): ' + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepCompletionHandlerRequest(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Build a "FalloutHandler" request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void prepFalloutHandler(Execution execution) {
@@ -372,7 +375,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 
 		try {
 			def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
-			
+
 			def WorkflowException workflowException = execution.getVariable("WorkflowException")
 			def errorResponseCode = workflowException.getErrorCode()
 			def errorResponseMsg = workflowException.getErrorMessage()
@@ -382,35 +385,35 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			}
 
 			String content = """
-				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
+				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

 					${requestInfo}
 					<sdncadapterworkflow:WorkflowException>
 						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
 						<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
-					</sdncadapterworkflow:WorkflowException>	
+					</sdncadapterworkflow:WorkflowException>
 				</sdncadapterworkflow:FalloutHandlerRequest>
 			"""
 			content = utils.formatXml(content)
 			logDebug('Request for Fallout Handler:\n' + content, isDebugLogEnabled)
 			utils.logAudit("UpdateVfModuleVolume Fallout request: " + content)
 			execution.setVariable('UPDVfModVol_FalloutHandlerRequest', content)
-			
+
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
 			logError('Caught exception in ' + method, e)
-			createWorkflowException(execution, 1002, 'Error in prepFalloutHandler(): ' + e.getMessage())
+			exceptionUtil.buildWorkflowException(execution, 1002, 'Error in prepFalloutHandler(): ' + e.getMessage())
 		}
 	}
-	
+
 	/**
 	 * Create a WorkflowException for the error case where the Tenant Id from
 	 * AAI did not match the Tenant Id in the incoming request.
-	 * 
+	 *
 	 * @param execution The flow's execution instance.
 	 */
 	public void handleTenantIdMismatch(Execution execution) {
@@ -419,21 +422,21 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			')'
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		logDebug('Entered ' + method, isDebugLogEnabled)
-		
+
 		String processKey = getProcessKey(execution);
 		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')
 		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')
 		def tenantId = execution.getVariable('UPDVfModVol_tenantId')
 		def volumeGroupTenantId = execution.getVariable('UPDVfModVol_volumeGroupTenantId')
-		
+
 		def String errorMessage = 'TenantId \'' + tenantId + '\' in incoming request does not match Tenant Id \'' + volumeGroupTenantId +
 			'\' retrieved from AAI for Volume Group Id \'' + volumeGroupId + '\', AIC Cloud Region \'' + aicCloudRegion + '\''
-			
+
 		logError('Error in UpdateVfModuleVol: ' + errorMessage)
-		
+
 		WorkflowException exception = new WorkflowException(processKey, 5000, errorMessage);
 		execution.setVariable("WorkflowException", exception);
-		
+
 		logDebug('Exited ' + method, isDebugLogEnabled)
 		utils.logAudit("UpdateVfModuleVolume workflowException in Tenant Mismatch: " + errorMessage)
 	}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
index 2f716f5..ffe122a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolumeInfraV1.groovy
@@ -1,549 +1,549 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.infrastructure.scripts
-
-import groovy.json.JsonSlurper
-
-import java.util.concurrent.ExecutionException;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.springframework.web.util.UriUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
-import org.openecomp.mso.bpmn.common.scripts.VfModuleBase;
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse
-import org.openecomp.mso.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
-
-class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {
-	
-	/**
-	 * Initialize the flow's variables.
-	 * 
-	 * @param execution The flow's execution instance.
-	 */
-	private void initProcessVariables(Execution execution) {
-		execution.setVariable('prefix', 'UPDVfModVol_')
-		execution.setVariable('UPDVfModVol_Request', null)
-		execution.setVariable('UPDVfModVol_requestInfo', null)
-		execution.setVariable('UPDVfModVol_requestId', null)
-		execution.setVariable('UPDVfModVol_source', null)
-		execution.setVariable('UPDVfModVol_volumeInputs', null)
-		execution.setVariable('UPDVfModVol_volumeGroupId', null)
-		execution.setVariable('UPDVfModVol_vnfType', null)
-		execution.setVariable('UPDVfModVol_serviceId', null)
-		execution.setVariable('UPDVfModVol_aicCloudRegion', null)
-		execution.setVariable('UPDVfModVol_tenantId', null)
-		execution.setVariable('UPDVfModVol_volumeParams', null)
-		execution.setVariable('UPDVfModVol_volumeGroupHeatStackId', null)
-		execution.setVariable('UPDVfModVol_volumeGroupTenantId', null)
-		execution.setVariable('UpdateVfModuleVolumeSuccessIndicator', false)
-	}
-	
-
-	/**
-	 * Perform initial processing, such as request validation, initialization of variables, etc.
-	 * * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		preProcessRequest(execution, isDebugEnabled)
-	}
-	
-	public void preProcessRequest(Execution execution, isDebugLogEnabled) {
-
-		initProcessVariables(execution)
-		String jsonRequest = validateRequest(execution)
-		
-		def request = ""
-		
-		try {
-			def jsonSlurper = new JsonSlurper()
-			Map reqMap = jsonSlurper.parseText(jsonRequest)
-			
-			def serviceInstanceId = execution.getVariable('serviceInstanceId')
-			def volumeGroupId = execution.getVariable('volumeGroupId')
-			//def vnfId = execution.getVariable('vnfId')
-			
-			def vidUtils = new VidUtils(this)
-			request = vidUtils.createXmlVolumeRequest(reqMap, 'UPDATE_VF_MODULE_VOL', serviceInstanceId, volumeGroupId)
-			
-			execution.setVariable('UPDVfModVol_Request', request)
-			execution.setVariable("UPDVfModVol_isVidRequest", true)
-			
-			//need to get persona-model-id aka model-invariantId to use later to validate vf-module relation in AAI
-			
-			def modelInvariantId = reqMap.requestDetails.modelInfo.modelInvariantId ?: ''
-			execution.setVariable('UPDVfModVol_modelInvariantId', modelInvariantId)
-		
-			utils.log("DEBUG", "XML request:\n" + request, isDebugLogEnabled)
-		}
-		catch(groovy.json.JsonException je) {
-			utils.log("DEBUG", " Request is in XML format.", isDebugLogEnabled)
-			// assume request is in XML format - proceed as usual to process XML request
-		}
-		
-		def requestId = execution.getVariable('mso-request-id')
-		
-		def requestInfo = getRequiredNodeXml(execution, request, 'request-info')
-		execution.setVariable('UPDVfModVol_requestInfo', requestInfo)
-		execution.setVariable('UPDVfModVol_requestId', requestId)
-		//execution.setVariable('UPDVfModVol_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
-		execution.setVariable('UPDVfModVol_source', getNodeTextForce(requestInfo, 'source'))
-		
-		def volumeInputs = getRequiredNodeXml(execution, request, 'volume-inputs')
-		execution.setVariable('UPDVfModVol_volumeInputs', volumeInputs)
-		execution.setVariable('UPDVfModVol_volumeGroupId', getRequiredNodeText(execution, volumeInputs, 'volume-group-id'))
-		execution.setVariable('UPDVfModVol_vnfType', getRequiredNodeText(execution, volumeInputs, 'vnf-type'))
-		execution.setVariable('UPDVfModVol_vnfVersion', getRequiredNodeText(execution, volumeInputs, 'asdc-service-model-version'))
-		execution.setVariable('UPDVfModVol_serviceId', getRequiredNodeText(execution, volumeInputs, 'service-id'))
-		execution.setVariable('UPDVfModVol_aicCloudRegion', getRequiredNodeText(execution, volumeInputs, 'aic-cloud-region'))
-		execution.setVariable('UPDVfModVol_tenantId', getRequiredNodeText(execution, volumeInputs, 'tenant-id'))
-		//execution.setVariable('UPDVfModVol_modelCustomizationId', getRequiredNodeText(execution, volumeInputs, 'model-customization-id'))
-
-		try {
-			// Catalog DB headers Authorization
-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)
-			
-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
-		} catch (IOException ex) {
-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-		def volumeParams = utils.getNodeXml(request, 'volume-params')
-		execution.setVariable('UPDVfModVol_volumeParams', volumeParams)
-	}
-
-	/**
-	 * Prepare and send the synchronous response.
-	 * 
-	 * @param execution The flow's execution instance.
-	 */
-	public void sendSynchResponse(Execution execution, isDebugLogEnabled) {
-
-		def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
-		def requestId = execution.getVariable('UPDVfModVol_requestId')
-		def source = execution.getVariable('UPDVfModVol_source')
-		def progress = getNodeTextForce(requestInfo, 'progress')
-		if (progress.isEmpty()) {
-			progress = '0'
-		}
-		def startTime = getNodeTextForce(requestInfo, 'start-time')
-		if (startTime.isEmpty()) {
-			startTime = System.currentTimeMillis()
-		}
-		def volumeInputs = execution.getVariable('UPDVfModVol_volumeInputs')
-		
-		String xmlSyncResponse = """
-			<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-				<request-info>
-					<request-id>${requestId}</request-id>
-					<action>UPDATE_VF_MODULE_VOL</action>
-					<request-status>IN_PROGRESS</request-status>
-					<progress>${progress}</progress>
-					<start-time>${startTime}</start-time>
-					<source>${source}</source>
-				</request-info>
-				${volumeInputs}
-			</volume-request>
-		"""
-
-		def syncResponse = ''
-		def isVidRequest = execution.getVariable('UPDVfModVol_isVidRequest')
-		
-		if(isVidRequest) {
-			def volumeGroupId = execution.getVariable('volumeGroupId')
-			syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()
-		} 
-		else {
-			syncResponse = utils.formatXml(xmlSyncResponse)
-		}
-		
-		logDebug('Sync response: ' + syncResponse, isDebugLogEnabled)
-		execution.setVariable('UPDVfModVol_syncResponseSent', true)
-		sendWorkflowResponse(execution, 200, syncResponse)
-	}
-	
-	/**
-	 * Prepare a Request for querying AAI for Volume Group information using the
-	 * Volume Group Id and Aic Cloud Region.
-	 * @param execution The flow's execution instance.
-	 */
-	public void queryAAIForVolumeGroup(Execution execution, isDebugLogEnabled) {
-
-		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')
-		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')
-
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)
-		String queryAAIVolumeGroupRequest = aaiEndpoint + '/' + URLEncoder.encode(aicCloudRegion, "UTF-8") + "/volume-groups/volume-group/" + UriUtils.encode(volumeGroupId, "UTF-8")
-		
-		utils.logAudit('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest)
-		logDebug('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest, isDebugLogEnabled)
-		
-		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVolumeGroupRequest)
-		
-		String returnCode = response.getStatusCode()
-		String aaiResponseAsString = response.getResponseBodyAsString()
-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-		
-		utils.logAudit("AAI query volume group by id return code: " + returnCode)
-		utils.logAudit("AAI query volume group by id response: " + aaiResponseAsString)
-		
-		logDebug("AAI Volume Group return code: " + returnCode, isDebugLogEnabled)
-		logDebug("AAI Volume Group response: " + aaiResponseAsString, isDebugLogEnabled)
-		
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		
-		if ((returnCode == '200') || (returnCode == '204')) {
-			
-			execution.setVariable('UPDVfModVol_aaiVolumeGroupResponse', aaiResponseAsString)
-			//def heatStackId = getNodeTextForce(aaiResponseAsString, 'heat-stack-id')
-			//execution.setVariable('UPDVfModVol_volumeGroupHeatStackId', heatStackId)
-			
-			def volumeGroupTenantId = getTenantIdFromVolumeGroup(aaiResponseAsString)
-			if (volumeGroupTenantId == null) {
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Could not find Tenant Id element in Volume Group with Volume Group Id " + volumeGroupId
-					+ ", AIC Cloud Region " + aicCloudRegion)
-			}
-			execution.setVariable('UPDVfModVol_volumeGroupTenantId', volumeGroupTenantId)
-			logDebug("Received Tenant Id " + volumeGroupTenantId + " from AAI for Volume Group with Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion, isDebugLogEnabled)
-
-			def relatedVfModuleLink = getRelatedVfModuleRelatedLink(aaiResponseAsString)
-			logDebug("Related VF Module link: " + relatedVfModuleLink, isDebugLogEnabled)
-			execution.setVariable('UPDVfModVol_relatedVfModuleLink', relatedVfModuleLink)
-			
-		} 
-		else if (returnCode == '404') {
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group " + volumeGroupId + " not found at AAI")
-		} 
-		else {
-			WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-			throw new BpmnError("MSOWorkflowException")
-		}
-	}
-	
-	/**
-	 * Query AAI service instance
-	 * @param execution
-	 * @param isDebugEnabled
-	 */
-	public void queryAAIForGenericVnf(Execution execution, isDebugEnabled) {
-		
-		def vnfId = execution.getVariable('vnfId')
-		
-		AaiUtil aaiUtil = new AaiUtil(this)
-		String aaiEndpoint = aaiUtil.getNetworkGenericVnfEndpoint(execution)
-		def String queryAAIRequest = aaiEndpoint + "/" + UriUtils.encode(vnfId, "UTF-8")
-		
-		utils.logAudit("AAI query generic vnf request: " + queryAAIRequest)
-		
-		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)
-		
-		String returnCode = response.getStatusCode()
-		String aaiResponseAsString = response.getResponseBodyAsString()
-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-		
-		utils.logAudit("AAI query generic vnf return code: " + returnCode)
-		utils.logAudit("AAI query generic vnf response: " + aaiResponseAsString)
-
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		
-		if (returnCode=='200') {
-			utils.log("DEBUG", 'Generic vnf ' + vnfId + ' found in AAI.', isDebugEnabled)
-			execution.setVariable('UPDVfModVol_AAIQueryGenericVfnResponse', aaiResponseAsString)
-		} else {
-			if (returnCode=='404') {
-				def message = 'Generic vnf ' + vnfId + ' was not found in AAI. Return code: 404.'
-				utils.log("DEBUG", message, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)
-			} else {
-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		}
-	}
-	
-	/**
-	 * Query AAI for VF Module using vf-module-id
-	 * @param execution
-	 * @param isDebugLogEnabled
-	 */
-	public void queryAAIForVfModule(Execution execution, isDebugLogEnabled) {
-		
-			AaiUtil aaiUtil = new AaiUtil(this)
-			String queryAAIVfModuleRequest = execution.getVariable('UPDVfModVol_relatedVfModuleLink')
-			execution.setVariable('UPDVfModVol_personaModelId', '')
-			
-			utils.logAudit('Query AAI VF Module: ' + queryAAIVfModuleRequest)
-			logDebug('Query AAI VF Module: ' + queryAAIVfModuleRequest, isDebugLogEnabled)
-			
-			APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVfModuleRequest)
-			
-			String returnCode = response.getStatusCode()
-			String aaiResponseAsString = response.getResponseBodyAsString()
-			aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
-			
-			utils.logAudit("AAI query vf-module: " + returnCode)
-			utils.logAudit("AAI query vf-module response: " + aaiResponseAsString)
-			
-			logDebug("AAI query vf-module:: " + returnCode, isDebugLogEnabled)
-			logDebug("AAI query vf-module response: " + aaiResponseAsString, isDebugLogEnabled)
-			
-			ExceptionUtil exceptionUtil = new ExceptionUtil()
-			
-			if ((returnCode == '200') || (returnCode == '204')) {
-				def personaModelId =  utils.getNodeText1(aaiResponseAsString, 'persona-model-id')
-				execution.setVariable('UPDVfModVol_personaModelId', personaModelId)
-			}
-			else if (returnCode == '404') {
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "VF Module not found at AAI")
-			}
-			else {
-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-				throw new BpmnError("MSOWorkflowException")
-			}
-		}
-	/**
-	 * 
-	 */
-	public String getRelatedVfModuleRelatedLink(xml) {
-		def list = new XmlSlurper().parseText(xml)
-		def vfModuleRelationship = list.'**'.find { node -> node.'related-to'.text() == 'vf-module'	}
-		return vfModuleRelationship?.'related-link'?.text() ?: ''
-	}
-	
-	/**
-	 * Prepare a Request for invoking the VnfAdapterRest subflow to do
-	 * a Volume Group update.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepVnfAdapterRest(Execution execution, isDebugLogEnabled) {
-		
-		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')
-		def tenantId = execution.getVariable('UPDVfModVol_tenantId')
-		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')
-		
-		def aaiVolumeGroupResponse = execution.getVariable('UPDVfModVol_aaiVolumeGroupResponse')
-		def volumeGroupHeatStackId = getNodeTextForce(aaiVolumeGroupResponse, 'heat-stack-id')
-		def volumeGroupName = getNodeTextForce(aaiVolumeGroupResponse, 'volume-group-name')
-		def modelCustomizationId = getNodeTextForce(aaiVolumeGroupResponse, 'vf-module-persona-model-customization-id')
-		
-		def vnfType = execution.getVariable('UPDVfModVol_vnfType')
-		def vnfVersion = execution.getVariable('UPDVfModVol_vnfVersion')
-		
-		def aaiGenericVnfResponse = execution.getVariable('UPDVfModVol_AAIQueryGenericVfnResponse')
-		def vnfId = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-id')
-		def vnfName = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-name')
-
-		
-		def volumeParamsXml = execution.getVariable('UPDVfModVol_volumeParams')
-		def volumeGroupParams = transformVolumeParamsToEntries(volumeParamsXml)
-		
-		def requestId = execution.getVariable('UPDVfModVol_requestId')
-		def serviceId = execution.getVariable('UPDVfModVol_serviceId')
-		
-		def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()
-		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
-		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
-		if ('true'.equals(useQualifiedHostName)) {
-				notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
-		}
-
-		String vnfAdapterRestRequest = """
-			<updateVolumeGroupRequest>
-				<cloudSiteId>${aicCloudRegion}</cloudSiteId>
-				<tenantId>${tenantId}</tenantId>
-				<vnfId>${vnfId}</vnfId>
-				<vnfName>${vnfName}</vnfName>
-				<volumeGroupId>${volumeGroupId}</volumeGroupId>
-				<volumeGroupName>${volumeGroupName}</volumeGroupName>
-				<volumeGroupStackId>${volumeGroupHeatStackId}</volumeGroupStackId>
-				<vnfType>${vnfType}</vnfType>
-				<vnfVersion>${vnfVersion}</vnfVersion>
-				<vfModuleType></vfModuleType>
-				<modelCustomizationUuid>${modelCustomizationId}</modelCustomizationUuid>
-				<volumeGroupParams>
-					<entry>
-						<key>vnf_id</key>
-						<value>${vnfId}</value>
-					</entry>
-					<entry>
-						<key>vnf_name</key>
-						<value>${vnfName}</value>
-					</entry>
-					<entry>
-						<key>vf_module_id</key>
-						<value>${volumeGroupId}</value>
-					</entry>
-					<entry>
-						<key>vf_module_name</key>
-						<value>${volumeGroupName}</value>
-					</entry>
-					${volumeGroupParams}
-			    </volumeGroupParams>
-				<skipAAI>true</skipAAI>
-			    <msoRequest>
-			        <requestId>${requestId}</requestId>
-			        <serviceInstanceId>${serviceId}</serviceInstanceId>
-			    </msoRequest>
-			    <messageId>${messageId}</messageId>
-			    <notificationUrl>${notificationUrl}</notificationUrl>
-			</updateVolumeGroupRequest>
-		"""
-		vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
-		execution.setVariable('UPDVfModVol_vnfAdapterRestRequest', vnfAdapterRestRequest)
-		logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)
-	}
-	
-	/**
-	 * Prepare a Request for updating the DB for this Infra request.
-	 *
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepDbInfraDbRequest(Execution execution, isDebugLogEnabled) {
-
-		def requestId = execution.getVariable('UPDVfModVol_requestId')
-		
-		String updateInfraRequest = """
-			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-					xmlns:req="http://org.openecomp.mso/requestsdb">
-				<soapenv:Header/>
-				<soapenv:Body>
-					<req:updateInfraRequest>
-						<requestId>${requestId}</requestId>
-						<lastModifiedBy>BPEL</lastModifiedBy>
-						<requestStatus>COMPLETE</requestStatus>
-						<progress>100</progress>
-					</req:updateInfraRequest>
-				</soapenv:Body>
-			</soapenv:Envelope>
-		"""
-
-		updateInfraRequest = utils.formatXml(updateInfraRequest)
-		execution.setVariable('UPDVfModVol_updateInfraRequest', updateInfraRequest)
-		logDebug('Request for Update Infra Request:\n' + updateInfraRequest, isDebugLogEnabled)
-	}
-	
-	/**
-	 * Build a "CompletionHandler" request.
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepCompletionHandlerRequest(Execution execution, requestId, action, source, isDebugLogEnabled) {
-
-		String content = """
-		<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
-					xmlns:ns="http://org.openecomp/mso/request/types/v1">
-			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-				<request-id>${requestId}</request-id>
-				<action>CREATE</action>
-				<source>${source}</source>
-   			</request-info>
-   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: UPDATE</aetgt:mso-bpel-name>
-		</aetgt:MsoCompletionRequest>		
-		"""
-
-		content = utils.formatXml(content)
-		logDebug('Request for Completion Handler:\n' + content, isDebugLogEnabled)
-		execution.setVariable('UPDVfModVol_CompletionHandlerRequest', content)
-	}
-	
-
-	/**
-	 * Build a "FalloutHandler" request.
-	 * @param execution The flow's execution instance.
-	 */
-	public void prepFalloutHandler(Execution execution, isDebugLogEnabled) {
-		
-		def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
-		
-		def WorkflowException workflowException = execution.getVariable("WorkflowException")
-		def errorResponseCode = workflowException.getErrorCode()
-		def errorResponseMsg = workflowException.getErrorMessage()
-		def encErrorResponseMsg = ""
-		if (errorResponseMsg != null) {
-			encErrorResponseMsg = errorResponseMsg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
-		}
-
-		String content = """
-			<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-					xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
-					xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
-					xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
-				${requestInfo}
-				<sdncadapterworkflow:WorkflowException>
-					<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
-					<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>
-				</sdncadapterworkflow:WorkflowException>	
-			</sdncadapterworkflow:FalloutHandlerRequest>
-		"""
-		content = utils.formatXml(content)
-		logDebug('Request for Fallout Handler:\n' + content, isDebugLogEnabled)
-		execution.setVariable('UPDVfModVol_FalloutHandlerRequest', content)
-	}
-	
-	/**
-	 * Create a WorkflowException for the error case where the Tenant Id from
-	 * AAI did not match the Tenant Id in the incoming request.
-	 * @param execution The flow's execution instance.
-	 */
-	public void handleTenantIdMismatch(Execution execution, isDebugLogEnabled) {
-		
-		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')
-		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')
-		def tenantId = execution.getVariable('UPDVfModVol_tenantId')
-		def volumeGroupTenantId = execution.getVariable('UPDVfModVol_volumeGroupTenantId')
-		
-		def String errorMessage = "TenantId " + tenantId + " in incoming request does not match Tenant Id " + volumeGroupTenantId +
-			" retrieved from AAI for Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion 
-		
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		logError('Error in UpdateVfModuleVol: ' + errorMessage)
-		exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
-	}
-	
-	/**
-	 * Create a WorkflowException for the error case where the Personal Model Id from
-	 * AAI did not match the model invariant ID in the incoming request.
-	 * @param execution The flow's execution instance.
-	 */
-	public void handlePersonaModelIdMismatch(Execution execution, isDebugLogEnabled) {
-		
-		def modelInvariantId = execution.getVariable('UPDVfModVol_modelInvariantId')
-		def personaModelId = execution.getVariable('UPDVfModVol_personaModelId')
-		
-		def String errorMessage = "Model Invariant ID " + modelInvariantId + " in incoming request does not match persona model ID " + personaModelId +
-			" retrieved from AAI for Volume Group Id "
-		
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		logError('Error in UpdateVfModuleVol: ' + errorMessage)
-		exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
-	}
-	
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 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.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.infrastructure.scripts

+

+import groovy.json.JsonSlurper

+

+import java.util.concurrent.ExecutionException;

+

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution

+import org.apache.commons.lang3.*

+import org.springframework.web.util.UriUtils

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

+import org.openecomp.mso.bpmn.common.scripts.VfModuleBase;

+import org.openecomp.mso.bpmn.common.scripts.VidUtils;

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse

+import org.openecomp.mso.rest.RESTClient

+import org.openecomp.mso.rest.RESTConfig

+

+class UpdateVfModuleVolumeInfraV1 extends VfModuleBase {

+	

+	/**

+	 * Initialize the flow's variables.

+	 * 

+	 * @param execution The flow's execution instance.

+	 */

+	private void initProcessVariables(Execution execution) {

+		execution.setVariable('prefix', 'UPDVfModVol_')

+		execution.setVariable('UPDVfModVol_Request', null)

+		execution.setVariable('UPDVfModVol_requestInfo', null)

+		execution.setVariable('UPDVfModVol_requestId', null)

+		execution.setVariable('UPDVfModVol_source', null)

+		execution.setVariable('UPDVfModVol_volumeInputs', null)

+		execution.setVariable('UPDVfModVol_volumeGroupId', null)

+		execution.setVariable('UPDVfModVol_vnfType', null)

+		execution.setVariable('UPDVfModVol_serviceId', null)

+		execution.setVariable('UPDVfModVol_aicCloudRegion', null)

+		execution.setVariable('UPDVfModVol_tenantId', null)

+		execution.setVariable('UPDVfModVol_volumeParams', null)

+		execution.setVariable('UPDVfModVol_volumeGroupHeatStackId', null)

+		execution.setVariable('UPDVfModVol_volumeGroupTenantId', null)

+		execution.setVariable('UpdateVfModuleVolumeSuccessIndicator', false)

+	}

+	

+

+	/**

+	 * Perform initial processing, such as request validation, initialization of variables, etc.

+	 * * @param execution

+	 */

+	public void preProcessRequest (Execution execution) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		preProcessRequest(execution, isDebugEnabled)

+	}

+	

+	public void preProcessRequest(Execution execution, isDebugLogEnabled) {

+

+		initProcessVariables(execution)

+		String jsonRequest = validateRequest(execution)

+		

+		def request = ""

+		

+		try {

+			def jsonSlurper = new JsonSlurper()

+			Map reqMap = jsonSlurper.parseText(jsonRequest)

+			

+			def serviceInstanceId = execution.getVariable('serviceInstanceId')

+			def volumeGroupId = execution.getVariable('volumeGroupId')

+			//def vnfId = execution.getVariable('vnfId')

+			

+			def vidUtils = new VidUtils(this)

+			request = vidUtils.createXmlVolumeRequest(reqMap, 'UPDATE_VF_MODULE_VOL', serviceInstanceId, volumeGroupId)

+			

+			execution.setVariable('UPDVfModVol_Request', request)

+			execution.setVariable("UPDVfModVol_isVidRequest", true)

+			

+			//need to get persona-model-id aka model-invariantId to use later to validate vf-module relation in AAI

+			

+			def modelInvariantId = reqMap.requestDetails.modelInfo.modelInvariantId ?: ''

+			execution.setVariable('UPDVfModVol_modelInvariantId', modelInvariantId)

+		

+			utils.log("DEBUG", "XML request:\n" + request, isDebugLogEnabled)

+		}

+		catch(groovy.json.JsonException je) {

+			utils.log("DEBUG", " Request is in XML format.", isDebugLogEnabled)

+			// assume request is in XML format - proceed as usual to process XML request

+		}

+		

+		def requestId = execution.getVariable('mso-request-id')

+		

+		def requestInfo = getRequiredNodeXml(execution, request, 'request-info')

+		execution.setVariable('UPDVfModVol_requestInfo', requestInfo)

+		execution.setVariable('UPDVfModVol_requestId', requestId)

+		//execution.setVariable('UPDVfModVol_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))

+		execution.setVariable('UPDVfModVol_source', getNodeTextForce(requestInfo, 'source'))

+		

+		def volumeInputs = getRequiredNodeXml(execution, request, 'volume-inputs')

+		execution.setVariable('UPDVfModVol_volumeInputs', volumeInputs)

+		execution.setVariable('UPDVfModVol_volumeGroupId', getRequiredNodeText(execution, volumeInputs, 'volume-group-id'))

+		execution.setVariable('UPDVfModVol_vnfType', getRequiredNodeText(execution, volumeInputs, 'vnf-type'))

+		execution.setVariable('UPDVfModVol_vnfVersion', getRequiredNodeText(execution, volumeInputs, 'asdc-service-model-version'))

+		execution.setVariable('UPDVfModVol_serviceId', utils.getNodeText1(volumeInputs, 'service-id'))

+		execution.setVariable('UPDVfModVol_aicCloudRegion', getRequiredNodeText(execution, volumeInputs, 'aic-cloud-region'))

+		execution.setVariable('UPDVfModVol_tenantId', getRequiredNodeText(execution, volumeInputs, 'tenant-id'))

+		//execution.setVariable('UPDVfModVol_modelCustomizationId', getRequiredNodeText(execution, volumeInputs, 'model-customization-id'))

+

+		try {

+			// Catalog DB headers Authorization

+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)

+			

+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

+		} catch (IOException ex) {

+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

+			utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

+		}

+		def volumeParams = utils.getNodeXml(request, 'volume-params')

+		execution.setVariable('UPDVfModVol_volumeParams', volumeParams)

+	}

+

+	/**

+	 * Prepare and send the synchronous response.

+	 * 

+	 * @param execution The flow's execution instance.

+	 */

+	public void sendSynchResponse(Execution execution, isDebugLogEnabled) {

+

+		def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')

+		def requestId = execution.getVariable('UPDVfModVol_requestId')

+		def source = execution.getVariable('UPDVfModVol_source')

+		def progress = getNodeTextForce(requestInfo, 'progress')

+		if (progress.isEmpty()) {

+			progress = '0'

+		}

+		def startTime = getNodeTextForce(requestInfo, 'start-time')

+		if (startTime.isEmpty()) {

+			startTime = System.currentTimeMillis()

+		}

+		def volumeInputs = execution.getVariable('UPDVfModVol_volumeInputs')

+		

+		String xmlSyncResponse = """

+			<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+				<request-info>

+					<request-id>${requestId}</request-id>

+					<action>UPDATE_VF_MODULE_VOL</action>

+					<request-status>IN_PROGRESS</request-status>

+					<progress>${progress}</progress>

+					<start-time>${startTime}</start-time>

+					<source>${source}</source>

+				</request-info>

+				${volumeInputs}

+			</volume-request>

+		"""

+

+		def syncResponse = ''

+		def isVidRequest = execution.getVariable('UPDVfModVol_isVidRequest')

+		

+		if(isVidRequest) {

+			def volumeGroupId = execution.getVariable('volumeGroupId')

+			syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()

+		} 

+		else {

+			syncResponse = utils.formatXml(xmlSyncResponse)

+		}

+		

+		logDebug('Sync response: ' + syncResponse, isDebugLogEnabled)

+		execution.setVariable('UPDVfModVol_syncResponseSent', true)

+		sendWorkflowResponse(execution, 200, syncResponse)

+	}

+	

+	/**

+	 * Prepare a Request for querying AAI for Volume Group information using the

+	 * Volume Group Id and Aic Cloud Region.

+	 * @param execution The flow's execution instance.

+	 */

+	public void queryAAIForVolumeGroup(Execution execution, isDebugLogEnabled) {

+

+		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')

+		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')

+

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aaiEndpoint = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(execution)

+		String queryAAIVolumeGroupRequest = aaiEndpoint + '/' + URLEncoder.encode(aicCloudRegion, "UTF-8") + "/volume-groups/volume-group/" + UriUtils.encode(volumeGroupId, "UTF-8")

+		

+		utils.logAudit('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest)

+		logDebug('Query AAI volume group by ID: ' + queryAAIVolumeGroupRequest, isDebugLogEnabled)

+		

+		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVolumeGroupRequest)

+		

+		String returnCode = response.getStatusCode()

+		String aaiResponseAsString = response.getResponseBodyAsString()

+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+		

+		utils.logAudit("AAI query volume group by id return code: " + returnCode)

+		utils.logAudit("AAI query volume group by id response: " + aaiResponseAsString)

+		

+		logDebug("AAI Volume Group return code: " + returnCode, isDebugLogEnabled)

+		logDebug("AAI Volume Group response: " + aaiResponseAsString, isDebugLogEnabled)

+		

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		

+		if ((returnCode == '200') || (returnCode == '204')) {

+			

+			execution.setVariable('UPDVfModVol_aaiVolumeGroupResponse', aaiResponseAsString)

+			//def heatStackId = getNodeTextForce(aaiResponseAsString, 'heat-stack-id')

+			//execution.setVariable('UPDVfModVol_volumeGroupHeatStackId', heatStackId)

+			

+			def volumeGroupTenantId = getTenantIdFromVolumeGroup(aaiResponseAsString)

+			if (volumeGroupTenantId == null) {

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Could not find Tenant Id element in Volume Group with Volume Group Id " + volumeGroupId

+					+ ", AIC Cloud Region " + aicCloudRegion)

+			}

+			execution.setVariable('UPDVfModVol_volumeGroupTenantId', volumeGroupTenantId)

+			logDebug("Received Tenant Id " + volumeGroupTenantId + " from AAI for Volume Group with Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion, isDebugLogEnabled)

+

+			def relatedVfModuleLink = getRelatedVfModuleRelatedLink(aaiResponseAsString)

+			logDebug("Related VF Module link: " + relatedVfModuleLink, isDebugLogEnabled)

+			execution.setVariable('UPDVfModVol_relatedVfModuleLink', relatedVfModuleLink)

+			

+		} 

+		else if (returnCode == '404') {

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Volume Group " + volumeGroupId + " not found at AAI")

+		} 

+		else {

+			WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+			throw new BpmnError("MSOWorkflowException")

+		}

+	}

+	

+	/**

+	 * Query AAI service instance

+	 * @param execution

+	 * @param isDebugEnabled

+	 */

+	public void queryAAIForGenericVnf(Execution execution, isDebugEnabled) {

+		

+		def vnfId = execution.getVariable('vnfId')

+		

+		AaiUtil aaiUtil = new AaiUtil(this)

+		String aaiEndpoint = aaiUtil.getNetworkGenericVnfEndpoint(execution)

+		def String queryAAIRequest = aaiEndpoint + "/" + UriUtils.encode(vnfId, "UTF-8")

+		

+		utils.logAudit("AAI query generic vnf request: " + queryAAIRequest)

+		

+		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)

+		

+		String returnCode = response.getStatusCode()

+		String aaiResponseAsString = response.getResponseBodyAsString()

+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+		

+		utils.logAudit("AAI query generic vnf return code: " + returnCode)

+		utils.logAudit("AAI query generic vnf response: " + aaiResponseAsString)

+

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		

+		if (returnCode=='200') {

+			utils.log("DEBUG", 'Generic vnf ' + vnfId + ' found in AAI.', isDebugEnabled)

+			execution.setVariable('UPDVfModVol_AAIQueryGenericVfnResponse', aaiResponseAsString)

+		} else {

+			if (returnCode=='404') {

+				def message = 'Generic vnf ' + vnfId + ' was not found in AAI. Return code: 404.'

+				utils.log("DEBUG", message, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)

+			} else {

+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		}

+	}

+	

+	/**

+	 * Query AAI for VF Module using vf-module-id

+	 * @param execution

+	 * @param isDebugLogEnabled

+	 */

+	public void queryAAIForVfModule(Execution execution, isDebugLogEnabled) {

+		

+			AaiUtil aaiUtil = new AaiUtil(this)

+			String queryAAIVfModuleRequest = execution.getVariable('UPDVfModVol_relatedVfModuleLink')

+			execution.setVariable('UPDVfModVol_personaModelId', '')

+			

+			utils.logAudit('Query AAI VF Module: ' + queryAAIVfModuleRequest)

+			logDebug('Query AAI VF Module: ' + queryAAIVfModuleRequest, isDebugLogEnabled)

+			

+			APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIVfModuleRequest)

+			

+			String returnCode = response.getStatusCode()

+			String aaiResponseAsString = response.getResponseBodyAsString()

+			aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

+			

+			utils.logAudit("AAI query vf-module: " + returnCode)

+			utils.logAudit("AAI query vf-module response: " + aaiResponseAsString)

+			

+			logDebug("AAI query vf-module:: " + returnCode, isDebugLogEnabled)

+			logDebug("AAI query vf-module response: " + aaiResponseAsString, isDebugLogEnabled)

+			

+			ExceptionUtil exceptionUtil = new ExceptionUtil()

+			

+			if ((returnCode == '200') || (returnCode == '204')) {

+				def personaModelId =  utils.getNodeText1(aaiResponseAsString, 'persona-model-id')

+				execution.setVariable('UPDVfModVol_personaModelId', personaModelId)

+			}

+			else if (returnCode == '404') {

+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "VF Module not found at AAI")

+			}

+			else {

+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

+				throw new BpmnError("MSOWorkflowException")

+			}

+		}

+	/**

+	 * 

+	 */

+	public String getRelatedVfModuleRelatedLink(xml) {

+		def list = new XmlSlurper().parseText(xml)

+		def vfModuleRelationship = list.'**'.find { node -> node.'related-to'.text() == 'vf-module'	}

+		return vfModuleRelationship?.'related-link'?.text() ?: ''

+	}

+	

+	/**

+	 * Prepare a Request for invoking the VnfAdapterRest subflow to do

+	 * a Volume Group update.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepVnfAdapterRest(Execution execution, isDebugLogEnabled) {

+		

+		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')

+		def tenantId = execution.getVariable('UPDVfModVol_tenantId')

+		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')

+		

+		def aaiVolumeGroupResponse = execution.getVariable('UPDVfModVol_aaiVolumeGroupResponse')

+		def volumeGroupHeatStackId = getNodeTextForce(aaiVolumeGroupResponse, 'heat-stack-id')

+		def volumeGroupName = getNodeTextForce(aaiVolumeGroupResponse, 'volume-group-name')

+		def modelCustomizationId = getNodeTextForce(aaiVolumeGroupResponse, 'vf-module-persona-model-customization-id')

+		

+		def vnfType = execution.getVariable('UPDVfModVol_vnfType')

+		def vnfVersion = execution.getVariable('UPDVfModVol_vnfVersion')

+		

+		def aaiGenericVnfResponse = execution.getVariable('UPDVfModVol_AAIQueryGenericVfnResponse')

+		def vnfId = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-id')

+		def vnfName = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-name')

+

+		

+		def volumeParamsXml = execution.getVariable('UPDVfModVol_volumeParams')

+		def volumeGroupParams = transformVolumeParamsToEntries(volumeParamsXml)

+		

+		def requestId = execution.getVariable('UPDVfModVol_requestId')

+		def serviceId = execution.getVariable('UPDVfModVol_serviceId')

+		

+		def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()

+		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)

+		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")

+		if ('true'.equals(useQualifiedHostName)) {

+				notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)

+		}

+

+		String vnfAdapterRestRequest = """

+			<updateVolumeGroupRequest>

+				<cloudSiteId>${aicCloudRegion}</cloudSiteId>

+				<tenantId>${tenantId}</tenantId>

+				<vnfId>${vnfId}</vnfId>

+				<vnfName>${vnfName}</vnfName>

+				<volumeGroupId>${volumeGroupId}</volumeGroupId>

+				<volumeGroupName>${volumeGroupName}</volumeGroupName>

+				<volumeGroupStackId>${volumeGroupHeatStackId}</volumeGroupStackId>

+				<vnfType>${vnfType}</vnfType>

+				<vnfVersion>${vnfVersion}</vnfVersion>

+				<vfModuleType></vfModuleType>

+				<modelCustomizationUuid>${modelCustomizationId}</modelCustomizationUuid>

+				<volumeGroupParams>

+					<entry>

+						<key>vnf_id</key>

+						<value>${vnfId}</value>

+					</entry>

+					<entry>

+						<key>vnf_name</key>

+						<value>${vnfName}</value>

+					</entry>

+					<entry>

+						<key>vf_module_id</key>

+						<value>${volumeGroupId}</value>

+					</entry>

+					<entry>

+						<key>vf_module_name</key>

+						<value>${volumeGroupName}</value>

+					</entry>

+					${volumeGroupParams}

+			    </volumeGroupParams>

+				<skipAAI>true</skipAAI>

+			    <msoRequest>

+			        <requestId>${requestId}</requestId>

+			        <serviceInstanceId>${serviceId}</serviceInstanceId>

+			    </msoRequest>

+			    <messageId>${messageId}</messageId>

+			    <notificationUrl>${notificationUrl}</notificationUrl>

+			</updateVolumeGroupRequest>

+		"""

+		vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)

+		execution.setVariable('UPDVfModVol_vnfAdapterRestRequest', vnfAdapterRestRequest)

+		logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)

+	}

+	

+	/**

+	 * Prepare a Request for updating the DB for this Infra request.

+	 *

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepDbInfraDbRequest(Execution execution, isDebugLogEnabled) {

+

+		def requestId = execution.getVariable('UPDVfModVol_requestId')

+		

+		String updateInfraRequest = """

+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

+					xmlns:req="http://org.openecomp.mso/requestsdb">

+				<soapenv:Header/>

+				<soapenv:Body>

+					<req:updateInfraRequest>

+						<requestId>${requestId}</requestId>

+						<lastModifiedBy>BPEL</lastModifiedBy>

+						<requestStatus>COMPLETE</requestStatus>

+						<progress>100</progress>

+					</req:updateInfraRequest>

+				</soapenv:Body>

+			</soapenv:Envelope>

+		"""

+

+		updateInfraRequest = utils.formatXml(updateInfraRequest)

+		execution.setVariable('UPDVfModVol_updateInfraRequest', updateInfraRequest)

+		logDebug('Request for Update Infra Request:\n' + updateInfraRequest, isDebugLogEnabled)

+	}

+	

+	/**

+	 * Build a "CompletionHandler" request.

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepCompletionHandlerRequest(Execution execution, requestId, action, source, isDebugLogEnabled) {

+

+		String content = """

+		<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

+					xmlns:ns="http://org.openecomp/mso/request/types/v1">

+			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+				<request-id>${requestId}</request-id>

+				<action>CREATE</action>

+				<source>${source}</source>

+   			</request-info>

+   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: UPDATE</aetgt:mso-bpel-name>

+		</aetgt:MsoCompletionRequest>		

+		"""

+

+		content = utils.formatXml(content)

+		logDebug('Request for Completion Handler:\n' + content, isDebugLogEnabled)

+		execution.setVariable('UPDVfModVol_CompletionHandlerRequest', content)

+	}

+	

+

+	/**

+	 * Build a "FalloutHandler" request.

+	 * @param execution The flow's execution instance.

+	 */

+	public void prepFalloutHandler(Execution execution, isDebugLogEnabled) {

+		

+		def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')

+		

+		def WorkflowException workflowException = execution.getVariable("WorkflowException")

+		def errorResponseCode = workflowException.getErrorCode()

+		def errorResponseMsg = workflowException.getErrorMessage()

+		def encErrorResponseMsg = ""

+		if (errorResponseMsg != null) {

+			encErrorResponseMsg = errorResponseMsg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")

+		}

+

+		String content = """

+			<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

+					xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

+					xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

+					xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

+				${requestInfo}

+				<sdncadapterworkflow:WorkflowException>

+					<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>

+					<sdncadapterworkflow:ErrorCode>${errorResponseCode}</sdncadapterworkflow:ErrorCode>

+				</sdncadapterworkflow:WorkflowException>	

+			</sdncadapterworkflow:FalloutHandlerRequest>

+		"""

+		content = utils.formatXml(content)

+		logDebug('Request for Fallout Handler:\n' + content, isDebugLogEnabled)

+		execution.setVariable('UPDVfModVol_FalloutHandlerRequest', content)

+	}

+	

+	/**

+	 * Create a WorkflowException for the error case where the Tenant Id from

+	 * AAI did not match the Tenant Id in the incoming request.

+	 * @param execution The flow's execution instance.

+	 */

+	public void handleTenantIdMismatch(Execution execution, isDebugLogEnabled) {

+		

+		def volumeGroupId = execution.getVariable('UPDVfModVol_volumeGroupId')

+		def aicCloudRegion = execution.getVariable('UPDVfModVol_aicCloudRegion')

+		def tenantId = execution.getVariable('UPDVfModVol_tenantId')

+		def volumeGroupTenantId = execution.getVariable('UPDVfModVol_volumeGroupTenantId')

+		

+		def String errorMessage = "TenantId " + tenantId + " in incoming request does not match Tenant Id " + volumeGroupTenantId +

+			" retrieved from AAI for Volume Group Id " + volumeGroupId + ", AIC Cloud Region " + aicCloudRegion 

+		

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		logError('Error in UpdateVfModuleVol: ' + errorMessage)

+		exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)

+	}

+	

+	/**

+	 * Create a WorkflowException for the error case where the Personal Model Id from

+	 * AAI did not match the model invariant ID in the incoming request.

+	 * @param execution The flow's execution instance.

+	 */

+	public void handlePersonaModelIdMismatch(Execution execution, isDebugLogEnabled) {

+		

+		def modelInvariantId = execution.getVariable('UPDVfModVol_modelInvariantId')

+		def personaModelId = execution.getVariable('UPDVfModVol_personaModelId')

+		

+		def String errorMessage = "Model Invariant ID " + modelInvariantId + " in incoming request does not match persona model ID " + personaModelId +

+			" retrieved from AAI for Volume Group Id "

+		

+		ExceptionUtil exceptionUtil = new ExceptionUtil()

+		logError('Error in UpdateVfModuleVol: ' + errorMessage)

+		exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)

+	}

+	

+}