Merge "Refactor homing flows for OOF/HPA"

7 files changed, 745 insertions, 706 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 503cdfd034..05c3fa2d5b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -50,704 +50,728 @@ import static org.apache.commons.lang3.StringUtils.*
  */
 public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 
-	private static final String DebugFlag = "isDebugLogEnabled"
-
-	String Prefix="CVRCS_"
-	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(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable("createVcpeServiceRequest", "")
-		execution.setVariable("globalSubscriberId", "")
-		execution.setVariable("serviceInstanceName", "")
-		execution.setVariable("msoRequestId", "")
-		execution.setVariable(Prefix+"VnfsCreatedCount", 0)
-		execution.setVariable("productFamilyId", "")
-		execution.setVariable("brgWanMacAddress", "")
-
-		//TODO
-		execution.setVariable("sdncVersion", "1707")
-	}
-
-	// **************************************************
-	//     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 (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside preProcessRequest CreateVcpeResCustService Request ***** ", isDebugEnabled)
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			//Config Inputs
-			String aaiDistDelay = execution.getVariable('URN_mso_workflow_aai_distribution_delay')
-			if (isBlank(aaiDistDelay)) {
-				msg = "URN_mso_workflow_aai_distribution_delay is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-			execution.setVariable("aaiDistDelay", aaiDistDelay)
-			utils.log("DEBUG","AAI distribution delay: " + aaiDistDelay, isDebugEnabled)
-
-			// check for incoming json message/input
-			String createVcpeServiceRequest = execution.getVariable("bpmnRequest")
-			utils.logAudit(createVcpeServiceRequest)
-			execution.setVariable("createVcpeServiceRequest", createVcpeServiceRequest);
-			println 'createVcpeServiceRequest - ' + createVcpeServiceRequest
-
-			// 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)
-
-			setBasicDBAuthHeader(execution, isDebugEnabled)
-			
-			String source = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.source")
-			if ((source == null) || (source.isEmpty())) {
-				source = "VID"
-			}
-			execution.setVariable("source", source)
-
-			// extract globalSubscriberId
-			String globalSubscriberId = jsonUtil.getJsonValue(createVcpeServiceRequest, "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(createVcpeServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
-
-			String suppressRollback = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.suppressRollback")
-			execution.setVariable("disableRollback", suppressRollback)
-			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
-
-			String productFamilyId = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.productFamilyId")
-			execution.setVariable("productFamilyId", productFamilyId)
-			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
-			
-			String subscriberInfo = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.subscriberInfo")
-			execution.setVariable("subscriberInfo", subscriberInfo)
-			utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)
-
-		  /*
-		  * Extracting User Parameters from incoming Request and converting into a Map
-		  */
-		  def jsonSlurper = new JsonSlurper()
-		  def jsonOutput = new JsonOutput()
-
-		  Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
-
  
-		  //InputParams
-		  def userParams = reqMap.requestDetails?.requestParameters?.userParams
-  
-		  Map<String, String> inputMap = [:]
-
-
-		  if (userParams) {
-				userParams.each {
-								userParam ->
-								if("BRG_WAN_MAC_Address".equals(userParam?.name)) {
-												execution.setVariable("brgWanMacAddress", userParam.value)
-												inputMap.put("BRG_WAN_MAC_Address", userParam.value)
-					}
-				}
-		  }
-
-		  utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-		  execution.setVariable("serviceInputParams", inputMap)
-
-			utils.log("DEBUG", "Incoming brgWanMacAddress is: " + execution.getVariable('brgWanMacAddress'), 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(Prefix+"requestInfo", requestInfo)
-
-			utils.log("DEBUG", " ***** Completed preProcessRequest CreateVcpeResCustService Request ***** ", isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex){
-			String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void sendSyncResponse(DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	// *******************************
-	//
-	// *******************************
-	public void prepareDecomposeService(DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareDecomposeService of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-			String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
-
-			//serviceModelInfo JSON string will be used as-is for DoCreateServiceInstance BB
-			String serviceModelInfo = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.modelInfo")
-			execution.setVariable("serviceModelInfo", serviceModelInfo)
-
-			utils.log("DEBUG", " ***** Completed prepareDecomposeService of CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareDecomposeService() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	// *******************************
-	//
-	// *******************************
-	public void prepareCreateServiceInstance(DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-			/*
-			 * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
-			 *		ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-			 *		ModelInfo modelInfo = serviceDecomposition.getModelInfo()
-			 *
-			 */
-			String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
-//			String serviceInputParams = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestParameters")
-//			execution.setVariable("serviceInputParams", serviceInputParams)
-
-
-			String serviceInstanceName = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.instanceName")
-			execution.setVariable("serviceInstanceName", serviceInstanceName)
-
-			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-			execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonStringNoRootName())
-
-			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	public void postProcessServiceInstanceCreate (DelegateExecution execution){
-		def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable(DebugFlag)
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		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(Prefix+"setUpdateDbInstancePayload", payload)
-			utils.logAudit(Prefix+"setUpdateDbInstancePayload: " + payload)
-			logDebug('Exited ' + method, isDebugLogEnabled)
-
-		} 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 processDecomposition (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		utils.log("DEBUG", " ***** Inside processDecomposition() of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-		try {
-
-			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-
-			// VNFs
-			List<VnfResource> vnfList = serviceDecomposition.getServiceVnfs()
-			filterVnfs(vnfList)
-			serviceDecomposition.setServiceVnfs(vnfList)
-			
-			execution.setVariable("vnfList", vnfList)
-			execution.setVariable("vnfListString", vnfList.toString())
-
-			String vnfModelInfoString = ""
-			if (vnfList != null && vnfList.size() > 0) {
-				execution.setVariable(Prefix+"VNFsCount", vnfList.size())
-				utils.log("DEBUG", "vnfs to create: "+ vnfList.size(), isDebugEnabled)
-				ModelInfo vnfModelInfo = vnfList[0].getModelInfo()
-
-				vnfModelInfoString = vnfModelInfo.toString()
-				String vnfModelInfoWithRoot = vnfModelInfo.toString()
-				vnfModelInfoString = jsonUtil.getJsonValue(vnfModelInfoWithRoot, "modelInfo")
-			} else {
-					execution.setVariable(Prefix+"VNFsCount", 0)
-					utils.log("DEBUG", "no vnfs to create based upon serviceDecomposition content", isDebugEnabled)
-			}
-
-			execution.setVariable("vnfModelInfo", vnfModelInfoString)
-			execution.setVariable("vnfModelInfoString", vnfModelInfoString)
-			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
-
-			utils.log("DEBUG", " ***** Completed processDecomposition() of CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			sendSyncError(execution)
-		   String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. processDecomposition() - " + ex.getMessage()
-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-	
-	private void filterVnfs(List<VnfResource> vnfList) {
-		if(vnfList == null) {
-			return
-		}
-		
-		// remove BRG & TXC from VNF list
-		
-		Iterator<VnfResource> it = vnfList.iterator()
-		while(it.hasNext()) {
-			VnfResource vr = it.next()
-			
-			String role = vr.getNfRole()
-			if(role == "BRG" || role == "TunnelXConn") {
-				it.remove()
-			}
-		}
-	}
-
-
-	public void prepareCreateAllottedResourceTXC(DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareCreateAllottedResourceTXC of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-			/*
-			 * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
-			 *		ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-			 *		ModelInfo modelInfo = serviceDecomposition.getModelInfo()
-			 *
-			 */
-			String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
-			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-
-			//allottedResourceModelInfo
-			//allottedResourceRole
-			//The model Info parameters are a JSON structure as defined in the Service Instantiation API.
-			//It would be sufficient to only include the service model UUID (i.e. the modelVersionId), since this BB will query the full model from the Catalog DB.
-			List<AllottedResource> allottedResources = serviceDecomposition.getServiceAllottedResources()
-			if (allottedResources != null) {
-				Iterator iter = allottedResources.iterator();
-				while (iter.hasNext()){
-					AllottedResource allottedResource = (AllottedResource)iter.next();
-
-					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
-					utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
-					if("TunnelXConn".equalsIgnoreCase(allottedResource.getAllottedResourceType())){
-						//set create flag to true
-						execution.setVariable("createTXCAR", true)
-						ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
-						execution.setVariable("allottedResourceModelInfoTXC", allottedResourceModelInfo.toJsonStringNoRootName())
-						execution.setVariable("allottedResourceRoleTXC", allottedResource.getAllottedResourceRole())
-						execution.setVariable("allottedResourceTypeTXC", allottedResource.getAllottedResourceType())
-						//After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the TXC,
-						//and in its homingSolution section should be found the infraServiceInstanceId (i.e. infraServiceInstanceId in TXC Allotted Resource structure) (which the Homing BB would have populated).
-						execution.setVariable("parentServiceInstanceIdTXC", allottedResource.getHomingSolution().getServiceInstanceId())
-					}
-				}
-			}
-
-			//unit test only
-			String allottedResourceId = execution.getVariable("allottedResourceId")
-			execution.setVariable("allottedResourceIdTXC", allottedResourceId)
-			utils.log("DEBUG", "setting allottedResourceId CreateVcpeResCustService "+allottedResourceId, isDebugEnabled)
-			
-			utils.log("DEBUG", " ***** Completed prepareCreateAllottedResourceTXC of CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in prepareCreateAllottedResourceTXC flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-	public void prepareCreateAllottedResourceBRG(DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareCreateAllottedResourceBRG of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-			/*
-			 * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
-			 *		ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-			 *		ModelInfo modelInfo = serviceDecomposition.getModelInfo()
-			 *
-			 */
-			String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
-			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-
-			//allottedResourceModelInfo
-			//allottedResourceRole
-			//The model Info parameters are a JSON structure as defined in the Service Instantiation API.
-			//It would be sufficient to only include the service model UUID (i.e. the modelVersionId), since this BB will query the full model from the Catalog DB.
-			List<AllottedResource> allottedResources = serviceDecomposition.getServiceAllottedResources()
-			if (allottedResources != null) {
-				Iterator iter = allottedResources.iterator();
-				while (iter.hasNext()){
-					AllottedResource allottedResource = (AllottedResource)iter.next();
-
-					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
-					utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
-					if("BRG".equalsIgnoreCase(allottedResource.getAllottedResourceType())){
-						//set create flag to true
-						execution.setVariable("createBRGAR", true)
-						ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
-						execution.setVariable("allottedResourceModelInfoBRG", allottedResourceModelInfo.toJsonStringNoRootName())
-						execution.setVariable("allottedResourceRoleBRG", allottedResource.getAllottedResourceRole())
-						execution.setVariable("allottedResourceTypeBRG", allottedResource.getAllottedResourceType())
-						//After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the BRG,
-						//and in its homingSolution section should be found the infraServiceInstanceId (i.e. infraServiceInstanceId in BRG Allotted Resource structure) (which the Homing BB would have populated).
-						execution.setVariable("parentServiceInstanceIdBRG", allottedResource.getHomingSolution().getServiceInstanceId())
-					}
-				}
-			}
-
-			//unit test only
-			String allottedResourceId = execution.getVariable("allottedResourceId")
-			execution.setVariable("allottedResourceIdBRG", allottedResourceId)
-			utils.log("DEBUG", "setting allottedResourceId CreateVcpeResCustService "+allottedResourceId, isDebugEnabled)
-			
-			utils.log("DEBUG", " ***** Completed prepareCreateAllottedResourceBRG of CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in prepareCreateAllottedResourceBRG flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-
-
-	// *******************************
-	//     Generate Network request Section
-	// *******************************
-	public void prepareVnfAndModulesCreate (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateVcpeResCustService ***** ", 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 createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
-			String productFamilyId = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.productFamilyId")
-			execution.setVariable("productFamilyId", productFamilyId)
-			utils.log("DEBUG","productFamilyId: "+ productFamilyId, isDebugEnabled)
-
-			List<VnfResource> vnfList = execution.getVariable("vnfList")
-
-			Integer vnfsCreatedCount = execution.getVariable(Prefix+"VnfsCreatedCount")
-			String vnfModelInfoString = null;
-
-			if (vnfList != null && vnfList.size() > 0 ) {
-				utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)
-				ModelInfo vnfModelInfo1 = vnfList[0].getModelInfo()
-				utils.log("DEBUG", "got 0 ", isDebugEnabled)
-				ModelInfo vnfModelInfo = vnfList[vnfsCreatedCount.intValue()].getModelInfo()
-				vnfModelInfoString = vnfModelInfo.toString()
-			} else {
-				//TODO: vnfList does not contain data. Need to investigate why ... . Fro VCPE use model stored
-				vnfModelInfoString = execution.getVariable("vnfModelInfo")
-			}
-
-			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
-
-			// extract cloud configuration
-			String lcpCloudRegionId = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
-			String tenantId = jsonUtil.getJsonValue(createVcpeServiceRequest, "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 CreateVcpeResCustService ***** ", isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	// *******************************
-	//     Validate Vnf request Section -> increment count
-	// *******************************
-	public void validateVnfCreate (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		try {
-			utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-			Integer vnfsCreatedCount = execution.getVariable(Prefix+"VnfsCreatedCount")
-			vnfsCreatedCount++
-
-			execution.setVariable(Prefix+"VnfsCreatedCount", vnfsCreatedCount)
-
-			utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateVcpeResCustService ***** "+" vnf # "+vnfsCreatedCount, isDebugEnabled)
-		} catch (Exception ex) {
-			// try error in method block
-			String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	 }
-
-	// *****************************************
-	//     Prepare Completion request Section
-	// *****************************************
-	public void postProcessResponse (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		utils.log("DEBUG", " ***** Inside postProcessResponse of CreateVcpeResCustService ***** ", 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(Prefix+"Success", true)
-			execution.setVariable(Prefix+"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 CreateVcpeResCustService flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void preProcessRollback (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-		utils.log("DEBUG"," ***** preProcessRollback of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService *** ", isDebugEnabled)
-	}
-
-	public void postProcessRollback (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-		utils.log("DEBUG"," ***** postProcessRollback of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService *** ", isDebugEnabled)
-	}
-
-	public void prepareFalloutRequest(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-
-		utils.log("DEBUG", " *** STARTED CreateVcpeResCustService prepareFalloutRequest Process *** ", isDebugEnabled)
-
-		try {
-			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
-			String requestInfo = execution.getVariable(Prefix+"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_rolledBack")
-//			if (successIndicator){
-//				errorMessage = errorMessage + ". Rollback successful."
-//			} else {
-//				errorMessage = errorMessage + ". Rollback not completed."
-//			}
-
-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
-
-			execution.setVariable(Prefix+"falloutRequest", falloutRequest)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", "Error Occured in CreateVcpeResCustService prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateVcpeResCustService prepareFalloutRequest Process")
-		}
-		utils.log("DEBUG", "*** COMPLETED CreateVcpeResCustService prepareFalloutRequest Process ***", isDebugEnabled)
-	}
-
-
-	public void sendSyncError (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside sendSyncError() of CreateVcpeResCustService ***** ", isDebugEnabled)
-
-		try {
-			String errorMessage = ""
-			def wfe = execution.getVariable("WorkflowException")
-			if (wfe instanceof 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(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable(DebugFlag)
-		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(Prefix+"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(Prefix+"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)
-	}
+    private static final String DebugFlag = "isDebugLogEnabled"
+
+    String Prefix = "CVRCS_"
+    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(DelegateExecution execution) {
+        /* Initialize all the process variables in this block */
+
+        execution.setVariable("createVcpeServiceRequest", "")
+        execution.setVariable("globalSubscriberId", "")
+        execution.setVariable("serviceInstanceName", "")
+        execution.setVariable("msoRequestId", "")
+        execution.setVariable(Prefix + "VnfsCreatedCount", 0)
+        execution.setVariable("productFamilyId", "")
+        execution.setVariable("brgWanMacAddress", "")
+        execution.setVariable("customerLocation", "")
+        execution.setVariable("homingService", "")
+
+        //TODO
+        execution.setVariable("sdncVersion", "1707")
+    }
+
+    // **************************************************
+    //     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(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+        execution.setVariable("prefix", Prefix)
+
+        utils.log("DEBUG", " ***** Inside preProcessRequest CreateVcpeResCustService Request ***** ", isDebugEnabled)
+
+        try {
+            // initialize flow variables
+            InitializeProcessVariables(execution)
+
+            //Config Inputs
+            String aaiDistDelay = execution.getVariable('URN_mso_workflow_aai_distribution_delay')
+            if (isBlank(aaiDistDelay)) {
+                msg = "URN_mso_workflow_aai_distribution_delay is null"
+                utils.log("DEBUG", msg, isDebugEnabled)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+            }
+            execution.setVariable("aaiDistDelay", aaiDistDelay)
+            utils.log("DEBUG", "AAI distribution delay: " + aaiDistDelay, isDebugEnabled)
+
+            // check for incoming json message/input
+            String createVcpeServiceRequest = execution.getVariable("bpmnRequest")
+            utils.logAudit(createVcpeServiceRequest)
+            execution.setVariable("createVcpeServiceRequest", createVcpeServiceRequest);
+            println 'createVcpeServiceRequest - ' + createVcpeServiceRequest
+
+            // 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)
+
+            setBasicDBAuthHeader(execution, isDebugEnabled)
+
+            String source = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.source")
+            if ((source == null) || (source.isEmpty())) {
+                source = "VID"
+            }
+            execution.setVariable("source", source)
+
+            // extract globalSubscriberId
+            String globalSubscriberId = jsonUtil.getJsonValue(createVcpeServiceRequest, "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(createVcpeServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")
+            execution.setVariable("subscriptionServiceType", subscriptionServiceType)
+            utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
+
+            String suppressRollback = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.suppressRollback")
+            execution.setVariable("disableRollback", suppressRollback)
+            utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
+
+            String productFamilyId = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.productFamilyId")
+            execution.setVariable("productFamilyId", productFamilyId)
+            utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
+
+            String subscriberInfo = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.subscriberInfo")
+            execution.setVariable("subscriberInfo", subscriberInfo)
+            utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)
+
+            /*
+            * Extracting User Parameters from incoming Request and converting into a Map
+            */
+            def jsonSlurper = new JsonSlurper()
+            def jsonOutput = new JsonOutput()
+
+            Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
+
+            //InputParams
+            def userParams = reqMap.requestDetails?.requestParameters?.userParams
+
+            Map<String, String> inputMap = [:]
+
+          if (userParams) {
+                userParams.each {
+                                userParam ->
+                                if("BRG_WAN_MAC_Address".equals(userParam?.name)) {
+                                                execution.setVariable("brgWanMacAddress", userParam.value)
+                                                inputMap.put("BRG_WAN_MAC_Address", userParam.value)
+                                }
+                                if("Customer_Location".equals(userParam?.name)) {
+                                    execution.setVariable("customerLocation", userParam.value)
+                                    userParam.value.each {
+                                        customerLocParam ->
+                                        inputMap.put(customerLocParam.key, customerLocParam.value)
+                                    }
+                                }
+                                if("Homing_Solution".equals(userParam?.name)) {
+                                    execution.setVariable("homingService", userParam.value)
+                                    inputMap.put("Homing_Solution", userParam.value)
+                                } else {
+                                    execution.setVariable("homingService", "oof")
+                                }
+                }
+            }
+
+            utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
+            execution.setVariable("serviceInputParams", inputMap)
+
+            utils.log("DEBUG", "Incoming brgWanMacAddress is: " + execution.getVariable('brgWanMacAddress'), 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(Prefix + "requestInfo", requestInfo)
+
+            utils.log("DEBUG", " ***** Completed preProcessRequest CreateVcpeResCustService Request ***** ", isDebugEnabled)
+
+        } catch (BpmnError e) {
+            throw e;
+
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    public void sendSyncResponse(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    // *******************************
+    //
+    // *******************************
+    public void prepareDecomposeService(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside prepareDecomposeService of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+            String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
+
+            //serviceModelInfo JSON string will be used as-is for DoCreateServiceInstance BB
+            String serviceModelInfo = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.modelInfo")
+            execution.setVariable("serviceModelInfo", serviceModelInfo)
+
+            utils.log("DEBUG", " ***** Completed prepareDecomposeService of CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareDecomposeService() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    // *******************************
+    //
+    // *******************************
+    public void prepareCreateServiceInstance(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+            /*
+             * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
+             *      ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+             *      ModelInfo modelInfo = serviceDecomposition.getModelInfo()
+             *
+             */
+            String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
+//          String serviceInputParams = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestParameters")
+//          execution.setVariable("serviceInputParams", serviceInputParams)
+
+
+            String serviceInstanceName = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.instanceName")
+            execution.setVariable("serviceInstanceName", serviceInstanceName)
+
+            ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+            execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonStringNoRootName())
+
+            utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    public void postProcessServiceInstanceCreate(DelegateExecution execution) {
+        def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' + 'execution=' + execution.getId() + ')'
+        def isDebugLogEnabled = execution.getVariable(DebugFlag)
+        logDebug('Entered ' + method, isDebugLogEnabled)
+
+        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(Prefix + "setUpdateDbInstancePayload", payload)
+            utils.logAudit(Prefix + "setUpdateDbInstancePayload: " + payload)
+            logDebug('Exited ' + method, isDebugLogEnabled)
+
+        } 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 processDecomposition(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        utils.log("DEBUG", " ***** Inside processDecomposition() of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+        try {
+
+            ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+
+            // VNFs
+            List<VnfResource> vnfList = serviceDecomposition.getServiceVnfs()
+            filterVnfs(vnfList)
+            serviceDecomposition.setServiceVnfs(vnfList)
+
+            execution.setVariable("vnfList", vnfList)
+            execution.setVariable("vnfListString", vnfList.toString())
+
+            String vnfModelInfoString = ""
+            if (vnfList != null && vnfList.size() > 0) {
+                execution.setVariable(Prefix + "VNFsCount", vnfList.size())
+                utils.log("DEBUG", "vnfs to create: " + vnfList.size(), isDebugEnabled)
+                ModelInfo vnfModelInfo = vnfList[0].getModelInfo()
+
+                vnfModelInfoString = vnfModelInfo.toString()
+                String vnfModelInfoWithRoot = vnfModelInfo.toString()
+                vnfModelInfoString = jsonUtil.getJsonValue(vnfModelInfoWithRoot, "modelInfo")
+            } else {
+                execution.setVariable(Prefix + "VNFsCount", 0)
+                utils.log("DEBUG", "no vnfs to create based upon serviceDecomposition content", isDebugEnabled)
+            }
+
+            execution.setVariable("vnfModelInfo", vnfModelInfoString)
+            execution.setVariable("vnfModelInfoString", vnfModelInfoString)
+            utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
+
+            utils.log("DEBUG", " ***** Completed processDecomposition() of CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            sendSyncError(execution)
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. processDecomposition() - " + ex.getMessage()
+            utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    private void filterVnfs(List<VnfResource> vnfList) {
+        if (vnfList == null) {
+            return
+        }
+
+        // remove BRG & TXC from VNF list
+
+        Iterator<VnfResource> it = vnfList.iterator()
+        while (it.hasNext()) {
+            VnfResource vr = it.next()
+
+            String role = vr.getNfRole()
+            if (role == "BRG" || role == "TunnelXConn") {
+                it.remove()
+            }
+        }
+    }
+
+
+    public void prepareCreateAllottedResourceTXC(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside prepareCreateAllottedResourceTXC of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+            /*
+             * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
+             *      ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+             *      ModelInfo modelInfo = serviceDecomposition.getModelInfo()
+             *
+             */
+            String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
+            ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+
+            //allottedResourceModelInfo
+            //allottedResourceRole
+            //The model Info parameters are a JSON structure as defined in the Service Instantiation API.
+            //It would be sufficient to only include the service model UUID (i.e. the modelVersionId), since this BB will query the full model from the Catalog DB.
+            List<AllottedResource> allottedResources = serviceDecomposition.getServiceAllottedResources()
+            if (allottedResources != null) {
+                Iterator iter = allottedResources.iterator();
+                while (iter.hasNext()) {
+                    AllottedResource allottedResource = (AllottedResource) iter.next();
+
+                    utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
+                    utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
+                    if ("TunnelXConn".equalsIgnoreCase(allottedResource.getAllottedResourceType())) {
+                        //set create flag to true
+                        execution.setVariable("createTXCAR", true)
+                        ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
+                        execution.setVariable("allottedResourceModelInfoTXC", allottedResourceModelInfo.toJsonStringNoRootName())
+                        execution.setVariable("allottedResourceRoleTXC", allottedResource.getAllottedResourceRole())
+                        execution.setVariable("allottedResourceTypeTXC", allottedResource.getAllottedResourceType())
+                        //After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the TXC,
+                        //and in its homingSolution section should be found the infraServiceInstanceId (i.e. infraServiceInstanceId in TXC Allotted Resource structure) (which the Homing BB would have populated).
+                        execution.setVariable("parentServiceInstanceIdTXC", allottedResource.getHomingSolution().getServiceInstanceId())
+                    }
+                }
+            }
+
+            //unit test only
+            String allottedResourceId = execution.getVariable("allottedResourceId")
+            execution.setVariable("allottedResourceIdTXC", allottedResourceId)
+            utils.log("DEBUG", "setting allottedResourceId CreateVcpeResCustService " + allottedResourceId, isDebugEnabled)
+
+            utils.log("DEBUG", " ***** Completed prepareCreateAllottedResourceTXC of CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in prepareCreateAllottedResourceTXC flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    public void prepareCreateAllottedResourceBRG(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside prepareCreateAllottedResourceBRG of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+            /*
+             * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
+             *      ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+             *      ModelInfo modelInfo = serviceDecomposition.getModelInfo()
+             *
+             */
+            String createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
+            ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+
+            //allottedResourceModelInfo
+            //allottedResourceRole
+            //The model Info parameters are a JSON structure as defined in the Service Instantiation API.
+            //It would be sufficient to only include the service model UUID (i.e. the modelVersionId), since this BB will query the full model from the Catalog DB.
+            List<AllottedResource> allottedResources = serviceDecomposition.getServiceAllottedResources()
+            if (allottedResources != null) {
+                Iterator iter = allottedResources.iterator();
+                while (iter.hasNext()) {
+                    AllottedResource allottedResource = (AllottedResource) iter.next();
+
+                    utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
+                    utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
+                    if ("BRG".equalsIgnoreCase(allottedResource.getAllottedResourceType())) {
+                        //set create flag to true
+                        execution.setVariable("createBRGAR", true)
+                        ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
+                        execution.setVariable("allottedResourceModelInfoBRG", allottedResourceModelInfo.toJsonStringNoRootName())
+                        execution.setVariable("allottedResourceRoleBRG", allottedResource.getAllottedResourceRole())
+                        execution.setVariable("allottedResourceTypeBRG", allottedResource.getAllottedResourceType())
+                        //After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the BRG,
+                        //and in its homingSolution section should be found the infraServiceInstanceId (i.e. infraServiceInstanceId in BRG Allotted Resource structure) (which the Homing BB would have populated).
+                        execution.setVariable("parentServiceInstanceIdBRG", allottedResource.getHomingSolution().getServiceInstanceId())
+                    }
+                }
+            }
+
+            //unit test only
+            String allottedResourceId = execution.getVariable("allottedResourceId")
+            execution.setVariable("allottedResourceIdBRG", allottedResourceId)
+            utils.log("DEBUG", "setting allottedResourceId CreateVcpeResCustService " + allottedResourceId, isDebugEnabled)
+
+            utils.log("DEBUG", " ***** Completed prepareCreateAllottedResourceBRG of CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in prepareCreateAllottedResourceBRG flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    // *******************************
+    //     Generate Network request Section
+    // *******************************
+    public void prepareVnfAndModulesCreate(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateVcpeResCustService ***** ", 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 createVcpeServiceRequest = execution.getVariable("createVcpeServiceRequest")
+            String productFamilyId = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.productFamilyId")
+            execution.setVariable("productFamilyId", productFamilyId)
+            utils.log("DEBUG", "productFamilyId: " + productFamilyId, isDebugEnabled)
+
+            List<VnfResource> vnfList = execution.getVariable("vnfList")
+
+            Integer vnfsCreatedCount = execution.getVariable(Prefix + "VnfsCreatedCount")
+            String vnfModelInfoString = null;
+
+            if (vnfList != null && vnfList.size() > 0) {
+                utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)
+                ModelInfo vnfModelInfo1 = vnfList[0].getModelInfo()
+                utils.log("DEBUG", "got 0 ", isDebugEnabled)
+                ModelInfo vnfModelInfo = vnfList[vnfsCreatedCount.intValue()].getModelInfo()
+                vnfModelInfoString = vnfModelInfo.toString()
+            } else {
+                //TODO: vnfList does not contain data. Need to investigate why ... . Fro VCPE use model stored
+                vnfModelInfoString = execution.getVariable("vnfModelInfo")
+            }
+
+            utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
+
+            // extract cloud configuration
+            String vimId = jsonUtil.getJsonValue(createVcpeServiceRequest,
+                    "requestDetails.cloudConfiguration.lcpCloudRegionId")
+            def cloudRegion = vimId.split("_")
+            execution.setVariable("cloudOwner", cloudRegion[0])
+            utils.log("DEBUG","cloudOwner: "+ cloudRegion[0], isDebugEnabled)
+            execution.setVariable("cloudRegionId", cloudRegion[1])
+            utils.log("DEBUG","cloudRegionId: "+ cloudRegion[1], isDebugEnabled)
+            execution.setVariable("lcpCloudRegionId", cloudRegion[1])
+            utils.log("DEBUG","lcpCloudRegionId: "+ cloudRegion[1], isDebugEnabled)
+            String tenantId = jsonUtil.getJsonValue(createVcpeServiceRequest,
+                    "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 CreateVcpeResCustService ***** ", isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    // *******************************
+    //     Validate Vnf request Section -> increment count
+    // *******************************
+    public void validateVnfCreate(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        try {
+            utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+            Integer vnfsCreatedCount = execution.getVariable(Prefix + "VnfsCreatedCount")
+            vnfsCreatedCount++
+
+            execution.setVariable(Prefix + "VnfsCreatedCount", vnfsCreatedCount)
+
+            utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateVcpeResCustService ***** " + " vnf # " + vnfsCreatedCount, isDebugEnabled)
+        } catch (Exception ex) {
+            // try error in method block
+            String exceptionMessage = "Bpmn error encountered in CreateVcpeResCustService flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    // *****************************************
+    //     Prepare Completion request Section
+    // *****************************************
+    public void postProcessResponse(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        utils.log("DEBUG", " ***** Inside postProcessResponse of CreateVcpeResCustService ***** ", 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(Prefix + "Success", true)
+            execution.setVariable(Prefix + "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 CreateVcpeResCustService flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    public void preProcessRollback(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+        utils.log("DEBUG", " ***** preProcessRollback of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService *** ", isDebugEnabled)
+    }
+
+    public void postProcessRollback(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+        utils.log("DEBUG", " ***** postProcessRollback of CreateVcpeResCustService ***** ", 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 CreateVcpeResCustService *** ", isDebugEnabled)
+    }
+
+    public void prepareFalloutRequest(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+
+        utils.log("DEBUG", " *** STARTED CreateVcpeResCustService prepareFalloutRequest Process *** ", isDebugEnabled)
+
+        try {
+            WorkflowException wfex = execution.getVariable("WorkflowException")
+            utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
+            String requestInfo = execution.getVariable(Prefix + "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_rolledBack")
+//          if (successIndicator){
+//              errorMessage = errorMessage + ". Rollback successful."
+//          } else {
+//              errorMessage = errorMessage + ". Rollback not completed."
+//          }
+
+            String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
+
+            execution.setVariable(Prefix + "falloutRequest", falloutRequest)
+
+        } catch (Exception ex) {
+            utils.log("DEBUG", "Error Occured in CreateVcpeResCustService prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateVcpeResCustService prepareFalloutRequest Process")
+        }
+        utils.log("DEBUG", "*** COMPLETED CreateVcpeResCustService prepareFalloutRequest Process ***", isDebugEnabled)
+    }
+
+
+    public void sendSyncError(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+        execution.setVariable("prefix", Prefix)
+
+        utils.log("DEBUG", " ***** Inside sendSyncError() of CreateVcpeResCustService ***** ", isDebugEnabled)
+
+        try {
+            String errorMessage = ""
+            def wfe = execution.getVariable("WorkflowException")
+            if (wfe instanceof 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(DelegateExecution execution) {
+        def isDebugEnabled = execution.getVariable(DebugFlag)
+        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(Prefix + "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(Prefix + "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)
+    }
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
index 2c9d591399..a735121002 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
@@ -32,6 +32,7 @@ import org.junit.Ignore
 import org.mockito.MockitoAnnotations
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.domain.HomingSolution
 import org.openecomp.mso.bpmn.mock.FileUtil
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
@@ -109,6 +110,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		
 		verify(mex).setVariable("brgWanMacAddress", "brgmac")
 		verify(mex).setVariable("customerLocation", ["customerLatitude":"32.897480", "customerLongitude":"-97.040443", "customerName":"some_company"])
+		verify(mex).setVariable("homingService", "sniro")
 		assertTrue(map.containsKey("serviceInputParams"))
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
@@ -166,6 +168,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		
 		assertEquals("", map.get("brgWanMacAddress"))
 		assertEquals("", map.get("customerLocation"))
+		assertEquals("oof", map.get("homingService"))
 		assertTrue(map.containsKey("serviceInputParams"))
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
index fdc470f16d..b904a3f2d9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
@@ -47,7 +47,7 @@ import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition
 import org.openecomp.mso.bpmn.core.domain.VnfResource
 import org.openecomp.mso.bpmn.core.domain.AllottedResource
 import org.openecomp.mso.bpmn.core.domain.ModelInfo
-import org.openecomp.mso.bpmn.core.domain.HomingSolution
+
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.vcpe.scripts.MapGetter
 import org.openecomp.mso.bpmn.vcpe.scripts.MapSetter
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json
index c6cc1ca428..52ead5f77f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json
@@ -7,7 +7,7 @@
 			"modelVersion": "1.0"
 		},
 		"cloudConfiguration": {
-			"lcpCloudRegionId": "MDTWNJ21",
+			"lcpCloudRegionId": "cloudowner_MDTWNJ21",
 			"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"
 		},
 		"requestInfo": {
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
index 3e05ba0f9d..bc0a1ef491 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
@@ -23,7 +23,7 @@
 				},
 			"cloudConfiguration":
 				{
-					"lcpCloudRegionId":"mdt1",
+					"lcpCloudRegionId":"cloudowner_mdt1",
 					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
 				},
 			"requestParameters":
@@ -43,6 +43,10 @@
 									"customerLongitude": "-97.040443",
 									"customerName": "some_company"
 								}
+							},
+							{
+								"name":"Homing_Solution",
+								"value":"sniro"
 							}
 						]
 				}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
index cf02444705..4100ec76de 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
@@ -22,7 +22,7 @@
 				},
 			"cloudConfiguration":
 				{
-					"lcpCloudRegionId":"mdt1",
+					"lcpCloudRegionId":"cloudowner_mdt1",
 					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
 				},
 			"requestParameters":
@@ -42,6 +42,10 @@
 									"customerLongitude": "-97.040443",
 									"customerName": "some_company"
 								}
+							},
+							{
+								"name":"Homing_Solution",
+								"value":"sniro"
 							}
 						]
 				}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
index 39be40aedd..5fc0b04180 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
@@ -22,7 +22,7 @@
 				},
 			"cloudConfiguration":
 				{
-					"lcpCloudRegionId":"mdt1",
+					"lcpCloudRegionId":"cloudowner_mdt1",
 					"tenantId":"8b1df54faa3b49078e3416e21370a3ba"
 				},
 			"requestParameters":
@@ -42,7 +42,11 @@
 									"customerLongitude": "-97.040443",
 									"customerName": "some_company"
 								}
-							}
+							},
+							{
+								"name":"Homing_Solution",
+								"value":"sniro"
+						   }
 						]
 				}
 		}