633 files changed, 52735 insertions, 63071 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AaiUtil.groovy
index 5a4b25dca9..0bd54ffe64 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AaiUtil.groovy
@@ -1,667 +1,643 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

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

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-

-class AaiUtil {

-

-	public MsoUtils utils = new MsoUtils()

-	public static final String AAI_NAMESPACE_STRING_KEY = 'URN_mso_workflow_global_default_aai_namespace'

-	public static final String DEFAULT_VERSION_KEY = 'URN_mso_workflow_global_default_aai_version'

-

-	private String aaiNamespace = null;

-

-	private AbstractServiceTaskProcessor taskProcessor

-

-	public AaiUtil(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-	}

-

-	public String getNetworkGenericVnfEndpoint(DelegateExecution execution) {

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

-		String endpoint = execution.getVariable("URN_aai_endpoint")

-		def uri = getNetworkGenericVnfUri(execution)

-		taskProcessor.logDebug('AaiUtil.getNetworkGenericVnfEndpoint() - AAI endpoint: ' + endpoint + uri, isDebugLogEnabled)

-		return endpoint + uri

-	}

-

-	public String getNetworkGenericVnfUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'generic_vnf')

-		taskProcessor.logDebug('AaiUtil.getNetworkGenericVnfUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getNetworkVpnBindingUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'vpn_binding')

-		taskProcessor.logDebug('AaiUtil.getNetworkVpnBindingUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getNetworkPolicyUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'network_policy')

-		taskProcessor.logDebug('AaiUtil.getNetworkPolicyUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getNetworkTableReferencesUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'route_table_reference')

-		taskProcessor.logDebug('AaiUtil.getNetworkTableReferencesUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getNetworkVceUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'vce')

-		taskProcessor.logDebug('AaiUtil.getNetworkVceUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getNetworkL3NetworkUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'l3_network')

-		taskProcessor.logDebug('AaiUtil.getNetworkL3NetworkUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getBusinessCustomerUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'customer')

-		taskProcessor.logDebug('AaiUtil.getBusinessCustomerUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	//public String getBusinessCustomerUriv7(DelegateExecution execution) {

-	//	def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-	//	//def uri = getUri(execution, BUSINESS_CUSTOMERV7)

-	//	def uri = getUri(execution, 'Customer')

-	//	taskProcessor.logDebug('AaiUtil.getBusinessCustomerUriv7() - AAI URI: ' + uri, isDebugLogEnabled)

-	//	return uri

-	//}

-

-	public String getCloudInfrastructureCloudRegionEndpoint(DelegateExecution execution) {

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

-		String endpoint = execution.getVariable("URN_aai_endpoint")

-		def uri = getCloudInfrastructureCloudRegionUri(execution)

-		taskProcessor.logDebug('AaiUtil.getCloudInfrastructureCloudRegionEndpoint() - AAI endpoint: ' + endpoint + uri, isDebugLogEnabled)

-		return endpoint + uri

-	}

-

-	public String getCloudInfrastructureCloudRegionUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'cloud_region')

-		taskProcessor.logDebug('AaiUtil.getCloudInfrastructureCloudRegionUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getCloudInfrastructureTenantUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'tenant')

-		taskProcessor.logDebug('AaiUtil.getCloudInfrastructureTenantUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getSearchNodesQueryUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'nodes_query')

-		taskProcessor.logDebug('AaiUtil.getSearchNodesQueryUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getSearchNodesQueryEndpoint(DelegateExecution execution) {

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

-		String endpoint = execution.getVariable("URN_aai_endpoint")

-		def uri = getSearchNodesQueryUri(execution)

-		taskProcessor.logDebug('AaiUtil.getSearchNodesQueryEndpoint() - AAI endpoint: ' + endpoint + uri, isDebugLogEnabled)

-		return endpoint + uri

-	}

-

-	public String getSearchGenericQueryUri(DelegateExecution execution) {

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

-		def uri = getUri(execution, 'generic_query')

-		taskProcessor.logDebug('AaiUtil.getSearchGenericQueryUri() - AAI URI: ' + uri, isDebugLogEnabled)

-		return uri

-	}

-

-	public String getVersion(DelegateExecution execution, resourceName, processKey) {

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

-

-		resourceName = resourceName.replaceAll('-', '_')

-

-		def versionWithResourceKey = "URN_mso_workflow_default_aai_${resourceName}_version"

-		def versionWithProcessKey = "URN_mso_workflow_custom_${processKey}_aai_version"

-

-		def version = execution.getVariable(versionWithProcessKey)

-		if (version) {

-			taskProcessor.logDebug("AaiUtil.getVersion() - using flow specific ${versionWithProcessKey}=${version}", isDebugLogEnabled)

-			return version

-		}

-

-		version = execution.getVariable(versionWithResourceKey)

-		if (version) {

-			taskProcessor.logDebug("AaiUtil.getVersion() - using resource specific ${versionWithResourceKey}=${version}", isDebugLogEnabled)

-			return version

-		}

-

-		version = execution.getVariable(DEFAULT_VERSION_KEY)

-		if (version) {

-			taskProcessor.logDebug("AaiUtil.getVersion() - using default version ${DEFAULT_VERSION_KEY}=${version}", isDebugLogEnabled)

-			return version

-		}

-

-		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, "Internal Error: One of the following should be defined in MSO URN properties file: ${versionWithResourceKey}, ${versionWithProcessKey}, ${DEFAULT_VERSION_KEY}")

-	}

-

-	public String getUri(DelegateExecution execution, resourceName) {

-

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

-		def processKey = taskProcessor.getMainProcessKey(execution)

-		resourceName = resourceName.replaceAll('-', '_')

-

-		//set namespace

-		setNamespace(execution)

-

-		// Check for flow+resource specific first

-		def key = "URN_mso_workflow_${processKey}_aai_${resourceName}_uri"

-		def uri = execution.getVariable(key)

-		if(uri) {

-			taskProcessor.logDebug("AaiUtil.getUri() - using flow+resource specific key: ${key}=${uri}", isDebugLogEnabled)

-			return uri

-		}

-

-		// Check for versioned key

-		def version = getVersion(execution, resourceName, processKey)

-		key = "URN_mso_workflow_default_aai_v${version}_${resourceName}_uri"

-		uri = execution.getVariable(key)

-

-		if(uri) {

-			taskProcessor.logDebug("AaiUtil.getUri() - using versioned URI key: ${key}=${uri}", isDebugLogEnabled)

-			return uri

-		}

-

-		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')

-	}

-

-	public String setNamespace(DelegateExecution execution) {

-		def key = AAI_NAMESPACE_STRING_KEY

-		aaiNamespace = execution.getVariable(key)

-		if (aaiNamespace == null ) {

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')

-		}

-	}

-

-	/**

-	 * This method can be used for getting the building namespace out of uri.

-	 *  NOTE: A getUri() method needs to be invoked first.

-	 *        Alternative method is the getNamespaceFromUri(DelegateExecution execution, String uri)

-	 * return namespace (plus version from uri)

-	 *

-	 * @param url

-	 *

-	 * @return namespace

-	 */

-

-	public String getNamespaceFromUri(String uri) {

-		 if (aaiNamespace == null) {

-			throw new Exception('Internal Error: AAI Namespace has not been set yet. A getUri() method needs to be invoked first.')

-		}

-		String namespace = aaiNamespace

-		if(uri!=null){

-			String version = getVersionFromUri(uri)

-			return namespace + "v"+version

-		}else{

-			return namespace

-		}

-	}

-

-	/**

-	 * This method can be used for building namespace with aai version out of uri.

-	 *   NOTE: 2 arguments: DelegateExecution execution & String uri

-	 * @param execution

-	 * @param url

-	 *

-	 * @return namespace

-	 */

-	public String getNamespaceFromUri(DelegateExecution execution, String uri) {

-	   String namespace = execution.getVariable(AAI_NAMESPACE_STRING_KEY)

-	   if (namespace == null ) {

-		   (new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + AAI_NAMESPACE_STRING_KEY + ' not defined in the MSO URN properties file')

-	   }

-	   if(uri!=null){

-		   String version = getVersionFromUri(uri)

-		   return namespace + "v"+version

-	   }else{

-		   return namespace

-	   }

-   }

-

-	/**

-	 * This is used to extract the version from uri.

-	 *

-	 * @param uri

-	 *

-	 * @return version

-	 */

-	private String getVersionFromUri(String uri) {

-		def version = ""

-		def savedVersion = ""

-		for (int x=2; x<6; x++) {

-			version = uri.substring(uri.indexOf("v")+1,  uri.indexOf("v")+x)

-			if (!Character.isDigit(version.charAt(version.size()-1))) {

-				break

-			}

-			savedVersion = version

-		}

-		return savedVersion

-	}

-

-

-	/**

-	 * This reusable method can be used for making AAI Get Calls. The url should

-	 * be passed as a parameter along with the execution.  The method will

-	 * return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIGetCall(DelegateExecution execution, String url){

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

-		taskProcessor.logDebug(" ======== STARTED Execute AAI Get Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

-

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.get()

-

-			taskProcessor.logDebug( "======== COMPLETED Execute AAI Get Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.logDebug("Exception occured while executing AAI Get Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-

-	/**

-	 * This reusable method can be used for making AAI httpPut Calls. The url should

-	 * be passed as a parameter along with the execution and payload.  The method will

-	 * return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 * @param payload

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIPutCall(DelegateExecution execution, String url, String payload){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Put Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Content-Type", "application/xml").addHeader("Accept","application/xml");

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.httpPut(payload)

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Put Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Put Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-	/**

-	 * This reusable method can be used for making AAI httpPatch Calls. The url should

-	 * be passed as a parameter along with the execution and payload.  The method will

-	 * return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 * @param payload

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIPatchCall(DelegateExecution execution, String url, String payload){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Patch Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Content-Type", "application/merge-patch+json").addHeader("Accept","application/json");

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.httpPatch(payload)

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Patch Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Patch Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-

-	/**

-	 * This reusable method can be used for making AAI Delete Calls. The url should

-	 * be passed as a parameter along with the execution.  The method will

-	 * return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIDeleteCall(DelegateExecution execution, String url){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Delete Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.delete()

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Delete Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Delete Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-	/**

-	 * This reusable method can be used for making AAI Delete Calls. The url should

-	 * be passed as a parameter along with the execution.  The method will

-	 * return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 * @param payload

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIDeleteCall(DelegateExecution execution, String url, String payload, String authHeader){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Delete Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml").addAuthorizationHeader(authHeader);

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.httpDelete(payload)

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Delete Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Delete Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-	/**

-	 * This reusable method can be used for making AAI Post Calls. The url

-	 * and payload should be passed as a parameters along with the execution.

-	 * The method will return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 * @param payload

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIPostCall(DelegateExecution execution, String url, String payload){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Post Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			String uuid = utils.getRequestID()

-			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

-

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.httpPost(payload)

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Post Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Post Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-	/**

-	 * This reusable method can be used for making AAI Post Calls. The url

-	 * and payload should be passed as a parameters along with the execution.

-	 * The method will return an APIResponse.

-	 *

-	 * @param execution

-	 * @param url

-	 * @param payload

-	 * @param authenticationHeader - addAuthenticationHeader value

-	 * @param headerName - name of header you want to add, i.e. addHeader(headerName, headerValue)

-	 * @param headerValue - the header's value, i.e. addHeader(headerName, headerValue)

-	 *

-	 * @return APIResponse

-	 *

-	 */

-	public APIResponse executeAAIPostCall(DelegateExecution execution, String url, String payload, String authenticationHeaderValue, String headerName, String headerValue){

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

-		taskProcessor.logDebug( " ======== Started Execute AAI Post Process ======== ", isDebugEnabled)

-		APIResponse apiResponse = null

-		try{

-			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-

-			RESTConfig config = new RESTConfig(url);

-			RESTClient client = new RESTClient(config).addAuthorizationHeader(authenticationHeaderValue).addHeader(headerName, headerValue)

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			apiResponse = client.httpPost(payload)

-

-			taskProcessor.logDebug( "======== Completed Execute AAI Post Process ======== ", isDebugEnabled)

-		}catch(Exception e){

-			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Post Call. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return apiResponse

-	}

-

-

-	/* Utility to get the Cloud Region from AAI

-	 * Returns String cloud region id, (ie, cloud-region-id)

-	 * @param execution

-	 * @param url  - url for AAI get cloud region

-	 * @param backend - "PO" - real region, or "SDNC" - v2.5 (fake region).

-	 */

-

-	public String getAAICloudReqion(DelegateExecution execution, String url, String backend, inputCloudRegion){

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

-		String regionId = ""

-		try{

-			APIResponse apiResponse = executeAAIGetCall(execution, url)

-			String returnCode = apiResponse.getStatusCode()

-			String aaiResponseAsString = apiResponse.getResponseBodyAsString()

-			taskProcessor.utils.log("DEBUG", "Call AAI Cloud Region Return code: " + returnCode, isDebugEnabled)

-			execution.setVariable(execution.getVariable("prefix")+"queryCloudRegionReturnCode", returnCode)

-

-			if(returnCode == "200"){

-				taskProcessor.utils.log("DEBUG", "Call AAI Cloud Region is Successful.", isDebugEnabled)

-

-				String regionVersion = taskProcessor.utils.getNodeText1(aaiResponseAsString, "cloud-region-version")

-				taskProcessor.utils.log("DEBUG", "Cloud Region Version from AAI for " + backend + " is: " + regionVersion, isDebugEnabled)

-				if (backend == "PO") {

-					regionId = taskProcessor.utils.getNodeText1(aaiResponseAsString, "cloud-region-id")

-				} else { // backend not "PO"

-					if (regionVersion == "2.5" ) {

-						regionId = "AAIAIC25"

-					} else {

-						regionId = taskProcessor.utils.getNodeText1(aaiResponseAsString, "cloud-region-id")

-					}

-				}

-				if(regionId == null){

-					throw new BpmnError("MSOWorkflowException")

-				}

-				taskProcessor.utils.log("DEBUG", "Cloud Region Id from AAI " + backend + " is: " + regionId, isDebugEnabled)

-			}else if (returnCode == "404"){ // not 200

-				if (backend == "PO") {

-					regionId = inputCloudRegion

-				}else{  // backend not "PO"

-					regionId = "AAIAIC25"

-				}

-				taskProcessor.utils.log("DEBUG", "Cloud Region value for code='404' of " + backend + " is: " + regionId, isDebugEnabled)

-			}else{

-				taskProcessor.utils.log("ERROR", "Call AAI Cloud Region is NOT Successful.", isDebugEnabled)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(Exception e) {

-			taskProcessor.utils.log("ERROR", "Exception occured while getting the Cloud Reqion. Exception is: \n" + e, isDebugEnabled)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-		}

-		return regionId

-	}

-

-	/* returns xml Node with service-type of searchValue */

-	def searchServiceType(xmlInput, searchValue){

-		def fxml= new XmlSlurper().parseText(xmlInput)

-		def ret = fxml.'**'.find {it.'service-type' == searchValue}

-		return ret

-	}

-

-	/* returns xml Node with service-instance-id of searchValue */

-	def searchServiceInstanceId(xmlInput, searchValue){

-		def ret = xmlInput.'**'.find {it.'service-instance-id' == searchValue}

-		return ret

-	}

-

-	/**

-	 * Get the lowest unused VF Module index from AAI response for a given module type. The criteria for

-	 * determining module type is specified by "key" parameter (for example, "persona-model-id"),

-	 * the value for filtering is specified in "value" parameter

-	 *

-	 * @param execution

-	 * @param aaiVnfResponse

-	 * @param key

-	 * @param value

-	 *

-	 * @return moduleIndex

-	 *

-	 */

-	public int getLowestUnusedVfModuleIndexFromAAIVnfResponse(DelegateExecution execution, String aaiVnfResponse, String key, String value) {

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

-		if (aaiVnfResponse != null) {

-			String vfModulesText = taskProcessor.utils.getNodeXml(aaiVnfResponse, "vf-modules")

-			if (vfModulesText == null || vfModulesText.isEmpty()) {

-				taskProcessor.utils.log("DEBUG", "There are no VF modules in this VNF yet", isDebugEnabled)

-				return 0

-			}

-			else {

-				def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

-				def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

-				int vfModulesSize = 0

-				if (vfModules != null) {

-					vfModulesSize = vfModules.size()

-				}

-				String matchingVfModules = "<vfModules>"

-				for (i in 0..vfModulesSize-1) {

-					def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-					def keyFromAAI = taskProcessor.utils.getNodeText(vfModuleXml, key)

-					if (keyFromAAI != null && keyFromAAI.equals(value)) {

-						matchingVfModules = matchingVfModules + taskProcessor.utils.removeXmlPreamble(vfModuleXml)

-					}

-				}

-				matchingVfModules = matchingVfModules + "</vfModules>"

-				taskProcessor.utils.log("DEBUG", "Matching VF Modules: " + matchingVfModules, isDebugEnabled)

-				String lowestUnusedIndex = taskProcessor.utils.getLowestUnusedIndex(matchingVfModules)

-				return Integer.parseInt(lowestUnusedIndex)

-			}

-		}

-		else {

-			return 0

-		}

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.rest.APIResponse;
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+class AaiUtil {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, AaiUtil.class);
+
+
+	public MsoUtils utils = new MsoUtils()
+	public static final String AAI_NAMESPACE_STRING_KEY = 'mso.workflow.global.default.aai.namespace'
+	public static final String DEFAULT_VERSION_KEY = 'mso.workflow.global.default.aai.version'
+
+	private String aaiNamespace = null;
+
+	private AbstractServiceTaskProcessor taskProcessor
+
+	public AaiUtil(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+	}
+
+	public String getNetworkGenericVnfEndpoint(DelegateExecution execution) {
+		String endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+		def uri = getNetworkGenericVnfUri(execution)
+		msoLogger.debug('AaiUtil.getNetworkGenericVnfEndpoint() - AAI endpoint: ' + endpoint + uri)
+		return endpoint + uri
+	}
+
+	public String getNetworkGenericVnfUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'generic-vnf')
+		msoLogger.debug('AaiUtil.getNetworkGenericVnfUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getNetworkVpnBindingUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'vpn-binding')
+		msoLogger.debug('AaiUtil.getNetworkVpnBindingUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getNetworkPolicyUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'network-policy')
+		msoLogger.debug('AaiUtil.getNetworkPolicyUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getNetworkTableReferencesUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'route-table-reference')
+		msoLogger.debug('AaiUtil.getNetworkTableReferencesUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getNetworkVceUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'vce')
+		msoLogger.debug('AaiUtil.getNetworkVceUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getNetworkL3NetworkUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'l3-network')
+		msoLogger.debug('AaiUtil.getNetworkL3NetworkUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getBusinessCustomerUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'customer')
+		msoLogger.debug('AaiUtil.getBusinessCustomerUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	//public String getBusinessCustomerUriv7(DelegateExecution execution) {
+	//	//	//def uri = getUri(execution, BUSINESS_CUSTOMERV7)
+	//	def uri = getUri(execution, 'Customer')
+	//	msoLogger.debug('AaiUtil.getBusinessCustomerUriv7() - AAI URI: ' + uri)
+	//	return uri
+	//}
+
+	public String getCloudInfrastructureCloudRegionEndpoint(DelegateExecution execution) {
+		String endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+		def uri = getCloudInfrastructureCloudRegionUri(execution)
+		msoLogger.debug('AaiUtil.getCloudInfrastructureCloudRegionEndpoint() - AAI endpoint: ' + endpoint + uri)
+		return endpoint + uri
+	}
+
+	public String getCloudInfrastructureCloudRegionUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'cloud-region')
+		msoLogger.debug('AaiUtil.getCloudInfrastructureCloudRegionUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getCloudInfrastructureTenantUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'tenant')
+		msoLogger.debug('AaiUtil.getCloudInfrastructureTenantUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getSearchNodesQueryUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'nodes-query')
+		msoLogger.debug('AaiUtil.getSearchNodesQueryUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getSearchNodesQueryEndpoint(DelegateExecution execution) {
+		String endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+		def uri = getSearchNodesQueryUri(execution)
+		msoLogger.debug('AaiUtil.getSearchNodesQueryEndpoint() - AAI endpoint: ' + endpoint + uri)
+		return endpoint + uri
+	}
+
+	public String getSearchGenericQueryUri(DelegateExecution execution) {
+		def uri = getUri(execution, 'generic-query')
+		msoLogger.debug('AaiUtil.getSearchGenericQueryUri() - AAI URI: ' + uri)
+		return uri
+	}
+
+	public String getVersion(DelegateExecution execution, resourceName, processKey) {
+		def versionWithResourceKey = "mso.workflow.default.aai.${resourceName}.version"
+		def versionWithProcessKey = "mso.workflow.custom.${processKey}.aai.version"
+
+		def version = UrnPropertiesReader.getVariable(versionWithProcessKey, execution)
+		if (version) {
+			msoLogger.debug("AaiUtil.getVersion() - using flow specific ${versionWithProcessKey}=${version}")
+			return version
+		}
+
+		version = UrnPropertiesReader.getVariable(versionWithResourceKey, execution)
+		if (version) {
+			msoLogger.debug("AaiUtil.getVersion() - using resource specific ${versionWithResourceKey}=${version}")
+			return version
+		}
+
+		version = UrnPropertiesReader.getVariable(DEFAULT_VERSION_KEY, execution)
+		if (version) {
+			msoLogger.debug("AaiUtil.getVersion() - using default version ${DEFAULT_VERSION_KEY}=${version}")
+			return version
+		}
+
+		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, "Internal Error: One of the following should be defined in MSO URN properties file: ${versionWithResourceKey}, ${versionWithProcessKey}, ${DEFAULT_VERSION_KEY}")
+	}
+
+	public String getUri(DelegateExecution execution, resourceName) {
+
+		def processKey = taskProcessor.getMainProcessKey(execution)
+
+		//set namespace
+		setNamespace(execution)
+
+		// Check for flow+resource specific first
+		def key = "mso.workflow.${processKey}.aai.${resourceName}.uri"
+		def uri = UrnPropertiesReader.getVariable(key, execution)
+		if(uri) {
+			msoLogger.debug("AaiUtil.getUri() - using flow+resource specific key: ${key}=${uri}")
+			return uri
+		}
+
+		// Check for versioned key
+		def version = getVersion(execution, resourceName, processKey)
+		key = "mso.workflow.default.aai.v${version}.${resourceName}.uri"
+		uri = UrnPropertiesReader.getVariable(key, execution)
+
+		if(uri) {
+			msoLogger.debug("AaiUtil.getUri() - using versioned URI key: ${key}=${uri}")
+			return uri
+		}
+
+		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')
+	}
+
+	public String setNamespace(DelegateExecution execution) {
+		def key = AAI_NAMESPACE_STRING_KEY
+		aaiNamespace = UrnPropertiesReader.getVariable(key, execution)
+		if (aaiNamespace == null ) {
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')
+		}
+	}
+
+	/**
+	 * This method can be used for getting the building namespace out of uri.
+	 *  NOTE: A getUri() method needs to be invoked first.
+	 *        Alternative method is the getNamespaceFromUri(DelegateExecution execution, String uri)
+	 * return namespace (plus version from uri)
+	 *
+	 * @param url
+	 *
+	 * @return namespace
+	 */
+
+	public String getNamespaceFromUri(String uri) {
+		 if (aaiNamespace == null) {
+			throw new Exception('Internal Error: AAI Namespace has not been set yet. A getUri() method needs to be invoked first.')
+		}
+		String namespace = aaiNamespace
+		if(uri!=null){
+			String version = getVersionFromUri(uri)
+			return namespace + "v"+version
+		}else{
+			return namespace
+		}
+	}
+
+	/**
+	 * This method can be used for building namespace with aai version out of uri.
+	 *   NOTE: 2 arguments: DelegateExecution execution & String uri
+	 * @param execution
+	 * @param url
+	 *
+	 * @return namespace
+	 */
+	public String getNamespaceFromUri(DelegateExecution execution, String uri) {
+	   String namespace = UrnPropertiesReader.getVariable(AAI_NAMESPACE_STRING_KEY, execution)
+	   if (namespace == null ) {
+		   (new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + AAI_NAMESPACE_STRING_KEY + ' not defined in the MSO URN properties file')
+	   }
+	   if(uri!=null){
+		   String version = getVersionFromUri(uri)
+		   return namespace + "v"+version
+	   }else{
+		   return namespace
+	   }
+   }
+
+	/**
+	 * This is used to extract the version from uri.
+	 *
+	 * @param uri
+	 *
+	 * @return version
+	 */
+	private String getVersionFromUri(String uri) {
+		def version = ""
+		def savedVersion = ""
+		for (int x=2; x<6; x++) {
+			version = uri.substring(uri.indexOf("v")+1,  uri.indexOf("v")+x)
+			if (!Character.isDigit(version.charAt(version.size()-1))) {
+				break
+			}
+			savedVersion = version
+		}
+		return savedVersion
+	}
+
+
+	/**
+	 * This reusable method can be used for making AAI Get Calls. The url should
+	 * be passed as a parameter along with the execution.  The method will
+	 * return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIGetCall(DelegateExecution execution, String url){
+		msoLogger.trace("STARTED Execute AAI Get Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");
+
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.get()
+
+			msoLogger.trace("COMPLETED Execute AAI Get Process ")
+		}catch(Exception e){
+			msoLogger.debug("Exception occured while executing AAI Get Call. Exception is: \n" + e)
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+
+	/**
+	 * This reusable method can be used for making AAI httpPut Calls. The url should
+	 * be passed as a parameter along with the execution and payload.  The method will
+	 * return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 * @param payload
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIPutCall(DelegateExecution execution, String url, String payload){
+		msoLogger.trace("Started Execute AAI Put Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Content-Type", "application/xml").addHeader("Accept","application/xml");
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.httpPut(payload)
+
+			msoLogger.trace("Completed Execute AAI Put Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Put Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+	/**
+	 * This reusable method can be used for making AAI httpPatch Calls. The url should
+	 * be passed as a parameter along with the execution and payload.  The method will
+	 * return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 * @param payload
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIPatchCall(DelegateExecution execution, String url, String payload){
+		msoLogger.trace("Started Execute AAI Patch Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Content-Type", "application/merge-patch+json").addHeader("Accept","application/json");
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.httpPatch(payload)
+
+			msoLogger.trace("Completed Execute AAI Patch Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Patch Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+
+	/**
+	 * This reusable method can be used for making AAI Delete Calls. The url should
+	 * be passed as a parameter along with the execution.  The method will
+	 * return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIDeleteCall(DelegateExecution execution, String url){
+		msoLogger.trace("Started Execute AAI Delete Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.delete()
+
+			msoLogger.trace("Completed Execute AAI Delete Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Delete Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+	/**
+	 * This reusable method can be used for making AAI Delete Calls. The url should
+	 * be passed as a parameter along with the execution.  The method will
+	 * return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 * @param payload
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIDeleteCall(DelegateExecution execution, String url, String payload, String authHeader){
+		msoLogger.trace("Started Execute AAI Delete Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml").addAuthorizationHeader(authHeader);
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.httpDelete(payload)
+
+			msoLogger.trace("Completed Execute AAI Delete Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Delete Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+	/**
+	 * This reusable method can be used for making AAI Post Calls. The url
+	 * and payload should be passed as a parameters along with the execution.
+	 * The method will return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 * @param payload
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIPostCall(DelegateExecution execution, String url, String payload){
+		msoLogger.trace("Started Execute AAI Post Process ")
+		APIResponse apiResponse = null
+		try{
+			String uuid = utils.getRequestID()
+			msoLogger.debug("Generated uuid is: " + uuid)
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");
+
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.httpPost(payload)
+
+			msoLogger.trace("Completed Execute AAI Post Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Post Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+	/**
+	 * This reusable method can be used for making AAI Post Calls. The url
+	 * and payload should be passed as a parameters along with the execution.
+	 * The method will return an APIResponse.
+	 *
+	 * @param execution
+	 * @param url
+	 * @param payload
+	 * @param authenticationHeader - addAuthenticationHeader value
+	 * @param headerName - name of header you want to add, i.e. addHeader(headerName, headerValue)
+	 * @param headerValue - the header's value, i.e. addHeader(headerName, headerValue)
+	 *
+	 * @return APIResponse
+	 *
+	 */
+	public APIResponse executeAAIPostCall(DelegateExecution execution, String url, String payload, String authenticationHeaderValue, String headerName, String headerValue){
+		msoLogger.trace("Started Execute AAI Post Process ")
+		APIResponse apiResponse = null
+		try{
+			msoLogger.debug("URL to be used is: " + url)
+
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+
+			RESTConfig config = new RESTConfig(url);
+			RESTClient client = new RESTClient(config).addAuthorizationHeader(authenticationHeaderValue).addHeader(headerName, headerValue)
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			apiResponse = client.httpPost(payload)
+
+			msoLogger.trace("Completed Execute AAI Post Process ")
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while executing AAI Post Call.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return apiResponse
+	}
+
+
+	/* Utility to get the Cloud Region from AAI
+	 * Returns String cloud region id, (ie, cloud-region-id)
+	 * @param execution
+	 * @param url  - url for AAI get cloud region
+	 * @param backend - "PO" - real region, or "SDNC" - v2.5 (fake region).
+	 */
+
+	public String getAAICloudReqion(DelegateExecution execution, String url, String backend, inputCloudRegion){
+		String regionId = ""
+		try{
+			APIResponse apiResponse = executeAAIGetCall(execution, url)
+			String returnCode = apiResponse.getStatusCode()
+			String aaiResponseAsString = apiResponse.getResponseBodyAsString()
+			msoLogger.debug("Call AAI Cloud Region Return code: " + returnCode)
+			execution.setVariable(execution.getVariable("prefix")+"queryCloudRegionReturnCode", returnCode)
+
+			if(returnCode == "200"){
+				msoLogger.debug("Call AAI Cloud Region is Successful.")
+
+				String regionVersion = taskProcessor.utils.getNodeText(aaiResponseAsString, "cloud-region-version")
+				msoLogger.debug("Cloud Region Version from AAI for " + backend + " is: " + regionVersion)
+				if (backend == "PO") {
+					regionId = taskProcessor.utils.getNodeText(aaiResponseAsString, "cloud-region-id")
+				} else { // backend not "PO"
+					if (regionVersion == "2.5" ) {
+						regionId = "AAIAIC25"
+					} else {
+						regionId = taskProcessor.utils.getNodeText(aaiResponseAsString, "cloud-region-id")
+					}
+				}
+				if(regionId == null){
+					throw new BpmnError("MSOWorkflowException")
+				}
+				msoLogger.debug("Cloud Region Id from AAI " + backend + " is: " + regionId)
+			}else if (returnCode == "404"){ // not 200
+				if (backend == "PO") {
+					regionId = inputCloudRegion
+				}else{  // backend not "PO"
+					regionId = "AAIAIC25"
+				}
+				msoLogger.debug("Cloud Region value for code='404' of " + backend + " is: " + regionId)
+			}else{
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Call AAI Cloud Region is NOT Successful.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception occured while getting the Cloud Reqion.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.getMessage());
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+		}
+		return regionId
+	}
+
+	/* returns xml Node with service-type of searchValue */
+	def searchServiceType(xmlInput, searchValue){
+		def fxml= new XmlSlurper().parseText(xmlInput)
+		def ret = fxml.'**'.find {it.'service-type' == searchValue}
+		return ret
+	}
+
+	/* returns xml Node with service-instance-id of searchValue */
+	def searchServiceInstanceId(xmlInput, searchValue){
+		def ret = xmlInput.'**'.find {it.'service-instance-id' == searchValue}
+		return ret
+	}
+
+	/**
+	 * Get the lowest unused VF Module index from AAI response for a given module type. The criteria for
+	 * determining module type is specified by "key" parameter (for example, "persona-model-id"),
+	 * the value for filtering is specified in "value" parameter
+	 *
+	 * @param execution
+	 * @param aaiVnfResponse
+	 * @param key
+	 * @param value
+	 *
+	 * @return moduleIndex
+	 *
+	 */
+	public int getLowestUnusedVfModuleIndexFromAAIVnfResponse(DelegateExecution execution, String aaiVnfResponse, String key, String value) {
+		if (aaiVnfResponse != null) {
+			String vfModulesText = taskProcessor.utils.getNodeXml(aaiVnfResponse, "vf-modules")
+			if (vfModulesText == null || vfModulesText.isEmpty()) {
+				msoLogger.debug("There are no VF modules in this VNF yet")
+				return 0
+			}
+			else {
+				def xmlVfModules= new XmlSlurper().parseText(vfModulesText)
+				def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}
+				int vfModulesSize = 0
+				if (vfModules != null) {
+					vfModulesSize = vfModules.size()
+				}
+				String matchingVfModules = "<vfModules>"
+				for (i in 0..vfModulesSize-1) {
+					def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])
+					def keyFromAAI = taskProcessor.utils.getNodeText(vfModuleXml, key)
+					if (keyFromAAI != null && keyFromAAI.equals(value)) {
+						matchingVfModules = matchingVfModules + taskProcessor.utils.removeXmlPreamble(vfModuleXml)
+					}
+				}
+				matchingVfModules = matchingVfModules + "</vfModules>"
+				msoLogger.debug("Matching VF Modules: " + matchingVfModules)
+				String lowestUnusedIndex = taskProcessor.utils.getLowestUnusedIndex(matchingVfModules)
+				return Integer.parseInt(lowestUnusedIndex)
+			}
+		}
+		else {
+			return 0
+		}
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
index d3f3696fcf..1e2a703e70 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
@@ -1,787 +1,768 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import groovy.json.JsonSlurper

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.camunda.bpm.engine.variable.VariableMap

-import org.camunda.bpm.engine.variable.Variables

-import org.camunda.bpm.engine.variable.Variables.SerializationDataFormats

-import org.camunda.bpm.engine.variable.impl.value.ObjectValueImpl

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowCallbackResponse

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowContextHolder

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

-import org.springframework.web.util.UriUtils

-

-public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcessor {

-	public MsoUtils utils = new MsoUtils()

-

-

-	/**

-	 * Logs a message at the ERROR level.

-	 * @param message the message

-	 */

-	public void logError(String message) {

-		log('ERROR', message, null, "true")

-	}

-

-	/**

-	 * Logs a message at the ERROR level.

-	 * @param message the message

-	 * @param cause the cause (stracktrace will be included in the output)

-	 */

-	public void logError(String message, Throwable cause) {

-		log('ERROR', message, cause, "true")

-	}

-

-	/**

-	 * Logs a message at the WARN level.

-	 * @param message the message

-	 */

-	public void logWarn(String message) {

-		log('WARN', message, null, "true")

-	}

-

-	/**

-	 * Logs a message at the WARN level.

-	 * @param message the message

-	 * @param cause the cause (stracktrace will be included in the output)

-	 */

-	public void logWarn(String message, Throwable cause) {

-		log('WARN', message, cause, "true")

-	}

-

-	/**

-	 * Logs a message at the DEBUG level.

-	 * @param message the message

-	 * @param isDebugLogEnabled a flag indicating if DEBUG level is enabled

-	 */

-	public void logDebug(String message, String isDebugLogEnabled) {

-		log('DEBUG', message, null, isDebugLogEnabled)

-	}

-

-	/**

-	 * Logs a message at the DEBUG level.

-	 * @param message the message

-	 * @param cause the cause (stracktrace will be included in the output)

-	 * @param isDebugLogEnabled a flag indicating if DEBUG level is enabled

-	 */

-	public void logDebug(String message, Throwable cause, String isDebugLogEnabled) {

-		log('DEBUG', message, cause, isDebugLogEnabled)

-	}

-

-	/**

-	 * Logs a message at the specified level.

-	 * @param level the level (DEBUG, INFO, WARN, ERROR)

-	 * @param message the message

-	 * @param isLevelEnabled a flag indicating if the level is enabled

-	 *        (used only at the DEBUG level)

-	 */

-	public void log(String level, String message, String isLevelEnabled) {

-		log(level, message,  null, isLevelEnabled)

-	}

-

-	/**

-	 * Logs a message at the specified level.

-	 * @param level the level (DEBUG, INFO, WARN, ERROR)

-	 * @param message the message

-	 * @param cause the cause (stracktrace will be included in the output)

-	 * @param isLevelEnabled a flag indicating if the level is enabled

-	 *        (used only at the DEBUG level)

-	 */

-	public void log(String level, String message, Throwable cause, String isLevelEnabled) {

-		if (cause == null) {

-			utils.log(level, message, isLevelEnabled);

-		} else {

-			StringWriter stringWriter = new StringWriter();

-			PrintWriter printWriter = new PrintWriter(stringWriter);

-			printWriter.println(message);

-			cause.printStackTrace(printWriter);

-			utils.log(level, stringWriter.toString(), isLevelEnabled);

-			printWriter.close();

-		}

-	}

-

-	/**

-	 * Logs a WorkflowException at the ERROR level with the specified message.

-	 * @param execution the execution

-	 */

-	public void logWorkflowException(DelegateExecution execution, String message) {

-		def workflowException = execution.getVariable("WorkflowException")

-

-		if (workflowException == null) {

-			logError(message);

-		} else {

-			logError(message + ": " + workflowException)

-		}

-	}

-

-	/**

-	 * Saves the WorkflowException in the execution to the specified variable,

-	 * clearing the WorkflowException variable so the workflow can continue

-	 * processing (perhaps catching another WorkflowException).

-	 * @param execution the execution

-	 * @return the name of the destination variable

-	 */

-	public saveWorkflowException(DelegateExecution execution, String variable) {

-		if (variable == null) {

-			throw new NullPointerException();

-		}

-

-		execution.setVariable(variable, execution.getVariable("WorkflowException"))

-		execution.setVariable("WorkflowException", null)

-	}

-

-

-	/**

-	 * Validates that the request exists and that the mso-request-id variable is set.

-	 * Additional required variables may be checked by specifying their names.

-	 * NOTE: services requiring mso-service-instance-id must specify it explicitly!

-	 * If a problem is found, buildAndThrowWorkflowException builds a WorkflowException

-	 * and throws an MSOWorkflowException.  This method also sets up the log context for

-	 * the workflow.

-	 *

-	 * @param execution the execution

-	 * @return the validated request

-	 */

-	public String validateRequest(DelegateExecution execution, String... requiredVariables) {

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		def method = getClass().getSimpleName() + '.validateRequest(' +

-			'execution=' + execution.getId() +

-			', requredVariables=' + requiredVariables +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		String processKey = getProcessKey(execution)

-		def prefix = execution.getVariable("prefix")

-

-		if (prefix == null) {

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " prefix is null")

-		}

-

-		try {

-			def request = execution.getVariable(prefix + 'Request')

-

-			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) {

-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request is null")

-			}

-

-			// All requests must have a request ID.

-			// Some requests (e.g. SDN-MOBILITY) do not have a service instance ID.

-

-			String requestId = null

-			String serviceInstanceId = null

-

-			List<String> allRequiredVariables = new ArrayList<String>()

-			allRequiredVariables.add("mso-request-id")

-

-			if (requiredVariables != null) {

-				for (String variable : requiredVariables) {

-					if (!allRequiredVariables.contains(variable)) {

-						allRequiredVariables.add(variable)

-					}

-				}

-			}

-

-			for (String variable : allRequiredVariables) {

-				def value = execution.getVariable(variable)

-				if (value == null || ((value instanceof CharSequence) && value.length() == 0)) {

-					exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey +

-						" request was received with no '" + variable + "' variable")

-				}

-

-				if ("mso-request-id".equals(variable)) {

-					requestId = (String) value

-				} else if ("mso-service-instance-id".equals(variable)) {

-					serviceInstanceId = (String) value

-				}

-			}

-

-			if (serviceInstanceId == null) {

-				serviceInstanceId = (String) execution.getVariable("mso-service-instance-id")

-			}

-

-			utils.logContext(requestId, serviceInstanceId)

-			logDebug('Incoming message: ' + System.lineSeparator() + request, isDebugLogEnabled)

-			logDebug('Exited ' + method, isDebugLogEnabled)

-			return request

-		} catch (BpmnError e) {

-			throw e

-		} catch (Exception e) {

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

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Invalid Message")

-		}

-	}

-

-	/**

-	 * gets vars stored in a JSON object in prefix+Request and returns as a LazyMap

-	 * setting log context here too

-	 * @param execution the execution

-	 * @return the inputVars

-	 */

-	public Map validateJSONReq(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.validateJSONReq(' +

-				'execution=' + execution.getId() +

-				')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		String processKey = getProcessKey(execution);

-		def prefix = execution.getVariable("prefix")

-

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

-		def serviceInstanceId = getVariable(execution, "mso-service-instance-id")

-		if(requestId!=null && serviceInstanceId!=null){

-			utils.logContext(requestId, serviceInstanceId)

-		}

-

-

-		def request = getVariable(execution, prefix + 'Request')

-

-		if (request == null) {

-			request = getVariable(execution, processKey + 'Request')

-

-			if (request == null) {

-				request = getVariable(execution, 'bpmnRequest')

-			}

-			execution.setVariable(prefix + 'Request', request)

-		}

-

-		def jsonSlurper = new JsonSlurper()

-		def parsed = jsonSlurper.parseText(request)

-

-

-		logDebug('Incoming message: ' + System.lineSeparator() + request, isDebugLogEnabled)

-		logDebug('Exited ' + method, isDebugLogEnabled)

-		return parsed

-

-	}

-

-	/**

-	 * Sends a response to the workflow service that invoked the process.  This method

-	 * may only be used by top-level processes that were directly invoked by the

-	 * asynchronous workflow service.

-	 * @param execution the execution

-	 * @param responseCode the response code

-	 * @param content the message content

-	 * @throws IllegalArgumentException if the response code is invalid

-	 *         by HTTP standards

-	 * @throws UnsupportedOperationException if not invoked by an asynchronous,

-	 *         top-level process

-	 * @throws IllegalStateException if a response has already been sent

-	 */

-	protected void sendWorkflowResponse(DelegateExecution execution, Object responseCode, String response) {

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

-		try {

-			String processKey = getProcessKey(execution);

-

-			// isAsyncProcess is injected by the workflow service that started the flow

-			if (!String.valueOf(execution.getVariable("isAsyncProcess")).equals("true")) {

-				throw new UnsupportedOperationException(processKey + ": " +

-					"sendWorkflowResponse is valid only in asynchronous workflows");

-			}

-

-			if (String.valueOf(execution.getVariable(processKey + "WorkflowResponseSent")).equals("true")) {

-					logDebug("Sync response has already been sent for " + processKey, isDebugLogEnabled)

-			}else{

-

-				logDebug("Building " + processKey + " response ", isDebugLogEnabled)

-

-				int intResponseCode;

-

-				try {

-					intResponseCode = Integer.parseInt(String.valueOf(responseCode));

-

-					if (intResponseCode < 100 || intResponseCode > 599) {

-						throw new NumberFormatException(String.valueOf(responseCode));

-					}

-				} catch (NumberFormatException e) {

-					throw new IllegalArgumentException("Process " + processKey

-						+ " provided an invalid HTTP response code: " + responseCode);

-				}

-

-				// Only 2XX responses are considered "Success"

-				String status = (intResponseCode >= 200 && intResponseCode <= 299) ?

-					"Success" : "Fail";

-

-				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead

-				execution.setVariable(processKey + "ResponseCode", String.valueOf(intResponseCode))

-				execution.setVariable(processKey + "Response", response);

-				execution.setVariable(processKey + "Status", status);

-				execution.setVariable("WorkflowResponse", response)

-

-				logDebug("Sending response for " + processKey

-					+ " ResponseCode=" + intResponseCode

-					+ " Status=" + status

-					+ " Response=\n" + response,

-					isDebugLogEnabled)

-

-				// TODO: ensure that this flow was invoked asynchronously?

-

-				WorkflowCallbackResponse callbackResponse = new WorkflowCallbackResponse()

-				callbackResponse.setStatusCode(intResponseCode)

-				callbackResponse.setMessage(status)

-				callbackResponse.setResponse(response)

-

-				// TODO: send this data with HTTP POST

-

-				WorkflowContextHolder.getInstance().processCallback(

-					processKey,

-					execution.getProcessInstanceId(),

-					execution.getVariable("mso-request-id"),

-					callbackResponse)

-

-				execution.setVariable(processKey + "WorkflowResponseSent", "true");

-			}

-

-		} catch (Exception ex) {

-			logError("Unable to send workflow response to client ....", ex)

-		}

-	}

-

-	/**

-	 * Returns true if a workflow response has already been sent.

-	 * @param execution the execution

-	 */

-	protected boolean isWorkflowResponseSent(DelegateExecution execution) {

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

-		String processKey = getProcessKey(execution);

-		return String.valueOf(execution.getVariable(processKey + "WorkflowResponseSent")).equals("true");

-	}

-

-	/**

-	 * Returns the process definition key (i.e. the process name) of the

-	 * current process.

-	 * 

-	 * @param execution the execution

-	 */

-	public String getProcessKey(DelegateExecution execution) {

-		def testKey = execution.getVariable("testProcessKey")

-		if(testKey!=null){

-			return testKey

-		}

-		return execution.getProcessEngineServices().getRepositoryService()

-			.getProcessDefinition(execution.getProcessDefinitionId()).getKey()

-	}

-

-	/**

-	 * Returns the process definition key (i.e. the process name) of the

-	 * top-level process.

-	 * @param execution the execution

-	 */

-	public String getMainProcessKey(DelegateExecution execution) {

-		DelegateExecution exec = execution

-

-		while (true) {

-			DelegateExecution parent = exec.getSuperExecution()

-

-			if (parent == null) {

-				parent = exec.getParent()

-

-				if (parent == null) {

-					break

-				}

-			}

-

-			exec = parent

-		}

-

-		return execution.getProcessEngineServices().getRepositoryService()

-			.getProcessDefinition(exec.getProcessDefinitionId()).getKey()

-	}

-

-	/**

-	 * Gets the node for the named element from the given xml. If the element

-	 * does not exist in the xml or is empty, a WorkflowException is created

-	 * (and as a result, a MSOWorkflowException event is thrown).

-	 *

-	 * @param execution The flow's execution.

-	 * @param xml Xml to search.

-	 * @param elementName Name of element to search for.

-	 * @return The element node, if found in the xml.

-	 */

-	protected String getRequiredNodeXml(DelegateExecution execution, String xml, String elementName) {

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		def element = utils.getNodeXml(xml, elementName, false)

-		if (element.trim().isEmpty()) {

-			def msg = 'Required element \'' + elementName + '\' is missing or empty'

-			logError(msg)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-		} else {

-			return element

-		}

-	}

-

-	/**

-	 * Gets the value of the named element from the given xml. If the element

-	 * does not exist in the xml or is empty, a WorkflowException is created

-	 * (and as a result, a MSOWorkflowException event is thrown).

-	 *

-	 * @param execution The flow's execution.

-	 * @param xml Xml to search.

-	 * @param elementName Name of element to whose value to get.

-	 * @return The non-empty value of the element, if found in the xml.

-	 */

-	protected String getRequiredNodeText(DelegateExecution execution, String xml, String elementName) {

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		def elementText = utils.getNodeText1(xml, elementName)

-		if ((elementText == null) || (elementText.isEmpty())) {

-			def msg = 'Required element \'' + elementName + '\' is missing or empty'

-			logError(msg)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-		} else {

-			return elementText

-		}

-	}

-

-	/**

-	 * Get the text for the specified element from the specified xml.  If

-	 * the element does not exist, return the specified default value.

-	 *

-	 * @param xml Xml from which to get the element's text

-	 * @param elementName Name of element whose text to get

-	 * @param defaultValue the default value

-	 * @return the element's text or the default value if the element does not

-	 * exist in the given xml

-	 */

-	protected String getNodeText(String xml, String elementName, String defaultValue) {

-		def nodeText = utils.getNodeText1(xml, elementName)

-		return (nodeText == null) ? defaultValue : nodeText

-	}

-

-	/**

-	 * Get the text for the specified element from the specified xml.  If

-	 * the element does not exist, return an empty string.

-	 *

-	 * @param xml Xml from which to get the element's text.

-	 * @param elementName Name of element whose text to get.

-	 * @return the element's text or an empty string if the element does not

-	 * exist in the given xml.

-	 */

-	protected String getNodeTextForce(String xml, String elementName) {

-		return getNodeText(xml, elementName, '');

-	}

-

-	/**

-	*Store the variable as typed with java serialization type

-	*@param execution

-	*@param name

-	*@param value

-	*/

-	public void setVariable(DelegateExecution execution, String name, Object value) {

-		VariableMap variables = Variables.createVariables()

-		variables.putValueTyped('payload', Variables.objectValue(value)

-		.serializationDataFormat(SerializationDataFormats.JAVA) // tells the engine to use java serialization for persisting the value

-		.create())

-		execution.setVariable(name,variables)

-	}

-

-	//TODO not sure how this will look in Cockpit

-

-	/**

-	 * Returns the variable map

-	*@param execution

-	*@param name

-	*@return

-	**/

-	public String getVariable(DelegateExecution execution, String name) {

-		def myObj = execution.getVariable(name)

-		if(myObj instanceof VariableMap){

-			VariableMap serializedObjectMap = (VariableMap) myObj

-			ObjectValueImpl payloadObj = serializedObjectMap.getValueTyped('payload')

-			return payloadObj.getValue()

-		}else{

-			return myObj

-		}

-	}

-

-

-	/**

-	 * Returns true if a value equals one of the provided set. Equality is

-	 * determined by using the equals method if the value object and the

-	 * object in the provided set have the same class. Otherwise, the objects

-	 * are converted to strings and then compared.  Nulls are permitted for

-	 * the value as well as in the provided set

-	 * Example:

-	 * <pre>

-	 *     def statusCode = getStatusCode()

-	 *     isOneOf(statusCode, 200, 201, 204)

-	 * </pre>

-	 * @param value the value to test

-	 * @param these a set of permissable values

-	 * @return true if the value is in the provided set

-	 */

-	public boolean isOneOf(Object value, Object... these) {

-		for (Object thisOne : these) {

-			if (thisOne == null) {

-				if (value == null) {

-					return true

-				}

-			} else {

-				if (value != null) {

-					if (value.getClass() == thisOne.getClass()) {

-						if (value.equals(thisOne)) {

-							return true

-						}

-					} else {

-						if (String.valueOf(value).equals(String.valueOf(thisOne))) {

-							return true

-						}

-					}

-				}

-			}

-		}

-		return false

-	}

-

-	/**

-	 * Sets flows success indicator variable.

-	 *

-	 */

-	public void setSuccessIndicator(DelegateExecution execution, boolean isSuccess) {

-		String prefix = execution.getVariable('prefix')

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

-

-		logDebug('Entered SetSuccessIndicator Method', isDebugLogEnabled)

-		execution.setVariable(prefix+'SuccessIndicator', isSuccess)

-		logDebug('Outgoing SuccessIndicator is: ' + execution.getVariable(prefix+'SuccessIndicator') + '', isDebugLogEnabled)

-	}

-

-	/**

-	 * Sends a Error Sync Response

-	 *

-	 */

-	public void sendSyncError(DelegateExecution execution) {

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

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

-		logDebug('sendSyncError, requestId: ' + requestId, isDebugEnabled)

-		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")

-		if (workflowExceptionObj != null) {

-			String errorMessage = workflowExceptionObj.getErrorMessage()

-			def errorCode = workflowExceptionObj.getErrorCode()

-			logDebug('sendSyncError, requestId: '  + requestId + ' | errorMessage: ' + errorMessage + ' | errorCode: ' + errorCode, isDebugEnabled)

-			sendWorkflowResponse(execution, errorCode, errorMessage)

-		}

-	}

-

-	/**

-	 * Executes a named groovy script method in the current object

-	 */

-	public void executeMethod(String methodName, Object... args) {

-

-		if (args != null && args.size() > 0) {

-

-			// First argument of method to call is always the execution object

-			DelegateExecution execution = (DelegateExecution) args[0]

-

-			def classAndMethod = getClass().getSimpleName() + '.' + methodName + '(execution=' + execution.getId() + ')'

-			def isDebugEnabled =  execution.getVariable('isDebugLogEnabled')

-

-			logDebug('Entered ' + classAndMethod, isDebugEnabled)

-			logDebug('Received parameters: ' + args, isDebugEnabled)

-

-			try{

-				def methodToCall = this.metaClass.getMetaMethod(methodName, args)

-				logDebug('Method to call: ' + methodToCall, isDebugEnabled)

-				methodToCall?.invoke(this, args)

-			}

-			catch(BpmnError bpmnError) {

-				logDebug('Rethrowing BpmnError ' + bpmnError.getMessage(), isDebugEnabled)

-				throw bpmnError

-			}

-			catch(Exception e) {

-				e.printStackTrace()

-				logDebug('Unexpected error encountered - ' + e.getMessage(), isDebugEnabled)

-				(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())

-			}

-			finally {

-				logDebug('Exited ' + classAndMethod, isDebugEnabled)

-			}

-		}

-	}

-

-	/**

-	 *This method determines and adds the appropriate ending to come

-	 *after a number (-st, -nd, -rd, or -th)

-	 *

-	 *@param int n

-	 *

-	 *@return String ending - number with suffix

-	 */

-	public static String labelMaker(Object n) {

-		Integer num

-		if(n instanceof String){

-			num = Integer.parseInt(n)

-		}else{

-			num = n

-		}

-

-		String ending = ""; //the end to be added to the number

-		if(num != null){

-		if ((num % 10 == 1) && (num != 11)) {

-			ending = num + "st";

-			} else if ((num % 10 == 2) && (num != 12)) {

-			ending = num + "nd";

-			} else if ((num % 10 == 3) && (num != 13)) {

-			ending = num + "rd";

-			} else {

-			ending = num + "th";

-		}

-		}

-		return ending

-	}

-

-	/**

-	 *

-	 *This method gets and decodes SDNC Response's "RequestData".

-	 *

-	 *@param response - the sdnc response

-	 *

-	 *@return data - the response "RequestData" decoded

-	 *

-	 */

-	public String getRequestDataDecoded(String response){

-		String data = utils.getNodeText1(response, "RequestData")

-		if(data != null){

-			data = data.replaceAll("&lt;", "<")

-			data = data.replaceAll("&gt;", ">")

-		}

-

-		return data

-	}

-

-

-	/**

-	 * Constructs a workflow message callback URL for the specified message type and correlator.

-	 * This type of callback URL is used when a workflow wants an MSO adapter (like the SDNC

-	 * adapter) to call it back.  In other words, this is for callbacks internal to the MSO

-	 * complex.  Use <code>createWorkflowMessageAdapterCallbackURL</code> if the callback

-	 * will come from outside the MSO complex.

-	 * @param messageType the message type (e.g. SDNCAResponse or VNFAResponse)

-	 * @param correlator the correlator value (e.g. a request ID)

-	 */

-	public String createCallbackURL(DelegateExecution execution, String messageType, String correlator) {

-		String endpoint = (String) execution.getVariable('URN_mso_workflow_message_endpoint')

-

-		if (endpoint == null || endpoint.isEmpty()) {

-			ExceptionUtil exceptionUtil = new ExceptionUtil()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000,

-				'mso:workflow:message:endpoint URN mapping is not set')

-		}

-

-		while (endpoint.endsWith('/')) {

-			endpoint = endpoint.substring(0, endpoint.length()-1)

-		}

-

-		return endpoint +

-			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +

-			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')

-	}

-

-	/**

-	 *

-	 * Constructs a workflow message callback URL for the specified message type and correlator.

-	 * This type of callback URL is used when a workflow wants a system outside the MSO complex

-	 * to call it back through the Workflow Message Adapter.

-	 * @param messageType the message type (e.g. SNIROResponse)

-	 * @param correlator the correlator value (e.g. a request ID)

-	 */

-	public String createWorkflowMessageAdapterCallbackURL(DelegateExecution execution, String messageType, String correlator) {

-		String endpoint = (String) execution.getVariable('URN_mso_adapters_workflow_message_endpoint')

-

-		if (endpoint == null || endpoint.isEmpty()) {

-			ExceptionUtil exceptionUtil = new ExceptionUtil()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000,

-				'mso:adapters:workflow:message:endpoint URN mapping is not set')

-		}

-

-		while (endpoint.endsWith('/')) {

-			endpoint = endpoint.substring(0, endpoint.length()-1)

-		}

-

-		return endpoint +

-			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +

-			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')

-	}

-	

-	public void setRollbackEnabled(DelegateExecution execution, isDebugLogEnabled) {

-		

-		// Rollback settings

-		def prefix = execution.getVariable('prefix')

-		def disableRollback = execution.getVariable("disableRollback")

-		def defaultRollback = execution.getVariable("URN_mso_rollback").toBoolean()

-		

-		logDebug('disableRollback: ' + disableRollback, isDebugLogEnabled)

-		logDebug('defaultRollback: ' + defaultRollback, isDebugLogEnabled)

-		

-		def rollbackEnabled

-		

-		if(disableRollback == null || disableRollback == '' ) {

-			// get from default urn settings for mso_rollback

-			disableRollback = !defaultRollback

-			rollbackEnabled = defaultRollback

-			logDebug('disableRollback is null or empty!', isDebugLogEnabled)

-		}

-		else {

-			if(disableRollback == true) {

-				rollbackEnabled = false

-			}

-			else if(disableRollback == false){

-				rollbackEnabled = true

-			}

-			else {

-				rollbackEnabled = defaultRollback

-			}

-		}

-		

-		execution.setVariable(prefix+"backoutOnFailure", rollbackEnabled)

-		logDebug('rollbackEnabled (aka backoutOnFailure): ' + rollbackEnabled, isDebugLogEnabled)

-	}

-	

-	public void setBasicDBAuthHeader(DelegateExecution execution, isDebugLogEnabled) {

-		try {

-			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)

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-		}

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import groovy.json.JsonSlurper
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.camunda.bpm.engine.variable.VariableMap
+import org.camunda.bpm.engine.variable.Variables
+import org.camunda.bpm.engine.variable.Variables.SerializationDataFormats
+import org.camunda.bpm.engine.variable.impl.value.ObjectValueImpl
+import org.onap.so.bpmn.common.workflow.context.WorkflowCallbackResponse
+import org.onap.so.bpmn.common.workflow.context.WorkflowContextHolder
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.springframework.web.util.UriUtils
+
+public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcessor {
+	public MsoUtils utils = new MsoUtils()
+
+
+	/**
+	 * Logs a message at the ERROR level.
+	 * @param message the message
+	 */
+	public void logError(String message) {
+		log('ERROR', message, null, "true")
+	}
+
+	/**
+	 * Logs a message at the ERROR level.
+	 * @param message the message
+	 * @param cause the cause (stracktrace will be included in the output)
+	 */
+	public void logError(String message, Throwable cause) {
+		log('ERROR', message, cause, "true")
+	}
+
+	/**
+	 * Logs a message at the WARN level.
+	 * @param message the message
+	 */
+	public void logWarn(String message) {
+		log('WARN', message, null, "true")
+	}
+
+	/**
+	 * Logs a message at the WARN level.
+	 * @param message the message
+	 * @param cause the cause (stracktrace will be included in the output)
+	 */
+	public void logWarn(String message, Throwable cause) {
+		log('WARN', message, cause, "true")
+	}
+
+	/**
+	 * Logs a message at the DEBUG level.
+	 * @param message the message
+	 * @param isDebugLogEnabled a flag indicating if DEBUG level is enabled
+	 */
+	public void logDebug(String message, String isDebugLogEnabled) {
+		log('DEBUG', message, null, isDebugLogEnabled)
+	}
+
+	/**
+	 * Logs a message at the DEBUG level.
+	 * @param message the message
+	 * @param cause the cause (stracktrace will be included in the output)
+	 * @param isDebugLogEnabled a flag indicating if DEBUG level is enabled
+	 */
+	public void logDebug(String message, Throwable cause, String isDebugLogEnabled) {
+		log('DEBUG', message, cause, isDebugLogEnabled)
+	}
+
+	/**
+	 * Logs a message at the specified level.
+	 * @param level the level (DEBUG, INFO, WARN, ERROR)
+	 * @param message the message
+	 * @param isLevelEnabled a flag indicating if the level is enabled
+	 *        (used only at the DEBUG level)
+	 */
+	public void log(String level, String message, String isLevelEnabled) {
+		log(level, message,  null, isLevelEnabled)
+	}
+
+	/**
+	 * Logs a message at the specified level.
+	 * @param level the level (DEBUG, INFO, WARN, ERROR)
+	 * @param message the message
+	 * @param cause the cause (stracktrace will be included in the output)
+	 * @param isLevelEnabled a flag indicating if the level is enabled
+	 *        (used only at the DEBUG level)
+	 */
+	public void log(String level, String message, Throwable cause, String isLevelEnabled) {
+		if (cause == null) {
+			utils.log(level, message, isLevelEnabled);
+		} else {
+			StringWriter stringWriter = new StringWriter();
+			PrintWriter printWriter = new PrintWriter(stringWriter);
+			printWriter.println(message);
+			cause.printStackTrace(printWriter);
+			utils.log(level, stringWriter.toString(), isLevelEnabled);
+			printWriter.close();
+		}
+	}
+
+	/**
+	 * Logs a WorkflowException at the ERROR level with the specified message.
+	 * @param execution the execution
+	 */
+	public void logWorkflowException(DelegateExecution execution, String message) {
+		def workflowException = execution.getVariable("WorkflowException")
+
+		if (workflowException == null) {
+			logError(message);
+		} else {
+			logError(message + ": " + workflowException)
+		}
+	}
+
+	/**
+	 * Saves the WorkflowException in the execution to the specified variable,
+	 * clearing the WorkflowException variable so the workflow can continue
+	 * processing (perhaps catching another WorkflowException).
+	 * @param execution the execution
+	 * @return the name of the destination variable
+	 */
+	public saveWorkflowException(DelegateExecution execution, String variable) {
+		if (variable == null) {
+			throw new NullPointerException();
+		}
+
+		execution.setVariable(variable, execution.getVariable("WorkflowException"))
+		execution.setVariable("WorkflowException", null)
+	}
+
+
+	/**
+	 * Validates that the request exists and that the mso-request-id variable is set.
+	 * Additional required variables may be checked by specifying their names.
+	 * NOTE: services requiring mso-service-instance-id must specify it explicitly!
+	 * If a problem is found, buildAndThrowWorkflowException builds a WorkflowException
+	 * and throws an MSOWorkflowException.  This method also sets up the log context for
+	 * the workflow.
+	 *
+	 * @param execution the execution
+	 * @return the validated request
+	 */
+	public String validateRequest(DelegateExecution execution, String... requiredVariables) {
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+		def method = getClass().getSimpleName() + '.validateRequest(' +
+			'execution=' + execution.getId() +
+			', requredVariables=' + requiredVariables +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		String processKey = getProcessKey(execution)
+		def prefix = execution.getVariable("prefix")
+
+		if (prefix == null) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " prefix is null")
+		}
+
+		try {
+			def request = execution.getVariable(prefix + 'Request')
+
+			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) {
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request is null")
+			}
+
+			// All requests must have a request ID.
+			// Some requests (e.g. SDN-MOBILITY) do not have a service instance ID.
+
+			String requestId = null
+			String serviceInstanceId = null
+
+			List<String> allRequiredVariables = new ArrayList<String>()
+			allRequiredVariables.add("mso-request-id")
+
+			if (requiredVariables != null) {
+				for (String variable : requiredVariables) {
+					if (!allRequiredVariables.contains(variable)) {
+						allRequiredVariables.add(variable)
+					}
+				}
+			}
+
+			for (String variable : allRequiredVariables) {
+				def value = execution.getVariable(variable)
+				if (value == null || ((value instanceof CharSequence) && value.length() == 0)) {
+					exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey +
+						" request was received with no '" + variable + "' variable")
+				}
+
+				if ("mso-request-id".equals(variable)) {
+					requestId = (String) value
+				} else if ("mso-service-instance-id".equals(variable)) {
+					serviceInstanceId = (String) value
+				}
+			}
+
+			if (serviceInstanceId == null) {
+				serviceInstanceId = (String) execution.getVariable("mso-service-instance-id")
+			}
+
+			utils.logContext(requestId, serviceInstanceId)
+			logDebug('Incoming message: ' + System.lineSeparator() + request, isDebugLogEnabled)
+			logDebug('Exited ' + method, isDebugLogEnabled)
+			return request
+		} catch (BpmnError e) {
+			throw e
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Invalid Message")
+		}
+	}
+
+	/**
+	 * gets vars stored in a JSON object in prefix+Request and returns as a LazyMap
+	 * setting log context here too
+	 * @param execution the execution
+	 * @return the inputVars
+	 */
+	public Map validateJSONReq(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.validateJSONReq(' +
+				'execution=' + execution.getId() +
+				')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		String processKey = getProcessKey(execution);
+		def prefix = execution.getVariable("prefix")
+
+		def requestId =getVariable(execution, "mso-request-id")
+		def serviceInstanceId = getVariable(execution, "mso-service-instance-id")
+		if(requestId!=null && serviceInstanceId!=null){
+			utils.logContext(requestId, serviceInstanceId)
+		}
+
+
+		def request = getVariable(execution, prefix + 'Request')
+
+		if (request == null) {
+			request = getVariable(execution, processKey + 'Request')
+
+			if (request == null) {
+				request = getVariable(execution, 'bpmnRequest')
+			}
+			execution.setVariable(prefix + 'Request', request)
+		}
+
+		def jsonSlurper = new JsonSlurper()
+		def parsed = jsonSlurper.parseText(request)
+
+
+		logDebug('Incoming message: ' + System.lineSeparator() + request, isDebugLogEnabled)
+		logDebug('Exited ' + method, isDebugLogEnabled)
+		return parsed
+
+	}
+
+	/**
+	 * Sends a response to the workflow service that invoked the process.  This method
+	 * may only be used by top-level processes that were directly invoked by the
+	 * asynchronous workflow service.
+	 * @param execution the execution
+	 * @param responseCode the response code
+	 * @param content the message content
+	 * @throws IllegalArgumentException if the response code is invalid
+	 *         by HTTP standards
+	 * @throws UnsupportedOperationException if not invoked by an asynchronous,
+	 *         top-level process
+	 * @throws IllegalStateException if a response has already been sent
+	 */
+	protected void sendWorkflowResponse(DelegateExecution execution, Object responseCode, String response) {
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		try {
+			String processKey = getProcessKey(execution);
+
+			// isAsyncProcess is injected by the workflow service that started the flow
+			if (!String.valueOf(execution.getVariable("isAsyncProcess")).equals("true")) {
+				throw new UnsupportedOperationException(processKey + ": " +
+					"sendWorkflowResponse is valid only in asynchronous workflows");
+			}
+
+			if (String.valueOf(execution.getVariable(processKey + "WorkflowResponseSent")).equals("true")) {
+					logDebug("Sync response has already been sent for " + processKey, isDebugLogEnabled)
+			}else{
+
+				logDebug("Building " + processKey + " response ", isDebugLogEnabled)
+
+				int intResponseCode;
+
+				try {
+					intResponseCode = Integer.parseInt(String.valueOf(responseCode));
+
+					if (intResponseCode < 100 || intResponseCode > 599) {
+						throw new NumberFormatException(String.valueOf(responseCode));
+					}
+				} catch (NumberFormatException e) {
+					throw new IllegalArgumentException("Process " + processKey
+						+ " provided an invalid HTTP response code: " + responseCode);
+				}
+
+				// Only 2XX responses are considered "Success"
+				String status = (intResponseCode >= 200 && intResponseCode <= 299) ?
+					"Success" : "Fail";
+
+				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
+				execution.setVariable(processKey + "ResponseCode", String.valueOf(intResponseCode))
+				execution.setVariable(processKey + "Response", response);
+				execution.setVariable(processKey + "Status", status);
+				execution.setVariable("WorkflowResponse", response)
+
+				logDebug("Sending response for " + processKey
+					+ " ResponseCode=" + intResponseCode
+					+ " Status=" + status
+					+ " Response=\n" + response,
+					isDebugLogEnabled)
+
+				// TODO: ensure that this flow was invoked asynchronously?
+
+				WorkflowCallbackResponse callbackResponse = new WorkflowCallbackResponse()
+				callbackResponse.setStatusCode(intResponseCode)
+				callbackResponse.setMessage(status)
+				callbackResponse.setResponse(response)
+
+				// TODO: send this data with HTTP POST
+
+				WorkflowContextHolder.getInstance().processCallback(
+					processKey,
+					execution.getProcessInstanceId(),
+					execution.getVariable("mso-request-id"),
+					callbackResponse)
+
+				execution.setVariable(processKey + "WorkflowResponseSent", "true");
+			}
+
+		} catch (Exception ex) {
+			logError("Unable to send workflow response to client ....", ex)
+		}
+	}
+
+	/**
+	 * Returns true if a workflow response has already been sent.
+	 * @param execution the execution
+	 */
+	protected boolean isWorkflowResponseSent(DelegateExecution execution) {
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		String processKey = getProcessKey(execution);
+		return String.valueOf(execution.getVariable(processKey + "WorkflowResponseSent")).equals("true");
+	}
+
+	/**
+	 * Returns the process definition key (i.e. the process name) of the
+	 * current process.
+	 * 
+	 * @param execution the execution
+	 */
+	public String getProcessKey(DelegateExecution execution) {
+		def testKey = execution.getVariable("testProcessKey")
+		if(testKey!=null){
+			return testKey
+		}
+		return execution.getProcessEngineServices().getRepositoryService()
+			.getProcessDefinition(execution.getProcessDefinitionId()).getKey()
+	}
+
+	/**
+	 * Returns the process definition key (i.e. the process name) of the
+	 * top-level process.
+	 * @param execution the execution
+	 */
+	public String getMainProcessKey(DelegateExecution execution) {
+		DelegateExecution exec = execution
+
+		while (true) {
+			DelegateExecution parent = exec.getSuperExecution()
+
+			if (parent == null) {
+				parent = exec.getParent()
+
+				if (parent == null) {
+					break
+				}
+			}
+
+			exec = parent
+		}
+
+		return execution.getProcessEngineServices().getRepositoryService()
+			.getProcessDefinition(exec.getProcessDefinitionId()).getKey()
+	}
+
+	/**
+	 * Gets the node for the named element from the given xml. If the element
+	 * does not exist in the xml or is empty, a WorkflowException is created
+	 * (and as a result, a MSOWorkflowException event is thrown).
+	 *
+	 * @param execution The flow's execution.
+	 * @param xml Xml to search.
+	 * @param elementName Name of element to search for.
+	 * @return The element node, if found in the xml.
+	 */
+	protected String getRequiredNodeXml(DelegateExecution execution, String xml, String elementName) {
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+		def element = utils.getNodeXml(xml, elementName, false)
+		if (element.trim().isEmpty()) {
+			def msg = 'Required element \'' + elementName + '\' is missing or empty'
+			logError(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+		} else {
+			return element
+		}
+	}
+
+	/**
+	 * Gets the value of the named element from the given xml. If the element
+	 * does not exist in the xml or is empty, a WorkflowException is created
+	 * (and as a result, a MSOWorkflowException event is thrown).
+	 *
+	 * @param execution The flow's execution.
+	 * @param xml Xml to search.
+	 * @param elementName Name of element to whose value to get.
+	 * @return The non-empty value of the element, if found in the xml.
+	 */
+	protected String getRequiredNodeText(DelegateExecution execution, String xml, String elementName) {
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+		def elementText = utils.getNodeText(xml, elementName)
+		if ((elementText == null) || (elementText.isEmpty())) {
+			def msg = 'Required element \'' + elementName + '\' is missing or empty'
+			logError(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+		} else {
+			return elementText
+		}
+	}
+
+	/**
+	 * Get the text for the specified element from the specified xml.  If
+	 * the element does not exist, return the specified default value.
+	 *
+	 * @param xml Xml from which to get the element's text
+	 * @param elementName Name of element whose text to get
+	 * @param defaultValue the default value
+	 * @return the element's text or the default value if the element does not
+	 * exist in the given xml
+	 */
+	protected String getNodeText(String xml, String elementName, String defaultValue) {
+		def nodeText = utils.getNodeText(xml, elementName)
+		return (nodeText == null) ? defaultValue : nodeText
+	}
+
+	/**
+	 * Get the text for the specified element from the specified xml.  If
+	 * the element does not exist, return an empty string.
+	 *
+	 * @param xml Xml from which to get the element's text.
+	 * @param elementName Name of element whose text to get.
+	 * @return the element's text or an empty string if the element does not
+	 * exist in the given xml.
+	 */
+	protected String getNodeTextForce(String xml, String elementName) {
+		return getNodeText(xml, elementName, '');
+	}
+
+	/**
+	*Store the variable as typed with java serialization type
+	*@param execution
+	*@param name
+	*@param value
+	*/
+	public void setVariable(DelegateExecution execution, String name, Object value) {
+		VariableMap variables = Variables.createVariables()
+		variables.putValueTyped('payload', Variables.objectValue(value)
+		.serializationDataFormat(SerializationDataFormats.JAVA) // tells the engine to use java serialization for persisting the value
+		.create())
+		execution.setVariable(name,variables)
+	}
+
+	//TODO not sure how this will look in Cockpit
+
+	/**
+	 * Returns the variable map
+	*@param execution
+	*@param name
+	*@return
+	**/
+	public String getVariable(DelegateExecution execution, String name) {
+		def myObj = execution.getVariable(name)
+		if(myObj instanceof VariableMap){
+			VariableMap serializedObjectMap = (VariableMap) myObj
+			ObjectValueImpl payloadObj = serializedObjectMap.getValueTyped('payload')
+			return payloadObj.getValue()
+		}else{
+			return myObj
+		}
+	}
+
+
+	/**
+	 * Returns true if a value equals one of the provided set. Equality is
+	 * determined by using the equals method if the value object and the
+	 * object in the provided set have the same class. Otherwise, the objects
+	 * are converted to strings and then compared.  Nulls are permitted for
+	 * the value as well as in the provided set
+	 * Example:
+	 * <pre>
+	 *     def statusCode = getStatusCode()
+	 *     isOneOf(statusCode, 200, 201, 204)
+	 * </pre>
+	 * @param value the value to test
+	 * @param these a set of permissable values
+	 * @return true if the value is in the provided set
+	 */
+	public boolean isOneOf(Object value, Object... these) {
+		for (Object thisOne : these) {
+			if (thisOne == null) {
+				if (value == null) {
+					return true
+				}
+			} else {
+				if (value != null) {
+					if (value.getClass() == thisOne.getClass()) {
+						if (value.equals(thisOne)) {
+							return true
+						}
+					} else {
+						if (String.valueOf(value).equals(String.valueOf(thisOne))) {
+							return true
+						}
+					}
+				}
+			}
+		}
+		return false
+	}
+
+	/**
+	 * Sets flows success indicator variable.
+	 *
+	 */
+	public void setSuccessIndicator(DelegateExecution execution, boolean isSuccess) {
+		String prefix = execution.getVariable('prefix')
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+
+		logDebug('Entered SetSuccessIndicator Method', isDebugLogEnabled)
+		execution.setVariable(prefix+'SuccessIndicator', isSuccess)
+		logDebug('Outgoing SuccessIndicator is: ' + execution.getVariable(prefix+'SuccessIndicator') + '', isDebugLogEnabled)
+	}
+
+	/**
+	 * Sends a Error Sync Response
+	 *
+	 */
+	public void sendSyncError(DelegateExecution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		String requestId = execution.getVariable("mso-request-id")
+		logDebug('sendSyncError, requestId: ' + requestId, isDebugEnabled)
+		WorkflowException workflowExceptionObj = execution.getVariable("WorkflowException")
+		if (workflowExceptionObj != null) {
+			String errorMessage = workflowExceptionObj.getErrorMessage()
+			def errorCode = workflowExceptionObj.getErrorCode()
+			logDebug('sendSyncError, requestId: '  + requestId + ' | errorMessage: ' + errorMessage + ' | errorCode: ' + errorCode, isDebugEnabled)
+			sendWorkflowResponse(execution, errorCode, errorMessage)
+		}
+	}
+
+	/**
+	 * Executes a named groovy script method in the current object
+	 */
+	public void executeMethod(String methodName, Object... args) {
+
+		if (args != null && args.size() > 0) {
+
+			// First argument of method to call is always the execution object
+			DelegateExecution execution = (DelegateExecution) args[0]
+
+			def classAndMethod = getClass().getSimpleName() + '.' + methodName + '(execution=' + execution.getId() + ')'
+			def isDebugEnabled =  execution.getVariable('isDebugLogEnabled')
+
+			logDebug('Entered ' + classAndMethod, isDebugEnabled)
+			logDebug('Received parameters: ' + args, isDebugEnabled)
+
+			try{
+				def methodToCall = this.metaClass.getMetaMethod(methodName, args)
+				logDebug('Method to call: ' + methodToCall, isDebugEnabled)
+				methodToCall?.invoke(this, args)
+			}
+			catch(BpmnError bpmnError) {
+				logDebug('Rethrowing BpmnError ' + bpmnError.getMessage(), isDebugEnabled)
+				throw bpmnError
+			}
+			catch(Exception e) {
+				e.printStackTrace()
+				logDebug('Unexpected error encountered - ' + e.getMessage(), isDebugEnabled)
+				(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, e.getMessage())
+			}
+			finally {
+				logDebug('Exited ' + classAndMethod, isDebugEnabled)
+			}
+		}
+	}
+
+	/**
+	 *This method determines and adds the appropriate ending to come
+	 *after a number (-st, -nd, -rd, or -th)
+	 *
+	 *@param int n
+	 *
+	 *@return String ending - number with suffix
+	 */
+	public static String labelMaker(Object n) {
+		Integer num
+		if(n instanceof String){
+			num = Integer.parseInt(n)
+		}else{
+			num = n
+		}
+
+		String ending = ""; //the end to be added to the number
+		if(num != null){
+		if ((num % 10 == 1) && (num != 11)) {
+			ending = num + "st";
+			} else if ((num % 10 == 2) && (num != 12)) {
+			ending = num + "nd";
+			} else if ((num % 10 == 3) && (num != 13)) {
+			ending = num + "rd";
+			} else {
+			ending = num + "th";
+		}
+		}
+		return ending
+	}
+
+	/**
+	 * Constructs a workflow message callback URL for the specified message type and correlator.
+	 * This type of callback URL is used when a workflow wants an MSO adapter (like the SDNC
+	 * adapter) to call it back.  In other words, this is for callbacks internal to the MSO
+	 * complex.  Use <code>createWorkflowMessageAdapterCallbackURL</code> if the callback
+	 * will come from outside the MSO complex.
+	 * @param messageType the message type (e.g. SDNCAResponse or VNFAResponse)
+	 * @param correlator the correlator value (e.g. a request ID)
+	 */
+	public String createCallbackURL(DelegateExecution execution, String messageType, String correlator) {
+		String endpoint = UrnPropertiesReader.getVariable("mso.workflow.message.endpoint", execution)
+
+		if (endpoint == null || endpoint.isEmpty()) {
+			ExceptionUtil exceptionUtil = new ExceptionUtil()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000,
+				'mso:workflow:message:endpoint URN mapping is not set')
+		}
+
+		while (endpoint.endsWith('/')) {
+			endpoint = endpoint.substring(0, endpoint.length()-1)
+		}
+
+		return endpoint +
+			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +
+			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')
+	}
+
+	/**
+	 *
+	 * Constructs a workflow message callback URL for the specified message type and correlator.
+	 * This type of callback URL is used when a workflow wants a system outside the MSO complex
+	 * to call it back through the Workflow Message Adapter.
+	 * @param messageType the message type (e.g. SNIROResponse)
+	 * @param correlator the correlator value (e.g. a request ID)
+	 */
+	public String createWorkflowMessageAdapterCallbackURL(DelegateExecution execution, String messageType, String correlator) {
+		String endpoint = UrnPropertiesReader.getVariable("mso.adapters.workflow.message.endpoint", execution)
+
+		if (endpoint == null || endpoint.isEmpty()) {
+			ExceptionUtil exceptionUtil = new ExceptionUtil()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000,
+				'mso:adapters:workflow:message:endpoint URN mapping is not set')
+		}
+
+		while (endpoint.endsWith('/')) {
+			endpoint = endpoint.substring(0, endpoint.length()-1)
+		}
+
+		return endpoint +
+			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +
+			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')
+	}
+	
+	public void setRollbackEnabled(DelegateExecution execution, isDebugLogEnabled) {
+		
+		// Rollback settings
+		def prefix = execution.getVariable('prefix')
+		def disableRollback = execution.getVariable("disableRollback")
+		def defaultRollback = UrnPropertiesReader.getVariable("mso.rollback", execution).toBoolean()
+		
+		logDebug('disableRollback: ' + disableRollback, isDebugLogEnabled)
+		logDebug('defaultRollback: ' + defaultRollback, isDebugLogEnabled)
+		
+		def rollbackEnabled
+		
+		if(disableRollback == null || disableRollback == '' ) {
+			// get from default urn settings for mso_rollback
+			disableRollback = !defaultRollback
+			rollbackEnabled = defaultRollback
+			logDebug('disableRollback is null or empty!', isDebugLogEnabled)
+		}
+		else {
+			if(disableRollback == true) {
+				rollbackEnabled = false
+			}
+			else if(disableRollback == false){
+				rollbackEnabled = true
+			}
+			else {
+				rollbackEnabled = defaultRollback
+			}
+		}
+		
+		execution.setVariable(prefix+"backoutOnFailure", rollbackEnabled)
+		logDebug('rollbackEnabled (aka backoutOnFailure): ' + rollbackEnabled, isDebugLogEnabled)
+	}
+	
+	public void setBasicDBAuthHeader(DelegateExecution execution, isDebugLogEnabled) {
+		try {
+			String basicAuthValueDB = UrnPropertiesReader.getVariable("mso.adapters.db.auth", execution)
+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugLogEnabled)
+			
+			def encodedString = utils.getBasicAuth(basicAuthValueDB, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
+		} catch (IOException ex) {
+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
+			utils.log("DEBUG", dataErrorMessage, isDebugLogEnabled)
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+		}
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AllottedResourceUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AllottedResourceUtils.groovy
index fc099caa5f..b054c0f934 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AllottedResourceUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AllottedResourceUtils.groovy
@@ -1,333 +1,343 @@
-package org.openecomp.mso.bpmn.common.scripts

-

-import org.apache.commons.lang3.StringEscapeUtils;

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

-import org.camunda.bpm.engine.delegate.DelegateExecution;

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

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

-

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution;

-

-import groovy.util.XmlParser

-import groovy.util.Node

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

-

-class AllottedResourceUtils {

-

-	private AbstractServiceTaskProcessor taskProcessor

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	MsoUtils utils;

-

-	public AllottedResourceUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-		this.utils = taskProcessor.utils

-	}

-

-	/*Used on Create - called from DoCreate

-	* Using Consuming ServiceInstanceId get related Allotted Resources Orchestration status from AAI

-	* 1) get related AR links for CSI 2) get AR from AR links

-	* return: null -> AR Not found

-	* return: " " -> AR found with empty orchStatus

-	* return: orchStatus - > AR found with this orchStatus

-	* setsVariable aaiARGetResponse

-	*/

-	public String getAROrchStatus (DelegateExecution execution) {

-

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

-		utils.log("DEBUG"," ***** getAROrchStatus *****", isDebugEnabled)

-		String msg = ""

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

-		String arType = execution.getVariable("allottedResourceType")

-		String arRole = execution.getVariable("allottedResourceRole")

-		String siXml = execution.getVariable("CSI_service")

-		String ar = null

-		String orchStatus = null

-		XmlParser xmlParser = new XmlParser()

-		utils.log("DEBUG","getAROrchStatus siXml:" + siXml, isDebugEnabled)

-		try {

-			if (!isBlank(siXml)) {

-				def groovy.util.Node siNode = xmlParser.parseText(siXml)

-				def groovy.util.Node relationshipList = utils.getChildNode(siNode, 'relationship-list')

-				if (relationshipList != null) {

-					def groovy.util.NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

-					for (groovy.util.Node relationship in relationships) {

-						def groovy.util.Node relatedTo = utils.getChildNode(relationship, 'related-to')

-						if ((relatedTo != null) && (relatedTo.text().equals('allotted-resource'))) {

-							utils.log("DEBUG","getARORchStatus AR found", isDebugEnabled)

-							def groovy.util.Node relatedLink = utils.getChildNode(relationship, 'related-link')

-							if (relatedLink != null){

-								ar = getARbyLink(execution, relatedLink.text(), arRole)

-								if (!isBlank(ar))

-								{

-									orchStatus = execution.getVariable("aaiAROrchStatus")

-									break

-								}

-							}

-						}

-					}

-				}

-			}

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered in getAROrchStatus" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in getAROrchStatus" + e.getMessage())

-		}

-		utils.log("DEBUG"," *****Exit getAROrchStatus **** OrchStatus:" + orchStatus, isDebugEnabled)

-		return orchStatus

-	}

-

-	// get Allotted Resource by AllottedResourceId

-	// used on Delete - called from doDeleteAR

-	// setsVariable aaiARGetResponse

-	public String getARbyId (DelegateExecution execution, String allottedResourceId) {

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

-		utils.log("DEBUG", " ***** getARbyId ***** ", isDebugEnabled)

-		String arLink = getARLinkbyId(execution, allottedResourceId)

-		String ar = null

-		if (!isBlank(arLink))

-		{

-			ar = getARbyLink(execution, arLink, "")

-		}

-		utils.log("DEBUG", " ***** Exit GetARbyId ***** AR:" + ar, isDebugEnabled)

-		return ar;

-	}

-	

-	public String getPSIFmARLink(DelegateExecution execution, String arLink)

-	{

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

-		// Path: /aai/{version}/business/customers/customer/{cust}/service-subscriptions/service-subscription/{subs}/service-instances/service-instance/{psiid}/allotted-resources/allotted-resource/{arid}

-		utils.log("DEBUG", " ***** getPSIFmARLink ***** path:" + arLink, isDebugEnabled)

-		String[] split = arLink.split("/service-instance/")

-		String[] splitB =  split[1].split("/allotted-resources/")

-		String siId = splitB[0]

-		utils.log("DEBUG", " ***** Exit getARLinkbyId ***** parentServiceInstanceId:" + siId , isDebugEnabled)

-		return siId

-	}

-

-	// get Allotted Resource Link by AllottedResourceId using Nodes Query

-	// used on Delete - called from getARbyId

-	public String getARLinkbyId (DelegateExecution execution, String allottedResourceId) {

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

-		utils.log("DEBUG", " ***** getARLinkbyId ***** ", isDebugEnabled)

-		String arLink = null

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

-			String aaiNQUri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

-			String aaiEndpoint = execution.getVariable("URN_aai_endpoint")

-			String aaiUrl = "${aaiNQUri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"

-

-			utils.log("DEBUG", "getARLinkbyId url: \n" + aaiUrl, isDebugEnabled)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, aaiUrl)

-			int responseCode = response.getStatusCode()

-			utils.log("DEBUG", "  GET AR response code is: " + responseCode, isDebugEnabled)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			utils.log("DEBUG", "GET AR:" + aaiResponse, isDebugEnabled)

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET AR Received a Good Response Code", isDebugEnabled)

-				if(utils.nodeExists(aaiResponse, "result-data")){

-					utils.log("DEBUG", "Query for AllottedResource Url Response Does Contain Data" , isDebugEnabled)

-					arLink = utils.getNodeText1(aaiResponse, "resource-link")

-				}else{

-					utils.log("DEBUG", "GET AR Response Does NOT Contain Data" , isDebugEnabled)

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET AR received a Not Found (404) Response", isDebugEnabled)

-			}

-			else{

-				utils.log("DEBUG", "  GET AR received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")

-			}

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GetAaiAR" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetARbyId" + e.getMessage())

-		}

-		utils.log("DEBUG", " ***** Exit GetARLinkbyId ***** Link:" + arLink, isDebugEnabled)

-		return arLink

-	}

-

-	// get Allotted resource using Link

-	// used on Create called from getARORchStatus

-	// used on Delete called from getARbyId

-	// setsVariable aaiARPath - used for Patch in create

-	public String getARbyLink (DelegateExecution execution, String link, String role) {

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

-		utils.log("DEBUG", " ***** getARbyLink ***** ", isDebugEnabled)

-		String ar = null

-		String arUrl = null

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			String arEndpoint = ""

-

-			if(!isBlank(link)) {

-				utils.log("DEBUG", "Incoming AR Resource Link is: " + link, isDebugEnabled)

-				String[] split = link.split("/aai/")

-				arEndpoint = "/aai/" + split[1]

-			}

-

-			arUrl = "${aai_endpoint}" + arEndpoint

-		

-			utils.log("DEBUG", "GET AR Aai Path is: \n" + arUrl, isDebugEnabled)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, arUrl)

-			int responseCode = response.getStatusCode()

-			utils.log("DEBUG", "  GET AR response code is: " + responseCode, isDebugEnabled)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			utils.log("DEBUG", "GET AR:" + aaiResponse, isDebugEnabled)

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET AR Received a Good Response Code", isDebugEnabled)

-				if(utils.nodeExists(aaiResponse, "allotted-resource")){

-					if (!isBlank(role))

-					{

-						if (utils.nodeExists(aaiResponse, "role") && role.equals(utils.getNodeText1(aaiResponse, "role"))) {

-							ar = aaiResponse

-						}else{

-							utils.log("DEBUG", "AAI AR does not match input role:" + role, isDebugEnabled)

-						}

-					}

-					else

-					{

-						ar = aaiResponse

-					}

-				}

-				else

-				{

-					utils.log("DEBUG", "GET AR Does NOT Contain Data" , isDebugEnabled)

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET AR received a Not Found (404) Response", isDebugEnabled)

-			}

-			else{

-				utils.log("DEBUG", "  GET AR received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")

-			}

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GetAaiAR" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetAaiAR" + e.getMessage())

-		}

-		if (!isBlank(ar))

-		{

-			execution.setVariable("aaiARGetResponse", ar)

-			execution.setVariable("aaiARPath", arUrl)

-			

-			String resourceVersion = null

-			if (utils.nodeExists(ar, "resource-version")) {

-				resourceVersion = utils.getNodeText1(ar, "resource-version")

-				execution.setVariable("aaiARResourceVersion", resourceVersion)

-			}

-			

-			String orchStatus = null

-			if (utils.nodeExists(ar, "orchestration-status")) {

-				orchStatus= utils.getNodeText1(ar, "orchestration-status")

-			}

-			else

-			{

-				orchStatus = " "

-			}

-			execution.setVariable("aaiAROrchStatus", orchStatus)

-		}

-		utils.log("DEBUG", " ***** Exit GetARbyLink ***** AR:" + ar, isDebugEnabled)

-		return ar

-	}

-

-	public void updateAROrchStatus(DelegateExecution execution, String status, String aaiARPath){

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

-		utils.log("DEBUG", " *** updaAROrchStatus *** ", isDebugEnabled)

-		try{

-

-			String updateReq =	"""

-					{

-					"orchestration-status": "${status}"

-					}

-					"""

-

-			utils.log("DEBUG", 'AAI AR URI: ' + aaiARPath, isDebugEnabled)

-

-			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

-			APIResponse apiResponse = aaiUriUtil.executeAAIPatchCall(execution, aaiARPath, updateReq)

-			def aaiResponse = StringEscapeUtils.unescapeXml(apiResponse.getResponseBodyAsString())

-			def responseCode = apiResponse.getStatusCode()

-

-			utils.logAudit("AAI Response Code: " + responseCode)

-			utils.logAudit("AAI Response: " + aaiResponse)

-			if(responseCode == 200){

-				utils.log("DEBUG", "UpdateAR Good REST Response is: " + "\n" + aaiResponse, isDebugEnabled)

-			}else{

-				utils.log("DEBUG", "UpdateAROrchStatus Bad REST Response!", isDebugEnabled)

-				buildAAIErrorResponse(execution, aaiResponse, "Error updating AR OrchStatus in AAI")

-			}

-

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException ", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", "Exception in updateAR. Exception is:\n" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, 'Internal Error in updateAROrchStatus.' + e.getMessage())

-		}

-		utils.log("DEBUG", " *** Exit updateAROrchStatus *** ", isDebugEnabled)

-	}

-	

-	//Sets Variable "wasDeleted"

-	public void deleteAR(DelegateExecution execution, String aaiARPath){

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

-		utils.log("DEBUG", " *** deleteAR *** aaiARPath:" + aaiARPath, isDebugEnabled)

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

-			APIResponse response = aaiUriUtil.executeAAIDeleteCall(execution, aaiARPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("deleteARResponseCode", responseCode)

-			

-			utils.log("DEBUG", "  Delete AR response code:" + responseCode, isDebugEnabled)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("aaiARDeleteResponse", aaiResponse)

-

-			utils.log("DEBUG", "Delete AR Response:" + aaiResponse)

-			//Process Response

-			if(responseCode == 204){

-				utils.log("DEBUG", "  Delete AR Received a Good Response", isDebugEnabled)

-				execution.setVariable("wasDeleted", "true")

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "  Delete AR Received a Not Found (404) Response", isDebugEnabled)

-			}else if(responseCode == 412){

-				utils.log("DEBUG", "Delete AR Received a Resource Version Mismatch Error: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 412, "DeleteAR Received a resource-version Mismatch Error Response from AAI")

-			}else{

-				utils.log("DEBUG", "Delete AR Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				buildAAIErrorResponse(execution, aaiResponse, "Error deleting AR in AAI")

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered in deleteAR!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Delete AR")

-		}

-		utils.log("DEBUG", " *** Exit deleteAR *** ", isDebugEnabled)

-	}

-

-	public void buildAAIErrorResponse(DelegateExecution execution, String response, String errorMessage){

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

-		utils.log("DEBUG", " *** BuildAAIErrorResponse*** ", isDebugEnabled)

-

-		if((response != null) && (response.contains("Fault") || response.contains("RESTFault"))){

-			WorkflowException workflowException = exceptionUtil.MapAAIExceptionToWorkflowException(response, execution)

-			execution.setVariable("WorkflowException", workflowException)

-		}else{

-			exceptionUtil.buildWorkflowException(execution, 500, errorMessage)

-		}

-

-		utils.log("DEBUG", " *** Exit BuildAAIErrorResponse Process*** ", isDebugEnabled)

-		throw new BpmnError("MSOWorkflowException")

-	}

-

-}
\ No newline at end of file
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+import org.onap.so.rest.APIResponse;
+
+
+
+class AllottedResourceUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, AllottedResourceUtils.class);
+
+
+	private AbstractServiceTaskProcessor taskProcessor
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	MsoUtils utils;
+
+	public AllottedResourceUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+		this.utils = taskProcessor.utils
+	}
+
+	/*Used on Create - called from DoCreate
+	* Using Consuming ServiceInstanceId get related Allotted Resources Orchestration status from AAI
+	* 1) get related AR links for CSI 2) get AR from AR links
+	* return: null -> AR Not found
+	* return: " " -> AR found with empty orchStatus
+	* return: orchStatus - > AR found with this orchStatus
+	* setsVariable aaiARGetResponse
+	*/
+	public String getAROrchStatus (DelegateExecution execution) {
+
+		msoLogger.trace("getAROrchStatus ")
+		String msg = ""
+		String serviceInstanceId = execution.getVariable("serviceInstanceId")
+		String arType = execution.getVariable("allottedResourceType")
+		String arRole = execution.getVariable("allottedResourceRole")
+		String siXml = execution.getVariable("CSI_service")
+		String ar = null
+		String orchStatus = null
+		XmlParser xmlParser = new XmlParser()
+		msoLogger.debug("getAROrchStatus siXml:" + siXml)
+		try {
+			if (!isBlank(siXml)) {
+				def groovy.util.Node siNode = xmlParser.parseText(siXml)
+				def groovy.util.Node relationshipList = utils.getChildNode(siNode, 'relationship-list')
+				if (relationshipList != null) {
+					def groovy.util.NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
+					for (groovy.util.Node relationship in relationships) {
+						def groovy.util.Node relatedTo = utils.getChildNode(relationship, 'related-to')
+						if ((relatedTo != null) && (relatedTo.text().equals('allotted-resource'))) {
+							msoLogger.debug("getARORchStatus AR found")
+							def groovy.util.Node relatedLink = utils.getChildNode(relationship, 'related-link')
+							if (relatedLink != null){
+								ar = getARbyLink(execution, relatedLink.text(), arRole)
+								if (!isBlank(ar))
+								{
+									orchStatus = execution.getVariable("aaiAROrchStatus")
+									break
+								}
+							}
+						}
+					}
+				}
+			}
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered in getAROrchStatus" + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in getAROrchStatus" + e.getMessage())
+		}
+		msoLogger.trace(" Exit getAROrchStatus - OrchStatus:" + orchStatus)
+		return orchStatus
+	}
+
+	// get Allotted Resource by AllottedResourceId
+	// used on Delete - called from doDeleteAR
+	// setsVariable aaiARGetResponse
+	public String getARbyId (DelegateExecution execution, String allottedResourceId) {
+		msoLogger.trace("getARbyId ")
+		String arLink = getARLinkbyId(execution, allottedResourceId)
+		String ar = null
+		if (!isBlank(arLink))
+		{
+			ar = getARbyLink(execution, arLink, "")
+		}
+		msoLogger.trace(" Exit GetARbyId - AR:" + ar)
+		return ar;
+	}
+	
+	public String getPSIFmARLink(DelegateExecution execution, String arLink)
+	{
+		// Path: /aai/{version}/business/customers/customer/{cust}/service-subscriptions/service-subscription/{subs}/service-instances/service-instance/{psiid}/allotted-resources/allotted-resource/{arid}
+		msoLogger.trace(" getPSIFmARLink - path:" + arLink)
+		String[] split = arLink.split("/service-instance/")
+		String[] splitB =  split[1].split("/allotted-resources/")
+		String siId = splitB[0]
+		msoLogger.trace(" Exit getARLinkbyId - parentServiceInstanceId:" + siId )
+		return siId
+	}
+
+	// get Allotted Resource Link by AllottedResourceId using Nodes Query
+	// used on Delete - called from getARbyId
+	public String getARLinkbyId (DelegateExecution execution, String allottedResourceId) {
+		msoLogger.trace("getARLinkbyId ")
+		String arLink = null
+		try {
+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)
+			String aaiNQUri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)
+			String aaiEndpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String aaiUrl = "${aaiNQUri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"
+
+			msoLogger.debug("getARLinkbyId url: \n" + aaiUrl)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, aaiUrl)
+			int responseCode = response.getStatusCode()
+			msoLogger.debug("  GET AR response code is: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			msoLogger.debug("GET AR:" + aaiResponse)
+			if(responseCode == 200 || responseCode == 202){
+				msoLogger.debug("GET AR Received a Good Response Code")
+				if(utils.nodeExists(aaiResponse, "result-data")){
+					msoLogger.debug("Query for AllottedResource Url Response Does Contain Data" )
+					arLink = utils.getNodeText(aaiResponse, "resource-link")
+				}else{
+					msoLogger.debug("GET AR Response Does NOT Contain Data" )
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("GET AR received a Not Found (404) Response")
+			}
+			else{
+				msoLogger.debug("  GET AR received a Bad Response: \n" + aaiResponse)
+				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")
+			}
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered within GetAaiAR" + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetARbyId" + e.getMessage())
+		}
+		msoLogger.trace(" Exit GetARLinkbyId - Link:" + arLink)
+		return arLink
+	}
+
+	// get Allotted resource using Link
+	// used on Create called from getARORchStatus
+	// used on Delete called from getARbyId
+	// setsVariable aaiARPath - used for Patch in create
+	public String getARbyLink (DelegateExecution execution, String link, String role) {
+		msoLogger.trace("getARbyLink ")
+		String ar = null
+		String arUrl = null
+		try {
+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String arEndpoint = ""
+
+			if(!isBlank(link)) {
+				msoLogger.debug("Incoming AR Resource Link is: " + link)
+				String[] split = link.split("/aai/")
+				arEndpoint = "/aai/" + split[1]
+			}
+
+			arUrl = "${aai_endpoint}" + arEndpoint
+		
+			msoLogger.debug("GET AR Aai Path is: \n" + arUrl)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, arUrl)
+			int responseCode = response.getStatusCode()
+			msoLogger.debug("  GET AR response code is: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			msoLogger.debug("GET AR:" + aaiResponse)
+			if(responseCode == 200 || responseCode == 202){
+				msoLogger.debug("GET AR Received a Good Response Code")
+				if(utils.nodeExists(aaiResponse, "allotted-resource")){
+					if (!isBlank(role))
+					{
+						if (utils.nodeExists(aaiResponse, "role") && role.equals(utils.getNodeText(aaiResponse, "role"))) {
+							ar = aaiResponse
+						}else{
+							msoLogger.debug("AAI AR does not match input role:" + role)
+						}
+					}
+					else
+					{
+						ar = aaiResponse
+					}
+				}
+				else
+				{
+					msoLogger.debug("GET AR Does NOT Contain Data" )
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("GET AR received a Not Found (404) Response")
+			}
+			else{
+				msoLogger.debug("  GET AR received a Bad Response: \n" + aaiResponse)
+				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")
+			}
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered within GetAaiAR" + e.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetAaiAR" + e.getMessage())
+		}
+		if (!isBlank(ar))
+		{
+			execution.setVariable("aaiARGetResponse", ar)
+			execution.setVariable("aaiARPath", arUrl)
+			
+			String resourceVersion = null
+			if (utils.nodeExists(ar, "resource-version")) {
+				resourceVersion = utils.getNodeText(ar, "resource-version")
+				execution.setVariable("aaiARResourceVersion", resourceVersion)
+			}
+			
+			String orchStatus = null
+			if (utils.nodeExists(ar, "orchestration-status")) {
+				orchStatus= utils.getNodeText(ar, "orchestration-status")
+			}
+			else
+			{
+				orchStatus = " "
+			}
+			execution.setVariable("aaiAROrchStatus", orchStatus)
+		}
+		msoLogger.trace(" Exit GetARbyLink - AR:" + ar)
+		return ar
+	}
+
+	public void updateAROrchStatus(DelegateExecution execution, String status, String aaiARPath){
+		msoLogger.trace("updaAROrchStatus ")
+		try{
+
+			String updateReq =	"""
+					{
+					"orchestration-status": "${status}"
+					}
+					"""
+
+			msoLogger.debug('AAI AR URI: ' + aaiARPath)
+
+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)
+			APIResponse apiResponse = aaiUriUtil.executeAAIPatchCall(execution, aaiARPath, updateReq)
+			def aaiResponse = apiResponse.getResponseBodyAsString()
+			def responseCode = apiResponse.getStatusCode()
+
+			msoLogger.debug("AAI Response Code: " + responseCode)
+			msoLogger.debug("AAI Response: " + aaiResponse)
+			if(responseCode == 200){
+				msoLogger.debug("UpdateAR Good REST Response is: " + "\n" + aaiResponse)
+			}else{
+				msoLogger.debug("UpdateAROrchStatus Bad REST Response!")
+				buildAAIErrorResponse(execution, aaiResponse, "Error updating AR OrchStatus in AAI")
+			}
+
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException ")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in updateAR.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.getMessage());
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, 'Internal Error in updateAROrchStatus.' + e.getMessage())
+		}
+		msoLogger.trace("Exit updateAROrchStatus ")
+	}
+	
+	//Sets Variable "wasDeleted"
+	public void deleteAR(DelegateExecution execution, String aaiARPath){
+		msoLogger.trace(" deleteAR - aaiARPath:" + aaiARPath)
+		try {
+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)
+			APIResponse response = aaiUriUtil.executeAAIDeleteCall(execution, aaiARPath)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("deleteARResponseCode", responseCode)
+			
+			msoLogger.debug("  Delete AR response code:" + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("aaiARDeleteResponse", aaiResponse)
+
+			msoLogger.debug("Delete AR Response:" + aaiResponse)
+			
+			//Process Response
+			if(responseCode == 204){
+				msoLogger.debug("  Delete AR Received a Good Response")
+				execution.setVariable("wasDeleted", "true")
+			}else if(responseCode == 404){
+				msoLogger.debug("  Delete AR Received a Not Found (404) Response")
+			}else if(responseCode == 412){
+				msoLogger.debug("Delete AR Received a Resource Version Mismatch Error: \n" + aaiResponse)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 412, "DeleteAR Received a resource-version Mismatch Error Response from AAI")
+			}else{
+				msoLogger.debug("Delete AR Received a BAD REST Response: \n" + aaiResponse)
+				buildAAIErrorResponse(execution, aaiResponse, "Error deleting AR in AAI")
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered in deleteAR!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Delete AR")
+		}
+		msoLogger.trace("Exit deleteAR ")
+	}
+
+	public void buildAAIErrorResponse(DelegateExecution execution, String response, String errorMessage){
+		msoLogger.trace("BuildAAIErrorResponse")
+
+		if((response != null) && (response.contains("Fault") || response.contains("RESTFault"))){
+			WorkflowException workflowException = exceptionUtil.MapAAIExceptionToWorkflowException(response, execution)
+			execution.setVariable("WorkflowException", workflowException)
+		}else{
+			exceptionUtil.buildWorkflowException(execution, 500, errorMessage)
+		}
+
+		msoLogger.trace("Exit BuildAAIErrorResponse Process")
+		throw new BpmnError("MSOWorkflowException")
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy
index 535b65e187..bb1de36eac 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AppCClient.groovy
@@ -1,20 +1,42 @@
-package org.openecomp.mso.bpmn.common.scripts
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
 
 import java.util.HashMap;
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.hibernate.event.internal.AbstractLockUpgradeEventListener
-import org.openecomp.mso.bpmn.core.HealthCheckHandler
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-import org.openecomp.mso.client.appc.ApplicationControllerOrchestrator
-import org.openecomp.mso.client.appc.ApplicationControllerOrchestratorException
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.client.appc.ApplicationControllerOrchestrator
+import org.onap.so.client.appc.ApplicationControllerOrchestratorException
 import org.onap.appc.client.lcm.model.Action
 import org.onap.appc.client.lcm.model.Status
-import org.openecomp.mso.bpmn.appc.payload.PayloadClient
-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs
-import org.openecomp.mso.client.appc.ApplicationControllerAction;
+import org.onap.so.bpmn.appc.payload.PayloadClient
+import org.onap.so.client.appc.ApplicationControllerAction;
 import groovy.transform.TypeChecked;
 import java.util.UUID;
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
 
 /**
  * This groovy class supports the <class>AppCClient.bpmn</class> process.
@@ -27,37 +49,32 @@ import java.util.UUID;
  * @param - vnfId
  * @param - action
  * @param - payload
- * @param - vnfName
- * @param - controllerType
- *
+ * 
  * Outputs:
  * @param - errorcode
  * @param - errorText
  * @param - responsePayload
  * @param - healthCheckIndex
  * @param - workstep
- * @param - rollbackVnfStop
- * @param - rollbackVnfLock
- * @param - rollbackQuiesceTraffic
  */
 
 public class AppCClient extends AbstractServiceTaskProcessor{
-	
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, AppCClient.class);
+
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 	JsonUtils jsonUtils = new JsonUtils()
 	def prefix = "UPDVnfI_"
 	
-	public void preProcessRequest(DelegateExecution execution){
+    public void preProcessRequest(DelegateExecution execution){
 
 	}
 	
 	public void runAppcCommand(DelegateExecution execution) {
-		String isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		utils.log("DEBUG", "***** Start runCommand *****", isDebugLogEnabled)
+		msoLogger.trace("Start runCommand ")
 		def method = getClass().getSimpleName() + '.runAppcCommand(' +
 		'execution=' + execution.getId() +
 		')'
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 		execution.setVariable("rollbackVnfStop", false)
 		execution.setVariable("rollbackVnfLock", false)
 		execution.setVariable("rollbackQuiesceTraffic", false)
@@ -73,19 +90,21 @@ public class AppCClient extends AbstractServiceTaskProcessor{
 			String aicIdentity = execution.getVariable('aicIdentity')
 			String vnfHostIpAddress = execution.getVariable('vnfHostIpAddress')
 			String vmIdList = execution.getVariable("vmIdList")
+			String vserverIdList = execution.getVariable("vserverIdList")
 			String identityUrl = execution.getVariable("identityUrl")
-			String controllerType = execution.getVariable("controllerType")	
+			String controllerType = execution.getVariable("controllerType")			
 			String vfModuleId = execution.getVariable("vfModuleId")		
-			HashMap<String, String> payloadInfo = new HashMap<String, String>();		
+			HashMap<String, String> payloadInfo = new HashMap<String, String>();
 			payloadInfo.put("vnfName", vnfName)
 			payloadInfo.put("aicIdentity", aicIdentity)
 			payloadInfo.put("vnfHostIpAddress", vnfHostIpAddress)
 			payloadInfo.put("vmIdList", vmIdList)
+			payloadInfo.put("vserverIdList", vserverIdList)
 			payloadInfo.put("identityUrl", identityUrl)
 			payloadInfo.put("vfModuleId",vfModuleId)
 			Optional<String> payload
-			logDebug("Running APP-C action: " + action.toString(), isDebugLogEnabled)
-			utils.log("DEBUG", "VNFID: " + vnfId, isDebugLogEnabled)
+			msoLogger.debug("Running APP-C action: " + action.toString())
+			msoLogger.debug("VNFID: " + vnfId)
 			execution.setVariable('msoRequestId', msoRequestId)
 			execution.setVariable("failedActivity", "APP-C")
 			execution.setVariable('workStep', action.toString())
@@ -99,17 +118,17 @@ public class AppCClient extends AbstractServiceTaskProcessor{
 				execution.setVariable('healthCheckIndex', healthCheckIndex + 1)
 			}
 			ApplicationControllerAction client = new ApplicationControllerAction()
-			utils.log("DEBUG", "Created Application Controller Action Object", isDebugLogEnabled)
+			msoLogger.debug("Created Application Controller Action Object")
 			//PayloadInfo contains extra information that adds on to payload before making request to appc
 			client.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType)
-			utils.log("DEBUG", "ran through the main method for Application Contoller", isDebugLogEnabled)
+			msoLogger.debug("ran through the main method for Application Contoller")
 			appcCode = client.getErrorCode()
 			appcMessage = client.getErrorMessage()
 		}
 		catch (BpmnError e) {
-			logError('Caught exception in ' + method, e)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			appcMessage = e.getMessage()
-		}
+		} 
 		execution.setVariable("errorCode", appcCode)
 		if (appcCode == '0' && action != null) {
 			if (action.equals(Action.Lock)) {
@@ -133,8 +152,8 @@ public class AppCClient extends AbstractServiceTaskProcessor{
 		}
 		execution.setVariable("errorText", appcMessage)
 		execution.setVariable("responsePayload", responsePayload)
-		utils.log("DEBUG", "Error Message: " + appcMessage, isDebugLogEnabled)
-		utils.log("DEBUG","ERROR CODE: " + execution.getVariable("errorCode"), isDebugLogEnabled)
-		utils.log("DEBUG", "***** End of runCommand *****", isDebugLogEnabled)
-	}
-}
\ No newline at end of file
+		msoLogger.debug("Error Message: " + appcMessage)
+		msoLogger.debug("ERROR CODE: " + execution.getVariable("errorCode"))
+		msoLogger.trace("End of runCommand ")
+	}    
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy
index 7fcf310210..9ce29dedb8 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy
@@ -1,1251 +1,1311 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import org.json.JSONObject;

-import org.json.JSONArray;

-import org.json.XML;

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

-

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

-

-

-import groovy.json.JsonBuilder

-import groovy.json.JsonSlurper

-import groovy.util.slurpersupport.GPathResult

-import groovy.xml.QName;

-

-import org.camunda.bpm.engine.delegate.DelegateExecution

-

-import org.openecomp.mso.logger.MsoLogger;

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

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-

-

-/***

- * Utilities for accessing Catalog DB Adapter to retrieve Networks, VNF/VFModules, AllottedResources and complete ServiceResources information

- *

- */

-

-class CatalogDbUtils {

-

-	MsoUtils utils = new MsoUtils()

-	JsonUtils jsonUtils = new JsonUtils()

-	MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-	static private String defaultDbAdapterVersion = "v2"

-

-	public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					networksList = responseJson.getJSONArray("serviceNetworks")

-				}

-				else {

-					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					networksList = responseJson.getJSONArray("serviceNetworks")

-				}

-				else {

-					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					networksList = responseJson.getJSONArray("serviceNetworks")

-				}

-				else {

-					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid, String catalogUtilsVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					networksList = responseJson.getJSONArray("serviceNetworks")

-				}

-				else {

-					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-	public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType, String catalogUtilsVersion) {

-		JSONArray networksList = null

-		String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					networksList = responseJson.getJSONArray("serviceNetworks")

-				}

-				else {

-					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return networksList

-	}

-

-

-	public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceVnfs")

-				}

-				else {

-					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {

-		JSONArray vnfsList = null

-		String endPoint ="/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceVnfs")

-				}

-				else {

-					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {

-		JSONArray vnfsList = null

-		String endPoint =  "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceVnfs")

-				}

-				else {

-					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	/**

-	 * This method gets a all vnfs for a particular

-	 * service from the catalog database using the

-	 * service model's model name.

-	 *

-	 * @param catalogDbEndpoint

-	 * @param serviceModelModelName

-	 * @return vnfsList	 *

-	 *

-	 */

-	public JSONArray getAllVnfsByServiceModelModelName(DelegateExecution execution, String serviceModelModelName) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?serviceModelName=" + UriUtils.encode(serviceModelModelName, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", defaultDbAdapterVersion)

-			}

-		}catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-		return vnfsList

-	}

-

-	public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceVnfs")

-				}

-				else {

-					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	/**

-	 * This method gets a single vf module from

-	 * the catalog database using the vf module's

-	 * model name. It returns that vf module as

-	 * a JSONObject

-	 *

-	 * @param catalogDbEndpoint

-	 * @param vfModuleModelName

-	 * @return vfModule

-	 */

-	public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName) {

-		JSONObject vfModule = null

-		String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")

-		try{

-			msoLogger.debug("Get VfModule By VfModule ModelName Endpoint is: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vfModule = parseVfModuleJson(catalogDbResponse, "vfModules", "v1")

-			}

-		}

-		catch(Exception e){

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vfModule

-	}

-

-	/**

-	 * This method gets a single vf module from

-	 * the catalog database using the vf module's

-	 * model name. It returns that vf module as

-	 * a JSONObject

-	 *

-	 * @param catalogDbEndpoint

-	 * @param vfModuleModelName

-	 * @param catalogUtilsVersion

-	 * @return vfModules

-	 */

-	public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName, String catalogUtilsVersion)  {

-		JSONObject vfModule = null

-		String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")

-		try{

-			msoLogger.debug("Get VfModule By VfModule ModelName Endpoint is: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vfModule = parseVfModuleJson(catalogDbResponse, "vfModules", "v1")

-			}

-		}

-		catch(Exception e){

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vfModule

-	}

-

-

-	public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {

-		JSONArray vnfsList = null

-		String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceAllottedResources")

-				}

-				else {

-					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray()

-				}

-				else {

-					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.getStackTrace())

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceAllottedResources")

-				}

-				else {

-					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-

-	public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid, String catalogUtilsVersion) {

-		JSONArray vnfsList = null

-		String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					JSONObject responseJson = new JSONObject(catalogDbResponse)

-					vnfsList = responseJson.getJSONArray("serviceAllottedResources")

-				}

-				else {

-					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return vnfsList

-	}

-

-	public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-		    String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-	

-		    if (catalogDbResponse != null) {

-	

-			resources = parseServiceResourcesJson(catalogDbResponse, "v1")

-		    }

-	

-		}

-		catch (Exception e) {

-		    utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-	public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					resources = new JSONObject(catalogDbResponse)

-				}

-				else {

-					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)

-				}

-			}

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-	public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-

-				resources = parseServiceResourcesJson(catalogDbResponse, "v1")

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-	public String getServiceResourcesByServiceModelInvariantUuidString(DelegateExecution execution, String serviceModelInvariantUuid) {

-		String resources = null

-		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-

-				resources = catalogDbResponse

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-	public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					resources = new JSONObject(catalogDbResponse)

-				}

-				else {

-					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-

-	public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				//TODO this is wrong

-				resources = parseServiceResourcesJson(catalogDbResponse)

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-	public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {

-		JSONObject resources = null

-		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")

-		try {

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				if (!catalogUtilsVersion.equals("v1")) {

-					resources = new JSONObject(catalogDbResponse)

-				}

-				else {

-					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)

-				}

-			}

-

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return resources

-	}

-

-

-

-	private JSONArray parseNetworksJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {

-		JSONArray modelInfos = null

-

-		msoLogger.debug("parseNetworksJson - catalogUtilsVersion is " + catalogUtilsVersion)

-		try {

-			// Create array of jsons

-

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONArray networks = responseJson.getJSONArray(arrayName)

-			modelInfos = new JSONArray()

-

-			for (int i = 0; i < networks.length(); i++) {

-

-				JSONObject network = networks.getJSONObject(i)

-				JSONObject modelJson = new JSONObject()

-				JSONObject modelInfo = buildModelInfo("network", network, catalogUtilsVersion)

-				modelJson.put("modelInfo", modelInfo)

-				String networkType = jsonUtils.getJsonValueForKey(network, "networkType")

-				modelJson.put("networkType", networkType)

-

-				switch (catalogUtilsVersion) {

-					case "v1":

-						break

-					default:

-						String toscaNodeType = jsonUtils.getJsonValueForKey(network, "toscaNodeType")

-						modelJson.put("toscaNodeType", toscaNodeType)

-						String networkTechnology = jsonUtils.getJsonValueForKey(network, "networkTechnology")

-						modelJson.put("networkTechnology", networkTechnology)

-						String networkRole = jsonUtils.getJsonValueForKey(network, "networkRole")

-						modelJson.put("networkRole", networkRole)

-						String networkScope = jsonUtils.getJsonValueForKey(network, "networkScope")

-						modelJson.put("networkScope", networkScope)

-						break

-				}

-				modelInfos.put(modelJson)

-			}

-

-			String modelInfosString = modelInfos.toString()

-			msoLogger.debug("Returning networks JSON: " + modelInfosString)

-

-		} catch (Exception e) {

-			utils.log("ERROR", "Exception in parsing Catalog DB Response: " + e.message)

-		}

-

-		return modelInfos

-	}

-

-	private JSONArray parseVnfsJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {

-		JSONArray modelInfos = null

-

-		msoLogger.debug("parseVnfsJson - catalogUtilsVersion is " + catalogUtilsVersion)

-

-		try {

-			// Create array of jsons

-

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONArray vnfs = responseJson.getJSONArray(arrayName)

-			modelInfos = new JSONArray()

-

-			for (int i = 0; i < vnfs.length(); i++) {

-				JSONObject vnf = vnfs.getJSONObject(i)

-

-				msoLogger.debug(vnf.toString(2))

-				JSONObject modelInfo = buildModelInfo("vnf", vnf, catalogUtilsVersion)

-				JSONObject modelJson = new JSONObject()

-				modelJson.put("modelInfo", modelInfo)

-				switch(catalogUtilsVersion) {

-					case "v1":

-						break

-					default:

-						String toscaNodeType = jsonUtils.getJsonValueForKey(vnf, "toscaNodeType")

-						modelJson.put("toscaNodeType", toscaNodeType)

-						String nfType = jsonUtils.getJsonValueForKey(vnf, "nfType")

-						modelJson.put("nfType", nfType)

-						String nfRole = jsonUtils.getJsonValueForKey(vnf, "nfRole")

-						modelJson.put("nfRole", nfRole)

-						String nfCode = jsonUtils.getJsonValueForKey(vnf, "nfCode")

-						modelJson.put("nfNamingCode", nfCode)

-						String nfFunction = jsonUtils.getJsonValueForKey(vnf, "nfFunction")

-						modelJson.put("nfFunction", nfFunction)

-						String multiStageDesign = jsonUtils.getJsonValueForKey(vnf, "multiStageDesign")

-						modelJson.put("multiStageDesign", multiStageDesign)

-						break

-				}

-

-				JSONArray vfModules = null

-				try {

-					vfModules = vnf.getJSONArray("vfModules")

-				} catch (Exception e)

-				{

-					msoLogger.debug("Cannot find VF MODULE ARRAY: " + i + ", exception is " + e.message)

-				}

-

-				if (vfModules != null) {

-					JSONArray vfModuleInfo = new JSONArray()

-					for (int j = 0; j < vfModules.length(); j++) {

-						JSONObject vfModule = vfModules.getJSONObject(j)

-						JSONObject vfModuleModelInfo = buildModelInfo("vfModule", vfModule, catalogUtilsVersion)

-						JSONObject vfModuleModelJson = new JSONObject()

-						vfModuleModelJson.put("modelInfo", vfModuleModelInfo)

-						String vfModuleType = jsonUtils.getJsonValueForKey(vfModule, "type")

-						vfModuleModelJson.put("vfModuleType", vfModuleType)

-						switch(catalogUtilsVersion) {

-							case "v1":

-							//TODO this does not work, isBase is not a integer.

-								Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")

-								if (isBase.intValue() == 1) {

-									vfModuleModelJson.put("isBase", "true")

-								}

-								else {

-									vfModuleModelJson.put("isBase", "false")

-								}

-								break

-							default:

-								boolean isBase = jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase")

-								vfModuleModelJson.put("isBase", isBase)

-								break

-						}

-						String vfModuleLabel = jsonUtils.getJsonValueForKey(vfModule, "label")

-						vfModuleModelJson.put("vfModuleLabel", vfModuleLabel)

-						Integer initialCount = jsonUtils.getJsonIntValueForKey(vfModule, "initialCount")

-						vfModuleModelJson.put("initialCount", initialCount.intValue())

-						vfModuleInfo.put(vfModuleModelJson)

-					}

-					modelJson.put("vfModules", vfModuleInfo)

-				}

-				modelInfos.put(modelJson)

-			}

-

-			String modelInfosString = modelInfos.toString()

-			msoLogger.debug("Returning vnfs JSON: " + modelInfosString)

-

-		} catch (Exception e) {

-			utils.log("ERROR", "Exception in parsing Catalog DB Response: " + e.message)

-		}

-

-		return modelInfos

-	}

-

-	/**

-	 * This method parses a Vf Module from the

-	 * Vf Modules array

-	 *

-	 * @param catalogDbResponse

-	 * @param arrayName

-	 * @param catalogUtilsVersion

-	 * @return vfModulelJson

-	 */

-	private JSONObject parseVfModuleJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {

-		JSONObject vfModulelJson = new JSONObject()

-		msoLogger.debug("Started Parse Vf Module Json")

-		try {

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONArray vfModules = responseJson.getJSONArray(arrayName)

-			if(vfModules != null){

-				JSONObject vfModuleInfo = new JSONObject()

-				for (int i = 0; i < vfModules.length(); i++) {

-					JSONObject vfModule = vfModules.getJSONObject(i)

-					JSONObject vfModuleModelInfo = buildModelInfo("vfModule", vfModule, catalogUtilsVersion)

-					vfModulelJson.put("modelInfo", vfModuleModelInfo)

-					String vfModuleType = jsonUtils.getJsonValueForKey(vfModule, "type")

-					vfModulelJson.put("vfModuleType", vfModuleType)

-					switch(catalogUtilsVersion) {

-						case "v1":

-							Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")

-							if (isBase.intValue() == 1) {

-								vfModulelJson.put("isBase", "true")

-							}

-							else {

-								vfModulelJson.put("isBase", "false")

-							}

-							break

-						default:

-							boolean isBase = jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase")

-							vfModulelJson.put("isBase", isBase)

-							break

-					}

-					String vfModuleLabel = jsonUtils.getJsonValueForKey(vfModule, "label")

-					vfModulelJson.put("vfModuleLabel", vfModuleLabel)

-					Integer initialCount = jsonUtils.getJsonIntValueForKey(vfModule, "initialCount")

-					vfModulelJson.put("initialCount", initialCount.intValue())

-				}

-			}

-			msoLogger.debug("Completed Parsing Vf Module: " + vfModulelJson.toString())

-		}catch (Exception e){

-			utils.log("DEBUG", "Exception while parsing Vf Modules from Catalog DB Response: " + e.message)

-		}

-

-		return vfModulelJson

-	}

-

-	private JSONArray parseAllottedResourcesJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {

-		JSONArray modelInfos = null

-

-		msoLogger.debug("parseAllottedResourcesJson - catalogUtilsVersion is " + catalogUtilsVersion)

-

-		try {

-			// Create array of jsons

-

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONArray allottedResources = responseJson.getJSONArray(arrayName)

-			modelInfos = new JSONArray()

-

-			for (int i = 0; i < allottedResources.length(); i++) {

-				JSONObject allottedResource = allottedResources.getJSONObject(i)

-				JSONObject modelInfo = buildModelInfo("allottedResource", allottedResource, catalogUtilsVersion)

-				JSONObject modelJson = new JSONObject()

-				modelJson.put("modelInfo", modelInfo)

-				switch(catalogUtilsVersion) {

-					case "v1":

-						break

-					default:

-						String toscaNodeType = jsonUtils.getJsonValueForKey(allottedResource, "toscaNodeType")

-						modelJson.put("toscaNodeType", toscaNodeType)

-						String nfType = jsonUtils.getJsonValueForKey(allottedResource, "nfType")

-						modelJson.put("nfType", nfType)

-						String nfRole = jsonUtils.getJsonValueForKey(allottedResource, "nfRole")

-						modelJson.put("nfRole", nfRole)

-						String nfCode = jsonUtils.getJsonValueForKey(allottedResource, "nfCode")

-						modelJson.put("nfNamingCode", nfCode)

-						String nfFunction = jsonUtils.getJsonValueForKey(allottedResource, "nfFunction")

-						modelJson.put("nfFunction", nfFunction)

-						String providingServiceModelName = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelName")

-						modelJson.put("providingServiceModelName", providingServiceModelName)

-						String providingServiceModelUuid = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelUuid")

-						modelJson.put("providingServiceModelUuid", providingServiceModelUuid)

-						break

-				}

-

-

-				modelInfos.put(modelJson)

-			}

-

-			String modelInfosString = modelInfos.toString()

-			msoLogger.debug("Returning allottedResources JSON: " + modelInfosString)

-

-		} catch (Exception e) {

-			utils.log("ERROR", "Exception in parsing Catalog DB Response: " + e.message)

-		}

-

-		return modelInfos

-	}

-

-	//TODO this is wrong

-	private JSONObject parseServiceResourcesJson (String catalogDbResponse) {

-		JSONObject serviceResources = new JSONObject()

-		String catalogUtilsVersion = "v1"

-

-		try {

-			// Create array of jsons

-

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONObject serviceResourcesRoot = responseJson.getJSONObject("serviceResources")

-			JSONArray vnfsArray = parseVnfsJson(serviceResourcesRoot.toString(), "vnfResources", catalogUtilsVersion)

-			serviceResources.put("vnfs", vnfsArray)

-			JSONArray networksArray = parseNetworksJson(serviceResourcesRoot.toString(), "networkResourceCustomization", catalogUtilsVersion)

-			serviceResources.put("networks", networksArray)

-			JSONArray allottedResourcesArray = parseAllottedResourcesJson(serviceResourcesRoot.toString(), "allottedResourceCustomization", catalogUtilsVersion)

-			serviceResources.put("allottedResources", allottedResourcesArray)

-

-			String serviceResourcesString = serviceResources.toString()

-			msoLogger.debug("Returning serviceResources JSON: " + serviceResourcesString)

-

-		} catch (Exception e) {

-			utils.log("ERROR", "Exception in parsing Catalog DB Response: " + e.message)

-		}

-

-		return serviceResources

-	}

-

-	private JSONObject parseServiceResourcesJson (String catalogDbResponse, String catalogUtilsVersion) {

-		JSONObject serviceResources = new JSONObject()

-		JSONObject serviceResourcesObject = new JSONObject()

-		String serviceResourcesString = ""

-

-		try {

-			// Create array of jsons

-

-			JSONObject responseJson = new JSONObject(catalogDbResponse)

-			JSONObject serviceResourcesRoot = responseJson.getJSONObject("serviceResources")

-			JSONObject modelInfo = buildModelInfo("", serviceResourcesRoot, catalogUtilsVersion)

-			serviceResources.put("modelInfo", modelInfo)

-			JSONArray vnfsArray = parseVnfsJson(serviceResourcesRoot.toString(), "serviceVnfs", catalogUtilsVersion)

-			serviceResources.put("serviceVnfs", vnfsArray)

-			JSONArray networksArray = parseNetworksJson(serviceResourcesRoot.toString(), "serviceNetworks", catalogUtilsVersion)

-			serviceResources.put("serviceNetworks", networksArray)

-			JSONArray allottedResourcesArray = parseAllottedResourcesJson(serviceResourcesRoot.toString(), "serviceAllottedResources", catalogUtilsVersion)

-			serviceResources.put("serviceAllottedResources", allottedResourcesArray)

-			serviceResourcesObject.put("serviceResources", serviceResources)

-

-			serviceResourcesString = serviceResourcesObject.toString()

-			msoLogger.debug("Returning serviceResources JSON: " + serviceResourcesString)

-

-		} catch (Exception e) {

-			utils.log("ERROR", "Exception in parsing Catalog DB Response: " + e.message)

-		}

-

-		return serviceResourcesObject

-	}

-

-	private JSONObject buildModelInfo(String modelType, JSONObject modelFromDb, String catalogUtilsVersion) {

-		JSONObject modelInfo = null

-		try {

-			modelInfo = new JSONObject()

-			modelInfo.put("modelType", modelType)

-			String modelInvariantId = jsonUtils.getJsonValueForKey(modelFromDb, "modelInvariantUuid")

-			modelInfo.put("modelInvariantId", modelInvariantId)

-			if(modelType.equalsIgnoreCase("allottedResource") || modelType.equalsIgnoreCase("vnf")){

-				String modelInstanceName = jsonUtils.getJsonValueForKey(modelFromDb, "modelInstanceName")

-				modelInfo.put("modelInstanceName", modelInstanceName)

-			}

-			if ((!"vfModule".equals(modelType) && !"vnf".equals(modelType)) || !catalogUtilsVersion.equals("v1")) {

-				String modelVersionId = jsonUtils.getJsonValueForKey(modelFromDb, "modelUuid")

-				modelInfo.put("modelVersionId", modelVersionId)

-			}

-			else {

-				String modelVersionId = jsonUtils.getJsonValueForKey(modelFromDb, "asdcUuid")

-				modelInfo.put("modelVersionId", modelVersionId)

-			}

-			String modelName = jsonUtils.getJsonValueForKey(modelFromDb, "modelName")

-			modelInfo.put("modelName", modelName)

-			String modelVersion = jsonUtils.getJsonValueForKey(modelFromDb, "modelVersion")

-			modelInfo.put("modelVersion", modelVersion)

-			if (!"vfModule".equals(modelType)) {

-				String modelCustomizationName = jsonUtils.getJsonValueForKey(modelFromDb, "modelCustomizationName")

-				modelInfo.put("modelCustomizationName", modelCustomizationName)

-			}

-			String modelCustomizationId = jsonUtils.getJsonValueForKey(modelFromDb, "modelCustomizationUuid")

-			switch (catalogUtilsVersion) {

-				case "v1":

-					modelInfo.put("modelCustomizationId", modelCustomizationId)

-					break

-				default:

-					modelInfo.put("modelCustomizationUuid", modelCustomizationId)

-					break

-			}

-			JSONObject modelJson = new JSONObject()

-			modelJson.put("modelInfo", modelInfo)

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception while parsing model information: " + e.message)

-		}

-		return modelInfo

-	}

-

-	private String getResponseFromCatalogDb (DelegateExecution execution, String endPoint) {

-		try {

-			String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")

-			String queryEndpoint = catalogDbEndpoint + "/" + defaultDbAdapterVersion + endPoint

-			RESTConfig config = new RESTConfig(queryEndpoint);

-			def responseData = ''

-			def bpmnRequestId = UUID.randomUUID().toString()

-			RESTClient client = new RESTClient(config).

-					addHeader('X-TransactionId', bpmnRequestId).

-					addHeader('X-FromAppId', 'BPMN').

-					addHeader('Content-Type', 'application/json').

-					addHeader('Accept','application/json');

-

-			String basicAuthCred = execution.getVariable("BasicAuthHeaderValueDB")

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-					client.addAuthorizationHeader(basicAuthCred)

-			}

-			msoLogger.debug('sending GET to Catalog DB endpoint: ' + endPoint)

-			APIResponse response = client.httpGet()

-

-			responseData = response.getResponseBodyAsString()

-			if (responseData != null) {

-				msoLogger.debug("Received data from Catalog DB: " + responseData)

-			}

-

-			msoLogger.debug('Response code:' + response.getStatusCode())

-			msoLogger.debug('Response:' + System.lineSeparator() + responseData)

-			if (response.getStatusCode() == 200) {

-				// parse response as needed

-				return responseData

-			}

-			else {

-				return null

-			}

-		}

-		catch (Exception e) {

-			msoLogger.debug("ERROR WHILE QUERYING CATALOG DB: " + e.message)

-			return null

-		}

-

-	}

-

-	/**

-	 * get resource recipe by resource model uuid and action

-	 */

-	public JSONObject getResourceRecipe(DelegateExecution execution, String resourceModelUuid, String action) {

-		String endPoint = "/resourceRecipe?resourceModelUuid=" + UriUtils.encode(resourceModelUuid, "UTF-8")+ "&action=" + UriUtils.encode(action, "UTF-8")

-		JSONObject responseJson = null

-		try {

-			msoLogger.debug("ENDPOINT: " + endPoint)

-			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)

-

-			if (catalogDbResponse != null) {

-				responseJson = new JSONObject(catalogDbResponse)

-			}

-		}

-		catch (Exception e) {

-			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)

-		}

-

-		return responseJson

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.XML
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.springframework.web.util.UriUtils;
+
+import org.onap.so.bpmn.core.json.JsonUtils
+
+
+import groovy.json.JsonBuilder
+import groovy.json.JsonSlurper
+import groovy.util.slurpersupport.GPathResult
+import groovy.xml.QName;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution
+
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.rest.APIResponse;
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.logger.MessageEnum
+
+
+
+/***
+ * Utilities for accessing Catalog DB Adapter to retrieve Networks, VNF/VFModules, AllottedResources and complete ServiceResources information
+ *
+ */
+
+class CatalogDbUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CatalogDbUtils.class);
+
+
+	MsoUtils utils = new MsoUtils()
+	JsonUtils jsonUtils = new JsonUtils()
+	static private String defaultDbAdapterVersion = "v2"
+
+	public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					networksList = responseJson.getJSONArray("serviceNetworks")
+				}
+				else {
+					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					networksList = responseJson.getJSONArray("serviceNetworks")
+				}
+				else {
+					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					networksList = responseJson.getJSONArray("serviceNetworks")
+				}
+				else {
+					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid, String catalogUtilsVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					networksList = responseJson.getJSONArray("serviceNetworks")
+				}
+				else {
+					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+	public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType, String catalogUtilsVersion) {
+		JSONArray networksList = null
+		String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					networksList = responseJson.getJSONArray("serviceNetworks")
+				}
+				else {
+					networksList = parseNetworksJson(catalogDbResponse, "serviceNetworks", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return networksList
+	}
+
+
+	public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceVnfs")
+				}
+				else {
+					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {
+		JSONArray vnfsList = null
+		String endPoint ="/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceVnfs")
+				}
+				else {
+					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {
+		JSONArray vnfsList = null
+		String endPoint =  "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceVnfs")
+				}
+				else {
+					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	/**
+	 * This method gets a all vnfs for a particular
+	 * service from the catalog database using the
+	 * service model's model name.
+	 *
+	 * @param catalogDbEndpoint
+	 * @param serviceModelModelName
+	 * @return vnfsList	 *
+	 *
+	 */
+	public JSONArray getAllVnfsByServiceModelModelName(DelegateExecution execution, String serviceModelModelName) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?serviceModelName=" + UriUtils.encode(serviceModelModelName, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", defaultDbAdapterVersion)
+			}
+		}catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+		return vnfsList
+	}
+
+	public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceVnfs")
+				}
+				else {
+					vnfsList = parseVnfsJson(catalogDbResponse, "serviceVnfs", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	/**
+	 * This method gets a single vf module from
+	 * the catalog database using the vf module's
+	 * model name. It returns that vf module as
+	 * a JSONObject
+	 *
+	 * @param catalogDbEndpoint
+	 * @param vfModuleModelName
+	 * @return vfModule
+	 */
+	public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName) {
+		JSONObject vfModule = null
+		String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")
+		try{
+			msoLogger.debug("Get VfModule By VfModule ModelName Endpoint is: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vfModule = parseVfModuleJson(catalogDbResponse, "vfModules", "v1")
+			}
+		}
+		catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vfModule
+	}
+
+	/**
+	 * This method gets a single vf module from
+	 * the catalog database using the vf module's
+	 * model name. It returns that vf module as
+	 * a JSONObject
+	 *
+	 * @param catalogDbEndpoint
+	 * @param vfModuleModelName
+	 * @param catalogUtilsVersion
+	 * @return vfModules
+	 */
+	public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName, String catalogUtilsVersion)  {
+		JSONObject vfModule = null
+		String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")
+		try{
+			msoLogger.debug("Get VfModule By VfModule ModelName Endpoint is: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vfModule = parseVfModuleJson(catalogDbResponse, "vfModules", "v1")
+			}
+		}
+		catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vfModule
+	}
+
+
+	public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {
+		JSONArray vnfsList = null
+		String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceAllottedResources")
+				}
+				else {
+					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray()
+				}
+				else {
+					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.getStackTrace());
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceAllottedResources")
+				}
+				else {
+					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+
+	public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid, String catalogUtilsVersion) {
+		JSONArray vnfsList = null
+		String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					JSONObject responseJson = new JSONObject(catalogDbResponse)
+					vnfsList = responseJson.getJSONArray("serviceAllottedResources")
+				}
+				else {
+					vnfsList = parseAllottedResourcesJson(catalogDbResponse, "serviceAllottedResources", catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return vnfsList
+	}
+
+	public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+		    String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+	
+		    if (catalogDbResponse != null) {
+	
+			resources = parseServiceResourcesJson(catalogDbResponse, "v1")
+		    }
+	
+		}
+		catch (Exception e) {
+		    utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)
+			throw e
+		}
+
+		return resources
+	}
+
+	public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					resources = new JSONObject(catalogDbResponse)
+				}
+				else {
+					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)
+				}
+			}
+		}
+		catch (Exception e) {
+			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)
+			throw e
+		}
+
+		return resources
+	}
+
+	public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+
+				resources = parseServiceResourcesJson(catalogDbResponse, "v1")
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return resources
+	}
+
+	public String getServiceResourcesByServiceModelInvariantUuidString(DelegateExecution execution, String serviceModelInvariantUuid) {
+		String resources = null
+		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+
+				resources = catalogDbResponse
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return resources
+	}
+
+	public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					resources = new JSONObject(catalogDbResponse)
+				}
+				else {
+					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return resources
+	}
+
+
+	public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				//TODO this is wrong
+				resources = parseServiceResourcesJson(catalogDbResponse)
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return resources
+	}
+
+	public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {
+		JSONObject resources = null
+		String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")
+		try {
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				if (!catalogUtilsVersion.equals("v1")) {
+					resources = new JSONObject(catalogDbResponse)
+				}
+				else {
+					resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)
+				}
+			}
+
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in Querying Catalog DB", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+			throw e
+		}
+
+		return resources
+	}
+
+
+
+	private JSONArray parseNetworksJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {
+		JSONArray modelInfos = null
+
+		msoLogger.debug("parseNetworksJson - catalogUtilsVersion is " + catalogUtilsVersion)
+		try {
+			// Create array of jsons
+
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONArray networks = responseJson.getJSONArray(arrayName)
+			modelInfos = new JSONArray()
+
+			for (int i = 0; i < networks.length(); i++) {
+
+				JSONObject network = networks.getJSONObject(i)
+				JSONObject modelJson = new JSONObject()
+				JSONObject modelInfo = buildModelInfo("network", network, catalogUtilsVersion)
+				modelJson.put("modelInfo", modelInfo)
+				String networkType = jsonUtils.getJsonValueForKey(network, "networkType")
+				modelJson.put("networkType", networkType)
+
+				switch (catalogUtilsVersion) {
+					case "v1":
+						break
+					default:
+						String toscaNodeType = jsonUtils.getJsonValueForKey(network, "toscaNodeType")
+						modelJson.put("toscaNodeType", toscaNodeType)
+						String networkTechnology = jsonUtils.getJsonValueForKey(network, "networkTechnology")
+						modelJson.put("networkTechnology", networkTechnology)
+						String networkRole = jsonUtils.getJsonValueForKey(network, "networkRole")
+						modelJson.put("networkRole", networkRole)
+						String networkScope = jsonUtils.getJsonValueForKey(network, "networkScope")
+						modelJson.put("networkScope", networkScope)
+						break
+				}
+				modelInfos.put(modelJson)
+			}
+
+			String modelInfosString = modelInfos.toString()
+			msoLogger.debug("Returning networks JSON: " + modelInfosString)
+
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in parsing Catalog DB Response", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+
+		return modelInfos
+	}
+
+	private JSONArray parseVnfsJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {
+		JSONArray modelInfos = null
+
+		msoLogger.debug("parseVnfsJson - catalogUtilsVersion is " + catalogUtilsVersion)
+
+		try {
+			// Create array of jsons
+
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONArray vnfs = responseJson.getJSONArray(arrayName)
+			modelInfos = new JSONArray()
+
+			for (int i = 0; i < vnfs.length(); i++) {
+				JSONObject vnf = vnfs.getJSONObject(i)
+
+				msoLogger.debug(vnf.toString(2))
+				JSONObject modelInfo = buildModelInfo("vnf", vnf, catalogUtilsVersion)
+				JSONObject modelJson = new JSONObject()
+				modelJson.put("modelInfo", modelInfo)
+				switch(catalogUtilsVersion) {
+					case "v1":
+						break
+					default:
+						String toscaNodeType = jsonUtils.getJsonValueForKey(vnf, "toscaNodeType")
+						modelJson.put("toscaNodeType", toscaNodeType)
+						String nfType = jsonUtils.getJsonValueForKey(vnf, "nfType")
+						modelJson.put("nfType", nfType)
+						String nfRole = jsonUtils.getJsonValueForKey(vnf, "nfRole")
+						modelJson.put("nfRole", nfRole)
+						String nfCode = jsonUtils.getJsonValueForKey(vnf, "nfCode")
+						modelJson.put("nfNamingCode", nfCode)
+						String nfFunction = jsonUtils.getJsonValueForKey(vnf, "nfFunction")
+						modelJson.put("nfFunction", nfFunction)
+						String multiStageDesign = jsonUtils.getJsonValueForKey(vnf, "multiStageDesign")
+						modelJson.put("multiStageDesign", multiStageDesign)
+						break
+				}
+
+				JSONArray vfModules = null
+				try {
+					vfModules = vnf.getJSONArray("vfModules")
+				} catch (Exception e)
+				{
+					msoLogger.debug("Cannot find VF MODULE ARRAY: " + i + ", exception is " + e.message)
+				}
+
+				if (vfModules != null) {
+					JSONArray vfModuleInfo = new JSONArray()
+					for (int j = 0; j < vfModules.length(); j++) {
+						JSONObject vfModule = vfModules.getJSONObject(j)
+						JSONObject vfModuleModelInfo = buildModelInfo("vfModule", vfModule, catalogUtilsVersion)
+						JSONObject vfModuleModelJson = new JSONObject()
+						vfModuleModelJson.put("modelInfo", vfModuleModelInfo)
+						String vfModuleType = jsonUtils.getJsonValueForKey(vfModule, "type")
+						vfModuleModelJson.put("vfModuleType", vfModuleType)
+						switch(catalogUtilsVersion) {
+							case "v1":
+							//TODO this does not work, isBase is not a integer.
+								Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")
+								if (isBase.intValue() == 1) {
+									vfModuleModelJson.put("isBase", "true")
+								}
+								else {
+									vfModuleModelJson.put("isBase", "false")
+								}
+								break
+							default:
+								boolean isBase = jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase")
+								vfModuleModelJson.put("isBase", isBase)
+								break
+						}
+						String vfModuleLabel = jsonUtils.getJsonValueForKey(vfModule, "label")
+						vfModuleModelJson.put("vfModuleLabel", vfModuleLabel)
+						Integer initialCount = jsonUtils.getJsonIntValueForKey(vfModule, "initialCount")
+						vfModuleModelJson.put("initialCount", initialCount.intValue())
+						vfModuleInfo.put(vfModuleModelJson)
+					}
+					modelJson.put("vfModules", vfModuleInfo)
+				}
+				modelInfos.put(modelJson)
+			}
+
+			String modelInfosString = modelInfos.toString()
+			msoLogger.debug("Returning vnfs JSON: " + modelInfosString)
+
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in parsing Catalog DB Response", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+
+		return modelInfos
+	}
+
+	/**
+	 * This method parses a Vf Module from the
+	 * Vf Modules array
+	 *
+	 * @param catalogDbResponse
+	 * @param arrayName
+	 * @param catalogUtilsVersion
+	 * @return vfModulelJson
+	 */
+	private JSONObject parseVfModuleJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {
+		JSONObject vfModulelJson = new JSONObject()
+		msoLogger.debug("Started Parse Vf Module Json")
+		try {
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONArray vfModules = responseJson.getJSONArray(arrayName)
+			if(vfModules != null){
+				JSONObject vfModuleInfo = new JSONObject()
+				for (int i = 0; i < vfModules.length(); i++) {
+					JSONObject vfModule = vfModules.getJSONObject(i)
+					JSONObject vfModuleModelInfo = buildModelInfo("vfModule", vfModule, catalogUtilsVersion)
+					vfModulelJson.put("modelInfo", vfModuleModelInfo)
+					String vfModuleType = jsonUtils.getJsonValueForKey(vfModule, "type")
+					vfModulelJson.put("vfModuleType", vfModuleType)
+					switch(catalogUtilsVersion) {
+						case "v1":
+							Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")
+							if (isBase.intValue() == 1) {
+								vfModulelJson.put("isBase", "true")
+							}
+							else {
+								vfModulelJson.put("isBase", "false")
+							}
+							break
+						default:
+							boolean isBase = jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase")
+							vfModulelJson.put("isBase", isBase)
+							break
+					}
+					String vfModuleLabel = jsonUtils.getJsonValueForKey(vfModule, "label")
+					vfModulelJson.put("vfModuleLabel", vfModuleLabel)
+					Integer initialCount = jsonUtils.getJsonIntValueForKey(vfModule, "initialCount")
+					vfModulelJson.put("initialCount", initialCount.intValue())
+				}
+			}
+			msoLogger.debug("Completed Parsing Vf Module: " + vfModulelJson.toString())
+		}catch (Exception e){
+			msoLogger.debug("Exception while parsing Vf Modules from Catalog DB Response: " + e.message)
+		}
+
+		return vfModulelJson
+	}
+
+	private JSONArray parseAllottedResourcesJson (String catalogDbResponse, String arrayName, String catalogUtilsVersion) {
+		JSONArray modelInfos = null
+
+		msoLogger.debug("parseAllottedResourcesJson - catalogUtilsVersion is " + catalogUtilsVersion)
+
+		try {
+			// Create array of jsons
+
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONArray allottedResources = responseJson.getJSONArray(arrayName)
+			modelInfos = new JSONArray()
+
+			for (int i = 0; i < allottedResources.length(); i++) {
+				JSONObject allottedResource = allottedResources.getJSONObject(i)
+				JSONObject modelInfo = buildModelInfo("allottedResource", allottedResource, catalogUtilsVersion)
+				JSONObject modelJson = new JSONObject()
+				modelJson.put("modelInfo", modelInfo)
+				switch(catalogUtilsVersion) {
+					case "v1":
+						break
+					default:
+						String toscaNodeType = jsonUtils.getJsonValueForKey(allottedResource, "toscaNodeType")
+						modelJson.put("toscaNodeType", toscaNodeType)
+						String nfType = jsonUtils.getJsonValueForKey(allottedResource, "nfType")
+						modelJson.put("nfType", nfType)
+						String nfRole = jsonUtils.getJsonValueForKey(allottedResource, "nfRole")
+						modelJson.put("nfRole", nfRole)
+						String nfCode = jsonUtils.getJsonValueForKey(allottedResource, "nfCode")
+						modelJson.put("nfNamingCode", nfCode)
+						String nfFunction = jsonUtils.getJsonValueForKey(allottedResource, "nfFunction")
+						modelJson.put("nfFunction", nfFunction)
+						String providingServiceModelName = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelName")
+						modelJson.put("providingServiceModelName", providingServiceModelName)
+						String providingServiceModelUuid = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelUuid")
+						modelJson.put("providingServiceModelUuid", providingServiceModelUuid)
+						break
+				}
+
+
+				modelInfos.put(modelJson)
+			}
+
+			String modelInfosString = modelInfos.toString()
+			msoLogger.debug("Returning allottedResources JSON: " + modelInfosString)
+
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in parsing Catalog DB Response", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+
+		return modelInfos
+	}
+
+	//TODO this is wrong
+	private JSONObject parseServiceResourcesJson (String catalogDbResponse) {
+		JSONObject serviceResources = new JSONObject()
+		String catalogUtilsVersion = "v1"
+
+		try {
+			// Create array of jsons
+
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONObject serviceResourcesRoot = responseJson.getJSONObject("serviceResources")
+			JSONArray vnfsArray = parseVnfsJson(serviceResourcesRoot.toString(), "vnfResources", catalogUtilsVersion)
+			serviceResources.put("vnfs", vnfsArray)
+			JSONArray networksArray = parseNetworksJson(serviceResourcesRoot.toString(), "networkResourceCustomization", catalogUtilsVersion)
+			serviceResources.put("networks", networksArray)
+			JSONArray allottedResourcesArray = parseAllottedResourcesJson(serviceResourcesRoot.toString(), "allottedResourceCustomization", catalogUtilsVersion)
+			serviceResources.put("allottedResources", allottedResourcesArray)
+
+			String serviceResourcesString = serviceResources.toString()
+			msoLogger.debug("Returning serviceResources JSON: " + serviceResourcesString)
+
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in parsing Catalog DB Response", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+
+		return serviceResources
+	}
+
+	private JSONObject parseServiceResourcesJson (String catalogDbResponse, String catalogUtilsVersion) {
+		JSONObject serviceResources = new JSONObject()
+		JSONObject serviceResourcesObject = new JSONObject()
+		String serviceResourcesString = ""
+
+		try {
+			// Create array of jsons
+
+			JSONObject responseJson = new JSONObject(catalogDbResponse)
+			JSONObject serviceResourcesRoot = responseJson.getJSONObject("serviceResources")
+			JSONObject modelInfo = buildModelInfo("", serviceResourcesRoot, catalogUtilsVersion)
+			serviceResources.put("modelInfo", modelInfo)
+			JSONArray vnfsArray = parseVnfsJson(serviceResourcesRoot.toString(), "serviceVnfs", catalogUtilsVersion)
+			serviceResources.put("serviceVnfs", vnfsArray)
+			JSONArray networksArray = parseNetworksJson(serviceResourcesRoot.toString(), "serviceNetworks", catalogUtilsVersion)
+			serviceResources.put("serviceNetworks", networksArray)
+			JSONArray allottedResourcesArray = parseAllottedResourcesJson(serviceResourcesRoot.toString(), "serviceAllottedResources", catalogUtilsVersion)
+			serviceResources.put("serviceAllottedResources", allottedResourcesArray)
+			serviceResourcesObject.put("serviceResources", serviceResources)
+
+			serviceResourcesString = serviceResourcesObject.toString()
+			msoLogger.debug("Returning serviceResources JSON: " + serviceResourcesString)
+
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception in parsing Catalog DB Response", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+
+		return serviceResourcesObject
+	}
+
+	private JSONObject buildModelInfo(String modelType, JSONObject modelFromDb, String catalogUtilsVersion) {
+		JSONObject modelInfo = null
+		try {
+			modelInfo = new JSONObject()
+			modelInfo.put("modelType", modelType)
+			String modelInvariantId = jsonUtils.getJsonValueForKey(modelFromDb, "modelInvariantUuid")
+			modelInfo.put("modelInvariantId", modelInvariantId)
+			if(modelType.equalsIgnoreCase("allottedResource") || modelType.equalsIgnoreCase("vnf")){
+				String modelInstanceName = jsonUtils.getJsonValueForKey(modelFromDb, "modelInstanceName")
+				modelInfo.put("modelInstanceName", modelInstanceName)
+			}
+			if ((!"vfModule".equals(modelType) && !"vnf".equals(modelType)) || !catalogUtilsVersion.equals("v1")) {
+				String modelVersionId = jsonUtils.getJsonValueForKey(modelFromDb, "modelUuid")
+				modelInfo.put("modelVersionId", modelVersionId)
+			}
+			else {
+				String modelVersionId = jsonUtils.getJsonValueForKey(modelFromDb, "asdcUuid")
+				modelInfo.put("modelVersionId", modelVersionId)
+			}
+			String modelName = jsonUtils.getJsonValueForKey(modelFromDb, "modelName")
+			modelInfo.put("modelName", modelName)
+			String modelVersion = jsonUtils.getJsonValueForKey(modelFromDb, "modelVersion")
+			modelInfo.put("modelVersion", modelVersion)
+			if (!"vfModule".equals(modelType)) {
+				String modelCustomizationName = jsonUtils.getJsonValueForKey(modelFromDb, "modelCustomizationName")
+				modelInfo.put("modelCustomizationName", modelCustomizationName)
+			}
+			String modelCustomizationId = jsonUtils.getJsonValueForKey(modelFromDb, "modelCustomizationUuid")
+			switch (catalogUtilsVersion) {
+				case "v1":
+					modelInfo.put("modelCustomizationId", modelCustomizationId)
+					break
+				default:
+					modelInfo.put("modelCustomizationUuid", modelCustomizationId)
+					break
+			}
+			JSONObject modelJson = new JSONObject()
+			modelJson.put("modelInfo", modelInfo)
+		}
+		catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception while parsing model information", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e.message);
+		}
+		return modelInfo
+	}
+
+	private String getResponseFromCatalogDb (DelegateExecution execution, String endPoint) {
+		try {
+
+			String catalogDbEndpoint = UrnPropertiesReader.getVariable("mso.catalog.db.endpoint",execution)
+			String queryEndpoint = catalogDbEndpoint + "/" + defaultDbAdapterVersion + endPoint
+			RESTConfig config = new RESTConfig(queryEndpoint);
+			def responseData = ''
+			def bpmnRequestId = UUID.randomUUID().toString()
+			RESTClient client = new RESTClient(config).
+					addHeader('X-TransactionId', bpmnRequestId).
+					addHeader('X-FromAppId', 'BPMN').
+					addHeader('Content-Type', 'application/json').
+					addHeader('Accept','application/json');
+
+			String basicAuthCred = execution.getVariable("BasicAuthHeaderValueDB")
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+					client.addAuthorizationHeader(basicAuthCred)
+			}else {
+				client.addAuthorizationHeader(getBasicDBAuthHeader(execution))
+			}
+			msoLogger.debug('sending GET to Catalog DB endpoint: ' + endPoint)
+			APIResponse response = client.httpGet()
+
+			responseData = response.getResponseBodyAsString()
+			if (responseData != null) {
+				msoLogger.debug("Received data from Catalog DB: " + responseData)
+			}
+
+			msoLogger.debug('Response code:' + response.getStatusCode())
+			msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			if (response.getStatusCode() == 200) {
+				// parse response as needed
+				return responseData
+			}
+			else {
+				return null
+			}
+		}
+		catch (Exception e) {
+			msoLogger.debug("ERROR WHILE QUERYING CATALOG DB: " + e.message)
+			throw e
+		}
+
+	}
+
+	/**
+	 * get resource recipe by resource model uuid and action
+	 */
+	public JSONObject getResourceRecipe(DelegateExecution execution, String resourceModelUuid, String action) {
+		String endPoint = "/resourceRecipe?resourceModelUuid=" + UriUtils.encode(resourceModelUuid, "UTF-8")+ "&action=" + UriUtils.encode(action, "UTF-8")
+		JSONObject responseJson = null
+		try {
+			msoLogger.debug("ENDPOINT: " + endPoint)
+			String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)
+
+			if (catalogDbResponse != null) {
+				responseJson = new JSONObject(catalogDbResponse)
+			}
+		}
+		catch (Exception e) {
+			utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)
+			throw e
+		}
+
+		return responseJson
+	}
+	
+	private String getBasicDBAuthHeader(DelegateExecution execution) {
+		
+		String encodedString = null
+		try {
+			String basicAuthValueDB = UrnPropertiesReader.getVariable("mso.adapters.db.auth", execution)
+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB)
+			
+			encodedString = utils.getBasicAuth(basicAuthValueDB, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
+		} catch (IOException ex) {
+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
+			utils.log("ERROR", dataErrorMessage)
+		}
+		return encodedString
+	}
+	
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CompleteMsoProcess.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
index 57a04e5439..9c4c73fb7d 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CompleteMsoProcess.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
@@ -7,9 +7,9 @@
  * 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.
@@ -18,24 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
 
 import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.delegate.DelegateExecution

-
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
 
 public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CompleteMsoProcess.class);
 
 	String Prefix="CMSO_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 
 	// Complete MSO Request processing
-	public initializeProcessVariables(DelegateExecution execution){

+	public initializeProcessVariables(DelegateExecution execution){
 
 		def method = getClass().getSimpleName() + '.initializeProcessVariables(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 		try {
 
 			/* Initialize all the process request variables in this block */
@@ -70,30 +71,29 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
 		}
 
 	}
 
-	public void preProcessRequest (DelegateExecution execution) {

+	public void preProcessRequest (DelegateExecution execution) {
 
 		initializeProcessVariables(execution)
 		def method = getClass().getSimpleName() + '.preProcessRequest(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-//		utils.log("DEBUG", "*** Started CompleteMsoProcess preProcessRequest Method ***", isDebugLogEnabled);
-		logDebug('Entered ' + method, isDebugLogEnabled)
-
-		setBasicDBAuthHeader(execution, isDebugLogEnabled)
+		//		msoLogger.trace("Started CompleteMsoProcess preProcessRequest Method ");
+		msoLogger.trace('Entered ' + method)
+		
+		setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
 
 		try {
 			def xml = execution.getVariable("CompleteMsoProcessRequest")
 
-			utils.logAudit("CompleteMsoProcess Request: " + xml)
-			utils.log("DEBUG", "Incoming Request is: "+ xml, isDebugLogEnabled)
+			msoLogger.debug("CompleteMsoProcess Request: " + xml)
+			msoLogger.debug("Incoming Request is: "+ xml)
 
 			//mso-bpel-name from the incoming request
-			def msoBpelName = utils.getNodeText1(xml,"mso-bpel-name")
+			def msoBpelName = utils.getNodeText(xml,"mso-bpel-name")
 			execution.setVariable("CMSO_mso-bpel-name",msoBpelName)
 
 			//Check the incoming request type
@@ -103,7 +103,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 			}
 
 			//Check for rehome indicator
-			def rehomeIndicator = utils.getNodeText1(xml,"rehomeDone")
+			def rehomeIndicator = utils.getNodeText(xml,"rehomeDone")
 			execution.setVariable("rehomeDone", rehomeIndicator)
 
 			//Check notification-url for the incoming request type
@@ -143,18 +143,18 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 				execution.setVariable("CMSO_source",utils.getNodeText(xml,"source"))
 			}
 
-			utils.log("DEBUG", "CMSO_notification-url-Ok --> " + execution.getVariable("CMSO_notification-url-Ok"), isDebugLogEnabled)
-			utils.log("DEBUG", "CMSO_request_id-Ok --> " + execution.getVariable("CMSO_request_id-Ok"), isDebugLogEnabled)
+			msoLogger.trace("--> " + execution.getVariable(""))
+			msoLogger.trace("--> " + execution.getVariable(""))
 
 			// set the DHV/Service Instantiation values if specified in the request
-			execution.setVariable("CMSO_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText1(xml, "is-srv-inst-req"))))
-			utils.log("DEBUG", "CMSO_is_srv_inst_req --> " + execution.getVariable("CMSO_is_srv_inst_req"), isDebugLogEnabled)
-			execution.setVariable("CMSO_is_json_content", String.valueOf("JSON".equals(utils.getNodeText1(xml, "resp-content-type"))))
-			utils.log("DEBUG", "CMSO_is_json_content --> " + execution.getVariable("CMSO_is_json_content"), isDebugLogEnabled)
-			execution.setVariable("CMSO_service_inst_id", utils.getNodeText1(xml, "service-instance-id"))
-			utils.log("DEBUG", "CMSO_service_inst_id --> " + execution.getVariable("CMSO_service_inst_id"), isDebugLogEnabled)
-			execution.setVariable("CMSO_start_time", utils.getNodeText1(xml, "start-time"))
-			utils.log("DEBUG", "CMSO_start_time --> " + execution.getVariable("CMSO_start_time"), isDebugLogEnabled)
+			execution.setVariable("CMSO_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText(xml, "is-srv-inst-req"))))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("CMSO_is_json_content", String.valueOf("JSON".equals(utils.getNodeText(xml, "resp-content-type"))))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("CMSO_service_inst_id", utils.getNodeText(xml, "service-instance-id"))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("CMSO_start_time", utils.getNodeText(xml, "start-time"))
+			msoLogger.trace("--> " + execution.getVariable(""))
 			// this variable is used by the camunda flow to set the Content-Type for the async response
 			if (execution.getVariable("CMSO_is_srv_inst_req").equals("true") &&
 				execution.getVariable("CMSO_is_json_content").equals("true")) {
@@ -163,22 +163,21 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 				execution.setVariable("CMSO_content_type", "text/xml")
 			}
 
-			logDebug('Exited ' + method, isDebugLogEnabled)
+			msoLogger.trace('Exited ' + method)
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
-			utils.log("DEBUG", "Exception Occured During PreProcessRequest: " + e, isDebugLogEnabled);
+			msoLogger.debug("Exception Occured During PreProcessRequest: " + e);
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
 		}
 
-//		utils.log("DEBUG", "*** Completed CompleteMsoProcess preProcessRequest Method ***", isDebugLogEnabled);
+//		msoLogger.trace("Completed CompleteMsoProcess preProcessRequest Method ");
 	}
 
-	public void setUpdateDBstatustoSuccessPayload (DelegateExecution execution){

+	public void setUpdateDBstatustoSuccessPayload (DelegateExecution execution){
 
 		def method = getClass().getSimpleName() + '.setUpdateDBstatustoSuccessPayload(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		try {
 
@@ -187,7 +186,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 			//Get statusMessage if exists
 			def statusMessage
 			if(utils.nodeExists(xml, "status-message")){
-				statusMessage = utils.getNodeText1(xml, "status-message")
+				statusMessage = utils.getNodeText(xml, "status-message")
 			}else{
 				statusMessage = "Resource Completed Successfully"
 			}
@@ -210,16 +209,16 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 				idXml = ""
 			}
 			idXml = utils.removeXmlPreamble(idXml)
-			utils.log("DEBUG", "Incoming Instance Id Xml: " + idXml, isDebugLogEnabled)
+			msoLogger.debug("Incoming Instance Id Xml: " + idXml)
 
 			String payload = """
-						<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
+						<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
 						   <soapenv:Header/>
 						   <soapenv:Body>
 						      <req:updateInfraRequest>
-						         <requestId>${execution.getVariable("CMSO_request_id")}</requestId>
-						         <lastModifiedBy>${execution.getVariable("CMSO_mso-bpel-name")}</lastModifiedBy>
-						         <statusMessage>${statusMessage}</statusMessage>
+						         <requestId>${MsoUtils.xmlEscape(execution.getVariable("CMSO_request_id"))}</requestId>
+						         <lastModifiedBy>${MsoUtils.xmlEscape(execution.getVariable("CMSO_mso-bpel-name"))}</lastModifiedBy>
+						         <statusMessage>${MsoUtils.xmlEscape(statusMessage)}</statusMessage>
 						         <requestStatus>COMPLETE</requestStatus>
 								 <progress>100</progress>
 								 ${idXml}
@@ -228,27 +227,26 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 						</soapenv:Envelope>"""
 
 			execution.setVariable("CMSO_setUpdateDBstatustoSuccessPayload", payload)
-			utils.log("DEBUG", "Outgoing Update Mso Request Payload is: " + payload, isDebugLogEnabled)
-			utils.logAudit("setUpdateDBstatustoSuccessPayload: " + payload)
+			msoLogger.debug("Outgoing Update Mso Request Payload is: " + payload)
+			msoLogger.debug("setUpdateDBstatustoSuccessPayload: " + payload)
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
 		}
-		logDebug('Exited ' + method, isDebugLogEnabled)
+		msoLogger.trace('Exited ' + method)
 	}
 
-	public void buildDataError (DelegateExecution execution, String message) {

+	public void buildDataError (DelegateExecution execution, String message) {
 
 		def method = getClass().getSimpleName() + '.buildDataError(' +'execution=' + execution.getId() +')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 		try {
 
 			def msoCompletionResponse = """
-			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
+			<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
 			   <sdncadapterworkflow:out>BPEL ${execution.getVariable("CMSO_mso-bpel-name")} FAILED</sdncadapterworkflow:out>
 			</sdncadapterworkflow:MsoCompletionResponse>
 			""".trim()
@@ -256,28 +254,27 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 			// Format Response
 			def xmlMsoCompletionResponse = utils.formatXml(msoCompletionResponse)
 			String buildMsoCompletionResponseAsString = xmlMsoCompletionResponse.drop(38).trim()
-			utils.logAudit("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
+			msoLogger.debug("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
 			execution.setVariable("CompleteMsoProcessResponse", buildMsoCompletionResponseAsString)
-			utils.log("DEBUG", "@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompletionHandlerResponse"), isDebugLogEnabled)
+			msoLogger.debug("@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompletionHandlerResponse"))
 
 			exceptionUtil.buildAndThrowWorkflowException(execution, 500, message)
 
 		} catch (BpmnError e) {
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugLogEnabled)
+			msoLogger.debug("Rethrowing MSOWorkflowException")
 			throw e;
 		} catch (Exception e) {
-			logError('Caught exception in ' + method, e)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
 		}
 
 	}
 
-	public void postProcessResponse (DelegateExecution execution) {

+	public void postProcessResponse (DelegateExecution execution) {
 
 				def method = getClass().getSimpleName() + '.postProcessResponse(' +'execution=' + execution.getId() +')'
-				def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-				logDebug('Entered ' + method, isDebugLogEnabled)
-		//		utils.log("DEBUG", "*** Started CompleteMsoProcess PostProcessRequest Method ***", isDebugLogEnabled);
+				msoLogger.trace('Entered ' + method)
+		//		msoLogger.trace("Started CompleteMsoProcess PostProcessRequest Method ");
 				try {
 
 					def msoCompletionResponse = """
@@ -291,22 +288,22 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
 					String buildMsoCompletionResponseAsString = xmlMsoCompletionResponse.drop(38).trim()
 					// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
 					execution.setVariable("WorkflowResponse", buildMsoCompletionResponseAsString)
-					utils.logAudit("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
+					msoLogger.debug("CompleteMsoProcess Response: " + buildMsoCompletionResponseAsString)
 					execution.setVariable("CompleteMsoProcessResponse", buildMsoCompletionResponseAsString)
 					execution.setVariable("CMSO_ResponseCode", "200")
 
 					setSuccessIndicator(execution, true)
 
-					utils.log("DEBUG", "@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompleteMsoProcessResponse"), isDebugLogEnabled)
+					msoLogger.debug("@@ CompleteMsoProcess Response @@ " + "\n" + execution.getVariable("CompleteMsoProcessResponse"))
 
-					logDebug('Exited ' + method, isDebugLogEnabled)
+					msoLogger.trace('Exited ' + method)
 				} catch (BpmnError e) {
 					throw e;
 				} catch (Exception e) {
-					logError('Caught exception in ' + method, e)
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
 				}
-		//		utils.log("DEBUG", "*** Completed CompleteMsoProcess PostProcessRequest Method ***", isDebugLogEnabled);
+		//		msoLogger.trace("Completed CompleteMsoProcess PostProcessRequest Method ");
 
 	}
 
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ConfirmVolumeGroupName.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupName.groovy
index 615e25de71..8b786bc152 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ConfirmVolumeGroupName.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupName.groovy
@@ -1,159 +1,152 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-

-

-public class ConfirmVolumeGroupName extends AbstractServiceTaskProcessor{

-	

-	def Prefix="CVGN_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable("prefix",Prefix)

-		execution.setVariable("CVGN_volumeGroupId",null)

-		execution.setVariable("CVGN_volumeGroupName",null)

-		execution.setVariable("CVGN_aicCloudRegion", null)

-		execution.setVariable("CVGN_volumeGroupGetEndpoint",null)

-						

-		// ConfirmVolumeGroupName workflow response variable placeholders

-		execution.setVariable("CVGN_volumeGroupNameMatches", false)

-		execution.setVariable("CVGN_queryVolumeGroupResponseCode",null)

-		execution.setVariable("CVGN_queryVolumeGroupResponse","")

-		execution.setVariable("CVGN_ResponseCode",null)

-//		execution.setVariable("CVGN_ErrorResponse","")

-		execution.setVariable("RollbackData", null)

-	}

-

-	// store the incoming data in the flow DelegateExecution

-	public void preProcessRequest(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def volumeGroupId = execution.getVariable("ConfirmVolumeGroupName_volumeGroupId")

-		def volumeGroupName= execution.getVariable("ConfirmVolumeGroupName_volumeGroupName")

-		def aicCloudRegion = execution.getVariable("ConfirmVolumeGroupName_aicCloudRegion")

-		

-		initProcessVariables(execution)

-		execution.setVariable("CVGN_volumeGroupId", volumeGroupId)

-		execution.setVariable("CVGN_volumeGroupName", volumeGroupName)

-		execution.setVariable("CVGN_aicCloudRegion", aicCloudRegion)

-		

-		AaiUtil aaiUriUtil = new AaiUtil(this)

-		def aai_uri = aaiUriUtil.getCloudInfrastructureCloudRegionUri(execution)

-		logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-		utils.logAudit("AAI URI: " + aai_uri)

-		execution.setVariable("CVGN_volumeGroupGetEndpoint","${aai_uri}/${aicCloudRegion}/volume-groups/volume-group/" +

-				volumeGroupId)		

-	}

-	

-	// send a GET request to AA&I to retrieve the Volume information based on volume-group-id

-	// expect a 200 response with the information in the response body or a 404 if the volume group id does not exist

-	public void queryAAIForVolumeGroupId(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("CVGN_volumeGroupGetEndpoint")

-		

-		try {

-			logDebug("invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint,isDebugLogEnabled)

-			utils.log("DEBUG","queryAAIForVolumeGroupId() endpoint-" + endPoint, isDebugLogEnabled)

-			utils.logAudit("ConfirmVolumeGroup sending GET call to AAI Endpoint: " + endPoint)

-

-			AaiUtil aaiUtil = new AaiUtil(this)

-			APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)

-			def responseData = response.getResponseBodyAsString()

-			def responseStatusCode = response.getStatusCode()

-			execution.setVariable("CVGN_queryVolumeGroupResponseCode", responseStatusCode)

-			execution.setVariable("CVGN_queryVolumeGroupResponse", responseData)

-

-			utils.logAudit("Response code:" + responseStatusCode)

-			utils.logAudit("Response:" + responseData)

-			logDebug("Response code:" + responseStatusCode, isDebugLogEnabled)

-			logDebug("Response:" + System.lineSeparator()+responseData,isDebugLogEnabled)

-		} catch (Exception ex) {

-	//		ex.printStackTrace()

-			logDebug("Exception occurred while executing AAI GET:" + ex.getMessage(),isDebugLogEnabled)

-			execution.setVariable("CVGN_queryVolumeGroupResponseCode", 500)

-			execution.setVariable("CVGN_queryVolumeGroupResponse", "AAI GET Failed:" + ex.getMessage())

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "AAI GET Failed")

-		}

-	}

-

-	// process the result from queryAAIVolumeGroupId()

-

-	public void checkAAIQueryResult(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def result = execution.getVariable("CVGN_queryVolumeGroupResponse")

-

-		if (execution.getVariable("CVGN_queryVolumeGroupResponseCode") == 404) {

-			logDebug('volumeGroupId does not exist in AAI', isDebugLogEnabled)

-		}

-		else if (execution.getVariable("CVGN_queryVolumeGroupResponseCode") == 200) {

-			logDebug("volumeGroupId exists in AAI", isDebugLogEnabled)

-		}

-		def xml = execution.getVariable("CVGN_queryVolumeGroupResponse")

-		def actualVolumeGroupName = ""

-		if (utils.nodeExists(xml, "volume-group-name")) {

-			actualVolumeGroupName = utils.getNodeText(xml, "volume-group-name")

-		}

-		execution.setVariable("CVGN_volumeGroupNameMatches", false)

-		def volumeGroupName = execution.getVariable("CVGN_volumeGroupName")

-

-		if (volumeGroupName.equals(actualVolumeGroupName)) {

-			logDebug('Volume Group Name Matches AAI records', isDebugLogEnabled)

-			execution.setVariable("CVGN_volumeGroupNameMatches", true)

-		}

-	}

-

-

-	// generates a WorkflowException if the A&AI query returns a response code other than 200/404

-	public void handleAAIQueryFailure(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-

-		logError("Error occurred attempting to query AAI, Response Code " +

-			execution.getVariable("CVGN_queryVolumeGroupResponseCode") + ", Error Response " +

-			execution.getVariable("CVGN_queryVolumeGroupResponse"))

-		//String processKey = getProcessKey(execution);

-		//WorkflowException exception = new WorkflowException(processKey, 5000,

-			//execution.getVariable("CVGN_queryVolumeGroupResponse"))

-		//execution.setVariable("WorkflowException", exception)

-	}

-

-	// generates a WorkflowException if the volume group name does not match AAI record for this volume group

-	public void handleVolumeGroupNameNoMatch(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-

-		def errorNotAssociated = "Error occurred - volume group id " + execution.getVariable("CVGN_volumeGroupId") +

-			" is not associated with  " + execution.getVariable("CVGN_volumeGroupName")

-		logError(errorNotAssociated)

-		exceptionUtil.buildAndThrowWorkflowException(execution, 1002, errorNotAssociated)

-		//String processKey = getProcessKey(execution);

-		//WorkflowException exception = new WorkflowException(processKey, 1002,

-		//	errorNotAssociated)

-		//execution.setVariable("WorkflowException", exception)

-	}

-

-	// sends a successful WorkflowResponse

-	public void reportSuccess(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		logDebug("Sending 200 back to the caller", isDebugLogEnabled)

-		def responseXML = ""

-		execution.setVariable("WorkflowResponse", responseXML)

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+public class ConfirmVolumeGroupName extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ConfirmVolumeGroupName.class);
+	
+	def Prefix="CVGN_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		execution.setVariable("CVGN_volumeGroupId",null)
+		execution.setVariable("CVGN_volumeGroupName",null)
+		execution.setVariable("CVGN_aicCloudRegion", null)
+		execution.setVariable("CVGN_volumeGroupGetEndpoint",null)
+						
+		// ConfirmVolumeGroupName workflow response variable placeholders
+		execution.setVariable("CVGN_volumeGroupNameMatches", false)
+		execution.setVariable("CVGN_queryVolumeGroupResponseCode",null)
+		execution.setVariable("CVGN_queryVolumeGroupResponse","")
+		execution.setVariable("CVGN_ResponseCode",null)
+//		execution.setVariable("CVGN_ErrorResponse","")
+		execution.setVariable("RollbackData", null)
+	}
+
+	// store the incoming data in the flow DelegateExecution
+	public void preProcessRequest(DelegateExecution execution) {
+		def volumeGroupId = execution.getVariable("ConfirmVolumeGroupName_volumeGroupId")
+		def volumeGroupName= execution.getVariable("ConfirmVolumeGroupName_volumeGroupName")
+		def aicCloudRegion = execution.getVariable("ConfirmVolumeGroupName_aicCloudRegion")
+		
+		initProcessVariables(execution)
+		execution.setVariable("CVGN_volumeGroupId", volumeGroupId)
+		execution.setVariable("CVGN_volumeGroupName", volumeGroupName)
+		execution.setVariable("CVGN_aicCloudRegion", aicCloudRegion)
+		
+		AaiUtil aaiUriUtil = new AaiUtil(this)
+		def aai_uri = aaiUriUtil.getCloudInfrastructureCloudRegionUri(execution)
+		msoLogger.debug('AAI URI is: ' + aai_uri)
+		msoLogger.debug("AAI URI: " + aai_uri)
+		execution.setVariable("CVGN_volumeGroupGetEndpoint","${aai_uri}/${aicCloudRegion}/volume-groups/volume-group/" +
+				volumeGroupId)		
+	}
+	
+	// send a GET request to AA&I to retrieve the Volume information based on volume-group-id
+	// expect a 200 response with the information in the response body or a 404 if the volume group id does not exist
+	public void queryAAIForVolumeGroupId(DelegateExecution execution) {
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("CVGN_volumeGroupGetEndpoint")
+		
+		try {
+			msoLogger.debug("invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint)
+			msoLogger.debug("queryAAIForVolumeGroupId() endpoint-" + endPoint)
+			msoLogger.debug("ConfirmVolumeGroup sending GET call to AAI Endpoint: " + endPoint)
+
+			AaiUtil aaiUtil = new AaiUtil(this)
+			APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)
+			def responseData = response.getResponseBodyAsString()
+			def responseStatusCode = response.getStatusCode()
+			execution.setVariable("CVGN_queryVolumeGroupResponseCode", responseStatusCode)
+			execution.setVariable("CVGN_queryVolumeGroupResponse", responseData)
+
+			msoLogger.debug("Response code:" + responseStatusCode)
+			msoLogger.debug("Response:" + responseData)
+			msoLogger.debug("Response code:" + responseStatusCode)
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+		} catch (Exception ex) {
+	//		ex.printStackTrace()
+			msoLogger.debug("Exception occurred while executing AAI GET:" + ex.getMessage())
+			execution.setVariable("CVGN_queryVolumeGroupResponseCode", 500)
+			execution.setVariable("CVGN_queryVolumeGroupResponse", "AAI GET Failed:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "AAI GET Failed")
+		}
+	}
+
+	// process the result from queryAAIVolumeGroupId()
+
+	public void checkAAIQueryResult(DelegateExecution execution) {
+		def result = execution.getVariable("CVGN_queryVolumeGroupResponse")
+
+		if (execution.getVariable("CVGN_queryVolumeGroupResponseCode") == 404) {
+			msoLogger.debug('volumeGroupId does not exist in AAI')
+		}
+		else if (execution.getVariable("CVGN_queryVolumeGroupResponseCode") == 200) {
+			msoLogger.debug("volumeGroupId exists in AAI")
+		}
+		def xml = execution.getVariable("CVGN_queryVolumeGroupResponse")
+		def actualVolumeGroupName = ""
+		if (utils.nodeExists(xml, "volume-group-name")) {
+			actualVolumeGroupName = utils.getNodeText(xml, "volume-group-name")
+		}
+		execution.setVariable("CVGN_volumeGroupNameMatches", false)
+		def volumeGroupName = execution.getVariable("CVGN_volumeGroupName")
+
+		if (volumeGroupName.equals(actualVolumeGroupName)) {
+			msoLogger.debug('Volume Group Name Matches AAI records')
+			execution.setVariable("CVGN_volumeGroupNameMatches", true)
+		}
+	}
+
+
+	// generates a WorkflowException if the A&AI query returns a response code other than 200/404
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Error occurred attempting to query AAI, Response Code " + execution.getVariable("CVGN_queryVolumeGroupResponseCode"), "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "ErrorResponse is:\n" + execution.getVariable("CVGN_queryVolumeGroupResponse"));
+		//String processKey = getProcessKey(execution);
+		//WorkflowException exception = new WorkflowException(processKey, 5000,
+			//execution.getVariable("CVGN_queryVolumeGroupResponse"))
+		//execution.setVariable("WorkflowException", exception)
+	}
+
+	// generates a WorkflowException if the volume group name does not match AAI record for this volume group
+	public void handleVolumeGroupNameNoMatch(DelegateExecution execution) {
+		def errorNotAssociated = "Error occurred - volume group id " + execution.getVariable("CVGN_volumeGroupId") +
+			" is not associated with  " + execution.getVariable("CVGN_volumeGroupName")
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, errorNotAssociated, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+		exceptionUtil.buildAndThrowWorkflowException(execution, 1002, errorNotAssociated)
+		//String processKey = getProcessKey(execution);
+		//WorkflowException exception = new WorkflowException(processKey, 1002,
+		//	errorNotAssociated)
+		//execution.setVariable("WorkflowException", exception)
+	}
+
+	// sends a successful WorkflowResponse
+	public void reportSuccess(DelegateExecution execution) {
+		msoLogger.debug("Sending 200 back to the caller")
+		def responseXML = ""
+		execution.setVariable("WorkflowResponse", responseXML)
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ConfirmVolumeGroupTenant.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenant.groovy
index ecb18043a7..c0ed81c553 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ConfirmVolumeGroupTenant.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenant.groovy
@@ -1,193 +1,193 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.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.delegate.DelegateExecution

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

-import org.openecomp.mso.rest.APIResponse

-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

-

-

-/**

- * Vnf Module Subflow for confirming the volume group belongs

- * to the tenant

- *

- * @param tenantId

- * @param volumeGroupId

- *

- */

-class ConfirmVolumeGroupTenant extends AbstractServiceTaskProcessor{

-

-	String Prefix="CVGT_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	public void preProcessRequest(DelegateExecution execution){

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

-		execution.setVariable("prefix", Prefix)

-		utils.log("DEBUG", " ======== STARTED Confirm Volume Group Tenant Subflow ======== ", isDebugEnabled)

-		String processKey = getProcessKey(execution);

-		try{

-			utils.log("DEBUG", " === Started QueryAAIForVolumeGroup Process === ", isDebugEnabled)

-

-			String volumeGroupId = execution.getVariable("volumeGroupId")

-			String incomingGroupName = execution.getVariable("volumeGroupName")

-			String incomingTenantId = execution.getVariable("tenantId")

-			def aicCloudRegion = execution.getVariable("aicCloudRegion")

-			String aai = execution.getVariable("URN_aai_endpoint")

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def aai_uri = aaiUriUtil.getCloudInfrastructureCloudRegionUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-

-			String path = aai + "${aai_uri}/${aicCloudRegion}/volume-groups/volume-group/" + volumeGroupId

-

-			APIResponse queryAAIForVolumeGroupResponse = aaiUriUtil.executeAAIGetCall(execution, path)

-

-			def responseCode = queryAAIForVolumeGroupResponse.getStatusCode()

-			execution.setVariable("queryVolumeGroupResponseCode", responseCode)

-			String response = queryAAIForVolumeGroupResponse.getResponseBodyAsString()

-			response = StringEscapeUtils.unescapeXml(response)

-

-			utils.logAudit("ConfirmVolumeGroup Response: " + response)

-			utils.logAudit("ConfirmVolumeGroup Response Code: " + responseCode)

-

-			if(responseCode == 200 && response != null){

-				execution.setVariable("queryAAIVolumeGroupResponse", response)

-				utils.log("DEBUG", "QueryAAIForVolumeGroup Received a Good REST Response is: \n" + response, isDebugEnabled)

-

-				String volumeGroupTenantId = ""

-				InputSource source = new InputSource(new StringReader(response));

-				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-				docFactory.setNamespaceAware(true)

-				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-				Document createVCERequestXml = docBuilder.parse(source)

-				NodeList nodeList = createVCERequestXml.getElementsByTagNameNS("*", "relationship")

-				for (int x = 0; x < nodeList.getLength(); x++) {

-					Node node = nodeList.item(x)

-					if (node.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement = (Element) node

-						String e = eElement.getElementsByTagNameNS("*", "related-to").item(0).getTextContent()

-						if(e.equals("tenant")){

-							NodeList relationDataList = eElement.getElementsByTagNameNS("*", "relationship-data")

-							for (int d = 0; d < relationDataList.getLength(); d++) {

-								Node dataNode = relationDataList.item(d)

-								if (dataNode.getNodeType() == Node.ELEMENT_NODE) {

-									Element dElement = (Element) dataNode

-									String key = dElement.getElementsByTagNameNS("*", "relationship-key").item(0).getTextContent()

-									if(key.equals("tenant.tenant-id")){

-										volumeGroupTenantId = dElement.getElementsByTagNameNS("*", "relationship-value").item(0).getTextContent()

-									}

-								}

-							}

-						}

-					}

-				}

-

-				//Determine if Tenant Ids match

-				if(incomingTenantId.equals(volumeGroupTenantId)){

-					utils.log("DEBUG", "Tenant Ids Match", isDebugEnabled)

-					execution.setVariable("tenantIdsMatch", true)

-				}else{

-					utils.log("DEBUG", "Tenant Ids DO NOT Match", isDebugEnabled)

-					execution.setVariable("tenantIdsMatch", false)

-				}

-

-				//Determine if Volume Group Names match

-				String volumeGroupName = utils.getNodeText1(response, "volume-group-name")

-				if(incomingGroupName == null || incomingGroupName.length() < 1){

-					utils.log("DEBUG", "Incoming Volume Group Name is NOT Provided.", isDebugEnabled)

-					execution.setVariable("groupNamesMatch", true)

-				}else{

-					utils.log("DEBUG", "Incoming Volume Group Name is: " + incomingGroupName, isDebugEnabled)

-					if(volumeGroupName.equals(incomingGroupName)){

-						utils.log("DEBUG", "Volume Group Names Match.", isDebugEnabled)

-						execution.setVariable("groupNamesMatch", true)

-					}else{

-						utils.log("DEBUG", "Volume Group Names DO NOT Match.", isDebugEnabled)

-						execution.setVariable("groupNamesMatch", false)

-					}

-				}

-			}else{

-				utils.log("DEBUG", "QueryAAIForVolumeGroup Bad REST Response!", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 1, "Error Searching AAI for Volume Group. Received a Bad Response.")

-			}

-

-		}catch(BpmnError b){

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", "Exception Occured Processing queryAAIForVolumeGroup. Exception is:\n" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in preProcessRequest.")

-		}

-		utils.log("DEBUG", "=== COMPLETED queryAAIForVolumeGroup Process === ", isDebugEnabled)

-	}

-

-	public void assignVolumeHeatId(DelegateExecution execution){

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

-		execution.setVariable("prefix", Prefix)

-		try{

-			utils.log("DEBUG", " === Started assignVolumeHeatId Process === ", isDebugEnabled)

-

-			String response = execution.getVariable("queryAAIVolumeGroupResponse")

-			String heatStackId = utils.getNodeText1(response, "heat-stack-id")

-			execution.setVariable("volumeHeatStackId", heatStackId)

-			execution.setVariable("ConfirmVolumeGroupTenantResponse", heatStackId)

-			// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead

-			execution.setVariable("WorkflowResponse", heatStackId)

-			utils.log("DEBUG", "Volume Heat Stack Id is: " + heatStackId, isDebugEnabled)

-

-		}catch(Exception e){

-		utils.log("ERROR", "Exception Occured Processing assignVolumeHeatId. Exception is:\n" + e, isDebugEnabled)

-		exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in assignVolumeHeatId.")

-	}

-	utils.log("DEBUG", "=== COMPLETED assignVolumeHeatId Process === ", isDebugEnabled)

-	utils.log("DEBUG", "======== COMPLETED Confirm Volume Group Tenant Subflow ======== ", isDebugEnabled)

-}

-

-	public void assignWorkflowException(DelegateExecution execution, String message){

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

-		execution.setVariable("prefix", Prefix)

-		String processKey = getProcessKey(execution);

-		utils.log("DEBUG", " === STARTED Assign Workflow Exception === ", isDebugEnabled)

-		try{

-			String volumeGroupId = execution.getVariable("volumeGroupId")

-			int errorCode = 1

-			String errorMessage = "Volume Group " + volumeGroupId + " " + message

-

-			exceptionUtil.buildWorkflowException(execution, errorCode, errorMessage)

-		}catch(Exception e){

-			utils.log("ERROR", "Exception Occured Processing assignWorkflowException. Exception is:\n" + e, isDebugEnabled)

-		}

-		utils.log("DEBUG", "=== COMPLETED Assign Workflow Exception ==== ", isDebugEnabled)

-	}

-

-

-

-}

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
+
+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.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.rest.APIResponse
+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 org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+/**
+ * Vnf Module Subflow for confirming the volume group belongs
+ * to the tenant
+ *
+ * @param tenantId
+ * @param volumeGroupId
+ *
+ */
+class ConfirmVolumeGroupTenant extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ConfirmVolumeGroupTenant.class);
+
+	String Prefix="CVGT_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	public void preProcessRequest(DelegateExecution execution){
+		execution.setVariable("prefix", Prefix)
+		msoLogger.trace("STARTED Confirm Volume Group Tenant Subflow ")
+		String processKey = getProcessKey(execution);
+		try{
+			msoLogger.trace("Started QueryAAIForVolumeGroup Process ")
+
+			String volumeGroupId = execution.getVariable("volumeGroupId")
+			String incomingGroupName = execution.getVariable("volumeGroupName")
+			String incomingTenantId = execution.getVariable("tenantId")
+			def aicCloudRegion = execution.getVariable("aicCloudRegion")
+			String aai = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getCloudInfrastructureCloudRegionUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+
+			String path = aai + "${aai_uri}/${aicCloudRegion}/volume-groups/volume-group/" + volumeGroupId
+
+			APIResponse queryAAIForVolumeGroupResponse = aaiUriUtil.executeAAIGetCall(execution, path)
+
+			def responseCode = queryAAIForVolumeGroupResponse.getStatusCode()
+			execution.setVariable("queryVolumeGroupResponseCode", responseCode)
+			String response = queryAAIForVolumeGroupResponse.getResponseBodyAsString()
+
+			msoLogger.debug("ConfirmVolumeGroup Response: " + response)
+			msoLogger.debug("ConfirmVolumeGroup Response Code: " + responseCode)
+
+			if(responseCode == 200 && response != null){
+				execution.setVariable("queryAAIVolumeGroupResponse", response)
+				msoLogger.debug("QueryAAIForVolumeGroup Received a Good REST Response is: \n" + response)
+
+				String volumeGroupTenantId = ""
+				InputSource source = new InputSource(new StringReader(response));
+				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+				docFactory.setNamespaceAware(true)
+				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+				Document createVCERequestXml = docBuilder.parse(source)
+				NodeList nodeList = createVCERequestXml.getElementsByTagNameNS("*", "relationship")
+				for (int x = 0; x < nodeList.getLength(); x++) {
+					Node node = nodeList.item(x)
+					if (node.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement = (Element) node
+						String e = eElement.getElementsByTagNameNS("*", "related-to").item(0).getTextContent()
+						if(e.equals("tenant")){
+							NodeList relationDataList = eElement.getElementsByTagNameNS("*", "relationship-data")
+							for (int d = 0; d < relationDataList.getLength(); d++) {
+								Node dataNode = relationDataList.item(d)
+								if (dataNode.getNodeType() == Node.ELEMENT_NODE) {
+									Element dElement = (Element) dataNode
+									String key = dElement.getElementsByTagNameNS("*", "relationship-key").item(0).getTextContent()
+									if(key.equals("tenant.tenant-id")){
+										volumeGroupTenantId = dElement.getElementsByTagNameNS("*", "relationship-value").item(0).getTextContent()
+									}
+								}
+							}
+						}
+					}
+				}
+
+				//Determine if Tenant Ids match
+				if(incomingTenantId.equals(volumeGroupTenantId)){
+					msoLogger.debug("Tenant Ids Match")
+					execution.setVariable("tenantIdsMatch", true)
+				}else{
+					msoLogger.debug("Tenant Ids DO NOT Match")
+					execution.setVariable("tenantIdsMatch", false)
+				}
+
+				//Determine if Volume Group Names match
+				String volumeGroupName = utils.getNodeText(response, "volume-group-name")
+				if(incomingGroupName == null || incomingGroupName.length() < 1){
+					msoLogger.debug("Incoming Volume Group Name is NOT Provided.")
+					execution.setVariable("groupNamesMatch", true)
+				}else{
+					msoLogger.debug("Incoming Volume Group Name is: " + incomingGroupName)
+					if(volumeGroupName.equals(incomingGroupName)){
+						msoLogger.debug("Volume Group Names Match.")
+						execution.setVariable("groupNamesMatch", true)
+					}else{
+						msoLogger.debug("Volume Group Names DO NOT Match.")
+						execution.setVariable("groupNamesMatch", false)
+					}
+				}
+			}else{
+				msoLogger.debug("QueryAAIForVolumeGroup Bad REST Response!")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1, "Error Searching AAI for Volume Group. Received a Bad Response.")
+			}
+
+		}catch(BpmnError b){
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception Occured Processing queryAAIForVolumeGroup.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in preProcessRequest.")
+		}
+		msoLogger.trace("COMPLETED queryAAIForVolumeGroup Process ")
+	}
+
+	public void assignVolumeHeatId(DelegateExecution execution){
+		execution.setVariable("prefix", Prefix)
+		try{
+			msoLogger.trace("Started assignVolumeHeatId Process ")
+
+			String response = execution.getVariable("queryAAIVolumeGroupResponse")
+			String heatStackId = utils.getNodeText(response, "heat-stack-id")
+			execution.setVariable("volumeHeatStackId", heatStackId)
+			execution.setVariable("ConfirmVolumeGroupTenantResponse", heatStackId)
+			// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
+			execution.setVariable("WorkflowResponse", heatStackId)
+			msoLogger.debug("Volume Heat Stack Id is: " + heatStackId)
+
+		}catch(Exception e){
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception Occured Processing assignVolumeHeatId.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+		exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in assignVolumeHeatId.")
+	}
+	msoLogger.trace("COMPLETED assignVolumeHeatId Process ")
+	msoLogger.trace("COMPLETED Confirm Volume Group Tenant Subflow ")
+}
+
+	public void assignWorkflowException(DelegateExecution execution, String message){
+		execution.setVariable("prefix", Prefix)
+		String processKey = getProcessKey(execution);
+		msoLogger.trace("STARTED Assign Workflow Exception ")
+		try{
+			String volumeGroupId = execution.getVariable("volumeGroupId")
+			int errorCode = 1
+			String errorMessage = "Volume Group " + volumeGroupId + " " + message
+
+			exceptionUtil.buildWorkflowException(execution, errorCode, errorMessage)
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Exception Occured Processing assignWorkflowException.", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, e);
+		}
+		msoLogger.trace("COMPLETED Assign Workflow Exception =")
+	}
+
+
+
+}
+
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CreateAAIVfModule.groovy
index 41036e7f43..84dd70682d 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CreateAAIVfModule.groovy
@@ -1,635 +1,612 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

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

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-public class CreateAAIVfModule extends AbstractServiceTaskProcessor{

-	

-	def Prefix="CAAIVfMod_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable("prefix",Prefix)

-		execution.setVariable("CAAIVfMod_vnfId",null)

-		execution.setVariable("CAAIVfMod_vnfName",null)

-		execution.setVariable("CAAIVfMod_vnfType",null)

-		execution.setVariable("CAAIVfMod_serviceId",null)

-		execution.setVariable("CAAIVfMod_personaId",null)

-		execution.setVariable("CAAIVfMod_personaVer",null)

-		execution.setVariable("CAAIVfMod_modelCustomizationId",null)

-		execution.setVariable("CAAIVfMod_vnfPersonaId",null)

-		execution.setVariable("CAAIVfMod_vnfPersonaVer",null)

-		execution.setVariable("CAAIVfMod_isBaseVfModule", false)

-		execution.setVariable("CAAIVfMod_moduleName",null)

-		execution.setVariable("CAAIVfMod_moduleModelName",null)

-		execution.setVariable("CAAIVfMod_newGenericVnf",false)

-		execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",null)

-		execution.setVariable("CAAIVfMod_genericVnfPutEndpoint",null)

-		execution.setVariable("CAAIVfMod_aaiNamespace",null)

-		execution.setVariable("CAAIVfMod_moduleExists",false)

-		execution.setVariable("CAAIVfMod_baseModuleConflict", false)

-		execution.setVariable("CAAIVfMod_vnfNameFromAAI", null)

-		

-		

-		// CreateAAIVfModule workflow response variable placeholders

-		execution.setVariable("CAAIVfMod_queryGenericVnfResponseCode",null)

-		execution.setVariable("CAAIVfMod_queryGenericVnfResponse","")

-		execution.setVariable("CAAIVfMod_createGenericVnfResponseCode",null)

-		execution.setVariable("CAAIVfMod_createGenericVnfResponse","")

-		execution.setVariable("CAAIVfMod_createVfModuleResponseCode",null)

-		execution.setVariable("CAAIVfMod_createVfModuleResponse","")

-		execution.setVariable("CAAIVfMod_parseModuleResponse","")

-		execution.setVariable("CAAIVfMod_deleteGenericVnfResponseCode",null)

-		execution.setVariable("CAAIVfMod_deleteGenericVnfResponse","")

-		execution.setVariable("CAAIVfMod_deleteVfModuleResponseCode",null)

-		execution.setVariable("CAAIVfMod_deleteVfModuleResponse","")

-//		execution.setVariable("CAAIVfMod_ResponseCode",null)

-//		execution.setVariable("CAAIVfMod_ErrorResponse","")

-		execution.setVariable("CreateAAIVfModuleResponse","")

-		execution.setVariable("RollbackData", null)

-

-	}	

-	

-	// parse the incoming CREATE_VF_MODULE request and store the Generic VNF

-	// and VF Module data in the flow DelegateExecution

-	public void preProcessRequest(DelegateExecution execution) {

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

-		initProcessVariables(execution)

-

-		def vnfId = execution.getVariable("vnfId")		

-		if (vnfId == null || vnfId.isEmpty()) {

-			execution.setVariable("CAAIVfMod_newGenericVnf", true)

-			execution.setVariable("CAAIVfMod_vnfId","")

-		}

-		else {

-			execution.setVariable("CAAIVfMod_vnfId",vnfId)

-		}

-

-		def vnfName = execution.getVariable("vnfName")		

-		execution.setVariable("CAAIVfMod_vnfName", vnfName)

-

-		String vnfType = execution.getVariable("vnfType")

-		if (vnfType != null && !vnfType.isEmpty()) {

-			execution.setVariable("CAAIVfMod_vnfType", vnfType)

-		} else {

-			execution.setVariable("CAAIVfMod_vnfType","")

-		}

-

-		execution.setVariable("CAAIVfMod_serviceId", execution.getVariable("serviceId"))

-		

-		String personaModelId = execution.getVariable("personaModelId")

-

-		if (personaModelId != null && !personaModelId.isEmpty()) {

-			execution.setVariable("CAAIVfMod_personaId",personaModelId)

-		} else {

-			execution.setVariable("CAAIVfMod_personaId","")

-		}

-		

-		String personaModelVersion = execution.getVariable("personaModelVersion")

-

-		if (personaModelVersion != null && !personaModelVersion.isEmpty()) {

-			execution.setVariable("CAAIVfMod_personaVer", personaModelVersion)

-		} else {

-			execution.setVariable("CAAIVfMod_personaVer","")

-		}

-		

-		

-		String modelCustomizationId = execution.getVariable("modelCustomizationId")

-

-		if (modelCustomizationId != null && !modelCustomizationId.isEmpty()) {

-			execution.setVariable("CAAIVfMod_modelCustomizationId",modelCustomizationId)

-		} else {

-			execution.setVariable("CAAIVfMod_modelCustomizationId","")

-		}

-		

-		String vnfPersonaModelId = execution.getVariable("vnfPersonaModelId")

-		

-		if (vnfPersonaModelId != null && !vnfPersonaModelId.isEmpty()) {

-			execution.setVariable("CAAIVfMod_vnfPersonaId",vnfPersonaModelId)

-		} else {

-			execution.setVariable("CAAIVfMod_vnfPersonaId","")

-		}

-		

-		String vnfPersonaModelVersion = execution.getVariable("vnfPersonaModelVersion")

-

-		if (vnfPersonaModelVersion != null && !vnfPersonaModelVersion.isEmpty()) {

-			execution.setVariable("CAAIVfMod_vnfPersonaVer",vnfPersonaModelVersion)

-		} else {

-			execution.setVariable("CAAIVfMod_vnfPersonaVer","")

-		}

-		

-		//isBaseVfModule

-		Boolean isBaseVfModule = false

-		String isBaseVfModuleString = execution.getVariable("isBaseVfModule")

-		if (isBaseVfModuleString != null && isBaseVfModuleString.equals("true")) {

-				isBaseVfModule = true			

-		}

-		execution.setVariable("CAAIVfMod_isBaseVfModule", isBaseVfModule)

-		

-		String isVidRequest = execution.getVariable("isVidRequest")

-		if (isVidRequest != null && "true".equals(isVidRequest)) {

-			logDebug("VID Request received", isDebugEnabled)		

-		}

-

-		execution.setVariable("CAAIVfMod_moduleName",execution.getVariable("vfModuleName"))

-		execution.setVariable("CAAIVfMod_moduleModelName",execution.getVariable("vfModuleModelName"))

-

-		AaiUtil aaiUriUtil = new AaiUtil(this)

-		def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-		logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-		String aaiNamespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)

-		logDebug('AAI namespace is: ' + aaiNamespace, isDebugEnabled)

-		

-		execution.setVariable("CAAIVfMod_aaiNamespace","${aaiNamespace}")		

-	

-		if (vnfId == null || vnfId.isEmpty()) {

-			// TBD - assert that the vnfName is not empty

-			execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",

-				"${aai_uri}/?vnf-name=" +

-					UriUtils.encode(vnfName,"UTF-8") + "&depth=1")

-		} else {

-			execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",

-				"${aai_uri}/" + UriUtils.encode(vnfId,"UTF-8") + "?depth=1")

-		}

-

-		utils.logAudit("CreateAAIVfModule VNF PUT Endpoint:   ${aai_uri}/")

-		execution.setVariable("CAAIVfMod_genericVnfPutEndpoint","${aai_uri}/")

-	}

-	

-	// send a GET request to AA&I to retrieve the Generic VNF/VF Module information based on a Vnf Name

-	// expect a 200 response with the information in the response body or a 404 if the Generic VNF does not exist

-	public void queryAAIForGenericVnf(DelegateExecution execution) {

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

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("CAAIVfMod_genericVnfGetEndpoint")

-

-		try {

-			utils.log("DEBUG","queryAAIForGenericVnf() endpoint-" + endPoint, isDebugEnabled)

-			utils.log("DEBUG", "invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint,isDebugEnabled)

-			utils.logAudit("CreateAAIVfModule sending GET call to AAI Endpoint: " + endPoint)

-

-			AaiUtil aaiUtil = new AaiUtil(this)

-			APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)

-			def responseData = response.getResponseBodyAsString()

-			def statusCode = response.getStatusCode()

-			execution.setVariable("CAAIVfMod_queryGenericVnfResponseCode", statusCode)

-			execution.setVariable("CAAIVfMod_queryGenericVnfResponse", responseData)

-

-			utils.logAudit("CreateAAIVfModule Response Code: " + statusCode)

-			utils.logAudit("CreateAAIVfModule Response data: " + responseData)

-			utils.log("DEBUG", "Response code:" + statusCode, isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Exception occurred while executing AAI GET:" + ex.getMessage(),isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in queryAAIForGenericVnf.")

-

-		}

-	}

-	

-	// process the result from queryAAIForGenericVnf()

-	// note: this method is primarily for logging as the actual decision logic is embedded in the bpmn flow 

-	public void processAAIGenericVnfQuery(DelegateExecution execution) {

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

-		def result = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-		

-		if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&

-			execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {

-			utils.log("DEBUG", "New Generic VNF requested and it does not already exist", isDebugEnabled)

-		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200 &&

-				!execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {

-			utils.log("DEBUG", "Adding module to existing Generic VNF", isDebugEnabled)	

-		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200 &&

-				execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {

-			utils.log("DEBUG", "Invalid request for new Generic VNF which already exists", isDebugEnabled)

-			execution.setVariable("CAAIVfMod_queryGenericVnfResponse",

-				"Invalid request for new Generic VNF which already exists, Vnf Name=" +

-				 execution.getVariable("CAAIVfMod_vnfName"))	

-		} else { // execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&

-			   // !execution.getVariable("CAAIVfMod_vnfId").isEmpty())

-			utils.log("DEBUG", "Invalid request for Add-on Module requested for non-existant Generic VNF", isDebugEnabled)	

-			execution.setVariable("CAAIVfMod_createVfModuleResponse",

-				"Invalid request for Add-on Module requested for non-existant Generic VNF, VNF Id=" +

-				execution.getVariable("CAAIVfMod_vnfId"))

-		}

-	}

-

-	// construct and send a PUT request to A&AI to create a new Generic VNF

-	// note: to get here, the vnf-id in the original CREATE_VF_MODULE request was absent or ""

-	public void createGenericVnf(DelegateExecution execution) {

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

-		// TBD - is this how we want to generate the Id for the new Generic VNF?

-		def newVnfId = UUID.randomUUID().toString()

-		def endPoint = execution.getVariable("URN_aai_endpoint") +

-			execution.getVariable("CAAIVfMod_genericVnfPutEndpoint") + newVnfId

-		// update the flow execution with the new Vnf Id

-		execution.setVariable("CAAIVfMod_vnfId",newVnfId)

-		

-	//	AaiUriUtil aaiUriUtil = new AaiUriUtil(this)

-	//	def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-	//	logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-	//	String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)

-	//	logDebug('AAI namespace is: ' + namespace, isDebugEnabled)

-		

-				

-		String payload = """<generic-vnf xmlns="${execution.getVariable("CAAIVfMod_aaiNamespace")}">

-								<vnf-id>${newVnfId}</vnf-id>

-								<vnf-name>${execution.getVariable("CAAIVfMod_vnfName")}</vnf-name>

-								<vnf-type>${execution.getVariable("CAAIVfMod_vnfType")}</vnf-type>

-								<service-id>${execution.getVariable("CAAIVfMod_serviceId")}</service-id>

-								<orchestration-status>Active</orchestration-status>

-								<model-invariant-id>${execution.getVariable("CAAIVfMod_vnfPersonaId")}</model-invariant-id>

-								<model-version-id>${execution.getVariable("CAAIVfMod_vnfPersonaVer")}</model-version-id>

-							</generic-vnf>""" as String

-		execution.setVariable("CAAIVfMod_createGenericVnfPayload", payload)

-

-		try {

-			utils.log("DEBUG","createGenericVnf() endpoint-" + endPoint, isDebugEnabled)

-			utils.log("DEBUG", "invoking PUT call to AAI with payload:"+System.lineSeparator()+payload,isDebugEnabled)

-			utils.logAudit("Sending PUT call to AAI with Endpoint /n" + endPoint + " with payload /n" + payload)

-

-			AaiUtil aaiUtil = new AaiUtil(this);

-			APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload);

-			def	responseData = response.getResponseBodyAsString()

-			def responseStatusCode = response.getStatusCode()

-			execution.setVariable("CAAIVfMod_createGenericVnfResponseCode", responseStatusCode)

-			execution.setVariable("CAAIVfMod_createGenericVnfResponse", responseData)

-			

-			utils.logAudit("Response Code: " + responseStatusCode)

-			utils.logAudit("Response Data: " + responseData)

-			utils.log("DEBUG", "Response code:" + responseStatusCode, isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-		} catch (Exception ex) {

-			ex.printStackTrace()

-			utils.log("DEBUG", "Exception occurred while executing AAI PUT:" + ex.getMessage(),isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in createGenericVnf.")

-		}

-	}

-

-	// construct and send a PUT request to A&AI to create a Base or Add-on VF Module

-	public void createVfModule(DelegateExecution execution, Boolean isBaseModule) {

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

-		// TBD - is this how we want to generate the Id for the new (Base) VF Module?

-		

-		// Generate the new VF Module ID here if it has not been provided by the parent process

-		def newModuleId = execution.getVariable('newVfModuleId')

-		if (newModuleId == null || newModuleId.isEmpty()) {

-			newModuleId = UUID.randomUUID().toString()

-		}

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("CAAIVfMod_genericVnfPutEndpoint")

-		// need to append the existing Vnf Id or the one generated in createGenericVnf() to the url

-		endPoint = endPoint + UriUtils.encode(execution.getVariable("CAAIVfMod_vnfId"), "UTF-8") +

-			"/vf-modules/vf-module/" + newModuleId;

-		int moduleIndex = 0

-		if (!isBaseModule) {

-			def aaiVnfResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-			AaiUtil aaiUtil = new AaiUtil(this)

-			def personaModelId = execution.getVariable("CAAIVfMod_personaId")

-			

-			// Check if the response includes model-invariant-id or persona-model-id

-			// note: getRequiredNodeText() throws an exception if the field is missing

-			// need to retun a null for the subsequent "either/or" logic to work properly

-//			def modelInvariantId = getRequiredNodeText(execution, aaiVnfResponse,'model-invariant-id')

-			def modelInvariantId = getNodeText(aaiVnfResponse,'model-invariant-id', null)

-			def fieldToCheck = 'model-invariant-id'

-			if (!modelInvariantId) {

-				fieldToCheck = 'persona-model-id'

-			}

-			

-			moduleIndex = aaiUtil.getLowestUnusedVfModuleIndexFromAAIVnfResponse(execution, aaiVnfResponse, 

-				fieldToCheck, personaModelId)

-		}

-		def moduleIndexString = String.valueOf(moduleIndex)

-

-		// if we get to this point, we may be about to create the Vf Module,

-		// add rollback information about the Generic VNF for this base/add-on module

-		def rollbackData = execution.getVariable("RollbackData")

-		if (rollbackData == null) {

-			rollbackData = new RollbackData();

-		}

-		rollbackData.put("VFMODULE", "vnfId", execution.getVariable("CAAIVfMod_vnfId"))

-		rollbackData.put("VFMODULE", "vnfName", execution.getVariable("CAAIVfMod_vnfName"))

-		rollbackData.put("VFMODULE", "isBaseModule", isBaseModule.toString())

-		execution.setVariable("RollbackData", rollbackData)

-		utils.log("DEBUG", "RollbackData:" + rollbackData, isDebugEnabled)

-		String payload = """<vf-module xmlns="${execution.getVariable("CAAIVfMod_aaiNamespace")}">

-								<vf-module-id>${newModuleId}</vf-module-id>

-								<vf-module-name>${execution.getVariable("CAAIVfMod_moduleName")}</vf-module-name>

-								<model-invariant-id>${execution.getVariable("CAAIVfMod_personaId")}</model-invariant-id>

-								<model-version-id>${execution.getVariable("CAAIVfMod_personaVer")}</model-version-id>

-								<model-customization-id>${execution.getVariable("CAAIVfMod_modelCustomizationId")}</model-customization-id>

-								<is-base-vf-module>${isBaseModule}</is-base-vf-module>

-								<orchestration-status>PendingCreate</orchestration-status>

-								<module-index>${moduleIndex}</module-index>

-								</vf-module>""" as String

-		execution.setVariable("CAAIVfMod_createVfModulePayload", payload)

-

-		try {

-			utils.log("DEBUG","createVfModule() endpoint-" + endPoint, isDebugEnabled)

-			utils.log("DEBUG", "invoking PUT call to AAI with payload:"+System.lineSeparator()+payload,isDebugEnabled)

-			utils.logAudit("CreateAAIVfModule sending PUT call to AAI with endpoint /n" + endPoint + " with payload /n " + payload)

-

-			AaiUtil aaiUtil = new AaiUtil(this)

-			APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload)	

-			def responseData = response.getResponseBodyAsString()

-			def statusCode = response.getStatusCode()

-			execution.setVariable("CAAIVfMod_createVfModuleResponseCode", statusCode)

-			execution.setVariable("CAAIVfMod_createVfModuleResponse", responseData)

-			

-			utils.log("DEBUG", "Response code:" + statusCode, isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-			utils.logAudit("Response Code: " + statusCode)

-			utils.logAudit("Response data: " + responseData)

-			// the base or add-on VF Module was successfully created,

-			// add the module name to the rollback data and the response

-			if (isOneOf(statusCode, 200, 201)) {

-				rollbackData.put("VFMODULE", "vfModuleId", newModuleId)

-				rollbackData.put("VFMODULE", "vfModuleName", execution.getVariable("CAAIVfMod_moduleName"))

-				execution.setVariable("RollbackData", rollbackData)

-				utils.log("DEBUG", "RollbackData:" + rollbackData, isDebugEnabled)

-				

-				String responseOut = ""

-				

-				String isVidRequest = execution.getVariable("isVidRequest")

-				

-				if (isBaseModule && (isVidRequest == null || "false".equals(isVidRequest))) {				

-				

-					responseOut = """<CreateAAIVfModuleResponse>

-											<vnf-id>${execution.getVariable("CAAIVfMod_vnfId")}</vnf-id>

-											<vf-module-id>${newModuleId}</vf-module-id>

-											<vf-module-index>${moduleIndexString}</vf-module-index>

-										</CreateAAIVfModuleResponse>""" as String

-				}

-				else {

-					responseOut = """<CreateAAIVfModuleResponse>

-											<vnf-name>${execution.getVariable("CAAIVfMod_vnfNameFromAAI")}</vnf-name>

-											<vnf-id>${execution.getVariable("CAAIVfMod_vnfId")}</vnf-id>

-											<vf-module-id>${newModuleId}</vf-module-id>

-											<vf-module-index>${moduleIndexString}</vf-module-index>

-										</CreateAAIVfModuleResponse>""" as String

-				}

-				

-				execution.setVariable("CreateAAIVfModuleResponse", responseOut)

-				utils.log("DEBUG", "CreateAAIVfModuleResponse:" + System.lineSeparator()+responseOut,isDebugEnabled)

-				utils.logAudit("CreateAAIVfModule Response /n " + responseOut)

-			}

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Exception occurred while executing AAI PUT:" + ex.getMessage(),isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in createVfModule.")

-		}

-	}

-	

-	// parses the output from the result from queryAAIForGenericVnf() to determine if the vf-module-name

-	// requested for an Add-on VF Module does not already exist for the specified Generic VNF

-	// also retrieves VNF name from AAI response for existing VNF

-	public void parseForAddOnModule(DelegateExecution execution) {

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

-		def xml = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-		def vnfNameFromAAI = utils.getNodeText1(xml, "vnf-name")

-		execution.setVariable("CAAIVfMod_vnfNameFromAAI", vnfNameFromAAI)

-		utils.log("DEBUG", "Obtained vnf-name from AAI for existing VNF: " + vnfNameFromAAI)	

-		def newModuleName = execution.getVariable("CAAIVfMod_moduleName")

-		utils.log("DEBUG", "VF Module to be added: " + newModuleName, isDebugEnabled)

-		def qryModuleNameList = utils.getMultNodes(xml, "vf-module-name")

-		execution.setVariable("CAAIVfMod_moduleExists", false)

-		if (qryModuleNameList != null) {

-			utils.log("DEBUG", "Existing VF Module List: " + qryModuleNameList, isDebugEnabled)

-			for (String qryModuleName : qryModuleNameList) {

-				if (newModuleName.equals(qryModuleName)) {

-					// a module with the requested name already exists - failure

-					utils.log("DEBUG", "VF Module " + qryModuleName + " already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"), isDebugEnabled)

-					execution.setVariable("CAAIVfMod_moduleExists", true)

-					execution.setVariable("CAAIVfMod_parseModuleResponse",

-						"VF Module " + qryModuleName + " already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))

-					break

-				}

-			}

-		}

-		if (execution.getVariable("CAAIVfMod_moduleExists") == false) {

-			utils.log("DEBUG", "VF Module " + execution.getVariable("CAAIVfMod_moduleName") +

-				" does not exist for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"), isDebugEnabled)

-			execution.setVariable("CAAIVfMod_parseModuleResponse",

-				"VF Module " + newModuleName + " does not exist for Generic VNF " +

-				execution.getVariable("CAAIVfMod_vnfNameFromAAI"))

-		}		

-	}

-	

-	// parses the output from the result from queryAAIForGenericVnf() to determine if the vf-module-name

-	// requested for an Add-on VF Module does not already exist for the specified Generic VNF; 

-	// also retrieves VNF name from AAI response for existing VNF

-	public void parseForBaseModule(DelegateExecution execution) {

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

-		def xml = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-		def vnfNameFromAAI = utils.getNodeText1(xml, "vnf-name")

-		execution.setVariable("CAAIVfMod_vnfNameFromAAI", vnfNameFromAAI)

-		utils.log("DEBUG", "Obtained vnf-name from AAI for existing VNF: " + vnfNameFromAAI)	

-		def newModuleName = execution.getVariable("CAAIVfMod_moduleName")

-		utils.log("DEBUG", "VF Module to be added: " + newModuleName, isDebugEnabled)

-		def qryModuleNameList = utils.getMultNodes(xml, "vf-module-name")

-		execution.setVariable("CAAIVfMod_moduleExists", false)

-		if (qryModuleNameList != null) {

-			utils.log("DEBUG", "Existing VF Module List: " + qryModuleNameList, isDebugEnabled)

-			for (String qryModuleName : qryModuleNameList) {

-				if (newModuleName.equals(qryModuleName)) {

-					// a module with the requested name already exists - failure

-					utils.log("DEBUG", "VF Module " + qryModuleName + " already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"), isDebugEnabled)

-					execution.setVariable("CAAIVfMod_baseModuleConflict", true)

-					execution.setVariable("CAAIVfMod_parseModuleResponse",

-						"VF Module " + qryModuleName + " already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))

-					break

-				}

-			}

-		}

-		def isBaseVfModuleList = utils.getMultNodes(xml, "is-base-vf-module")

-		if (isBaseVfModuleList != null && !execution.getVariable("CAAIVfMod_baseModuleConflict")) {

-			

-			for (String baseValue : isBaseVfModuleList) {

-				if (baseValue.equals("true")) {

-					// a base module already exists in this VNF - failure

-					utils.log("DEBUG", "Base VF Module already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"), isDebugEnabled)

-					execution.setVariable("CAAIVfMod_baseModuleConflict", true)

-					execution.setVariable("CAAIVfMod_parseModuleResponse",

-						"Base VF Module already exists for Generic VNF " +

-						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))

-					break

-				}

-			}

-		

-		}

-		if (execution.getVariable("CAAIVfMod_moduleExists") == false && execution.getVariable("CAAIVfMod_baseModuleConflict") == false) {

-			utils.log("DEBUG", "VF Module " + execution.getVariable("CAAIVfMod_moduleName") +

-				" does not exist for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"), isDebugEnabled)

-			execution.setVariable("CAAIVfMod_parseModuleResponse",

-				"VF Module " + newModuleName + " does not exist for Generic VNF " +

-				execution.getVariable("CAAIVfMod_vnfNameFromAAI"))

-		}		

-	}

-	

-	// generates a WorkflowException when the A&AI query returns a response code other than 200 or 404

-	public void handleAAIQueryFailure(DelegateExecution execution) {

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

-		

-		utils.log("ERROR", "Error occurred attempting to query AAI, Response Code " +

-			execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") + ", Error Response " +

-			execution.getVariable("CAAIVfMod_queryGenericVnfResponse"), isDebugEnabled)

-		int code = execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode")

-		exceptionUtil.buildAndThrowWorkflowException(execution, code, "Error occurred attempting to query AAI")

-

-	}

-	

-	// generates a WorkflowException if

-	//		- the A&AI Generic VNF PUT returns a response code other than 200 or 201

-	//		- the requested Generic VNF already exists but vnf-id == null

-	//		- the requested Generic VNF does not exist but vnf-id != null

-	// 		- the A&AI VF Module PUT returns a response code other than 200 or 201

-	//		- the requested VF Module already exists for the Generic VNF

-	public void handleCreateVfModuleFailure(DelegateExecution execution) {

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

-		

-		def errorCode

-		def errorResponse

-		if (execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") != null &&

-				!isOneOf(execution.getVariable("CAAIVfMod_createGenericVnfResponseCode"), 200, 201)) {

-			utils.log("DEBUG", "Failure creating Generic VNF: " +

-				execution.getVariable("CAAIVfMod_createGenericVnfResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_createGenericVnfResponse")

-			errorCode = 5000

-		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponse") != null &&

-				execution.getVariable("CAAIVfMod_newGenericVnf") == true) {

-			// attempted to create a Generic VNF that already exists but vnf-id == null

-			utils.log("DEBUG", execution.getVariable("CAAIVfMod_queryGenericVnfResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-			errorCode = 1002

-		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&

-				execution.getVariable("CAAIVfMod_newGenericVnf") == false) {

-			// attempted to create a Generic VNF where vnf-name does not exist but vnf-id != null

-			utils.log("DEBUG", execution.getVariable("CAAIVfMod_queryGenericVnfResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

-			errorCode = 1002

-		} else if (execution.getVariable("CAAIVfMod_createVfModuleResponseCode") != null) {

-			utils.log("DEBUG", "Failed to add VF Module: " +

-			execution.getVariable("CAAIVfMod_createVfModuleResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_createVfModuleResponse")

-			errorCode = 5000

-		} else if (execution.getVariable("CAAIVfMod_moduleExists") == true) {

-			utils.log("DEBUG", "Attempting to add VF Module that already exists: " +

-				execution.getVariable("CAAIVfMod_parseModuleResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_parseModuleResponse")

-			errorCode = 1002

-		} else if (execution.getVariable("CAAIVfMod_baseModuleConflict") == true) {

-			utils.log("DEBUG", "Attempting to add Base VF Module to VNF that already has a Base VF Module: " +

-				execution.getVariable("CAAIVfMod_parseModuleResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("CAAIVfMod_parseModuleResponse")

-			errorCode = 1002

-		} else {

-			// if the responses get populated corerctly, we should never get here

-			errorResponse = "Unknown error occurred during CreateAAIVfModule flow"

-			errorCode = 2000

-		}

-

-		utils.log("ERROR", "Error occurred during CreateAAIVfModule flow: " + errorResponse, isDebugEnabled)

-		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, errorResponse)

-		utils.logAudit("Workflow exception occurred in CreateAAIVfModule: " + errorResponse)

-	}

-

-	/**

-	 * Performs a rollback.

-	 * TBD: This method requires additional testing once integrated with the

-	 *      main CreateVfModule flow.

-	 * @param execution the execution

-	 */

-	public void rollback(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + ".rollback(" +

-			"execution=" + execution.getId() +

-			")"

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		logDebug("Entered " + method, isDebugLogEnabled)

-

-		try {

-			RollbackData rollbackData = (RollbackData) execution.getVariable("RollbackData")

-			logDebug("RollbackData:" + rollbackData, isDebugLogEnabled)

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-			utils.logAudit("CreateAAIVfModule rollback AAI URI: " + aai_uri)

-			

-			if (rollbackData != null) {

-				if (rollbackData.hasType("VFMODULE")) {

-					// use the DeleteAAIVfModule groovy methods for the rollback

-					def vnfId = rollbackData.get("VFMODULE", "vnfId")

-					def vfModuleId = rollbackData.get("VFMODULE", "vfModuleId")

-					def isBaseModule = rollbackData.get("VFMODULE", "isBaseModule")

-					execution.setVariable("DAAIVfMod_vnfId", vnfId)		

-					execution.setVariable("DAAIVfMod_vfModuleId", vfModuleId)

-					execution.setVariable("DAAIVfMod_genericVnfEndpoint", "${aai_uri}/" + vnfId)

-					execution.setVariable("DAAIVfMod_vfModuleEndpoint", "${aai_uri}/" + vnfId +

-						 "/vf-modules/vf-module/" + vfModuleId)

-					DeleteAAIVfModule dvm = new DeleteAAIVfModule()

-					// query A&AI to get the needed information for the delete(s)

-					dvm.queryAAIForGenericVnf(execution)

-					dvm.parseForVfModule(execution)

-					

-					// roll back the base or add-on module

-					dvm.deleteVfModule(execution)

-					def responseCode = execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode")

-					def response = execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode")

-

-					if (isOneOf(responseCode, 200, 204)) {

-						logDebug("Received " + responseCode + " to VF Module rollback request", isDebugLogEnabled)

-//						execution.setVariable("RollbackResult", "SUCCESS")

-					} else {

-						logError("Received " + responseCode + " to VF Module rollback request: " + rollbackData +

-							System.lineSeparator() + "Response: " + response)

-					}

-					

-					// a new Generic VNF was created that needs to be rolled back

-					if (isBaseModule.equals("true")) {

-						dvm.deleteGenericVnf(execution)

-						responseCode = execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode")

-						response = execution.getVariable("DAAIVfMod_deleteGenericVnfResponse")

-	

-						if (isOneOf(responseCode, 200, 204)) {

-							logDebug("Received " + responseCode + " to Generic VNF rollback request", isDebugLogEnabled)

-							execution.setVariable("RollbackResult", "SUCCESS")

-						} else {

-							logError("Received " + responseCode + " to Generic VNF rollback request: " + rollbackData +

-								System.lineSeparator() + "Response: " + response)

-						}

-					} else {

-						execution.setVariable("RollbackResult", "SUCCESS")

-					}

-				}

-			}

-

-			logDebug("Exited " + method, isDebugLogEnabled)

-		} catch (Exception e) {

-			logError("Caught exception in " + method, e)

-		}

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.RollbackData
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+
+public class CreateAAIVfModule extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CreateAAIVfModule.class);
+
+	def Prefix="CAAIVfMod_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		execution.setVariable("CAAIVfMod_vnfId",null)
+		execution.setVariable("CAAIVfMod_vnfName",null)
+		execution.setVariable("CAAIVfMod_vnfType",null)
+		execution.setVariable("CAAIVfMod_serviceId",null)
+		execution.setVariable("CAAIVfMod_personaId",null)
+		execution.setVariable("CAAIVfMod_personaVer",null)
+		execution.setVariable("CAAIVfMod_modelCustomizationId",null)
+		execution.setVariable("CAAIVfMod_vnfPersonaId",null)
+		execution.setVariable("CAAIVfMod_vnfPersonaVer",null)
+		execution.setVariable("CAAIVfMod_isBaseVfModule", false)
+		execution.setVariable("CAAIVfMod_moduleName",null)
+		execution.setVariable("CAAIVfMod_moduleModelName",null)
+		execution.setVariable("CAAIVfMod_newGenericVnf",false)
+		execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",null)
+		execution.setVariable("CAAIVfMod_genericVnfPutEndpoint",null)
+		execution.setVariable("CAAIVfMod_aaiNamespace",null)
+		execution.setVariable("CAAIVfMod_moduleExists",false)
+		execution.setVariable("CAAIVfMod_baseModuleConflict", false)
+		execution.setVariable("CAAIVfMod_vnfNameFromAAI", null)
+		
+		
+		// CreateAAIVfModule workflow response variable placeholders
+		execution.setVariable("CAAIVfMod_queryGenericVnfResponseCode",null)
+		execution.setVariable("CAAIVfMod_queryGenericVnfResponse","")
+		execution.setVariable("CAAIVfMod_createGenericVnfResponseCode",null)
+		execution.setVariable("CAAIVfMod_createGenericVnfResponse","")
+		execution.setVariable("CAAIVfMod_createVfModuleResponseCode",null)
+		execution.setVariable("CAAIVfMod_createVfModuleResponse","")
+		execution.setVariable("CAAIVfMod_parseModuleResponse","")
+		execution.setVariable("CAAIVfMod_deleteGenericVnfResponseCode",null)
+		execution.setVariable("CAAIVfMod_deleteGenericVnfResponse","")
+		execution.setVariable("CAAIVfMod_deleteVfModuleResponseCode",null)
+		execution.setVariable("CAAIVfMod_deleteVfModuleResponse","")
+//		execution.setVariable("CAAIVfMod_ResponseCode",null)
+//		execution.setVariable("CAAIVfMod_ErrorResponse","")
+		execution.setVariable("CreateAAIVfModuleResponse","")
+		execution.setVariable("RollbackData", null)
+
+	}	
+	
+	// parse the incoming CREATE_VF_MODULE request and store the Generic VNF
+	// and VF Module data in the flow DelegateExecution
+	public void preProcessRequest(DelegateExecution execution) {
+		initProcessVariables(execution)
+
+		def vnfId = execution.getVariable("vnfId")		
+		if (vnfId == null || vnfId.isEmpty()) {
+			execution.setVariable("CAAIVfMod_newGenericVnf", true)
+			execution.setVariable("CAAIVfMod_vnfId","")
+		}
+		else {
+			execution.setVariable("CAAIVfMod_vnfId",vnfId)
+		}
+
+		def vnfName = execution.getVariable("vnfName")		
+		execution.setVariable("CAAIVfMod_vnfName", vnfName)
+
+		String vnfType = execution.getVariable("vnfType")
+		if (vnfType != null && !vnfType.isEmpty()) {
+			execution.setVariable("CAAIVfMod_vnfType", vnfType)
+		} else {
+			execution.setVariable("CAAIVfMod_vnfType","")
+		}
+
+		execution.setVariable("CAAIVfMod_serviceId", execution.getVariable("serviceId"))
+		
+		String personaModelId = execution.getVariable("personaModelId")
+
+		if (personaModelId != null && !personaModelId.isEmpty()) {
+			execution.setVariable("CAAIVfMod_personaId",personaModelId)
+		} else {
+			execution.setVariable("CAAIVfMod_personaId","")
+		}
+		
+		String personaModelVersion = execution.getVariable("personaModelVersion")
+
+		if (personaModelVersion != null && !personaModelVersion.isEmpty()) {
+			execution.setVariable("CAAIVfMod_personaVer", personaModelVersion)
+		} else {
+			execution.setVariable("CAAIVfMod_personaVer","")
+		}
+		
+		
+		String modelCustomizationId = execution.getVariable("modelCustomizationId")
+
+		if (modelCustomizationId != null && !modelCustomizationId.isEmpty()) {
+			execution.setVariable("CAAIVfMod_modelCustomizationId",modelCustomizationId)
+		} else {
+			execution.setVariable("CAAIVfMod_modelCustomizationId","")
+		}
+		
+		String vnfPersonaModelId = execution.getVariable("vnfPersonaModelId")
+		
+		if (vnfPersonaModelId != null && !vnfPersonaModelId.isEmpty()) {
+			execution.setVariable("CAAIVfMod_vnfPersonaId",vnfPersonaModelId)
+		} else {
+			execution.setVariable("CAAIVfMod_vnfPersonaId","")
+		}
+		
+		String vnfPersonaModelVersion = execution.getVariable("vnfPersonaModelVersion")
+
+		if (vnfPersonaModelVersion != null && !vnfPersonaModelVersion.isEmpty()) {
+			execution.setVariable("CAAIVfMod_vnfPersonaVer",vnfPersonaModelVersion)
+		} else {
+			execution.setVariable("CAAIVfMod_vnfPersonaVer","")
+		}
+		
+		//isBaseVfModule
+		Boolean isBaseVfModule = false
+		String isBaseVfModuleString = execution.getVariable("isBaseVfModule")
+		if (isBaseVfModuleString != null && isBaseVfModuleString.equals("true")) {
+				isBaseVfModule = true			
+		}
+		execution.setVariable("CAAIVfMod_isBaseVfModule", isBaseVfModule)
+		
+		String isVidRequest = execution.getVariable("isVidRequest")
+		if (isVidRequest != null && "true".equals(isVidRequest)) {
+			msoLogger.debug("VID Request received")		
+		}
+
+		execution.setVariable("CAAIVfMod_moduleName",execution.getVariable("vfModuleName"))
+		execution.setVariable("CAAIVfMod_moduleModelName",execution.getVariable("vfModuleModelName"))
+
+		AaiUtil aaiUriUtil = new AaiUtil(this)
+		def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+		msoLogger.debug('AAI URI is: ' + aai_uri)
+		String aaiNamespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
+		msoLogger.debug('AAI namespace is: ' + aaiNamespace)
+		
+		execution.setVariable("CAAIVfMod_aaiNamespace","${aaiNamespace}")		
+	
+		if (vnfId == null || vnfId.isEmpty()) {
+			// TBD - assert that the vnfName is not empty
+			execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",
+				"${aai_uri}/?vnf-name=" +
+					UriUtils.encode(vnfName,"UTF-8") + "&depth=1")
+		} else {
+			execution.setVariable("CAAIVfMod_genericVnfGetEndpoint",
+				"${aai_uri}/" + UriUtils.encode(vnfId,"UTF-8") + "?depth=1")
+		}
+
+		msoLogger.debug("CreateAAIVfModule VNF PUT Endpoint:   ${aai_uri}/")
+		execution.setVariable("CAAIVfMod_genericVnfPutEndpoint","${aai_uri}/")
+	}
+	
+	// send a GET request to AA&I to retrieve the Generic VNF/VF Module information based on a Vnf Name
+	// expect a 200 response with the information in the response body or a 404 if the Generic VNF does not exist
+	public void queryAAIForGenericVnf(DelegateExecution execution) {
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("CAAIVfMod_genericVnfGetEndpoint")
+
+		try {
+			msoLogger.debug("queryAAIForGenericVnf() endpoint-" + endPoint)
+			msoLogger.debug("invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint)
+			msoLogger.debug("CreateAAIVfModule sending GET call to AAI Endpoint: " + endPoint)
+
+			AaiUtil aaiUtil = new AaiUtil(this)
+			APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)
+			def responseData = response.getResponseBodyAsString()
+			def statusCode = response.getStatusCode()
+			execution.setVariable("CAAIVfMod_queryGenericVnfResponseCode", statusCode)
+			execution.setVariable("CAAIVfMod_queryGenericVnfResponse", responseData)
+
+			msoLogger.debug("CreateAAIVfModule Response Code: " + statusCode)
+			msoLogger.debug("CreateAAIVfModule Response data: " + responseData)
+			msoLogger.debug("Response code:" + statusCode)
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+		} catch (Exception ex) {
+			msoLogger.debug("Exception occurred while executing AAI GET:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in queryAAIForGenericVnf.")
+
+		}
+	}
+	
+	// process the result from queryAAIForGenericVnf()
+	// note: this method is primarily for logging as the actual decision logic is embedded in the bpmn flow 
+	public void processAAIGenericVnfQuery(DelegateExecution execution) {
+		def result = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+		
+		if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&
+			execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {
+			msoLogger.debug("New Generic VNF requested and it does not already exist")
+		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200 &&
+				!execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {
+			msoLogger.debug("Adding module to existing Generic VNF")	
+		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200 &&
+				execution.getVariable("CAAIVfMod_vnfId").isEmpty()) {
+			msoLogger.debug("Invalid request for new Generic VNF which already exists")
+			execution.setVariable("CAAIVfMod_queryGenericVnfResponse",
+				"Invalid request for new Generic VNF which already exists, Vnf Name=" +
+				 execution.getVariable("CAAIVfMod_vnfName"))	
+		} else { // execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&
+			   // !execution.getVariable("CAAIVfMod_vnfId").isEmpty())
+			msoLogger.debug("Invalid request for Add-on Module requested for non-existant Generic VNF")	
+			execution.setVariable("CAAIVfMod_createVfModuleResponse",
+				"Invalid request for Add-on Module requested for non-existant Generic VNF, VNF Id=" +
+				execution.getVariable("CAAIVfMod_vnfId"))
+		}
+	}
+
+	// construct and send a PUT request to A&AI to create a new Generic VNF
+	// note: to get here, the vnf-id in the original CREATE_VF_MODULE request was absent or ""
+	public void createGenericVnf(DelegateExecution execution) {
+		// TBD - is this how we want to generate the Id for the new Generic VNF?
+		def newVnfId = UUID.randomUUID().toString()
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) +
+			execution.getVariable("CAAIVfMod_genericVnfPutEndpoint") + newVnfId
+		// update the flow execution with the new Vnf Id
+		execution.setVariable("CAAIVfMod_vnfId",newVnfId)
+		
+	//	AaiUriUtil aaiUriUtil = new AaiUriUtil(this)
+	//	def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+	//	msoLogger.debug('AAI URI is: ' + aai_uri)
+	//	String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
+	//	msoLogger.debug('AAI namespace is: ' + namespace)
+		
+				
+		String payload = """<generic-vnf xmlns="${execution.getVariable("CAAIVfMod_aaiNamespace")}">
+								<vnf-id>${MsoUtils.xmlEscape(newVnfId)}</vnf-id>
+								<vnf-name>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfName"))}</vnf-name>
+								<vnf-type>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfType"))}</vnf-type>
+								<service-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_serviceId"))}</service-id>
+								<orchestration-status>Active</orchestration-status>
+								<model-invariant-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfPersonaId"))}</model-invariant-id>
+								<model-version-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfPersonaVer"))}</model-version-id>
+							</generic-vnf>""" as String
+		execution.setVariable("CAAIVfMod_createGenericVnfPayload", payload)
+
+		try {
+			msoLogger.debug("createGenericVnf() endpoint-" + endPoint)
+			msoLogger.debug("invoking PUT call to AAI with payload:"+System.lineSeparator()+payload)
+			msoLogger.debug("Sending PUT call to AAI with Endpoint /n" + endPoint + " with payload /n" + payload)
+
+			AaiUtil aaiUtil = new AaiUtil(this);
+			APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload);
+			def	responseData = response.getResponseBodyAsString()
+			def responseStatusCode = response.getStatusCode()
+			execution.setVariable("CAAIVfMod_createGenericVnfResponseCode", responseStatusCode)
+			execution.setVariable("CAAIVfMod_createGenericVnfResponse", responseData)
+			
+			msoLogger.debug("Response Code: " + responseStatusCode)
+			msoLogger.debug("Response Data: " + responseData)
+			msoLogger.debug("Response code:" + responseStatusCode)
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+		} catch (Exception ex) {
+			ex.printStackTrace()
+			msoLogger.debug("Exception occurred while executing AAI PUT:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in createGenericVnf.")
+		}
+	}
+
+	// construct and send a PUT request to A&AI to create a Base or Add-on VF Module
+	public void createVfModule(DelegateExecution execution, Boolean isBaseModule) {
+		// TBD - is this how we want to generate the Id for the new (Base) VF Module?
+		
+		// Generate the new VF Module ID here if it has not been provided by the parent process
+		def newModuleId = execution.getVariable('newVfModuleId')
+		if (newModuleId == null || newModuleId.isEmpty()) {
+			newModuleId = UUID.randomUUID().toString()
+		}
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("CAAIVfMod_genericVnfPutEndpoint")
+		// need to append the existing Vnf Id or the one generated in createGenericVnf() to the url
+		endPoint = endPoint + UriUtils.encode(execution.getVariable("CAAIVfMod_vnfId"), "UTF-8") +
+			"/vf-modules/vf-module/" + newModuleId;
+		int moduleIndex = 0
+		if (!isBaseModule) {
+			def aaiVnfResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+			AaiUtil aaiUtil = new AaiUtil(this)
+			def personaModelId = execution.getVariable("CAAIVfMod_personaId")
+			
+			// Check if the response includes model-invariant-id or persona-model-id
+			// note: getRequiredNodeText() throws an exception if the field is missing
+			// need to retun a null for the subsequent "either/or" logic to work properly
+//			def modelInvariantId = getRequiredNodeText(execution, aaiVnfResponse,'model-invariant-id')
+			def modelInvariantId = getNodeText(aaiVnfResponse,'model-invariant-id', null)
+			def fieldToCheck = 'model-invariant-id'
+			if (!modelInvariantId) {
+				fieldToCheck = 'persona-model-id'
+			}
+			
+			moduleIndex = aaiUtil.getLowestUnusedVfModuleIndexFromAAIVnfResponse(execution, aaiVnfResponse, 
+				fieldToCheck, personaModelId)
+		}
+		def moduleIndexString = String.valueOf(moduleIndex)
+
+		// if we get to this point, we may be about to create the Vf Module,
+		// add rollback information about the Generic VNF for this base/add-on module
+		def rollbackData = execution.getVariable("RollbackData")
+		if (rollbackData == null) {
+			rollbackData = new RollbackData();
+		}
+		rollbackData.put("VFMODULE", "vnfId", execution.getVariable("CAAIVfMod_vnfId"))
+		rollbackData.put("VFMODULE", "vnfName", execution.getVariable("CAAIVfMod_vnfName"))
+		rollbackData.put("VFMODULE", "isBaseModule", isBaseModule.toString())
+		execution.setVariable("RollbackData", rollbackData)
+		msoLogger.debug("RollbackData:" + rollbackData)
+		String payload = """<vf-module xmlns="${execution.getVariable("CAAIVfMod_aaiNamespace")}">
+								<vf-module-id>${MsoUtils.xmlEscape(newModuleId)}</vf-module-id>
+								<vf-module-name>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_moduleName"))}</vf-module-name>
+								<model-invariant-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_personaId"))}</model-invariant-id>
+								<model-version-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_personaVer"))}</model-version-id>
+								<model-customization-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_modelCustomizationId"))}</model-customization-id>
+								<is-base-vf-module>${MsoUtils.xmlEscape(isBaseModule)}</is-base-vf-module>
+								<orchestration-status>PendingCreate</orchestration-status>
+								<module-index>${MsoUtils.xmlEscape(moduleIndex)}</module-index>
+								</vf-module>""" as String
+		execution.setVariable("CAAIVfMod_createVfModulePayload", payload)
+
+		try {
+			msoLogger.debug("createVfModule() endpoint-" + endPoint)
+			msoLogger.debug("invoking PUT call to AAI with payload:"+System.lineSeparator()+payload)
+			msoLogger.debug("CreateAAIVfModule sending PUT call to AAI with endpoint /n" + endPoint + " with payload /n " + payload)
+
+			AaiUtil aaiUtil = new AaiUtil(this)
+			APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload)	
+			def responseData = response.getResponseBodyAsString()
+			def statusCode = response.getStatusCode()
+			execution.setVariable("CAAIVfMod_createVfModuleResponseCode", statusCode)
+			execution.setVariable("CAAIVfMod_createVfModuleResponse", responseData)
+			
+			msoLogger.debug("Response code:" + statusCode)
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+			msoLogger.debug("Response Code: " + statusCode)
+			msoLogger.debug("Response data: " + responseData)
+			// the base or add-on VF Module was successfully created,
+			// add the module name to the rollback data and the response
+			if (isOneOf(statusCode, 200, 201)) {
+				rollbackData.put("VFMODULE", "vfModuleId", newModuleId)
+				rollbackData.put("VFMODULE", "vfModuleName", execution.getVariable("CAAIVfMod_moduleName"))
+				execution.setVariable("RollbackData", rollbackData)
+				msoLogger.debug("RollbackData:" + rollbackData)
+				
+				String responseOut = ""
+				
+				String isVidRequest = execution.getVariable("isVidRequest")
+				
+				if (isBaseModule && (isVidRequest == null || "false".equals(isVidRequest))) {				
+				
+					responseOut = """<CreateAAIVfModuleResponse>
+											<vnf-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfId"))}</vnf-id>
+											<vf-module-id>${MsoUtils.xmlEscape(newModuleId)}</vf-module-id>
+											<vf-module-index>${MsoUtils.xmlEscape(moduleIndexString)}</vf-module-index>
+										</CreateAAIVfModuleResponse>""" as String
+				}
+				else {
+					responseOut = """<CreateAAIVfModuleResponse>
+											<vnf-name>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfNameFromAAI"))}</vnf-name>
+											<vnf-id>${MsoUtils.xmlEscape(execution.getVariable("CAAIVfMod_vnfId"))}</vnf-id>
+											<vf-module-id>${MsoUtils.xmlEscape(newModuleId)}</vf-module-id>
+											<vf-module-index>${MsoUtils.xmlEscape(moduleIndexString)}</vf-module-index>
+										</CreateAAIVfModuleResponse>""" as String
+				}
+				
+				execution.setVariable("CreateAAIVfModuleResponse", responseOut)
+				msoLogger.debug("CreateAAIVfModuleResponse:" + System.lineSeparator()+responseOut)
+				msoLogger.debug("CreateAAIVfModule Response /n " + responseOut)
+			}
+		} catch (Exception ex) {
+			msoLogger.debug("Exception occurred while executing AAI PUT:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured in createVfModule.")
+		}
+	}
+	
+	// parses the output from the result from queryAAIForGenericVnf() to determine if the vf-module-name
+	// requested for an Add-on VF Module does not already exist for the specified Generic VNF
+	// also retrieves VNF name from AAI response for existing VNF
+	public void parseForAddOnModule(DelegateExecution execution) {
+		def xml = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+		def vnfNameFromAAI = utils.getNodeText(xml, "vnf-name")
+		execution.setVariable("CAAIVfMod_vnfNameFromAAI", vnfNameFromAAI)
+		msoLogger.debug("Obtained vnf-name from AAI for existing VNF: " + vnfNameFromAAI)	
+		def newModuleName = execution.getVariable("CAAIVfMod_moduleName")
+		msoLogger.debug("VF Module to be added: " + newModuleName)
+		def qryModuleNameList = utils.getMultNodes(xml, "vf-module-name")
+		execution.setVariable("CAAIVfMod_moduleExists", false)
+		if (qryModuleNameList != null) {
+			msoLogger.debug("Existing VF Module List: " + qryModuleNameList)
+			for (String qryModuleName : qryModuleNameList) {
+				if (newModuleName.equals(qryModuleName)) {
+					// a module with the requested name already exists - failure
+					msoLogger.debug("VF Module " + qryModuleName + " already exists for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					execution.setVariable("CAAIVfMod_moduleExists", true)
+					execution.setVariable("CAAIVfMod_parseModuleResponse",
+						"VF Module " + qryModuleName + " already exists for Generic VNF " +
+						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					break
+				}
+			}
+		}
+		if (execution.getVariable("CAAIVfMod_moduleExists") == false) {
+			msoLogger.debug("VF Module " + execution.getVariable("CAAIVfMod_moduleName") + " does not exist for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+			execution.setVariable("CAAIVfMod_parseModuleResponse",
+				"VF Module " + newModuleName + " does not exist for Generic VNF " +
+				execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+		}		
+	}
+	
+	// parses the output from the result from queryAAIForGenericVnf() to determine if the vf-module-name
+	// requested for an Add-on VF Module does not already exist for the specified Generic VNF; 
+	// also retrieves VNF name from AAI response for existing VNF
+	public void parseForBaseModule(DelegateExecution execution) {
+		def xml = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+		def vnfNameFromAAI = utils.getNodeText(xml, "vnf-name")
+		execution.setVariable("CAAIVfMod_vnfNameFromAAI", vnfNameFromAAI)
+		msoLogger.debug("Obtained vnf-name from AAI for existing VNF: " + vnfNameFromAAI)	
+		def newModuleName = execution.getVariable("CAAIVfMod_moduleName")
+		msoLogger.debug("VF Module to be added: " + newModuleName)
+		def qryModuleNameList = utils.getMultNodes(xml, "vf-module-name")
+		execution.setVariable("CAAIVfMod_moduleExists", false)
+		if (qryModuleNameList != null) {
+			msoLogger.debug("Existing VF Module List: " + qryModuleNameList)
+			for (String qryModuleName : qryModuleNameList) {
+				if (newModuleName.equals(qryModuleName)) {
+					// a module with the requested name already exists - failure
+					msoLogger.debug("VF Module " + qryModuleName + " already exists for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					execution.setVariable("CAAIVfMod_baseModuleConflict", true)
+					execution.setVariable("CAAIVfMod_parseModuleResponse",
+						"VF Module " + qryModuleName + " already exists for Generic VNF " +
+						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					break
+				}
+			}
+		}
+		def isBaseVfModuleList = utils.getMultNodes(xml, "is-base-vf-module")
+		if (isBaseVfModuleList != null && !execution.getVariable("CAAIVfMod_baseModuleConflict")) {
+			
+			for (String baseValue : isBaseVfModuleList) {
+				if (baseValue.equals("true")) {
+					// a base module already exists in this VNF - failure
+					msoLogger.debug("Base VF Module already exists for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					execution.setVariable("CAAIVfMod_baseModuleConflict", true)
+					execution.setVariable("CAAIVfMod_parseModuleResponse",
+						"Base VF Module already exists for Generic VNF " +
+						execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+					break
+				}
+			}
+		
+		}
+		if (execution.getVariable("CAAIVfMod_moduleExists") == false && execution.getVariable("CAAIVfMod_baseModuleConflict") == false) {
+			msoLogger.debug("VF Module " + execution.getVariable("CAAIVfMod_moduleName") + " does not exist for Generic VNF " + execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+			execution.setVariable("CAAIVfMod_parseModuleResponse",
+				"VF Module " + newModuleName + " does not exist for Generic VNF " +
+				execution.getVariable("CAAIVfMod_vnfNameFromAAI"))
+		}		
+	}
+	
+	// generates a WorkflowException when the A&AI query returns a response code other than 200 or 404
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Error occurred attempting to query AAI, Response Code " + execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") + ", Error Response " + execution.getVariable("CAAIVfMod_queryGenericVnfResponse"), "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+		int code = execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode")
+		exceptionUtil.buildAndThrowWorkflowException(execution, code, "Error occurred attempting to query AAI")
+
+	}
+	
+	// generates a WorkflowException if
+	//		- the A&AI Generic VNF PUT returns a response code other than 200 or 201
+	//		- the requested Generic VNF already exists but vnf-id == null
+	//		- the requested Generic VNF does not exist but vnf-id != null
+	// 		- the A&AI VF Module PUT returns a response code other than 200 or 201
+	//		- the requested VF Module already exists for the Generic VNF
+	public void handleCreateVfModuleFailure(DelegateExecution execution) {
+		def errorCode
+		def errorResponse
+		if (execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") != null &&
+				!isOneOf(execution.getVariable("CAAIVfMod_createGenericVnfResponseCode"), 200, 201)) {
+			msoLogger.debug("Failure creating Generic VNF: " + execution.getVariable("CAAIVfMod_createGenericVnfResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_createGenericVnfResponse")
+			errorCode = 5000
+		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponse") != null &&
+				execution.getVariable("CAAIVfMod_newGenericVnf") == true) {
+			// attempted to create a Generic VNF that already exists but vnf-id == null
+			msoLogger.debug(execution.getVariable("CAAIVfMod_queryGenericVnfResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+			errorCode = 1002
+		} else if (execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404 &&
+				execution.getVariable("CAAIVfMod_newGenericVnf") == false) {
+			// attempted to create a Generic VNF where vnf-name does not exist but vnf-id != null
+			msoLogger.debug(execution.getVariable("CAAIVfMod_queryGenericVnfResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")
+			errorCode = 1002
+		} else if (execution.getVariable("CAAIVfMod_createVfModuleResponseCode") != null) {
+			msoLogger.debug("Failed to add VF Module: " + execution.getVariable("CAAIVfMod_createVfModuleResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_createVfModuleResponse")
+			errorCode = 5000
+		} else if (execution.getVariable("CAAIVfMod_moduleExists") == true) {
+			msoLogger.debug("Attempting to add VF Module that already exists: " + execution.getVariable("CAAIVfMod_parseModuleResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_parseModuleResponse")
+			errorCode = 1002
+		} else if (execution.getVariable("CAAIVfMod_baseModuleConflict") == true) {
+			msoLogger.debug("Attempting to add Base VF Module to VNF that already has a Base VF Module: " + execution.getVariable("CAAIVfMod_parseModuleResponse"))
+			errorResponse = execution.getVariable("CAAIVfMod_parseModuleResponse")
+			errorCode = 1002
+		} else {
+			// if the responses get populated corerctly, we should never get here
+			errorResponse = "Unknown error occurred during CreateAAIVfModule flow"
+			errorCode = 2000
+		}
+
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Error occurred during CreateAAIVfModule flow", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, errorResponse);
+		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, errorResponse)
+		msoLogger.debug("Workflow exception occurred in CreateAAIVfModule: " + errorResponse)
+	}
+
+	/**
+	 * Performs a rollback.
+	 * TBD: This method requires additional testing once integrated with the
+	 *      main CreateVfModule flow.
+	 * @param execution the execution
+	 */
+	public void rollback(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + ".rollback(" +
+			"execution=" + execution.getId() +
+			")"
+		msoLogger.debug("Entered " + method)
+
+		try {
+			RollbackData rollbackData = (RollbackData) execution.getVariable("RollbackData")
+			msoLogger.debug("RollbackData:" + rollbackData)
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			msoLogger.debug("CreateAAIVfModule rollback AAI URI: " + aai_uri)
+			
+			if (rollbackData != null) {
+				if (rollbackData.hasType("VFMODULE")) {
+					// use the DeleteAAIVfModule groovy methods for the rollback
+					def vnfId = rollbackData.get("VFMODULE", "vnfId")
+					def vfModuleId = rollbackData.get("VFMODULE", "vfModuleId")
+					def isBaseModule = rollbackData.get("VFMODULE", "isBaseModule")
+					execution.setVariable("DAAIVfMod_vnfId", vnfId)		
+					execution.setVariable("DAAIVfMod_vfModuleId", vfModuleId)
+					execution.setVariable("DAAIVfMod_genericVnfEndpoint", "${aai_uri}/" + vnfId)
+					execution.setVariable("DAAIVfMod_vfModuleEndpoint", "${aai_uri}/" + vnfId +
+						 "/vf-modules/vf-module/" + vfModuleId)
+					DeleteAAIVfModule dvm = new DeleteAAIVfModule()
+					// query A&AI to get the needed information for the delete(s)
+					dvm.queryAAIForGenericVnf(execution)
+					dvm.parseForVfModule(execution)
+					
+					// roll back the base or add-on module
+					dvm.deleteVfModule(execution)
+					def responseCode = execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode")
+					def response = execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode")
+
+					if (isOneOf(responseCode, 200, 204)) {
+						msoLogger.debug("Received " + responseCode + " to VF Module rollback request")
+//						execution.setVariable("RollbackResult", "SUCCESS")
+					} else {
+						msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Received " + responseCode + " to VF Module rollback request", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, rollbackData + System.lineSeparator() + "Response: " + response);
+					}
+					
+					// a new Generic VNF was created that needs to be rolled back
+					if (isBaseModule.equals("true")) {
+						dvm.deleteGenericVnf(execution)
+						responseCode = execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode")
+						response = execution.getVariable("DAAIVfMod_deleteGenericVnfResponse")
+	
+						if (isOneOf(responseCode, 200, 204)) {
+							msoLogger.debug("Received " + responseCode + " to Generic VNF rollback request")
+							execution.setVariable("RollbackResult", "SUCCESS")
+						} else {
+							msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Received " + responseCode + " to Generic VNF rollback request", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, rollbackData + System.lineSeparator() + "Response: " + response);
+						}
+					} else {
+						execution.setVariable("RollbackResult", "SUCCESS")
+					}
+				}
+			}
+
+			msoLogger.debug("Exited " + method)
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Caught exception in " + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModuleVolumeGroup.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CreateAAIVfModuleVolumeGroup.groovy
index 5edf391bb4..ec691f299e 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModuleVolumeGroup.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CreateAAIVfModuleVolumeGroup.groovy
@@ -1,334 +1,327 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-

-

-public class CreateAAIVfModuleVolumeGroup extends AbstractServiceTaskProcessor {

-

-	private XmlParser xmlParser = new XmlParser()

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * Initialize the flow's variables.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable('prefix', 'CAAIVfModVG_')

-		execution.setVariable('CAAIVfModVG_vnfId', null)

-		execution.setVariable('CAAIVfModVG_vfModuleId', null)

-		execution.setVariable('CAAIVfModVG_aicCloudRegion', null)

-		execution.setVariable('CAAIVfModVG_volumeGroupId', null)

-		execution.setVariable('CAAIVfModVG_getVfModuleResponseCode' ,null)

-		execution.setVariable('CAAIVfModVG_getVfModuleResponse', '')

-		execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', null)

-		execution.setVariable('CAAIVfModVG_updateVfModuleResponse', '')

-	}

-

-	/**

-	 * Check for missing elements in the received request.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def xml = execution.getVariable('CreateAAIVfModuleVolumeGroupRequest')

-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

-			utils.logAudit("CreateAAIVfModuleVolume Received Request XML: " + xml)

-			initProcessVariables(execution)

-

-			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')

-			execution.setVariable('CAAIVfModVG_vnfId', vnfId)

-

-			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')

-			execution.setVariable('CAAIVfModVG_vfModuleId', vfModuleId)

-			

-			def aicCloudRegion = getRequiredNodeText(execution, xml,'aic-cloud-region')

-			execution.setVariable('CAAIVfModVG_aicCloudRegion', aicCloudRegion)

-			

-			def volumeGroupId = getRequiredNodeText(execution, xml,'volume-group-id')

-			execution.setVariable('CAAIVfModVG_volumeGroupId', volumeGroupId)

-

-			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())

-

-		}

-	}

-

-	/**

-	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VF Module.

-	 * A 200 response is expected with the VF Module in the response body.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void getVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.getVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('CAAIVfModVG_vnfId')

-			def vfModuleId = execution.getVariable('CAAIVfModVG_vfModuleId')

-

-			// Construct endpoint

-			AaiUtil aaiUtil = new AaiUtil(this)

-			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-			String endPoint = execution.getVariable('URN_aai_endpoint') + aai_uri + '/' + URLEncoder.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + URLEncoder.encode(vfModuleId, "UTF-8")

-

-			try {

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				utils.logAudit("aaiResponse GET TO AAI Endpoint: " + endPoint)

-				APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('CAAIVfModVG_getVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('CAAIVfModVG_getVfModuleResponse', responseData)

-				

-				utils.logAudit("CreateAAIVfModule Response Code: " + response.getStatusCode())

-				utils.logAudit("CreateAAIVfModule Response: " + response)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('CAAIVfModVG_getVfModuleResponseCode', 500)

-				execution.setVariable('CAAIVfModVG_getVfModuleResponse', '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 getVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Construct and send a PUT request to AAI to update the VF Module with the

-	 * created Volume Group relationship.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void updateVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.updateVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('CAAIVfModVG_vnfId')

-			def vfModuleId = execution.getVariable('CAAIVfModVG_vfModuleId')

-			def vfModule = execution.getVariable('CAAIVfModVG_getVfModuleResponse')

-			def origRequest = execution.getVariable('CreateAAIVfModuleVolumeGroupRequest')

-			def Node vfModuleNode = xmlParser.parseText(vfModule)

-			

-			// Confirm resource-version is in retrieved VF Module

-			if (utils.getChildNode(vfModuleNode, 'resource-version') == null) {

-				def msg = 'Can\'t update VF Module ' + vfModuleId + ' since \'resource-version\' is missing'

-				logError(msg)

-				throw new Exception(msg)

-			}

-						

-			// Construct payload by creating a Volume Group relationhip and inserting it into the VF Module

-			def aicCloudRegion = execution.getVariable('CAAIVfModVG_aicCloudRegion')

-			def volumeGroupId = execution.getVariable('CAAIVfModVG_volumeGroupId')

-			def Node vgRelationshipNode = createVolumeGroupRelationshipNode(aicCloudRegion, volumeGroupId)

-			insertVolumeGroupRelationshipNode(vfModuleNode, vgRelationshipNode)

-			def payload = utils.nodeToString(vfModuleNode)

-

-			// Construct endpoint

-			AaiUtil aaiUtil = new AaiUtil(this)

-			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-			String endPoint = execution.getVariable('URN_aai_endpoint') + aai_uri + '/' + URLEncoder.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + URLEncoder.encode(vfModuleId, "UTF-8")

-

-			try {

-				utils.logAudit("CreateAAIVfModuleVolume Sendind PUT to AAI Endpoint \n " + endPoint + " with payload \n " + payload)

-				logDebug('sending PUT to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload, isDebugLogEnabled)

-				APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('CAAIVfModVG_updateVfModuleResponse', responseData)

-				

-				utils.logAudit("CreateAAIVfModule Response code: " + response.getStatusCode())

-				utils.logAudit("CreateAAIVfModule Response: " + responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI PUT:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', 500)

-				execution.setVariable('CAAIVfModVG_updateVfModuleResponse', 'AAI PUT 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 updateVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Construct a Volume Group relationship Node with the given AIC Cloud Region and

-	 * Volume Group ID for insertion into a VF Module.

-	 * 

-	 * @param aicCloudRegion Cloud Region ID to use in the Volume Group relationship

-	 * @param volumeGroupId Volume Group ID to use in the Volume Group relationship

-	 * @return a Node representing the new Volume Group relationship

-	 */

-	private Node createVolumeGroupRelationshipNode(String aicCloudRegion, String volumeGroupId) {

-		

-		def Node relatedTo = new Node(null, 'related-to', 'volume-group')

-		

-		def Node relationshipKeyCO = new Node(null, 'relationship-key', 'cloud-region.cloud-owner')

-		def Node relationshipValueCO = new Node(null, 'relationship-value', 'att-aic')

-		def Node relationshipDataCO = new Node(null, 'relationship-data')

-		relationshipDataCO.append(relationshipKeyCO)

-		relationshipDataCO.append(relationshipValueCO)

-		

-		def Node relationshipKeyCRI = new Node(null, 'relationship-key', 'cloud-region.cloud-region-id')

-		def Node relationshipValueCRI = new Node(null, 'relationship-value', aicCloudRegion)

-		def Node relationshipDataCRI = new Node(null, 'relationship-data')

-		relationshipDataCRI.append(relationshipKeyCRI)

-		relationshipDataCRI.append(relationshipValueCRI)

-

-		def Node relationshipKeyVGI = new Node(null, 'relationship-key', 'volume-group.volume-group-id')

-		def Node relationshipValueVGI = new Node(null, 'relationship-value', volumeGroupId)

-		def Node relationshipDataVGI = new Node(null, 'relationship-data')

-		relationshipDataVGI.append(relationshipKeyVGI)

-		relationshipDataVGI.append(relationshipValueVGI)

-		

-		def Node volumeGroupRelationship = new Node(null, 'relationship')

-		volumeGroupRelationship.append(relatedTo)

-		volumeGroupRelationship.append(relationshipDataCO)

-		volumeGroupRelationship.append(relationshipDataCRI)

-		volumeGroupRelationship.append(relationshipDataVGI)

-		

-		return volumeGroupRelationship;

-	}

-	

-	/**

-	 * Insert the given Volume Group relationship Node into the given VF Module.

-	 * If the VF Module does NOT contain a relationship list:

-	 * 	- Create a relationship list containing the Volume Group relationship and insert it into the VF Module

-	 * If the VF Module contains a relationship list but not a Volume Group relationship:

-	 * 	- Insert the the Volume Group relationship into the relationship lsit

-	 * If the VF Module contains a relationship list and has a Volume Group relationship:

-	 * 	- Replace the existing Volume Group relationship with the new one

-	 * @param vfModuleNode

-	 * @param volumeGroupRelationshipNode

-	 */

-	private void insertVolumeGroupRelationshipNode(Node vfModuleNode, Node volumeGroupRelationshipNode) {

-		def Node relationshipList = utils.getChildNode(vfModuleNode, 'relationship-list')

-		if (relationshipList == null) {

-			relationshipList = new Node(null, 'relationship-list')

-			relationshipList.append(volumeGroupRelationshipNode)

-			vfModuleNode.append(relationshipList)

-		} else {

-			def Node currVolumeGroupRelationshipNode = getCurrVolumeGroupRelationshipNode(relationshipList)

-			if (currVolumeGroupRelationshipNode == null) {

-				relationshipList.append(volumeGroupRelationshipNode)

-			} else {

-				currVolumeGroupRelationshipNode.replaceNode(volumeGroupRelationshipNode)

-			}

-		}

-	}

-		

-	/**

-	 * Find and return the value of the Volume Group ID for the specified VF Module.  If

-	 * the value of the Volume Group ID cannot be found for any reason, 'null' is returned.

-	 * 

-	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.

-	 * @return the value of the Volume Group ID for the specified VF Module.  If the

-	 * value of the Volume Group ID cannot be found for any reason, 'null' is returned.

-	 */

-	private Node getCurrVolumeGroupRelationshipNode(Node relationshipList) {

-		def Node currVolumeGroupRelationshipNode = null

-		def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

-		for (Node relationshipNode in relationships) {

-			def String relatedTo = utils.getChildNodeText(relationshipNode, 'related-to')

-			if ((relatedTo != null) && relatedTo.equals('volume-group')) {

-				currVolumeGroupRelationshipNode = relationshipNode

-			}

-		}

-		return currVolumeGroupRelationshipNode

-	}

-

-	/**

-	 * Generates a WorkflowException if the AAI query returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleAAIQueryFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to query AAI, Response Code ' +

-			execution.getVariable('CAAIVfModVG_getVfModuleResponseCode') + ', Error Response ' +

-			execution.getVariable('CAAIVfModVG_getVfModuleResponse'))

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		exceptionUtil.buildWorkflowException(execution, 5000, execution.getVariable('CAAIVfModVG_getVfModuleResponse'))

-

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-

-	/**

-	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleUpdateVfModuleFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to update VF Module in AAI, Response Code ' +

-			execution.getVariable('CAAIVfModVG_updateVfModuleResponseCode') + ', Error Response ' +

-			execution.getVariable('CAAIVfModVG_updateVfModuleResponse'))

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		exceptionUtil.buildWorkflowException(execution, 5000, execution.getVariable('CAAIVfModVG_updateVfModuleResponse'))

-

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+public class CreateAAIVfModuleVolumeGroup extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CreateAAIVfModuleVolumeGroup.class);
+
+	private XmlParser xmlParser = new XmlParser()
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * Initialize the flow's variables.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable('prefix', 'CAAIVfModVG_')
+		execution.setVariable('CAAIVfModVG_vnfId', null)
+		execution.setVariable('CAAIVfModVG_vfModuleId', null)
+		execution.setVariable('CAAIVfModVG_aicCloudRegion', null)
+		execution.setVariable('CAAIVfModVG_volumeGroupId', null)
+		execution.setVariable('CAAIVfModVG_getVfModuleResponseCode' ,null)
+		execution.setVariable('CAAIVfModVG_getVfModuleResponse', '')
+		execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', null)
+		execution.setVariable('CAAIVfModVG_updateVfModuleResponse', '')
+	}
+
+	/**
+	 * Check for missing elements in the received request.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def xml = execution.getVariable('CreateAAIVfModuleVolumeGroupRequest')
+			msoLogger.debug('Received request xml:\n' + xml)
+			msoLogger.debug("CreateAAIVfModuleVolume Received Request XML: " + xml)
+			initProcessVariables(execution)
+
+			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')
+			execution.setVariable('CAAIVfModVG_vnfId', vnfId)
+
+			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')
+			execution.setVariable('CAAIVfModVG_vfModuleId', vfModuleId)
+			
+			def aicCloudRegion = getRequiredNodeText(execution, xml,'aic-cloud-region')
+			execution.setVariable('CAAIVfModVG_aicCloudRegion', aicCloudRegion)
+			
+			def volumeGroupId = getRequiredNodeText(execution, xml,'volume-group-id')
+			execution.setVariable('CAAIVfModVG_volumeGroupId', volumeGroupId)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+
+		}
+	}
+
+	/**
+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VF Module.
+	 * A 200 response is expected with the VF Module in the response body.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void getVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.getVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('CAAIVfModVG_vnfId')
+			def vfModuleId = execution.getVariable('CAAIVfModVG_vfModuleId')
+
+			// Construct endpoint
+			AaiUtil aaiUtil = new AaiUtil(this)
+			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + URLEncoder.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + URLEncoder.encode(vfModuleId, "UTF-8")
+
+			try {
+				msoLogger.debug('sending GET to AAI endpoint \'' + endPoint + '\'')
+				msoLogger.debug("aaiResponse GET TO AAI Endpoint: " + endPoint)
+				APIResponse response = aaiUtil.executeAAIGetCall(execution, endPoint)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('CAAIVfModVG_getVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('CAAIVfModVG_getVfModuleResponse', responseData)
+				
+				msoLogger.debug("CreateAAIVfModule Response Code: " + response.getStatusCode())
+				msoLogger.debug("CreateAAIVfModule Response: " + response)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI GET:' + ex.getMessage())
+				execution.setVariable('CAAIVfModVG_getVfModuleResponseCode', 500)
+				execution.setVariable('CAAIVfModVG_getVfModuleResponse', 'AAI GET Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in getVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Construct and send a PUT request to AAI to update the VF Module with the
+	 * created Volume Group relationship.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void updateVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.updateVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('CAAIVfModVG_vnfId')
+			def vfModuleId = execution.getVariable('CAAIVfModVG_vfModuleId')
+			def vfModule = execution.getVariable('CAAIVfModVG_getVfModuleResponse')
+			def origRequest = execution.getVariable('CreateAAIVfModuleVolumeGroupRequest')
+			def Node vfModuleNode = xmlParser.parseText(vfModule)
+			
+			// Confirm resource-version is in retrieved VF Module
+			if (utils.getChildNode(vfModuleNode, 'resource-version') == null) {
+				def msg = 'Can\'t update VF Module ' + vfModuleId + ' since \'resource-version\' is missing'
+				msoLogger.error( msg);
+				throw new Exception(msg)
+			}
+						
+			// Construct payload by creating a Volume Group relationhip and inserting it into the VF Module
+			def aicCloudRegion = execution.getVariable('CAAIVfModVG_aicCloudRegion')
+			def volumeGroupId = execution.getVariable('CAAIVfModVG_volumeGroupId')
+			def Node vgRelationshipNode = createVolumeGroupRelationshipNode(aicCloudRegion, volumeGroupId)
+			insertVolumeGroupRelationshipNode(vfModuleNode, vgRelationshipNode)
+			def payload = utils.nodeToString(vfModuleNode)
+
+			// Construct endpoint
+			AaiUtil aaiUtil = new AaiUtil(this)
+			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + URLEncoder.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + URLEncoder.encode(vfModuleId, "UTF-8")
+
+			try {
+				msoLogger.debug("CreateAAIVfModuleVolume Sendind PUT to AAI Endpoint \n " + endPoint + " with payload \n " + payload)
+				msoLogger.debug('sending PUT to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload)
+				APIResponse response = aaiUtil.executeAAIPutCall(execution, endPoint, payload)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('CAAIVfModVG_updateVfModuleResponse', responseData)
+				
+				msoLogger.debug("CreateAAIVfModule Response code: " + response.getStatusCode())
+				msoLogger.debug("CreateAAIVfModule Response: " + responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI PUT:' + ex.getMessage())
+				execution.setVariable('CAAIVfModVG_updateVfModuleResponseCode', 500)
+				execution.setVariable('CAAIVfModVG_updateVfModuleResponse', 'AAI PUT Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in updateVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Construct a Volume Group relationship Node with the given AIC Cloud Region and
+	 * Volume Group ID for insertion into a VF Module.
+	 * 
+	 * @param aicCloudRegion Cloud Region ID to use in the Volume Group relationship
+	 * @param volumeGroupId Volume Group ID to use in the Volume Group relationship
+	 * @return a Node representing the new Volume Group relationship
+	 */
+	private Node createVolumeGroupRelationshipNode(String aicCloudRegion, String volumeGroupId) {
+		
+		def Node relatedTo = new Node(null, 'related-to', 'volume-group')
+		
+		def Node relationshipKeyCO = new Node(null, 'relationship-key', 'cloud-region.cloud-owner')
+		def Node relationshipValueCO = new Node(null, 'relationship-value', 'att-aic')
+		def Node relationshipDataCO = new Node(null, 'relationship-data')
+		relationshipDataCO.append(relationshipKeyCO)
+		relationshipDataCO.append(relationshipValueCO)
+		
+		def Node relationshipKeyCRI = new Node(null, 'relationship-key', 'cloud-region.cloud-region-id')
+		def Node relationshipValueCRI = new Node(null, 'relationship-value', aicCloudRegion)
+		def Node relationshipDataCRI = new Node(null, 'relationship-data')
+		relationshipDataCRI.append(relationshipKeyCRI)
+		relationshipDataCRI.append(relationshipValueCRI)
+
+		def Node relationshipKeyVGI = new Node(null, 'relationship-key', 'volume-group.volume-group-id')
+		def Node relationshipValueVGI = new Node(null, 'relationship-value', volumeGroupId)
+		def Node relationshipDataVGI = new Node(null, 'relationship-data')
+		relationshipDataVGI.append(relationshipKeyVGI)
+		relationshipDataVGI.append(relationshipValueVGI)
+		
+		def Node volumeGroupRelationship = new Node(null, 'relationship')
+		volumeGroupRelationship.append(relatedTo)
+		volumeGroupRelationship.append(relationshipDataCO)
+		volumeGroupRelationship.append(relationshipDataCRI)
+		volumeGroupRelationship.append(relationshipDataVGI)
+		
+		return volumeGroupRelationship;
+	}
+	
+	/**
+	 * Insert the given Volume Group relationship Node into the given VF Module.
+	 * If the VF Module does NOT contain a relationship list:
+	 * 	- Create a relationship list containing the Volume Group relationship and insert it into the VF Module
+	 * If the VF Module contains a relationship list but not a Volume Group relationship:
+	 * 	- Insert the the Volume Group relationship into the relationship lsit
+	 * If the VF Module contains a relationship list and has a Volume Group relationship:
+	 * 	- Replace the existing Volume Group relationship with the new one
+	 * @param vfModuleNode
+	 * @param volumeGroupRelationshipNode
+	 */
+	private void insertVolumeGroupRelationshipNode(Node vfModuleNode, Node volumeGroupRelationshipNode) {
+		def Node relationshipList = utils.getChildNode(vfModuleNode, 'relationship-list')
+		if (relationshipList == null) {
+			relationshipList = new Node(null, 'relationship-list')
+			relationshipList.append(volumeGroupRelationshipNode)
+			vfModuleNode.append(relationshipList)
+		} else {
+			def Node currVolumeGroupRelationshipNode = getCurrVolumeGroupRelationshipNode(relationshipList)
+			if (currVolumeGroupRelationshipNode == null) {
+				relationshipList.append(volumeGroupRelationshipNode)
+			} else {
+				currVolumeGroupRelationshipNode.replaceNode(volumeGroupRelationshipNode)
+			}
+		}
+	}
+		
+	/**
+	 * Find and return the value of the Volume Group ID for the specified VF Module.  If
+	 * the value of the Volume Group ID cannot be found for any reason, 'null' is returned.
+	 * 
+	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.
+	 * @return the value of the Volume Group ID for the specified VF Module.  If the
+	 * value of the Volume Group ID cannot be found for any reason, 'null' is returned.
+	 */
+	private Node getCurrVolumeGroupRelationshipNode(Node relationshipList) {
+		def Node currVolumeGroupRelationshipNode = null
+		def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
+		for (Node relationshipNode in relationships) {
+			def String relatedTo = utils.getChildNodeText(relationshipNode, 'related-to')
+			if ((relatedTo != null) && relatedTo.equals('volume-group')) {
+				currVolumeGroupRelationshipNode = relationshipNode
+			}
+		}
+		return currVolumeGroupRelationshipNode
+	}
+
+	/**
+	 * Generates a WorkflowException if the AAI query returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+		msoLogger.error( 'Error occurred attempting to query AAI, Response Code ' + execution.getVariable('CAAIVfModVG_getVfModuleResponseCode'));		
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+		exceptionUtil.buildWorkflowException(execution, 5000, execution.getVariable('CAAIVfModVG_getVfModuleResponse'))
+
+		msoLogger.trace('Exited ' + method)
+	}
+
+	/**
+	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleUpdateVfModuleFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error('Error occurred attempting to update VF Module in AAI, Response Code ' + execution.getVariable('CAAIVfModVG_updateVfModuleResponseCode'));
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+		exceptionUtil.buildWorkflowException(execution, 5000, execution.getVariable('CAAIVfModVG_updateVfModuleResponse'))
+
+		msoLogger.trace('Exited ' + method)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CustomE2EGetService.groovy
index 86b35853ba..5aef1d6ea5 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CustomE2EGetService.groovy
@@ -1,443 +1,440 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.common.scripts

-

-import static org.apache.commons.lang3.StringUtils.*

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-/**

- * This class supports the GenericGetService Sub Flow.

- * This Generic sub flow can be used by any flow for accomplishing

- * the goal of getting a Service-Instance or Service-Subscription (from AAI).

- * The calling flow must set the GENGS_type variable as "service-instance"

- * or "service-subscription".

- *

- * When using to Get a Service-Instance:

- * If the global-customer-id and service-type are not provided

- * this flow executes a query to get the service- Url using the

- * Service  Id or Name (whichever is provided).

- *

- * When using to Get a Service-Subscription:

- * The global-customer-id and service-type must be

- * provided.

- *

- * Upon successful completion of this sub flow the

- * GENGS_SuccessIndicator will be true and the query response payload

- * will be set to GENGS_service.  An MSOWorkflowException will

- * be thrown upon unsuccessful completion or if an error occurs

- * at any time during this sub flow. Please map variables

- * to the corresponding variable names below.

- *

- * Note - If this sub flow receives a Not Found (404) response

- * from AAI at any time this will be considered an acceptable

- * successful response however the GENGS_FoundIndicator

- * will be set to false. This variable will allow the calling flow

- * to distinguish between the two Success scenarios,

- * "Success where service- is found" and

- * "Success where service- is NOT found".

- *

- *

- * Variable Mapping Below:

- *

- * In Mapping Variables:

- *   For Allotted-Resource:

- *     @param - GENGS_allottedResourceId

- *     @param - GENGS_type

- *     @param (Optional) - GENGS_serviceInstanceId

- *     @param (Optional) - GENGS_serviceType

- *     @param (Optional) - GENGS_globalCustomerId

- *

- *   For Service-Instance:

- *     @param - GENGS_serviceInstanceId or @param - GENGS_serviceInstanceName

- *     @param - GENGS_type

- *     @param (Optional) - GENGS_serviceType

- *     @param (Optional) - GENGS_globalCustomerId

- *

- *   For Service-Subscription:

- *     @param - GENGS_type

- *     @param - GENGS_serviceType

- *     @param - GENGS_globalCustomerId

- *

- *

- * Out Mapping Variables:

- *    @param - GENGS_service

- *    @param - GENGS_FoundIndicator

- *    @param - WorkflowException

- */

-class CustomE2EGetService extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENGS_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * determines the subsequent event based on which

-	 * variables the calling flow provided.

-	 *

-	 * @param - execution

-	 *

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENGS_obtainObjectsUrl", false)

-		execution.setVariable("GENGS_obtainServiceInstanceUrlByName", false)

-		execution.setVariable("GENGS_SuccessIndicator", false)

-		execution.setVariable("GENGS_FoundIndicator", false)

-		execution.setVariable("GENGS_resourceLink", null)

-		execution.setVariable("GENGS_siResourceLink", null)

-

-		try{

-			// Get Variables

-			String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")

-			String serviceType = execution.getVariable("GENGS_serviceType")

-			String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-			String type = execution.getVariable("GENGS_type")

-

-			if(type != null){

-				utils.log("DEBUG", "Incoming GENGS_type is: " + type, isDebugEnabled)

-				if(type.equalsIgnoreCase("allotted-resource")){

-					if(isBlank(allottedResourceId)){

-						utils.log("DEBUG", "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")

-					}else{

-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)

-						if(isBlank(globalCustomerId) || isBlank(serviceType) || isBlank(serviceInstanceId)){

-							execution.setVariable("GENGS_obtainObjectsUrl", true)

-						}else{

-							utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-						}

-					}

-				}else if(type.equalsIgnoreCase("service-instance")){

-					if(isBlank(serviceInstanceId) && isBlank(serviceInstanceName)){

-						utils.log("DEBUG", "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")

-					}else{

-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-						utils.log("DEBUG", "Incoming Service Instance Name is: " + serviceInstanceName, isDebugEnabled)

-						if(isBlank(globalCustomerId) || isBlank(serviceType)){

-							execution.setVariable("GENGS_obtainObjectsUrl", true)

-							if(isBlank(serviceInstanceId)){

-								execution.setVariable("GENGS_obtainServiceInstanceUrlByName", true)

-							}

-						}else{

-							utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-						}

-					}

-				}else if(type.equalsIgnoreCase("service-subscription")){

-					if(isBlank(serviceType) || isBlank(globalCustomerId)){

-						utils.log("DEBUG", "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")

-					}else{

-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-						utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-					}

-				}else{

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")

-				}

-			}else{

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENGS_type is null. Variable is Required.")

-			}

-

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", "Internal Error encountered within GenericGetService PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetService PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericGetService PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method obtains the Url to the provided service instance

-	 * using the Service Instance Id.

-	 *

-	 * @param - execution

-	 */

-	public void obtainServiceInstanceUrlById(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-

-			String type = execution.getVariable("GENGS_type")

-			String path = ""

-			if(type.equalsIgnoreCase("service-instance")){

-				String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId, isDebugEnabled)

-				path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"

-				utils.logAudit("Service Instance Node Query Url is: " + path)

-				utils.log("DEBUG", "Service Instance Node Query Url is: " + path, isDebugEnabled)

-			}else if(type.equalsIgnoreCase("allotted-resource")){

-				String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Allotted Resource Id: " + allottedResourceId, isDebugEnabled)

-				path = "${aai_uri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"

-				utils.logAudit("Allotted Resource Node Query Url is: " + path)

-				utils.log("DEBUG", "Allotted Resource Node Query Url is: " + path, isDebugEnabled)

-			}

-

-			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property

-			String url = "${path}"

-			execution.setVariable("GENGS_genericQueryPath", url)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_genericQueryResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI GET Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			execution.setVariable("GENGS_obtainSIUrlResponseBeforeUnescaping", aaiResponse)

-			utils.log("DEBUG", "GenericGetService AAI Response before unescaping: " + aaiResponse, isDebugEnabled)

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_genericQueryResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			utils.log("DEBUG", "GenericGetService AAI Response: " + aaiResponse, isDebugEnabled)

-

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "Generic Query Received a Good Response Code", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				if(utils.nodeExists(aaiResponse, "result-data")){

-					utils.log("DEBUG", "Generic Query Response Does Contain Data" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

-					execution.setVariable("GENGS_resourceLink", resourceLink)

-					execution.setVariable("GENGS_siResourceLink", resourceLink)

-				}else{

-					utils.log("DEBUG", "Generic Query Response Does NOT Contains Data" , isDebugEnabled)

-					execution.setVariable("WorkflowResponse", "  ") //for junits

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "Generic Query Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}else{

-				utils.log("DEBUG", "Generic Query Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetService ObtainServiceInstanceUrlById method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlById")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * This method obtains the Url to the provided service instance

-	 * using the Service Instance Name.

-	 *

-	 * @param - execution

-	 */

-	public void obtainServiceInstanceUrlByName(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlByName Process*** ", isDebugEnabled)

-		try {

-			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")

-			utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Name " + serviceInstanceName, isDebugEnabled)

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			String path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-name:EQUALS:${serviceInstanceName}"

-

-			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property

-			String url = "${path}"

-			execution.setVariable("GENGS_obtainSIUrlPath", url)

-

-			utils.logAudit("GenericGetService AAI Endpoint: " + aai_endpoint)

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "  Query for Service Instance Url Received a Good Response Code", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				if(utils.nodeExists(aaiResponse, "result-data")){

-					utils.log("DEBUG", "Query for Service Instance Url Response Does Contain Data" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

-					execution.setVariable("GENGS_resourceLink", resourceLink)

-					execution.setVariable("GENGS_siResourceLink", resourceLink)

-				}else{

-					utils.log("DEBUG", "Query for Service Instance Url Response Does NOT Contains Data" , isDebugEnabled)

-					execution.setVariable("WorkflowResponse", "  ") //for junits

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "  Query for Service Instance Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}else{

-				utils.log("DEBUG", "Query for Service Instance Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetService ObtainServiceInstanceUrlByName method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlByName")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService ObtainServiceInstanceUrlByName Process*** ", isDebugEnabled)

-	}

-

-

-	/**

-	 * This method executes a GET call to AAI to obtain the

-	 * service-instance or service-subscription

-	 *

-	 * @param - execution

-	 */

-	public void getServiceObject(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService GetServiceObject Process*** ", isDebugEnabled)

-		try {

-			String type = execution.getVariable("GENGS_type")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			String serviceEndpoint = ""

-

-			utils.logAudit("GenericGetService getServiceObject AAI Endpoint: " + aai_endpoint)

-			if(type.equalsIgnoreCase("service-instance")){

-				String siResourceLink = execution.getVariable("GENGS_resourceLink")

-				if(isBlank(siResourceLink)){

-					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-					String serviceType = execution.getVariable("GENGS_serviceType")

-					utils.log("DEBUG", " Incoming GENGS_serviceType is: " + serviceType, isDebugEnabled)

-					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-

-					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")

-				}else{

-					utils.log("DEBUG", "Incoming Service Instance Url is: " + siResourceLink, isDebugEnabled)

-					String[] split = siResourceLink.split("/aai/")

-					serviceEndpoint = "/aai/" + split[1]

-				}

-			}else if(type.equalsIgnoreCase("allotted-resource")){

-				String siResourceLink = execution.getVariable("GENGS_resourceLink")

-				if(isBlank(siResourceLink)){

-					String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-					utils.log("DEBUG", " Incoming GENGS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)

-					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-					String serviceType = execution.getVariable("GENGS_serviceType")

-					utils.log("DEBUG", " Incoming GENGS_serviceType is: " + serviceType, isDebugEnabled)

-					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-

-					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") +  "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")

-				}else{

-					utils.log("DEBUG", "Incoming Allotted-Resource Url is: " + siResourceLink, isDebugEnabled)

-					String[] split = siResourceLink.split("/aai/")

-					serviceEndpoint = "/aai/" + split[1]

-				}

-			}else if(type.equalsIgnoreCase("service-subscription")){

-				String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-				String serviceType = execution.getVariable("GENGS_serviceType")

-				serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")

-			}

-

-			String serviceUrl = "${aai_endpoint}" + serviceEndpoint

-

-			execution.setVariable("GENGS_getServiceUrl", serviceUrl)

-			utils.log("DEBUG", "GET Service AAI Path is: \n" + serviceUrl, isDebugEnabled)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, serviceUrl)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_getServiceResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_getServiceResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			//Process Response

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET Service Received a Good Response Code", isDebugEnabled)

-				if(utils.nodeExists(aaiResponse, "service-instance") || utils.nodeExists(aaiResponse, "service-subscription")){

-					utils.log("DEBUG", "GET Service Response Contains a service-instance" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					execution.setVariable("GENGS_service", aaiResponse)

-					execution.setVariable("WorkflowResponse", aaiResponse)

-

-				}else{

-					utils.log("DEBUG", "GET Service Response Does NOT Contain Data" , isDebugEnabled)

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Service Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}

-			else{

-				utils.log("DEBUG", "  GET Service Received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericGetService GetServiceObject method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GenericGetService")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService GetServiceObject Process*** ", isDebugEnabled)

-	}

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.onap.so.bpmn.common.scripts
+
+import static org.apache.commons.lang3.StringUtils.*
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+/**
+ * This class supports the GenericGetService Sub Flow.
+ * This Generic sub flow can be used by any flow for accomplishing
+ * the goal of getting a Service-Instance or Service-Subscription (from AAI).
+ * The calling flow must set the GENGS_type variable as "service-instance"
+ * or "service-subscription".
+ *
+ * When using to Get a Service-Instance:
+ * If the global-customer-id and service-type are not provided
+ * this flow executes a query to get the service- Url using the
+ * Service  Id or Name (whichever is provided).
+ *
+ * When using to Get a Service-Subscription:
+ * The global-customer-id and service-type must be
+ * provided.
+ *
+ * Upon successful completion of this sub flow the
+ * GENGS_SuccessIndicator will be true and the query response payload
+ * will be set to GENGS_service.  An MSOWorkflowException will
+ * be thrown upon unsuccessful completion or if an error occurs
+ * at any time during this sub flow. Please map variables
+ * to the corresponding variable names below.
+ *
+ * Note - If this sub flow receives a Not Found (404) response
+ * from AAI at any time this will be considered an acceptable
+ * successful response however the GENGS_FoundIndicator
+ * will be set to false. This variable will allow the calling flow
+ * to distinguish between the two Success scenarios,
+ * "Success where service- is found" and
+ * "Success where service- is NOT found".
+ *
+ *
+ * Variable Mapping Below:
+ *
+ * In Mapping Variables:
+ *   For Allotted-Resource:
+ *     @param - GENGS_allottedResourceId
+ *     @param - GENGS_type
+ *     @param (Optional) - GENGS_serviceInstanceId
+ *     @param (Optional) - GENGS_serviceType
+ *     @param (Optional) - GENGS_globalCustomerId
+ *
+ *   For Service-Instance:
+ *     @param - GENGS_serviceInstanceId or @param - GENGS_serviceInstanceName
+ *     @param - GENGS_type
+ *     @param (Optional) - GENGS_serviceType
+ *     @param (Optional) - GENGS_globalCustomerId
+ *
+ *   For Service-Subscription:
+ *     @param - GENGS_type
+ *     @param - GENGS_serviceType
+ *     @param - GENGS_globalCustomerId
+ *
+ *
+ * Out Mapping Variables:
+ *    @param - GENGS_service
+ *    @param - GENGS_FoundIndicator
+ *    @param - WorkflowException
+ */
+class CustomE2EGetService extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CustomE2EGetService.class);
+
+	String Prefix = "GENGS_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * This method validates the incoming variables and
+	 * determines the subsequent event based on which
+	 * variables the calling flow provided.
+	 *
+	 * @param - execution
+	 *
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService PreProcessRequest Process")
+
+		execution.setVariable("GENGS_obtainObjectsUrl", false)
+		execution.setVariable("GENGS_obtainServiceInstanceUrlByName", false)
+		execution.setVariable("GENGS_SuccessIndicator", false)
+		execution.setVariable("GENGS_FoundIndicator", false)
+		execution.setVariable("GENGS_resourceLink", null)
+		execution.setVariable("GENGS_siResourceLink", null)
+
+		try{
+			// Get Variables
+			String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")
+			String serviceType = execution.getVariable("GENGS_serviceType")
+			String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+			String type = execution.getVariable("GENGS_type")
+
+			if(type != null){
+				msoLogger.debug("Incoming GENGS_type is: " + type)
+				if(type.equalsIgnoreCase("allotted-resource")){
+					if(isBlank(allottedResourceId)){
+						msoLogger.debug("Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")
+					}else{
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						if(isBlank(globalCustomerId) || isBlank(serviceType) || isBlank(serviceInstanceId)){
+							execution.setVariable("GENGS_obtainObjectsUrl", true)
+						}else{
+							msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+							msoLogger.debug("Incoming Service Type is: " + serviceType)
+							msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+						}
+					}
+				}else if(type.equalsIgnoreCase("service-instance")){
+					if(isBlank(serviceInstanceId) && isBlank(serviceInstanceName)){
+						msoLogger.debug("Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")
+					}else{
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Instance Name is: " + serviceInstanceName)
+						if(isBlank(globalCustomerId) || isBlank(serviceType)){
+							execution.setVariable("GENGS_obtainObjectsUrl", true)
+							if(isBlank(serviceInstanceId)){
+								execution.setVariable("GENGS_obtainServiceInstanceUrlByName", true)
+							}
+						}else{
+							msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+							msoLogger.debug("Incoming Service Type is: " + serviceType)
+						}
+					}
+				}else if(type.equalsIgnoreCase("service-subscription")){
+					if(isBlank(serviceType) || isBlank(globalCustomerId)){
+						msoLogger.debug("Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
+					}else{
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+					}
+				}else{
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")
+				}
+			}else{
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENGS_type is null. Variable is Required.")
+			}
+
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug("Internal Error encountered within GenericGetService PreProcessRequest method!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetService PreProcessRequest")
+
+		}
+		msoLogger.trace("COMPLETED GenericGetService PreProcessRequest Process ")
+	}
+
+	/**
+	 * This method obtains the Url to the provided service instance
+	 * using the Service Instance Id.
+	 *
+	 * @param - execution
+	 */
+	public void obtainServiceInstanceUrlById(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService ObtainServiceInstanceUrlById Process")
+		try {
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+
+			String type = execution.getVariable("GENGS_type")
+			String path = ""
+			if(type.equalsIgnoreCase("service-instance")){
+				String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+				msoLogger.debug(" Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId)
+				path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"
+				msoLogger.debug("Service Instance Node Query Url is: " + path)
+				msoLogger.debug("Service Instance Node Query Url is: " + path)
+			}else if(type.equalsIgnoreCase("allotted-resource")){
+				String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+				msoLogger.debug(" Querying Node for Service-Instance URL by using Allotted Resource Id: " + allottedResourceId)
+				path = "${aai_uri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"
+				msoLogger.debug("Allotted Resource Node Query Url is: " + path)
+				msoLogger.debug("Allotted Resource Node Query Url is: " + path)
+			}
+
+			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property
+			String url = "${path}"
+			execution.setVariable("GENGS_genericQueryPath", url)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_genericQueryResponseCode", responseCode)
+			msoLogger.debug("  GET Service Instance response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI GET Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_obtainSIUrlResponseBeforeUnescaping", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response before unescaping: " + aaiResponse)
+			execution.setVariable("GENGS_genericQueryResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("Generic Query Received a Good Response Code")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				if(utils.nodeExists(aaiResponse, "result-data")){
+					msoLogger.debug("Generic Query Response Does Contain Data" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					String resourceLink = utils.getNodeText(aaiResponse, "resource-link")
+					execution.setVariable("GENGS_resourceLink", resourceLink)
+					execution.setVariable("GENGS_siResourceLink", resourceLink)
+				}else{
+					msoLogger.debug("Generic Query Response Does NOT Contains Data" )
+					execution.setVariable("WorkflowResponse", "  ") //for junits
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("Generic Query Received a Not Found (404) Response")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}else{
+				msoLogger.debug("Generic Query Received a BAD REST Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetService ObtainServiceInstanceUrlById method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlById")
+		}
+		msoLogger.trace("COMPLETED GenericGetService ObtainServiceInstanceUrlById Process")
+	}
+
+	/**
+	 * This method obtains the Url to the provided service instance
+	 * using the Service Instance Name.
+	 *
+	 * @param - execution
+	 */
+	public void obtainServiceInstanceUrlByName(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService ObtainServiceInstanceUrlByName Process")
+		try {
+			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")
+			msoLogger.debug(" Querying Node for Service-Instance URL by using Service-Instance Name " + serviceInstanceName)
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-name:EQUALS:${serviceInstanceName}"
+
+			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property
+			String url = "${path}"
+			execution.setVariable("GENGS_obtainSIUrlPath", url)
+
+			msoLogger.debug("GenericGetService AAI Endpoint: " + aai_endpoint)
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)
+			msoLogger.debug("  GET Service Instance response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("  Query for Service Instance Url Received a Good Response Code")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				if(utils.nodeExists(aaiResponse, "result-data")){
+					msoLogger.debug("Query for Service Instance Url Response Does Contain Data" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					String resourceLink = utils.getNodeText(aaiResponse, "resource-link")
+					execution.setVariable("GENGS_resourceLink", resourceLink)
+					execution.setVariable("GENGS_siResourceLink", resourceLink)
+				}else{
+					msoLogger.debug("Query for Service Instance Url Response Does NOT Contains Data" )
+					execution.setVariable("WorkflowResponse", "  ") //for junits
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("  Query for Service Instance Received a Not Found (404) Response")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}else{
+				msoLogger.debug("Query for Service Instance Received a BAD REST Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetService ObtainServiceInstanceUrlByName method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlByName")
+		}
+		msoLogger.trace("COMPLETED GenericGetService ObtainServiceInstanceUrlByName Process")
+	}
+
+
+	/**
+	 * This method executes a GET call to AAI to obtain the
+	 * service-instance or service-subscription
+	 *
+	 * @param - execution
+	 */
+	public void getServiceObject(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService GetServiceObject Process")
+		try {
+			String type = execution.getVariable("GENGS_type")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String serviceEndpoint = ""
+
+			msoLogger.debug("GenericGetService getServiceObject AAI Endpoint: " + aai_endpoint)
+			if(type.equalsIgnoreCase("service-instance")){
+				String siResourceLink = execution.getVariable("GENGS_resourceLink")
+				if(isBlank(siResourceLink)){
+					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+					msoLogger.debug(" Incoming GENGS_serviceInstanceId is: " + serviceInstanceId)
+					String serviceType = execution.getVariable("GENGS_serviceType")
+					msoLogger.debug(" Incoming GENGS_serviceType is: " + serviceType)
+					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+					msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+
+					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+					msoLogger.debug('AAI URI is: ' + aai_uri)
+					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")
+				}else{
+					msoLogger.debug("Incoming Service Instance Url is: " + siResourceLink)
+					String[] split = siResourceLink.split("/aai/")
+					serviceEndpoint = "/aai/" + split[1]
+				}
+			}else if(type.equalsIgnoreCase("allotted-resource")){
+				String siResourceLink = execution.getVariable("GENGS_resourceLink")
+				if(isBlank(siResourceLink)){
+					String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+					msoLogger.debug(" Incoming GENGS_allottedResourceId is: " + allottedResourceId)
+					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+					msoLogger.debug(" Incoming GENGS_serviceInstanceId is: " + serviceInstanceId)
+					String serviceType = execution.getVariable("GENGS_serviceType")
+					msoLogger.debug(" Incoming GENGS_serviceType is: " + serviceType)
+					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+					msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+
+					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+					msoLogger.debug('AAI URI is: ' + aai_uri)
+					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") +  "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")
+				}else{
+					msoLogger.debug("Incoming Allotted-Resource Url is: " + siResourceLink)
+					String[] split = siResourceLink.split("/aai/")
+					serviceEndpoint = "/aai/" + split[1]
+				}
+			}else if(type.equalsIgnoreCase("service-subscription")){
+				String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+				String serviceType = execution.getVariable("GENGS_serviceType")
+				serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")
+			}
+
+			String serviceUrl = "${aai_endpoint}" + serviceEndpoint
+
+			execution.setVariable("GENGS_getServiceUrl", serviceUrl)
+			msoLogger.debug("GET Service AAI Path is: \n" + serviceUrl)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, serviceUrl)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_getServiceResponseCode", responseCode)
+			msoLogger.debug("  GET Service response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_getServiceResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			//Process Response
+			if(responseCode == 200 || responseCode == 202){
+				msoLogger.debug("GET Service Received a Good Response Code")
+				if(utils.nodeExists(aaiResponse, "service-instance") || utils.nodeExists(aaiResponse, "service-subscription")){
+					msoLogger.debug("GET Service Response Contains a service-instance" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					execution.setVariable("GENGS_service", aaiResponse)
+					execution.setVariable("WorkflowResponse", aaiResponse)
+
+				}else{
+					msoLogger.debug("GET Service Response Does NOT Contain Data" )
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("GET Service Received a Not Found (404) Response")
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}
+			else{
+				msoLogger.debug("  GET Service Received a Bad Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered within GenericGetService GetServiceObject method!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GenericGetService")
+		}
+		msoLogger.trace("COMPLETED GenericGetService GetServiceObject Process")
+	}
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CustomE2EPutService.groovy
index 2c42ef03b3..43d540cc74 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CustomE2EPutService.groovy
@@ -8,9 +8,9 @@
  * 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.
@@ -18,7 +18,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.scripts
+
+package org.onap.so.bpmn.common.scripts
 
 import static org.apache.commons.lang3.StringUtils.*;
 
@@ -27,14 +28,17 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.apache.commons.codec.binary.Base64
 import org.apache.commons.lang3.*
 
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-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.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.rest.APIResponse;
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
 
 import java.net.URLEncoder;
 import org.springframework.web.util.UriUtils
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
 
 /**
  * This class supports the GenericPutService Sub Flow.
@@ -73,22 +77,22 @@ import org.springframework.web.util.UriUtils
 
 
 class CustomE2EPutService extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CustomE2EPutService.class);
 
 	String Prefix = "GENPS_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 
 
 	public void preProcessRequest(DelegateExecution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED GenericPutService PreProcessRequest Process*** ", isDebugEnabled)
+		msoLogger.trace("STARTED GenericPutService PreProcessRequest Process")
 
 		execution.setVariable("GENPS_SuccessIndicator", false)
 
 		try{
 			// Get Variables
 			String requestId = execution.getVariable("GENPS_requestId")
-			utils.log("DEBUG", "Incoming GENPS_requestId is: " + requestId, isDebugEnabled)
+			msoLogger.debug("Incoming GENPS_requestId is: " + requestId)
 
 			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
 			String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
@@ -98,53 +102,53 @@ class CustomE2EPutService extends AbstractServiceTaskProcessor{
 			String type = execution.getVariable("GENPS_type")
 
 			if(type != null){
-				utils.log("DEBUG", "Incoming GENPS_type is: " + type, isDebugEnabled)
+				msoLogger.debug("Incoming GENPS_type is: " + type)
 				if(type.equalsIgnoreCase("service-instance")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId)){
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
 					}
 				}else if(type.equalsIgnoreCase("service-subscription")){
 					if(isBlank(serviceType) || isBlank(globalSubscriberId)){
-						utils.log("DEBUG", "Incoming ServiceType or GlobalSubscriberId is null. These variables are required to create a service-subscription.", isDebugEnabled)
+						msoLogger.debug("Incoming ServiceType or GlobalSubscriberId is null. These variables are required to create a service-subscription.")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
 					}else{
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
 					}
 				}else if(type.equalsIgnoreCase("allotted-resource")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId) || isBlank(allottedResourceId)){
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
 					}
 				}else if(type.equalsIgnoreCase("tunnel-xconnect")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId) || isBlank(allottedResourceId) || isBlank(tunnelXconnectId)){
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Tunnel Xconnect Id is: " + tunnelXconnectId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Tunnel Xconnect Id is: " + tunnelXconnectId)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Tunnel Xconnect Id is: " + tunnelXconnectId, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Tunnel Xconnect Id is: " + tunnelXconnectId)
 					}
 				}else{
 					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")
@@ -154,14 +158,14 @@ class CustomE2EPutService extends AbstractServiceTaskProcessor{
 			}
 
 		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			msoLogger.debug("Rethrowing MSOWorkflowException")
 			throw b
 		}catch(Exception e){
-			utils.log("ERROR", " Error encountered within GenericPutService PreProcessRequest method!" + e, isDebugEnabled)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericPutService PreProcessRequest method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericPutService PreProcessRequest")
 
 		}
-		utils.log("DEBUG", "*** COMPLETED GenericPutService PreProcessRequest Process ***", isDebugEnabled)
+		msoLogger.trace("COMPLETED GenericPutService PreProcessRequest Process ")
 
 	}
 
@@ -175,35 +179,34 @@ class CustomE2EPutService extends AbstractServiceTaskProcessor{
 	 *
 	 */
 	public void putServiceInstance(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED GenericPutService PutServiceInstance method*** ", isDebugEnabled)
+		msoLogger.trace("STARTED GenericPutService PutServiceInstance method")
 		try {
 			String type = execution.getVariable("GENPS_type")
 
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
-			logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
 			String namespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
-			logDebug('AAI namespace is: ' + namespace, isDebugEnabled)
+			msoLogger.debug('AAI namespace is: ' + namespace)
 
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
 			String serviceAaiPath = ""
 			String payload = execution.getVariable("GENPS_payload")
 			execution.setVariable("GENPS_payload", payload)
-			utils.log("DEBUG", "Incoming GENPS_payload is: " + payload, isDebugEnabled)
-			utils.logAudit(payload)
+			msoLogger.debug("Incoming GENPS_payload is: " + payload)
+			msoLogger.debug(payload)
 
 			String serviceType = execution.getVariable("GENPS_serviceType")
-			utils.log("DEBUG", " Incoming GENPS_serviceType is: " + serviceType, isDebugEnabled)
+			msoLogger.debug(" Incoming GENPS_serviceType is: " + serviceType)
 			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
-			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+			msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
 
 			// This IF clause is if we need to create a new Service Instance
 			if(type.equalsIgnoreCase("service-instance")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + URLEncoder.encode(serviceInstanceId,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")
@@ -215,41 +218,40 @@ class CustomE2EPutService extends AbstractServiceTaskProcessor{
 			}else if(type.equalsIgnoreCase("allotted-resource")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
-				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_allottedResourceId is: " + allottedResourceId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") + "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")
 			}else if(type.equalsIgnoreCase("tunnel-xconnect")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
-				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_allottedResourceId is: " + allottedResourceId)
 				String tunnelXconnectId = execution.getVariable("GENPS_tunnelXconnectId")
-				utils.log("DEBUG", " Incoming GENPS_tunnelXconnectId is: " + tunnelXconnectId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_tunnelXconnectId is: " + tunnelXconnectId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") + "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8") + "/tunnel-xconnects/tunnel-xconnect/" + UriUtils.encode(tunnelXconnectId,"UTF-8")
 			}
 
 			String resourceVersion = execution.getVariable("GENPS_serviceResourceVersion")
-			utils.log("DEBUG", "Incoming Resource Version is: " + resourceVersion, isDebugEnabled)
+			msoLogger.debug("Incoming Resource Version is: " + resourceVersion)
 			if(resourceVersion !=null){
 				serviceAaiPath = serviceAaiPath +'?resource-version=' + UriUtils.encode(resourceVersion,"UTF-8")
 			}
 
 			execution.setVariable("GENPS_putServiceInstanceAaiPath", serviceAaiPath)
-			utils.log("DEBUG", "PUT Service Instance AAI Path is: " + "\n" + serviceAaiPath, isDebugEnabled)
+			msoLogger.debug("PUT Service Instance AAI Path is: " + "\n" + serviceAaiPath)
 
 			APIResponse response = aaiUriUtil.executeAAIPutCall(execution, serviceAaiPath, payload)
 			int responseCode = response.getStatusCode()
 			execution.setVariable("GENPS_putServiceInstanceResponseCode", responseCode)
-			utils.log("DEBUG", "  Put Service Instance response code is: " + responseCode, isDebugEnabled)
+			msoLogger.debug("  Put Service Instance response code is: " + responseCode)
 
 			String aaiResponse = response.getResponseBodyAsString()
-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)
 			execution.setVariable("GENPS_putServiceInstanceResponse", aaiResponse)
 
 
@@ -257,23 +259,23 @@ class CustomE2EPutService extends AbstractServiceTaskProcessor{
 			if(responseCode == 200 || responseCode == 201 || responseCode == 202 )
 				//200 OK 201 CREATED 202 ACCEPTED
 			{
-				utils.log("DEBUG", "PUT Service Instance Received a Good Response", isDebugEnabled)
+				msoLogger.debug("PUT Service Instance Received a Good Response")
 				execution.setVariable("GENPS_SuccessIndicator", true)
 			}
 
 			else{
-				utils.log("DEBUG", "Put Generic Service Instance Received a Bad Response Code. Response Code is: " + responseCode, isDebugEnabled)
+				msoLogger.debug("Put Generic Service Instance Received a Bad Response Code. Response Code is: " + responseCode)
 				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
 				throw new BpmnError("MSOWorkflowException")
 			}
 		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			msoLogger.debug("Rethrowing MSOWorkflowException")
 			throw b
 		}catch(Exception e){
-			utils.log("ERROR", " Error encountered within GenericPutService PutServiceInstance method!" + e, isDebugEnabled)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericPutService PutServiceInstance method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Put Service Instance")
 		}
-		utils.log("DEBUG", " *** COMPLETED GenericPutService PutServiceInstance Process*** ", isDebugEnabled)
+		msoLogger.trace("COMPLETED GenericPutService PutServiceInstance Process")
 	}
 
 
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/DecomposeService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DecomposeService.groovy
index 7a81ce519e..739bc4b7ed 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/DecomposeService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DecomposeService.groovy
@@ -7,9 +7,9 @@
  * 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.
@@ -17,26 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.scripts
 
-import org.openecomp.mso.bpmn.core.json.DecomposeJsonUtil;
+package org.onap.so.bpmn.common.scripts
 
 import static org.apache.commons.lang3.StringUtils.*;
 
-
 import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.json.JSONObject;
-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.core.domain.ServiceDecomposition
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-
-import com.att.ecomp.mso.bpmn.core.domain.*
-
-import groovy.json.*
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.json.DecomposeJsonUtil;
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.logger.MsoLogger
 
 /**
  * This groovy class supports the <class>DecomposeService.bpmn</class> process.
@@ -58,6 +51,8 @@ import groovy.json.*
  *
  */
 public class DecomposeService extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, DecomposeService.class);
+
 
 	String Prefix="DDS_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
@@ -65,10 +60,9 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 	JsonUtils jsonUtils = new JsonUtils()
 
 	public void preProcessRequest (DelegateExecution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		String msg = ""
-		utils.log("DEBUG"," ***** preProcessRequest of DecomposeService *****",  isDebugEnabled)
-		setBasicDBAuthHeader(execution, isDebugEnabled)
+		msoLogger.trace("preProcessRequest of DecomposeService ")
+		setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
 
 		try {
 			execution.setVariable("prefix", Prefix)
@@ -89,16 +83,15 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			msoLogger.debug(msg)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest of DecomposeService *****",  isDebugEnabled)
+		msoLogger.trace("Exit preProcessRequest of DecomposeService ")
 	}
 
 	public void queryCatalogDb (DelegateExecution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		String msg = ""
-		utils.log("DEBUG"," ***** queryCatalogDB of DecomposeService *****",  isDebugEnabled)
+		msoLogger.trace("queryCatalogDB of DecomposeService ")
 
 		try {
 
@@ -107,8 +100,8 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 			String serviceModelUuid = execution.getVariable("DDS_serviceModelUuid")
 			String modelVersion = execution.getVariable("DDS_modelVersion")
 
-			utils.log("DEBUG", "serviceModelInvariantId: " + serviceModelInvariantId, isDebugEnabled)
-			utils.log("DEBUG", "modelVersion: " + modelVersion, isDebugEnabled)
+			msoLogger.debug("serviceModelInvariantId: " + serviceModelInvariantId)
+			msoLogger.debug("modelVersion: " + modelVersion)
 
 			JSONObject catalogDbResponse = null
             if(serviceModelUuid != null && serviceModelUuid.length() > 0)
@@ -120,31 +113,30 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 
 			if (catalogDbResponse == null || catalogDbResponse.toString().equalsIgnoreCase("null")) {
 				msg = "No data found in Catalog DB"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				msoLogger.debug(msg)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 			}
 
 			String catalogDbResponseString = catalogDbResponse.toString()
 
 			execution.setVariable("DDS_catalogDbResponse", catalogDbResponseString)
-			utils.log("DEBUG", "catalog DB response string: "+ catalogDbResponseString, isDebugEnabled)
+			msoLogger.debug("catalog DB response string: "+ catalogDbResponseString)
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in queryCatalogDb " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			msoLogger.debug(msg)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit queryCatalogDb of DecomposeService *****",  isDebugEnabled)
+		msoLogger.trace("Exit queryCatalogDb of DecomposeService ")
 	}
 
 
 
 	public void actuallyDecomposeService (DelegateExecution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		String msg = ""
-		utils.log("DEBUG"," ***** actuallyDecomposeService of DecomposeService *****",  isDebugEnabled)
+		msoLogger.trace("actuallyDecomposeService of DecomposeService ")
 
 		try {
 
@@ -153,9 +145,9 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			String serviceModelInvariantId = execution.getVariable("DDS_serviceModelInvariantId")
 
-			utils.log("DEBUG", "serviceModelInvariantId: " + serviceModelInvariantId, isDebugEnabled)
+			msoLogger.debug("serviceModelInvariantId: " + serviceModelInvariantId)
 
-			utils.log("DEBUG", "getting service decomposition", isDebugEnabled)
+			msoLogger.debug("getting service decomposition")
 
 			String catalogDbResponse = execution.getVariable("DDS_catalogDbResponse")
 			ServiceDecomposition serviceDecomposition = DecomposeJsonUtil.jsonToServiceDecomposition(catalogDbResponse, serviceInstanceId)
@@ -163,16 +155,16 @@ public class DecomposeService extends AbstractServiceTaskProcessor {
 			execution.setVariable("serviceDecomposition", serviceDecomposition)
 			execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonString())
 
-			utils.log("DEBUG", "service decomposition: "+ serviceDecomposition.toJsonString(), isDebugEnabled)
+			msoLogger.debug("service decomposition: "+ serviceDecomposition.toJsonString())
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in actuallyDecomposeService " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			msoLogger.debug(msg)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit actuallyDecomposeService of DecomposeService *****",  isDebugEnabled)
+		msoLogger.trace("Exit actuallyDecomposeService of DecomposeService ")
 	}
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/DeleteAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DeleteAAIVfModule.groovy
index 54e3da54d2..bb9846c112 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/DeleteAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/DeleteAAIVfModule.groovy
@@ -1,350 +1,335 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-import org.camunda.bpm.engine.delegate.DelegateExecution

-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;

-

-

-public class DeleteAAIVfModule extends AbstractServiceTaskProcessor{

-	

-	def Prefix="DAAIVfMod_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-    private MsoUtils utils = new MsoUtils()

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable("prefix",Prefix)

-		execution.setVariable("DAAIVfMod_vnfId",null)

-		execution.setVariable("DAAIVfMod_vnfName",null)

-		execution.setVariable("DAAIVfMod_genVnfRsrcVer",null)

-		execution.setVariable("DAAIVfMod_vfModuleId",null)

-		execution.setVariable("DAAIVfMod_vfModRsrcVer",null)

-		execution.setVariable("DAAIVfMod_genericVnfEndpoint",null)

-		execution.setVariable("DAAIVfMod_vfModuleEndpoint",null)

-		execution.setVariable("DAAIVfMod_moduleExists",false)

-		execution.setVariable("DAAIVfMod_isBaseModule", false)

-		execution.setVariable("DAAIVfMod_isLastModule", false)

-

-		// DeleteAAIVfModule workflow response variable placeholders

-		execution.setVariable("DAAIVfMod_queryGenericVnfResponseCode",null)

-		execution.setVariable("DAAIVfMod_queryGenericVnfResponse","")

-		execution.setVariable("DAAIVfMod_parseModuleResponse","")

-		execution.setVariable("DAAIVfMod_deleteGenericVnfResponseCode",null)

-		execution.setVariable("DAAIVfMod_deleteGenericVnfResponse","")

-		execution.setVariable("DAAIVfMod_deleteVfModuleResponseCode",null)

-		execution.setVariable("DAAIVfMod_deleteVfModuleResponse","")

-

-	}

-	

-	// parse the incoming DELETE_VF_MODULE request and store the Generic Vnf

-	// and Vf Module Ids in the flow DelegateExecution

-	public void preProcessRequest(DelegateExecution execution) {

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

-		def xml = execution.getVariable("DeleteAAIVfModuleRequest")

-		utils.logAudit("DeleteAAIVfModule Request: " + xml)

-		utils.log("DEBUG", "input request xml:" + xml, isDebugEnabled)

-		initProcessVariables(execution)

-		def vnfId = utils.getNodeText(xml,"vnf-id")

-		def vfModuleId = utils.getNodeText(xml,"vf-module-id")

-		execution.setVariable("DAAIVfMod_vnfId", vnfId)

-		execution.setVariable("DAAIVfMod_vfModuleId", vfModuleId)

-		

-		AaiUtil aaiUriUtil = new AaiUtil(this)

-		def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-		logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-		

-		execution.setVariable("DAAIVfMod_genericVnfEndpoint", "${aai_uri}/" + vnfId)

-		execution.setVariable("DAAIVfMod_vfModuleEndpoint", "${aai_uri}/" + vnfId +

-			 "/vf-modules/vf-module/" + vfModuleId)

-	}

-	

-	// send a GET request to AA&I to retrieve the Generic Vnf/Vf Module information based on a Vnf Id

-	// expect a 200 response with the information in the response body or a 404 if the Generic Vnf does not exist

-	public void queryAAIForGenericVnf(DelegateExecution execution) {

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

-		def delModuleId = execution.getVariable("DAAIVfMod_vfModuleId")

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("DAAIVfMod_genericVnfEndpoint") + "?depth=1"

-		utils.logAudit("DeleteAAIVfModule endPoint: " + endPoint)

-		def aaiRequestId = utils.getRequestID()

-

-		RESTConfig config = new RESTConfig(endPoint);

-		utils.log("DEBUG","queryAAIForGenericVnf() endpoint-" + endPoint, isDebugEnabled)

-		def responseData = ""

-		try {

-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").

-				addHeader("Accept","application/xml");

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-				

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			utils.log("DEBUG", "invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint,isDebugEnabled)

-			APIResponse response = client.httpGet()

-			utils.logAudit("DeleteAAIVfModule - invoking httpGet to AAI")

-

-			responseData = response.getResponseBodyAsString()

-			execution.setVariable("DAAIVfMod_queryGenericVnfResponseCode", response.getStatusCode())

-			execution.setVariable("DAAIVfMod_queryGenericVnfResponse", responseData)

-			utils.logAudit("AAI Response: " + responseData)

-			utils.log("DEBUG", "Response code:" + response.getStatusCode(), isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Exception occurred while executing AAI GET:" + ex.getMessage(),isDebugEnabled)

-			execution.setVariable("DAAIVfMod_queryGenericVnfResponse", "AAI GET Failed:" + ex.getMessage())

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during queryAAIForGenericVnf")

-

-		}

-	}

-	

-	// construct and send a DELETE request to A&AI to delete a Generic Vnf

-	// note: to get here, all the modules associated with the Generic Vnf must already be deleted

-	public void deleteGenericVnf(DelegateExecution execution) {

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

-		def aaiRequestId = utils.getRequestID()

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("DAAIVfMod_genericVnfEndpoint") +

-			"/?resource-version=" + execution.getVariable("DAAIVfMod_genVnfRsrcVer")

-		utils.logAudit("AAI endPoint: " + endPoint)

-		RESTConfig config = new RESTConfig(endPoint);

-		utils.log("DEBUG","deleteGenericVnf() endpoint-" + endPoint, isDebugEnabled)

-		def responseData = ""

-		try {

-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").

-				addHeader("Accept","application/xml");

-			

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-					

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			APIResponse response = client.httpDelete()

-				

-			responseData = response.getResponseBodyAsString()

-			execution.setVariable("DAAIVfMod_deleteGenericVnfResponseCode", response.getStatusCode())

-			execution.setVariable("DAAIVfMod_deleteGenericVnfResponse", responseData)

-			utils.log("DEBUG", "Response code:" + response.getStatusCode(), isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-		} catch (Exception ex) {

-			ex.printStackTrace()

-			utils.log("DEBUG", "Exception occurred while executing AAI DELETE:" + ex.getMessage(),isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during deleteGenericVnf")

-		}

-	}

-

-	// construct and send a DELETE request to A&AI to delete the Base or Add-on Vf Module

-	public void deleteVfModule(DelegateExecution execution) {

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

-		def endPoint = execution.getVariable("URN_aai_endpoint") + execution.getVariable("DAAIVfMod_vfModuleEndpoint") +

-			"/?resource-version=" + execution.getVariable("DAAIVfMod_vfModRsrcVer")

-		def aaiRequestId = utils.getRequestID()

-

-		RESTConfig config = new RESTConfig(endPoint);

-		utils.log("DEBUG","deleteVfModule() endpoint-" + endPoint, isDebugEnabled)

-		def responseData = ""

-		try {

-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").

-				addHeader("Accept","application/xml");

-			

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-					

-			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-				client.addAuthorizationHeader(basicAuthCred)

-			}

-			APIResponse response = client.httpDelete()

-			

-			utils.logAudit("DeleteAAIVfModule - invoking httpDelete to AAI")

-			

-			responseData = response.getResponseBodyAsString()

-			execution.setVariable("DAAIVfMod_deleteVfModuleResponseCode", response.getStatusCode())

-			execution.setVariable("DAAIVfMod_deleteVfModuleResponse", responseData)

-			utils.logAudit("DeleteAAIVfModule - AAI Response" + responseData)

-			utils.log("DEBUG", "Response code:" + response.getStatusCode(), isDebugEnabled)

-			utils.log("DEBUG", "Response:" + System.lineSeparator()+responseData,isDebugEnabled)

-

-		} catch (Exception ex) {

-			ex.printStackTrace()

-			utils.log("DEBUG", "Exception occurred while executing AAI PUT:" + ex.getMessage(),isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during deleteVfModule")

-		}

-	}

-	

-	// parses the output from the result from queryAAIForGenericVnf() to determine if the Vf Module

-	// to be deleted exists for the specified Generic Vnf and if it is the Base Module,

-	// there are no Add-on Modules present

-	public void parseForVfModule(DelegateExecution execution) {

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

-		def xml = execution.getVariable("DAAIVfMod_queryGenericVnfResponse")

-		utils.logAudit("DeleteAAIVfModule - queryGenericVnfResponse" + xml)

-		

-		def delModuleId = execution.getVariable("DAAIVfMod_vfModuleId")

-		utils.log("DEBUG", "Vf Module to be deleted: " + delModuleId, isDebugEnabled)

-		List <String> qryModuleIdList = utils.getMultNodes(xml, "vf-module-id")

-		List <String> qryBaseModuleList = utils.getMultNodes(xml, "is-base-vf-module")

-		List <String> qryResourceVerList = utils.getMultNodes(xml, "resource-version")

-		execution.setVariable("DAAIVfMod_moduleExists", false)

-		execution.setVariable("DAAIVfMod_isBaseModule", false)

-		execution.setVariable("DAAIVfMod_isLastModule", false)

-		//

-		def isBaseVfModule = "false"

-		// loop through the Vf Module Ids looking for a match

-		if (qryModuleIdList != null && !qryModuleIdList.empty) {

-			utils.log("DEBUG", "Existing Vf Module Id List: " + qryModuleIdList, isDebugEnabled)

-			utils.log("DEBUG", "Existing Vf Module Resource Version List: " + qryResourceVerList, isDebugEnabled)

-			def moduleCntr = 0

-			// the Generic Vnf resource-version in the 1st entry in the query response

-			execution.setVariable("DAAIVfMod_genVnfRsrcVer", qryResourceVerList[moduleCntr])

-			for (String qryModuleId : qryModuleIdList) {

-				if (delModuleId.equals(qryModuleId)) {

-					// a Vf Module with the requested Id exists

-					execution.setVariable("DAAIVfMod_moduleExists", true)

-					// find the corresponding value for the is-base-vf-module field

-					isBaseVfModule = qryBaseModuleList[moduleCntr]

-					// find the corresponding value for the resource-version field

-					// note: the Generic Vnf entry also has a resource-version field, so

-					//       add 1 to the index to get the corresponding Vf Module value

-					execution.setVariable("DAAIVfMod_vfModRsrcVer", qryResourceVerList[moduleCntr+1])

-					utils.log("DEBUG", "Match found for Vf Module Id " + qryModuleId + " for Generic Vnf Id " +

-						execution.getVariable("DAAIVfMod_vnfId") + ", Base Module is " + isBaseVfModule +

-						", Resource Version is " + execution.getVariable("vfModRsrcVer"), isDebugEnabled)

-					break

-				}

-				moduleCntr++

-			}

-		}

-		

-		// determine if the module to be deleted is a Base Module and/or the Last Module

-		if (execution.getVariable("DAAIVfMod_moduleExists") == true) {

-			if (isBaseVfModule.equals("true") && qryModuleIdList.size() != 1) {

-				execution.setVariable("DAAIVfMod_parseModuleResponse",

-					"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +

-					execution.getVariable("DAAIVfMod_vnfId") + ": is Base Module, not Last Module")

-				execution.setVariable("DAAIVfMod_isBaseModule", true)

-			} else {

-				if (isBaseVfModule.equals("true") && qryModuleIdList.size() == 1) {

-					execution.setVariable("DAAIVfMod_parseModuleResponse",

-						"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +

-						execution.getVariable("DAAIVfMod_vnfId") + ": is Base Module and Last Module")

-					execution.setVariable("DAAIVfMod_isBaseModule", true)

-					execution.setVariable("DAAIVfMod_isLastModule", true)

-				} else {

-					if (qryModuleIdList.size() == 1) {

-						execution.setVariable("DAAIVfMod_parseModuleResponse",

-							"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +

-							execution.getVariable("DAAIVfMod_vnfId") + ": is Not Base Module, is Last Module")

-						execution.setVariable("DAAIVfMod_isLastModule", true)

-					} else {

-					execution.setVariable("DAAIVfMod_parseModuleResponse",

-						"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +

-						execution.getVariable("DAAIVfMod_vnfId") + ": is Not Base Module and Not Last Module")

-					}

-				}

-			}

-			utils.log("DEBUG", execution.getVariable("DAAIVfMod_parseModuleResponse"), isDebugEnabled)

-		} else { // (execution.getVariable("DAAIVfMod_moduleExists") == false)

-			utils.log("DEBUG", "Vf Module Id " + delModuleId + " does not exist for Generic Vnf Id " +

-				 execution.getVariable("DAAIVfMod_vnfId"), isDebugEnabled)

-			execution.setVariable("DAAIVfMod_parseModuleResponse",

-				"Vf Module Id " + delModuleId + " does not exist for Generic Vnf Id " +

-				execution.getVariable("DAAIVfMod_vnfName"))

-		}

-	}

-	

-	// parses the output from the result from queryAAIForGenericVnf() to determine if the Vf Module

-	// to be deleted exists for the specified Generic Vnf and if it is the Base Module,

-	// there are no Add-on Modules present

-	public void parseForResourceVersion(DelegateExecution execution) {

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

-		def xml = execution.getVariable("DAAIVfMod_queryGenericVnfResponse")

-		utils.logAudit("DeleteAAIVfModule - queryGenericVnfResponse" + xml)

-		String resourceVer = utils.getNodeText1(xml, "resource-version")

-		execution.setVariable("DAAIVfMod_genVnfRsrcVer", resourceVer)

-		utils.log("DEBUG", "Latest Generic VNF Resource Version: " + resourceVer)

-	}

-	

-	

-	// generates a WorkflowException if the A&AI query returns a response code other than 200

-	public void handleAAIQueryFailure(DelegateExecution execution) {

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

-		

-		utils.log("ERROR", "Error occurred attempting to query AAI, Response Code " +

-			execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") + ", Error Response " +

-			execution.getVariable("DAAIVfMod_queryGenericVnfResponse"), isDebugEnabled)

-		def errorCode = 5000

-		// set the errorCode to distinguish between a A&AI failure

-		// and the Generic Vnf Id not found

-		if (execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") == 404) {

-			errorCode = 1002

-		}

-		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, execution.getVariable("DAAIVfMod_queryGenericVnfResponse"))

-	}

-	

-	// generates a WorkflowException if

-	//		- the A&AI Vf Module DELETE returns a response code other than 200

-	// 		- the Vf Module is a Base Module that is not the last Vf Module

-	//		- the Vf Module does not exist for the Generic Vnf

-	public void handleDeleteVfModuleFailure(DelegateExecution execution) {

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

-		

-		def errorCode = 2000

-		def errorResponse = ""

-		if (execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") != null &&

-			execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") != 200) {

-			utils.log("DEBUG", "AAI failure deleting a Vf Module: " +

-				execution.getVariable("DAAIVfMod_deleteVfModuleResponse"), isDebugEnabled)

-			errorResponse = execution.getVariable("DAAIVfMod_deleteVfModuleResponse")

-			utils.logAudit("DeleteAAIVfModule - deleteVfModuleResponse" + errorResponse)

-			errorCode = 5000

-		} else {

-			if (execution.getVariable("DAAIVfMod_isBaseModule", true) == true &&

-					execution.getVariable("DAAIVfMod_isLastModule") == false) {

-				// attempt to delete a Base Module that is not the last Vf Module

-				utils.log("DEBUG", execution.getVariable("DAAIVfMod_parseModuleResponse"), isDebugEnabled)

-				errorResponse = execution.getVariable("DAAIVfMod_parseModuleResponse")

-				utils.logAudit("DeleteAAIVfModule - parseModuleResponse" + errorResponse)

-				errorCode = 1002

-			} else {

-				// attempt to delete a non-existant Vf Module

-				if (execution.getVariable("DAAIVfMod_moduleExists") == false) {

-					utils.log("DEBUG", execution.getVariable("DAAIVfMod_parseModuleResponse"), isDebugEnabled)

-					errorResponse = execution.getVariable("DAAIVfMod_parseModuleResponse")

-					utils.logAudit("DeleteAAIVfModule - parseModuleResponse" + errorResponse)

-					errorCode = 1002

-				} else {

-					// if the responses get populated corerctly, we should never get here

-					errorResponse = "Unknown error occurred during DeleteAAIVfModule flow"

-				}

-			}

-		}

-

-		utils.log("ERROR", "Error occurred during DeleteAAIVfModule flow: " + errorResponse, isDebugEnabled)

-		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, errorResponse)

-

-	}

-

-	// generates a WorkflowException if

-	//		- the A&AI Generic Vnf DELETE returns a response code other than 200

-	public void handleDeleteGenericVnfFailure(DelegateExecution execution) {

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

-		utils.log("ERROR", "AAI error occurred deleting the Generic Vnf: "

-			+ execution.getVariable("DAAIVfMod_deleteGenericVnfResponse"), isDebugEnabled)

-		exceptionUtil.buildAndThrowWorkflowException(execution, 5000, execution.getVariable("DAAIVfMod_deleteGenericVnfResponse"))

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient;
+import org.onap.so.rest.RESTConfig;
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+public class DeleteAAIVfModule extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, DeleteAAIVfModule.class);
+
+	def Prefix="DAAIVfMod_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+    private MsoUtils utils = new MsoUtils()
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		execution.setVariable("DAAIVfMod_vnfId",null)
+		execution.setVariable("DAAIVfMod_vnfName",null)
+		execution.setVariable("DAAIVfMod_genVnfRsrcVer",null)
+		execution.setVariable("DAAIVfMod_vfModuleId",null)
+		execution.setVariable("DAAIVfMod_vfModRsrcVer",null)
+		execution.setVariable("DAAIVfMod_genericVnfEndpoint",null)
+		execution.setVariable("DAAIVfMod_vfModuleEndpoint",null)
+		execution.setVariable("DAAIVfMod_moduleExists",false)
+		execution.setVariable("DAAIVfMod_isBaseModule", false)
+		execution.setVariable("DAAIVfMod_isLastModule", false)
+
+		// DeleteAAIVfModule workflow response variable placeholders
+		execution.setVariable("DAAIVfMod_queryGenericVnfResponseCode",null)
+		execution.setVariable("DAAIVfMod_queryGenericVnfResponse","")
+		execution.setVariable("DAAIVfMod_parseModuleResponse","")
+		execution.setVariable("DAAIVfMod_deleteGenericVnfResponseCode",null)
+		execution.setVariable("DAAIVfMod_deleteGenericVnfResponse","")
+		execution.setVariable("DAAIVfMod_deleteVfModuleResponseCode",null)
+		execution.setVariable("DAAIVfMod_deleteVfModuleResponse","")
+
+	}
+	
+	// parse the incoming DELETE_VF_MODULE request and store the Generic Vnf
+	// and Vf Module Ids in the flow DelegateExecution
+	public void preProcessRequest(DelegateExecution execution) {
+		def xml = execution.getVariable("DeleteAAIVfModuleRequest")
+		msoLogger.debug("DeleteAAIVfModule Request: " + xml)
+		msoLogger.debug("input request xml:" + xml)
+		initProcessVariables(execution)
+		def vnfId = utils.getNodeText(xml,"vnf-id")
+		def vfModuleId = utils.getNodeText(xml,"vf-module-id")
+		execution.setVariable("DAAIVfMod_vnfId", vnfId)
+		execution.setVariable("DAAIVfMod_vfModuleId", vfModuleId)
+		
+		AaiUtil aaiUriUtil = new AaiUtil(this)
+		def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+		msoLogger.debug('AAI URI is: ' + aai_uri)
+		
+		execution.setVariable("DAAIVfMod_genericVnfEndpoint", "${aai_uri}/" + vnfId)
+		execution.setVariable("DAAIVfMod_vfModuleEndpoint", "${aai_uri}/" + vnfId +
+			 "/vf-modules/vf-module/" + vfModuleId)
+	}
+	
+	// send a GET request to AA&I to retrieve the Generic Vnf/Vf Module information based on a Vnf Id
+	// expect a 200 response with the information in the response body or a 404 if the Generic Vnf does not exist
+	public void queryAAIForGenericVnf(DelegateExecution execution) {
+		def delModuleId = execution.getVariable("DAAIVfMod_vfModuleId")
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("DAAIVfMod_genericVnfEndpoint") + "?depth=1"
+		msoLogger.debug("DeleteAAIVfModule endPoint: " + endPoint)
+		def aaiRequestId = utils.getRequestID()
+
+		RESTConfig config = new RESTConfig(endPoint);
+		msoLogger.debug("queryAAIForGenericVnf() endpoint-" + endPoint)
+		def responseData = ""
+		try {
+			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").
+				addHeader("Accept","application/xml");
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+				
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			msoLogger.debug("invoking GET call to AAI endpoint :"+System.lineSeparator()+endPoint)
+			APIResponse response = client.httpGet()
+			msoLogger.debug("DeleteAAIVfModule - invoking httpGet to AAI")
+
+			responseData = response.getResponseBodyAsString()
+			execution.setVariable("DAAIVfMod_queryGenericVnfResponseCode", response.getStatusCode())
+			execution.setVariable("DAAIVfMod_queryGenericVnfResponse", responseData)
+			msoLogger.debug("AAI Response: " + responseData)
+			msoLogger.debug("Response code:" + response.getStatusCode())
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+		} catch (Exception ex) {
+			msoLogger.debug("Exception occurred while executing AAI GET:" + ex.getMessage())
+			execution.setVariable("DAAIVfMod_queryGenericVnfResponse", "AAI GET Failed:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during queryAAIForGenericVnf")
+
+		}
+	}
+	
+	// construct and send a DELETE request to A&AI to delete a Generic Vnf
+	// note: to get here, all the modules associated with the Generic Vnf must already be deleted
+	public void deleteGenericVnf(DelegateExecution execution) {
+		def aaiRequestId = utils.getRequestID()
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("DAAIVfMod_genericVnfEndpoint") +
+			"/?resource-version=" + execution.getVariable("DAAIVfMod_genVnfRsrcVer")
+		msoLogger.debug("AAI endPoint: " + endPoint)
+		RESTConfig config = new RESTConfig(endPoint);
+		msoLogger.debug("deleteGenericVnf() endpoint-" + endPoint)
+		def responseData = ""
+		try {
+			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").
+				addHeader("Accept","application/xml");
+			
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+					
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			APIResponse response = client.httpDelete()
+				
+			responseData = response.getResponseBodyAsString()
+			execution.setVariable("DAAIVfMod_deleteGenericVnfResponseCode", response.getStatusCode())
+			execution.setVariable("DAAIVfMod_deleteGenericVnfResponse", responseData)
+			msoLogger.debug("Response code:" + response.getStatusCode())
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+		} catch (Exception ex) {
+			ex.printStackTrace()
+			msoLogger.debug("Exception occurred while executing AAI DELETE:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during deleteGenericVnf")
+		}
+	}
+
+	// construct and send a DELETE request to A&AI to delete the Base or Add-on Vf Module
+	public void deleteVfModule(DelegateExecution execution) {
+		def endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + execution.getVariable("DAAIVfMod_vfModuleEndpoint") +
+			"/?resource-version=" + execution.getVariable("DAAIVfMod_vfModRsrcVer")
+		def aaiRequestId = utils.getRequestID()
+
+		RESTConfig config = new RESTConfig(endPoint);
+		msoLogger.debug("deleteVfModule() endpoint-" + endPoint)
+		def responseData = ""
+		try {
+			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", aaiRequestId).addHeader("X-FromAppId", "MSO").
+				addHeader("Accept","application/xml");
+			
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+					
+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+				client.addAuthorizationHeader(basicAuthCred)
+			}
+			APIResponse response = client.httpDelete()
+			
+			msoLogger.debug("DeleteAAIVfModule - invoking httpDelete to AAI")
+			
+			responseData = response.getResponseBodyAsString()
+			execution.setVariable("DAAIVfMod_deleteVfModuleResponseCode", response.getStatusCode())
+			execution.setVariable("DAAIVfMod_deleteVfModuleResponse", responseData)
+			msoLogger.debug("DeleteAAIVfModule - AAI Response" + responseData)
+			msoLogger.debug("Response code:" + response.getStatusCode())
+			msoLogger.debug("Response:" + System.lineSeparator()+responseData)
+
+		} catch (Exception ex) {
+			ex.printStackTrace()
+			msoLogger.debug("Exception occurred while executing AAI PUT:" + ex.getMessage())
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error - Occured during deleteVfModule")
+		}
+	}
+	
+	// parses the output from the result from queryAAIForGenericVnf() to determine if the Vf Module
+	// to be deleted exists for the specified Generic Vnf and if it is the Base Module,
+	// there are no Add-on Modules present
+	public void parseForVfModule(DelegateExecution execution) {
+		def xml = execution.getVariable("DAAIVfMod_queryGenericVnfResponse")
+		msoLogger.debug("DeleteAAIVfModule - queryGenericVnfResponse" + xml)
+		
+		def delModuleId = execution.getVariable("DAAIVfMod_vfModuleId")
+		msoLogger.debug("Vf Module to be deleted: " + delModuleId)
+		List <String> qryModuleIdList = utils.getMultNodes(xml, "vf-module-id")
+		List <String> qryBaseModuleList = utils.getMultNodes(xml, "is-base-vf-module")
+		List <String> qryResourceVerList = utils.getMultNodes(xml, "resource-version")
+		execution.setVariable("DAAIVfMod_moduleExists", false)
+		execution.setVariable("DAAIVfMod_isBaseModule", false)
+		execution.setVariable("DAAIVfMod_isLastModule", false)
+		//
+		def isBaseVfModule = "false"
+		// loop through the Vf Module Ids looking for a match
+		if (qryModuleIdList != null && !qryModuleIdList.empty) {
+			msoLogger.debug("Existing Vf Module Id List: " + qryModuleIdList)
+			msoLogger.debug("Existing Vf Module Resource Version List: " + qryResourceVerList)
+			def moduleCntr = 0
+			// the Generic Vnf resource-version in the 1st entry in the query response
+			execution.setVariable("DAAIVfMod_genVnfRsrcVer", qryResourceVerList[moduleCntr])
+			for (String qryModuleId : qryModuleIdList) {
+				if (delModuleId.equals(qryModuleId)) {
+					// a Vf Module with the requested Id exists
+					execution.setVariable("DAAIVfMod_moduleExists", true)
+					// find the corresponding value for the is-base-vf-module field
+					isBaseVfModule = qryBaseModuleList[moduleCntr]
+					// find the corresponding value for the resource-version field
+					// note: the Generic Vnf entry also has a resource-version field, so
+					//       add 1 to the index to get the corresponding Vf Module value
+					execution.setVariable("DAAIVfMod_vfModRsrcVer", qryResourceVerList[moduleCntr+1])
+					msoLogger.debug("Match found for Vf Module Id " + qryModuleId + " for Generic Vnf Id " + execution.getVariable("DAAIVfMod_vnfId") + ", Base Module is " + isBaseVfModule + ", Resource Version is " + execution.getVariable("vfModRsrcVer"))
+					break
+				}
+				moduleCntr++
+			}
+		}
+		
+		// determine if the module to be deleted is a Base Module and/or the Last Module
+		if (execution.getVariable("DAAIVfMod_moduleExists") == true) {
+			if (isBaseVfModule.equals("true") && qryModuleIdList.size() != 1) {
+				execution.setVariable("DAAIVfMod_parseModuleResponse",
+					"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +
+					execution.getVariable("DAAIVfMod_vnfId") + ": is Base Module, not Last Module")
+				execution.setVariable("DAAIVfMod_isBaseModule", true)
+			} else {
+				if (isBaseVfModule.equals("true") && qryModuleIdList.size() == 1) {
+					execution.setVariable("DAAIVfMod_parseModuleResponse",
+						"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +
+						execution.getVariable("DAAIVfMod_vnfId") + ": is Base Module and Last Module")
+					execution.setVariable("DAAIVfMod_isBaseModule", true)
+					execution.setVariable("DAAIVfMod_isLastModule", true)
+				} else {
+					if (qryModuleIdList.size() == 1) {
+						execution.setVariable("DAAIVfMod_parseModuleResponse",
+							"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +
+							execution.getVariable("DAAIVfMod_vnfId") + ": is Not Base Module, is Last Module")
+						execution.setVariable("DAAIVfMod_isLastModule", true)
+					} else {
+					execution.setVariable("DAAIVfMod_parseModuleResponse",
+						"Found Vf Module Id " + delModuleId + " for Generic Vnf Id " +
+						execution.getVariable("DAAIVfMod_vnfId") + ": is Not Base Module and Not Last Module")
+					}
+				}
+			}
+			msoLogger.debug(execution.getVariable("DAAIVfMod_parseModuleResponse"))
+		} else { // (execution.getVariable("DAAIVfMod_moduleExists") == false)
+			msoLogger.debug("Vf Module Id " + delModuleId + " does not exist for Generic Vnf Id " + execution.getVariable("DAAIVfMod_vnfId"))
+			execution.setVariable("DAAIVfMod_parseModuleResponse",
+				"Vf Module Id " + delModuleId + " does not exist for Generic Vnf Id " +
+				execution.getVariable("DAAIVfMod_vnfName"))
+		}
+	}
+	
+	// parses the output from the result from queryAAIForGenericVnf() to determine if the Vf Module
+	// to be deleted exists for the specified Generic Vnf and if it is the Base Module,
+	// there are no Add-on Modules present
+	public void parseForResourceVersion(DelegateExecution execution) {
+		def xml = execution.getVariable("DAAIVfMod_queryGenericVnfResponse")
+		msoLogger.debug("DeleteAAIVfModule - queryGenericVnfResponse" + xml)
+		String resourceVer = utils.getNodeText(xml, "resource-version")
+		execution.setVariable("DAAIVfMod_genVnfRsrcVer", resourceVer)
+		msoLogger.debug("Latest Generic VNF Resource Version: " + resourceVer)
+	}
+	
+	
+	// generates a WorkflowException if the A&AI query returns a response code other than 200
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Error occurred attempting to query AAI, Response Code " + execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") + ", Error Response " + execution.getVariable("DAAIVfMod_queryGenericVnfResponse"), "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+		def errorCode = 5000
+		// set the errorCode to distinguish between a A&AI failure
+		// and the Generic Vnf Id not found
+		if (execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") == 404) {
+			errorCode = 1002
+		}
+		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, execution.getVariable("DAAIVfMod_queryGenericVnfResponse"))
+	}
+	
+	// generates a WorkflowException if
+	//		- the A&AI Vf Module DELETE returns a response code other than 200
+	// 		- the Vf Module is a Base Module that is not the last Vf Module
+	//		- the Vf Module does not exist for the Generic Vnf
+	public void handleDeleteVfModuleFailure(DelegateExecution execution) {
+		def errorCode = 2000
+		def errorResponse = ""
+		if (execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") != null &&
+			execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") != 200) {
+			msoLogger.debug("AAI failure deleting a Vf Module: " + execution.getVariable("DAAIVfMod_deleteVfModuleResponse"))
+			errorResponse = execution.getVariable("DAAIVfMod_deleteVfModuleResponse")
+			msoLogger.debug("DeleteAAIVfModule - deleteVfModuleResponse" + errorResponse)
+			errorCode = 5000
+		} else {
+			if (execution.getVariable("DAAIVfMod_isBaseModule", true) == true &&
+					execution.getVariable("DAAIVfMod_isLastModule") == false) {
+				// attempt to delete a Base Module that is not the last Vf Module
+				msoLogger.debug(execution.getVariable("DAAIVfMod_parseModuleResponse"))
+				errorResponse = execution.getVariable("DAAIVfMod_parseModuleResponse")
+				msoLogger.debug("DeleteAAIVfModule - parseModuleResponse" + errorResponse)
+				errorCode = 1002
+			} else {
+				// attempt to delete a non-existant Vf Module
+				if (execution.getVariable("DAAIVfMod_moduleExists") == false) {
+					msoLogger.debug(execution.getVariable("DAAIVfMod_parseModuleResponse"))
+					errorResponse = execution.getVariable("DAAIVfMod_parseModuleResponse")
+					msoLogger.debug("DeleteAAIVfModule - parseModuleResponse" + errorResponse)
+					errorCode = 1002
+				} else {
+					// if the responses get populated corerctly, we should never get here
+					errorResponse = "Unknown error occurred during DeleteAAIVfModule flow"
+				}
+			}
+		}
+
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Error occurred during DeleteAAIVfModule flow", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, errorResponse);
+		exceptionUtil.buildAndThrowWorkflowException(execution, errorCode, errorResponse)
+
+	}
+
+	// generates a WorkflowException if
+	//		- the A&AI Generic Vnf DELETE returns a response code other than 200
+	public void handleDeleteGenericVnfFailure(DelegateExecution execution) {
+		msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "AAI error occurred deleting the Generic Vnf", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, execution.getVariable("DAAIVfMod_deleteGenericVnfResponse"));
+		exceptionUtil.buildAndThrowWorkflowException(execution, 5000, execution.getVariable("DAAIVfMod_deleteGenericVnfResponse"))
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ExceptionUtil.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy
index b65ce74c70..de5408fac5 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ExceptionUtil.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
 
 import static org.apache.commons.lang3.StringUtils.*
 
@@ -27,12 +27,18 @@ import com.google.common.xml.XmlEscapers
 import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
-import org.openecomp.mso.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
 
 /**
  * @version 1.0
  */
 class ExceptionUtil extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ExceptionUtil.class);
+
 
 
 	/**
@@ -49,23 +55,22 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	WorkflowException MapAAIExceptionToWorkflowException(String response, DelegateExecution execution)
 	{
 		def utils=new MsoUtils()
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		def prefix=execution.getVariable("prefix")
 		def errorMsg = execution.getVariable(prefix+"ErrorResponse")
-		utils.log("DEBUG","=========== Begin MapAAIExceptionToWorkflowException ===========",isDebugEnabled)
+		msoLogger.trace("Begin MapAAIExceptionToWorkflowException ")
 		String text = null
 		def variables
 		String errorCode = '5000'
 		WorkflowException wfex
-		utils.log("DEBUG","response: " + response, isDebugEnabled)
+		msoLogger.debug("response: " + response)
 		try{
 		try {
 			//String msg = utils.getNodeXml(response, "Fault")
 			variables = utils.getMultNodes(response, "variable")
-			text = utils.getNodeText1(response, "text")
+			text = utils.getNodeText(response, "text")
 		} catch (Exception ex) {
 			//Ignore the exception - cases include non xml payload
-			utils.log("DEBUG","error mapping error, ignoring: " + ex,isDebugEnabled)
+			msoLogger.debug("error mapping error, ignoring: " + ex)
 		}
 
 		if(text != null) {
@@ -76,12 +81,12 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 				text = text.replaceFirst("%4", variables[3])
 			}
 			String modifiedErrorMessage = 'Received error from A&amp;AI (' + text +')'
-			utils.log("DEBUG", "ModifiedErrorMessage " + modifiedErrorMessage, isDebugEnabled)
+			msoLogger.debug("ModifiedErrorMessage " + modifiedErrorMessage)
 			// let $ModifiedErrorMessage := concat( 'Received error from A',$exceptionaai:ampersand,'AI (' ,functx:replace-multi($ErrorMessage,$from,$Variables ),')')
 			buildWorkflowException(execution, 5000, modifiedErrorMessage)
 
 			wfex = execution.getVariable("WorkflowException")
-			utils.log("ERROR","Fault:"+ wfex)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Fault", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, wfex.errorMessage);
 			return wfex
 		} else {
 			try {
@@ -91,18 +96,18 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 				int errorCodeInt = Integer.parseInt(errorCode)
 				buildWorkflowException(execution, errorCodeInt, mappedErrorMessage)
 
-				utils.log("DEBUG", "mappedErrorMessage " + mappedErrorMessage, isDebugEnabled)
+				msoLogger.debug("mappedErrorMessage " + mappedErrorMessage)
 				wfex = execution.getVariable("WorkflowException")
-				utils.log("ERROR","Fault:"+ wfex, isDebugEnabled)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Fault", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, wfex.errorMessage);
 				return wfex
 			} catch(Exception ex) {
-				utils.log("DEBUG","error mapping error, return null: " + ex, isDebugEnabled)
+				msoLogger.debug("error mapping error, return null: " + ex)
 				return null
 
 			}
 		}
 		}catch(Exception e){
-			utils.log("DEBUG", "Exception occured during MapAAIExceptionToWorkflowException: " + e, isDebugEnabled)
+			msoLogger.debug("Exception occured during MapAAIExceptionToWorkflowException: " + e)
 			buildWorkflowException(execution, 5000, "Error mapping AAI Response to WorkflowException")
 		}
 	}
@@ -120,8 +125,7 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 */
 	WorkflowException MapAAIExceptionToWorkflowExceptionGeneric(DelegateExecution execution, String response, int resCode){
 		def utils=new MsoUtils()
-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", "Start MapAAIExceptionToWorkflowExceptionGeneric Process", isDebugLogEnabled)
+		msoLogger.debug("Start MapAAIExceptionToWorkflowExceptionGeneric Process")
 
 		WorkflowException wfex
 		try {
@@ -138,12 +142,12 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 				buildWorkflowException(execution, resCode, "Received a bad response from AAI")
 			}
 		} catch (Exception ex) {
-			utils.log("DEBUG", "Exception Occured during MapAAIExceptionToWorkflowExceptionGeneric: " + ex, isDebugLogEnabled)
+			msoLogger.debug("Exception Occured during MapAAIExceptionToWorkflowExceptionGeneric: " + ex)
 			buildWorkflowException(execution, resCode, "Internal Error - Occured in MapAAIExceptionToWorkflowExceptionGeneric")
 
 		}
-		utils.log("DEBUG", "Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"), isDebugLogEnabled)
-		utils.log("DEBUG", "Completed MapAAIExceptionToWorkflowExceptionGeneric Process", isDebugLogEnabled)
+		msoLogger.debug("Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"))
+		msoLogger.debug("Completed MapAAIExceptionToWorkflowExceptionGeneric Process")
 	}
 
 	/**
@@ -164,14 +168,14 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 			String mes = XmlEscapers.xmlContentEscaper().escape(wfex.getErrorMessage())
 			int code = wfex.getErrorCode()
 			xml =
-			"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-					<aetgt:ErrorMessage>${mes}</aetgt:ErrorMessage>
-					<aetgt:ErrorCode>${code}</aetgt:ErrorCode>
+			"""<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
+					<aetgt:ErrorMessage>${MsoUtils.xmlEscape(mes)}</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>${MsoUtils.xmlEscape(code)}</aetgt:ErrorCode>
 				  </aetgt:WorkflowException>"""
 
 		}else{
 		 	xml =
-			"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+			"""<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
 					<aetgt:ErrorMessage>Internal Error</aetgt:ErrorMessage>
 					<aetgt:ErrorCode>2500</aetgt:ErrorCode>
 				  </aetgt:WorkflowException>"""
@@ -223,7 +227,7 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 			errorMessage=""
 		}
 		if( errorCode.equals('5010')){
-			return 'Could not communicate with A&AI'
+					return 'Could not communicate with A&AI'
 		}else if (errorCode.equals('5020')){
 			return 'No response from A&AI'
 		}else{
@@ -264,13 +268,12 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 */
 	public void buildWorkflowException(DelegateExecution execution, int errorCode, String errorMessage) {
 		MsoUtils utils = new MsoUtils()
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		String processKey = getProcessKey(execution);
-		utils.log("DEBUG", "Building a WorkflowException for " + processKey, isDebugLogEnabled)
+		msoLogger.debug("Building a WorkflowException for " + processKey)
 
 		WorkflowException exception = new WorkflowException(processKey, errorCode, errorMessage);
 		execution.setVariable("WorkflowException", exception);
-		utils.log("DEBUG", "Outgoing WorkflowException is " + exception, isDebugLogEnabled)
+		msoLogger.debug("Outgoing WorkflowException is " + exception)
 	}
 
 	/**
@@ -283,14 +286,13 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 * @param errorMessage the error message
 	 */
 	public void buildAndThrowWorkflowException(DelegateExecution execution, int errorCode, String errorMessage) {
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 		String processKey = getProcessKey(execution);
-		utils.log("Building a WorkflowException for Subflow " + processKey, isDebugLogEnabled)
+		msoLogger.debug("Building a WorkflowException for Subflow " + processKey)
 
 		WorkflowException exception = new WorkflowException(processKey, errorCode, errorMessage);
 		execution.setVariable("WorkflowException", exception);
-		utils.log("DEBUG", "Outgoing WorkflowException is " + exception, isDebugLogEnabled)
-		utils.log("DEBUG", "Throwing MSOWorkflowException", isDebugLogEnabled)
+		msoLogger.debug("Outgoing WorkflowException is " + exception)
+		msoLogger.debug("Throwing MSOWorkflowException")
 		throw new BpmnError("MSOWorkflowException")
 	}
 
@@ -304,19 +306,18 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 *
 	 */
 	public void processSubflowsBPMNException(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		String processKey = getProcessKey(execution)
 		try{
-			utils.log("DEBUG", "Started ProcessSubflowsBPMNException Method", isDebugEnabled)
+			msoLogger.debug("Started ProcessSubflowsBPMNException Method")
 			if(execution.getVariable("WorkflowException") == null){
 				buildWorkflowException(execution, 2500, "Internal Error - Occured During " + processKey)
 			}
 
-			utils.log("DEBUG", processKey + " Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"), isDebugEnabled)
+			msoLogger.debug(processKey + " Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"))
 		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during ProcessSubflowsBPMNException Method: " + e, isDebugEnabled)
+			msoLogger.debug("Caught Exception during ProcessSubflowsBPMNException Method: " + e)
 		}
-		utils.log("DEBUG", "Completed ProcessSubflowsBPMNException Method", isDebugEnabled)
+		msoLogger.debug("Completed ProcessSubflowsBPMNException Method")
 	}
 
 	/**
@@ -331,10 +332,9 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 *
 	 */
 	public String processMainflowsBPMNException(DelegateExecution execution, String requestInfo){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		String processKey = getProcessKey(execution)
 		try{
-			utils.log("DEBUG", "Started ProcessMainflowBPMNException Method", isDebugEnabled)
+			msoLogger.debug("Started ProcessMainflowBPMNException Method")
 			if(execution.getVariable("WorkflowException") == null || isBlank(requestInfo)){
 				buildWorkflowException(execution, 2500, "Internal Error - WorkflowException Object and/or RequestInfo is null! " + processKey)
 			}
@@ -344,25 +344,26 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 			int errorCode = wfex.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">
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
+					                             xmlns:ns="http://org.onap/so/request/types/v1"
+					                             xmlns:wfsch="http://org.onap/so/workflow/schema/v1">
 					   ${requestInfo}
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
-							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
+							<aetgt:ErrorMessage>${MsoUtils.xmlEscape(errorMessage)}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>${MsoUtils.xmlEscape(errorCode)}</aetgt:ErrorCode>
 						</aetgt:WorkflowException>
 					</aetgt:FalloutHandlerRequest>"""
 
-			utils.log("DEBUG", processKey + " Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"), isDebugEnabled)
-			utils.log("DEBUG", processKey + " Outgoing FalloutHandler Request is: " + falloutHandlerRequest, isDebugEnabled)
+			msoLogger.debug(processKey + " Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"))
+			msoLogger.debug(processKey + " Outgoing FalloutHandler Request is: " + falloutHandlerRequest)
+
 			return falloutHandlerRequest
 
 		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during ProcessMainflowBPMNException Method: " + e, isDebugEnabled)
+			msoLogger.debug("Caught Exception during ProcessMainflowBPMNException Method: " + e)
 			return null
 		}
-		utils.log("DEBUG", "Completed ProcessMainflowBPMNException Method", isDebugEnabled)
+		msoLogger.debug("Completed ProcessMainflowBPMNException Method")
 	}
 
 	/**
@@ -374,20 +375,25 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 	 *
 	 */
 	public void processJavaException(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		String processKey = getProcessKey(execution)
 		try{
-			utils.log("DEBUG", "Caught a Java Exception in " + processKey, isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			buildWorkflowException(execution, 2500, "Catch a Java Lang Exception in " + processKey)
+			msoLogger.debug("Caught a Java Exception in " + processKey)
+			msoLogger.debug("Started processJavaException Method")
+			// if the BPMN flow java error handler sets "BPMN_javaExpMsg", append it to the WFE
+			String javaExpMsg = execution.getVariable("BPMN_javaExpMsg")
+			String wfeExpMsg = "Catch a Java Lang Exception in " + processKey
+			if (javaExpMsg != null && !javaExpMsg.empty) {
+				wfeExpMsg = wfeExpMsg + ": " + javaExpMsg
+			}
+			buildWorkflowException(execution, 2500, wfeExpMsg)
 
 		}catch(BpmnError b){
 			throw b
 		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			msoLogger.debug("Caught Exception during processJavaException Method: " + e)
 			buildWorkflowException(execution, 2500, "Internal Error - During Process Java Exception")
 		}
-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
+		msoLogger.debug("Completed processJavaException Method")
 	}
 
 
@@ -395,4 +401,22 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 		// TODO Auto-generated method stub
 
 	}
+	
+	public String getErrorMessage(WorkflowException wfe, String processKey) {
+		if(wfe == null) {
+			return "Unexpected error encountered in " + processKey
+		}
+		else {
+			return wfe.getErrorMessage()
+		}
+	}
+	
+	public int getErrorCode(WorkflowException wfe) {
+		if(wfe == null) {
+			return 2500
+		}
+		else {
+			return wfe.getErrorCode()
+		}
+	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
index 0356397eaa..9732693f38 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandler.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/FalloutHandler.groovy
@@ -1,380 +1,378 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import java.text.SimpleDateFormat

-

-import org.apache.commons.lang3.*

-import org.camunda.bpm.engine.delegate.DelegateExecution

-

-public class FalloutHandler extends AbstractServiceTaskProcessor {

-	String Prefix="FH_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	

-	public initializeProcessVariables(DelegateExecution execution){

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		try {

-			execution.setVariable("prefix",Prefix)

-	

-			//These variables are form the input Message to the BPMN

-			execution.setVariable("FH_request_id","")

-			execution.setVariable("FH_request_action","")

-			execution.setVariable("FH_notification-url","")

-			execution.setVariable("FH_mso-bpel-name","")

-			execution.setVariable("FH_ErrorCode", "")

-			execution.setVariable("FH_ErrorMessage", "")

-

-			execution.setVariable("FH_notification-url-Ok", false)

-			execution.setVariable("FH_request_id-Ok", false)

-

-			//These variables are for Get Mso Aai Password Adapter

-			execution.setVariable("FH_deliveryStatus", true)

-	

-			//update Response Status to pending ...Adapter variables

-			execution.setVariable("FH_updateResponseStatusPayload", null)

-			execution.setVariable("FH_updateResponseStatusResponse", null)

-	

-			//update Request Gamma ...Adapter variables

-			execution.setVariable("FH_updateRequestGammaPayload", "")

-			execution.setVariable("FH_updateRequestGammaResponse", null)

-			execution.setVariable("FH_updateRequestGammaResponseCode", null)

-	

-			//update Request Infra ...Adapter variables

-			execution.setVariable("FH_updateRequestInfraPayload", "")

-			execution.setVariable("FH_updateRequestInfraResponse", null)

-			execution.setVariable("FH_updateRequestInfraResponseCode", null)

-	

-			//assign True to success variable

-			execution.setVariable("FH_success", true)

-	

-			//Set notify status to Failed variable

-			execution.setVariable("FH_NOTIFY_STATUS", "SUCCESS")

-	

-			//Set DB update variable

-			execution.setVariable("FH_updateRequestPayload", "")

-			execution.setVariable("FH_updateRequestResponse", null)

-			execution.setVariable("FH_updateRequestResponseCode", null)

-	

-			//Auth variables

-			execution.setVariable("BasicAuthHeaderValue","")

-	

-			//Parameter list

-			execution.setVariable("FH_parameterList",  "")

-	

-			//Response variables

-			execution.setVariable("FalloutHandlerResponse","")

-			execution.setVariable("FH_ErrorResponse", null)

-			execution.setVariable("FH_ResponseCode", "")

-	

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	public void preProcessRequest (DelegateExecution execution) {

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		// Initialize flow variables

-		initializeProcessVariables(execution)

-		setSuccessIndicator(execution, false)

-	

-		setBasicDBAuthHeader(execution, isDebugLogEnabled)

-		

-		try {

-			def xml = execution.getVariable("FalloutHandlerRequest")

-			utils.log("DEBUG", " XML --> " + xml, isDebugLogEnabled)

-			utils.logAudit("FalloutHandler request: " + xml)

-	

-			//Check the incoming request type

-			//Incoming request can be ACTIVE_REQUESTS (request-information node) or  INFRA_ACTIVE_REQUESTS (request-info node)

-			if (utils.nodeExists(xml, "request-information")) {

-				execution.setVariable("FH_request_id-Ok", true) // Incoming request is for ACTIVE_REQUESTS

-			}

-	

-			//Check notification-url for the incoming request type

-			//ACTIVE_REQUESTS may have notificationurl node

-			//INFRA_ACTIVE_REQUESTS notificationurl node does not exist

-			def notificationurl = ""

-			if (utils.nodeExists(xml, "notification-url")) {

-				notificationurl = utils.getNodeText(xml,"notification-url")

-				if(notificationurl != null && !notificationurl.isEmpty()) {

-					utils.log("DEBUG", "********** Incoming notification Url is: " + notificationurl,isDebugLogEnabled);

-					execution.setVariable("FH_notification-url-Ok", true)

-					execution.setVariable("FH_notification-url",notificationurl)

-				}

-			}

-	

-			//Check request_id for the incoming request type

-			//For INFRA_ACTIVE_REQUESTS payload request-id IS optional (Not sure why this is option since req id is primary key ... also tried exe through SOAP UI to check if MSO code handles null like auto generated seq not it does not)

-			//For ACTIVE_REQUESTS payload request-id is NOT optional

-			def request_id = ""

-			if (utils.nodeExists(xml, "request-id")) {

-				execution.setVariable("FH_request_id",utils.getNodeText(xml,"request-id"))

-			}

-			utils.logAudit("FH_request_id: " + execution.getVariable("FH_request_id"))

-	

-			// INFRA_ACTIVE_REQUESTS	 have "action" element ... mandatory

-			// ACTIVE_REQUEST have "request-action" ... mandatory

-			if (utils.nodeExists(xml, "request-action")) {

-				execution.setVariable("FH_request_action",utils.getNodeText(xml,"request-action"))

-			} else if (utils.nodeExists(xml, "action")) {

-				execution.setVariable("FH_request_action",utils.getNodeText(xml,"action"))

-			}

-	

-	

-			//Check source for the incoming request type

-			//For INFRA_ACTIVE_REQUESTS payload source IS optional

-			//For ACTIVE_REQUESTS payload source is NOT optional

-			def source = ""

-			if (utils.nodeExists(xml, "source")) {

-				execution.setVariable("FH_source",utils.getNodeText(xml,"source"))

-			}

-	

-			//Check if ErrorCode node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.

-			def errorCode = ""

-			if (utils.nodeExists(xml, "ErrorCode")) {

-				errorCode = utils.getNodeText(xml,"ErrorCode")

-				if(errorCode != null && !errorCode.isEmpty()) {

-					execution.setVariable("FH_ErrorCode", errorCode)

-				}

-			}

-			utils.logAudit("FH_ErrorCode: " + errorCode)

-	

-			//Check if ErrorMessage node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.

-			def errorMessage = ""

-			if (utils.nodeExists(xml, "ErrorMessage")) {

-				errorCode = utils.getNodeText(xml,"ErrorMessage")

-				if(errorCode != null && !errorCode.isEmpty()) {

-					errorCode = errorCode.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")

-					execution.setVariable("FH_ErrorMessage", errorCode)

-				}

-			}

-	

-			//Check for Parameter List

-			if (utils.nodeExists(xml, "parameter-list")) {

-				def parameterList = utils.getNodeXml(xml, "parameter-list", false)

-				execution.setVariable("FH_parameterList", parameterList)

-			}

-	

-			utils.log("DEBUG","FH_notification-url-Ok --> " + execution.getVariable("FH_notification-url-Ok"),isDebugLogEnabled)

-			utils.log("DEBUG","FH_request_id-OK --> " + execution.getVariable("FH_request_id-Ok"),isDebugLogEnabled)

-	

-			// set the DHV/Service Instantiation values if specified in the request

-			execution.setVariable("FH_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText1(xml, "is-srv-inst-req"))))

-			utils.log("DEBUG", "FH_is_srv_inst_req --> " + execution.getVariable("FH_is_srv_inst_req"), isDebugLogEnabled)

-			execution.setVariable("FH_is_json_content", String.valueOf("JSON".equals(utils.getNodeText1(xml, "resp-content-type"))))

-			utils.log("DEBUG", "FH_is_json_content --> " + execution.getVariable("FH_is_json_content"), isDebugLogEnabled)

-			execution.setVariable("FH_service_inst_id", utils.getNodeText1(xml, "service-instance-id"))

-			utils.log("DEBUG", "FH_service_inst_id --> " + execution.getVariable("FH_service_inst_id"), isDebugLogEnabled)

-			execution.setVariable("FH_start_time", utils.getNodeText1(xml, "start-time"))

-			utils.log("DEBUG", "FH_start_time --> " + execution.getVariable("FH_start_time"), isDebugLogEnabled)

-			// this variable is used by the camunda flow to set the Content-Type for the async response

-			if (execution.getVariable("FH_is_srv_inst_req").equals("true") &&

-				execution.getVariable("FH_is_json_content").equals("true")) {

-				execution.setVariable("FH_content_type", "application/json")

-			} else {

-				execution.setVariable("FH_content_type", "text/xml")

-			}

-		} catch (Exception e) {

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

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

-		}

-	

-		utils.log("DEBUG","OUTOF --> Initialize Variables Fallout Handler #########",isDebugLogEnabled);

-	}

-	

-	public String updateRequestPayload (DelegateExecution execution){

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		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:updateRequest>

-							<requestId>${execution.getVariable("FH_request_id")}</requestId>

-							<lastModifiedBy>BPEL</lastModifiedBy>

-							<finalErrorMessage>${execution.getVariable("FH_ErrorMessage")}</finalErrorMessage>

-							<finalErrorCode>${execution.getVariable("FH_ErrorCode")}</finalErrorCode>

-							<status>FAILED</status>

-							<responseStatus>${execution.getVariable("FH_NOTIFY_STATUS")}</responseStatus>

-						</req:updateRequest>

-					</soapenv:Body>

-					</soapenv:Envelope>

-				"""

-	

-			utils.logAudit("updateRequestPayload: " + payload)

-			execution.setVariable("FH_updateRequestPayload", payload)

-			return execution.getVariable("FH_updateRequestPayload")

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	public String updateRequestInfraPayload (DelegateExecution execution){

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		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>${execution.getVariable("FH_request_id")}</requestId>

-							<lastModifiedBy>BPEL</lastModifiedBy>

-							<statusMessage>${execution.getVariable("FH_ErrorMessage")}</statusMessage>

-							<requestStatus>FAILED</requestStatus>

-							<progress>100</progress>

-						</req:updateInfraRequest>

-					</soapenv:Body>

-					</soapenv:Envelope>

-				"""

-	

-			execution.setVariable("FH_updateRequestInfraPayload", payload)

-			utils.logAudit("updateRequestInfraPayload: " + payload)

-			return execution.getVariable("FH_updateRequestInfraPayload")

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	public String updateRequestGammaPayload (DelegateExecution execution){

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		try {

-			String payload = """

-					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="${execution.getVariable("URN_mso_default_adapter_namespace")}/requestsdb">

-					<soapenv:Header/>

-					<soapenv:Body>

-						<req:updateRequest>

-							<requestId>${execution.getVariable("FH_request_id")}</requestId>

-							<lastModifiedBy>BPEL</lastModifiedBy>

-							<finalErrorMessage>${execution.getVariable("FH_ErrorMessage")}</finalErrorMessage>

-							<finalErrorCode>${execution.getVariable("FH_ErrorCode")}</finalErrorCode>

-							<status>FAILED</status>

-						</req:updateRequest>

-					</soapenv:Body>

-					</soapenv:Envelope>

-				"""

-	

-			execution.setVariable("FH_updateRequestGammaPayload", payload)

-			utils.logAudit("updateRequestGammaPayload: " + payload)

-			return execution.getVariable("FH_updateRequestGammaPayload")

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	public String updateResponseStatusPayload (DelegateExecution execution){

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		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:updateResponseStatus>

-							<requestId>${execution.getVariable("FH_request_id")}</requestId>

-							<lastModifiedBy>BPEL</lastModifiedBy>

-							<responseStatus>SENDING_FINAL_NOTIFY</responseStatus>

-						</req:updateResponseStatus>

-					</soapenv:Body>

-					</soapenv:Envelope>

-				"""

-	

-			execution.setVariable("FH_updateResponseStatusPayload", payload)

-			utils.logAudit("updateResponseStatusPayload: " + payload)

-			return execution.getVariable("FH_updateResponseStatusPayload")

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	public void buildDBWorkflowException(DelegateExecution execution, String responseCodeVariable) {

-		def method = getClass().getSimpleName() + '.buildDBWorkflowException(' +

-			'execution=' + execution.getId() +

-			', responseCodeVariable=' + responseCodeVariable + ')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		try {

-			def responseCode = execution.getVariable(responseCodeVariable)

-			// If the HTTP response code was null, it means a connection fault occurred (a java exception)

-			def errorMessage = responseCode == null ? "Could not connect to DB Adapter" : "DB Adapter returned ${responseCode} response"

-			def errorCode = responseCode == null ? 7000 : 7020

-		//	exceptionUtil.buildWorkflowException(execution, errorCode, errorMessage)

-		} catch (Exception e) {

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

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

-		}

-	}

-	

-	/**

-	 * Used to create a workflow response in success and failure cases.

-	 */

-	public void postProcessResponse (DelegateExecution execution) {

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

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		try {

-			Boolean success = (Boolean) execution.getVariable("FH_success")

-			String out = success ? "Fallout Handler Succeeded" : "Fallout Handler Failed";

-	

-			def falloutHandlerResponse = """

-					<workflow:FalloutHandlerResponse xmlns:workflow="http://org.openecomp/mso/workflow/schema/v1">

-					   <workflow:out>${out}</workflow:out>

-					</workflow:FalloutHandlerResponse>

-				"""

-	

-			falloutHandlerResponse = utils.formatXml(falloutHandlerResponse)

-			utils.logAudit("FalloutHandler Response: " + falloutHandlerResponse);

-	

-			execution.setVariable("FalloutHandlerResponse", falloutHandlerResponse)

-			execution.setVariable("WorkflowResponse", falloutHandlerResponse)

-			execution.setVariable("FH_ResponseCode", success ? "200" : "500")

-			setSuccessIndicator(execution, success)

-	

-			logDebug("FalloutHandlerResponse =\n" + falloutHandlerResponse, isDebugLogEnabled)

-		} catch (Exception e) {

-			// Do NOT throw WorkflowException!

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

-		}

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
+
+import java.text.SimpleDateFormat
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+public class FalloutHandler extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, FalloutHandler.class);
+
+	String Prefix="FH_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	
+	public initializeProcessVariables(DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.initializeProcessVariables(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			execution.setVariable("prefix",Prefix)
+	
+			//These variables are form the input Message to the BPMN
+			execution.setVariable("FH_request_id","")
+			execution.setVariable("FH_request_action","")
+			execution.setVariable("FH_notification-url","")
+			execution.setVariable("FH_mso-bpel-name","")
+			execution.setVariable("FH_ErrorCode", "")
+			execution.setVariable("FH_ErrorMessage", "")
+
+			execution.setVariable("FH_notification-url-Ok", false)
+			execution.setVariable("FH_request_id-Ok", false)
+
+			//These variables are for Get Mso Aai Password Adapter
+			execution.setVariable("FH_deliveryStatus", true)
+	
+			//update Response Status to pending ...Adapter variables
+			execution.setVariable("FH_updateResponseStatusPayload", null)
+			execution.setVariable("FH_updateResponseStatusResponse", null)
+	
+			//update Request Gamma ...Adapter variables
+			execution.setVariable("FH_updateRequestGammaPayload", "")
+			execution.setVariable("FH_updateRequestGammaResponse", null)
+			execution.setVariable("FH_updateRequestGammaResponseCode", null)
+	
+			//update Request Infra ...Adapter variables
+			execution.setVariable("FH_updateRequestInfraPayload", "")
+			execution.setVariable("FH_updateRequestInfraResponse", null)
+			execution.setVariable("FH_updateRequestInfraResponseCode", null)
+	
+			//assign True to success variable
+			execution.setVariable("FH_success", true)
+	
+			//Set notify status to Failed variable
+			execution.setVariable("FH_NOTIFY_STATUS", "SUCCESS")
+	
+			//Set DB update variable
+			execution.setVariable("FH_updateRequestPayload", "")
+			execution.setVariable("FH_updateRequestResponse", null)
+			execution.setVariable("FH_updateRequestResponseCode", null)
+	
+			//Auth variables
+			execution.setVariable("BasicAuthHeaderValue","")
+	
+			//Parameter list
+			execution.setVariable("FH_parameterList",  "")
+	
+			//Response variables
+			execution.setVariable("FalloutHandlerResponse","")
+			execution.setVariable("FH_ErrorResponse", null)
+			execution.setVariable("FH_ResponseCode", "")
+	
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	public void preProcessRequest (DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		// Initialize flow variables
+		initializeProcessVariables(execution)
+		setSuccessIndicator(execution, false)
+	
+		setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
+		
+		try {
+			def xml = execution.getVariable("FalloutHandlerRequest")
+			msoLogger.debug(" XML --> " + xml)
+			msoLogger.debug("FalloutHandler request: " + xml)
+	
+			//Check the incoming request type
+			//Incoming request can be ACTIVE_REQUESTS (request-information node) or  INFRA_ACTIVE_REQUESTS (request-info node)
+			if (utils.nodeExists(xml, "request-information")) {
+				execution.setVariable("FH_request_id-Ok", true) // Incoming request is for ACTIVE_REQUESTS
+			}
+	
+			//Check notification-url for the incoming request type
+			//ACTIVE_REQUESTS may have notificationurl node
+			//INFRA_ACTIVE_REQUESTS notificationurl node does not exist
+			def notificationurl = ""
+			if (utils.nodeExists(xml, "notification-url")) {
+				notificationurl = utils.getNodeText(xml,"notification-url")
+				if(notificationurl != null && !notificationurl.isEmpty()) {
+					msoLogger.debug("********** Incoming notification Url is: " + notificationurl);
+					execution.setVariable("FH_notification-url-Ok", true)
+					execution.setVariable("FH_notification-url",notificationurl)
+				}
+			}
+	
+			//Check request_id for the incoming request type
+			//For INFRA_ACTIVE_REQUESTS payload request-id IS optional (Not sure why this is option since req id is primary key ... also tried exe through SOAP UI to check if MSO code handles null like auto generated seq not it does not)
+			//For ACTIVE_REQUESTS payload request-id is NOT optional
+			def request_id = ""
+			if (utils.nodeExists(xml, "request-id")) {
+				execution.setVariable("FH_request_id",utils.getNodeText(xml,"request-id"))
+			}
+			msoLogger.debug("FH_request_id: " + execution.getVariable("FH_request_id"))
+	
+			// INFRA_ACTIVE_REQUESTS	 have "action" element ... mandatory
+			// ACTIVE_REQUEST have "request-action" ... mandatory
+			if (utils.nodeExists(xml, "request-action")) {
+				execution.setVariable("FH_request_action",utils.getNodeText(xml,"request-action"))
+			} else if (utils.nodeExists(xml, "action")) {
+				execution.setVariable("FH_request_action",utils.getNodeText(xml,"action"))
+			}
+	
+	
+			//Check source for the incoming request type
+			//For INFRA_ACTIVE_REQUESTS payload source IS optional
+			//For ACTIVE_REQUESTS payload source is NOT optional
+			def source = ""
+			if (utils.nodeExists(xml, "source")) {
+				execution.setVariable("FH_source",utils.getNodeText(xml,"source"))
+			}
+	
+			//Check if ErrorCode node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
+			def errorCode = ""
+			if (utils.nodeExists(xml, "ErrorCode")) {
+				errorCode = utils.getNodeText(xml,"ErrorCode")
+				if(errorCode != null && !errorCode.isEmpty()) {
+					execution.setVariable("FH_ErrorCode", errorCode)
+				}
+			}
+			msoLogger.debug("FH_ErrorCode: " + errorCode)
+	
+			//Check if ErrorMessage node exists. If yes, initialize it from request xml, if no, it will stay with defaulf value already set in initializeProcessVariables() method above.
+			def errorMessage = ""
+			if (utils.nodeExists(xml, "ErrorMessage")) {
+				errorCode = utils.getNodeText(xml,"ErrorMessage")
+				if(errorCode != null && !errorCode.isEmpty()) {
+					errorCode = errorCode
+					execution.setVariable("FH_ErrorMessage", errorCode)
+				}
+			}
+	
+			//Check for Parameter List
+			if (utils.nodeExists(xml, "parameter-list")) {
+				def parameterList = utils.getNodeXml(xml, "parameter-list", false)
+				execution.setVariable("FH_parameterList", parameterList)
+			}
+	
+			msoLogger.trace("--> " + execution.getVariable(""))
+			msoLogger.debug("FH_request_id-OK --> " + execution.getVariable("FH_request_id-Ok"))
+	
+			// set the DHV/Service Instantiation values if specified in the request
+			execution.setVariable("FH_is_srv_inst_req", String.valueOf("true".equals(utils.getNodeText(xml, "is-srv-inst-req"))))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("FH_is_json_content", String.valueOf("JSON".equals(utils.getNodeText(xml, "resp-content-type"))))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("FH_service_inst_id", utils.getNodeText(xml, "service-instance-id"))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			execution.setVariable("FH_start_time", utils.getNodeText(xml, "start-time"))
+			msoLogger.trace("--> " + execution.getVariable(""))
+			// this variable is used by the camunda flow to set the Content-Type for the async response
+			if (execution.getVariable("FH_is_srv_inst_req").equals("true") &&
+				execution.getVariable("FH_is_json_content").equals("true")) {
+				execution.setVariable("FH_content_type", "application/json")
+			} else {
+				execution.setVariable("FH_content_type", "text/xml")
+			}
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
+		}
+	
+		msoLogger.debug("OUTOF --> Initialize Variables Fallout Handler #########");
+	}
+	
+	public String updateRequestPayload (DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.updateRequestPayload(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			String payload = """
+					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+					<soapenv:Header/>
+					<soapenv:Body>
+						<req:updateRequest>
+							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
+							<lastModifiedBy>BPEL</lastModifiedBy>
+							<finalErrorMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</finalErrorMessage>
+							<finalErrorCode>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorCode"))}</finalErrorCode>
+							<status>FAILED</status>
+							<responseStatus>${MsoUtils.xmlEscape(execution.getVariable("FH_NOTIFY_STATUS"))}</responseStatus>
+						</req:updateRequest>
+					</soapenv:Body>
+					</soapenv:Envelope>
+				"""
+	
+			msoLogger.debug("updateRequestPayload: " + payload)
+			execution.setVariable("FH_updateRequestPayload", payload)
+			return execution.getVariable("FH_updateRequestPayload")
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	public String updateRequestInfraPayload (DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.updateRequestInfraPayload(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			String payload = """
+					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+					<soapenv:Header/>
+					<soapenv:Body>
+						<req:updateInfraRequest>
+							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
+							<lastModifiedBy>BPEL</lastModifiedBy>
+							<statusMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</statusMessage>
+							<requestStatus>FAILED</requestStatus>
+							<progress>100</progress>
+						</req:updateInfraRequest>
+					</soapenv:Body>
+					</soapenv:Envelope>
+				"""
+	
+			execution.setVariable("FH_updateRequestInfraPayload", payload)
+			msoLogger.debug("updateRequestInfraPayload: " + payload)
+			return execution.getVariable("FH_updateRequestInfraPayload")
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	public String updateRequestGammaPayload (DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.updateRequestGammaPayload(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			String payload = """
+					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="${UrnPropertiesReader.getVariable("mso.default.adapter.namespace", execution)}/requestsdb">
+					<soapenv:Header/>
+					<soapenv:Body>
+						<req:updateRequest>
+							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
+							<lastModifiedBy>BPEL</lastModifiedBy>
+							<finalErrorMessage>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorMessage"))}</finalErrorMessage>
+							<finalErrorCode>${MsoUtils.xmlEscape(execution.getVariable("FH_ErrorCode"))}</finalErrorCode>
+							<status>FAILED</status>
+						</req:updateRequest>
+					</soapenv:Body>
+					</soapenv:Envelope>
+				"""
+	
+			execution.setVariable("FH_updateRequestGammaPayload", payload)
+			msoLogger.debug("updateRequestGammaPayload: " + payload)
+			return execution.getVariable("FH_updateRequestGammaPayload")
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	public String updateResponseStatusPayload (DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.updateResponseStatusPayload(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			String payload = """
+					<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+					<soapenv:Header/>
+					<soapenv:Body>
+						<req:updateResponseStatus>
+							<requestId>${MsoUtils.xmlEscape(execution.getVariable("FH_request_id"))}</requestId>
+							<lastModifiedBy>BPEL</lastModifiedBy>
+							<responseStatus>SENDING_FINAL_NOTIFY</responseStatus>
+						</req:updateResponseStatus>
+					</soapenv:Body>
+					</soapenv:Envelope>
+				"""
+	
+			execution.setVariable("FH_updateResponseStatusPayload", payload)
+			msoLogger.debug("updateResponseStatusPayload: " + payload)
+			return execution.getVariable("FH_updateResponseStatusPayload")
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	public void buildDBWorkflowException(DelegateExecution execution, String responseCodeVariable) {
+		def method = getClass().getSimpleName() + '.buildDBWorkflowException(' +
+			'execution=' + execution.getId() +
+			', responseCodeVariable=' + responseCodeVariable + ')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			def responseCode = execution.getVariable(responseCodeVariable)
+			// If the HTTP response code was null, it means a connection fault occurred (a java exception)
+			def errorMessage = responseCode == null ? "Could not connect to DB Adapter" : "DB Adapter returned ${responseCode} response"
+			def errorCode = responseCode == null ? 7000 : 7020
+		//	exceptionUtil.buildWorkflowException(execution, errorCode, errorMessage)
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		//	exceptionUtil.buildWorkflowException(execution, 2000, "Internal Error - Occured in " + method)
+		}
+	}
+	
+	/**
+	 * Used to create a workflow response in success and failure cases.
+	 */
+	public void postProcessResponse (DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.postProcessResponse(' +'execution=' + execution.getId() +')'
+		msoLogger.trace('Entered ' + method)
+	
+		try {
+			Boolean success = (Boolean) execution.getVariable("FH_success")
+			String out = success ? "Fallout Handler Succeeded" : "Fallout Handler Failed";
+	
+			def falloutHandlerResponse = """
+					<workflow:FalloutHandlerResponse xmlns:workflow="http://org.onap/so/workflow/schema/v1">
+					   <workflow:out>${MsoUtils.xmlEscape(out)}</workflow:out>
+					</workflow:FalloutHandlerResponse>
+				"""
+	
+			falloutHandlerResponse = utils.formatXml(falloutHandlerResponse)
+			msoLogger.debug("FalloutHandler Response: " + falloutHandlerResponse);
+	
+			execution.setVariable("FalloutHandlerResponse", falloutHandlerResponse)
+			execution.setVariable("WorkflowResponse", falloutHandlerResponse)
+			execution.setVariable("FH_ResponseCode", success ? "200" : "500")
+			setSuccessIndicator(execution, success)
+	
+			msoLogger.debug("FalloutHandlerResponse =\n" + falloutHandlerResponse)
+		} catch (Exception e) {
+			// Do NOT throw WorkflowException!
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+		}
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenerateVfModuleName.groovy
index 95c258f2a4..5cdcd0d5bf 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenerateVfModuleName.groovy
@@ -1,170 +1,173 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-import java.io.Serializable;

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.springframework.web.util.UriUtils

-

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

-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

-

-public class GenerateVfModuleName extends AbstractServiceTaskProcessor{

-

-	def Prefix="GVFMN_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	

-	

-	public void preProcessRequest(DelegateExecution execution) {

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

-		

-		try {

-			def vnfId = execution.getVariable("vnfId")

-			utils.log("DEBUG", "vnfId is " + vnfId, isDebugEnabled)

-			def vnfName = execution.getVariable("vnfName")

-			utils.log("DEBUG", "vnfName is " + vnfName, isDebugEnabled)

-			def vfModuleLabel = execution.getVariable("vfModuleLabel")

-			utils.log("DEBUG", "vfModuleLabel is " + vfModuleLabel, isDebugEnabled)

-			def personaModelId = execution.getVariable("personaModelId")

-			utils.log("DEBUG", "personaModelId is " + personaModelId, isDebugEnabled)

-			execution.setVariable("GVFMN_vfModuleXml", "")

-		}catch(BpmnError b){

-			throw b

-		}catch(Exception e){

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error encountered in initVariables method!")

-		}

-	}

-

-

-	public void queryAAI(DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def method = getClass().getSimpleName() + '.queryAAI(' +

-			'execution=' + execution.getId() +

-			')'

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

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

-			def personaModelId = execution.getVariable('personaModelId')

-			

-			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("GenerateVfModuleName - invoking httpGet() to AAI")

-

-				responseData = response.getResponseBodyAsString()

-				if (responseData != null) {

-					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)

-

-				}

-

-				utils.logAudit("GenerateVfModuleName - queryAAIVfModule Response: " + responseData)

-				utils.logAudit("GenerateVfModuleName - queryAAIVfModule ResponseCode: " + response.getStatusCode())

-

-				execution.setVariable('GVFMN_queryAAIVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('GVFMN_queryAAIVfModuleResponse', responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-				if (response.getStatusCode() == 200) {

-					// Set the VfModuleXML					

-					if (responseData != null) {						

-						String vfModulesText = utils.getNodeXml(responseData, "vf-modules")

-						if (vfModulesText == null || vfModulesText.isEmpty()) {

-							logDebug("There are no VF modules in this VNF yet", isDebugLogEnabled)

-							execution.setVariable("GVFMN_vfModuleXml", null)

-						}

-						else {

-							def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

-							def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

-							int vfModulesSize = 0

-							if (vfModules != null) {

-								vfModulesSize = vfModules.size()

-							}

-							String matchingVfModules = "<vfModules>"

-							for (i in 0..vfModulesSize-1) {

-								def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "model-invariant-id")

-								if (!personaModelIdFromAAI) {

-									// check old attribute name

-								   personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")								  

-								}

-								if (personaModelIdFromAAI != null && personaModelIdFromAAI.equals(personaModelId)) {

-									matchingVfModules = matchingVfModules + utils.removeXmlPreamble(vfModuleXml)

-								}							

-							}

-							matchingVfModules = matchingVfModules + "</vfModules>"

-							logDebug("Matching VF Modules: " + matchingVfModules, isDebugLogEnabled)					

-							execution.setVariable("GVFMN_vfModuleXml", matchingVfModules)

-						}

-					}

-				}	

-			} 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 queryAAI(): ' + e.getMessage())

-		}

-		

-	}

-					

-	public void generateName (DelegateExecution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def method = getClass().getSimpleName() + '.generateName() ' +

-			'execution=' + execution.getId() +

-			')'

-		logDebug('Entered ' + method, isDebugLogEnabled)

-	

-		String vfModuleXml = execution.getVariable("GVFMN_vfModuleXml")		

-		

-		String moduleIndex = utils.getLowestUnusedIndex(vfModuleXml)			

-		logDebug("moduleIndex is: " + moduleIndex, isDebugLogEnabled)

-		def vnfName = execution.getVariable("vnfName")

-		def vfModuleLabel = execution.getVariable("vfModuleLabel")

-		def vfModuleName = vnfName + "_" + vfModuleLabel + "_" + moduleIndex

-		logDebug("vfModuleName is: " + vfModuleName, isDebugLogEnabled)

-		execution.setVariable("vfModuleName", vfModuleName)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
+
+import java.io.Serializable;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.springframework.web.util.UriUtils
+
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.rest.APIResponse;
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+public class GenerateVfModuleName extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, GenerateVfModuleName.class);
+
+	def Prefix="GVFMN_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	
+	
+	public void preProcessRequest(DelegateExecution execution) {
+		try {
+			def vnfId = execution.getVariable("vnfId")
+			msoLogger.debug("vnfId is " + vnfId)
+			def vnfName = execution.getVariable("vnfName")
+			msoLogger.debug("vnfName is " + vnfName)
+			def vfModuleLabel = execution.getVariable("vfModuleLabel")
+			msoLogger.debug("vfModuleLabel is " + vfModuleLabel)
+			def personaModelId = execution.getVariable("personaModelId")
+			msoLogger.debug("personaModelId is " + personaModelId)
+			execution.setVariable("GVFMN_vfModuleXml", "")
+		}catch(BpmnError b){
+			throw b
+		}catch(Exception e){
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error encountered in initVariables method!")
+		}
+	}
+
+
+	public void queryAAI(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.queryAAI(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('vnfId')
+			def personaModelId = execution.getVariable('personaModelId')
+			
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+			msoLogger.debug("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');
+				msoLogger.debug('sending GET to AAI endpoint \'' + endPoint + '\'')
+				APIResponse response = client.httpGet()
+				msoLogger.debug("GenerateVfModuleName - invoking httpGet() to AAI")
+
+				responseData = response.getResponseBodyAsString()
+				if (responseData != null) {
+					msoLogger.debug("Received generic VNF data: " + responseData)
+
+				}
+
+				msoLogger.debug("GenerateVfModuleName - queryAAIVfModule Response: " + responseData)
+				msoLogger.debug("GenerateVfModuleName - queryAAIVfModule ResponseCode: " + response.getStatusCode())
+
+				execution.setVariable('GVFMN_queryAAIVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('GVFMN_queryAAIVfModuleResponse', responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+				if (response.getStatusCode() == 200) {
+					// Set the VfModuleXML					
+					if (responseData != null) {						
+						String vfModulesText = utils.getNodeXml(responseData, "vf-modules")
+						if (vfModulesText == null || vfModulesText.isEmpty()) {
+							msoLogger.debug("There are no VF modules in this VNF yet")
+							execution.setVariable("GVFMN_vfModuleXml", null)
+						}
+						else {
+							def xmlVfModules= new XmlSlurper().parseText(vfModulesText)
+							def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}
+							int vfModulesSize = 0
+							if (vfModules != null) {
+								vfModulesSize = vfModules.size()
+							}
+							String matchingVfModules = "<vfModules>"
+							for (i in 0..vfModulesSize-1) {
+								def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])
+								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "model-invariant-id")
+								if (!personaModelIdFromAAI) {
+									// check old attribute name
+								   personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")								  
+								}
+								if (personaModelIdFromAAI != null && personaModelIdFromAAI.equals(personaModelId)) {
+									matchingVfModules = matchingVfModules + utils.removeXmlPreamble(vfModuleXml)
+								}							
+							}
+							matchingVfModules = matchingVfModules + "</vfModules>"
+							msoLogger.debug("Matching VF Modules: " + matchingVfModules)					
+							execution.setVariable("GVFMN_vfModuleXml", matchingVfModules)
+						}
+					}
+				}	
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI GET:' + ex.getMessage())
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAI(): ' + e.getMessage())
+		}
+		
+	}
+					
+	public void generateName (DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.generateName() ' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+	
+		String vfModuleXml = execution.getVariable("GVFMN_vfModuleXml")		
+		
+		String moduleIndex = utils.getLowestUnusedIndex(vfModuleXml)			
+		msoLogger.debug("moduleIndex is: " + moduleIndex)
+		def vnfName = execution.getVariable("vnfName")
+		def vfModuleLabel = execution.getVariable("vfModuleLabel")
+		def vfModuleName = vnfName + "_" + vfModuleLabel + "_" + moduleIndex
+		msoLogger.debug("vfModuleName is: " + vfModuleName)
+		execution.setVariable("vfModuleName", vfModuleName)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericGetService.groovy
index 3b380a9164..857df16772 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericGetService.groovy
@@ -1,471 +1,470 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import org.apache.commons.lang3.StringEscapeUtils

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-import static org.apache.commons.lang3.StringUtils.isBlank

-

-

-/**

- * This class supports the GenericGetService Sub Flow.

- * This Generic sub flow can be used by any flow for accomplishing

- * the goal of getting a Service-Instance or Service-Subscription (from AAI).

- * The calling flow must set the GENGS_type variable as "service-instance"

- * or "service-subscription".

- *

- * When using to Get a Service-Instance:

- * If the global-customer-id and service-type are not provided

- * this flow executes a query to get the service- Url using the

- * Service  Id or Name (whichever is provided).

- *

- * When using to Get a Service-Subscription:

- * The global-customer-id and service-type must be

- * provided.

- *

- * Upon successful completion of this sub flow the

- * GENGS_SuccessIndicator will be true and the query response payload

- * will be set to GENGS_service.  An MSOWorkflowException will

- * be thrown upon unsuccessful completion or if an error occurs

- * at any time during this sub flow. Please map variables

- * to the corresponding variable names below.

- *

- * Note - If this sub flow receives a Not Found (404) response

- * from AAI at any time this will be considered an acceptable

- * successful response however the GENGS_FoundIndicator

- * will be set to false. This variable will allow the calling flow

- * to distinguish between the two Success scenarios,

- * "Success where service- is found" and

- * "Success where service- is NOT found".

- *

- *

- * Variable Mapping Below:

- *

- * In Mapping Variables:

- *   For Allotted-Resource:

- *     @param - GENGS_allottedResourceId

- *     @param - GENGS_type

- *     @param (Optional) - GENGS_serviceInstanceId

- *     @param (Optional) - GENGS_serviceType

- *     @param (Optional) - GENGS_globalCustomerId

- *

- *   For Service-Instance:

- *     @param - GENGS_serviceInstanceId or @param - GENGS_serviceInstanceName

- *     @param - GENGS_type

- *     @param (Optional) - GENGS_serviceType

- *     @param (Optional) - GENGS_globalCustomerId

- *

- *   For Service-Subscription:

- *     @param - GENGS_type

- *     @param - GENGS_serviceType

- *     @param - GENGS_globalCustomerId

- *

- *

- * Out Mapping Variables:

- *    @param - GENGS_service

- *    @param - GENGS_FoundIndicator

- *    @param - WorkflowException

- */

-class GenericGetService extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENGS_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * determines the subsequent event based on which

-	 * variables the calling flow provided.

-	 *

-	 * @param - execution

-	 *

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENGS_obtainObjectsUrl", false)

-		execution.setVariable("GENGS_obtainServiceInstanceUrlByName", false)

-		execution.setVariable("GENGS_SuccessIndicator", false)

-		execution.setVariable("GENGS_FoundIndicator", false)

-		execution.setVariable("GENGS_resourceLink", null)

-		execution.setVariable("GENGS_siResourceLink", null)

-

-		try{

-			// Get Variables

-			String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")

-			String serviceType = execution.getVariable("GENGS_serviceType")

-			String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-			String type = execution.getVariable("GENGS_type")

-

-			if(type != null){

-				utils.log("DEBUG", "Incoming GENGS_type is: " + type, isDebugEnabled)

-				if(type.equalsIgnoreCase("allotted-resource")){

-					if(isBlank(allottedResourceId)){

-						utils.log("DEBUG", "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")

-					}else{

-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)

-						if(isBlank(globalCustomerId) || isBlank(serviceType) || isBlank(serviceInstanceId)){

-							execution.setVariable("GENGS_obtainObjectsUrl", true)

-						}else{

-							utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-						}

-					}

-				}else if(type.equalsIgnoreCase("service-instance")){

-					if(isBlank(serviceInstanceId) && isBlank(serviceInstanceName)){

-						utils.log("DEBUG", "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")

-					}else{

-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-						utils.log("DEBUG", "Incoming Service Instance Name is: " + serviceInstanceName, isDebugEnabled)

-						if(isBlank(globalCustomerId) || isBlank(serviceType)){

-							execution.setVariable("GENGS_obtainObjectsUrl", true)

-							if(isBlank(serviceInstanceId)){

-								execution.setVariable("GENGS_obtainServiceInstanceUrlByName", true)

-							}

-						}else{

-							utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-							utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-						}

-					}

-				}else if(type.equalsIgnoreCase("service-subscription")){

-					if(isBlank(serviceType) || isBlank(globalCustomerId)){

-						utils.log("DEBUG", "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")

-					}else{

-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-						utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-					}

-				}else{

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")

-				}

-			}else{

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENGS_type is null. Variable is Required.")

-			}

-

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", "Internal Error encountered within GenericGetService PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetService PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericGetService PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method obtains the Url to the provided service instance

-	 * using the Service Instance Id.

-	 *

-	 * @param - execution

-	 */

-	public void obtainServiceInstanceUrlById(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-

-			String type = execution.getVariable("GENGS_type")

-			String path = ""

-			if(type.equalsIgnoreCase("service-instance")){

-				String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId, isDebugEnabled)

-				path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"

-				utils.logAudit("Service Instance Node Query Url is: " + path)

-				utils.log("DEBUG", "Service Instance Node Query Url is: " + path, isDebugEnabled)

-			}else if(type.equalsIgnoreCase("allotted-resource")){

-				String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Allotted Resource Id: " + allottedResourceId, isDebugEnabled)

-				path = "${aai_uri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"

-				utils.logAudit("Allotted Resource Node Query Url is: " + path)

-				utils.log("DEBUG", "Allotted Resource Node Query Url is: " + path, isDebugEnabled)

-			}

-

-			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property

-			String url = "${path}"

-			execution.setVariable("GENGS_genericQueryPath", url)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_genericQueryResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI GET Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			execution.setVariable("GENGS_obtainSIUrlResponseBeforeUnescaping", aaiResponse)

-			utils.log("DEBUG", "GenericGetService AAI Response before unescaping: " + aaiResponse, isDebugEnabled)

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_genericQueryResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			utils.log("DEBUG", "GenericGetService AAI Response: " + aaiResponse, isDebugEnabled)

-

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "Generic Query Received a Good Response Code", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				if(utils.nodeExists(aaiResponse, "result-data")){

-					utils.log("DEBUG", "Generic Query Response Does Contain Data" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

-					execution.setVariable("GENGS_resourceLink", resourceLink)

-					execution.setVariable("GENGS_siResourceLink", resourceLink)

-				}else{

-					utils.log("DEBUG", "Generic Query Response Does NOT Contains Data" , isDebugEnabled)

-					execution.setVariable("WorkflowResponse", "  ") //for junits

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "Generic Query Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}else{

-				utils.log("DEBUG", "Generic Query Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetService ObtainServiceInstanceUrlById method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlById")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * This method obtains the Url to the provided service instance

-	 * using the Service Instance Name.

-	 *

-	 * @param - execution

-	 */

-	public void obtainServiceInstanceUrlByName(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlByName Process*** ", isDebugEnabled)

-		try {

-			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")

-			utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Name " + serviceInstanceName, isDebugEnabled)

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			String path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-name:EQUALS:${serviceInstanceName}"

-

-			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property

-			String url = "${path}"

-			execution.setVariable("GENGS_obtainSIUrlPath", url)

-

-			utils.logAudit("GenericGetService AAI Endpoint: " + aai_endpoint)

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "  Query for Service Instance Url Received a Good Response Code", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-				boolean nodeExists = isBlank(globalCustomerId) ? utils.nodeExists(aaiResponse, "result-data") : hasCustomerServiceInstance(aaiResponse, globalCustomerId)

-				if(nodeExists){

-					utils.log("DEBUG", "Query for Service Instance Url Response Does Contain Data" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

-					execution.setVariable("GENGS_resourceLink", resourceLink)

-					execution.setVariable("GENGS_siResourceLink", resourceLink)

-				}else{

-					utils.log("DEBUG", "Query for Service Instance Url Response Does NOT Contains Data" , isDebugEnabled)

-					execution.setVariable("WorkflowResponse", "  ") //for junits

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "  Query for Service Instance Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENGS_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}else{

-				utils.log("DEBUG", "Query for Service Instance Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetService ObtainServiceInstanceUrlByName method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlByName")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService ObtainServiceInstanceUrlByName Process*** ", isDebugEnabled)

-	}

-

-

-	/**

-	 * This method executes a GET call to AAI to obtain the

-	 * service-instance or service-subscription

-	 *

-	 * @param - execution

-	 */

-	public void getServiceObject(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetService GetServiceObject Process*** ", isDebugEnabled)

-		try {

-			String type = execution.getVariable("GENGS_type")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			String serviceEndpoint = ""

-

-			utils.logAudit("GenericGetService getServiceObject AAI Endpoint: " + aai_endpoint)

-			if(type.equalsIgnoreCase("service-instance")){

-				String siResourceLink = execution.getVariable("GENGS_resourceLink")

-				if(isBlank(siResourceLink)){

-					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-					String serviceType = execution.getVariable("GENGS_serviceType")

-					utils.log("DEBUG", " Incoming GENGS_serviceType is: " + serviceType, isDebugEnabled)

-					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-

-					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")

-				}else{

-					utils.log("DEBUG", "Incoming Service Instance Url is: " + siResourceLink, isDebugEnabled)

-					String[] split = siResourceLink.split("/aai/")

-					serviceEndpoint = "/aai/" + split[1]

-				}

-			}else if(type.equalsIgnoreCase("allotted-resource")){

-				String siResourceLink = execution.getVariable("GENGS_resourceLink")

-				if(isBlank(siResourceLink)){

-					String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

-					utils.log("DEBUG", " Incoming GENGS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)

-					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-					String serviceType = execution.getVariable("GENGS_serviceType")

-					utils.log("DEBUG", " Incoming GENGS_serviceType is: " + serviceType, isDebugEnabled)

-					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-

-					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") +  "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")

-				}else{

-					utils.log("DEBUG", "Incoming Allotted-Resource Url is: " + siResourceLink, isDebugEnabled)

-					String[] split = siResourceLink.split("/aai/")

-					serviceEndpoint = "/aai/" + split[1]

-				}

-			}else if(type.equalsIgnoreCase("service-subscription")){

-				String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

-				String serviceType = execution.getVariable("GENGS_serviceType")

-				serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")

-			}

-

-			String serviceUrl = "${aai_endpoint}" + serviceEndpoint

-

-			execution.setVariable("GENGS_getServiceUrl", serviceUrl)

-			utils.log("DEBUG", "GET Service AAI Path is: \n" + serviceUrl, isDebugEnabled)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, serviceUrl)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_getServiceResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_getServiceResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			aaiResponse = aaiResponse.replaceAll("&", "&amp;")

-			//Process Response

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET Service Received a Good Response Code", isDebugEnabled)

-				if(utils.nodeExists(aaiResponse, "service-instance") || utils.nodeExists(aaiResponse, "service-subscription")){

-					utils.log("DEBUG", "GET Service Response Contains a service-instance" , isDebugEnabled)

-					execution.setVariable("GENGS_FoundIndicator", true)

-					execution.setVariable("GENGS_service", aaiResponse)

-					execution.setVariable("WorkflowResponse", aaiResponse)

-

-				}else{

-					utils.log("DEBUG", "GET Service Response Does NOT Contain Data" , isDebugEnabled)

-				}

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Service Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("WorkflowResponse", "  ") //for junits

-			}

-			else{

-				utils.log("DEBUG", "  GET Service Received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericGetService GetServiceObject method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GenericGetService")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetService GetServiceObject Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * An utility method which check whether a service(by name) is already present within a globalCustomerId or not.

-	 * @param jsonResponse raw response received from AAI by searching ServiceInstance by Name.

-	 * @param globalCustomerId

-	 * @return {@code true} if globalCustomerId is found at 6th position within "resource-link", {@code false} in any other cases.

-	 */

-	public boolean hasCustomerServiceInstance(String aaiResponse, final String globalCustomerId) {

-		if (isBlank(aaiResponse)) {

-			return false

-		}

-		aaiResponse = utils.removeXmlNamespaces(aaiResponse)

-		ArrayList<String> linksArray = utils.getMultNodeObjects(aaiResponse, "resource-link")

-		if (linksArray == null || linksArray.size() == 0) {

-			return false

-		}

-		for (String resourceLink : linksArray) {

-			int custStart = resourceLink.indexOf("customer/")

-			int custEnd = resourceLink.indexOf("/service-subscriptions/")

-			String receivedCustomerId = resourceLink.substring(custStart + 9, custEnd)

-			if (globalCustomerId.equals(receivedCustomerId)) {

-				return true

-			}

-		}

-		return false

-	}

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
+
+import org.apache.commons.lang3.StringEscapeUtils
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+import static org.apache.commons.lang3.StringUtils.isBlank
+
+
+
+/**
+ * This class supports the GenericGetService Sub Flow.
+ * This Generic sub flow can be used by any flow for accomplishing
+ * the goal of getting a Service-Instance or Service-Subscription (from AAI).
+ * The calling flow must set the GENGS_type variable as "service-instance"
+ * or "service-subscription".
+ *
+ * When using to Get a Service-Instance:
+ * If the global-customer-id and service-type are not provided
+ * this flow executes a query to get the service- Url using the
+ * Service  Id or Name (whichever is provided).
+ *
+ * When using to Get a Service-Subscription:
+ * The global-customer-id and service-type must be
+ * provided.
+ *
+ * Upon successful completion of this sub flow the
+ * GENGS_SuccessIndicator will be true and the query response payload
+ * will be set to GENGS_service.  An MSOWorkflowException will
+ * be thrown upon unsuccessful completion or if an error occurs
+ * at any time during this sub flow. Please map variables
+ * to the corresponding variable names below.
+ *
+ * Note - If this sub flow receives a Not Found (404) response
+ * from AAI at any time this will be considered an acceptable
+ * successful response however the GENGS_FoundIndicator
+ * will be set to false. This variable will allow the calling flow
+ * to distinguish between the two Success scenarios,
+ * "Success where service- is found" and
+ * "Success where service- is NOT found".
+ *
+ *
+ * Variable Mapping Below:
+ *
+ * In Mapping Variables:
+ *   For Allotted-Resource:
+ *     @param - GENGS_allottedResourceId
+ *     @param - GENGS_type
+ *     @param (Optional) - GENGS_serviceInstanceId
+ *     @param (Optional) - GENGS_serviceType
+ *     @param (Optional) - GENGS_globalCustomerId
+ *
+ *   For Service-Instance:
+ *     @param - GENGS_serviceInstanceId or @param - GENGS_serviceInstanceName
+ *     @param - GENGS_type
+ *     @param (Optional) - GENGS_serviceType
+ *     @param (Optional) - GENGS_globalCustomerId
+ *
+ *   For Service-Subscription:
+ *     @param - GENGS_type
+ *     @param - GENGS_serviceType
+ *     @param - GENGS_globalCustomerId
+ *
+ *
+ * Out Mapping Variables:
+ *    @param - GENGS_service
+ *    @param - GENGS_FoundIndicator
+ *    @param - WorkflowException
+ */
+class GenericGetService extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, GenericGetService.class);
+
+
+	String Prefix = "GENGS_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * This method validates the incoming variables and
+	 * determines the subsequent event based on which
+	 * variables the calling flow provided.
+	 *
+	 * @param - execution
+	 *
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService PreProcessRequest Process")
+
+		execution.setVariable("GENGS_obtainObjectsUrl", false)
+		execution.setVariable("GENGS_obtainServiceInstanceUrlByName", false)
+		execution.setVariable("GENGS_SuccessIndicator", false)
+		execution.setVariable("GENGS_FoundIndicator", false)
+		execution.setVariable("GENGS_resourceLink", null)
+		execution.setVariable("GENGS_siResourceLink", null)
+
+		try{
+			// Get Variables
+			String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")
+			String serviceType = execution.getVariable("GENGS_serviceType")
+			String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+			String type = execution.getVariable("GENGS_type")
+
+			if(type != null){
+				msoLogger.debug("Incoming GENGS_type is: " + type)
+				if(type.equalsIgnoreCase("allotted-resource")){
+					if(isBlank(allottedResourceId)){
+						msoLogger.debug("Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")
+					}else{
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						if(isBlank(globalCustomerId) || isBlank(serviceType) || isBlank(serviceInstanceId)){
+							execution.setVariable("GENGS_obtainObjectsUrl", true)
+						}else{
+							msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+							msoLogger.debug("Incoming Service Type is: " + serviceType)
+							msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+						}
+					}
+				}else if(type.equalsIgnoreCase("service-instance")){
+					if(isBlank(serviceInstanceId) && isBlank(serviceInstanceName)){
+						msoLogger.debug("Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")
+					}else{
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Instance Name is: " + serviceInstanceName)
+						if(isBlank(globalCustomerId) || isBlank(serviceType)){
+							execution.setVariable("GENGS_obtainObjectsUrl", true)
+							if(isBlank(serviceInstanceId)){
+								execution.setVariable("GENGS_obtainServiceInstanceUrlByName", true)
+							}
+						}else{
+							msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+							msoLogger.debug("Incoming Service Type is: " + serviceType)
+						}
+					}
+				}else if(type.equalsIgnoreCase("service-subscription")){
+					if(isBlank(serviceType) || isBlank(globalCustomerId)){
+						msoLogger.debug("Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
+					}else{
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+					}
+				}else{
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")
+				}
+			}else{
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENGS_type is null. Variable is Required.")
+			}
+
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug("Internal Error encountered within GenericGetService PreProcessRequest method!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetService PreProcessRequest")
+
+		}
+		msoLogger.trace("COMPLETED GenericGetService PreProcessRequest Process ")
+	}
+
+	/**
+	 * This method obtains the Url to the provided service instance
+	 * using the Service Instance Id.
+	 *
+	 * @param - execution
+	 */
+	public void obtainServiceInstanceUrlById(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService ObtainServiceInstanceUrlById Process")
+		try {
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+
+			String type = execution.getVariable("GENGS_type")
+			String path = ""
+			if(type.equalsIgnoreCase("service-instance")){
+				String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+				msoLogger.debug(" Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId)
+				path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"
+				msoLogger.debug("Service Instance Node Query Url is: " + path)
+				msoLogger.debug("Service Instance Node Query Url is: " + path)
+			}else if(type.equalsIgnoreCase("allotted-resource")){
+				String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+				msoLogger.debug(" Querying Node for Service-Instance URL by using Allotted Resource Id: " + allottedResourceId)
+				path = "${aai_uri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"
+				msoLogger.debug("Allotted Resource Node Query Url is: " + path)
+				msoLogger.debug("Allotted Resource Node Query Url is: " + path)
+			}
+
+			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property
+			String url = "${path}"
+			execution.setVariable("GENGS_genericQueryPath", url)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_genericQueryResponseCode", responseCode)
+			msoLogger.debug("  GET Service Instance response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI GET Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_obtainSIUrlResponseBeforeUnescaping", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response before unescaping: " + aaiResponse)
+			execution.setVariable("GENGS_genericQueryResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("Generic Query Received a Good Response Code")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				if(utils.nodeExists(aaiResponse, "result-data")){
+					msoLogger.debug("Generic Query Response Does Contain Data" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					String resourceLink = utils.getNodeText(aaiResponse, "resource-link")
+					execution.setVariable("GENGS_resourceLink", resourceLink)
+					execution.setVariable("GENGS_siResourceLink", resourceLink)
+				}else{
+					msoLogger.debug("Generic Query Response Does NOT Contains Data" )
+					execution.setVariable("WorkflowResponse", "  ") //for junits
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("Generic Query Received a Not Found (404) Response")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}else{
+				msoLogger.debug("Generic Query Received a BAD REST Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetService ObtainServiceInstanceUrlById method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlById")
+		}
+		msoLogger.trace("COMPLETED GenericGetService ObtainServiceInstanceUrlById Process")
+	}
+
+	/**
+	 * This method obtains the Url to the provided service instance
+	 * using the Service Instance Name.
+	 *
+	 * @param - execution
+	 */
+	public void obtainServiceInstanceUrlByName(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService ObtainServiceInstanceUrlByName Process")
+		try {
+			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")
+			msoLogger.debug(" Querying Node for Service-Instance URL by using Service-Instance Name " + serviceInstanceName)
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-name:EQUALS:${serviceInstanceName}"
+
+			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property
+			String url = "${path}"
+			execution.setVariable("GENGS_obtainSIUrlPath", url)
+
+			msoLogger.debug("GenericGetService AAI Endpoint: " + aai_endpoint)
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)
+			msoLogger.debug("  GET Service Instance response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("  Query for Service Instance Url Received a Good Response Code")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+				boolean nodeExists = isBlank(globalCustomerId) ? utils.nodeExists(aaiResponse, "result-data") : hasCustomerServiceInstance(aaiResponse, globalCustomerId)
+				if(nodeExists){
+					msoLogger.debug("Query for Service Instance Url Response Does Contain Data" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					String resourceLink = utils.getNodeText(aaiResponse, "resource-link")
+					execution.setVariable("GENGS_resourceLink", resourceLink)
+					execution.setVariable("GENGS_siResourceLink", resourceLink)
+				}else{
+					msoLogger.debug("Query for Service Instance Url Response Does NOT Contains Data" )
+					execution.setVariable("WorkflowResponse", "  ") //for junits
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("  Query for Service Instance Received a Not Found (404) Response")
+				execution.setVariable("GENGS_SuccessIndicator", true)
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}else{
+				msoLogger.debug("Query for Service Instance Received a BAD REST Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetService ObtainServiceInstanceUrlByName method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During ObtainServiceInstanceUrlByName")
+		}
+		msoLogger.trace("COMPLETED GenericGetService ObtainServiceInstanceUrlByName Process")
+	}
+
+
+	/**
+	 * This method executes a GET call to AAI to obtain the
+	 * service-instance or service-subscription
+	 *
+	 * @param - execution
+	 */
+	public void getServiceObject(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetService GetServiceObject Process")
+		try {
+			String type = execution.getVariable("GENGS_type")
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			String serviceEndpoint = ""
+
+			msoLogger.debug("GenericGetService getServiceObject AAI Endpoint: " + aai_endpoint)
+			if(type.equalsIgnoreCase("service-instance")){
+				String siResourceLink = execution.getVariable("GENGS_resourceLink")
+				if(isBlank(siResourceLink)){
+					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+					msoLogger.debug(" Incoming GENGS_serviceInstanceId is: " + serviceInstanceId)
+					String serviceType = execution.getVariable("GENGS_serviceType")
+					msoLogger.debug(" Incoming GENGS_serviceType is: " + serviceType)
+					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+					msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+
+					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+					msoLogger.debug('AAI URI is: ' + aai_uri)
+					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")
+				}else{
+					msoLogger.debug("Incoming Service Instance Url is: " + siResourceLink)
+					String[] split = siResourceLink.split("/aai/")
+					serviceEndpoint = "/aai/" + split[1]
+				}
+			}else if(type.equalsIgnoreCase("allotted-resource")){
+				String siResourceLink = execution.getVariable("GENGS_resourceLink")
+				if(isBlank(siResourceLink)){
+					String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")
+					msoLogger.debug(" Incoming GENGS_allottedResourceId is: " + allottedResourceId)
+					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")
+					msoLogger.debug(" Incoming GENGS_serviceInstanceId is: " + serviceInstanceId)
+					String serviceType = execution.getVariable("GENGS_serviceType")
+					msoLogger.debug(" Incoming GENGS_serviceType is: " + serviceType)
+					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+					msoLogger.debug("Incoming Global Customer Id is: " + globalCustomerId)
+
+					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+					msoLogger.debug('AAI URI is: ' + aai_uri)
+					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") +  "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")
+				}else{
+					msoLogger.debug("Incoming Allotted-Resource Url is: " + siResourceLink)
+					String[] split = siResourceLink.split("/aai/")
+					serviceEndpoint = "/aai/" + split[1]
+				}
+			}else if(type.equalsIgnoreCase("service-subscription")){
+				String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+				String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")
+				String serviceType = execution.getVariable("GENGS_serviceType")
+				serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")
+			}
+
+			String serviceUrl = "${aai_endpoint}" + serviceEndpoint
+
+			execution.setVariable("GENGS_getServiceUrl", serviceUrl)
+			msoLogger.debug("GET Service AAI Path is: \n" + serviceUrl)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, serviceUrl)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGS_getServiceResponseCode", responseCode)
+			msoLogger.debug("  GET Service response code is: " + responseCode)
+			msoLogger.debug("GenericGetService AAI Response Code: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGS_getServiceResponse", aaiResponse)
+			msoLogger.debug("GenericGetService AAI Response: " + aaiResponse)
+			//Process Response
+			if(responseCode == 200 || responseCode == 202){
+				msoLogger.debug("GET Service Received a Good Response Code")
+				if(utils.nodeExists(aaiResponse, "service-instance") || utils.nodeExists(aaiResponse, "service-subscription")){
+					msoLogger.debug("GET Service Response Contains a service-instance" )
+					execution.setVariable("GENGS_FoundIndicator", true)
+					execution.setVariable("GENGS_service", aaiResponse)
+					execution.setVariable("WorkflowResponse", aaiResponse)
+
+				}else{
+					msoLogger.debug("GET Service Response Does NOT Contain Data" )
+				}
+			}else if(responseCode == 404){
+				msoLogger.debug("GET Service Received a Not Found (404) Response")
+				execution.setVariable("WorkflowResponse", "  ") //for junits
+			}
+			else{
+				msoLogger.debug("  GET Service Received a Bad Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered within GenericGetService GetServiceObject method!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GenericGetService")
+		}
+		msoLogger.trace("COMPLETED GenericGetService GetServiceObject Process")
+	}
+
+	/**
+	 * An utility method which check whether a service(by name) is already present within a globalCustomerId or not.
+	 * @param jsonResponse raw response received from AAI by searching ServiceInstance by Name.
+	 * @param globalCustomerId
+	 * @return {@code true} if globalCustomerId is found at 6th position within "resource-link", {@code false} in any other cases.
+	 */
+	public boolean hasCustomerServiceInstance(String aaiResponse, final String globalCustomerId) {
+		if (isBlank(aaiResponse)) {
+			return false
+		}
+		aaiResponse = utils.removeXmlNamespaces(aaiResponse)
+		ArrayList<String> linksArray = utils.getMultNodeObjects(aaiResponse, "resource-link")
+		if (linksArray == null || linksArray.size() == 0) {
+			return false
+		}
+		for (String resourceLink : linksArray) {
+			int custStart = resourceLink.indexOf("customer/")
+			int custEnd = resourceLink.indexOf("/service-subscriptions/")
+			String receivedCustomerId = resourceLink.substring(custStart + 9, custEnd)
+			if (globalCustomerId.equals(receivedCustomerId)) {
+				return true
+			}
+		}
+		return false
+	}
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericGetVnf.groovy
index 1e181a6ee9..01d8e9b8d5 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericGetVnf.groovy
@@ -1,273 +1,275 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*;

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-/**

- * TODO: Support getting vnf type = vpe

- *

- * This class supports the GenericGetVnf Sub Flow.

- * This Generic sub flow can be used by any flow for accomplishing

- * the goal of getting a Vnf Object (from AAI).  The flow currently

- * supports the querying of 2 types of Vnfs, generic-vnf and vce. The

- * type must be provided by the calling flow and the type should

- * be mapped to the variable GENGV_type. The type should either be

- * "generic-vnf" or "vce".  If the Vnf Id is not provided by the calling

- * flow then this sub flow will execute the query to get the

- * Vnf using the Vnf Name. Therefore, the calling flow must provide

- * either the Vnf Id or Vnf Name.

- *

- * Upon successful completion of this sub flow the

- * GENGV_SuccessIndicator will be true and the query response payload

- * will be set to GENGV_vnf.  An MSOWorkflowException will

- * be thrown upon unsuccessful completion or if an error occurs

- * at any time during this sub flow. Please map variables

- * to the corresponding variable names below.

- *

- * Note - if this sub flow receives a Not Found (404) response

- * from AAI at any time this will be considered an acceptable

- * successful response however the GENGV_FoundIndicator

- * set to false.  This will allow the calling flow to distinguish

- * between the two success scenarios, "Success where Vnf is found"

- * and "Success where Vnf is NOT found".

- *

- *

- * Variable Mapping Below

- *

- * In Mapping Variables:

- *   @param - GENGV_vnfId  or  @param - GENGV_vnfName

- *   @param - GENGV_type

- *

- * Out Mapping Variables:

- *   @param - GENGV_vnf

- *   @param - GENGV_SuccessIndicator

- *   @param - GENGV_FoundIndicator

- *   @param - WorkflowException

- *

- *

- */

-class GenericGetVnf extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENGV_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * determines the subsequent event based on which

-	 * variables the calling flow provided.

-	 *

-	 * @param - execution

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetVnf PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENGV_getVnfByName", false)

-		execution.setVariable("GENGV_SuccessIndicator", false)

-		execution.setVariable("GENGV_FoundIndicator", false)

-

-		try{

-			// Get Variables

-			String vnfId = execution.getVariable("GENGV_vnfId")

-			utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)

-			String vnfName = execution.getVariable("GENGV_vnfName")

-			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)

-

-			if(isBlank(vnfId) && isBlank(vnfName)){

-				utils.log("DEBUG", "Incoming Vnf Name and Vnf Id are null. At least one is required!", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Vnf Name and Vnf Id are null. At least one is required.")

-			}else{

-				if(isBlank(vnfId)){

-					execution.setVariable("GENGV_getVnfByName", true)

-				}

-			}

-

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericGetVnf PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetVnf PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericGetVnf PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a GET call to AAI to obtain the

-	 * Vnf using the Vnf Name

-	 *

-	 * @param - execution

-	 */

-	public void getVnfByName(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetVnf GetVnfByName Process*** ", isDebugEnabled)

-		try {

-			String vnfName = execution.getVariable("GENGV_vnfName")

-			utils.log("DEBUG", "Getting Vnf by Vnf Name: " + vnfName, isDebugEnabled)

-			String type = execution.getVariable("GENGV_type")

-			utils.log("DEBUG", "Type of Vnf Getting is: " + type, isDebugEnabled)

-

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-

-			//Determine Type of Vnf Querying For.

-			def aai_uri = ""

-			if(type.equals("generic-vnf")){

-				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			}else if(type.equals("vce")){

-				aai_uri = aaiUriUtil.getNetworkVceUri(execution)

-			}else{

-				utils.log("DEBUG", "Invalid Incoming GENGV_type", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENGV_type")

-			}

-

-			String getVnfPath = "${aai_endpoint}${aai_uri}?vnf-name=" + UriUtils.encode(vnfName, "UTF-8") + "&depth=1"

-

-			execution.setVariable("GENGV_getVnfPath", getVnfPath)

-			utils.logAudit("Get Vnf Url is: " + getVnfPath)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getVnfPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGV_getVnfResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Vnf response code is: " + responseCode, isDebugEnabled)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGV_getVnfResponse", aaiResponse)

-

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "GET Vnf Received a Good Response", isDebugEnabled)

-					if(utils.nodeExists(aaiResponse, type)){

-						utils.log("DEBUG", "GET Vnf Response Contains a Vnf", isDebugEnabled)

-						execution.setVariable("GENGV_FoundIndicator", true)

-						execution.setVariable("GENGV_vnf", aaiResponse)

-						execution.setVariable("WorkflowResponse", aaiResponse)

-					}else{

-						utils.log("DEBUG", "GET Vnf Response Does NOT Contain a Vnf", isDebugEnabled)

-					}

-

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Vnf Received a Not Found (404) Response", isDebugEnabled)

-			}else{

-				utils.log("DEBUG", "GET Vnf Received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetVnf GetVnfByName method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetVnfByName")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetVnf GetVnfByName Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a GET call to AAI to obtain the

-	 * Vnf using the Vnf Id

-	 *

-	 * @param - execution

-	 */

-	public void getVnfById(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericGetVnf GetVnfById Process*** ", isDebugEnabled)

-		try {

-			String vnfId = execution.getVariable("GENGV_vnfId")

-			utils.log("DEBUG", "Getting Vnf by Vnf Id: " + vnfId, isDebugEnabled)

-			String type = execution.getVariable("GENGV_type")

-			utils.log("DEBUG", "Type of Vnf Getting is: " + type, isDebugEnabled)

-

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-

-			//Determine Type of Vnf Querying For.

-			def aai_uri = ""

-			if(type.equals("generic-vnf")){

-				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			}else if(type.equals("vce")){

-				aai_uri = aaiUriUtil.getNetworkVceUri(execution)

-			}else if(type.equals("vpe")){

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "GenericGetVnf does not yet support getting type of vnf = vpe")

-			}else{

-				utils.log("DEBUG", "Invalid Incoming GENGV_type", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENGV_type")

-			}

-			utils.log("DEBUG", "Using AAI Uri: " + aai_uri, isDebugEnabled)

-

-			String getVnfPath = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"

-			utils.log("DEBUG", "GET Vnf Endpoint is: " + getVnfPath, isDebugEnabled)

-

-			execution.setVariable("GENGV_getVnfPath", getVnfPath)

-			utils.logAudit("Get Vnf Url is: " + getVnfPath)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getVnfPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGV_getVnfResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Vnf response code is: " + responseCode, isDebugEnabled)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGV_getVnfResponse", aaiResponse)

-

-			//Process Response

-			if(responseCode == 200){

-				utils.log("DEBUG", "GET Vnf Received a Good Response", isDebugEnabled)

-					if(utils.nodeExists(aaiResponse, type)){

-						utils.log("DEBUG", "GET Vnf Response Contains a Vnf", isDebugEnabled)

-						execution.setVariable("GENGV_FoundIndicator", true)

-						execution.setVariable("GENGV_vnf", aaiResponse)

-						execution.setVariable("WorkflowResponse", aaiResponse)

-					}else{

-						utils.log("DEBUG", "GET Vnf Response Does NOT Contain a Vnf", isDebugEnabled)

-					}

-

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Vnf Received a Not Found (404) Response", isDebugEnabled)

-			}else{

-				utils.log("DEBUG", "GET Vnf Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericGetVnf GetVnfById method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetVnfById")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericGetVnf GetVnfById Process*** ", isDebugEnabled)

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import static org.onap.so.bpmn.common.scripts.GenericUtils.*;
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+/**
+ * TODO: Support getting vnf type = vpe
+ *
+ * This class supports the GenericGetVnf Sub Flow.
+ * This Generic sub flow can be used by any flow for accomplishing
+ * the goal of getting a Vnf Object (from AAI).  The flow currently
+ * supports the querying of 2 types of Vnfs, generic-vnf and vce. The
+ * type must be provided by the calling flow and the type should
+ * be mapped to the variable GENGV_type. The type should either be
+ * "generic-vnf" or "vce".  If the Vnf Id is not provided by the calling
+ * flow then this sub flow will execute the query to get the
+ * Vnf using the Vnf Name. Therefore, the calling flow must provide
+ * either the Vnf Id or Vnf Name.
+ *
+ * Upon successful completion of this sub flow the
+ * GENGV_SuccessIndicator will be true and the query response payload
+ * will be set to GENGV_vnf.  An MSOWorkflowException will
+ * be thrown upon unsuccessful completion or if an error occurs
+ * at any time during this sub flow. Please map variables
+ * to the corresponding variable names below.
+ *
+ * Note - if this sub flow receives a Not Found (404) response
+ * from AAI at any time this will be considered an acceptable
+ * successful response however the GENGV_FoundIndicator
+ * set to false.  This will allow the calling flow to distinguish
+ * between the two success scenarios, "Success where Vnf is found"
+ * and "Success where Vnf is NOT found".
+ *
+ *
+ * Variable Mapping Below
+ *
+ * In Mapping Variables:
+ *   @param - GENGV_vnfId  or  @param - GENGV_vnfName
+ *   @param - GENGV_type
+ *
+ * Out Mapping Variables:
+ *   @param - GENGV_vnf
+ *   @param - GENGV_SuccessIndicator
+ *   @param - GENGV_FoundIndicator
+ *   @param - WorkflowException
+ *
+ *
+ */
+class GenericGetVnf extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, GenericGetVnf.class);
+
+
+	String Prefix = "GENGV_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * This method validates the incoming variables and
+	 * determines the subsequent event based on which
+	 * variables the calling flow provided.
+	 *
+	 * @param - execution
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetVnf PreProcessRequest Process")
+
+		execution.setVariable("GENGV_getVnfByName", false)
+		execution.setVariable("GENGV_SuccessIndicator", false)
+		execution.setVariable("GENGV_FoundIndicator", false)
+
+		try{
+			// Get Variables
+			String vnfId = execution.getVariable("GENGV_vnfId")
+			msoLogger.debug("Incoming Vnf Id is: " + vnfId)
+			String vnfName = execution.getVariable("GENGV_vnfName")
+			msoLogger.debug("Incoming Vnf Name is: " + vnfName)
+
+			if(isBlank(vnfId) && isBlank(vnfName)){
+				msoLogger.debug("Incoming Vnf Name and Vnf Id are null. At least one is required!")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Vnf Name and Vnf Id are null. At least one is required.")
+			}else{
+				if(isBlank(vnfId)){
+					execution.setVariable("GENGV_getVnfByName", true)
+				}
+			}
+
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.debug(" Error encountered within GenericGetVnf PreProcessRequest method!" + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericGetVnf PreProcessRequest")
+
+		}
+		msoLogger.trace("COMPLETED GenericGetVnf PreProcessRequest Process ")
+	}
+
+	/**
+	 * This method executes a GET call to AAI to obtain the
+	 * Vnf using the Vnf Name
+	 *
+	 * @param - execution
+	 */
+	public void getVnfByName(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetVnf GetVnfByName Process")
+		try {
+			String vnfName = execution.getVariable("GENGV_vnfName")
+			msoLogger.debug("Getting Vnf by Vnf Name: " + vnfName)
+			String type = execution.getVariable("GENGV_type")
+			msoLogger.debug("Type of Vnf Getting is: " + type)
+
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+
+			//Determine Type of Vnf Querying For.
+			def aai_uri = ""
+			if(type.equals("generic-vnf")){
+				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			}else if(type.equals("vce")){
+				aai_uri = aaiUriUtil.getNetworkVceUri(execution)
+			}else{
+				msoLogger.debug("Invalid Incoming GENGV_type")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENGV_type")
+			}
+
+			String getVnfPath = "${aai_endpoint}${aai_uri}?vnf-name=" + UriUtils.encode(vnfName, "UTF-8") + "&depth=1"
+
+			execution.setVariable("GENGV_getVnfPath", getVnfPath)
+			msoLogger.debug("Get Vnf Url is: " + getVnfPath)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getVnfPath)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGV_getVnfResponseCode", responseCode)
+			msoLogger.debug("  GET Vnf response code is: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGV_getVnfResponse", aaiResponse)
+
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("GET Vnf Received a Good Response")
+					if(utils.nodeExists(aaiResponse, type)){
+						msoLogger.debug("GET Vnf Response Contains a Vnf")
+						execution.setVariable("GENGV_FoundIndicator", true)
+						execution.setVariable("GENGV_vnf", aaiResponse)
+						execution.setVariable("WorkflowResponse", aaiResponse)
+					}else{
+						msoLogger.debug("GET Vnf Response Does NOT Contain a Vnf")
+					}
+
+			}else if(responseCode == 404){
+				msoLogger.debug("GET Vnf Received a Not Found (404) Response")
+			}else{
+				msoLogger.debug("GET Vnf Received a Bad Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetVnf GetVnfByName method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetVnfByName")
+		}
+		msoLogger.trace("COMPLETED GenericGetVnf GetVnfByName Process")
+	}
+
+	/**
+	 * This method executes a GET call to AAI to obtain the
+	 * Vnf using the Vnf Id
+	 *
+	 * @param - execution
+	 */
+	public void getVnfById(DelegateExecution execution){
+		execution.setVariable("prefix",Prefix)
+		msoLogger.trace("STARTED GenericGetVnf GetVnfById Process")
+		try {
+			String vnfId = execution.getVariable("GENGV_vnfId")
+			msoLogger.debug("Getting Vnf by Vnf Id: " + vnfId)
+			String type = execution.getVariable("GENGV_type")
+			msoLogger.debug("Type of Vnf Getting is: " + type)
+
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+
+			//Determine Type of Vnf Querying For.
+			def aai_uri = ""
+			if(type.equals("generic-vnf")){
+				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			}else if(type.equals("vce")){
+				aai_uri = aaiUriUtil.getNetworkVceUri(execution)
+			}else if(type.equals("vpe")){
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "GenericGetVnf does not yet support getting type of vnf = vpe")
+			}else{
+				msoLogger.debug("Invalid Incoming GENGV_type")
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENGV_type")
+			}
+			msoLogger.debug("Using AAI Uri: " + aai_uri)
+
+			String getVnfPath = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+			msoLogger.debug("GET Vnf Endpoint is: " + getVnfPath)
+
+			execution.setVariable("GENGV_getVnfPath", getVnfPath)
+			msoLogger.debug("Get Vnf Url is: " + getVnfPath)
+
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getVnfPath)
+			int responseCode = response.getStatusCode()
+			execution.setVariable("GENGV_getVnfResponseCode", responseCode)
+			msoLogger.debug("  GET Vnf response code is: " + responseCode)
+
+			String aaiResponse = response.getResponseBodyAsString()
+			execution.setVariable("GENGV_getVnfResponse", aaiResponse)
+
+			//Process Response
+			if(responseCode == 200){
+				msoLogger.debug("GET Vnf Received a Good Response")
+					if(utils.nodeExists(aaiResponse, type)){
+						msoLogger.debug("GET Vnf Response Contains a Vnf")
+						execution.setVariable("GENGV_FoundIndicator", true)
+						execution.setVariable("GENGV_vnf", aaiResponse)
+						execution.setVariable("WorkflowResponse", aaiResponse)
+					}else{
+						msoLogger.debug("GET Vnf Response Does NOT Contain a Vnf")
+					}
+
+			}else if(responseCode == 404){
+				msoLogger.debug("GET Vnf Received a Not Found (404) Response")
+			}else{
+				msoLogger.debug("GET Vnf Received a BAD REST Response: \n" + aaiResponse)
+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}catch(BpmnError b){
+			msoLogger.debug("Rethrowing MSOWorkflowException")
+			throw b
+		}catch(Exception e){
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericGetVnf GetVnfById method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetVnfById")
+		}
+		msoLogger.trace("COMPLETED GenericGetVnf GetVnfById Process")
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericNotificationService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericNotificationService.groovy
new file mode 100644
index 0000000000..591e76e491
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericNotificationService.groovy
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.json.JsonUtils
+import java.text.SimpleDateFormat
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+public class GenericNotificationService  extends AbstractServiceTaskProcessor {	
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, GenericNotificationService.class);
+
+	
+	
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	
+	public void preProcessRequest (DelegateExecution execution) {
+		
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericPutService.groovy
index d1b733aecb..d41134be91 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericPutService.groovy
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.scripts
+
+package org.onap.so.bpmn.common.scripts
+
+import org.onap.so.bpmn.core.UrnPropertiesReader
 
 import static org.apache.commons.lang3.StringUtils.*;
 
@@ -26,14 +29,18 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.apache.commons.codec.binary.Base64
 import org.apache.commons.lang3.*
 
-import org.openecomp.mso.bpmn.core.json.JsonUtils
-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.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.rest.APIResponse;
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
 
 import java.net.URLEncoder;
 import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
 
 /**
  * This class supports the GenericPutService Sub Flow.
@@ -72,6 +79,8 @@ import org.springframework.web.util.UriUtils
 
 
 class GenericPutService extends AbstractServiceTaskProcessor{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, GenericPutService.class);
+
 
 	String Prefix = "GENPS_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
@@ -79,16 +88,15 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 
 	public void preProcessRequest(DelegateExecution execution) {
 		execution.setVariable("isDebugLogEnabled","true")
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED GenericPutService PreProcessRequest Process*** ", isDebugEnabled)
+		msoLogger.trace("STARTED GenericPutService PreProcessRequest Process")
 
 		execution.setVariable("GENPS_SuccessIndicator", false)
 
 		try{
 			// Get Variables
 			String requestId = execution.getVariable("GENPS_requestId")
-			utils.log("DEBUG", "Incoming GENPS_requestId is: " + requestId, isDebugEnabled)
+			msoLogger.debug("Incoming GENPS_requestId is: " + requestId)
 
 			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
 			String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
@@ -98,53 +106,53 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 			String type = execution.getVariable("GENPS_type")
 			
 			if(type != null){
-				utils.log("DEBUG", "Incoming GENPS_type is: " + type, isDebugEnabled)
+				msoLogger.debug("Incoming GENPS_type is: " + type)
 				if(type.equalsIgnoreCase("service-instance")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId)){
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
 					}
 				}else if(type.equalsIgnoreCase("service-subscription")){
 					if(isBlank(serviceType) || isBlank(globalSubscriberId)){
-						utils.log("DEBUG", "Incoming ServiceType or GlobalSubscriberId is null. These variables are required to create a service-subscription.", isDebugEnabled)
+						msoLogger.debug("Incoming ServiceType or GlobalSubscriberId is null. These variables are required to create a service-subscription.")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.")
 					}else{
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
 					}
 				}else if(type.equalsIgnoreCase("allotted-resource")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId) || isBlank(allottedResourceId)){
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
 					}
 				}else if(type.equalsIgnoreCase("tunnel-xconnect")){
 					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId) || isBlank(allottedResourceId) || isBlank(tunnelXconnectId)){
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Tunnel Xconnect Id is: " + tunnelXconnectId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Tunnel Xconnect Id is: " + tunnelXconnectId)
+						msoLogger.debug("Incoming Required Variable is missing or null!")
 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")
 					}else{
-						utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)
-						utils.log("DEBUG", "Incoming Tunnel Xconnect Id is: " + tunnelXconnectId, isDebugEnabled)
+						msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
+						msoLogger.debug("Incoming Service Instance Id is: " + serviceInstanceId)
+						msoLogger.debug("Incoming Service Type is: " + serviceType)
+						msoLogger.debug("Incoming Allotted Resource Id is: " + allottedResourceId)
+						msoLogger.debug("Incoming Tunnel Xconnect Id is: " + tunnelXconnectId)
 					}
 				}else{
 					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")
@@ -154,14 +162,14 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 			}
 
 		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			msoLogger.debug("Rethrowing MSOWorkflowException")
 			throw b
 		}catch(Exception e){
-			utils.log("ERROR", " Error encountered within GenericPutService PreProcessRequest method!" + e, isDebugEnabled)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericPutService PreProcessRequest method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericPutService PreProcessRequest")
 
 		}
-		utils.log("DEBUG", "*** COMPLETED GenericPutService PreProcessRequest Process ***", isDebugEnabled)
+		msoLogger.trace("COMPLETED GenericPutService PreProcessRequest Process ")
 
 	}
 
@@ -173,36 +181,35 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 	 *
 	 */
 	public void putServiceInstance(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")		
 		execution.setVariable("prefix",Prefix)
-		utils.log("DEBUG", " *** STARTED GenericPutService PutServiceInstance method*** ", isDebugEnabled)
+		msoLogger.trace("STARTED GenericPutService PutServiceInstance method")
 		try {
 			String type = execution.getVariable("GENPS_type")
 
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
-			logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
 			String namespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
-			logDebug('AAI namespace is: ' + namespace, isDebugEnabled)
+			msoLogger.debug('AAI namespace is: ' + namespace)
 
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
 			String serviceAaiPath = ""
 			String payload = execution.getVariable("GENPS_payload")
 			execution.setVariable("GENPS_payload", payload)
-			utils.log("DEBUG", "Incoming GENPS_payload is: " + payload, isDebugEnabled)
-			utils.logAudit(payload)
+			msoLogger.debug("Incoming GENPS_payload is: " + payload)
+			msoLogger.debug(payload)
 
 			String serviceType = execution.getVariable("GENPS_serviceType")
-			utils.log("DEBUG", " Incoming GENPS_serviceType is: " + serviceType, isDebugEnabled)
+			msoLogger.debug(" Incoming GENPS_serviceType is: " + serviceType)
 			
 			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
-			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+			msoLogger.debug("Incoming Global Subscriber Id is: " + globalSubscriberId)
 
 			// This IF clause is if we need to create a new Service Instance
 			if(type.equalsIgnoreCase("service-instance")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + URLEncoder.encode(serviceInstanceId,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")
@@ -214,63 +221,62 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 			}else if(type.equalsIgnoreCase("allotted-resource")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
-				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_allottedResourceId is: " + allottedResourceId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") + "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")
 			}else if(type.equalsIgnoreCase("tunnel-xconnect")){
 
 				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
-				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_serviceInstanceId is: " + serviceInstanceId)
 				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
-				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_allottedResourceId is: " + allottedResourceId)
 				String tunnelXconnectId = execution.getVariable("GENPS_tunnelXconnectId")
-				utils.log("DEBUG", " Incoming GENPS_tunnelXconnectId is: " + tunnelXconnectId, isDebugEnabled)
+				msoLogger.debug(" Incoming GENPS_tunnelXconnectId is: " + tunnelXconnectId)
 
 				//	serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + URLEncoder.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + URLEncoder.encode(serviceType,"UTF-8")
 				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + UriUtils.encode(globalSubscriberId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") + "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8") + "/tunnel-xconnects/tunnel-xconnect/" + UriUtils.encode(tunnelXconnectId,"UTF-8")
 			}
 
 			String resourceVersion = execution.getVariable("GENPS_serviceResourceVersion")
-			utils.log("DEBUG", "Incoming Resource Version is: " + resourceVersion, isDebugEnabled)
+			msoLogger.debug("Incoming Resource Version is: " + resourceVersion)
 			if(resourceVersion !=null){
 				serviceAaiPath = serviceAaiPath +'?resource-version=' + UriUtils.encode(resourceVersion,"UTF-8")
 			}
 
 			execution.setVariable("GENPS_putServiceInstanceAaiPath", serviceAaiPath)
-			utils.log("DEBUG", "PUT Service Instance AAI Path is: " + "\n" + serviceAaiPath, isDebugEnabled)
+			msoLogger.debug("PUT Service Instance AAI Path is: " + "\n" + serviceAaiPath)
 			APIResponse response = aaiUriUtil.executeAAIPutCall(execution, serviceAaiPath, payload)
 			int responseCode = response.getStatusCode()
 			execution.setVariable("GENPS_putServiceInstanceResponseCode", responseCode)
-			utils.log("DEBUG", "  Put Service Instance response code is: " + responseCode, isDebugEnabled)
+			msoLogger.debug("  Put Service Instance response code is: " + responseCode)
 
 			String aaiResponse = response.getResponseBodyAsString()
-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)
 			execution.setVariable("GENPS_putServiceInstanceResponse", aaiResponse)
 
 			//Process Response
 			if(responseCode == 200 || responseCode == 201 || responseCode == 202 )
 				//200 OK 201 CREATED 202 ACCEPTED
 			{
-				utils.log("DEBUG", "PUT Service Instance Received a Good Response", isDebugEnabled)
+				msoLogger.debug("PUT Service Instance Received a Good Response")
 				execution.setVariable("GENPS_SuccessIndicator", true)
 			}
 
 			else{
-				utils.log("DEBUG", "Put Generic Service Instance Received a Bad Response Code. Response Code is: " + responseCode, isDebugEnabled)
+				msoLogger.debug("Put Generic Service Instance Received a Bad Response Code. Response Code is: " + responseCode)
 				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)
 				throw new BpmnError("MSOWorkflowException")
 			}
 		}catch(BpmnError b){
-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			msoLogger.debug("Rethrowing MSOWorkflowException")
 			throw b
 		}catch(Exception e){
-			utils.log("ERROR", " Error encountered within GenericPutService PutServiceInstance method!" + e, isDebugEnabled)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, " Error encountered within GenericPutService PutServiceInstance method!" + e, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Put Service Instance")
 		}
-		utils.log("DEBUG", " *** COMPLETED GenericPutService PutServiceInstance Process*** ", isDebugEnabled)
+		msoLogger.trace("COMPLETED GenericPutService PutServiceInstance Process")
 	}
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
new file mode 100644
index 0000000000..cc261a2750
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.apache.commons.lang3.StringUtils;
+
+class GenericUtils extends StringUtils{
+
+	@Override
+	public static boolean isBlank(final CharSequence cs) {
+		int strLen;
+		if (cs == null || (strLen = cs.length()) == 0 || cs.equals("null"))  {
+			return true;
+		}
+		for (int i = 0; i < strLen; i++) {
+			if (!Character.isWhitespace(cs.charAt(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ManualHandling.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
index e79071f1e9..820364b1f7 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ManualHandling.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
@@ -1,345 +1,343 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

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

-

-import java.time.chrono.AbstractChronology

-import java.util.List

-import java.text.SimpleDateFormat

-import java.util.Date

-

-import org.apache.commons.lang3.*

-import org.camunda.bpm.engine.TaskService

-import org.camunda.bpm.engine.task.Task

-import org.camunda.bpm.engine.task.TaskQuery

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

-import org.camunda.bpm.engine.delegate.DelegateTask

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.json.JSONObject;

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

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

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition

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

-import org.openecomp.mso.client.ruby.*

-

-

-

-/**

- * This groovy class supports the <class>ManualHandling.bpmn</class> process.

- *

- * @author

- *

- * Inputs:

- * @param - msoRequestId

- * @param - isDebugLogEnabled

- * @param - serviceType

- * @param - vnfType

- * @param - requestorId

- * @param - currentActivity

- * @param - workStep

- * @param - failedActivity

- * @param - errorCode

- * @param - errorText

- * @param - validResponses

- * @param - vnfName

- *

- * Outputs:

- * @param - WorkflowException

- * @param - taskId

- *

- */

-public class ManualHandling extends AbstractServiceTaskProcessor {

-

-	String Prefix="MH_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	

-	JsonUtils jsonUtils = new JsonUtils()

-

-	public void preProcessRequest (DelegateExecution execution) {

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** preProcessRequest of ManualHandling *****",  isDebugLogEnabled)

-

-		try {

-			execution.setVariable("prefix", Prefix)

-			setBasicDBAuthHeader(execution, isDebugLogEnabled)

-			// check for required input

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

-			utils.log("DEBUG", "msoRequestId is: " + requestId, isDebugLogEnabled)		

-			def serviceType = execution.getVariable("serviceType")

-			utils.log("DEBUG", "serviceType is: " + serviceType, isDebugLogEnabled)

-			def vnfType = execution.getVariable("vnfType")

-			utils.log("DEBUG", "vnftype is: " + vnfType, isDebugLogEnabled)

-			def currentActivity = execution.getVariable("currentActivity")

-			utils.log("DEBUG", "currentActivity is: " + currentActivity, isDebugLogEnabled)

-			def workStep = execution.getVariable("workStep")

-			utils.log("DEBUG", "workStep is: " + workStep, isDebugLogEnabled)

-			def failedActivity = execution.getVariable("failedActivity")

-			utils.log("DEBUG", "failedActivity is: " + failedActivity, isDebugLogEnabled)

-			def errorCode = execution.getVariable("errorCode")

-			utils.log("DEBUG", "errorCode is: " + errorCode, isDebugLogEnabled)

-			def errorText = execution.getVariable("errorText")

-			utils.log("DEBUG", "errorText is: " + errorText, isDebugLogEnabled)

-			def requestorId = execution.getVariable("requestorId")

-			utils.log("DEBUG", "requestorId is: " + requestorId, isDebugLogEnabled)

-			def validResponses = execution.getVariable("validResponses")

-			utils.log("DEBUG", "validResponses is: " + validResponses, isDebugLogEnabled)

-			

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

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

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit preProcessRequest of RainyDayHandler *****",  isDebugLogEnabled)

-	}

-

-	public void createManualTask (DelegateExecution execution) {

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** createManualTask of ManualHandling *****",  isDebugLogEnabled)

-

-		try {

-			String taskId = UUID.randomUUID()

-			execution.setVariable('taskId', taskId)

-			String type = "fallout"

-			String nfRole = execution.getVariable("vnfType")

-			String subscriptionServiceType = execution.getVariable("serviceType")

-			String originalRequestId = execution.getVariable("msoRequestId")

-			String originalRequestorId = execution.getVariable("requestorId")

-			String errorSource = execution.getVariable("failedActivity")

-			String errorCode = execution.getVariable("errorCode")

-			String errorMessage = execution.getVariable("errorText")			

-			String buildingBlockName = execution.getVariable("currentActivity")

-			String buildingBlockStep = execution.getVariable("workStep")

-			String validResponses = execution.getVariable("validResponses")

-			

-			utils.log("DEBUG", "Before creating task", isDebugLogEnabled)			

-			

-			Map<String, String> taskVariables = new HashMap<String, String>()

-			taskVariables.put("type", type)

-			taskVariables.put("nfRole", nfRole)

-			taskVariables.put("subscriptionServiceType", subscriptionServiceType)

-			taskVariables.put("originalRequestId", originalRequestId)

-			taskVariables.put("originalRequestorId", originalRequestorId)

-			taskVariables.put("errorSource", errorSource)

-			taskVariables.put("errorCode", errorCode)

-			taskVariables.put("errorMessage", errorMessage)

-			taskVariables.put("buildingBlockName", buildingBlockName)

-			taskVariables.put("buildingBlockStep", buildingBlockStep)

-			taskVariables.put("validResponses", validResponses)			

-			

-			TaskService taskService = execution.getProcessEngineServices().getTaskService()			

-			Task manualTask = taskService.newTask(taskId)			

-			taskService.saveTask(manualTask)			

-			taskService.setVariables(taskId, taskVariables)

-			utils.log("DEBUG", "successfully created task: "+ taskId, isDebugLogEnabled)

-

-		} catch (BpmnError e) {

-			utils.log("DEBUG", "BPMN exception: " + e.errorMessage, isDebugLogEnabled)

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in createManualTask " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit createManualTask of ManualHandling *****",  isDebugLogEnabled)

-	}

-	

-	public void setTaskVariables (DelegateTask task) {

-				

-		DelegateExecution execution = task.getExecution()

-		

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** setTaskVariables of ManualHandling *****",  isDebugLogEnabled)

-		String taskId = task.getId()

-		utils.log("DEBUG", "taskId is: " + taskId, isDebugLogEnabled)

-

-		try {			

-			execution.setVariable('taskId', taskId)

-			String type = "fallout"

-			String nfRole = execution.getVariable("vnfType")

-			String subscriptionServiceType = execution.getVariable("serviceType")

-			String originalRequestId = execution.getVariable("msoRequestId")

-			String originalRequestorId = execution.getVariable("requestorId")

-			String errorSource = execution.getVariable("failedActivity")

-			String errorCode = execution.getVariable("errorCode")

-			String errorMessage = execution.getVariable("errorText")

-			String buildingBlockName = execution.getVariable("currentActivity")

-			String buildingBlockStep = execution.getVariable("workStep")

-			String validResponses = execution.getVariable("validResponses")

-			

-			utils.log("DEBUG", "Before creating task", isDebugLogEnabled)

-			

-			Map<String, String> taskVariables = new HashMap<String, String>()

-			taskVariables.put("type", type)

-			taskVariables.put("nfRole", nfRole)

-			taskVariables.put("subscriptionServiceType", subscriptionServiceType)

-			taskVariables.put("originalRequestId", originalRequestId)

-			taskVariables.put("originalRequestorId", originalRequestorId)

-			taskVariables.put("errorSource", errorSource)

-			taskVariables.put("errorCode", errorCode)

-			taskVariables.put("errorMessage", errorMessage)

-			taskVariables.put("buildingBlockName", buildingBlockName)

-			taskVariables.put("buildingBlockStep", buildingBlockStep)

-			taskVariables.put("validResponses", validResponses)

-			TaskService taskService = execution.getProcessEngineServices().getTaskService()

-			

-				

-			taskService.setVariables(taskId, taskVariables)

-			utils.log("DEBUG", "successfully created task: "+ taskId, isDebugLogEnabled)

-

-		} catch (BpmnError e) {

-			utils.log("DEBUG", "BPMN exception: " + e.errorMessage, isDebugLogEnabled)

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in createManualTask " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit createManualTask of ManualHandling *****",  isDebugLogEnabled)

-	}

-	

-	public void completeTask (DelegateTask task) {

-		

-		DelegateExecution execution = task.getExecution()

-

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** completeTask of ManualHandling *****",  isDebugLogEnabled)

-		String taskId = task.getId()	

-		utils.log("DEBUG", "taskId is: " + taskId, isDebugLogEnabled)

-

-		try {			

-			TaskService taskService = execution.getProcessEngineServices().getTaskService()	

-		

-			Map<String, String> taskVariables = taskService.getVariables(taskId)

-			String responseValue = taskVariables.get("responseValue")

-						

-			utils.log("DEBUG", "Received responseValue on completion: "+ responseValue, isDebugLogEnabled)

-			// Have to set the first letter of the response to upper case			

-			String responseValueForRainyDay = responseValue.substring(0, 1).toUpperCase() + responseValue.substring(1)

-			utils.log("DEBUG", "ResponseValue to RainyDayHandler: "+ responseValueForRainyDay, isDebugLogEnabled)

-			execution.setVariable("responseValue", responseValueForRainyDay)

-

-		} catch (BpmnError e) {

-			utils.log("DEBUG", "BPMN exception: " + e.errorMessage, isDebugLogEnabled)

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in createManualTask " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit completeTask of ManualHandling *****",  isDebugLogEnabled)

-	}

-	

-	public void prepareRequestsDBStatusUpdate (DelegateExecution execution, String requestStatus){

-		

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

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

-		utils.log("DEBUG"," ***** prepareRequestsDBStatusUpdate of ManualHandling *****",  isDebugLogEnabled)

-		try {

-			def requestId = execution.getVariable("msoRequestId")

-			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>ManualHandling</lastModifiedBy>						         

-						         <requestStatus>${requestStatus}</requestStatus>								 

-						      </req:updateInfraRequest>

-						   </soapenv:Body>

-						</soapenv:Envelope>

-				"""

-			

-			execution.setVariable("setUpdateDBstatusPayload", payload)

-			utils.log("DEBUG", "Outgoing Update Mso Request Payload is: " + payload, isDebugLogEnabled)

-			utils.logAudit("setUpdateDBstatusPayload: " + payload)

-		

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

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

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

-		}

-		

-		utils.log("DEBUG"," ***** Exit prepareRequestsDBStatusUpdate of ManualHandling *****",  isDebugLogEnabled)

-	}

-	

-	public void createAOTSTicket (DelegateExecution execution) {

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** createAOTSTicket of ManualHandling *****",  isDebugLogEnabled)

-		

-		// This method will not be throwing an exception, but rather log the error

-

-		try {

-			execution.setVariable("prefix", Prefix)

-			setBasicDBAuthHeader(execution, isDebugLogEnabled)

-			// check for required input

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

-			utils.log("DEBUG", "requestId is: " + requestId, isDebugLogEnabled)			

-			def currentActivity = execution.getVariable("currentActivity")

-			utils.log("DEBUG", "currentActivity is: " + currentActivity, isDebugLogEnabled)

-			def workStep = execution.getVariable("workStep")

-			utils.log("DEBUG", "workStep is: " + workStep, isDebugLogEnabled)

-			def failedActivity = execution.getVariable("failedActivity")

-			utils.log("DEBUG", "failedActivity is: " + failedActivity, isDebugLogEnabled)

-			def errorCode = execution.getVariable("errorCode")

-			utils.log("DEBUG", "errorCode is: " + errorCode, isDebugLogEnabled)

-			def errorText = execution.getVariable("errorText")

-			utils.log("DEBUG", "errorText is: " + errorText, isDebugLogEnabled)

-			def vnfName = execution.getVariable("vnfName")

-			utils.log("DEBUG", "vnfName is: " + vnfName, isDebugLogEnabled)			

-			

-			String rubyRequestId = UUID.randomUUID()

-			utils.log("DEBUG", "rubyRequestId: " + rubyRequestId, isDebugLogEnabled)

-			String sourceName = vnfName

-			utils.log("DEBUG", "sourceName: " + sourceName, isDebugLogEnabled)

-			String reason = "VID Workflow failed at " + failedActivity + " " + workStep + " call with error " + errorCode

-			utils.log("DEBUG", "reason: " + reason, isDebugLogEnabled)

-			String workflowId = requestId

-			utils.log("DEBUG", "workflowId: " + workflowId, isDebugLogEnabled)

-			String notification = "Request originated from VID | Workflow fallout on " + vnfName + " | Workflow step failure: " + workStep + " failed | VID workflow ID: " + workflowId

-			utils.log("DEBUG", "notification: " + notification, isDebugLogEnabled)			

-			

-			utils.log("DEBUG", "Creating AOTS Ticket request")			

-			

-			RubyClient rubyClient = new RubyClient()

-			rubyClient.rubyCreateTicketCheckRequest(rubyRequestId, sourceName, reason, workflowId, notification)			

-			

-		} catch (BpmnError e) {

-			msg = "BPMN error in createAOTSTicket " + ex.getMessage()

-			utils.log("ERROR", msg, isDebugLogEnabled)			

-		} catch (Exception ex){

-			msg = "Exception in createAOTSTicket " + ex.getMessage()

-			utils.log("ERROR", msg, isDebugLogEnabled)			

-		}

-		utils.log("DEBUG"," ***** Exit createAOTSTicket of ManualHandling *****",  isDebugLogEnabled)

-	}

-

-	

-	

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import java.time.chrono.AbstractChronology
+import java.util.List
+import java.text.SimpleDateFormat
+import java.util.Date
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.TaskService
+import org.camunda.bpm.engine.task.Task
+import org.camunda.bpm.engine.task.TaskQuery
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateTask
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.json.JSONObject;
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.client.ruby.*
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+
+/**
+ * This groovy class supports the <class>ManualHandling.bpmn</class> process.
+ *
+ * @author
+ *
+ * Inputs:
+ * @param - msoRequestId
+ * @param - isDebugLogEnabled
+ * @param - serviceType
+ * @param - vnfType
+ * @param - requestorId
+ * @param - currentActivity
+ * @param - workStep
+ * @param - failedActivity
+ * @param - errorCode
+ * @param - errorText
+ * @param - validResponses
+ * @param - vnfName
+ *
+ * Outputs:
+ * @param - WorkflowException
+ * @param - taskId
+ *
+ */
+public class ManualHandling extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ManualHandling.class);
+
+
+	String Prefix="MH_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	JsonUtils jsonUtils = new JsonUtils()
+
+	public void preProcessRequest (DelegateExecution execution) {
+		String msg = ""
+		msoLogger.trace("preProcessRequest of ManualHandling ")
+
+		try {
+			execution.setVariable("prefix", Prefix)
+			setBasicDBAuthHeader(execution, execution.getVariable('isDebugLogEnabled'))
+			// check for required input
+			String requestId = execution.getVariable("msoRequestId")
+			msoLogger.debug("msoRequestId is: " + requestId)
+			def serviceType = execution.getVariable("serviceType")
+			msoLogger.debug("serviceType is: " + serviceType)
+			def vnfType = execution.getVariable("vnfType")
+			msoLogger.debug("vnftype is: " + vnfType)
+			def currentActivity = execution.getVariable("currentActivity")
+			msoLogger.debug("currentActivity is: " + currentActivity)
+			def workStep = execution.getVariable("workStep")
+			msoLogger.debug("workStep is: " + workStep)
+			def failedActivity = execution.getVariable("failedActivity")
+			msoLogger.debug("failedActivity is: " + failedActivity)
+			def errorCode = execution.getVariable("errorCode")
+			msoLogger.debug("errorCode is: " + errorCode)
+			def errorText = execution.getVariable("errorText")
+			msoLogger.debug("errorText is: " + errorText)
+			def requestorId = execution.getVariable("requestorId")
+			msoLogger.debug("requestorId is: " + requestorId)
+			def validResponses = execution.getVariable("validResponses")
+			msoLogger.debug("validResponses is: " + validResponses)
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in preProcessRequest " + ex.getMessage()
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit preProcessRequest of RainyDayHandler ")
+	}
+
+	public void createManualTask (DelegateExecution execution) {
+		String msg = ""
+		msoLogger.trace("createManualTask of ManualHandling ")
+
+		try {
+			String taskId = UUID.randomUUID()
+			execution.setVariable('taskId', taskId)
+			String type = "fallout"
+			String nfRole = execution.getVariable("vnfType")
+			String subscriptionServiceType = execution.getVariable("serviceType")
+			String originalRequestId = execution.getVariable("msoRequestId")
+			String originalRequestorId = execution.getVariable("requestorId")
+			String errorSource = execution.getVariable("failedActivity")
+			String errorCode = execution.getVariable("errorCode")
+			String errorMessage = execution.getVariable("errorText")
+			String buildingBlockName = execution.getVariable("currentActivity")
+			String buildingBlockStep = execution.getVariable("workStep")
+			String validResponses = execution.getVariable("validResponses")
+
+			msoLogger.debug("Before creating task")
+
+			Map<String, String> taskVariables = new HashMap<String, String>()
+			taskVariables.put("type", type)
+			taskVariables.put("nfRole", nfRole)
+			taskVariables.put("subscriptionServiceType", subscriptionServiceType)
+			taskVariables.put("originalRequestId", originalRequestId)
+			taskVariables.put("originalRequestorId", originalRequestorId)
+			taskVariables.put("errorSource", errorSource)
+			taskVariables.put("errorCode", errorCode)
+			taskVariables.put("errorMessage", errorMessage)
+			taskVariables.put("buildingBlockName", buildingBlockName)
+			taskVariables.put("buildingBlockStep", buildingBlockStep)
+			taskVariables.put("validResponses", validResponses)
+
+			TaskService taskService = execution.getProcessEngineServices().getTaskService()
+			Task manualTask = taskService.newTask(taskId)
+			taskService.saveTask(manualTask)
+			taskService.setVariables(taskId, taskVariables)
+			msoLogger.debug("successfully created task: "+ taskId)
+		} catch (BpmnError e) {
+			msoLogger.debug("BPMN exception: " + e.errorMessage)
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in createManualTask " + ex.getMessage()
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit createManualTask of ManualHandling ")
+	}
+
+	public void setTaskVariables (DelegateTask task) {
+
+		DelegateExecution execution = task.getExecution()
+
+		String msg = ""
+		msoLogger.trace("setTaskVariables of ManualHandling ")
+		String taskId = task.getId()
+		msoLogger.debug("taskId is: " + taskId)
+
+		try {
+			execution.setVariable('taskId', taskId)
+			String type = "fallout"
+			String nfRole = execution.getVariable("vnfType")
+			String subscriptionServiceType = execution.getVariable("serviceType")
+			String originalRequestId = execution.getVariable("msoRequestId")
+			String originalRequestorId = execution.getVariable("requestorId")
+			String errorSource = execution.getVariable("failedActivity")
+			String errorCode = execution.getVariable("errorCode")
+			String errorMessage = execution.getVariable("errorText")
+			String buildingBlockName = execution.getVariable("currentActivity")
+			String buildingBlockStep = execution.getVariable("workStep")
+			String validResponses = execution.getVariable("validResponses")
+
+			msoLogger.debug("Before creating task")
+
+			Map<String, String> taskVariables = new HashMap<String, String>()
+			taskVariables.put("type", type)
+			taskVariables.put("nfRole", nfRole)
+			taskVariables.put("subscriptionServiceType", subscriptionServiceType)
+			taskVariables.put("originalRequestId", originalRequestId)
+			taskVariables.put("originalRequestorId", originalRequestorId)
+			taskVariables.put("errorSource", errorSource)
+			taskVariables.put("errorCode", errorCode)
+			taskVariables.put("errorMessage", errorMessage)
+			taskVariables.put("buildingBlockName", buildingBlockName)
+			taskVariables.put("buildingBlockStep", buildingBlockStep)
+			taskVariables.put("validResponses", validResponses)
+			TaskService taskService = execution.getProcessEngineServices().getTaskService()
+
+
+			taskService.setVariables(taskId, taskVariables)
+			msoLogger.debug("successfully created task: "+ taskId)
+		} catch (BpmnError e) {
+			msoLogger.debug("BPMN exception: " + e.errorMessage)
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in createManualTask " + ex.getMessage()
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit createManualTask of ManualHandling ")
+	}
+
+	public void completeTask (DelegateTask task) {
+
+		DelegateExecution execution = task.getExecution()
+
+		String msg = ""
+		msoLogger.trace("completeTask of ManualHandling ")
+		String taskId = task.getId()
+		msoLogger.debug("taskId is: " + taskId)
+
+		try {
+			TaskService taskService = execution.getProcessEngineServices().getTaskService()
+
+			Map<String, String> taskVariables = taskService.getVariables(taskId)
+			String responseValue = taskVariables.get("responseValue")
+
+			msoLogger.debug("Received responseValue on completion: "+ responseValue)
+			// Have to set the first letter of the response to upper case
+			String responseValueForRainyDay = responseValue.substring(0, 1).toUpperCase() + responseValue.substring(1)
+			msoLogger.debug("ResponseValue to RainyDayHandler: "+ responseValueForRainyDay)
+			execution.setVariable("responseValue", responseValueForRainyDay)
+
+		} catch (BpmnError e) {
+			msoLogger.debug("BPMN exception: " + e.errorMessage)
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in createManualTask " + ex.getMessage()
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit completeTask of ManualHandling ")
+	}
+
+	public void prepareRequestsDBStatusUpdate (DelegateExecution execution, String requestStatus){
+
+		def method = getClass().getSimpleName() + '.prepareRequestsDBStatusUpdate(' +'execution=' + execution.getId() +')'
+		msoLogger.trace("prepareRequestsDBStatusUpdate of ManualHandling ")
+		try {
+			def requestId = execution.getVariable("msoRequestId")
+			String payload = """
+				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+						   <soapenv:Header/>
+						   <soapenv:Body>
+						      <req:updateInfraRequest>
+						         <requestId>${MsoUtils.xmlEscape(requestId)}</requestId>
+						         <lastModifiedBy>ManualHandling</lastModifiedBy>						         
+						         <requestStatus>${MsoUtils.xmlEscape(requestStatus)}</requestStatus>								 
+						      </req:updateInfraRequest>
+						   </soapenv:Body>
+						</soapenv:Envelope>
+				"""
+
+			execution.setVariable("setUpdateDBstatusPayload", payload)
+			msoLogger.debug("Outgoing Update Mso Request Payload is: " + payload)
+			msoLogger.debug("setUpdateDBstatusPayload: " + payload)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
+		}
+
+		msoLogger.trace("Exit prepareRequestsDBStatusUpdate of ManualHandling ")
+	}
+
+	public void createAOTSTicket (DelegateExecution execution) {
+		String msg = ""
+		msoLogger.trace("createAOTSTicket of ManualHandling ")
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		// This method will not be throwing an exception, but rather log the error
+
+		try {
+			execution.setVariable("prefix", Prefix)
+			setBasicDBAuthHeader(execution,isDebugLogEnabled)
+			// check for required input
+			String requestId = execution.getVariable("msoRequestId")
+			msoLogger.debug("requestId is: " + requestId)
+			def currentActivity = execution.getVariable("currentActivity")
+			msoLogger.debug("currentActivity is: " + currentActivity)
+			def workStep = execution.getVariable("workStep")
+			msoLogger.debug("workStep is: " + workStep)
+			def failedActivity = execution.getVariable("failedActivity")
+			msoLogger.debug("failedActivity is: " + failedActivity)
+			def errorCode = execution.getVariable("errorCode")
+			msoLogger.debug("errorCode is: " + errorCode)
+			def errorText = execution.getVariable("errorText")
+			msoLogger.debug("errorText is: " + errorText)
+			def vnfName = execution.getVariable("vnfName")
+			msoLogger.debug("vnfName is: " + vnfName)
+
+			String rubyRequestId = UUID.randomUUID()
+			msoLogger.debug("rubyRequestId: " + rubyRequestId)
+			String sourceName = vnfName
+			msoLogger.debug("sourceName: " + sourceName)
+			String reason = "VID Workflow failed at " + failedActivity + " " + workStep + " call with error " + errorCode
+			msoLogger.debug("reason: " + reason)
+			String workflowId = requestId
+			msoLogger.debug("workflowId: " + workflowId)
+			String notification = "Request originated from VID | Workflow fallout on " + vnfName + " | Workflow step failure: " + workStep + " failed | VID workflow ID: " + workflowId
+			msoLogger.debug("notification: " + notification)
+
+			msoLogger.debug("Creating AOTS Ticket request")
+
+			RubyClient rubyClient = new RubyClient()
+			rubyClient.rubyCreateTicketCheckRequest(rubyRequestId, sourceName, reason, workflowId, notification)
+
+		} catch (BpmnError e) {
+			msg = "BPMN error in createAOTSTicket " + ex.getMessage()
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+		} catch (Exception ex){
+			msg = "Exception in createAOTSTicket " + ex.getMessage()
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+		}
+		msoLogger.trace("Exit createAOTSTicket of ManualHandling ")
+	}
+
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
index 719aeb837f..f9ddd0d430 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/MsoUtils.groovy
@@ -1,1016 +1,999 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import groovy.xml.XmlUtil

-

-import java.text.SimpleDateFormat

-

-import org.apache.commons.codec.binary.Base64

-import org.openecomp.mso.bpmn.core.BPMNLogger

-import org.openecomp.mso.bpmn.core.xml.XmlTool

-import org.openecomp.mso.logger.MessageEnum

-import org.openecomp.mso.logger.MsoLogger

-import org.openecomp.mso.utils.CryptoUtils

-import org.slf4j.MDC

-import org.w3c.dom.Element

-

-class MsoUtils {

-	def initializeEndPoints(execution){

-		// use this placeholder to initialize end points, if called independently, this need to be set

-		execution.setVariable("AAIEndPoint","http://localhost:28080/SoapUIMocks")			

-	}

-	

-	/**

-	 * Use getNodeText1 Instead!

-	 */

-	@Deprecated

-	def getNodeText(xmlInput,element){

-		def rtn=null

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			rtn= xml.'**'.find{node->node.name()==element}.text()

-		}

-		return rtn

-	}

-	def getMultNodes(xmlInput, element){

-		def nodes=null

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			nodes = xml.'**'.findAll{ node-> node.name() == element }*.text()

-		}

-		return nodes

-	}

-	/**

-	 * Note: this uses XmlParser instead of XmlSlurper, thus it is not as

-	 * efficient because it instantiates the whole DOM tree.

-	 * @param xmlInput

-	 * @param element

-	 * @return a list of Nodes, or {@code null} if <i>xmlInput</i> is {@code null}

-	 */

-	def getMultNodeObjects(xmlInput, element){

-		def nodes=null

-		if(xmlInput!=null){

-			def xml= new XmlParser().parseText(xmlInput)

-			nodes = xml.'**'.findAll{ node-> node.name() == element }

-		}

-		return nodes

-	}

-	def getNodeText1(xmlInput,element){

-		def rtn=null

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			rtn= xml.'**'.find{node->node.name()==element}

-			if (rtn != null){

-				rtn=rtn.text()

-			}

-		}

-		return rtn

-	}	

-	def getNodeXml(xmlInput,element){

-		return getNodeXml(xmlInput, element, true)

-	}

-	def getNodeXml(xmlInput,element,incPreamble){

-		def fxml= new XmlSlurper().parseText(xmlInput)

-		def nodeToSerialize = fxml.'**'.find {it.name() == element}

-		if(nodeToSerialize==null){

-			return ""

-		}

-		def nodeAsText = XmlUtil.serialize(nodeToSerialize)

-		if (!incPreamble) {

-			nodeAsText = removeXmlPreamble(nodeAsText)

-		}

-		return nodeAsText		

-	}

-	def nodeExists(xmlInput,element){

-		try {

-			def fxml= new XmlSlurper().parseText(xmlInput)

-			def nodeToSerialize = fxml.'**'.find {it.name() == element}

-			return nodeToSerialize!=null

-		} catch(Exception e) {

-			return false

-		}

-	}

-

-	

-	/***** Utilities when using XmlParser *****/

-	

-	/**

-	 * Convert a Node into a String by deserializing it and formatting it.

-	 *

-	 * @param node Node to be converted.

-	 * @return the Node as a String.

-	 */

-	def String nodeToString(Node node) {

-		def String nodeAsString = groovy.xml.XmlUtil.serialize(node)

-		nodeAsString = removeXmlPreamble(nodeAsString)

-		return formatXml(nodeAsString)

-	}

-	

-	/**

-	 * Get the specified child Node of the specified parent. If there are

-	 * multiple children of the same name, only the first one is returned.

-	 * If there are no children with the specified name, 'null' is returned.

-	 * 

-	 * @param parent Parent Node in which to find a child.

-	 * @param childNodeName Name of the child Node to get.

-	 * @return the (first) child Node with the specified name or 'null'

-	 * if a child Node with the specified name does not exist.

-	 */

-	def Node getChildNode(Node parent, String childNodeName) {

-		def NodeList nodeList = getIdenticalChildren(parent, childNodeName)

-		if (nodeList.size() == 0) {

-			return null

-		} else {

-			return nodeList.get(0)

-		}

-	}

-	

-	/**

-	 * Get the textual value of the specified child Node of the specified parent.

-	 * If there are no children with the specified name, 'null' is returned.

-	 * 

-	 * @param parent Parent Node in which to find a child.

-	 * @param childNodeName Name of the child Node whose value to get.

-	 * @return the textual value of child Node with the specified name or 'null'

-	 * if a child Node with the specified name does not exist.

-	 */

-	def String getChildNodeText(Node parent, String childNodeName) {

-		def Node childNode = getChildNode(parent, childNodeName)

-		if (childNode == null) {

-			return null

-		} else {

-			return childNode.text()

-		}

-	}

-	

-	/**

-	 * Get all of the child nodes from the specified parent that have the

-	 * specified name.  The returned NodeList could be empty.

-	 * 

-	 * @param parent Parent Node in which to find children.

-	 * @param childNodeName Name of the children to get.

-	 * @return a NodeList of all the children from the parent with the specified

-	 * name. The list could be empty.

-	 */

-	def NodeList getIdenticalChildren(Node parent, String childNodeName) {

-		return (NodeList) parent.get(childNodeName)

-	}

-

-	/***** End of Utilities when using XmlParser *****/

-

-	

-	/** these are covered under the common function above**/

-	def getSubscriberName(xmlInput,element){

-		def rtn=null

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			rtn= xml.'**'.find{node->node.name()==element}.text()

-		} 

-		return rtn

-	}

-	def getTenantInformation(xmlInput,element){

-		def xml= new XmlSlurper().parseText(xmlInput)

-		def nodeToSerialize = xml.'**'.find {it.name() == 'service-information'}

-		def nodeAsText = XmlUtil.serialize(nodeToSerialize)

-		return nodeAsText

-	}

-	def getServiceInstanceId(xmlInput,element){

-		def xml= new XmlSlurper().parseText(xmlInput)

-		return ( xml.'**'.find{node->node.name()==element}.text() )

-	}

-	//for aai tenant url

-	def searchResourceLink(xmlInput, resourceType){

-		def fxml= new XmlSlurper().parseText(xmlInput)

-		def element = fxml.'**'.find {it.'resource-type' == resourceType}

-		return (element == null) ? null : element.'resource-link'.text()

-	}

-

-	def searchMetaData(xmlInput, searchName, searchValue){

-		def fxml= new XmlSlurper().parseText(xmlInput)

-		def ret = fxml.'**'.find {it.metaname.text() == searchName && it.metaval.text() == searchValue}

-		if(ret != null){

-			return ret.parent().parent()

-		}

-		return ret

-	}

-	

-	def searchMetaDataNode(fxml, searchName, searchValue){

-		def ret = fxml.'**'.find {it.metaname.text() == searchName && it.metaval.text() == searchValue}

-		if(ret != null){

-			return ret.parent().parent()

-		}

-		return ret

-	}

-	

-	// for Trinity L3 add/delete bonding

-	def getPBGFList(isDebugLogEnabled, xmlInput){

-		xmlInput = xmlInput.replaceAll("&amp;", "&")

-		xmlInput = xmlInput.replaceAll("&lt;", "<")

-		xmlInput = xmlInput.replaceAll("&gt;", ">")

-		log("DEBUG", "getPBGFList: xmlInput " + xmlInput,isDebugLogEnabled)

-		ArrayList myNodes = new ArrayList()

-		if(nodeExists(xmlInput,"nbnc-response-information")){

-		def respInfo=getNodeXml(xmlInput,"nbnc-response-information", false)

-		if(respInfo!=null){

-			def fxml= new XmlSlurper().parseText(respInfo)

-			fxml.'virtual-datacenter-list'.each { vdc ->

-				//we only want to add two BGF per VDC, BGF1 and BGF2

-					def routerList = vdc.'router-list'.first()

-					routerList.each{ myList ->

-						def physNodes  = myList.'**'.findAll {it.'border-element-tangibility'.text() =~ /PHYSICAL/}

-						def nodeToAdd

-						physNodes.each{

-							if(nodeToAdd==null){

-								nodeToAdd = it

-							}else{

-								def beid = nodeToAdd.'border-element-id'.text() +

-									 " " + nodeToAdd.'border-element-type'.text() +

-									 " and " +

-									 it.'border-element-id'.text() +

-									 " " + it.'border-element-type'.text()

-								def mytag = nodeToAdd.'border-element-id'

-								mytag[0].replaceBody(beid)

-							}

-						}

-						def mytag = nodeToAdd.'vlan-id'

-						def ind = mytag.text().indexOf('.')

-						if(ind >= 0){

-							def vlan = mytag.text().substring(0,ind)

-							mytag[0].replaceBody(vlan)

-						}

-						myNodes.add(XmlUtil.serialize(nodeToAdd))

-					}

-					

-			}

-		}

-				

-			return myNodes

-		}else{

-			return null

-		}

-	}

-	

-	def getPBGFList(xmlInput){

-		getPBGFList("false", xmlInput)

-	}

-	

-	def String decodeXML(xml) {

-		def String decodedXml = xml.replaceAll("&amp;", "&")

-		decodedXml = decodedXml.replaceAll("&lt;", "<")

-		decodedXml = decodedXml.replaceAll("&gt;", ">")

-	}

-	

-	def getMetaVal(node, name){

-		try{

-			return node.'**'.find {it.metaname.text() == name}.metaval.text()

-		}catch(Exception e){

-			return null

-		}

-	}

-	def getRelationshipVal(node, name){

-		try{

-			return node.'**'.find {it.'relationship-key'.text() == name}.'relationship-value'.text()

-		}catch(Exception e){

-			return null

-		}

-	}

-

-	

-	def log(logmode,logtxt,isDebugLogEnabled="false"){

-		MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-		if ("INFO"==logmode) {

-			msoLogger.info(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt, "BPMN", MsoLogger.getServiceName());

-		} else if ("WARN"==logmode) {

-			// to see the warning text displayed in the log entry, the text must also be passed as arg0 (2nd argument) to invoke the correct MsoLogger warn() method

-			msoLogger.warn (MessageEnum.BPMN_GENERAL_WARNING, logtxt, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logtxt);

-		} else if ("ERROR"==logmode) {

-			// to see the error text displayed in the log entry, the text must also be passed as arg0 (2nd argument) to invoke the correct MsoLogger error() method

-		    msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logtxt);

-

-		} else {

-			BPMNLogger.debug(isDebugLogEnabled, logtxt);

-		}

-	}

-	

-	def logContext(requestId, serviceInstanceId){

-	    MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-		msoLogger.setLogContext(requestId, serviceInstanceId);

-	}

-	

-	def logMetrics(elapsedTime, logtxt){

-		MsoLogger metricsLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-		

-		metricsLogger.recordMetricEvent (elapsedTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,

-			logtxt, "BPMN", MsoLogger.getServiceName(), null);

-	}

-	

-	def logAudit(logtxt){

-		MsoLogger auditLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-		long startTime = System.currentTimeMillis();

-		

-		auditLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logtxt);

-	}

-	

-	// headers: header - name-value

-	def getHeaderNameValue(xmlInput, nameAttribute){

-		def rtn=null

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			rtn= xml.'**'.find {header->header.'@name'.text() == nameAttribute}.'@value'

-		}

-		return rtn

-	}

-	

-	/**

-	 * Gets the children of the specified element.

-	 */

-	public String getChildNodes(xmlInput, element) {

-		def xml= new XmlSlurper().parseText(xmlInput)

-		def thisElement = xml.'**'.find {it.name() == element}

-		StringBuilder out = new StringBuilder()

-		if (thisElement != null) {

-			thisElement.children().each() {

-				String nodeAsText = removeXmlPreamble(XmlUtil.serialize(it))

-				if (out.length() > 0) {

-					out.append(System.lineSeparator())

-				}

-				out.append(nodeAsText)

-			}

-		}

-		return out.toString();

-	}

-	

-	/**

-	 * Encodes a value so it can be used inside an XML text element.

-	 * @param s the string to encode

-	 * @return the encoded string

-	 */

-	public String xmlEncode(Object value) {

-		return XmlTool.encode(value)

-	}

-	

-	/**

-	 * Encodes a value so it can be used inside an XML attribute.

-	 * @param s the string to encode

-	 * @return the encoded string

-	 */

-	public String xmlEncodeAttr(Object value) {

-		return XmlTool.encodeAttr(value)

-	}

-	

-	/**

-	 * Decodes XML entities in a string value

-	 * @param value a value with embedded XML entities

-	 * @return the decoded string

-	 */

-	public String xmlDecode(Object value) {

-		return XmlTool.decode(value)

-	}

-	

-	/**

-	 * Removes the preamble, if present, from an XML document.

-	 * Also, for historical reasons, this also trims leading and trailing

-	 * whitespace from the resulting document.  TODO: remove the trimming

-	 * and fix unit tests that depend on EXACT xml format.

-	 * @param xml the XML document

-	 * @return a possibly modified document

-	 */

-	public String removeXmlPreamble(def xml) {

-		if (xml == null) {

-			return null

-		}

-

-		return XmlTool.removePreamble(xml).trim()

-	}

-

-	/**

-	 * Removes namespaces and namespace declarations from an XML document.

-	 * @param xml the XML document

-	 * @return a possibly modified document

-	 */

-	public String removeXmlNamespaces(def xml) {

-		return XmlTool.removeNamespaces(xml);

-	}

-

-	/**

-	 * Use formatXml instead.  Note: this method inserts an XML preamble.

-	 */

-	@Deprecated

-	def formatXML(xmlInput) {

-		def parseXml = null

-		def formatXml = null

-		if (xmlInput !=null) {

-			parseXml = new XmlParser().parseText(xmlInput)

-			formatXml = XmlUtil.serialize(parseXml)

-		}

-	}

-

-	/**

-	 * Reformats an XML document. The result will not contain an XML preamble

-	 * or a trailing newline.

-	 * @param xml the XML document

-	 * @return a reformatted document

-	 */

-	public String formatXml(def xml) {

-		return XmlTool.normalize(xml);

-	}

-	

-	// build single elements

-	def buildElements(xmlInput, elementList, parentName) {

-		String var = ""

-		def xmlBuild = ""

-		if (parentName != "") {

-		   xmlBuild += "<tns2:"+parentName+">"

-		}   

-		if (xmlInput != null) {

-			   for (element in elementList) {

-			      def xml= new XmlSlurper().parseText(xmlInput)

-			      var = xml.'**'.find {it.name() == element}

-				  if (var != null) {

-			         xmlBuild += "<tns2:"+element+">"+var.toString()+"</tns2:"+element+">"

-				  } 

-			   }

-		}

-		if (parentName != "") {

-		   xmlBuild += "</tns2:"+parentName+">"

-		}   

-		return xmlBuild

-	}

-	

-	// build the Unbounded elements

-	def buildElementsUnbounded(xmlInput, elementList, parentName) {

-		def varParents = ""

-		def var = ""

-		def xmlBuildUnbounded = ""

-		if (xmlInput != null) {

-			def xml= new XmlSlurper().parseText(xmlInput)

-			varParents = xml.'**'.findAll {it.name() == parentName}

-			//println " Unbounded ${parentName} - varParent.Size() - " + varParents.size()

-			for (i in 0..varParents.size()-1) {

-				if (parentName != "") {

-					xmlBuildUnbounded += "<tns2:"+parentName+">"

-				 }

-				for (element in elementList) {

-					var = varParents[i].'*'.find {it.name() == element}

-				   if (var != null) {

-					  xmlBuildUnbounded += "<tns2:"+element+">"+var.toString()+"</tns2:"+element+">"

-					  //println " i = " + i + ", element: " + element + " = " + var.toString()

-				   }

-				}

-				if (parentName != "") {

-					xmlBuildUnbounded += "</tns2:"+parentName+">"

-				 }

-			}

-		}

-		return xmlBuildUnbounded

-	 }

-	

-	// Build l2-homing-information

-	def buildL2HomingInformation(xmlInput) {

-		def elementsL2HomingList = ["evc-name", "topology", "preferred-aic-clli"]

-		def rebuildL2Home = ''

-		if (xmlInput != null) {

-			rebuildL2Home = buildElements(xmlInput, elementsL2HomingList, "l2-homing-information")

-		}

-		return rebuildL2Home

-	}

-	

-	// Build internet-evc-access-information

-	def buildInternetEvcAccessInformation(xmlInput) {

-		def elementsInternetEvcAccessInformationList = ["internet-evc-speed-value", "internet-evc-speed-units", "ip-version"]

-		def rebuildInternetEvcAccess = ''

-		if (xmlInput != null) {

-			rebuildInternetEvcAccess = buildElements(xmlInput, elementsInternetEvcAccessInformationList, "internet-evc-access-information")

-		}

-		return rebuildInternetEvcAccess

-	}

-	

-	// Build ucpe-vms-service-information

-	def buildUcpeVmsServiceInformation(xmlInput) {

-		def rebuildUcpeVmsServiceInformation = ''

-		if (xmlInput != null) {

-			def ucpeVmsServiceInformation = getNodeXml(xmlInput, "ucpe-vms-service-information").drop(38).trim()

-			rebuildUcpeVmsServiceInformation = "<tns2:ucpe-vms-service-information>"

-			// transport-service-information

-			rebuildUcpeVmsServiceInformation += "<tns2:transport-service-information>"

-			def transportServiceInformation = getNodeXml(ucpeVmsServiceInformation, "transport-service-information").drop(38).trim()

-			def elementsTransportServiceInformationList = ["transport-service-type"]

-			rebuildUcpeVmsServiceInformation += buildElements(transportServiceInformation, elementsTransportServiceInformationList, "")

-			try { // optional

-				def accessCircuitInfoList = ["access-circuit-id", "dual-mode"]

-				rebuildUcpeVmsServiceInformation += buildElementsUnbounded(transportServiceInformation, accessCircuitInfoList, "access-circuit-info")

-			} catch (Exception e) {

-			   log("ERROR", " Optional - Exception ACCESS-CIRCUIT-INFO - 'access-circuit-info' ")

-			}

-			rebuildUcpeVmsServiceInformation += "</tns2:transport-service-information>"

-			// ucpe-information

-			def elementsUcpeInformationList = ["ucpe-host-name", "ucpe-activation-code", "out-of-band-management-modem" ]

-			rebuildUcpeVmsServiceInformation += buildElements(ucpeVmsServiceInformation, elementsUcpeInformationList, "ucpe-information")

-			// vnf-list

-			rebuildUcpeVmsServiceInformation += "<tns2:vnf-list>"

-			def vnfListList = ["vnf-instance-id", "vnf-sequence-number", "vnf-type", "vnf-vendor", "vnf-model", "vnf-id", "prov-status", "operational-state", "orchestration-status", "equipment-role" ]

-			rebuildUcpeVmsServiceInformation += buildElementsUnbounded(ucpeVmsServiceInformation, vnfListList, "vnf-information")

-			rebuildUcpeVmsServiceInformation += "</tns2:vnf-list>"

-			rebuildUcpeVmsServiceInformation += "</tns2:ucpe-vms-service-information>"

-		}

-		log("DEBUG", " rebuildUcpeVmsServiceInformation - " + rebuildUcpeVmsServiceInformation)

-		return rebuildUcpeVmsServiceInformation

-	}

-	

-    // Build internet-service-change-details

-	def buildInternetServiceChangeDetails(xmlInput) {

-		def rebuildInternetServiceChangeDetails = ""

-		if (xmlInput != null) {

-		    try { // optional

-				def internetServiceChangeDetails = getNodeXml(xmlInput, "internet-service-change-details").drop(38).trim()

-				rebuildInternetServiceChangeDetails = "<tns:internet-service-change-details>"

-				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["internet-evc-speed-value"], "")

-				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["internet-evc-speed-units"], "")

-				try { // optional

-				   def tProvidedV4LanPublicPrefixesChangesList = ["request-index", "v4-next-hop-address", "v4-lan-public-prefix", "v4-lan-public-prefix-length"]

-				   rebuildInternetServiceChangeDetails += buildElementsUnbounded(internetServiceChangeDetails, tProvidedV4LanPublicPrefixesChangesList, "t-provided-v4-lan-public-prefixes")

-				} catch (Exception e) {

-				   log("ERROR"," Optional - Exception in INTERNET-SERVICE-CHANGE-DETAILS 't-provided-v4-lan-public-prefixes ")

-			    }

-				try { // optional

-				  def tProvidedV6LanPublicPrefixesChangesList = ["request-index", "v6-next-hop-address", "v6-lan-public-prefix", "v6-lan-public-prefix-length"]

-				  rebuildInternetServiceChangeDetails += buildElementsUnbounded(internetServiceChangeDetails, tProvidedV6LanPublicPrefixesChangesList, "t-provided-v6-lan-public-prefixes")

-				} catch (Exception e) {

-					log("ERROR"," Optional - Exception INTERNET-SERVICE-CHANGE-DETAILS 't-provided-v6-lan-public-prefixes ")

-				}

-				rebuildInternetServiceChangeDetails += "</tns:internet-service-change-details>"

-			} catch (Exception e) {

-				log("ERROR", " Optional - Exception INTERNET-SERVICE-CHANGE-DETAILS 'internet-service-change-details' ")

-			}

-		}

-	    return rebuildInternetServiceChangeDetails

-	}		

- 	

-	// Build vr-lan 

-	def buildVrLan(xmlInput) {

-		

-		def rebuildVrLan = ''

-		if (xmlInput != null) {

-			

-			rebuildVrLan = "<tns2:vr-lan>"

-			def vrLan = getNodeXml(xmlInput, "vr-lan").drop(38).trim()

-			rebuildVrLan += buildElements(vrLan, ["routing-protocol"], "")

-			

-			// vr-lan-interface

-			def rebuildVrLanInterface = "<tns2:vr-lan-interface>"

-			def vrLanInterface = getNodeXml(vrLan, "vr-lan-interface").drop(38).trim()

-			rebuildVrLanInterface += buildVrLanInterfacePartial(vrLanInterface)

-			

-			 // dhcp

-			 def dhcp = getNodeXml(vrLan, "dhcp").drop(38).trim()

-			 def rebuildDhcp = buildDhcp(dhcp)

-			 rebuildVrLanInterface += rebuildDhcp

-			 

-			 // pat

-			 def pat = getNodeXml(vrLan, "pat").drop(38).trim()

-			 def rebuildPat = buildPat(pat)

-			 rebuildVrLanInterface += rebuildPat

-			 

-			 // nat

-			 def rebuildNat = ""

-			 try { // optional

-				def nat = getNodeXml(vrLan, "nat").drop(38).trim()

-				rebuildNat = buildNat(nat)

-			 } catch (Exception e) {

-				 log("ERROR", " Optional - Exception 'nat' ")

-			 }

-			 rebuildVrLanInterface += rebuildNat

-										

-			 // firewall-lite

-			 def firewallLite = getNodeXml(vrLan, "firewall-lite").drop(38).trim()

-			 def rebuildFirewallLite = buildFirewallLite(firewallLite)

-			 rebuildVrLanInterface += rebuildFirewallLite

-			 

-			 // static-routes

-			 def rebuildStaticRoutes = ""

-			 try { // optional 

-				 def staticRoutes = getNodeXml(vrLan, "static-routes").drop(38).trim()

-				 rebuildStaticRoutes = buildStaticRoutes(staticRoutes)

-			} catch (Exception e) {

-				 log("ERROR", " Optional - Exception 'static-routes' ")

-			}

-			rebuildVrLanInterface += rebuildStaticRoutes

-			 

-		   rebuildVrLan += rebuildVrLanInterface

-		   rebuildVrLan += "</tns2:vr-lan-interface>"

-		   rebuildVrLan += "</tns2:vr-lan>"

-			

-		}

-		log("DEBUG", " rebuildVrLan - " + rebuildVrLan)

-		return rebuildVrLan 		

-	}

-	

-	// Build vr-lan-interface

-	def buildVrLanInterfacePartial(xmlInput) {

-		def rebuildingVrLanInterface = ''

-		if (xmlInput != null) {

-			def vrLanInterfaceList = ["vr-designation", "v4-vr-lan-prefix", "v4-vr-lan-address", "v4-vr-lan-prefix-length", "v6-vr-lan-prefix", "v6-vr-lan-address", "v6-vr-lan-prefix-length", "v4-vce-loopback-address", "v6-vce-wan-address"]

-			rebuildingVrLanInterface += buildElements(xmlInput, vrLanInterfaceList, "")

-			rebuildingVrLanInterface += "<tns2:v4-public-lan-prefixes>"

-			try { // optional

-				def tProvidedV4LanPublicPrefixes = getNodeXml(xmlInput, "v4-public-lan-prefixes").drop(38).trim()

-				def tProvidedV4LanPublicPrefixesList = ["request-index", "v4-next-hop-address", "v4-lan-public-prefix", "v4-lan-public-prefix-length" ]

-				rebuildingVrLanInterface += buildElementsUnbounded(xmlInput, tProvidedV4LanPublicPrefixesList, "t-provided-v4-lan-public-prefixes")

-			} catch (Exception ex) {

-				log("ERROR", " Optional - Exception VR-LAN INTERFACE 'v4-public-lan-prefixes' ")

-			}

-			rebuildingVrLanInterface += "</tns2:v4-public-lan-prefixes>"

-			rebuildingVrLanInterface += "<tns2:v6-public-lan-prefixes>"

-			try { // optional

-				def tProvidedV6LanPublicPrefixes = getNodeXml(xmlInput, "v6-public-lan-prefixes").drop(38).trim()

-				def tProvidedV6LanPublicPrefixesList = ["request-index", "v6-next-hop-address", "v6-lan-public-prefix", "v6-lan-public-prefix-length" ]

-				rebuildingVrLanInterface += buildElementsUnbounded(xmlInput, tProvidedV6LanPublicPrefixesList, "t-provided-v6-lan-public-prefixes")

-			} catch (Exception e) {

-				log("ERROR", " Optional - Exception VR-LAN INTERFACE 'v6-public-lan-prefixes' ")

-			}

-			rebuildingVrLanInterface += "</tns2:v6-public-lan-prefixes>"

-		}

-		log("DEBUG", " rebuildingVrLanInterface - " + rebuildingVrLanInterface)

-		return rebuildingVrLanInterface

-	}

-	

-	// Build dhcp

-	def buildDhcp(xmlInput) {

-		def rebuildingDhcp = ''

-		if (xmlInput != null) {

-			def dhcpData = new XmlSlurper().parseText(xmlInput)

-			rebuildingDhcp = "<tns2:dhcp>"

-			def dhcpList1 = ["v4-dhcp-server-enabled", "v6-dhcp-server-enabled", "use-v4-default-pool", "v4-dhcp-default-pool-prefix", "v4-dhcp-default-pool-prefix-length"]

-			rebuildingDhcp += buildElements(xmlInput, dhcpList1, "")

-			try { // optional

-				def excludedV4DhcpAddressesFromDefaultPoolList = ["excluded-v4-address"]

-				rebuildingDhcp += buildElementsUnbounded(xmlInput, excludedV4DhcpAddressesFromDefaultPoolList, "excluded-v4-dhcp-addresses-from-default-pool")

-			} catch (Exception e) {

-				log("ERROR", " Optional - Exception DHCP 'excluded-v4-dhcp-addresses-from-default-pool' ")

-			}

-			try { // optional

-				def v4DhcpPools = dhcpData.'**'.findAll {it.name() == "v4-dhcp-pools"}

-				def v4DhcpPoolsSize = v4DhcpPools.size()

-				// println " v4DhcpPoolsSize = " + v4DhcpPools.size()

-				for (i in 0..v4DhcpPoolsSize-1) {

-					def v4DhcpPool = v4DhcpPools[i]

-					def v4DhcpPoolXml = XmlUtil.serialize(v4DhcpPool)

-					rebuildingDhcp += "<tns2:v4-dhcp-pools>"

-					def v4DhcpPoolsList1 = ["v4-dhcp-pool-prefix", "v4-dhcp-pool-prefix-length" ]

-					rebuildingDhcp += buildElements(v4DhcpPoolXml, v4DhcpPoolsList1, "")

-					try { // optional

-					   def excludedV4AddressesList = ["excluded-v4-address"]

-					   rebuildingDhcp += buildElementsUnbounded(v4DhcpPoolXml, excludedV4AddressesList, "excluded-v4-addresses")

-					} catch (Exception e) {

-					   log("ERROR", " Optional - Exception DHCP 'excluded-v4-addresses' ")

-					}

-					def v4DhcpPoolsList2 = ["v4-dhcp-relay-gateway-address", "v4-dhcp-relay-next-hop-address"]

-					rebuildingDhcp += buildElements(v4DhcpPoolXml, v4DhcpPoolsList2, "")

-					rebuildingDhcp += "</tns2:v4-dhcp-pools>"

-				 }

-			 } catch (Exception e) {

-				  log("ERROR"," Optional - Exception DHCP 'v4-dhcp-pools' ")

-			 }

-			 def dhcpList2 = ["use-v6-default-pool", "v6-dhcp-default-pool-prefix", "v6-dhcp-default-pool-prefix-length"]

-			 rebuildingDhcp += buildElements(xmlInput, dhcpList2, "")

-			 try { // optional

-				 def excludedV6DhcpAddressesFromDdefaultPoolList = ["excluded-v6-address"]

-				 rebuildingDhcp += buildElementsUnbounded(xmlInput, excludedV6DhcpAddressesFromDdefaultPoolList, "excluded-v6-dhcp-addresses-from-default-pool")

-			 } catch (Exception e) {

-			   log("ERROR", " Optional - Exception DHCP 'excluded-v6-dhcp-addresses-from-default-pool' ")

-			 }

-			 try { // optional

-				 def v6DhcpPools = dhcpData.'**'.findAll {it.name() == "v6-dhcp-pools"}

-				 def v6DhcpPoolsSize = v6DhcpPools.size()

-				 //println " v6DhcpPoolsSize = " + v6DhcpPools.size()

-				 for (i in 0..v6DhcpPoolsSize-1) {

-					def v6DhcpPool = v6DhcpPools[i]

-					def v6DhcpPoolXml = XmlUtil.serialize(v6DhcpPool)

-					rebuildingDhcp += "<tns2:v6-dhcp-pools>"

-					def v6DhcpPoolsList1 = ["v6-dhcp-pool-prefix", "v6-dhcp-pool-prefix-length"]

-					rebuildingDhcp += buildElements(v6DhcpPoolXml, v6DhcpPoolsList1, "")

-					try { // optional

-						def excludedV6AddressesList = ["excluded-v6-address"]

-						rebuildingDhcp += buildElementsUnbounded(v6DhcpPoolXml, excludedV6AddressesList, "excluded-v6-addresses")

-					} catch (Exception e) {

-							 log("ERROR", " Optional - Exception DHCP 'excluded-v6-addresses' ")

-					}

-					def v6DhcpPoolsList2 = ["v6-dhcp-relay-gateway-address", "v6-dhcp-relay-next-hop-address"]

-					rebuildingDhcp += buildElements(v6DhcpPoolXml, v6DhcpPoolsList2, "")

-					rebuildingDhcp += "</tns2:v6-dhcp-pools>"

-				 }

-			 } catch (Exception e) {

-				 log("ERROR", " Optional - Exception DHCP 'v6-dhcp-pools' ")

-			 }

-			 rebuildingDhcp += "</tns2:dhcp>"

-		}	 

-		log("DEBUG", " rebuildingDhcp - " + rebuildingDhcp)

-		return rebuildingDhcp

-	}	

-

-	// Build pat

-	def buildPat(xmlInput) {

-		 def rebuildingPat = ''

-		 if (xmlInput != null) {

-			 rebuildingPat = "<tns2:pat>"

-			 def patList = ["v4-pat-enabled", "use-v4-default-pool", "v4-pat-default-pool-prefix", "v4-pat-default-pool-prefix-length"]

-			 rebuildingPat += buildElements(xmlInput, patList, "")

-			 try { // optional

-				 def v4PatPools = getNodeXml(xmlInput, "v4-pat-pools").drop(38).trim()

-				 def v4PatPoolsList = ["v4-pat-pool-prefix", "v4-pat-pool-prefix-length", "v4-pat-pool-next-hop-address"]

-				 rebuildingPat += buildElementsUnbounded(xmlInput, v4PatPoolsList, "v4-pat-pools")

-			 } catch (Exception e) {

-				log("ERROR", " Optional - Exception 'v4-pat-pool-next-hop-address' ")

-			 }

-			 rebuildingPat += "</tns2:pat>"

-		 }

-		 log("DEBUG", " rebuildingPat - " + rebuildingPat)

-	     return rebuildingPat

-    }

-	

-	// Build nat

-	def buildNat(xmlInput) {

-		def rebuildingNat = ''

-		if (xmlInput != null) {

-			rebuildingNat = "<tns2:nat>"

-			rebuildingNat += buildElements(xmlInput, ["v4-nat-enabled"], "")

-			try { // optional

-			 def v4NatMappingEntries = getNodeXml(xmlInput, "v4-nat-mapping-entries").drop(38).trim()

-			 def v4NatMappingEntriesList = ["v4-nat-internal", "v4-nat-next-hop-address", "v4-nat-external"]

-			 rebuildingNat += buildElementsUnbounded(xmlInput, v4NatMappingEntriesList, "v4-nat-mapping-entries")

-			} catch (Exception e) {

-			   log("ERROR", " Optional - Exception 'v4-nat-external' ")

-			}

-			rebuildingNat += "</tns2:nat>"

-		}

-		log("DEBUG", " rebuildingNat - " + rebuildingNat)

-	    return rebuildingNat

-	}				

-	

-	// Build firewall-lite

-	def buildFirewallLite(xmlInput) {

-		def rebuildingFirewallLite = ''

-		

-		if (xmlInput != null) {

-			

-			def firewallLiteData = new XmlSlurper().parseText(xmlInput)

-			rebuildingFirewallLite = "<tns2:firewall-lite>"

-			def firewallLiteList = ["stateful-firewall-lite-v4-enabled", "stateful-firewall-lite-v6-enabled"]

-			rebuildingFirewallLite += buildElements(xmlInput, firewallLiteList, "")

-			

-			 try { // optional

-				 def v4FirewallPacketFilters = firewallLiteData.'**'.findAll {it.name() == "v4-firewall-packet-filters"}

-				 def v4FirewallPacketFiltersSize = v4FirewallPacketFilters.size()

-				 //println " v4FirewallPacketFiltersSize = " + v4FirewallPacketFilters.size()

-				 for (i in 0..v4FirewallPacketFiltersSize-1) {

-			       def v4FirewallPacketFilter = v4FirewallPacketFilters[i]

-			       def v4FirewallPacketFilterXml = XmlUtil.serialize(v4FirewallPacketFilter)

-				   rebuildingFirewallLite += "<tns2:v4-firewall-packet-filters>"

-				   def v4FirewallPacketFiltersList = ["v4-firewall-prefix", "v4-firewall-prefix-length", "allow-icmp-ping"]

-				   rebuildingFirewallLite += buildElements(v4FirewallPacketFilterXml, v4FirewallPacketFiltersList, "")

-				   try {  // optional

-			          def udpPortsList = ["port-number"]

-					  rebuildingFirewallLite += buildElementsUnbounded(v4FirewallPacketFilterXml, udpPortsList, "udp-ports")

-				   } catch (Exception e) {

-					  log("ERROR", " Optional - Exception FIREWALL-LITE v4 'udp-ports' ")

-				   }

-				   try {  // optional

-					  def tcpPortsList =  ["port-number"]

-					  rebuildingFirewallLite += buildElementsUnbounded(v4FirewallPacketFilterXml, tcpPortsList, "tcp-ports")

-				   } catch (Exception e) {

-				      log("ERROR", " Optional - Exception FIREWALL-LITE v4 'tcp-ports' ")

-				   }

-				   rebuildingFirewallLite += "</tns2:v4-firewall-packet-filters>"

-				 }

-			 } catch (Exception e) {

-				 log("ERROR", " Optional - Exception FIREWALL-LITE 'v4-firewall-packet-filters' ")

-			 }

-			 

-			 try { // optional

-				 def v6FirewallPacketFilters = firewallLiteData.'**'.findAll {it.name() == "v6-firewall-packet-filters"}

-				 def v6FirewallPacketFiltersSize = v6FirewallPacketFilters.size()

-				 //println " v6FirewallPacketFiltersSize = " + v6FirewallPacketFilters.size()

-				 for (i in 0..v6FirewallPacketFiltersSize-1) {

-					def v6FirewallPacketFilter = v6FirewallPacketFilters[i]

-					def v6FirewallPacketFilterXml = XmlUtil.serialize(v6FirewallPacketFilter)

-					rebuildingFirewallLite += "<tns2:v6-firewall-packet-filters>"

-					def v6FirewallPacketFiltersList = ["v6-firewall-prefix", "v6-firewall-prefix-length", "allow-icmp-ping"]

-					rebuildingFirewallLite += buildElements(v6FirewallPacketFilterXml, v6FirewallPacketFiltersList, "")

-					try { // optional

-						def udpPortsList = ["port-number"]

-						rebuildingFirewallLite += buildElementsUnbounded(v6FirewallPacketFilterXml, udpPortsList, "udp-ports")

-					} catch (Exception e) {

-				      log("ERROR", " Optional - Exception FIREWALL-LITE v6 'udp-ports' ")

-					}

-					try { // optional

-						def tcpPortsList =  ["port-number"]

-						rebuildingFirewallLite += buildElementsUnbounded(v6FirewallPacketFilterXml, tcpPortsList, "tcp-ports")

-					} catch (Exception e) {

-				    	log("ERROR", " Optional - Exception FIREWALL-LITE v6 'tcp-ports' ")

-					}

-			       rebuildingFirewallLite += "</tns2:v6-firewall-packet-filters>"

-				 }

-			 } catch (Exception e) {

-				 log("ERROR", " Optional - Exception FIREWALL-LITE 'v6-firewall-packet-filters' ")

-			 }

-			 rebuildingFirewallLite+= "</tns2:firewall-lite>"

-		}

-		log("DEBUG", " rebuildingFirewallLite - " + rebuildingFirewallLite)

-		return rebuildingFirewallLite

-     }

-	

-	def buildStaticRoutes(xmlInput) {

-		def rebuildingStaticRoutes = ''

-		if (xmlInput != null) {

-			rebuildingStaticRoutes = "<tns2:static-routes>"

-			def v4StaticRouteslist = ["v4-static-route-prefix","v4-static-route-prefix-length", "v4-next-hop-address"]

-			rebuildingStaticRoutes += buildElementsUnbounded(xmlInput, v4StaticRouteslist, "v4-static-routes")

-			def v6StaticRouteslist = ["v6-static-route-prefix","v6-static-route-prefix-length", "v6-next-hop-address"]

-			rebuildingStaticRoutes += buildElementsUnbounded(xmlInput, v6StaticRouteslist, "v6-static-routes")

-			rebuildingStaticRoutes += "</tns2:static-routes>"

-		}

-		log("DEBUG", " rebuildingStaticRoutes - " + rebuildingStaticRoutes)

-		return rebuildingStaticRoutes

-	}

-	

-	public String generateCurrentTimeInUtc(){

-		final  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");

-		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));

-		final String utcTime = sdf.format(new Date());

-		return utcTime;

-	}

-	

-	public String generateCurrentTimeInGMT(){

-		final  SimpleDateFormat sdf = new SimpleDateFormat("E, d MMM yyyy h:m:s z");

-		sdf.setTimeZone(TimeZone.getTimeZone("GMT"));

-		final String utcTime = sdf.format(new Date());

-		return utcTime;

-	}

-	

-

-	/**

-	 * @param encryptedAuth: encrypted credentials from urn properties

-	 * @param msoKey: key to use to decrypt from urn properties

-	 * @return base 64 encoded basic auth credentials

-	 */

-	def getBasicAuth(encryptedAuth, msoKey){

-		if ((encryptedAuth == null || encryptedAuth.isEmpty()) || (msoKey == null || msoKey.isEmpty()))

-			return null

-		try {

-			def auth = decrypt(encryptedAuth, msoKey)

-			byte[] encoded = Base64.encodeBase64(auth.getBytes())

-			String encodedString = new String(encoded)

-			encodedString = "Basic " + encodedString

-			return encodedString

-		} catch (Exception ex) {

-			log("ERROR", "Unable to encode basic auth")

-			throw ex

-		}

-	}

-	

-	def encrypt(toEncrypt, msokey){

-		try {

-			String result = CryptoUtils.encrypt(toEncrypt, msokey);

-			return result

-		}

-		catch (Exception e) {

-			log("ERROR", "Failed to encrypt credentials")

-		}

-	}

-	

-	def decrypt(toDecrypt, msokey){

-		try {

-			String result = CryptoUtils.decrypt(toDecrypt, msokey);

-			return result

-		}

-		catch (Exception e) {

-			log("ERROR", "Failed to decrypt credentials")

-			throw e

-		}

-	}

-	

-	/**

-	 * Return URL with qualified host name (if any) or urn mapping

-	 * @param  String url from urn mapping

-	 * @return String url with qualified host name

-	 */

-	public String getQualifiedHostNameForCallback(String urnCallbackUrl) {

-		def callbackUrlToUse = urnCallbackUrl

-		try{

-			//swap host name with qualified host name from the jboss properties

-			def qualifiedHostName = System.getProperty("jboss.qualified.host.name")

-			if(qualifiedHostName!=null){

-				log("DEBUG", "qualifiedHostName:\n" + qualifiedHostName)

-				callbackUrlToUse = callbackUrlToUse.replaceAll("(http://)(.*)(:28080*)", {orig, first, torepl, last -> "${first}${qualifiedHostName}${last}"})

-			}

-		}catch(Exception e){

-				log("DEBUG", "unable to grab qualified host name, using what's in urn properties for callbackurl. Exception was: " + e.printStackTrace())

-		}

-		return callbackUrlToUse

-		

-	}

-	

-	/**

-	 * Retrieves text context of the element if the element exists, returns empty string otherwise

-	 * @param com.sun.org.apache.xerces.internal.dom.DeferredElementNSImpl element to parse

-	 * param String tagName tagName

-	 * @return String text content of the element

-	 */

-	 public String getElementText(Element element, String tagName) {

-	 	String text = ""

-	 	org.w3c.dom.NodeList nodeList = element.getElementsByTagNameNS("*", tagName)

-	 	if (nodeList != null && nodeList.length > 0) {

-	 		text = nodeList.item(0).getTextContent()

-	 	}

-	 	return text

-	 }

-	 

-	 /**

-	  *

-	  * Find the lowest unused module-index value in a given xml

-	  */

-	 public String getLowestUnusedIndex(String xml) {

-		 if (xml == null || xml.isEmpty()) {

-			 return "0"

-		 }		 

-		 def moduleIndexList = getMultNodes(xml, "module-index") 

-		 if (moduleIndexList == null || moduleIndexList.size() == 0) {			

-			 return "0"

-		 }

-		 def sortedModuleIndexList = moduleIndexList.sort { a, b -> a.compareTo b }

-		

-		 for (i in 0..sortedModuleIndexList.size()-1) {

-			 if (Integer.parseInt(sortedModuleIndexList[i]) != i) {

-				 return i.toString()

-			 }

-		 }

-		 return sortedModuleIndexList.size().toString()

-	 }

-	/**

-	 * This utility checks if there is transaction id already present in MDC.

-	 * If found, it returns same else creates new, sets in MDC for future use before returning

-	 * @return String RequestId in UUID format.

-	 */

-	public String getRequestID()

-	{

-		String requestId = MDC.get("RequestId")

-		if(requestId == null || requestId.isEmpty())

-		{

-			requestId = java.util.UUID.randomUUID()

-			MDC.put("RequestId",requestId)

-			log("DEBUG","MsoUtils - Created new RequestId: " + requestId)

-		}

-		else

-		{

-			log("DEBUG","MsoUtils - Using existing RequestId: " + requestId)

-		}

-

-		return requestId

-	}

-

-	/**

-	 * Remove all the empty nodes and attributes from the within the given node

-	 * @param node

-	 * @return true if all empty nodes and attributes were removed.

-	 */

-	public boolean cleanNode( Node node ) {

-		node.attributes().with { a ->

-			a.findAll { !it.value }.each { a.remove( it.key ) }

-		}

-		node.children().with { kids ->

-			kids.findAll { it instanceof Node ? !cleanNode( it ) : false }

-					.each { kids.remove( it ) }

-		}

-		node.attributes() || node.children() || node.text()

-	}

-

-	/**

-	 *

-	 * @param xml

-	 * @return String representation of xml after removing the empty nodes and attributes

-	 */

-	public String cleanNode(String xmlString) {

-		def xml = new XmlParser(false, false).parseText(xmlString)

-		cleanNode(xml)

-		return XmlUtil.serialize(xml)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import java.text.SimpleDateFormat
+
+import org.apache.commons.codec.binary.Base64
+import org.apache.commons.lang3.StringEscapeUtils
+import org.onap.so.bpmn.core.BPMNLogger
+import org.onap.so.bpmn.core.xml.XmlTool
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+import org.onap.so.utils.CryptoUtils
+import org.slf4j.MDC
+import org.w3c.dom.Element
+
+import groovy.util.slurpersupport.NodeChild
+import groovy.xml.XmlUtil
+
+class MsoUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, MsoUtils.class);
+	
+	def initializeEndPoints(execution){
+		// use this placeholder to initialize end points, if called independently, this need to be set
+		execution.setVariable("AAIEndPoint","http://localhost:28080/SoapUIMocks")			
+	}
+	
+	/**
+	 * Returns the unescaped contents of element
+	 * 
+	 * @param xmlInput
+	 * @param element
+	 * @return
+	 */
+	def getNodeText(xmlInput,element){
+		def rtn=null
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			rtn= xml.'**'.find{node->node.name()==element}
+			if (rtn != null){
+				rtn=rtn.text()
+			}
+		}
+		return rtn
+	}
+	def getMultNodes(xmlInput, element){
+		def nodes=null
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			nodes = xml.'**'.findAll{ node-> node.name() == element }*.text()
+		}
+		return nodes
+	}
+	/**
+	 * Note: this uses XmlParser instead of XmlSlurper, thus it is not as
+	 * efficient because it instantiates the whole DOM tree.
+	 * @param xmlInput
+	 * @param element
+	 * @return a list of Nodes, or {@code null} if <i>xmlInput</i> is {@code null}
+	 */
+	def getMultNodeObjects(xmlInput, element){
+		def nodes=null
+		if(xmlInput!=null){
+			def xml= new XmlParser().parseText(xmlInput)
+			nodes = xml.'**'.findAll{ node-> node.name() == element }
+		}
+		return nodes
+	}
+	
+	def getNodeXml(xmlInput,element){
+		return getNodeXml(xmlInput, element, true)
+	}
+	def getNodeXml(xmlInput,element,incPreamble){
+		def fxml= new XmlSlurper().parseText(xmlInput)
+		NodeChild nodeToSerialize = fxml.'**'.find {it.name() == element}
+		if(nodeToSerialize==null){
+			return ""
+		}
+		def nodeAsText = XmlUtil.serialize(nodeToSerialize)
+		if (!incPreamble) {
+			nodeAsText = removeXmlPreamble(nodeAsText)
+		}
+
+		return unescapeNodeContents(nodeToSerialize, nodeAsText)
+	}
+	
+	def unescapeNodeContents(NodeChild node, String text) {
+		if (!node.childNodes().hasNext()) {
+			return StringEscapeUtils.unescapeXml(text)
+		} else {
+			return text
+		}
+	}
+
+	def nodeExists(xmlInput,element){
+		try {
+			def fxml= new XmlSlurper().parseText(xmlInput)
+			def nodeToSerialize = fxml.'**'.find {it.name() == element}
+			return nodeToSerialize!=null
+		} catch(Exception e) {
+			return false
+		}
+	}
+
+	
+	/***** Utilities when using XmlParser *****/
+	
+	/**
+	 * Convert a Node into a String by deserializing it and formatting it.
+	 *
+	 * @param node Node to be converted.
+	 * @return the Node as a String.
+	 */
+	def String nodeToString(Node node) {
+		def String nodeAsString = groovy.xml.XmlUtil.serialize(node)
+		nodeAsString = removeXmlPreamble(nodeAsString)
+		return formatXml(nodeAsString)
+	}
+	
+	/**
+	 * Get the specified child Node of the specified parent. If there are
+	 * multiple children of the same name, only the first one is returned.
+	 * If there are no children with the specified name, 'null' is returned.
+	 * 
+	 * @param parent Parent Node in which to find a child.
+	 * @param childNodeName Name of the child Node to get.
+	 * @return the (first) child Node with the specified name or 'null'
+	 * if a child Node with the specified name does not exist.
+	 */
+	def Node getChildNode(Node parent, String childNodeName) {
+		def NodeList nodeList = getIdenticalChildren(parent, childNodeName)
+		if (nodeList.size() == 0) {
+			return null
+		} else {
+			return nodeList.get(0)
+		}
+	}
+	
+	/**
+	 * Get the textual value of the specified child Node of the specified parent.
+	 * If there are no children with the specified name, 'null' is returned.
+	 * 
+	 * @param parent Parent Node in which to find a child.
+	 * @param childNodeName Name of the child Node whose value to get.
+	 * @return the textual value of child Node with the specified name or 'null'
+	 * if a child Node with the specified name does not exist.
+	 */
+	def String getChildNodeText(Node parent, String childNodeName) {
+		def Node childNode = getChildNode(parent, childNodeName)
+		if (childNode == null) {
+			return null
+		} else {
+			return childNode.text()
+		}
+	}
+	
+	/**
+	 * Get all of the child nodes from the specified parent that have the
+	 * specified name.  The returned NodeList could be empty.
+	 * 
+	 * @param parent Parent Node in which to find children.
+	 * @param childNodeName Name of the children to get.
+	 * @return a NodeList of all the children from the parent with the specified
+	 * name. The list could be empty.
+	 */
+	def NodeList getIdenticalChildren(Node parent, String childNodeName) {
+		return (NodeList) parent.get(childNodeName)
+	}
+
+	/***** End of Utilities when using XmlParser *****/
+
+	
+	/** these are covered under the common function above**/
+	def getSubscriberName(xmlInput,element){
+		def rtn=null
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			rtn= xml.'**'.find{node->node.name()==element}.text()
+		} 
+		return rtn
+	}
+	def getTenantInformation(xmlInput,element){
+		def xml= new XmlSlurper().parseText(xmlInput)
+		def nodeToSerialize = xml.'**'.find {it.name() == 'service-information'}
+		def nodeAsText = XmlUtil.serialize(nodeToSerialize)
+		return nodeAsText
+	}
+	def getServiceInstanceId(xmlInput,element){
+		def xml= new XmlSlurper().parseText(xmlInput)
+		return ( xml.'**'.find{node->node.name()==element}.text() )
+	}
+	//for aai tenant url
+	def searchResourceLink(xmlInput, resourceType){
+		def fxml= new XmlSlurper().parseText(xmlInput)
+		def element = fxml.'**'.find {it.'resource-type' == resourceType}
+		return (element == null) ? null : element.'resource-link'.text()
+	}
+
+	def searchMetaData(xmlInput, searchName, searchValue){
+		def fxml= new XmlSlurper().parseText(xmlInput)
+		def ret = fxml.'**'.find {it.metaname.text() == searchName && it.metaval.text() == searchValue}
+		if(ret != null){
+			return ret.parent().parent()
+		}
+		return ret
+	}
+	
+	def searchMetaDataNode(fxml, searchName, searchValue){
+		def ret = fxml.'**'.find {it.metaname.text() == searchName && it.metaval.text() == searchValue}
+		if(ret != null){
+			return ret.parent().parent()
+		}
+		return ret
+	}
+	
+	// for Trinity L3 add/delete bonding
+	def getPBGFList(isDebugLogEnabled, xmlInput){
+		log("DEBUG", "getPBGFList: xmlInput " + xmlInput,isDebugLogEnabled)
+		ArrayList myNodes = new ArrayList()
+		if(nodeExists(xmlInput,"nbnc-response-information")){
+		def respInfo=getNodeXml(xmlInput,"nbnc-response-information", false)
+		if(respInfo!=null){
+			def fxml= new XmlSlurper().parseText(respInfo)
+			fxml.'virtual-datacenter-list'.each { vdc ->
+				//we only want to add two BGF per VDC, BGF1 and BGF2
+					def routerList = vdc.'router-list'.first()
+					routerList.each{ myList ->
+						def physNodes  = myList.'**'.findAll {it.'border-element-tangibility'.text() =~ /PHYSICAL/}
+						def nodeToAdd
+						physNodes.each{
+							if(nodeToAdd==null){
+								nodeToAdd = it
+							}else{
+								def beid = nodeToAdd.'border-element-id'.text() +
+									 " " + nodeToAdd.'border-element-type'.text() +
+									 " and " +
+									 it.'border-element-id'.text() +
+									 " " + it.'border-element-type'.text()
+								def mytag = nodeToAdd.'border-element-id'
+								mytag[0].replaceBody(beid)
+							}
+						}
+						def mytag = nodeToAdd.'vlan-id'
+						def ind = mytag.text().indexOf('.')
+						if(ind >= 0){
+							def vlan = mytag.text().substring(0,ind)
+							mytag[0].replaceBody(vlan)
+						}
+						myNodes.add(XmlUtil.serialize(nodeToAdd))
+					}
+					
+			}
+		}
+				
+			return myNodes
+		}else{
+			return null
+		}
+	}
+	
+	def getPBGFList(xmlInput){
+		getPBGFList("false", xmlInput)
+	}
+	
+	def getMetaVal(node, name){
+		try{
+			return node.'**'.find {it.metaname.text() == name}.metaval.text()
+		}catch(Exception e){
+			return null
+		}
+	}
+	def getRelationshipVal(node, name){
+		try{
+			return node.'**'.find {it.'relationship-key'.text() == name}.'relationship-value'.text()
+		}catch(Exception e){
+			return null
+		}
+	}
+
+	
+	def log(logmode,logtxt,isDebugLogEnabled="false"){
+		if ("INFO"==logmode) {
+			msoLogger.info(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt, "BPMN", MsoLogger.getServiceName());
+		} else if ("WARN"==logmode) {
+			// to see the warning text displayed in the log entry, the text must also be passed as arg0 (2nd argument) to invoke the correct MsoLogger warn() method
+			msoLogger.warn (MessageEnum.BPMN_GENERAL_WARNING, logtxt, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logtxt);
+		} else if ("ERROR"==logmode) {
+			// to see the error text displayed in the log entry, the text must also be passed as arg0 (2nd argument) to invoke the correct MsoLogger error() method
+		    msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logtxt);
+
+		} else {
+			BPMNLogger.debug(isDebugLogEnabled, logtxt);
+		}
+	}
+	
+	def logContext(requestId, serviceInstanceId){
+		msoLogger.setLogContext(requestId, serviceInstanceId);
+	}
+	
+	def logMetrics(elapsedTime, logtxt){
+		
+		msoLogger.recordMetricEvent (elapsedTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
+			logtxt, "BPMN", MsoLogger.getServiceName(), null);
+	}
+	
+	def logAudit(logtxt){
+		long startTime = System.currentTimeMillis();
+		
+		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logtxt);
+	}
+	
+	// headers: header - name-value
+	def getHeaderNameValue(xmlInput, nameAttribute){
+		def rtn=null
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			rtn= xml.'**'.find {header->header.'@name'.text() == nameAttribute}.'@value'
+		}
+		return rtn
+	}
+	
+	/**
+	 * Gets the children of the specified element.
+	 */
+	public String getChildNodes(xmlInput, element) {
+		def xml= new XmlSlurper().parseText(xmlInput)
+		def thisElement = xml.'**'.find {it.name() == element}
+		StringBuilder out = new StringBuilder()
+		if (thisElement != null) {
+			thisElement.children().each() {
+				String nodeAsText = removeXmlPreamble(XmlUtil.serialize(it))
+				if (out.length() > 0) {
+					out.append(System.lineSeparator())
+				}
+				out.append(nodeAsText)
+			}
+		}
+		return out.toString();
+	}
+	
+	/**
+	 * Encodes a value so it can be used inside an XML text element.
+	 * 
+	 * <b>Will double encode</b>
+	 * @param s the string to encode
+	 * @return the encoded string
+	 */
+	public static String xmlEscape(Object value) {
+		return XmlTool.encode(value)
+	}
+	
+	/**
+	 * Removes the preamble, if present, from an XML document.
+	 * Also, for historical reasons, this also trims leading and trailing
+	 * whitespace from the resulting document.  TODO: remove the trimming
+	 * and fix unit tests that depend on EXACT xml format.
+	 * @param xml the XML document
+	 * @return a possibly modified document
+	 */
+	public String removeXmlPreamble(def xml) {
+		if (xml == null) {
+			return null
+		}
+
+		return XmlTool.removePreamble(xml).trim()
+	}
+
+	/**
+	 * Removes namespaces and namespace declarations from an XML document.
+	 * @param xml the XML document
+	 * @return a possibly modified document
+	 */
+	public String removeXmlNamespaces(def xml) {
+		return XmlTool.removeNamespaces(xml);
+	}
+
+	/**
+	 * Use formatXml instead.  Note: this method inserts an XML preamble.
+	 */
+	@Deprecated
+	def formatXML(xmlInput) {
+		def parseXml = null
+		def formatXml = null
+		if (xmlInput !=null) {
+			parseXml = new XmlParser().parseText(xmlInput)
+			formatXml = XmlUtil.serialize(parseXml)
+		}
+	}
+
+	/**
+	 * Reformats an XML document. The result will not contain an XML preamble
+	 * or a trailing newline.
+	 * @param xml the XML document
+	 * @return a reformatted document
+	 */
+	public String formatXml(def xml) {
+		return XmlTool.normalize(xml);
+	}
+	
+	// build single elements
+	def buildElements(xmlInput, elementList, parentName) {
+		String var = ""
+		def xmlBuild = ""
+		if (parentName != "") {
+		   xmlBuild += "<tns2:"+parentName+">"
+		}   
+		if (xmlInput != null) {
+			   for (element in elementList) {
+			      def xml= new XmlSlurper().parseText(xmlInput)
+			      var = xml.'**'.find {it.name() == element}
+				  if (var != null) {
+			         xmlBuild += "<tns2:"+element+">"+var.toString()+"</tns2:"+element+">"
+				  } 
+			   }
+		}
+		if (parentName != "") {
+		   xmlBuild += "</tns2:"+parentName+">"
+		}   
+		return xmlBuild
+	}
+	
+	// build the Unbounded elements
+	def buildElementsUnbounded(xmlInput, elementList, parentName) {
+		def varParents = ""
+		def var = ""
+		def xmlBuildUnbounded = ""
+		if (xmlInput != null) {
+			def xml= new XmlSlurper().parseText(xmlInput)
+			varParents = xml.'**'.findAll {it.name() == parentName}
+			//println " Unbounded ${parentName} - varParent.Size() - " + varParents.size()
+			for (i in 0..varParents.size()-1) {
+				if (parentName != "") {
+					xmlBuildUnbounded += "<tns2:"+parentName+">"
+				 }
+				for (element in elementList) {
+					var = varParents[i].'*'.find {it.name() == element}
+				   if (var != null) {
+					  xmlBuildUnbounded += "<tns2:"+element+">"+var.toString()+"</tns2:"+element+">"
+					  //println " i = " + i + ", element: " + element + " = " + var.toString()
+				   }
+				}
+				if (parentName != "") {
+					xmlBuildUnbounded += "</tns2:"+parentName+">"
+				 }
+			}
+		}
+		return xmlBuildUnbounded
+	 }
+	
+	// Build l2-homing-information
+	def buildL2HomingInformation(xmlInput) {
+		def elementsL2HomingList = ["evc-name", "topology", "preferred-aic-clli","aic-version"]
+		def rebuildL2Home = ''
+		if (xmlInput != null) {
+			rebuildL2Home = buildElements(xmlInput, elementsL2HomingList, "l2-homing-information")
+		}
+		return rebuildL2Home
+	}
+	
+	// Build internet-evc-access-information
+	def buildInternetEvcAccessInformation(xmlInput) {
+		def elementsInternetEvcAccessInformationList = ["internet-evc-speed-value", "internet-evc-speed-units", "ip-version"]
+		def rebuildInternetEvcAccess = ''
+		if (xmlInput != null) {
+			rebuildInternetEvcAccess = buildElements(xmlInput, elementsInternetEvcAccessInformationList, "internet-evc-access-information")
+		}
+		return rebuildInternetEvcAccess
+	}
+	
+	// Build ucpe-vms-service-information
+	def buildUcpeVmsServiceInformation(xmlInput) {
+		def rebuildUcpeVmsServiceInformation = ''
+		if (xmlInput != null) {
+			def ucpeVmsServiceInformation = getNodeXml(xmlInput, "ucpe-vms-service-information").drop(38).trim()
+			rebuildUcpeVmsServiceInformation = "<tns2:ucpe-vms-service-information>"
+			// transport-service-information
+			rebuildUcpeVmsServiceInformation += "<tns2:transport-service-information>"
+			def transportServiceInformation = getNodeXml(ucpeVmsServiceInformation, "transport-service-information").drop(38).trim()
+			def elementsTransportServiceInformationList = ["transport-service-type"]
+			rebuildUcpeVmsServiceInformation += buildElements(transportServiceInformation, elementsTransportServiceInformationList, "")
+			try { // optional
+				def accessCircuitInfoList = ["access-circuit-id", "dual-mode"]
+				rebuildUcpeVmsServiceInformation += buildElementsUnbounded(transportServiceInformation, accessCircuitInfoList, "access-circuit-info")
+			} catch (Exception e) {
+			   log("ERROR", " Optional - Exception ACCESS-CIRCUIT-INFO - 'access-circuit-info' ")
+			}
+			rebuildUcpeVmsServiceInformation += "</tns2:transport-service-information>"
+			// ucpe-information
+			def elementsUcpeInformationList = ["ucpe-host-name", "ucpe-activation-code", "out-of-band-management-modem" ]
+			rebuildUcpeVmsServiceInformation += buildElements(ucpeVmsServiceInformation, elementsUcpeInformationList, "ucpe-information")
+			// vnf-list
+			rebuildUcpeVmsServiceInformation += "<tns2:vnf-list>"
+			def vnfListList = ["vnf-instance-id", "vnf-sequence-number", "vnf-type", "vnf-vendor", "vnf-model", "vnf-id", "prov-status", "operational-state", "orchestration-status", "equipment-role" ]
+			rebuildUcpeVmsServiceInformation += buildElementsUnbounded(ucpeVmsServiceInformation, vnfListList, "vnf-information")
+			rebuildUcpeVmsServiceInformation += "</tns2:vnf-list>"
+			rebuildUcpeVmsServiceInformation += "</tns2:ucpe-vms-service-information>"
+		}
+		log("DEBUG", " rebuildUcpeVmsServiceInformation - " + rebuildUcpeVmsServiceInformation)
+		return rebuildUcpeVmsServiceInformation
+	}
+	
+    // Build internet-service-change-details
+	def buildInternetServiceChangeDetails(xmlInput) {
+		def rebuildInternetServiceChangeDetails = ""
+		if (xmlInput != null) {
+		    try { // optional
+				def internetServiceChangeDetails = getNodeXml(xmlInput, "internet-service-change-details").drop(38).trim()
+				rebuildInternetServiceChangeDetails = "<tns:internet-service-change-details>"
+				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["internet-evc-speed-value"], "")
+				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["internet-evc-speed-units"], "")
+				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["v4-vr-lan-address"], "")
+				rebuildInternetServiceChangeDetails += buildElements(internetServiceChangeDetails, ["v4-vr-lan-prefix-length"], "")
+				try { // optional
+				   def tProvidedV4LanPublicPrefixesChangesList = ["request-index", "v4-next-hop-address", "v4-lan-public-prefix", "v4-lan-public-prefix-length"]
+				   rebuildInternetServiceChangeDetails += buildElementsUnbounded(internetServiceChangeDetails, tProvidedV4LanPublicPrefixesChangesList, "t-provided-v4-lan-public-prefixes")
+				} catch (Exception e) {
+				   log("ERROR"," Optional - Exception in INTERNET-SERVICE-CHANGE-DETAILS 't-provided-v4-lan-public-prefixes ")
+			    }
+				try { // optional
+				  def tProvidedV6LanPublicPrefixesChangesList = ["request-index", "v6-next-hop-address", "v6-lan-public-prefix", "v6-lan-public-prefix-length"]
+				  rebuildInternetServiceChangeDetails += buildElementsUnbounded(internetServiceChangeDetails, tProvidedV6LanPublicPrefixesChangesList, "t-provided-v6-lan-public-prefixes")
+				} catch (Exception e) {
+					log("ERROR"," Optional - Exception INTERNET-SERVICE-CHANGE-DETAILS 't-provided-v6-lan-public-prefixes ")
+				}
+				rebuildInternetServiceChangeDetails += "</tns:internet-service-change-details>"
+			} catch (Exception e) {
+				log("ERROR", " Optional - Exception INTERNET-SERVICE-CHANGE-DETAILS 'internet-service-change-details' ")
+			}
+		}
+	    return rebuildInternetServiceChangeDetails
+	}		
+ 	
+	// Build vr-lan 
+	def buildVrLan(xmlInput) {
+		
+		def rebuildVrLan = ''
+		if (xmlInput != null) {
+			
+			rebuildVrLan = "<tns2:vr-lan>"
+			def vrLan = getNodeXml(xmlInput, "vr-lan").drop(38).trim()
+			rebuildVrLan += buildElements(vrLan, ["routing-protocol"], "")
+			
+			// vr-lan-interface
+			def rebuildVrLanInterface = "<tns2:vr-lan-interface>"
+			def vrLanInterface = getNodeXml(vrLan, "vr-lan-interface").drop(38).trim()
+			rebuildVrLanInterface += buildVrLanInterfacePartial(vrLanInterface)
+			
+			 // dhcp
+			 def dhcp = getNodeXml(vrLan, "dhcp").drop(38).trim()
+			 def rebuildDhcp = buildDhcp(dhcp)
+			 rebuildVrLanInterface += rebuildDhcp
+			 
+			 // pat
+			 def pat = getNodeXml(vrLan, "pat").drop(38).trim()
+			 def rebuildPat = buildPat(pat)
+			 rebuildVrLanInterface += rebuildPat
+			 
+			 // nat
+			 def rebuildNat = ""
+			 try { // optional
+				def nat = getNodeXml(vrLan, "nat").drop(38).trim()
+				rebuildNat = buildNat(nat)
+			 } catch (Exception e) {
+				 log("ERROR", " Optional - Exception 'nat' ")
+			 }
+			 rebuildVrLanInterface += rebuildNat
+										
+			 // firewall-lite
+			 def firewallLite = getNodeXml(vrLan, "firewall-lite").drop(38).trim()
+			 def rebuildFirewallLite = buildFirewallLite(firewallLite)
+			 rebuildVrLanInterface += rebuildFirewallLite
+			 
+			 // static-routes
+			 def rebuildStaticRoutes = ""
+			 try { // optional 
+				 def staticRoutes = getNodeXml(vrLan, "static-routes").drop(38).trim()
+				 rebuildStaticRoutes = buildStaticRoutes(staticRoutes)
+			} catch (Exception e) {
+				 log("ERROR", " Optional - Exception 'static-routes' ")
+			}
+			rebuildVrLanInterface += rebuildStaticRoutes
+			 
+		   rebuildVrLan += rebuildVrLanInterface
+		   rebuildVrLan += "</tns2:vr-lan-interface>"
+		   rebuildVrLan += "</tns2:vr-lan>"
+			
+		}
+		log("DEBUG", " rebuildVrLan - " + rebuildVrLan)
+		return rebuildVrLan 		
+	}
+	
+	// Build vr-lan-interface
+	def buildVrLanInterfacePartial(xmlInput) {
+		def rebuildingVrLanInterface = ''
+		if (xmlInput != null) {
+			def vrLanInterfaceList = ["vr-designation", "v4-vr-lan-prefix", "v4-vr-lan-address", "v4-vr-lan-prefix-length", "v6-vr-lan-prefix", "v6-vr-lan-address", "v6-vr-lan-prefix-length", "v4-vce-loopback-address", "v6-vce-wan-address"]
+			rebuildingVrLanInterface += buildElements(xmlInput, vrLanInterfaceList, "")
+			rebuildingVrLanInterface += "<tns2:v4-public-lan-prefixes>"
+			try { // optional
+				def tProvidedV4LanPublicPrefixes = getNodeXml(xmlInput, "v4-public-lan-prefixes").drop(38).trim()
+				def tProvidedV4LanPublicPrefixesList = ["request-index", "v4-next-hop-address", "v4-lan-public-prefix", "v4-lan-public-prefix-length" ]
+				rebuildingVrLanInterface += buildElementsUnbounded(xmlInput, tProvidedV4LanPublicPrefixesList, "t-provided-v4-lan-public-prefixes")
+			} catch (Exception ex) {
+				log("ERROR", " Optional - Exception VR-LAN INTERFACE 'v4-public-lan-prefixes' ")
+			}
+			rebuildingVrLanInterface += "</tns2:v4-public-lan-prefixes>"
+			rebuildingVrLanInterface += "<tns2:v6-public-lan-prefixes>"
+			try { // optional
+				def tProvidedV6LanPublicPrefixes = getNodeXml(xmlInput, "v6-public-lan-prefixes").drop(38).trim()
+				def tProvidedV6LanPublicPrefixesList = ["request-index", "v6-next-hop-address", "v6-lan-public-prefix", "v6-lan-public-prefix-length" ]
+				rebuildingVrLanInterface += buildElementsUnbounded(xmlInput, tProvidedV6LanPublicPrefixesList, "t-provided-v6-lan-public-prefixes")
+			} catch (Exception e) {
+				log("ERROR", " Optional - Exception VR-LAN INTERFACE 'v6-public-lan-prefixes' ")
+			}
+			rebuildingVrLanInterface += "</tns2:v6-public-lan-prefixes>"
+		}
+		log("DEBUG", " rebuildingVrLanInterface - " + rebuildingVrLanInterface)
+		return rebuildingVrLanInterface
+	}
+	
+	// Build dhcp
+	def buildDhcp(xmlInput) {
+		def rebuildingDhcp = ''
+		if (xmlInput != null) {
+			def dhcpData = new XmlSlurper().parseText(xmlInput)
+			rebuildingDhcp = "<tns2:dhcp>"
+			def dhcpList1 = ["v4-dhcp-server-enabled", "v6-dhcp-server-enabled", "use-v4-default-pool", "v4-dhcp-default-pool-prefix", "v4-dhcp-default-pool-prefix-length"]
+			rebuildingDhcp += buildElements(xmlInput, dhcpList1, "")
+			try { // optional
+				def excludedV4DhcpAddressesFromDefaultPoolList = ["excluded-v4-address"]
+				rebuildingDhcp += buildElementsUnbounded(xmlInput, excludedV4DhcpAddressesFromDefaultPoolList, "excluded-v4-dhcp-addresses-from-default-pool")
+			} catch (Exception e) {
+				log("ERROR", " Optional - Exception DHCP 'excluded-v4-dhcp-addresses-from-default-pool' ")
+			}
+			try { // optional
+				def v4DhcpPools = dhcpData.'**'.findAll {it.name() == "v4-dhcp-pools"}
+				def v4DhcpPoolsSize = v4DhcpPools.size()
+				// println " v4DhcpPoolsSize = " + v4DhcpPools.size()
+				for (i in 0..v4DhcpPoolsSize-1) {
+					def v4DhcpPool = v4DhcpPools[i]
+					def v4DhcpPoolXml = XmlUtil.serialize(v4DhcpPool)
+					rebuildingDhcp += "<tns2:v4-dhcp-pools>"
+					def v4DhcpPoolsList1 = ["v4-dhcp-pool-prefix", "v4-dhcp-pool-prefix-length" ]
+					rebuildingDhcp += buildElements(v4DhcpPoolXml, v4DhcpPoolsList1, "")
+					try { // optional
+					   def excludedV4AddressesList = ["excluded-v4-address"]
+					   rebuildingDhcp += buildElementsUnbounded(v4DhcpPoolXml, excludedV4AddressesList, "excluded-v4-addresses")
+					} catch (Exception e) {
+					   log("ERROR", " Optional - Exception DHCP 'excluded-v4-addresses' ")
+					}
+					def v4DhcpPoolsList2 = ["v4-dhcp-relay-gateway-address", "v4-dhcp-relay-next-hop-address"]
+					rebuildingDhcp += buildElements(v4DhcpPoolXml, v4DhcpPoolsList2, "")
+					rebuildingDhcp += "</tns2:v4-dhcp-pools>"
+				 }
+			 } catch (Exception e) {
+				  log("ERROR"," Optional - Exception DHCP 'v4-dhcp-pools' ")
+			 }
+			 def dhcpList2 = ["use-v6-default-pool", "v6-dhcp-default-pool-prefix", "v6-dhcp-default-pool-prefix-length"]
+			 rebuildingDhcp += buildElements(xmlInput, dhcpList2, "")
+			 try { // optional
+				 def excludedV6DhcpAddressesFromDdefaultPoolList = ["excluded-v6-address"]
+				 rebuildingDhcp += buildElementsUnbounded(xmlInput, excludedV6DhcpAddressesFromDdefaultPoolList, "excluded-v6-dhcp-addresses-from-default-pool")
+			 } catch (Exception e) {
+			   log("ERROR", " Optional - Exception DHCP 'excluded-v6-dhcp-addresses-from-default-pool' ")
+			 }
+			 try { // optional
+				 def v6DhcpPools = dhcpData.'**'.findAll {it.name() == "v6-dhcp-pools"}
+				 def v6DhcpPoolsSize = v6DhcpPools.size()
+				 //println " v6DhcpPoolsSize = " + v6DhcpPools.size()
+				 for (i in 0..v6DhcpPoolsSize-1) {
+					def v6DhcpPool = v6DhcpPools[i]
+					def v6DhcpPoolXml = XmlUtil.serialize(v6DhcpPool)
+					rebuildingDhcp += "<tns2:v6-dhcp-pools>"
+					def v6DhcpPoolsList1 = ["v6-dhcp-pool-prefix", "v6-dhcp-pool-prefix-length"]
+					rebuildingDhcp += buildElements(v6DhcpPoolXml, v6DhcpPoolsList1, "")
+					try { // optional
+						def excludedV6AddressesList = ["excluded-v6-address"]
+						rebuildingDhcp += buildElementsUnbounded(v6DhcpPoolXml, excludedV6AddressesList, "excluded-v6-addresses")
+					} catch (Exception e) {
+							 log("ERROR", " Optional - Exception DHCP 'excluded-v6-addresses' ")
+					}
+					def v6DhcpPoolsList2 = ["v6-dhcp-relay-gateway-address", "v6-dhcp-relay-next-hop-address"]
+					rebuildingDhcp += buildElements(v6DhcpPoolXml, v6DhcpPoolsList2, "")
+					rebuildingDhcp += "</tns2:v6-dhcp-pools>"
+				 }
+			 } catch (Exception e) {
+				 log("ERROR", " Optional - Exception DHCP 'v6-dhcp-pools' ")
+			 }
+			 rebuildingDhcp += "</tns2:dhcp>"
+		}	 
+		log("DEBUG", " rebuildingDhcp - " + rebuildingDhcp)
+		return rebuildingDhcp
+	}	
+
+	// Build pat
+	def buildPat(xmlInput) {
+		 def rebuildingPat = ''
+		 if (xmlInput != null) {
+			 rebuildingPat = "<tns2:pat>"
+			 def patList = ["v4-pat-enabled", "use-v4-default-pool", "v4-pat-default-pool-prefix", "v4-pat-default-pool-prefix-length"]
+			 rebuildingPat += buildElements(xmlInput, patList, "")
+			 try { // optional
+				 def v4PatPools = getNodeXml(xmlInput, "v4-pat-pools").drop(38).trim()
+				 def v4PatPoolsList = ["v4-pat-pool-prefix", "v4-pat-pool-prefix-length", "v4-pat-pool-next-hop-address"]
+				 rebuildingPat += buildElementsUnbounded(xmlInput, v4PatPoolsList, "v4-pat-pools")
+			 } catch (Exception e) {
+				log("ERROR", " Optional - Exception 'v4-pat-pool-next-hop-address' ")
+			 }
+			 rebuildingPat += "</tns2:pat>"
+		 }
+		 log("DEBUG", " rebuildingPat - " + rebuildingPat)
+	     return rebuildingPat
+    }
+	
+	// Build nat
+	def buildNat(xmlInput) {
+		def rebuildingNat = ''
+		if (xmlInput != null) {
+			rebuildingNat = "<tns2:nat>"
+			rebuildingNat += buildElements(xmlInput, ["v4-nat-enabled"], "")
+			try { // optional
+			 def v4NatMappingEntries = getNodeXml(xmlInput, "v4-nat-mapping-entries").drop(38).trim()
+			 def v4NatMappingEntriesList = ["v4-nat-internal", "v4-nat-next-hop-address", "v4-nat-external"]
+			 rebuildingNat += buildElementsUnbounded(xmlInput, v4NatMappingEntriesList, "v4-nat-mapping-entries")
+			} catch (Exception e) {
+			   log("ERROR", " Optional - Exception 'v4-nat-external' ")
+			}
+			rebuildingNat += "</tns2:nat>"
+		}
+		log("DEBUG", " rebuildingNat - " + rebuildingNat)
+	    return rebuildingNat
+	}				
+	
+	// Build firewall-lite
+	def buildFirewallLite(xmlInput) {
+		def rebuildingFirewallLite = ''
+		
+		if (xmlInput != null) {
+			
+			def firewallLiteData = new XmlSlurper().parseText(xmlInput)
+			rebuildingFirewallLite = "<tns2:firewall-lite>"
+			def firewallLiteList = ["stateful-firewall-lite-v4-enabled", "stateful-firewall-lite-v6-enabled"]
+			rebuildingFirewallLite += buildElements(xmlInput, firewallLiteList, "")
+			
+			 try { // optional
+				 def v4FirewallPacketFilters = firewallLiteData.'**'.findAll {it.name() == "v4-firewall-packet-filters"}
+				 def v4FirewallPacketFiltersSize = v4FirewallPacketFilters.size()
+				 //println " v4FirewallPacketFiltersSize = " + v4FirewallPacketFilters.size()
+				 for (i in 0..v4FirewallPacketFiltersSize-1) {
+			       def v4FirewallPacketFilter = v4FirewallPacketFilters[i]
+			       def v4FirewallPacketFilterXml = XmlUtil.serialize(v4FirewallPacketFilter)
+				   rebuildingFirewallLite += "<tns2:v4-firewall-packet-filters>"
+				   def v4FirewallPacketFiltersList = ["v4-firewall-prefix", "v4-firewall-prefix-length", "allow-icmp-ping"]
+				   rebuildingFirewallLite += buildElements(v4FirewallPacketFilterXml, v4FirewallPacketFiltersList, "")
+				   try {  // optional
+			          def udpPortsList = ["port-number"]
+					  rebuildingFirewallLite += buildElementsUnbounded(v4FirewallPacketFilterXml, udpPortsList, "udp-ports")
+				   } catch (Exception e) {
+					  log("ERROR", " Optional - Exception FIREWALL-LITE v4 'udp-ports' ")
+				   }
+				   try {  // optional
+					  def tcpPortsList =  ["port-number"]
+					  rebuildingFirewallLite += buildElementsUnbounded(v4FirewallPacketFilterXml, tcpPortsList, "tcp-ports")
+				   } catch (Exception e) {
+				      log("ERROR", " Optional - Exception FIREWALL-LITE v4 'tcp-ports' ")
+				   }
+				   rebuildingFirewallLite += "</tns2:v4-firewall-packet-filters>"
+				 }
+			 } catch (Exception e) {
+				 log("ERROR", " Optional - Exception FIREWALL-LITE 'v4-firewall-packet-filters' ")
+			 }
+			 
+			 try { // optional
+				 def v6FirewallPacketFilters = firewallLiteData.'**'.findAll {it.name() == "v6-firewall-packet-filters"}
+				 def v6FirewallPacketFiltersSize = v6FirewallPacketFilters.size()
+				 //println " v6FirewallPacketFiltersSize = " + v6FirewallPacketFilters.size()
+				 for (i in 0..v6FirewallPacketFiltersSize-1) {
+					def v6FirewallPacketFilter = v6FirewallPacketFilters[i]
+					def v6FirewallPacketFilterXml = XmlUtil.serialize(v6FirewallPacketFilter)
+					rebuildingFirewallLite += "<tns2:v6-firewall-packet-filters>"
+					def v6FirewallPacketFiltersList = ["v6-firewall-prefix", "v6-firewall-prefix-length", "allow-icmp-ping"]
+					rebuildingFirewallLite += buildElements(v6FirewallPacketFilterXml, v6FirewallPacketFiltersList, "")
+					try { // optional
+						def udpPortsList = ["port-number"]
+						rebuildingFirewallLite += buildElementsUnbounded(v6FirewallPacketFilterXml, udpPortsList, "udp-ports")
+					} catch (Exception e) {
+				      log("ERROR", " Optional - Exception FIREWALL-LITE v6 'udp-ports' ")
+					}
+					try { // optional
+						def tcpPortsList =  ["port-number"]
+						rebuildingFirewallLite += buildElementsUnbounded(v6FirewallPacketFilterXml, tcpPortsList, "tcp-ports")
+					} catch (Exception e) {
+				    	log("ERROR", " Optional - Exception FIREWALL-LITE v6 'tcp-ports' ")
+					}
+			       rebuildingFirewallLite += "</tns2:v6-firewall-packet-filters>"
+				 }
+			 } catch (Exception e) {
+				 log("ERROR", " Optional - Exception FIREWALL-LITE 'v6-firewall-packet-filters' ")
+			 }
+			 rebuildingFirewallLite+= "</tns2:firewall-lite>"
+		}
+		log("DEBUG", " rebuildingFirewallLite - " + rebuildingFirewallLite)
+		return rebuildingFirewallLite
+     }
+	
+	def buildStaticRoutes(xmlInput) {
+		def rebuildingStaticRoutes = ''
+		if (xmlInput != null) {
+			rebuildingStaticRoutes = "<tns2:static-routes>"
+			def v4StaticRouteslist = ["v4-static-route-prefix","v4-static-route-prefix-length", "v4-next-hop-address"]
+			rebuildingStaticRoutes += buildElementsUnbounded(xmlInput, v4StaticRouteslist, "v4-static-routes")
+			def v6StaticRouteslist = ["v6-static-route-prefix","v6-static-route-prefix-length", "v6-next-hop-address"]
+			rebuildingStaticRoutes += buildElementsUnbounded(xmlInput, v6StaticRouteslist, "v6-static-routes")
+			rebuildingStaticRoutes += "</tns2:static-routes>"
+		}
+		log("DEBUG", " rebuildingStaticRoutes - " + rebuildingStaticRoutes)
+		return rebuildingStaticRoutes
+	}
+	
+	public String generateCurrentTimeInUtc(){
+		final  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+		final String utcTime = sdf.format(new Date());
+		return utcTime;
+	}
+	
+	public String generateCurrentTimeInGMT(){
+		final  SimpleDateFormat sdf = new SimpleDateFormat("E, d MMM yyyy h:m:s z");
+		sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+		final String utcTime = sdf.format(new Date());
+		return utcTime;
+	}
+	
+
+	/**
+	 * @param encryptedAuth: encrypted credentials from urn properties
+	 * @param msoKey: key to use to decrypt from urn properties
+	 * @return base 64 encoded basic auth credentials
+	 */
+	def getBasicAuth(encryptedAuth, msoKey){
+		if ((encryptedAuth == null || encryptedAuth.isEmpty()) || (msoKey == null || msoKey.isEmpty()))
+			return null
+		try {
+			def auth = decrypt(encryptedAuth, msoKey)
+			byte[] encoded = Base64.encodeBase64(auth.getBytes())
+			String encodedString = new String(encoded)
+			encodedString = "Basic " + encodedString
+			return encodedString
+		} catch (Exception ex) {
+			log("ERROR", "Unable to encode basic auth")
+			throw ex
+		}
+	}
+	
+	def encrypt(toEncrypt, msokey){
+		try {
+			String result = CryptoUtils.encrypt(toEncrypt, msokey);
+			return result
+		}
+		catch (Exception e) {
+			log("ERROR", "Failed to encrypt credentials")
+		}
+	}
+	
+	def decrypt(toDecrypt, msokey){
+		try {
+			String result = CryptoUtils.decrypt(toDecrypt, msokey);
+			return result
+		}
+		catch (Exception e) {
+			log("ERROR", "Failed to decrypt credentials")
+			throw e
+		}
+	}
+	
+	/**
+	 * Return URL with qualified host name (if any) or urn mapping
+	 * @param  String url from urn mapping
+	 * @return String url with qualified host name
+	 */
+	public String getQualifiedHostNameForCallback(String urnCallbackUrl) {
+		def callbackUrlToUse = urnCallbackUrl
+		try{
+			//swap host name with qualified host name from the jboss properties
+			def qualifiedHostName = System.getProperty("jboss.qualified.host.name")
+			if(qualifiedHostName!=null){
+				log("DEBUG", "qualifiedHostName:\n" + qualifiedHostName)
+				callbackUrlToUse = callbackUrlToUse.replaceAll("(http://)(.*)(:28080*)", {orig, first, torepl, last -> "${first}${qualifiedHostName}${last}"})
+			}
+		}catch(Exception e){
+				log("DEBUG", "unable to grab qualified host name, using what's in urn properties for callbackurl. Exception was: " + e.printStackTrace())
+		}
+		return callbackUrlToUse
+		
+	}
+	
+	/**
+	 * Retrieves text context of the element if the element exists, returns empty string otherwise
+	 * @param com.sun.org.apache.xerces.internal.dom.DeferredElementNSImpl element to parse
+	 * param String tagName tagName
+	 * @return String text content of the element
+	 */
+	 public String getElementText(Element element, String tagName) {
+	 	String text = ""
+	 	org.w3c.dom.NodeList nodeList = element.getElementsByTagNameNS("*", tagName)
+	 	if (nodeList != null && nodeList.length > 0) {
+	 		text = nodeList.item(0).getTextContent()
+	 	}
+	 	return text
+	 }
+	 
+	 /**
+	  *
+	  * Find the lowest unused module-index value in a given xml
+	  */
+	 public String getLowestUnusedIndex(String xml) {
+		 if (xml == null || xml.isEmpty()) {
+			 return "0"
+		 }		 
+		 def moduleIndexList = getMultNodes(xml, "module-index") 
+		 if (moduleIndexList == null || moduleIndexList.size() == 0) {			
+			 return "0"
+		 }
+		 def sortedModuleIndexList = moduleIndexList.sort { a, b -> a.compareTo b }
+		
+		 for (i in 0..sortedModuleIndexList.size()-1) {
+			 if (Integer.parseInt(sortedModuleIndexList[i]) != i) {
+				 return i.toString()
+			 }
+		 }
+		 return sortedModuleIndexList.size().toString()
+	 }
+	/**
+	 * This utility checks if there is transaction id already present in MDC.
+	 * If found, it returns same else creates new, sets in MDC for future use before returning
+	 * @return String RequestId in UUID format.
+	 */
+	public String getRequestID()
+	{
+		String requestId = MDC.get("RequestId")
+		if(requestId == null || requestId.isEmpty())
+		{
+			requestId = java.util.UUID.randomUUID()
+			MDC.put("RequestId",requestId)
+			log("DEBUG","MsoUtils - Created new RequestId: " + requestId)
+		}
+		else
+		{
+			log("DEBUG","MsoUtils - Using existing RequestId: " + requestId)
+		}
+
+		return requestId
+	}
+
+	/**
+	 * Remove all the empty nodes and attributes from the within the given node
+	 * @param node
+	 * @return true if all empty nodes and attributes were removed.
+	 */
+	public boolean cleanNode( Node node ) {
+		node.attributes().with { a ->
+			a.findAll { !it.value }.each { a.remove( it.key ) }
+		}
+		node.children().with { kids ->
+			kids.findAll { it instanceof Node ? !cleanNode( it ) : false }
+					.each { kids.remove( it ) }
+		}
+		node.attributes() || node.children() || node.text()
+	}
+
+	/**
+	 *
+	 * @param xml
+	 * @return String representation of xml after removing the empty nodes and attributes
+	 */
+	public String cleanNode(String xmlString) {
+		def xml = new XmlParser(false, false).parseText(xmlString)
+		cleanNode(xml)
+		return XmlUtil.serialize(xml)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/NetworkUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/NetworkUtils.groovy
index f6b36546aa..2e5499c158 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/NetworkUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/NetworkUtils.groovy
@@ -1,1573 +1,1581 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import org.apache.commons.lang3.*

-

-import groovy.xml.XmlUtil

-

-import javax.xml.parsers.DocumentBuilder

-import javax.xml.parsers.DocumentBuilderFactory

-import javax.xml.transform.Transformer

-import javax.xml.transform.TransformerFactory

-import javax.xml.transform.TransformerException

-import javax.xml.transform.dom.DOMSource

-import javax.xml.transform.stream.StreamResult

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-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.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

-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

-

-

-/**

- * This groovy class supports the any Network processes that need the methods defined here.

- */

-class NetworkUtils {

-

-	public MsoUtils utils = new MsoUtils()

-	private AbstractServiceTaskProcessor taskProcessor

-

-	public NetworkUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-	}

-

-	/**

-	 * This method returns the string for Network request

-	 * V2 for Contrail 3.x will populate cloud-region data in same cloudSiteId filed

-	 * Network adapter will handle it properly

-	 * @param requestId either 'request-id' or 'mso-request-id'

-	 * @param requestInput the request in the process

-	 * @param queryIdResponse the response of REST AAI query by Id

-	 * @param routeCollection the collection

-	 * @param policyFqdns the policy

-	 * @param tableCollection the collection

-	 * @param cloudRegionId the cloud-region-region

-	 * @return String request

-	 */

-	def CreateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyFqdns, tableCollection, cloudRegionId, backoutOnFailure, source) {

-		String createNetworkRequest = null

-		if(requestInput!=null && queryIdResponse!=null) {

-				String serviceInstanceId = ""

-				String sharedValue = ""

-				String externalValue = ""

-

-				if (source == "VID") {

-					sharedValue = utils.getNodeText1(queryIdResponse, "is-shared-network") != null ? utils.getNodeText1(queryIdResponse, "is-shared-network") : "false"

-					externalValue = utils.getNodeText1(queryIdResponse, "is-external-network") != null ? utils.getNodeText1(queryIdResponse, "is-external-network") : "false"

-					serviceInstanceId = utils.getNodeText1(requestInput, "service-instance-id")

-

-				} else { // source = 'PORTAL'

-					sharedValue = getParameterValue(requestInput, "shared")

-					externalValue = getParameterValue(requestInput, "external")

-					serviceInstanceId = utils.getNodeText1(requestInput, "service-instance-id") != null ? utils.getNodeText1(requestInput, "service-instance-id") : ""

-				}

-

-				String networkParams = ""

-				if (utils.nodeExists(requestInput, "network-params")) {

-					String netParams = utils.getNodeXml(requestInput, "network-params", false).replace("tag0:","").replace(":tag0","")

-					networkParams = buildParams(netParams)

-				}

-

-				String failIfExists = "false"

-				// requestInput

-				String cloudRegion = cloudRegionId

-				String tenantId = utils.getNodeText1(requestInput, "tenant-id")

-

-				String networkType = ""

-				String modelCustomizationUuid = ""

-				if (utils.nodeExists(requestInput, "networkModelInfo")) {

-					String networkModelInfo = utils.getNodeXml(requestInput, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")

-					networkType = utils.getNodeText1(networkModelInfo, "modelName")

-					modelCustomizationUuid = utils.getNodeText1(networkModelInfo, "modelCustomizationUuid")

-				} else {

-					networkType = utils.getNodeText1(queryIdResponse, "network-type")

-					modelCustomizationUuid = utils.getNodeText1(requestInput, "modelCustomizationId")

-				}

-

-				// queryIdResponse

-				String networkName = utils.getNodeText1(queryIdResponse, "network-name")

-				String networkId = utils.getNodeText1(queryIdResponse, "network-id")

-				String networkTechnology = utils.getNodeText1(queryIdResponse, "network-technology")

-

-				// contrailNetwork - networkTechnology = 'Contrail' vs. 'AIC_SR_IOV')

-				String contrailNetwork = ""

-				if (networkTechnology.contains('Contrail') || networkTechnology.contains('contrail') || networkTechnology.contains('CONTRAIL')) {

-					contrailNetwork = """<contrailNetwork>

-					                       <shared>${sharedValue}</shared>

-					                       <external>${externalValue}</external>

-					                       ${routeCollection}

-					                       ${policyFqdns}

-					                       ${tableCollection}

-				                         </contrailNetwork>"""

-					networkTechnology = "CONTRAIL"    // replace

-			    }

-

-				// rebuild subnets

-				String subnets = ""

-				if (utils.nodeExists(queryIdResponse, "subnets")) {

-					def subnetsGroup = utils.getNodeXml(queryIdResponse, "subnets", false)

-					subnets = buildSubnets(subnetsGroup)

-				}

-

-				String physicalNetworkName = ""

-				physicalNetworkName = utils.getNodeText1(queryIdResponse, "physical-network-name")

-

-				String vlansCollection = buildVlans(queryIdResponse)

-

-				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?

-

-				createNetworkRequest = """

-								<createNetworkRequest>

-									<cloudSiteId>${cloudRegion}</cloudSiteId>

-									<tenantId>${tenantId}</tenantId>

-									<networkId>${networkId}</networkId>

-									<networkName>${networkName}</networkName>

-									<networkType>${networkType}</networkType>

-									<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>

-									<networkTechnology>${networkTechnology}</networkTechnology>

-									<providerVlanNetwork>

-										<physicalNetworkName>${physicalNetworkName}</physicalNetworkName >

-										${vlansCollection}

-									</providerVlanNetwork>

-                                    ${contrailNetwork}

-									${subnets}

-									<skipAAI>true</skipAAI>

-									<backout>${backoutOnFailure}</backout>

-									<failIfExists>${failIfExists}</failIfExists>

-									${networkParams}

-									<msoRequest>

-										<requestId>${requestId}</requestId>

-										<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-			      					</msoRequest>

-									<messageId>${messageId}</messageId>

-									<notificationUrl>${notificationUrl}</notificationUrl>

-								</createNetworkRequest>

-								""".trim()

-		}

-		return createNetworkRequest

-

-	}

-

-	/**

-	 * This method returns the string for Network request

-	 * V2 for Contrail 3.x will populate cloud-region data in same cloudSiteId filed

-	 * Network adapter will handle it properly

-	 * @param requestId either 'request-id' or 'mso-request-id'

-	 * @param requestInput the request in the process

-	 * @param queryIdResponse the response of REST AAI query by Id

-	 * @param routeCollection the collection

-	 * @param policyFqdns the policy

-	 * @param cloudRegionId the cloud-region-region

-	 * @return String request

-	 */

-	def UpdateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyFqdns, tableCollection, cloudRegionId, backoutOnFailure, source) {

-		String updateNetworkRequest = null

-		if(requestInput!=null && queryIdResponse!=null) {

-				String serviceInstanceId = ""

-				String sharedValue = ""

-				String externalValue = ""

-

-				if (source == "VID") {

-					sharedValue = utils.getNodeText1(queryIdResponse, "is-shared-network") != null ? utils.getNodeText1(queryIdResponse, "is-shared-network") : "false"

-					externalValue = utils.getNodeText1(queryIdResponse, "is-external-network") != null ? utils.getNodeText1(queryIdResponse, "is-external-network") : "false"

-					serviceInstanceId = utils.getNodeText1(requestInput, "service-instance-id")

-

-				} else { // source = 'PORTAL'

-					sharedValue = getParameterValue(requestInput, "shared")

-					externalValue = getParameterValue(requestInput, "external")

-					serviceInstanceId = utils.getNodeText1(requestInput, "service-instance-id") != null ? utils.getNodeText1(requestInput, "service-instance-id") : ""

-				}

-

-				String failIfExists = "false"

-				// requestInput

-				String cloudRegion = cloudRegionId

-				String tenantId = utils.getNodeText1(requestInput, "tenant-id")

-

-				// queryIdResponse

-				String networkName = utils.getNodeText1(queryIdResponse, "network-name")

-				String networkId = utils.getNodeText1(queryIdResponse, "network-id")

-				

-				String networkType = ""

-				String modelCustomizationUuid = ""

-				if (utils.nodeExists(requestInput, "networkModelInfo")) {

-					String networkModelInfo = utils.getNodeXml(requestInput, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")

-					networkType = utils.getNodeText1(networkModelInfo, "modelName")

-					modelCustomizationUuid = utils.getNodeText1(networkModelInfo, "modelCustomizationUuid")

-				} else {

-					networkType = utils.getNodeText1(queryIdResponse, "network-type")

-					modelCustomizationUuid = utils.getNodeText1(requestInput, "modelCustomizationId")

-				}

-

-				// rebuild subnets

-				String subnets = ""

-				if (utils.nodeExists(queryIdResponse, "subnets")) {

-					def subnetsGroup = utils.getNodeXml(queryIdResponse, "subnets", false)

-					subnets = buildSubnets(subnetsGroup)

-				}

-

-				String networkParams = ""

-				if (utils.nodeExists(requestInput, "network-params")) {

-					String netParams = utils.getNodeXml(requestInput, "network-params", false).replace("tag0:","").replace(":tag0","")

-					networkParams = buildParams(netParams)

-				}

-

-				String networkStackId = utils.getNodeText1(queryIdResponse, "heat-stack-id")

-				if (networkStackId == 'null' || networkStackId == "" || networkStackId == null) {

-					networkStackId = "force_update"

-				}

-

-				String physicalNetworkName = utils.getNodeText1(queryIdResponse, "physical-network-name")

-				String vlansCollection = buildVlans(queryIdResponse)

-

-				updateNetworkRequest =

-                         """<updateNetworkRequest>

-								<cloudSiteId>${cloudRegion}</cloudSiteId>

-								<tenantId>${tenantId}</tenantId>

-								<networkId>${networkId}</networkId>

-						        <networkStackId>${networkStackId}</networkStackId>

-								<networkName>${networkName}</networkName>

-								<networkType>${networkType}</networkType>

-								<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>

-								<networkTypeVersion/>

-								<networkTechnology>CONTRAIL</networkTechnology>

-								<providerVlanNetwork>

-									<physicalNetworkName>${physicalNetworkName}</physicalNetworkName>

-									${vlansCollection}

-								</providerVlanNetwork>

-								<contrailNetwork>

-									<shared>${sharedValue}</shared>

-									<external>${externalValue}</external>

-									${routeCollection}

-									${policyFqdns}

-									${tableCollection}

-								</contrailNetwork>

-								${subnets}

-								<skipAAI>true</skipAAI>

-								<backout>${backoutOnFailure}</backout>

-								<failIfExists>${failIfExists}</failIfExists>

-									${networkParams}

-

-								<msoRequest>

-								  <requestId>${requestId}</requestId>

-								  <serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-								</msoRequest>

-						 		<messageId>${messageId}</messageId>

-						 		<notificationUrl></notificationUrl>

- 							</updateNetworkRequest>""".trim()

-

-		}

-		return updateNetworkRequest

-

-	}

-

-	/**

-	 * This method returns the string for Create Volume Request payload

-	 * @param groupId the volume-group-id

-	 * @param volumeName the volume-group-name

-	 * @param vnfType the vnf-type

-	 * @param tenantId the value of relationship-key 'tenant.tenant-id'

-	 * @return String request payload

-	 */

-	def String CreateNetworkVolumeRequest(groupId, volumeName, vnfType, tenantId) {

-

-		String requestPayload =

-		"""<volume-group xmlns="http://org.openecomp.mso/v6">

-				<volume-group-id>${groupId}</volume-group-id>

-				<volume-group-name>${volumeName}</volume-group-name>

-				<heat-stack-id></heat-stack-id>

-				<vnf-type>${vnfType}</vnf-type>

-				<orchestration-status>Pending</orchestration-status>

-				<relationship-list>

-				   <relationship>

-					   <related-to>tenant</related-to>

-					   <relationship-data>

-						   <relationship-key>tenant.tenant-id</relationship-key>

-						   <relationship-value>${tenantId}</relationship-value>

-					   </relationship-data>

-				   </relationship>

-			   </relationship-list>

-		   </volume-group>"""

-

-		return requestPayload

-	}

-

-	def String createCloudRegionVolumeRequest(groupId, volumeName, vnfType, tenantId, cloudRegion, namespace, modelCustomizationId) {

-

-				String requestPayload =

-				"""<volume-group xmlns="${namespace}">

-				<volume-group-id>${groupId}</volume-group-id>

-				<volume-group-name>${volumeName}</volume-group-name>

-				<heat-stack-id></heat-stack-id>

-				<vnf-type>${vnfType}</vnf-type>

-				<orchestration-status>Pending</orchestration-status>

-				<vf-module-model-customization-id>${modelCustomizationId}</vf-module-model-customization-id>

-				<relationship-list>

-				   <relationship>

-					   <related-to>tenant</related-to>

-					   <relationship-data>

-						   <relationship-key>tenant.tenant-id</relationship-key>

-						   <relationship-value>${tenantId}</relationship-value>

-					   </relationship-data>

-					   <relationship-data>

-						   <relationship-key>cloud-region.cloud-owner</relationship-key>

-						   <relationship-value>att-aic</relationship-value>

-					   </relationship-data>

-					   <relationship-data>

-						   <relationship-key>cloud-region.cloud-region-id</relationship-key>

-						   <relationship-value>${cloudRegion}</relationship-value>

-					   </relationship-data>

-				   </relationship>

-			   </relationship-list>

-		   </volume-group>"""

-

-				return requestPayload

-			}

-

-	def String createCloudRegionVolumeRequest(groupId, volumeName, vnfType, vnfId, tenantId, cloudRegion, namespace, modelCustomizationId) {

-

-		String requestPayload =

-		"""<volume-group xmlns="${namespace}">

-			<volume-group-id>${groupId}</volume-group-id>

-			<volume-group-name>${volumeName}</volume-group-name>

-			<heat-stack-id></heat-stack-id>

-			<vnf-type>${vnfType}</vnf-type>

-			<orchestration-status>Pending</orchestration-status>

-			<vf-module-model-customization-id>${modelCustomizationId}</vf-module-model-customization-id>

-			<relationship-list>

-				<relationship>

-				   <related-to>generic-vnf</related-to>

-				   <relationship-data>

-					   <relationship-key>generic-vnf.vnf-id</relationship-key>

-					   <relationship-value>${vnfId}</relationship-value>

-				   </relationship-data>

-			   </relationship>

-			   <relationship>

-				   <related-to>tenant</related-to>

-				   <relationship-data>

-					   <relationship-key>tenant.tenant-id</relationship-key>

-					   <relationship-value>${tenantId}</relationship-value>

-				   </relationship-data>

-				   <relationship-data>

-					   <relationship-key>cloud-region.cloud-owner</relationship-key>

-					   <relationship-value>att-aic</relationship-value>

-				   </relationship-data>

-				   <relationship-data>

-					   <relationship-key>cloud-region.cloud-region-id</relationship-key>

-					   <relationship-value>${cloudRegion}</relationship-value>

-				   </relationship-data>

-			   </relationship>

-		   </relationship-list>

-		</volume-group>"""

-

-		return requestPayload

-	}

-

-

-	/**

-	 * This method returns the string for Update Volume Request payload

-	 * @param requeryAAIVolGrpNameResponse the response of query volume group name (in AAI)

-	  * @param heatStackId the value of heat stack id

-	 * @return String request payload

-	 */

-	def String updateCloudRegionVolumeRequest(requeryAAIVolGrpNameResponse, heatStackId, namespace, modelCustomizationId) {

-		String requestPayload = ""

-		if (requeryAAIVolGrpNameResponse != null) {

-			def groupId = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-id")

-			def volumeName = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-name")

-			def vnfType = utils.getNodeText(requeryAAIVolGrpNameResponse, "vnf-type")

-			def resourceVersion = utils.getNodeText(requeryAAIVolGrpNameResponse, "resource-version")

-			def relationshipList = ""

-			if (utils.nodeExists(requeryAAIVolGrpNameResponse, "relationship")) {

-				relationshipList = rebuildRelationship(requeryAAIVolGrpNameResponse)

-			}

-

-			requestPayload =

-				"""<volume-group xmlns="${namespace}">

-					<volume-group-id>${groupId}</volume-group-id>

-					<volume-group-name>${volumeName}</volume-group-name>

-					<heat-stack-id>${heatStackId}</heat-stack-id>

-					<vnf-type>${vnfType}</vnf-type>

-					<orchestration-status>Active</orchestration-status>

-					<resource-version>${resourceVersion}</resource-version>

-					<vf-module-model-customization-id>${modelCustomizationId}</vf-module-model-customization-id>

-					${relationshipList}

-				 </volume-group>"""

-		}

-

-		return requestPayload

-	}

-

-

-	/**

-	 * This method returns the string for Update Volume Request payload

-	 * @param requeryAAIVolGrpNameResponse the response of query volume group name (in AAI)

- 	 * @param heatStackId the value of heat stack id

-	 * @return String request payload

-	 */

-	def String UpdateNetworkVolumeRequest(requeryAAIVolGrpNameResponse, heatStackId) {

-		String requestPayload = ""

-		if (requeryAAIVolGrpNameResponse != null) {

-			def groupId = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-id")

-			def volumeName = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-name")

-			def vnfType = utils.getNodeText(requeryAAIVolGrpNameResponse, "vnf-type")

-			def resourceVersion = utils.getNodeText(requeryAAIVolGrpNameResponse, "resource-version")

-			def relationshipList = ""

-			if (utils.nodeExists(requeryAAIVolGrpNameResponse, "relationship")) {

-				relationshipList = rebuildRelationship(requeryAAIVolGrpNameResponse)

-			}

-

-			requestPayload =

-				"""<volume-group xmlns="http://org.openecomp.mso/v6">

-					<volume-group-id>${groupId}</volume-group-id>

-					<volume-group-name>${volumeName}</volume-group-name>

-					<heat-stack-id>${heatStackId}</heat-stack-id>

-					<vnf-type>${vnfType}</vnf-type>

-					<orchestration-status>Active</orchestration-status>

-					<resource-version>${resourceVersion}</resource-version>

-					${relationshipList}

-				 </volume-group>"""

-		}

-

-		return requestPayload

-	}

-

-	/**

-	 * This method returns the string for Create Contrail Network payload

-	 * @param requeryIdAAIResponse the response from AAI query by id

-	 * @param createNetworkResponse the response of create network

-	 * @return String contrailNetworkCreatedUpdate

-	 */

-	def ContrailNetworkCreatedUpdate(requeryIdAAIResponse, createNetworkResponse, schemaVersion) {

-

-		String contrailNetworkCreatedUpdate = ""

-		if(requeryIdAAIResponse!=null && createNetworkResponse!=null) {

-

-			def l3Network = utils.getNodeXml(requeryIdAAIResponse, "l3-network", false).replace("tag0:","").replace(":tag0","")

-			def createNetworkContrailResponse = ""

-			if (utils.nodeExists(createNetworkResponse, 'createNetworkResponse')) {

-			   createNetworkContrailResponse = utils.getNodeXml(createNetworkResponse, "createNetworkResponse", false).replace("tag0:","").replace(":tag0","")

-			} else {

-			   createNetworkContrailResponse = utils.getNodeXml(createNetworkResponse, "updateNetworkContrailResponse", false).replace("tag0:","").replace(":tag0","")

-			}

-

-			// rebuild network

-			def networkList = ["network-id", "network-name", "network-type", "network-role", "network-technology", "neutron-network-id", "is-bound-to-vpn", "service-id", "network-role-instance", "resource-version", "resource-model-uuid", "orchestration-status", "heat-stack-id", "mso-catalog-key", "contrail-network-fqdn",

-				                             "physical-network-name", "is-provider-network", "is-shared-network", "is-external-network"]

-			String rebuildNetworkElements = buildNetworkElements(l3Network, createNetworkContrailResponse, networkList)

-

-			// rebuild 'subnets'

-			def rebuildSubnetList = ""

-			if (utils.nodeExists(requeryIdAAIResponse, 'subnet')) {

-			     rebuildSubnetList = buildSubnets(requeryIdAAIResponse, createNetworkResponse)

-			}

-

-			// rebuild 'segmentation-assignments'

-			def rebuildSegmentationAssignments = ""

-			if (utils.nodeExists(requeryIdAAIResponse, 'segmentation-assignments')) {

-				List elementList = ["segmentation-id", "resource-version"]

-				if (utils.nodeExists(requeryIdAAIResponse, 'segmentation-assignment')) {  // new tag

-				    rebuildSegmentationAssignments =  buildXMLElements(requeryIdAAIResponse, "segmentation-assignments", "segmentation-assignment", elementList)

-				} else {

-				   rebuildSegmentationAssignments =  buildXMLElements(requeryIdAAIResponse, "", "segmentation-assignments", elementList)

-				}   

-			}

-

-			// rebuild 'ctag-assignments' / rebuildCtagAssignments

-			def rebuildCtagAssignmentsList = ""

-			if (utils.nodeExists(requeryIdAAIResponse, 'ctag-assignment')) {

-				rebuildCtagAssignmentsList = rebuildCtagAssignments(requeryIdAAIResponse)

-			}

-

-			// rebuild 'relationship'

-			def relationshipList = ""

-			if (utils.nodeExists(requeryIdAAIResponse, 'relationship-list')) {

-				String rootRelationshipData = getFirstNodeXml(requeryIdAAIResponse, "relationship-list").drop(38).trim().replace("tag0:","").replace(":tag0","")

-				if (utils.nodeExists(rootRelationshipData, 'relationship')) {

-					relationshipList = rebuildRelationship(rootRelationshipData)

-				}

-			}

-

-			//Check for optional contrail network fqdn within CreateNetworkResponse

-			String contrailNetworkFQDN

-			if(utils.nodeExists(createNetworkResponse, "contrail-network-fqdn")){

-				contrailNetworkFQDN = utils.getNodeXml(createNetworkResponse, "contrail-network-fqdn")

-				contrailNetworkFQDN = utils.removeXmlNamespaces(contrailNetworkFQDN)

-				contrailNetworkFQDN = utils.removeXmlPreamble(contrailNetworkFQDN)

-			}else{

-				contrailNetworkFQDN = ""

-			}

-

-			contrailNetworkCreatedUpdate =

-				 """<l3-network xmlns="${schemaVersion}">

-					 	${rebuildNetworkElements}

-						${rebuildSubnetList}

-						${rebuildSegmentationAssignments}

-						${rebuildCtagAssignmentsList}

-						${relationshipList}

-						${contrailNetworkFQDN}

-				      </l3-network>""".trim()

-

-		}

-			return contrailNetworkCreatedUpdate

-	}

-

-

-

-	/**

-	 * This method returns the value for the name paramName.

-	 *   Ex:   <network-params>

-	 *            <param name="shared">1</param>

-	 *            <param name="external">0</external>

-	 *         </network-params>

-	 *

-	 * @param xmlInput the XML document

-	 * @param paramName the param name (ex: 'shared')

-	 * @return a param value for 'shared' (ex: '1')

-	 */

-	def getParameterValue(xmlInput, paramName) {

-		def rtn=""

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			rtn= xml.'**'.find {param->param.'@name'.text() == paramName}

-		}

-		if (rtn==null) {

-			return ""

-		} else {

-		   return rtn

-		}

-	}

-

-	/**

-	 * This method returns the name of param if found/match with paramName.

-	 *   Ex:   <network-params>

-	 *            <param name="shared">1</param>

-	 *            <param name="external">0</external>

-	 *         </network-params>

-	 *

-	 * @param xmlInput the XML document

-	 * @param paramName the param name (ex: 'shared', )

-	 * @return a param name for 'shared' (ex: 'shared' if found)

-	 */

-	def getParameterName(xmlInput, paramName) {

-		def rtn=""

-		if(xmlInput!=null){

-			def xml= new XmlSlurper().parseText(xmlInput)

-			try {

-				rtn= xml.'**'.find {param->param.'@name' == paramName}.'@name'

-			} catch (Exception ex) {

-			    rtn=""

-			}

-		}

-		if (rtn==null || rtn=="") {

-			return ""

-		} else {

-		   return rtn

-		}

-	}

-

-	/**

-	 * This method returns the networkParams xml string.

-	 *   Ex: input:

-	 *         <network-params>

-	 *            <param name="shared">1</param>

-	 *            <param name="external">0</external>

-	 *         </network-params>

-	 *

-	 *   Sample result:

-	 *         <networkParams>

-     *            <shared>1</shared>

-     *            <external>0</external>

-     *         </networkParams>

-     *

-	 */

-

-	def buildParams(networkParams) {

-		def build = ""

-			def netParams = new XmlParser().parseText(networkParams)

-			try {

-				def paramsList = netParams.'**'.findAll {param->param.'@name'}.'@name'

-				if (paramsList.size() > 0) {

-					build += "<networkParams>"

-					for (i in 0..paramsList.size()-1) {

-                        def name = netParams.'**'.find {param->param.'@name' == paramsList[i]}.'@name'

-						def value= netParams.'**'.find {param->param.'@name' == paramsList[i]}.text()

-						build += "<${name}>${value}</${name}>"

-					}

-					build += "</networkParams>"

-				}

-

-			} catch (Exception ex) {

-				println ' buildParams error - ' + ex.getMessage()

-				build = ""

-			}

-		return build

-	}

-

-	def getVlans(xmlInput) {

-		def rtn = ""

-		if (xmlInput!=null) {

-			def vlansList = getListWithElements(xmlInput, 'vlans')

-			def vlansListSize = vlansList.size()

-			if (vlansListSize > 0) {

-				for (i in 0..vlansListSize-1) {

-				   rtn += '<vlans>'+vlansList[i]+'</vlans>'

-				}

-			}

-		}

-		return rtn

-

-

-	}

-

-	/**

-	 * This method returns the uri value for the vpn bindings.

-	 * Return the a list of value of vpn binding in the <related-link> string.

-	 * Ex.

-	 *   <relationship-list>

-	 *      <relationship>

-	 *          <related-to>vpn-binding</related-to>

-	 *          <related-link>https://aai-app-e2e.test.openecomp.com:8443/aai/v6/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-	 *          <relationship-data>

-	 *             <relationship-key>vpn-binding.vpn-id</relationship-key>

-	 *             <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-	 *          </relationship-data>

-	 *       </relationship>

-	 *		<relationship>

-	 *	        <related-to>vpn-binding</related-to>

-	 *			<related-link>https://aai-ext1.test.openecomp.com:8443/aai/v6/network/vpn-bindings/vpn-binding/24a4b507-853a-4a38-99aa-05fcc54be24d/</related-link>

-	 *			<relationship-data>

-	 *			   <relationship-key>vpn-binding.vpn-id</relationship-key>

-	 *			   <relationship-value>24a4b507-853a-4a38-99aa-05fcc54be24d</relationship-value>

-	 *		    </relationship-data>

-	 *			<related-to-property>

-	 *			  <property-key>vpn-binding.vpn-name</property-key>

-	 *			  <property-value>oam_protected_net_6_MTN5_msotest1</property-value>

-	 *			</related-to-property>

-	 *		</relationship>

-	 * @param xmlInput the XML document

-	 * @return a list of vpn binding values

-	 *            ex: ['aai/v6/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/', 'aai/v6/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/']

-	 *

-	 **/

-	def getVnfBindingObject(xmlInput) {

-		//def rtn = null

-		List rtn = []

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "vpn-binding") {

-				   	  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))

-					  }

-				   }

-				}

-			}

-		}

-		return rtn

-	}

-	/**

-	 * similar to VNF bindings method

-	* @param xmlInput the XML document

-	* @return a list of network policy values

-	*            ex: ['aai/v$/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg', 'aai/v$/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg']

-	*

-	**/

-	def getNetworkPolicyObject(xmlInput) {

-		//def rtn = null

-		List rtn = []

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "network-policy") {

-					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))

-					  }

-				   }

-				}

-			}

-		}

-		return rtn

-	}

-

-	/**

-	 * similar to network policymethod

-	* @param xmlInput the XML document

-	* @return a list of network policy values

-	*            ex: ['aai/v$/network/route-table-references/route-table-reference/refFQDN1', 'aai/v$/network/route-table-references/route-table-reference/refFQDN2']

-	*

-	**/

-	def getNetworkTableRefObject(xmlInput) {

-		//def rtn = null

-		List rtn = []

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "route-table-reference") {

-					  def relatedLink = utils.getNodeText1(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))

-					  }

-				   }

-				}

-			}

-		}

-		return rtn

-	}

-

-	/**

-	 * similar to network policymethod

-	* @param xmlInput the XML document

-	* @return a list of IDs for related VNF instances

-	*

-	**/

-	def getRelatedVnfIdList(xmlInput) {

-		//def rtn = null

-		List rtn = []

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "generic-vnf") {

-					  def relatedLink = utils.getNodeText1(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 if (relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()).contains('/')) {

-							 rtn.add(relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()-1))

-						 } else {

-						     rtn.add(relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()))

-						 }

-					  }

-				   }

-				}

-			}

-		}

-		return rtn

-	}

-

-	/**

-	 * similar to network policymethod

-	* @param xmlInput the XML document

-	* @return a list of IDs for related Network instances

-	*

-	**/

-	def getRelatedNetworkIdList(xmlInput) {

-		//def rtn = null

-		List rtn = []

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "l3-network") {

-					  def relatedLink = utils.getNodeText1(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 if (relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()).contains('/')) {

-							 rtn.add(relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()-1))

-						 } else {

-						     rtn.add(relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()))

-						 }

-					  }

-				   }

-				}

-			}

-		}

-		return rtn

-	}

-

-	def isVfRelationshipExist(xmlInput) {

-		Boolean rtn = false

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "vf-module") {

-					     rtn = true

-				   }

-				}

-			}

-		}

-		return rtn

-

-	}

-

-	def getCloudRegion(xmlInput) {

-		String lcpCloudRegion = ""

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "cloud-region") {

-					  def relatedLink = utils.getNodeText1(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 lcpCloudRegion = relatedLink.substring(relatedLink.indexOf("/att-aic/")+9, relatedLink.length())

-						 if (lcpCloudRegion.contains('/')) {

-							 lcpCloudRegion = relatedLink.substring(relatedLink.indexOf("/att-aic/")+9, relatedLink.length()-1)

-						 }

-					  }

-				   }

-				}

-			}

-		}

-		return lcpCloudRegion

-	}

-

-	def getTenantId(xmlInput) {

-		String tenantId = ""

-		if (xmlInput!=null) {

-			def relationshipList = getListWithElements(xmlInput, 'relationship')

-			def relationshipListSize = relationshipList.size()

-			if (relationshipListSize > 0) {

-				for (i in 0..relationshipListSize-1) {

-				   def relationshipXml = XmlUtil.serialize(relationshipList[i])

-				   if (utils.getNodeText(relationshipXml, 'related-to') == "tenant") {

-					  def relatedLink = utils.getNodeText1(relationshipXml, 'related-link')

-					  if (relatedLink != null || relatedLink != "") {

-						 tenantId = relatedLink.substring(relatedLink.indexOf("/tenant/")+8, relatedLink.length())

-						 if (tenantId.contains('/')) {

-							 tenantId = relatedLink.substring(relatedLink.indexOf("/tenant/")+8, relatedLink.length()-1)

-						 }

-					  }

-				   }

-				}

-			}

-		}

-		return tenantId

-	}

-

-	def isInstanceValueMatch(linkResource, globalSubscriberId, serviceType) {

-		Boolean rtn = false

-		try {

-			String globalSubscriberIdLink = linkResource.substring(linkResource.indexOf("/customer/")+10, linkResource.indexOf("/service-subscriptions"))

-			String serviceTypeLink = linkResource.substring(linkResource.indexOf("/service-subscription/")+22, linkResource.indexOf("/service-instances"))

-			if (globalSubscriberIdLink == globalSubscriberId) {

-					rtn = true

-			} else {

-				if (serviceTypeLink == serviceType) {

-					rtn = true

-				}

-			}

-

-		} catch (Exception ex) {

-		    println 'Exception - ' + ex.getMessage()

-			return false

-		}

-        return rtn

-	}

-

-	def getListWithElements(xmlInput, groupName) {

-		def rtn = ""

-		if (xmlInput != null) {

-			def relationshipData = new XmlSlurper().parseText(xmlInput)

-			rtn = relationshipData.'**'.findAll {it.name() == groupName}

-		}

-		return rtn

-

-	}

-

-	// build network single elements

-	def buildNetworkElements(l3Network, createNetworkContrailResponse, networkList) {

-		def replaceNetworkId = ""

-		def replaceNeutronNetworkId = ""

-		def replaceContrailNetworkFqdn = ""

-		if (l3Network != null && createNetworkContrailResponse != null) {

-			if (utils.nodeExists(l3Network, 'heat-stack-id')) {

-				replaceNetworkId = utils.getNodeText(l3Network, 'heat-stack-id')

-			} else {

-				if (utils.nodeExists(createNetworkContrailResponse, 'networkStackId')) {

-					replaceNetworkId = utils.getNodeText(createNetworkContrailResponse, 'networkStackId')

-				}

-			}

-			if (utils.nodeExists(l3Network, 'neutron-network-id')) {

-				replaceNeutronNetworkId = utils.getNodeText(l3Network, 'neutron-network-id')

-			} else {

-				if (utils.nodeExists(createNetworkContrailResponse, 'neutronNetworkId')) {

-					replaceNeutronNetworkId = utils.getNodeText(createNetworkContrailResponse, 'neutronNetworkId')

-				}

-			}

-			if (utils.nodeExists(l3Network, 'contrail-network-fqdn')) {

-				replaceContrailNetworkFqdn = utils.getNodeText(l3Network, 'contrail-network-fqdn')

-			} else {

-				if (utils.nodeExists(createNetworkContrailResponse, 'networkFqdn')) {

-					replaceContrailNetworkFqdn = utils.getNodeText(createNetworkContrailResponse, 'networkFqdn')

-				}

-			}

-		}

-

-		String var = ""

-		def xmlNetwork = ""

-		if (l3Network != null) {

-			for (element in networkList) {

-				def xml= new XmlSlurper().parseText(l3Network)

-				var = xml.'**'.find {it.name() == element}

-				if (var == null) {

-					if (element=="orchestration-status") {

-						if (var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {

-							xmlNetwork += "<"+element+">"+"Created"+"</"+element+">"

-					    } else { //pending-update or PendingUpdate

-							xmlNetwork += "<"+element+">"+"Active"+"</"+element+">"

-					    }

-					}	

-					if (element=="heat-stack-id") {

-						if (replaceNetworkId != "") {

-							xmlNetwork += "<"+element+">"+replaceNetworkId+"</"+element+">"

-						}

-					}

-					if (element=="neutron-network-id") {

-						if (replaceNeutronNetworkId != "") {

-							xmlNetwork += "<"+element+">"+replaceNeutronNetworkId+"</"+element+">"

-						}

-					}

-					if (element=="contrail-network-fqdn") {

-						if (replaceContrailNetworkFqdn != "") {

-							xmlNetwork += "<"+element+">"+replaceContrailNetworkFqdn+"</"+element+">"

-						}

-					}

-

-				} else {

-			   		if (element=="orchestration-status") {

-					   if (element=="orchestration-status") {

-						  if (var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {

-						      xmlNetwork += "<"+element+">"+"Created"+"</"+element+">"

-						  } else { //pending-update or PendingUpdate

-							  xmlNetwork += "<"+element+">"+"Active"+"</"+element+">"

-						  }

-					   }   

-				    } else {

-			    	    xmlNetwork += "<"+element+">"+var.toString()+"</"+element+">"

-					}

-				}	

-			 }

-		}

-		return xmlNetwork

-	}

-

-	def buildSubnets(requeryIdAAIResponse, createNetworkResponse) {

-		def rebuildingSubnets = ""

-		if (requeryIdAAIResponse != null && utils.nodeExists(requeryIdAAIResponse, 'subnets')) {

-			def subnetIdMapValue = ""

-			def subnetsGroup = utils.getNodeXml(requeryIdAAIResponse, "subnets", false)

-			def subnetsData = new XmlSlurper().parseText(subnetsGroup)

-			rebuildingSubnets += "<subnets>"

-			try {

-				def subnets = subnetsData.'**'.findAll {it.name() == "subnet"}

-				def subnetsSize = subnets.size()

-				for (i in 0..subnetsSize-1) {

-				   def subnet = subnets[i]

-				   def subnetXml = XmlUtil.serialize(subnet)

-				   def orchestrationStatus = utils.getNodeText1(subnetXml, "orchestration-status")

-				   if (orchestrationStatus == "PendingDelete" || orchestrationStatus == "pending-delete") {

-					   // skip, do not include in processing, remove!!!

-				   } else {

-				      def subnetList = ["subnet-id", "neutron-subnet-id", "gateway-address", "network-start-address", "cidr-mask", "ip-version", "orchestration-status", "dhcp-enabled", "dhcp-start", "dhcp-end", "resource-version", "subnet-name", "ip-assignment-direction", "host-routes"]

-				      rebuildingSubnets += buildSubNetworkElements(subnetXml, createNetworkResponse, subnetList, "subnet")

-				   }	  

-				}

-				if (utils.nodeExists(subnetsData, 'relationship')) {

-					rebuildingSubnets = rebuildRelationship(requeryIdAAIResponse)

-				}

-

-			} catch (Exception ex) {

-				// error

-			} finally {

-				rebuildingSubnets += "</subnets>"

-			}

-		}

-		return rebuildingSubnets

-	}

-

-	def buildSubnets(queryIdResponse) {

-		def rebuildingSubnets = ""

-		def subnetsData = new XmlSlurper().parseText(queryIdResponse)

-		//rebuildingSubnets += "<subnets>"

-		try {

-			def subnets = subnetsData.'**'.findAll {it.name() == "subnet"}

-			def subnetsSize = subnets.size()

-			for (i in 0..subnetsSize-1) {

-			   def subnet = subnets[i]

-			   def subnetXml = XmlUtil.serialize(subnet)

-			   def orchestrationStatus = utils.getNodeText1(subnetXml, "orchestration-status")

-			   if (orchestrationStatus == "pending-delete" || orchestrationStatus == "PendingDelete") {

-				   // skip, do not include in processing, remove!!!

-			   } else {

-			   	  	def subnetList = ["dhcp-start", "dhcp-end", "network-start-address", "cidr-mask", "dhcp-enabled", "gateway-address", "ip-version", "subnet-id", "subnet-name", "ip-assignment-direction", "host-routes"]

-					rebuildingSubnets += buildSubNetworkElements(subnetXml, subnetList, "subnets")

-			   		//rebuildingSubnets += buildSubNetworkElements(subnetXml, subnetList, "")

-			   }	

-			}

-		} catch (Exception ex) {

-		   //

-		} finally {

-		  //rebuildingSubnets += "</subnets>"

-		}

-		return rebuildingSubnets

-	}

-

-

-	// build subnet sub-network single elements

-	def buildSubNetworkElements(subnetXml, createNetworkResponse, elementList, parentName) {

-		String var = ""

-		def xmlBuild = ""

-		if (parentName != "") {

-		   xmlBuild += "<"+parentName+">"

-		}

-		if (subnetXml != null) {

-			for (element in elementList) {

-			  def xml= new XmlSlurper().parseText(subnetXml)

-			  var = xml.'**'.find {it.name() == element}

-			  if (var != null) {

-			  	 if (element=="orchestration-status") {

-					if(var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {   

-						xmlBuild += "<"+element+">"+"Created"+"</"+element+">"

-					} else { // pending-update or PendingUpdate'

-					   xmlBuild += "<"+element+">"+"Active"+"</"+element+">"

-					}

-				 } else { // "subnet-id", "neutron-subnet-id"

-					 if (element=="subnet-id") {

-						 if (utils.nodeExists(createNetworkResponse, "subnetMap")) {

-							 xmlBuild += "<"+element+">"+var.toString()+"</"+element+">"

-							 String neutronSubnetId = extractNeutSubId(createNetworkResponse, var.toString())

-							 xmlBuild += "<neutron-subnet-id>"+neutronSubnetId+"</neutron-subnet-id>"

-						 }

-					 } else {

-					     if (element=="neutron-subnet-id") {

-                               // skip

-						 } else {

-						 	 if (element=="host-routes") {

-								 if (subnetXml.contains("host-routes")) {

-									 List elementRoute = ["host-route-id", "route-prefix", "next-hop", "next-hop-type", "resource-version"]

-									 xmlBuild += buildXMLElements(subnetXml, "host-routes", "host-route", elementRoute)

-								 }

-						 	 } else { 	  

-							  	xmlBuild += "<"+element+">"+var.toString()+"</"+element+">"

-						 	 }	  

-						 }

-					 }

-				 }

-			  }

-			}

-

-		}

-		if (parentName != "") {

-		   xmlBuild += "</"+parentName+">"

-		}

-		return xmlBuild

-	}

-

-	// build subnet sub-network single elements

-	def buildSubNetworkElements(subnetXml, elementList, parentName) {

-		def var = ""

-		def xmlBuild = ""

-		if (parentName != "") {

-			xmlBuild += "<"+parentName+">"

-		 }

-		if (subnetXml != null) {

-		    def networkStartAddress = ""

-			for (element in elementList) {

-				def xml= new XmlSlurper().parseText(subnetXml)

-				var = xml.'**'.find {it.name() == element}

-				if (element == "dhcp-start") {

-					xmlBuild += "<allocationPools>"

-					if (var.toString() == 'null') {

-						xmlBuild += "<start>"+""+"</start>"

-					} else {

-						xmlBuild += "<start>"+var.toString()+"</start>"

-					}

-				}

-				if (element == "dhcp-end") {

-					if (var.toString() == 'null') {

-						xmlBuild += "<end>"+""+"</end>"

-					} else {

-						xmlBuild += "<end>"+var.toString()+"</end>"

-					}

-					xmlBuild += "</allocationPools>"

-				}

-				if (element == "network-start-address" || element == "cidr-mask") {

-					if (element == "network-start-address") {

-						networkStartAddress = var.toString()

-					}

-					if (element == "cidr-mask") {

-						xmlBuild += "<cidr>"+networkStartAddress+"/"+var.toString()+"</cidr>"

-					}

-				}

-				if (element == "dhcp-enabled") {

-					xmlBuild += "<enableDHCP>"+var.toString()+"</enableDHCP>"

-				}

-				if (element == "gateway-address") {

-					xmlBuild += "<gatewayIp>"+var.toString()+"</gatewayIp>"

-				}

-				if (element == "ip-version") {

-					String ipVersion = getIpvVersion(var.toString())

-					xmlBuild += "<ipVersion>"+ipVersion+"</ipVersion>"

-				}

-				if (element == "subnet-id") {

-					xmlBuild += "<subnetId>"+var.toString()+"</subnetId>"

-				}

-				if ((element == "subnet-name") && (var != null)) {

-					xmlBuild += "<subnetName>"+var.toString()+"</subnetName>"

-				}

-				if ((element == "ip-assignment-direction") && (var != null)) {

-					xmlBuild += "<addrFromStart>"+var.toString()+"</addrFromStart>"

-				}

-				if (element == "host-routes") {

-					def routes = ""

-					if (subnetXml.contains("host-routes")) {

-						routes = buildHostRoutes(subnetXml)

-					}

-					xmlBuild += routes 

-				}	

-				

-			}

-		}

-		if (parentName != "") {

-			xmlBuild += "</"+parentName+">"

-		 }

-		return xmlBuild

-	}

-

-	// rebuild host-routes

-	def buildHostRoutes(subnetXml) {

-		List  routeElementList = ["host-route-id", "route-prefix", "next-hop", "next-hop-type", "resource-version"]

-		def hostRoutes = buildXMLElements(subnetXml, "host-routes", "host-route", routeElementList)

-		def buildHostRoutes = ""

-		def var = ""

-		if (hostRoutes!=null) {

-			def routesData = new XmlSlurper().parseText(hostRoutes)

-			def routes = routesData.'**'.findAll {it.name() == "host-route"}

-			def routesSize = routes.size()

-			for (i in 0..routesSize-1) {

-			   buildHostRoutes += "<hostRoutes>"

-			   def route = routes[i]

-			   def routeXml = XmlUtil.serialize(route)

-			   List  elementList = ["route-prefix", "next-hop"]

-			   for (element in elementList) {

-				   def xml= new XmlSlurper().parseText(routeXml)

-				   var = xml.'**'.find {it.name() == element}

-				   if (element == "route-prefix") {

-					   buildHostRoutes += "<prefix>"+var.toString()+"</prefix>"

-				   }

-				   if (element == "next-hop") {

-					   buildHostRoutes += "<nextHop>"+var.toString()+"</nextHop>"

-				   }

-			   }

-			   buildHostRoutes += "</hostRoutes>"

-			}   

-		}		

-		return buildHostRoutes		

-		

-	}

-	

-	// rebuild ctag-assignments

-	def rebuildCtagAssignments(xmlInput) {

-		def rebuildingCtagAssignments = ""

-		if (xmlInput!=null) {

-			def ctagAssignmentsData = new XmlSlurper().parseText(xmlInput)

-			rebuildingCtagAssignments += "<ctag-assignments>"

-			def ctagAssignments = ctagAssignmentsData.'**'.findAll {it.name() == "ctag-assignment"}

-			def ctagAssignmentsSize = ctagAssignments.size()

-			for (i in 0..ctagAssignmentsSize-1) {

-				def ctagAssignment = ctagAssignments[i]

-				def ctagAssignmentXml = XmlUtil.serialize(ctagAssignment)

-				rebuildingCtagAssignments += "<ctag-assignment>"

-				List elementList = ["vlan-id-inner", "resource-version"]

-				rebuildingCtagAssignments +=  buildXMLElements(ctagAssignmentXml, ""      , "", elementList)

-				if (utils.nodeExists(ctagAssignmentXml, 'relationship')) {

-					rebuildingCtagAssignments += rebuildRelationship(ctagAssignmentXml)

-				}

-				rebuildingCtagAssignments += "</ctag-assignment>"

-			}

-			rebuildingCtagAssignments += "</ctag-assignments>"

-		}

-		return rebuildingCtagAssignments

-	}

-

-	// rebuild 'relationship-list'

-	def rebuildRelationship(xmlInput) {

-		def rebuildingSubnets = ""

-		if (xmlInput!=null) {

-			def subnetsData = new XmlSlurper().parseText(xmlInput)

-			rebuildingSubnets += "<relationship-list>"

-			def relationships = subnetsData.'**'.findAll {it.name() == "relationship"}

-			def relationshipsSize = relationships.size()

-			for (i in 0..relationshipsSize-1) {

-				def relationship = relationships[i]

-				def relationshipXml = XmlUtil.serialize(relationship)

-				rebuildingSubnets += "<relationship>"

-				def relationshipList = ["related-to", "related-link"]

-				rebuildingSubnets += buildSubNetworkElements(relationshipXml, "", relationshipList, "")

-				if (utils.nodeExists(relationshipXml, 'relationship-data')) {

-					def relationshipDataXmlData = new XmlSlurper().parseText(relationshipXml)

-					def relationshipsData = relationshipDataXmlData.'**'.findAll {it.name() == "relationship-data"}

-					def relationshipsDataSize = relationshipsData.size()

-					for (j in 0..relationshipsDataSize-1) {

-						def relationshipData = relationshipsData[j]

-						def relationshipDataXml = XmlUtil.serialize(relationshipData)

-						def relationshipDataList =  ["relationship-key", "relationship-value"]

-						rebuildingSubnets += buildXMLElements(relationshipDataXml, "", "relationship-data", relationshipDataList)

-					}

-				}

-				if (utils.nodeExists(relationshipXml, 'related-to-property')) {

-					def relationshipDataXmlData = new XmlSlurper().parseText(relationshipXml)

-					def relationshipsData = relationshipDataXmlData.'**'.findAll {it.name() == "related-to-property"}

-					def relationshipsDataSize = relationshipsData.size()

-					for (j in 0..relationshipsDataSize-1) {

-						def relationshipData = relationshipsData[j]

-						def relationshipDataXml = XmlUtil.serialize(relationshipData)

-						def relationshipDataList =  ["property-key", "property-value"]

-						rebuildingSubnets += buildXMLElements(relationshipDataXml, "", "related-to-property", relationshipDataList)

-					}

-				}

-

-				rebuildingSubnets += "</relationship>"

-			}

-			rebuildingSubnets += "</relationship-list>"

-		}

-		return rebuildingSubnets

-	}

-

-	def buildVlans(queryIdResponse) {

-		def rebuildingSubnets = "<vlans>"

-		def subnetsData = new XmlSlurper().parseText(queryIdResponse)

-

-		try {

-			def subnets = subnetsData.'**'.findAll {it.name() == "segmentation-assignments"}

-			def subnetsSize = subnets.size()

-			for (i in 0..subnetsSize-1) {

-			   def subnet = subnets[i]

-			   def subnetXml = XmlUtil.serialize(subnet)

-

-			   String vlan = utils.getNodeText1(subnetXml, "segmentation-id")

-			   if (i>0){

-				   rebuildingSubnets += ","

-			   }

-			   rebuildingSubnets += vlan

-			}

-		} catch (Exception ex) {

-		   //

-		} finally {

-		  //rebuildingSubnets += "</subnets>"

-		rebuildingSubnets += "</vlans>"

-		}

-		return rebuildingSubnets

-	}

-

-	/* Utility code to rebuild xml/elements in a list:

-	 * rebuild xml with 1) unbounded groups of elements; or

-	 *                  2) one group of elements; or

-	 *                  3) just one or more elements (in a list as argument)

-	 * @param xmlInput the XML document

-	 * @param parentName the parent name  (ex: 'inputs')

-	 * @param childrenName the chilrendName (ex: 'entry' as unbounded/occurs>1)

-	 * @param elementList the element list of children (ex: 'key', 'value')

-	 * @return a string of rebuild xml

-	 *

-	 * Ex 1: xmlInput:

-	 *    <ws:inputs>

-	 *       <ws:entry>

-	 *          <ws:key>name</ws:key>

-	 *          <ws:value>Edward</ws:value>

-	 *       </ws:entry>

-	 *       <ws:entry>

-	 *          <ws:key>age</ws:key>

-	 *          <ws:value>30</ws:value>

-	 *       </ws:entry>

-	 *       <ws:entry>

-	 *          <ws:key>age</ws:key>

-	 *          <ws:value>30</ws:value>

-	 *       </ws:entry>

-	 *    <ws:/inputs>

-	 * Usage:

-	 * List elementList = ["key", "value"]

-	 * String rebuild =  buildXMLElements(xmlInput, "inputs", "entry", elementList)

-	 *

-	 * Ex 2: xmlInput // no parent tag

-	 *   <ws:sdnc-request-header>

-	 *    <ws:svc-request-id>fec8ec88-151a-45c9-ad60-8233e0fc8ff2</ws:svc-request-id>

-	 *    <ws:svc-notification-url>https://msojra.mtsnj.aic.cip.openecomp.com:8443/adapters/rest/SDNCNotify</ws:svc-notification-url>

-	 *    <ws:svc-action>assign</ws:svc-action>

-	 *   </ws:sdnc-request-header>

-	 * Usage:

-	 * List elementList = ["svc-request-id", "svc-notification-url", "svc-action"]

-	 * String rebuild =  buildXMLElements(xmlInput, ""      , "sdnc-request-header", elementList)  // no parent tag

-	 *

-	 * Ex 3: xmlInput // elements one after another (with no parent & children tag)

-	 * <ws:test-id>myTestid</ws:test-id>

-	 * <ws:test-user>myUser</ws:test-user>

-	 * Usage:

-	 * List elementList = ["test-id", "test-user"]

-	 * String rebuild =  buildXMLElements(xmlInput, ""      , "", elementList)

-	 *

-	 */

-	def buildXMLElements(xmlInput, parentName, childrenName, elementList) {

-		def varChildren = ""

-		def var = ""

-		def xmlBuildUnbounded = ""

-		if (parentName!="") {xmlBuildUnbounded += "<"+parentName+">" +'\n'}

-		if (xmlInput != null) {

-			def xml= new XmlSlurper().parseText(xmlInput)

-			if (childrenName!="") {

-				varChildren = xml.'**'.findAll {it.name() == childrenName}

-				for (i in 0..varChildren.size()-1) {

-					xmlBuildUnbounded += "<"+childrenName+">" +'\n'

-					for (element in elementList) {

-						var = varChildren[i].'*'.find {it.name() == element}

-					   if (var != null) {

-						  xmlBuildUnbounded += "<"+element+">"+var.toString()+"</"+element+">" +'\n'

-					   }

-					}

-					xmlBuildUnbounded += "</"+childrenName+">" +'\n'

-				}

-			} else {

-				for (element in elementList) {

-					var = xml.'*'.find {it.name() == element}

-					if (var != null) {

-						xmlBuildUnbounded += "<"+element+">"+var.toString()+"</"+element+">" +'\n'

-					}

-				}

-			}

-

-		}

-		if (parentName!="") {xmlBuildUnbounded += "</"+parentName+">" +'\n'}

-		return xmlBuildUnbounded

-	 }

-

-	def getFirstNodeXml(xmlInput, element){

-		def nodeAsText = ""

-		def nodeToSerialize =  ""

-		if (xmlInput != null) {

-			def fxml= new XmlSlurper().parseText(xmlInput)

-			if (utils.nodeExists(xmlInput, "payload")) {

-				nodeToSerialize = fxml.'payload'.'l3-network'.'*'.find {it.name() == element}

-				if (nodeToSerialize!=null) {

-					nodeAsText = XmlUtil.serialize(nodeToSerialize)

-				} else {

-				    nodeAsText = ""

-				}

-

-			} else {

-				nodeToSerialize = fxml.'*'.find {it.name() == element}

-				if (nodeToSerialize!=null) {

-					nodeAsText = XmlUtil.serialize(nodeToSerialize)

-				} else {

-					nodeAsText = ""

-				}

-

-			}

-		}

-		return nodeAsText

-

-	}

-

-//TODO: This method still needs to be tested before using.

-	/**

-	 *

-	 * This method is similar to the gennetwork:ContrailNetworUpdateCompletedObject

-	 * BPEL method.  It extracts all of the required subnet information

-	 * for each subnet listed with an orch status equal to the one provided

-	 * and puts the corresponding infomation with the appropriate node for

-	 * updating aai. The method sets the orch status for each subnet to active

-	 *

-	 * @param subnetsXml the entire subnets xml

-	 * @param requestInput the request in the process

-	 * @param queryIdResponse the response of REST AAI query by Id

-	 * @param queryVpnBindingResponse the response of REST AAI query by vpn binding

-	 * @param routeCollection the collection of vpnBinding's 'global-route-target'

-	 * @return String request

-	 */

-	public String networkUpdateSubnetInfo(String subnetsXml, String networkResponseXml){

-

-			String subnets = ""

-			StringBuilder sb = new StringBuilder()

-			InputSource source = new InputSource(new StringReader(subnetsXml));

-			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-			docFactory.setNamespaceAware(true)

-			DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-			Document xml = docBuilder.parse(source)

-			NodeList nodeList = xml.getElementsByTagNameNS("*", "subnet")

-			for (int x = 0; x < nodeList.getLength(); x++) {

-				Node node = nodeList.item(x)

-				String subnet = ""

-				if (node.getNodeType() == Node.ELEMENT_NODE) {

-					Element eElement = (Element) node

-					String subnetOrchStatus = eElement.getElementsByTagNameNS("*", "orchestration-status").item(0).getTextContent()

-					if(subnetOrchStatus.equals("pending-create")){

-

-						String subnetId = eElement.getElementsByTagNameNS("*", "subnet-id").item(0).getTextContent()

-						def netAddress = eElement.getElementsByTagNameNS("*", "network-start-address").item(0).getTextContent()

-						def mask = eElement.getElementsByTagNameNS("*", "cidr-mask").item(0).getTextContent()

-						def dhcpEnabledSubnet = eElement.getElementsByTagNameNS("*", "dhcp-enabled").item(0).getTextContent()

-						def gatewayAddress = eElement.getElementsByTagNameNS("*", "gateway-address").item(0).getTextContent()

-						def ipVersion = eElement.getElementsByTagNameNS("*", "ip-version").item(0).getTextContent()

-						def relationshipList =  eElement.getElementsByTagNameNS("*", "relationship-list").item(0).getTextContent() //TODO: test this

-						String neutronSubnetId = extractNeutSubId(networkResponseXml, subnetId)

-						subnet =

-						"""<subnet>

-					<subnetId>${subnetId}</subnetId>

-					<neutron-subnet-id>${neutronSubnetId}</neutron-subnet-id>

-					<gateway-address>${gatewayAddress}</gateway-address>

-					<network-start-address>${netAddress}</network-start-address>

-					<cidr-mask>${mask}</cidr-mask>

-					<ip-Version>${ipVersion}</ip-Version>

-					<orchestration-status>active</orchestration-status>

-					<dhcp-enabled>${dhcpEnabledSubnet}</dhcp-enabled>

-					<relationship-list>${relationshipList}</relationship-list>

-					</subnet>"""

-

-					}else if(subnetOrchStatus.equals("pending-delete")){

-						StringWriter writer = new StringWriter()

-						Transformer transformer = TransformerFactory.newInstance().newTransformer()

-						transformer.transform(new DOMSource(node), new StreamResult(writer))

-						subnet = writer.toString()

-

-					}else{

-						subnet = ""

-					}

-				}

-				subnets = sb.append(subnet)

-			}

-

-			subnets = utils.removeXmlPreamble(subnets)

-

-			String subnetsList =

-			"""<subnets>

-			${subnets}

-			</subnets>"""

-

-			return subnetsList

-	}

-

-

-	/**

-	 *

-	 * This method extracts the "value" node text for the the given subnet Id.

-	 *

-	 * @param String inputSource - xml that contains the subnet id key and value

-	 * @param String subnetId - for which you want the value of

-

-	 * @return String value - node text of node named value associated with the given subnet id

-	 */

-	public String extractNeutSubId(String inputSource, String subnetId){

-

-				String value = ""

-				InputSource source = new InputSource(new StringReader(inputSource));

-				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-				docFactory.setNamespaceAware(true)

-				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-				Document xml = docBuilder.parse(source)

-				NodeList nodeList = xml.getElementsByTagNameNS("*", "entry")

-				for (int x = 0; x < nodeList.getLength(); x++) {

-					Node node = nodeList.item(x)

-					String subnet = ""

-					if (node.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement = (Element) node

-						String key = eElement.getElementsByTagNameNS("*", "key").item(0).getTextContent()

-						if(key.equals(subnetId)){

-							value = eElement.getElementsByTagNameNS("*", "value").item(0).getTextContent()

-						}

-					}

-				}

-				return value

-			}

-

-	public boolean isRollbackEnabled (DelegateExecution execution, String payloadXml) {

-

-		def rollbackEnabled = false

-		def rollbackValueSet = false

-		if (utils.nodeExists(payloadXml, "backout-on-failure")) {

-			String backoutValue = utils.getNodeText1(payloadXml, "backout-on-failure")

-			if (backoutValue != null && !backoutValue.isEmpty()) {

-				if (backoutValue.equalsIgnoreCase("false")) {

-					rollbackEnabled = false

-				}

-				else {

-					rollbackEnabled = true

-				}

-				rollbackValueSet = true;

-			}

-		}

-

-		if (!rollbackValueSet) {

-			if (execution.getVariable("URN_mso_rollback") != null) {

-			    rollbackEnabled = execution.getVariable("URN_mso_rollback").toBoolean()

-			}

-		}

-		return rollbackEnabled

-	}

-	

-	

-	/**

-	 * This method extracts the version for the the given ip-version.

-	 *

-	 * @param String ipvVersion - IP protocols version (ex: ipv4 or ipv6 or 4 or 6)

-	 * @return String version - digit version (ex: 4 or 6)

-	 */

-	

-	public String getIpvVersion (String ipvVersion) {

-		

-		String version = ""

-		try {

-			if (ipvVersion.isNumber()) {

-				version = ipvVersion

-			} else {

-				version = ipvVersion.substring(ipvVersion.indexOf("ipv")+3)

-				if (!version.isNumber()) {

-					version = ipvVersion

-				}

-			}

-		} catch (Exception ex) {

-			version = ipvVersion  

-		}

-		return version

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import org.apache.commons.lang3.*
+
+import groovy.xml.XmlUtil
+import org.onap.so.bpmn.core.UrnPropertiesReader
+
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.Transformer
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.TransformerException
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+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.onap.so.logger.MsoLogger
+
+import org.onap.so.logger.MessageEnum
+
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor;
+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
+
+
+/**
+ * This groovy class supports the any Network processes that need the methods defined here.
+ */
+class NetworkUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, NetworkUtils.class);
+
+
+	public MsoUtils utils = new MsoUtils()
+	private AbstractServiceTaskProcessor taskProcessor
+
+	public NetworkUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+	}
+
+	/**
+	 * This method returns the string for Network request
+	 * V2 for Contrail 3.x will populate cloud-region data in same cloudSiteId filed
+	 * Network adapter will handle it properly
+	 * @param requestId either 'request-id' or 'mso-request-id'
+	 * @param requestInput the request in the process
+	 * @param queryIdResponse the response of REST AAI query by Id
+	 * @param routeCollection the collection
+	 * @param policyFqdns the policy
+	 * @param tableCollection the collection
+	 * @param cloudRegionId the cloud-region-region
+	 * @return String request
+	 */
+	def CreateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyFqdns, tableCollection, cloudRegionId, backoutOnFailure, source) {
+		String createNetworkRequest = null
+		if(requestInput!=null && queryIdResponse!=null) {
+				String serviceInstanceId = ""
+				String sharedValue = ""
+				String externalValue = ""
+
+				if (source == "VID") {
+					sharedValue = utils.getNodeText(queryIdResponse, "is-shared-network") != null ? utils.getNodeText(queryIdResponse, "is-shared-network") : "false"
+					externalValue = utils.getNodeText(queryIdResponse, "is-external-network") != null ? utils.getNodeText(queryIdResponse, "is-external-network") : "false"
+					serviceInstanceId = utils.getNodeText(requestInput, "service-instance-id")
+
+				} else { // source = 'PORTAL'
+					sharedValue = getParameterValue(requestInput, "shared")
+					externalValue = getParameterValue(requestInput, "external")
+					serviceInstanceId = utils.getNodeText(requestInput, "service-instance-id") != null ? utils.getNodeText(requestInput, "service-instance-id") : ""
+				}
+
+				String networkParams = ""
+				if (utils.nodeExists(requestInput, "network-params")) {
+					String netParams = utils.getNodeXml(requestInput, "network-params", false).replace("tag0:","").replace(":tag0","")
+					networkParams = buildParams(netParams)
+				}
+
+				String failIfExists = "false"
+				// requestInput
+				String cloudRegion = cloudRegionId
+				String tenantId = utils.getNodeText(requestInput, "tenant-id")
+
+				String networkType = ""
+				String modelCustomizationUuid = ""
+				if (utils.nodeExists(requestInput, "networkModelInfo")) {
+					String networkModelInfo = utils.getNodeXml(requestInput, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
+					networkType = utils.getNodeText(networkModelInfo, "modelName")
+					modelCustomizationUuid = utils.getNodeText(networkModelInfo, "modelCustomizationUuid")
+				} else {
+					networkType = utils.getNodeText(queryIdResponse, "network-type")
+					modelCustomizationUuid = utils.getNodeText(requestInput, "modelCustomizationId")
+				}
+
+				// queryIdResponse
+				String networkName = utils.getNodeText(queryIdResponse, "network-name")
+				String networkId = utils.getNodeText(queryIdResponse, "network-id")
+				String networkTechnology = utils.getNodeText(queryIdResponse, "network-technology")
+
+				// contrailNetwork - networkTechnology = 'Contrail' vs. 'AIC_SR_IOV')
+				String contrailNetwork = ""
+				if (networkTechnology.contains('Contrail') || networkTechnology.contains('contrail') || networkTechnology.contains('CONTRAIL')) {
+					contrailNetwork = """<contrailNetwork>
+					                       <shared>${MsoUtils.xmlEscape(sharedValue)}</shared>
+					                       <external>${MsoUtils.xmlEscape(externalValue)}</external>
+					                       ${routeCollection}
+					                       ${policyFqdns}
+					                       ${tableCollection}
+				                         </contrailNetwork>"""
+					networkTechnology = "CONTRAIL"    // replace
+			    }
+
+				// rebuild subnets
+				String subnets = ""
+				if (utils.nodeExists(queryIdResponse, "subnets")) {
+					def subnetsGroup = utils.getNodeXml(queryIdResponse, "subnets", false)
+					subnets = buildSubnets(subnetsGroup)
+				}
+
+				String physicalNetworkName = ""
+				physicalNetworkName = utils.getNodeText(queryIdResponse, "physical-network-name")
+
+				String vlansCollection = buildVlans(queryIdResponse)
+
+				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?
+
+				createNetworkRequest = """
+								<createNetworkRequest>
+									<cloudSiteId>${MsoUtils.xmlEscape(cloudRegion)}</cloudSiteId>
+									<tenantId>${MsoUtils.xmlEscape(tenantId)}</tenantId>
+									<networkId>${MsoUtils.xmlEscape(networkId)}</networkId>
+									<networkName>${MsoUtils.xmlEscape(networkName)}</networkName>
+									<networkType>${MsoUtils.xmlEscape(networkType)}</networkType>
+									<modelCustomizationUuid>${MsoUtils.xmlEscape(modelCustomizationUuid)}</modelCustomizationUuid>
+									<networkTechnology>${MsoUtils.xmlEscape(networkTechnology)}</networkTechnology>
+									<providerVlanNetwork>
+										<physicalNetworkName>${MsoUtils.xmlEscape(physicalNetworkName)}</physicalNetworkName >
+										${vlansCollection}
+									</providerVlanNetwork>
+                                    ${contrailNetwork}
+									${subnets}
+									<skipAAI>true</skipAAI>
+									<backout>${MsoUtils.xmlEscape(backoutOnFailure)}</backout>
+									<failIfExists>${MsoUtils.xmlEscape(failIfExists)}</failIfExists>
+									${networkParams}
+									<msoRequest>
+										<requestId>${MsoUtils.xmlEscape(requestId)}</requestId>
+										<serviceInstanceId>${MsoUtils.xmlEscape(serviceInstanceId)}</serviceInstanceId>
+			      					</msoRequest>
+									<messageId>${MsoUtils.xmlEscape(messageId)}</messageId>
+									<notificationUrl>${MsoUtils.xmlEscape(notificationUrl)}</notificationUrl>
+								</createNetworkRequest>
+								""".trim()
+		}
+		return createNetworkRequest
+
+	}
+
+	/**
+	 * This method returns the string for Network request
+	 * V2 for Contrail 3.x will populate cloud-region data in same cloudSiteId filed
+	 * Network adapter will handle it properly
+	 * @param requestId either 'request-id' or 'mso-request-id'
+	 * @param requestInput the request in the process
+	 * @param queryIdResponse the response of REST AAI query by Id
+	 * @param routeCollection the collection
+	 * @param policyFqdns the policy
+	 * @param cloudRegionId the cloud-region-region
+	 * @return String request
+	 */
+	def UpdateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyFqdns, tableCollection, cloudRegionId, backoutOnFailure, source) {
+		String updateNetworkRequest = null
+		if(requestInput!=null && queryIdResponse!=null) {
+				String serviceInstanceId = ""
+				String sharedValue = ""
+				String externalValue = ""
+
+				if (source == "VID") {
+					sharedValue = utils.getNodeText(queryIdResponse, "is-shared-network") != null ? utils.getNodeText(queryIdResponse, "is-shared-network") : "false"
+					externalValue = utils.getNodeText(queryIdResponse, "is-external-network") != null ? utils.getNodeText(queryIdResponse, "is-external-network") : "false"
+					serviceInstanceId = utils.getNodeText(requestInput, "service-instance-id")
+
+				} else { // source = 'PORTAL'
+					sharedValue = getParameterValue(requestInput, "shared")
+					externalValue = getParameterValue(requestInput, "external")
+					serviceInstanceId = utils.getNodeText(requestInput, "service-instance-id") != null ? utils.getNodeText(requestInput, "service-instance-id") : ""
+				}
+
+				String failIfExists = "false"
+				// requestInput
+				String cloudRegion = cloudRegionId
+				String tenantId = utils.getNodeText(requestInput, "tenant-id")
+
+				// queryIdResponse
+				String networkName = utils.getNodeText(queryIdResponse, "network-name")
+				String networkId = utils.getNodeText(queryIdResponse, "network-id")
+				
+				String networkType = ""
+				String modelCustomizationUuid = ""
+				if (utils.nodeExists(requestInput, "networkModelInfo")) {
+					String networkModelInfo = utils.getNodeXml(requestInput, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
+					networkType = utils.getNodeText(networkModelInfo, "modelName")
+					modelCustomizationUuid = utils.getNodeText(networkModelInfo, "modelCustomizationUuid")
+				} else {
+					networkType = utils.getNodeText(queryIdResponse, "network-type")
+					modelCustomizationUuid = utils.getNodeText(requestInput, "modelCustomizationId")
+				}
+
+				// rebuild subnets
+				String subnets = ""
+				if (utils.nodeExists(queryIdResponse, "subnets")) {
+					def subnetsGroup = utils.getNodeXml(queryIdResponse, "subnets", false)
+					subnets = buildSubnets(subnetsGroup)
+				}
+
+				String networkParams = ""
+				if (utils.nodeExists(requestInput, "network-params")) {
+					String netParams = utils.getNodeXml(requestInput, "network-params", false).replace("tag0:","").replace(":tag0","")
+					networkParams = buildParams(netParams)
+				}
+
+				String networkStackId = utils.getNodeText(queryIdResponse, "heat-stack-id")
+				if (networkStackId == 'null' || networkStackId == "" || networkStackId == null) {
+					networkStackId = "force_update"
+				}
+
+				String physicalNetworkName = utils.getNodeText(queryIdResponse, "physical-network-name")
+				String vlansCollection = buildVlans(queryIdResponse)
+
+				updateNetworkRequest =
+                         """<updateNetworkRequest>
+								<cloudSiteId>${MsoUtils.xmlEscape(cloudRegion)}</cloudSiteId>
+								<tenantId>${MsoUtils.xmlEscape(tenantId)}</tenantId>
+								<networkId>${MsoUtils.xmlEscape(networkId)}</networkId>
+						        <networkStackId>${MsoUtils.xmlEscape(networkStackId)}</networkStackId>
+								<networkName>${MsoUtils.xmlEscape(networkName)}</networkName>
+								<networkType>${MsoUtils.xmlEscape(networkType)}</networkType>
+								<modelCustomizationUuid>${MsoUtils.xmlEscape(modelCustomizationUuid)}</modelCustomizationUuid>
+								<networkTypeVersion/>
+								<networkTechnology>CONTRAIL</networkTechnology>
+								<providerVlanNetwork>
+									<physicalNetworkName>${MsoUtils.xmlEscape(physicalNetworkName)}</physicalNetworkName>
+									${vlansCollection}
+								</providerVlanNetwork>
+								<contrailNetwork>
+									<shared>${MsoUtils.xmlEscape(sharedValue)}</shared>
+									<external>${MsoUtils.xmlEscape(externalValue)}</external>
+									${routeCollection}
+									${policyFqdns}
+									${tableCollection}
+								</contrailNetwork>
+								${subnets}
+								<skipAAI>true</skipAAI>
+								<backout>${MsoUtils.xmlEscape(backoutOnFailure)}</backout>
+								<failIfExists>${MsoUtils.xmlEscape(failIfExists)}</failIfExists>
+									${networkParams}
+
+								<msoRequest>
+								  <requestId>${MsoUtils.xmlEscape(requestId)}</requestId>
+								  <serviceInstanceId>${MsoUtils.xmlEscape(serviceInstanceId)}</serviceInstanceId>
+								</msoRequest>
+						 		<messageId>${MsoUtils.xmlEscape(messageId)}</messageId>
+						 		<notificationUrl></notificationUrl>
+ 							</updateNetworkRequest>""".trim()
+
+		}
+		return updateNetworkRequest
+
+	}
+
+	/**
+	 * This method returns the string for Create Volume Request payload
+	 * @param groupId the volume-group-id
+	 * @param volumeName the volume-group-name
+	 * @param vnfType the vnf-type
+	 * @param tenantId the value of relationship-key 'tenant.tenant-id'
+	 * @return String request payload
+	 */
+	def String CreateNetworkVolumeRequest(groupId, volumeName, vnfType, tenantId) {
+
+		String requestPayload =
+		"""<volume-group xmlns="http://org.onap.so/v6">
+				<volume-group-id>${MsoUtils.xmlEscape(groupId)}</volume-group-id>
+				<volume-group-name>${MsoUtils.xmlEscape(volumeName)}</volume-group-name>
+				<heat-stack-id></heat-stack-id>
+				<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+				<orchestration-status>Pending</orchestration-status>
+				<relationship-list>
+				   <relationship>
+					   <related-to>tenant</related-to>
+					   <relationship-data>
+						   <relationship-key>tenant.tenant-id</relationship-key>
+						   <relationship-value>${MsoUtils.xmlEscape(tenantId)}</relationship-value>
+					   </relationship-data>
+				   </relationship>
+			   </relationship-list>
+		   </volume-group>"""
+
+		return requestPayload
+	}
+
+	def String createCloudRegionVolumeRequest(groupId, volumeName, vnfType, tenantId, cloudRegion, namespace, modelCustomizationId) {
+
+				String requestPayload =
+				"""<volume-group xmlns="${namespace}">
+				<volume-group-id>${MsoUtils.xmlEscape(groupId)}</volume-group-id>
+				<volume-group-name>${MsoUtils.xmlEscape(volumeName)}</volume-group-name>
+				<heat-stack-id></heat-stack-id>
+				<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+				<orchestration-status>Pending</orchestration-status>
+				<vf-module-model-customization-id>${MsoUtils.xmlEscape(modelCustomizationId)}</vf-module-model-customization-id>
+				<relationship-list>
+				   <relationship>
+					   <related-to>tenant</related-to>
+					   <relationship-data>
+						   <relationship-key>tenant.tenant-id</relationship-key>
+						   <relationship-value>${MsoUtils.xmlEscape(tenantId)}</relationship-value>
+					   </relationship-data>
+					   <relationship-data>
+						   <relationship-key>cloud-region.cloud-owner</relationship-key>
+						   <relationship-value>att-aic</relationship-value>
+					   </relationship-data>
+					   <relationship-data>
+						   <relationship-key>cloud-region.cloud-region-id</relationship-key>
+						   <relationship-value>${MsoUtils.xmlEscape(cloudRegion)}</relationship-value>
+					   </relationship-data>
+				   </relationship>
+			   </relationship-list>
+		   </volume-group>"""
+
+				return requestPayload
+			}
+
+	def String createCloudRegionVolumeRequest(groupId, volumeName, vnfType, vnfId, tenantId, cloudRegion, namespace, modelCustomizationId) {
+
+		String requestPayload =
+		"""<volume-group xmlns="${namespace}">
+			<volume-group-id>${MsoUtils.xmlEscape(groupId)}</volume-group-id>
+			<volume-group-name>${MsoUtils.xmlEscape(volumeName)}</volume-group-name>
+			<heat-stack-id></heat-stack-id>
+			<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+			<orchestration-status>Pending</orchestration-status>
+			<vf-module-model-customization-id>${MsoUtils.xmlEscape(modelCustomizationId)}</vf-module-model-customization-id>
+			<relationship-list>
+				<relationship>
+				   <related-to>generic-vnf</related-to>
+				   <relationship-data>
+					   <relationship-key>generic-vnf.vnf-id</relationship-key>
+					   <relationship-value>${MsoUtils.xmlEscape(vnfId)}</relationship-value>
+				   </relationship-data>
+			   </relationship>
+			   <relationship>
+				   <related-to>tenant</related-to>
+				   <relationship-data>
+					   <relationship-key>tenant.tenant-id</relationship-key>
+					   <relationship-value>${MsoUtils.xmlEscape(tenantId)}</relationship-value>
+				   </relationship-data>
+				   <relationship-data>
+					   <relationship-key>cloud-region.cloud-owner</relationship-key>
+					   <relationship-value>att-aic</relationship-value>
+				   </relationship-data>
+				   <relationship-data>
+					   <relationship-key>cloud-region.cloud-region-id</relationship-key>
+					   <relationship-value>${MsoUtils.xmlEscape(cloudRegion)}</relationship-value>
+				   </relationship-data>
+			   </relationship>
+		   </relationship-list>
+		</volume-group>"""
+
+		return requestPayload
+	}
+
+
+	/**
+	 * This method returns the string for Update Volume Request payload
+	 * @param requeryAAIVolGrpNameResponse the response of query volume group name (in AAI)
+	  * @param heatStackId the value of heat stack id
+	 * @return String request payload
+	 */
+	def String updateCloudRegionVolumeRequest(requeryAAIVolGrpNameResponse, heatStackId, namespace, modelCustomizationId) {
+		String requestPayload = ""
+		if (requeryAAIVolGrpNameResponse != null) {
+			def groupId = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-id")
+			def volumeName = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-name")
+			def vnfType = utils.getNodeText(requeryAAIVolGrpNameResponse, "vnf-type")
+			def resourceVersion = utils.getNodeText(requeryAAIVolGrpNameResponse, "resource-version")
+			def relationshipList = ""
+			if (utils.nodeExists(requeryAAIVolGrpNameResponse, "relationship")) {
+				relationshipList = rebuildRelationship(requeryAAIVolGrpNameResponse)
+			}
+
+			requestPayload =
+				"""<volume-group xmlns="${namespace}">
+					<volume-group-id>${MsoUtils.xmlEscape(groupId)}</volume-group-id>
+					<volume-group-name>${MsoUtils.xmlEscape(volumeName)}</volume-group-name>
+					<heat-stack-id>${MsoUtils.xmlEscape(heatStackId)}</heat-stack-id>
+					<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+					<orchestration-status>Active</orchestration-status>
+					<resource-version>${MsoUtils.xmlEscape(resourceVersion)}</resource-version>
+					<vf-module-model-customization-id>${MsoUtils.xmlEscape(modelCustomizationId)}</vf-module-model-customization-id>
+					${relationshipList}
+				 </volume-group>"""
+		}
+
+		return requestPayload
+	}
+
+
+	/**
+	 * This method returns the string for Update Volume Request payload
+	 * @param requeryAAIVolGrpNameResponse the response of query volume group name (in AAI)
+ 	 * @param heatStackId the value of heat stack id
+	 * @return String request payload
+	 */
+	def String UpdateNetworkVolumeRequest(requeryAAIVolGrpNameResponse, heatStackId) {
+		String requestPayload = ""
+		if (requeryAAIVolGrpNameResponse != null) {
+			def groupId = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-id")
+			def volumeName = utils.getNodeText(requeryAAIVolGrpNameResponse, "volume-group-name")
+			def vnfType = utils.getNodeText(requeryAAIVolGrpNameResponse, "vnf-type")
+			def resourceVersion = utils.getNodeText(requeryAAIVolGrpNameResponse, "resource-version")
+			def relationshipList = ""
+			if (utils.nodeExists(requeryAAIVolGrpNameResponse, "relationship")) {
+				relationshipList = rebuildRelationship(requeryAAIVolGrpNameResponse)
+			}
+
+			requestPayload =
+				"""<volume-group xmlns="http://org.onap.so/v6">
+					<volume-group-id>${MsoUtils.xmlEscape(groupId)}</volume-group-id>
+					<volume-group-name>${MsoUtils.xmlEscape(volumeName)}</volume-group-name>
+					<heat-stack-id>${MsoUtils.xmlEscape(heatStackId)}</heat-stack-id>
+					<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+					<orchestration-status>Active</orchestration-status>
+					<resource-version>${MsoUtils.xmlEscape(resourceVersion)}</resource-version>
+					${relationshipList}
+				 </volume-group>"""
+		}
+
+		return requestPayload
+	}
+
+	/**
+	 * This method returns the string for Create Contrail Network payload
+	 * @param requeryIdAAIResponse the response from AAI query by id
+	 * @param createNetworkResponse the response of create network
+	 * @return String contrailNetworkCreatedUpdate
+	 */
+	def ContrailNetworkCreatedUpdate(requeryIdAAIResponse, createNetworkResponse, schemaVersion) {
+
+		String contrailNetworkCreatedUpdate = ""
+		if(requeryIdAAIResponse!=null && createNetworkResponse!=null) {
+
+			def l3Network = utils.getNodeXml(requeryIdAAIResponse, "l3-network", false).replace("tag0:","").replace(":tag0","")
+			def createNetworkContrailResponse = ""
+			if (utils.nodeExists(createNetworkResponse, 'createNetworkResponse')) {
+			   createNetworkContrailResponse = utils.getNodeXml(createNetworkResponse, "createNetworkResponse", false).replace("tag0:","").replace(":tag0","")
+			} else {
+			   createNetworkContrailResponse = utils.getNodeXml(createNetworkResponse, "updateNetworkContrailResponse", false).replace("tag0:","").replace(":tag0","")
+			}
+
+			// rebuild network
+			def networkList = ["network-id", "network-name", "network-type", "network-role", "network-technology", "neutron-network-id", "is-bound-to-vpn", "service-id", "network-role-instance", "resource-version", "resource-model-uuid", "orchestration-status", "heat-stack-id", "mso-catalog-key", "contrail-network-fqdn",
+				                             "physical-network-name", "is-provider-network", "is-shared-network", "is-external-network"]
+			String rebuildNetworkElements = buildNetworkElements(l3Network, createNetworkContrailResponse, networkList)
+
+			// rebuild 'subnets'
+			def rebuildSubnetList = ""
+			if (utils.nodeExists(requeryIdAAIResponse, 'subnet')) {
+			     rebuildSubnetList = buildSubnets(requeryIdAAIResponse, createNetworkResponse)
+			}
+
+			// rebuild 'segmentation-assignments'
+			def rebuildSegmentationAssignments = ""
+			if (utils.nodeExists(requeryIdAAIResponse, 'segmentation-assignments')) {
+				List elementList = ["segmentation-id", "resource-version"]
+				if (utils.nodeExists(requeryIdAAIResponse, 'segmentation-assignment')) {  // new tag
+				    rebuildSegmentationAssignments =  buildXMLElements(requeryIdAAIResponse, "segmentation-assignments", "segmentation-assignment", elementList)
+				} else {
+				   rebuildSegmentationAssignments =  buildXMLElements(requeryIdAAIResponse, "", "segmentation-assignments", elementList)
+				}   
+			}
+
+			// rebuild 'ctag-assignments' / rebuildCtagAssignments
+			def rebuildCtagAssignmentsList = ""
+			if (utils.nodeExists(requeryIdAAIResponse, 'ctag-assignment')) {
+				rebuildCtagAssignmentsList = rebuildCtagAssignments(requeryIdAAIResponse)
+			}
+
+			// rebuild 'relationship'
+			def relationshipList = ""
+			if (utils.nodeExists(requeryIdAAIResponse, 'relationship-list')) {
+				String rootRelationshipData = getFirstNodeXml(requeryIdAAIResponse, "relationship-list").drop(38).trim().replace("tag0:","").replace(":tag0","")
+				if (utils.nodeExists(rootRelationshipData, 'relationship')) {
+					relationshipList = rebuildRelationship(rootRelationshipData)
+				}
+			}
+
+			//Check for optional contrail network fqdn within CreateNetworkResponse
+			String contrailNetworkFQDN
+			if(utils.nodeExists(createNetworkResponse, "contrail-network-fqdn")){
+				contrailNetworkFQDN = utils.getNodeXml(createNetworkResponse, "contrail-network-fqdn")
+				contrailNetworkFQDN = utils.removeXmlNamespaces(contrailNetworkFQDN)
+				contrailNetworkFQDN = utils.removeXmlPreamble(contrailNetworkFQDN)
+			}else{
+				contrailNetworkFQDN = ""
+			}
+
+			contrailNetworkCreatedUpdate =
+				 """<l3-network xmlns="${schemaVersion}">
+					 	${rebuildNetworkElements}
+						${rebuildSubnetList}
+						${rebuildSegmentationAssignments}
+						${rebuildCtagAssignmentsList}
+						${relationshipList}
+						${contrailNetworkFQDN}
+				      </l3-network>""".trim()
+
+		}
+			return contrailNetworkCreatedUpdate
+	}
+
+
+
+	/**
+	 * This method returns the value for the name paramName.
+	 *   Ex:   <network-params>
+	 *            <param name="shared">1</param>
+	 *            <param name="external">0</external>
+	 *         </network-params>
+	 *
+	 * @param xmlInput the XML document
+	 * @param paramName the param name (ex: 'shared')
+	 * @return a param value for 'shared' (ex: '1')
+	 */
+	def getParameterValue(xmlInput, paramName) {
+		def rtn=""
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			rtn= xml.'**'.find {param->param.'@name'.text() == paramName}
+		}
+		if (rtn==null) {
+			return ""
+		} else {
+		   return rtn
+		}
+	}
+
+	/**
+	 * This method returns the name of param if found/match with paramName.
+	 *   Ex:   <network-params>
+	 *            <param name="shared">1</param>
+	 *            <param name="external">0</external>
+	 *         </network-params>
+	 *
+	 * @param xmlInput the XML document
+	 * @param paramName the param name (ex: 'shared', )
+	 * @return a param name for 'shared' (ex: 'shared' if found)
+	 */
+	def getParameterName(xmlInput, paramName) {
+		def rtn=""
+		if(xmlInput!=null){
+			def xml= new XmlSlurper().parseText(xmlInput)
+			try {
+				rtn= xml.'**'.find {param->param.'@name' == paramName}.'@name'
+			} catch (Exception ex) {
+			    rtn=""
+			}
+		}
+		if (rtn==null || rtn=="") {
+			return ""
+		} else {
+		   return rtn
+		}
+	}
+
+	/**
+	 * This method returns the networkParams xml string.
+	 *   Ex: input:
+	 *         <network-params>
+	 *            <param name="shared">1</param>
+	 *            <param name="external">0</external>
+	 *         </network-params>
+	 *
+	 *   Sample result:
+	 *         <networkParams>
+     *            <shared>1</shared>
+     *            <external>0</external>
+     *         </networkParams>
+     *
+	 */
+
+	def buildParams(networkParams) {
+		def build = ""
+			def netParams = new XmlParser().parseText(networkParams)
+			try {
+				def paramsList = netParams.'**'.findAll {param->param.'@name'}.'@name'
+				if (paramsList.size() > 0) {
+					build += "<networkParams>"
+					for (i in 0..paramsList.size()-1) {
+                        def name = netParams.'**'.find {param->param.'@name' == paramsList[i]}.'@name'
+						def value= netParams.'**'.find {param->param.'@name' == paramsList[i]}.text()
+						build += "<${name}>${MsoUtils.xmlEscape(value)}</${name}>"
+					}
+					build += "</networkParams>"
+				}
+
+			} catch (Exception ex) {
+				println ' buildParams error - ' + ex.getMessage()
+				build = ""
+			}
+		return build
+	}
+
+	def getVlans(xmlInput) {
+		def rtn = ""
+		if (xmlInput!=null) {
+			def vlansList = getListWithElements(xmlInput, 'vlans')
+			def vlansListSize = vlansList.size()
+			if (vlansListSize > 0) {
+				for (i in 0..vlansListSize-1) {
+				   rtn += '<vlans>'+vlansList[i]+'</vlans>'
+				}
+			}
+		}
+		return rtn
+
+
+	}
+
+	/**
+	 * This method returns the uri value for the vpn bindings.
+	 * Return the a list of value of vpn binding in the <related-link> string.
+	 * Ex.
+	 *   <relationship-list>
+	 *      <relationship>
+	 *          <related-to>vpn-binding</related-to>
+	 *          <related-link>https://aai-app-e2e.test.openecomp.com:8443/aai/v6/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
+	 *          <relationship-data>
+	 *             <relationship-key>vpn-binding.vpn-id</relationship-key>
+	 *             <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
+	 *          </relationship-data>
+	 *       </relationship>
+	 *		<relationship>
+	 *	        <related-to>vpn-binding</related-to>
+	 *			<related-link>https://aai-ext1.test.openecomp.com:8443/aai/v6/network/vpn-bindings/vpn-binding/24a4b507-853a-4a38-99aa-05fcc54be24d/</related-link>
+	 *			<relationship-data>
+	 *			   <relationship-key>vpn-binding.vpn-id</relationship-key>
+	 *			   <relationship-value>24a4b507-853a-4a38-99aa-05fcc54be24d</relationship-value>
+	 *		    </relationship-data>
+	 *			<related-to-property>
+	 *			  <property-key>vpn-binding.vpn-name</property-key>
+	 *			  <property-value>oam_protected_net_6_MTN5_msotest1</property-value>
+	 *			</related-to-property>
+	 *		</relationship>
+	 * @param xmlInput the XML document
+	 * @return a list of vpn binding values
+	 *            ex: ['aai/v6/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/', 'aai/v6/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/']
+	 *
+	 **/
+	def getVnfBindingObject(xmlInput) {
+		//def rtn = null
+		List rtn = []
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "vpn-binding") {
+				   	  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))
+					  }
+				   }
+				}
+			}
+		}
+		return rtn
+	}
+	/**
+	 * similar to VNF bindings method
+	* @param xmlInput the XML document
+	* @return a list of network policy values
+	*            ex: ['aai/v$/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg', 'aai/v$/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg']
+	*
+	**/
+	def getNetworkPolicyObject(xmlInput) {
+		//def rtn = null
+		List rtn = []
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "network-policy") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))
+					  }
+				   }
+				}
+			}
+		}
+		return rtn
+	}
+
+	/**
+	 * similar to network policymethod
+	* @param xmlInput the XML document
+	* @return a list of network policy values
+	*            ex: ['aai/v$/network/route-table-references/route-table-reference/refFQDN1', 'aai/v$/network/route-table-references/route-table-reference/refFQDN2']
+	*
+	**/
+	def getNetworkTableRefObject(xmlInput) {
+		//def rtn = null
+		List rtn = []
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "route-table-reference") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 rtn.add(relatedLink.substring(relatedLink.indexOf("/aai/"), relatedLink.length()))
+					  }
+				   }
+				}
+			}
+		}
+		return rtn
+	}
+
+	/**
+	 * similar to network policymethod
+	* @param xmlInput the XML document
+	* @return a list of IDs for related VNF instances
+	*
+	**/
+	def getRelatedVnfIdList(xmlInput) {
+		//def rtn = null
+		List rtn = []
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "generic-vnf") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 if (relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()).contains('/')) {
+							 rtn.add(relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()-1))
+						 } else {
+						     rtn.add(relatedLink.substring(relatedLink.indexOf("/generic-vnf/")+13, relatedLink.length()))
+						 }
+					  }
+				   }
+				}
+			}
+		}
+		return rtn
+	}
+
+	/**
+	 * similar to network policymethod
+	* @param xmlInput the XML document
+	* @return a list of IDs for related Network instances
+	*
+	**/
+	def getRelatedNetworkIdList(xmlInput) {
+		//def rtn = null
+		List rtn = []
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "l3-network") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 if (relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()).contains('/')) {
+							 rtn.add(relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()-1))
+						 } else {
+						     rtn.add(relatedLink.substring(relatedLink.indexOf("/l3-network/")+12, relatedLink.length()))
+						 }
+					  }
+				   }
+				}
+			}
+		}
+		return rtn
+	}
+
+	def isVfRelationshipExist(xmlInput) {
+		Boolean rtn = false
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "vf-module") {
+					     rtn = true
+				   }
+				}
+			}
+		}
+		return rtn
+
+	}
+
+	def getCloudRegion(xmlInput) {
+		String lcpCloudRegion = ""
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "cloud-region") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 lcpCloudRegion = relatedLink.substring(relatedLink.indexOf("/att-aic/")+9, relatedLink.length())
+						 if (lcpCloudRegion.contains('/')) {
+							 lcpCloudRegion = relatedLink.substring(relatedLink.indexOf("/att-aic/")+9, relatedLink.length()-1)
+						 }
+					  }
+				   }
+				}
+			}
+		}
+		return lcpCloudRegion
+	}
+
+	def getTenantId(xmlInput) {
+		String tenantId = ""
+		if (xmlInput!=null) {
+			def relationshipList = getListWithElements(xmlInput, 'relationship')
+			def relationshipListSize = relationshipList.size()
+			if (relationshipListSize > 0) {
+				for (i in 0..relationshipListSize-1) {
+				   def relationshipXml = XmlUtil.serialize(relationshipList[i])
+				   if (utils.getNodeText(relationshipXml, 'related-to') == "tenant") {
+					  def relatedLink = utils.getNodeText(relationshipXml, 'related-link')
+					  if (relatedLink != null || relatedLink != "") {
+						 tenantId = relatedLink.substring(relatedLink.indexOf("/tenant/")+8, relatedLink.length())
+						 if (tenantId.contains('/')) {
+							 tenantId = relatedLink.substring(relatedLink.indexOf("/tenant/")+8, relatedLink.length()-1)
+						 }
+					  }
+				   }
+				}
+			}
+		}
+		return tenantId
+	}
+
+	def isInstanceValueMatch(linkResource, globalSubscriberId, serviceType) {
+		Boolean rtn = false
+		try {
+			String globalSubscriberIdLink = linkResource.substring(linkResource.indexOf("/customer/")+10, linkResource.indexOf("/service-subscriptions"))
+			String serviceTypeLink = linkResource.substring(linkResource.indexOf("/service-subscription/")+22, linkResource.indexOf("/service-instances"))
+			if (globalSubscriberIdLink == globalSubscriberId) {
+					rtn = true
+			} else {
+				if (serviceTypeLink == serviceType) {
+					rtn = true
+				}
+			}
+
+		} catch (Exception ex) {
+		    println 'Exception - ' + ex.getMessage()
+			return false
+		}
+        return rtn
+	}
+
+	def getListWithElements(xmlInput, groupName) {
+		def rtn = ""
+		if (xmlInput != null) {
+			def relationshipData = new XmlSlurper().parseText(xmlInput)
+			rtn = relationshipData.'**'.findAll {it.name() == groupName}
+		}
+		return rtn
+
+	}
+
+	// build network single elements
+	def buildNetworkElements(l3Network, createNetworkContrailResponse, networkList) {
+		def replaceNetworkId = ""
+		def replaceNeutronNetworkId = ""
+		def replaceContrailNetworkFqdn = ""
+		if (l3Network != null && createNetworkContrailResponse != null) {
+			if (utils.nodeExists(l3Network, 'heat-stack-id')) {
+				replaceNetworkId = utils.getNodeText(l3Network, 'heat-stack-id')
+			} else {
+				if (utils.nodeExists(createNetworkContrailResponse, 'networkStackId')) {
+					replaceNetworkId = utils.getNodeText(createNetworkContrailResponse, 'networkStackId')
+				}
+			}
+			if (utils.nodeExists(l3Network, 'neutron-network-id')) {
+				replaceNeutronNetworkId = utils.getNodeText(l3Network, 'neutron-network-id')
+			} else {
+				if (utils.nodeExists(createNetworkContrailResponse, 'neutronNetworkId')) {
+					replaceNeutronNetworkId = utils.getNodeText(createNetworkContrailResponse, 'neutronNetworkId')
+				}
+			}
+			if (utils.nodeExists(l3Network, 'contrail-network-fqdn')) {
+				replaceContrailNetworkFqdn = utils.getNodeText(l3Network, 'contrail-network-fqdn')
+			} else {
+				if (utils.nodeExists(createNetworkContrailResponse, 'networkFqdn')) {
+					replaceContrailNetworkFqdn = utils.getNodeText(createNetworkContrailResponse, 'networkFqdn')
+				}
+			}
+		}
+
+		String var = ""
+		def xmlNetwork = ""
+		if (l3Network != null) {
+			for (element in networkList) {
+				def xml= new XmlSlurper().parseText(l3Network)
+				var = xml.'**'.find {it.name() == element}
+				if (var == null) {
+					if (element=="orchestration-status") {
+						if (var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {
+							xmlNetwork += "<"+element+">"+"Created"+"</"+element+">"
+					    } else { //pending-update or PendingUpdate
+							xmlNetwork += "<"+element+">"+"Active"+"</"+element+">"
+					    }
+					}	
+					if (element=="heat-stack-id") {
+						if (replaceNetworkId != "") {
+							xmlNetwork += "<"+element+">"+replaceNetworkId+"</"+element+">"
+						}
+					}
+					if (element=="neutron-network-id") {
+						if (replaceNeutronNetworkId != "") {
+							xmlNetwork += "<"+element+">"+replaceNeutronNetworkId+"</"+element+">"
+						}
+					}
+					if (element=="contrail-network-fqdn") {
+						if (replaceContrailNetworkFqdn != "") {
+							xmlNetwork += "<"+element+">"+replaceContrailNetworkFqdn+"</"+element+">"
+						}
+					}
+
+				} else {
+			   		if (element=="orchestration-status") {
+					   if (element=="orchestration-status") {
+						  if (var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {
+						      xmlNetwork += "<"+element+">"+"Created"+"</"+element+">"
+						  } else { //pending-update or PendingUpdate
+							  xmlNetwork += "<"+element+">"+"Active"+"</"+element+">"
+						  }
+					   }   
+				    } else {
+			    	    xmlNetwork += "<"+element+">"+var.toString()+"</"+element+">"
+					}
+				}	
+			 }
+		}
+		return xmlNetwork
+	}
+
+	def buildSubnets(requeryIdAAIResponse, createNetworkResponse) {
+		def rebuildingSubnets = ""
+		if (requeryIdAAIResponse != null && utils.nodeExists(requeryIdAAIResponse, 'subnets')) {
+			def subnetIdMapValue = ""
+			def subnetsGroup = utils.getNodeXml(requeryIdAAIResponse, "subnets", false)
+			def subnetsData = new XmlSlurper().parseText(subnetsGroup)
+			rebuildingSubnets += "<subnets>"
+			try {
+				def subnets = subnetsData.'**'.findAll {it.name() == "subnet"}
+				def subnetsSize = subnets.size()
+				for (i in 0..subnetsSize-1) {
+				   def subnet = subnets[i]
+				   def subnetXml = XmlUtil.serialize(subnet)
+				   def orchestrationStatus = utils.getNodeText(subnetXml, "orchestration-status")
+				   if (orchestrationStatus == "PendingDelete" || orchestrationStatus == "pending-delete") {
+					   // skip, do not include in processing, remove!!!
+				   } else {
+				      def subnetList = ["subnet-id", "neutron-subnet-id", "gateway-address", "network-start-address", "cidr-mask", "ip-version", "orchestration-status", "dhcp-enabled", "dhcp-start", "dhcp-end", "subnet-role", "resource-version", "subnet-name", "ip-assignment-direction", "host-routes"]
+				      rebuildingSubnets += buildSubNetworkElements(subnetXml, createNetworkResponse, subnetList, "subnet")
+				   }	  
+				}
+				if (utils.nodeExists(subnetsData, 'relationship')) {
+					rebuildingSubnets = rebuildRelationship(requeryIdAAIResponse)
+				}
+
+			} catch (Exception ex) {
+				// error
+			} finally {
+				rebuildingSubnets += "</subnets>"
+			}
+		}
+		return rebuildingSubnets
+	}
+
+	def buildSubnets(queryIdResponse) {
+		def rebuildingSubnets = ""
+		def subnetsData = new XmlSlurper().parseText(queryIdResponse)
+		//rebuildingSubnets += "<subnets>"
+		try {
+			def subnets = subnetsData.'**'.findAll {it.name() == "subnet"}
+			def subnetsSize = subnets.size()
+			for (i in 0..subnetsSize-1) {
+			   def subnet = subnets[i]
+			   def subnetXml = XmlUtil.serialize(subnet)
+			   def orchestrationStatus = utils.getNodeText(subnetXml, "orchestration-status")
+			   if (orchestrationStatus == "pending-delete" || orchestrationStatus == "PendingDelete") {
+				   // skip, do not include in processing, remove!!!
+			   } else {
+			   	  	def subnetList = ["dhcp-start", "dhcp-end", "network-start-address", "cidr-mask", "dhcp-enabled", "gateway-address", "ip-version", "subnet-id", "subnet-name", "ip-assignment-direction", "host-routes"]
+					rebuildingSubnets += buildSubNetworkElements(subnetXml, subnetList, "subnets")
+			   		//rebuildingSubnets += buildSubNetworkElements(subnetXml, subnetList, "")
+			   }	
+			}
+		} catch (Exception ex) {
+		   //
+		} finally {
+		  //rebuildingSubnets += "</subnets>"
+		}
+		return rebuildingSubnets
+	}
+
+
+	// build subnet sub-network single elements
+	def buildSubNetworkElements(subnetXml, createNetworkResponse, elementList, parentName) {
+		String var = ""
+		def xmlBuild = ""
+		if (parentName != "") {
+		   xmlBuild += "<"+parentName+">"
+		}
+		if (subnetXml != null) {
+			for (element in elementList) {
+			  def xml= new XmlSlurper().parseText(subnetXml)
+			  var = xml.'**'.find {it.name() == element}
+			  if (var != null) {
+			  	 if (element=="orchestration-status") {
+					if(var.toString() == 'pending-create' || var.toString() == 'PendingCreate') {   
+						xmlBuild += "<"+element+">"+"Created"+"</"+element+">"
+					} else { // pending-update or PendingUpdate'
+					   xmlBuild += "<"+element+">"+"Active"+"</"+element+">"
+					}
+				 } else { // "subnet-id", "neutron-subnet-id"
+					 if (element=="subnet-id") {
+						 if (utils.nodeExists(createNetworkResponse, "subnetMap")) {
+							 xmlBuild += "<"+element+">"+var.toString()+"</"+element+">"
+							 String neutronSubnetId = extractNeutSubId(createNetworkResponse, var.toString())
+							 xmlBuild += "<neutron-subnet-id>"+neutronSubnetId+"</neutron-subnet-id>"
+						 }
+					 } else {
+					     if (element=="neutron-subnet-id") {
+                               // skip
+						 } else {
+						 	 if (element=="host-routes") {
+								 if (subnetXml.contains("host-routes")) {
+									 List elementRoute = ["host-route-id", "route-prefix", "next-hop", "next-hop-type", "resource-version"]
+									 xmlBuild += buildXMLElements(subnetXml, "host-routes", "host-route", elementRoute)
+								 }
+						 	 } else { 	  
+							  	xmlBuild += "<"+element+">"+var.toString()+"</"+element+">"
+						 	 }	  
+						 }
+					 }
+				 }
+			  }
+			}
+
+		}
+		if (parentName != "") {
+		   xmlBuild += "</"+parentName+">"
+		}
+		return xmlBuild
+	}
+
+	// build subnet sub-network single elements
+	def buildSubNetworkElements(subnetXml, elementList, parentName) {
+		def var = ""
+		def xmlBuild = ""
+		if (parentName != "") {
+			xmlBuild += "<"+parentName+">"
+		 }
+		if (subnetXml != null) {
+		    def networkStartAddress = ""
+			for (element in elementList) {
+				def xml= new XmlSlurper().parseText(subnetXml)
+				var = xml.'**'.find {it.name() == element}
+				if (element == "dhcp-start") {
+					xmlBuild += "<allocationPools>"
+					if (var.toString() == 'null') {
+						xmlBuild += "<start>"+""+"</start>"
+					} else {
+						xmlBuild += "<start>"+var.toString()+"</start>"
+					}
+				}
+				if (element == "dhcp-end") {
+					if (var.toString() == 'null') {
+						xmlBuild += "<end>"+""+"</end>"
+					} else {
+						xmlBuild += "<end>"+var.toString()+"</end>"
+					}
+					xmlBuild += "</allocationPools>"
+				}
+				if (element == "network-start-address" || element == "cidr-mask") {
+					if (element == "network-start-address") {
+						networkStartAddress = var.toString()
+					}
+					if (element == "cidr-mask") {
+						xmlBuild += "<cidr>"+networkStartAddress+"/"+var.toString()+"</cidr>"
+					}
+				}
+				if (element == "dhcp-enabled") {
+					xmlBuild += "<enableDHCP>"+var.toString()+"</enableDHCP>"
+				}
+				if (element == "gateway-address") {
+					xmlBuild += "<gatewayIp>"+var.toString()+"</gatewayIp>"
+				}
+				if (element == "ip-version") {
+					String ipVersion = getIpvVersion(var.toString())
+					xmlBuild += "<ipVersion>"+ipVersion+"</ipVersion>"
+				}
+				if (element == "subnet-id") {
+					xmlBuild += "<subnetId>"+var.toString()+"</subnetId>"
+				}
+				if ((element == "subnet-name") && (var != null)) {
+					xmlBuild += "<subnetName>"+var.toString()+"</subnetName>"
+				}
+				if ((element == "ip-assignment-direction") && (var != null)) {
+					xmlBuild += "<addrFromStart>"+var.toString()+"</addrFromStart>"
+				}
+				if (element == "host-routes") {
+					def routes = ""
+					if (subnetXml.contains("host-routes")) {
+						routes = buildHostRoutes(subnetXml)
+					}
+					xmlBuild += routes 
+				}	
+				
+			}
+		}
+		if (parentName != "") {
+			xmlBuild += "</"+parentName+">"
+		 }
+		return xmlBuild
+	}
+
+	// rebuild host-routes
+	def buildHostRoutes(subnetXml) {
+		List  routeElementList = ["host-route-id", "route-prefix", "next-hop", "next-hop-type", "resource-version"]
+		def hostRoutes = buildXMLElements(subnetXml, "host-routes", "host-route", routeElementList)
+		def buildHostRoutes = ""
+		def var = ""
+		if (hostRoutes!=null) {
+			def routesData = new XmlSlurper().parseText(hostRoutes)
+			def routes = routesData.'**'.findAll {it.name() == "host-route"}
+			def routesSize = routes.size()
+			for (i in 0..routesSize-1) {
+			   buildHostRoutes += "<hostRoutes>"
+			   def route = routes[i]
+			   def routeXml = XmlUtil.serialize(route)
+			   List  elementList = ["route-prefix", "next-hop"]
+			   for (element in elementList) {
+				   def xml= new XmlSlurper().parseText(routeXml)
+				   var = xml.'**'.find {it.name() == element}
+				   if (element == "route-prefix") {
+					   buildHostRoutes += "<prefix>"+var.toString()+"</prefix>"
+				   }
+				   if (element == "next-hop") {
+					   buildHostRoutes += "<nextHop>"+var.toString()+"</nextHop>"
+				   }
+			   }
+			   buildHostRoutes += "</hostRoutes>"
+			}   
+		}		
+		return buildHostRoutes		
+		
+	}
+	
+	// rebuild ctag-assignments
+	def rebuildCtagAssignments(xmlInput) {
+		def rebuildingCtagAssignments = ""
+		if (xmlInput!=null) {
+			def ctagAssignmentsData = new XmlSlurper().parseText(xmlInput)
+			rebuildingCtagAssignments += "<ctag-assignments>"
+			def ctagAssignments = ctagAssignmentsData.'**'.findAll {it.name() == "ctag-assignment"}
+			def ctagAssignmentsSize = ctagAssignments.size()
+			for (i in 0..ctagAssignmentsSize-1) {
+				def ctagAssignment = ctagAssignments[i]
+				def ctagAssignmentXml = XmlUtil.serialize(ctagAssignment)
+				rebuildingCtagAssignments += "<ctag-assignment>"
+				List elementList = ["vlan-id-inner", "resource-version"]
+				rebuildingCtagAssignments +=  buildXMLElements(ctagAssignmentXml, ""      , "", elementList)
+				if (utils.nodeExists(ctagAssignmentXml, 'relationship')) {
+					rebuildingCtagAssignments += rebuildRelationship(ctagAssignmentXml)
+				}
+				rebuildingCtagAssignments += "</ctag-assignment>"
+			}
+			rebuildingCtagAssignments += "</ctag-assignments>"
+		}
+		return rebuildingCtagAssignments
+	}
+
+	// rebuild 'relationship-list'
+	def rebuildRelationship(xmlInput) {
+		def rebuildingSubnets = ""
+		if (xmlInput!=null) {
+			def subnetsData = new XmlSlurper().parseText(xmlInput)
+			rebuildingSubnets += "<relationship-list>"
+			def relationships = subnetsData.'**'.findAll {it.name() == "relationship"}
+			def relationshipsSize = relationships.size()
+			for (i in 0..relationshipsSize-1) {
+				def relationship = relationships[i]
+				def relationshipXml = XmlUtil.serialize(relationship)
+				rebuildingSubnets += "<relationship>"
+				def relationshipList = ["related-to", "related-link"]
+				rebuildingSubnets += buildSubNetworkElements(relationshipXml, "", relationshipList, "")
+				if (utils.nodeExists(relationshipXml, 'relationship-data')) {
+					def relationshipDataXmlData = new XmlSlurper().parseText(relationshipXml)
+					def relationshipsData = relationshipDataXmlData.'**'.findAll {it.name() == "relationship-data"}
+					def relationshipsDataSize = relationshipsData.size()
+					for (j in 0..relationshipsDataSize-1) {
+						def relationshipData = relationshipsData[j]
+						def relationshipDataXml = XmlUtil.serialize(relationshipData)
+						def relationshipDataList =  ["relationship-key", "relationship-value"]
+						rebuildingSubnets += buildXMLElements(relationshipDataXml, "", "relationship-data", relationshipDataList)
+					}
+				}
+				if (utils.nodeExists(relationshipXml, 'related-to-property')) {
+					def relationshipDataXmlData = new XmlSlurper().parseText(relationshipXml)
+					def relationshipsData = relationshipDataXmlData.'**'.findAll {it.name() == "related-to-property"}
+					def relationshipsDataSize = relationshipsData.size()
+					for (j in 0..relationshipsDataSize-1) {
+						def relationshipData = relationshipsData[j]
+						def relationshipDataXml = XmlUtil.serialize(relationshipData)
+						def relationshipDataList =  ["property-key", "property-value"]
+						rebuildingSubnets += buildXMLElements(relationshipDataXml, "", "related-to-property", relationshipDataList)
+					}
+				}
+
+				rebuildingSubnets += "</relationship>"
+			}
+			rebuildingSubnets += "</relationship-list>"
+		}
+		return rebuildingSubnets
+	}
+
+	def buildVlans(queryIdResponse) {
+		def rebuildingSubnets = "<vlans>"
+		def subnetsData = new XmlSlurper().parseText(queryIdResponse)
+
+		try {
+			def subnets = subnetsData.'**'.findAll {it.name() == "segmentation-assignments"}
+			def subnetsSize = subnets.size()
+			for (i in 0..subnetsSize-1) {
+			   def subnet = subnets[i]
+			   def subnetXml = XmlUtil.serialize(subnet)
+
+			   String vlan = utils.getNodeText(subnetXml, "segmentation-id")
+			   if (i>0){
+				   rebuildingSubnets += ","
+			   }
+			   rebuildingSubnets += vlan
+			}
+		} catch (Exception ex) {
+		   //
+		} finally {
+		  //rebuildingSubnets += "</subnets>"
+		rebuildingSubnets += "</vlans>"
+		}
+		return rebuildingSubnets
+	}
+
+	/* Utility code to rebuild xml/elements in a list:
+	 * rebuild xml with 1) unbounded groups of elements; or
+	 *                  2) one group of elements; or
+	 *                  3) just one or more elements (in a list as argument)
+	 * @param xmlInput the XML document
+	 * @param parentName the parent name  (ex: 'inputs')
+	 * @param childrenName the chilrendName (ex: 'entry' as unbounded/occurs>1)
+	 * @param elementList the element list of children (ex: 'key', 'value')
+	 * @return a string of rebuild xml
+	 *
+	 * Ex 1: xmlInput:
+	 *    <ws:inputs>
+	 *       <ws:entry>
+	 *          <ws:key>name</ws:key>
+	 *          <ws:value>Edward</ws:value>
+	 *       </ws:entry>
+	 *       <ws:entry>
+	 *          <ws:key>age</ws:key>
+	 *          <ws:value>30</ws:value>
+	 *       </ws:entry>
+	 *       <ws:entry>
+	 *          <ws:key>age</ws:key>
+	 *          <ws:value>30</ws:value>
+	 *       </ws:entry>
+	 *    <ws:/inputs>
+	 * Usage:
+	 * List elementList = ["key", "value"]
+	 * String rebuild =  buildXMLElements(xmlInput, "inputs", "entry", elementList)
+	 *
+	 * Ex 2: xmlInput // no parent tag
+	 *   <ws:sdnc-request-header>
+	 *    <ws:svc-request-id>fec8ec88-151a-45c9-ad60-8233e0fc8ff2</ws:svc-request-id>
+	 *    <ws:svc-notification-url>https://localhost:8443/adapters/rest/SDNCNotify</ws:svc-notification-url>
+	 *    <ws:svc-action>assign</ws:svc-action>
+	 *   </ws:sdnc-request-header>
+	 * Usage:
+	 * List elementList = ["svc-request-id", "svc-notification-url", "svc-action"]
+	 * String rebuild =  buildXMLElements(xmlInput, ""      , "sdnc-request-header", elementList)  // no parent tag
+	 *
+	 * Ex 3: xmlInput // elements one after another (with no parent & children tag)
+	 * <ws:test-id>myTestid</ws:test-id>
+	 * <ws:test-user>myUser</ws:test-user>
+	 * Usage:
+	 * List elementList = ["test-id", "test-user"]
+	 * String rebuild =  buildXMLElements(xmlInput, ""      , "", elementList)
+	 *
+	 */
+	def buildXMLElements(xmlInput, parentName, childrenName, elementList) {
+		def varChildren = ""
+		def var = ""
+		def xmlBuildUnbounded = ""
+		if (parentName!="") {xmlBuildUnbounded += "<"+parentName+">" +'\n'}
+		if (xmlInput != null) {
+			def xml= new XmlSlurper().parseText(xmlInput)
+			if (childrenName!="") {
+				varChildren = xml.'**'.findAll {it.name() == childrenName}
+				for (i in 0..varChildren.size()-1) {
+					xmlBuildUnbounded += "<"+childrenName+">" +'\n'
+					for (element in elementList) {
+						var = varChildren[i].'*'.find {it.name() == element}
+					   if (var != null) {
+						  xmlBuildUnbounded += "<"+element+">"+var.toString()+"</"+element+">" +'\n'
+					   }
+					}
+					xmlBuildUnbounded += "</"+childrenName+">" +'\n'
+				}
+			} else {
+				for (element in elementList) {
+					var = xml.'*'.find {it.name() == element}
+					if (var != null) {
+						xmlBuildUnbounded += "<"+element+">"+var.toString()+"</"+element+">" +'\n'
+					}
+				}
+			}
+
+		}
+		if (parentName!="") {xmlBuildUnbounded += "</"+parentName+">" +'\n'}
+		return xmlBuildUnbounded
+	 }
+
+	def getFirstNodeXml(xmlInput, element){
+		def nodeAsText = ""
+		def nodeToSerialize =  ""
+		if (xmlInput != null) {
+			def fxml= new XmlSlurper().parseText(xmlInput)
+			if (utils.nodeExists(xmlInput, "payload")) {
+				nodeToSerialize = fxml.'payload'.'l3-network'.'*'.find {it.name() == element}
+				if (nodeToSerialize!=null) {
+					nodeAsText = XmlUtil.serialize(nodeToSerialize)
+				} else {
+				    nodeAsText = ""
+				}
+
+			} else {
+				nodeToSerialize = fxml.'*'.find {it.name() == element}
+				if (nodeToSerialize!=null) {
+					nodeAsText = XmlUtil.serialize(nodeToSerialize)
+				} else {
+					nodeAsText = ""
+				}
+
+			}
+		}
+		return nodeAsText
+
+	}
+
+//TODO: This method still needs to be tested before using.
+	/**
+	 *
+	 * This method is similar to the gennetwork:ContrailNetworUpdateCompletedObject
+	 * BPEL method.  It extracts all of the required subnet information
+	 * for each subnet listed with an orch status equal to the one provided
+	 * and puts the corresponding infomation with the appropriate node for
+	 * updating aai. The method sets the orch status for each subnet to active
+	 *
+	 * @param subnetsXml the entire subnets xml
+	 * @param requestInput the request in the process
+	 * @param queryIdResponse the response of REST AAI query by Id
+	 * @param queryVpnBindingResponse the response of REST AAI query by vpn binding
+	 * @param routeCollection the collection of vpnBinding's 'global-route-target'
+	 * @return String request
+	 */
+	public String networkUpdateSubnetInfo(String subnetsXml, String networkResponseXml){
+
+			String subnets = ""
+			StringBuilder sb = new StringBuilder()
+			InputSource source = new InputSource(new StringReader(subnetsXml));
+			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+			docFactory.setNamespaceAware(true)
+			DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+			Document xml = docBuilder.parse(source)
+			NodeList nodeList = xml.getElementsByTagNameNS("*", "subnet")
+			for (int x = 0; x < nodeList.getLength(); x++) {
+				Node node = nodeList.item(x)
+				String subnet = ""
+				if (node.getNodeType() == Node.ELEMENT_NODE) {
+					Element eElement = (Element) node
+					String subnetOrchStatus = eElement.getElementsByTagNameNS("*", "orchestration-status").item(0).getTextContent()
+					if(subnetOrchStatus.equals("pending-create")){
+
+						String subnetId = eElement.getElementsByTagNameNS("*", "subnet-id").item(0).getTextContent()
+						def netAddress = eElement.getElementsByTagNameNS("*", "network-start-address").item(0).getTextContent()
+						def mask = eElement.getElementsByTagNameNS("*", "cidr-mask").item(0).getTextContent()
+						def dhcpEnabledSubnet = eElement.getElementsByTagNameNS("*", "dhcp-enabled").item(0).getTextContent()
+						def gatewayAddress = eElement.getElementsByTagNameNS("*", "gateway-address").item(0).getTextContent()
+						def ipVersion = eElement.getElementsByTagNameNS("*", "ip-version").item(0).getTextContent()
+						def relationshipList =  eElement.getElementsByTagNameNS("*", "relationship-list").item(0).getTextContent() //TODO: test this
+						String neutronSubnetId = extractNeutSubId(networkResponseXml, subnetId)
+						subnet =
+						"""<subnet>
+					<subnetId>${MsoUtils.xmlEscape(subnetId)}</subnetId>
+					<neutron-subnet-id>${MsoUtils.xmlEscape(neutronSubnetId)}</neutron-subnet-id>
+					<gateway-address>${MsoUtils.xmlEscape(gatewayAddress)}</gateway-address>
+					<network-start-address>${MsoUtils.xmlEscape(netAddress)}</network-start-address>
+					<cidr-mask>${MsoUtils.xmlEscape(mask)}</cidr-mask>
+					<ip-Version>${MsoUtils.xmlEscape(ipVersion)}</ip-Version>
+					<orchestration-status>active</orchestration-status>
+					<dhcp-enabled>${MsoUtils.xmlEscape(dhcpEnabledSubnet)}</dhcp-enabled>
+					<relationship-list>${relationshipList}</relationship-list>
+					</subnet>"""
+
+					}else if(subnetOrchStatus.equals("pending-delete")){
+						StringWriter writer = new StringWriter()
+						Transformer transformer = TransformerFactory.newInstance().newTransformer()
+						transformer.transform(new DOMSource(node), new StreamResult(writer))
+						subnet = writer.toString()
+
+					}else{
+						subnet = ""
+					}
+				}
+				subnets = sb.append(subnet)
+			}
+
+			subnets = utils.removeXmlPreamble(subnets)
+
+			String subnetsList =
+			"""<subnets>
+			${subnets}
+			</subnets>"""
+
+			return subnetsList
+	}
+
+
+	/**
+	 *
+	 * This method extracts the "value" node text for the the given subnet Id.
+	 *
+	 * @param String inputSource - xml that contains the subnet id key and value
+	 * @param String subnetId - for which you want the value of
+
+	 * @return String value - node text of node named value associated with the given subnet id
+	 */
+	public String extractNeutSubId(String inputSource, String subnetId){
+
+				String value = ""
+				InputSource source = new InputSource(new StringReader(inputSource));
+				DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+				docFactory.setNamespaceAware(true)
+				DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+				Document xml = docBuilder.parse(source)
+				NodeList nodeList = xml.getElementsByTagNameNS("*", "entry")
+				for (int x = 0; x < nodeList.getLength(); x++) {
+					Node node = nodeList.item(x)
+					String subnet = ""
+					if (node.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement = (Element) node
+						String key = eElement.getElementsByTagNameNS("*", "key").item(0).getTextContent()
+						if(key.equals(subnetId)){
+							value = eElement.getElementsByTagNameNS("*", "value").item(0).getTextContent()
+						}
+					}
+				}
+				return value
+			}
+
+	public boolean isRollbackEnabled (DelegateExecution execution, String payloadXml) {
+
+		def rollbackEnabled = false
+		def rollbackValueSet = false
+		if (utils.nodeExists(payloadXml, "backout-on-failure")) {
+			String backoutValue = utils.getNodeText(payloadXml, "backout-on-failure")
+			if (backoutValue != null && !backoutValue.isEmpty()) {
+				if (backoutValue.equalsIgnoreCase("false")) {
+					rollbackEnabled = false
+				}
+				else {
+					rollbackEnabled = true
+				}
+				rollbackValueSet = true;
+			}
+		}
+
+		if (!rollbackValueSet) {
+
+			if (UrnPropertiesReader.getVariable("mso.rollback", execution) != null) {
+			    rollbackEnabled = UrnPropertiesReader.getVariable("mso.rollback", execution).toBoolean()
+			}
+		}
+		return rollbackEnabled
+	}
+	
+	
+	/**
+	 * This method extracts the version for the the given ip-version.
+	 *
+	 * @param String ipvVersion - IP protocols version (ex: ipv4 or ipv6 or 4 or 6)
+	 * @return String version - digit version (ex: 4 or 6)
+	 */
+	
+	public String getIpvVersion (String ipvVersion) {
+		
+		String version = ""
+		try {
+			if (ipvVersion.isNumber()) {
+				version = ipvVersion
+			} else {
+				version = ipvVersion.substring(ipvVersion.indexOf("ipv")+3)
+				if (!version.isNumber()) {
+					version = ipvVersion
+				}
+			}
+		} catch (Exception ex) {
+			version = ipvVersion  
+		}
+		return version
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofHoming.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy
index 1b5a2ecdcb..c7fcc5c5d3 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofHoming.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy
@@ -7,9 +7,9 @@
  * 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.
@@ -17,31 +17,32 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.scripts
-
+package org.onap.so.bpmn.common.scripts
+import org.onap.so.bpmn.core.UrnPropertiesReader
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
 
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.core.domain.CloudFlavor
-import org.openecomp.mso.bpmn.core.domain.InventoryType
-import org.openecomp.mso.bpmn.core.domain.Resource
-import org.openecomp.mso.bpmn.core.domain.ResourceType
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition
-import org.openecomp.mso.bpmn.core.domain.Subscriber
-import org.openecomp.mso.bpmn.core.domain.VnfResource
-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.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.AaiUtil
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
+import org.onap.so.bpmn.core.domain.CloudFlavor
+import org.onap.so.bpmn.core.domain.InventoryType
+import org.onap.so.bpmn.core.domain.Resource
+import org.onap.so.bpmn.core.domain.ResourceType
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.domain.Subscriber
+import org.onap.so.bpmn.core.domain.VnfResource
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.logger.MsoLogger
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
 
 import org.json.JSONArray
 import org.json.JSONObject
 
-import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*
+import static org.onap.so.bpmn.common.scripts.GenericUtils.*
 
 /**
  * This class contains the scripts used
@@ -51,6 +52,7 @@ import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*
  */
 class OofHoming extends AbstractServiceTaskProcessor {
 
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, OofHoming.class);
     ExceptionUtil exceptionUtil = new ExceptionUtil()
     JsonUtils jsonUtil = new JsonUtils()
     OofUtils oofUtils = new OofUtils(this)
@@ -99,19 +101,23 @@ class OofHoming extends AbstractServiceTaskProcessor {
                 if (isBlank(subscriberInfo)) {
                     subscriber = new Subscriber("", "", "")
                 } else {
-                    String subId = jsonUtil.getJsonValue(subscriberInfo, "globalSubscriberId")
-                    String subName = jsonUtil.getJsonValue(subscriberInfo, "subscriberName")
-                    String subCommonSiteId = ""
-                    if (jsonUtil.jsonElementExist(subscriberInfo, "subscriberCommonSiteId")) {
-                        subCommonSiteId = jsonUtil.getJsonValue(subscriberInfo, "subscriberCommonSiteId")
-                    }
+                String subId = jsonUtil.getJsonValue(subscriberInfo, "globalSubscriberId")
+                String subName = jsonUtil.getJsonValue(subscriberInfo, "subscriberName")
+                String subCommonSiteId = ""
+                if (jsonUtil.jsonElementExist(subscriberInfo, "subscriberCommonSiteId")) {
+                    subCommonSiteId = jsonUtil.getJsonValue(subscriberInfo, "subscriberCommonSiteId")
+                }
                     subscriber = new Subscriber(subId, subName, subCommonSiteId)
                 }
 
                 //Authentication
                 def authHeader = ""
-                String basicAuth = execution.getVariable("URN_mso_oof_auth")
-                String msokey = execution.getVariable("URN_mso_msoKey")
+                String basicAuth = UrnPropertiesReader.getVariable("mso.oof.auth", execution)
+                String msokey = UrnPropertiesReader.getVariable("mso.msoKey", execution)
+				
+
+				
+				
                 String basicAuthValue = utils.encrypt(basicAuth, msokey)
                 if (basicAuthValue != null) {
                     utils.log("DEBUG", "Obtained BasicAuth username and password for OOF Adapter: " + basicAuthValue,
@@ -132,8 +138,8 @@ class OofHoming extends AbstractServiceTaskProcessor {
 
                 //Prepare Callback
                 String timeout = execution.getVariable("timeout")
-                if (isBlank(timeout)) {
-                    timeout = execution.getVariable("URN_mso_oof_timeout");
+                if (isBlank(timeout)) {					
+                    timeout = UrnPropertiesReader.getVariable("mso.oof.timeout", execution);
                     if (isBlank(timeout)) {
                         timeout = "PT30M"
                     }
@@ -150,8 +156,8 @@ class OofHoming extends AbstractServiceTaskProcessor {
                 execution.setVariable("oofRequest", oofRequest)
                 utils.log("DEBUG", "OOF Request is: " + oofRequest, isDebugEnabled)
 
-                String endpoint = execution.getVariable("URN_mso_service_agnostic_oof_endpoint")
-                String host = execution.getVariable("URN_mso_service_agnostic_oof_host")
+                String endpoint = UrnPropertiesReader.getVariable("mso.oof.service.agnostic.endpoint", execution);
+                String host = UrnPropertiesReader.getVariable("mso.oof.service.agnostic.host", execution); 
                 String url = host + endpoint
                 utils.log("DEBUG", "Posting to OOF Url: " + url, isDebugEnabled)
 
@@ -163,18 +169,21 @@ class OofHoming extends AbstractServiceTaskProcessor {
                 APIResponse response = client.httpPost(oofRequest)
 
                 int responseCode = response.getStatusCode()
-                execution.setVariable("syncResponseCode", responseCode)
                 logDebug("OOF sync response code is: " + responseCode, isDebugEnabled)
                 String syncResponse = response.getResponseBodyAsString()
                 execution.setVariable("syncResponse", syncResponse)
                 logDebug("OOF sync response is: " + syncResponse, isDebugEnabled)
 
+				if(responseCode != 202){
+					exceptionUtil.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from OOF.")
+				}
+
                 utils.log("DEBUG", "*** Completed Homing Call OOF ***", isDebugEnabled)
             }
         } catch (BpmnError b) {
             throw b
         } catch (Exception e) {
-            utils.log("DEBUG", "Error encountered within Homing callOof method: " + e, isDebugEnabled)
+			msoLogger.error(e);
             exceptionUtil.buildAndThrowWorkflowException(execution, 2500,
                     "Internal Error - Occured in Homing callOof: " + e.getMessage())
         }
@@ -209,7 +218,7 @@ class OofHoming extends AbstractServiceTaskProcessor {
                 JSONArray arrSol = arr.getJSONArray(i)
                 for (int j = 0; j < arrSol.length(); j++) {
                     JSONObject placement = arrSol.getJSONObject(j)
-                    utils.log("DEBUG", "****** JSONObject is: " + placement + " *****", "true")
+                    utils.log("DEBUG", "****** Placement Solution is: " + placement + " *****", "true")
                     String jsonServiceResourceId = placement.getString("serviceResourceId")
                     String jsonResourceModuleName = placement.getString("resourceModuleName")
                     for (Resource resource : resourceList) {
@@ -308,7 +317,7 @@ class OofHoming extends AbstractServiceTaskProcessor {
         } catch (BpmnError b) {
             throw b
         } catch (Exception e) {
-            utils.log("DEBUG", "Error encountered within Homing ProcessHomingSolution method: " + e, isDebugEnabled)
+			msoLogger.error(e);
             exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occurred in Homing ProcessHomingSolution")
         }
     }
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
index b61739f32c..7c5ffca4ab 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/OofUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
@@ -1,25 +1,46 @@
-package org.openecomp.mso.bpmn.common.scripts
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common.scripts
 
 import org.camunda.bpm.engine.delegate.DelegateExecution
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.MsoUtils
-import org.openecomp.mso.bpmn.core.domain.HomingSolution
-import org.openecomp.mso.bpmn.core.domain.ModelInfo
-import org.openecomp.mso.bpmn.core.domain.Resource
-import org.openecomp.mso.bpmn.core.domain.AllottedResource
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition
-import org.openecomp.mso.bpmn.core.domain.ServiceInstance
-import org.openecomp.mso.bpmn.core.domain.Subscriber
-import org.openecomp.mso.bpmn.core.domain.VnfResource
-import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.common.scripts.MsoUtils
+import org.onap.so.bpmn.core.domain.HomingSolution
+import org.onap.so.bpmn.core.domain.ModelInfo
+import org.onap.so.bpmn.core.domain.Resource
+import org.onap.so.bpmn.core.domain.AllottedResource
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.domain.ServiceInstance
+import org.onap.so.bpmn.core.domain.Subscriber
+import org.onap.so.bpmn.core.domain.VnfResource
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.logger.MsoLogger
 
 import java.lang.reflect.Array
 
-import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*
+import static org.onap.so.bpmn.common.scripts.GenericUtils.*
 
 class OofUtils {
-
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, OofUtils.class);
     ExceptionUtil exceptionUtil = new ExceptionUtil()
     JsonUtils jsonUtil = new JsonUtils()
 
@@ -107,16 +128,16 @@ class OofUtils {
         //Demands
         String placementDemands = ""
         StringBuilder sb = new StringBuilder()
-        List<AllottedResource> allottedResourceList = decomposition.getServiceAllottedResources()
-        List<VnfResource> vnfResourceList = decomposition.getServiceVnfs()
+        List<AllottedResource> allottedResourceList = decomposition.getAllottedResources()
+        List<VnfResource> vnfResourceList = decomposition.getVnfResources()
 
-        if (allottedResourceList.isEmpty() || allottedResourceList == null) {
+        if (allottedResourceList == null || allottedResourceList.isEmpty() ) {
             utils.log("DEBUG", "Allotted Resources List is empty - will try to get service VNFs instead.",
                     isDebugEnabled)
-            allottedResourceList = decomposition.getServiceVnfs()
+            allottedResourceList = decomposition.getVnfResources()
         }
 
-        if (allottedResourceList.isEmpty() || allottedResourceList == null) {
+        if (allottedResourceList == null || allottedResourceList.isEmpty()) {
             utils.log("DEBUG", "Resources List is Empty", isDebugEnabled)
         } else {
             for (AllottedResource resource : allottedResourceList) {
@@ -460,4 +481,4 @@ class OofUtils {
         if (candidatesJson != "") {candidatesJson = candidatesJson.substring(0, candidatesJson.length() - 1)}
         return candidatesJson
     }
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/PrepareUpdateAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/PrepareUpdateAAIVfModule.groovy
index bbdaab15e9..a6f8ff469d 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/PrepareUpdateAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/PrepareUpdateAAIVfModule.groovy
@@ -1,375 +1,366 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-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.springframework.web.util.UriUtils

-

-public class PrepareUpdateAAIVfModule extends VfModuleBase {

-	

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	private MsoUtils utils = new MsoUtils()

-	/**

-	 * Initialize the flow's variables.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable('prefix', 'PUAAIVfMod_')

-		execution.setVariable('PUAAIVfMod_vnfId', null)

-		execution.setVariable('PUAAIVfMod_vfModuleId', null)

-		execution.setVariable('PUAAIVfMod_vnfName', null)

-		execution.setVariable('PUAAIVfMod_orchestrationStatus', null)

-		execution.setVariable('PUAAIVfMod_vfModule', null)

-		execution.setVariable('PUAAIVfMod_vfModuleOK', false)

-		execution.setVariable('PUAAIVfMod_vfModuleValidationError', null)

-		execution.setVariable('PUAAIVfMod_getVnfResponseCode' ,null)

-		execution.setVariable('PUAAIVfMod_getVnfResponse', '')

-		execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', null)

-		execution.setVariable('PUAAIVfMod_updateVfModuleResponse', '')

-		execution.setVariable('PUAAIVfMod_outVfModule', null)

-	}	

-	

-	/**

-	 * Check for missing elements in the received request.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def xml = execution.getVariable('PrepareUpdateAAIVfModuleRequest')

-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

-			utils.logAudit("PrepareUpdateAAIVfModule Request  : " + xml)

-			

-			initProcessVariables(execution)

-			

-			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')

-			execution.setVariable('PUAAIVfMod_vnfId', vnfId)

-

-			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')

-			execution.setVariable('PUAAIVfMod_vfModuleId', vfModuleId)

-			

-			def orchestrationStatus = getRequiredNodeText(execution, xml,'orchestration-status')

-			execution.setVariable('PUAAIVfMod_orchestrationStatus', orchestrationStatus)

-

-			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())

-		}

-	}

-	

-	/**

-	 * Using the received vnfId, query AAI to get the corresponding Generic VNF.

-	 * A 200 response is expected with the Generic VNF in the response body.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void getGenericVnf(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.getGenericVnf(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')

-			

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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("PrepareUpdateAAIVfModule: AAI endPoint  : " + endPoint)

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-			try {

-				RESTConfig config = new RESTConfig(endPoint);

-				def responseData = ''

-				String aaiRequestId = utils.getRequestID()

-				RESTClient client = new RESTClient(config).

-					addHeader('X-TransactionId', aaiRequestId).

-					addHeader('X-FromAppId', 'MSO').

-					addHeader('Content-Type', 'application/xml').

-					addHeader('Accept','application/xml');

-				if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-					client.addAuthorizationHeader(basicAuthCred)

-				}

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				APIResponse response = client.httpGet()

-				utils.logAudit("PrepareUpdateAAIVfModule: - invoking httpGet to AAI")

-				

-				responseData = response.getResponseBodyAsString()

-				execution.setVariable('PUAAIVfMod_getVnfResponseCode', response.getStatusCode())

-				execution.setVariable('PUAAIVfMod_getVnfResponse', responseData)

-				

-				utils.logAudit("PrepareUpdateAAIVfModule: AAI Response : " + responseData)

-				utils.logAudit("PrepareUpdateAAIVfModule: AAI ResponseCode : " + response.getStatusCode())

-				

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(), isDebugLogEnabled)

-				execution.setVariable('PUAAIVfMod_getVnfResponseCode', 500)

-				execution.setVariable('PUAAIVfMod_getVnfResponse', '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 getGenericVnf(): ' + e.getMessage())

-		}

-	}

-	

-	/**

-	 * Validate the VF Module.  That is, confirm that a VF Module with the input VF Module ID

-	 * exists in the retrieved Generic VNF.  Then, check to make sure that if that VF Module

-	 * is the base VF Module and it's not the only VF Module for this Generic VNF, that we're not

-	 * attempting to delete it.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void validateVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.validateVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-		

-		try {

-			def genericVnf = execution.getVariable('PUAAIVfMod_getVnfResponse')

-			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')

-			def vfModuleId = execution.getVariable('PUAAIVfMod_vfModuleId')

-			def vnfName = getNodeTextForce(genericVnf, 'vnf-name')

-			execution.setVariable('PUAAIVfMod_vnfName', vnfName)

-			def VfModule vfModule = findVfModule(genericVnf, vfModuleId)

-			if (vfModule == null) {

-				def String msg = 'VF Module \'' + vfModuleId + '\' does not exist in Generic VNF \'' + vnfId + '\''

-				execution.setVariable('PUAAIVfMod_vfModuleValidationError', msg)

-				execution.setVariable('PUAAIVfMod_vfModuleOK', false)

-			} else {

-				def orchestrationStatus = execution.getVariable('PUAAIVfMod_orchestrationStatus')

-				if (isDebugLogEnabled) {

-					logDebug('VF Module \'' + vfModuleId + '\': isBaseVfModule=' + vfModule.isBaseVfModule() +

-						', isOnlyVfModule=' + vfModule.isOnlyVfModule() + ', new orchestration-status=' + orchestrationStatus,

-						isDebugLogEnabled)

-				}

-				if (vfModule.isBaseVfModule() && !vfModule.isOnlyVfModule() && orchestrationStatus.equals('pending-delete')) {

-					def String msg = 'Orchestration status for VF Module \'' + vfModuleId +

-						'\' cannot be set to \'pending-delete\' since it is the base VF Module and it\'s not the only VF Module in Generic VNF \'' + vnfId + '\''

-					execution.setVariable('PUAAIVfMod_vfModuleValidationError', msg)

-					execution.setVariable('PUAAIVfMod_vfModuleOK', false)

-				} else {

-					execution.setVariable('PUAAIVfMod_vfModule', vfModule)

-					execution.setVariable('PUAAIVfMod_vfModuleOK', true)

-				}

-			}

-			

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

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

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in validateVfModule(): ' + e.getMessage())

-		}

-	}

-	

-	/**

-	 * Construct and send a PATCH request to AAI to update the VF Module.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void updateVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.updateVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-		

-		try {

-			// Construct payload

-			def VfModule vfModule = (VfModule) execution.getVariable('PUAAIVfMod_vfModule')

-			def Node newVfModuleNode = vfModule.getNode().clone()

-			def orchestrationStatus = execution.getVariable('PUAAIVfMod_orchestrationStatus')

-			def Node orchestrationStatusNode = utils.getChildNode(newVfModuleNode, 'orchestration-status')

-			if (orchestrationStatusNode == null) {

-				// Node doesn't exist, this should never happen, right?

-				new Node(newVfModuleNode, 'orchestration-status', orchestrationStatus)

-			} else {

-				// Node already exists, just give it a new value

-				orchestrationStatusNode.setValue(orchestrationStatus)

-			}

-			def VfModule newVfModule = new VfModule(newVfModuleNode, vfModule.isOnlyVfModule())

-			//def payload = utils.nodeToString(newVfModuleNode)

-					

-			// Construct endpoint

-			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')

-			def vfModuleId = execution.getVariable('PUAAIVfMod_vfModuleId')

-			

-			def payload = """{

-					"vf-module-id": "${vfModuleId}",

-					"orchestration-status": "${orchestrationStatus}"

-				}"""

-			

-			utils.logAudit("VfModule payload : " + payload)

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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") + "/vf-modules/vf-module/" + UriUtils.encode(vfModuleId, "UTF-8")

-			utils.logAudit("PrepareUpdateAAIVfModule: AAI endPoint  : " + endPoint)

-			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-			try {

-				RESTConfig config = new RESTConfig(endPoint);

-				def responseData = ''

-                def aaiRequestId = utils.getRequestID()

-				RESTClient client = new RESTClient(config).

-					addHeader('X-TransactionId', aaiRequestId).

-					addHeader('X-FromAppId', 'MSO').

-					addHeader('Content-Type', 'application/merge-patch+json').

-					addHeader('Accept','application/json');

-				if (basicAuthCred != null && !"".equals(basicAuthCred)) {

-					client.addAuthorizationHeader(basicAuthCred)

-				}

-				logDebug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload, isDebugLogEnabled)

-				APIResponse response = client.httpPatch(payload)

-				utils.logAudit("PrepareUpdateAAIVfModule: - invoking httpPatch to AAI")

-				utils.logAudit("PrepareUpdateAAIVfModule: - invoking httpPatch to AAI")

-

-				responseData = response.getResponseBodyAsString()

-				execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('PUAAIVfMod_updateVfModuleResponse', responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-				utils.logAudit("PrepareUpdateAAIVfModule: AAI Response : " + responseData)

-				utils.logAudit("PrepareUpdateAAIVfModule: AAI ResponseCode : " + response.getStatusCode())

-				

-				// Set the output for this flow.  The updated VfModule is an output, the generic VNF name, and for

-				// backward compatibilty, the heat-stack-id is an output

-				execution.setVariable('PUAAIVfMod_outVfModule', newVfModule)

-				def vnfName = execution.getVariable('PUAAIVfMod_vnfName')

-				logDebug('Output PUAAIVfMod_vnfName set to ' + vnfName, isDebugLogEnabled)

-				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead

-				execution.setVariable('WorkflowResponse', newVfModule)

-				logDebug('Output PUAAIVfMod_outVfModule set for VF Module Id \'' + newVfModule.getElementText('vf-module-id') + '\'', isDebugLogEnabled)

-				def heatStackId = newVfModule.getElementText('heat-stack-id')

-				execution.setVariable('PUAAIVfMod_heatStackId', heatStackId)

-				logDebug('Output PUAAIVfMod_heatStackId set to \'' + heatStackId + '\'', isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI PUT:' + ex.getMessage(), isDebugLogEnabled)

-				execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', 500)

-				execution.setVariable('PUAAIVfMod_updateVfModuleResponse', 'AAI PATCH 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 updateVfModule(): ' + e.getMessage())

-		}				

-	}

-		

-	/**

-	 * Generates a WorkflowException if the AAI query returns a response code other than 200.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleVnfNotFound(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleVnfNotFound(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to query AAI, Response Code ' +

-			execution.getVariable('PUAAIVfMod_getVnfResponseCode') + ', Error Response ' +

-			execution.getVariable('PUAAIVfMod_getVnfResponse'))

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('PUAAIVfMod_getVnfResponse'))

-		execution.setVariable('WorkflowException', exception)

-		

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-	

-	/**

-	 * Generates a WorkflowException if the VF Module does not pass validation.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleVfModuleValidationError(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleVfModuleValidationError(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-				

-		def String errorMsg = 'VF Module validation error: ' + execution.getVariable('PUAAIVfMod_vfModuleValidationError')

-		logError(errorMsg)

-		utils.logAudit("PrepareUpdateAAIVfModule: Error Message : " + errorMsg)

-		

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000, errorMsg)

-		execution.setVariable('WorkflowException', exception)

-

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-	

-	/**

-	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.

-	 * 

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleUpdateVfModuleFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to update VF Module in AAI, Response Code ' +

-			execution.getVariable('PUAAIVfMod_updateVfModuleResponseCode') + ', Error Response ' +

-			execution.getVariable('PUAAIVfMod_updateVfModuleResponse'))

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('PUAAIVfMod_updateVfModuleResponse'))

-		execution.setVariable('WorkflowException', exception)

-		

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+public class PrepareUpdateAAIVfModule extends VfModuleBase {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, PrepareUpdateAAIVfModule.class);
+
+	
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	private MsoUtils utils = new MsoUtils()
+	/**
+	 * Initialize the flow's variables.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable('prefix', 'PUAAIVfMod_')
+		execution.setVariable('PUAAIVfMod_vnfId', null)
+		execution.setVariable('PUAAIVfMod_vfModuleId', null)
+		execution.setVariable('PUAAIVfMod_vnfName', null)
+		execution.setVariable('PUAAIVfMod_orchestrationStatus', null)
+		execution.setVariable('PUAAIVfMod_vfModule', null)
+		execution.setVariable('PUAAIVfMod_vfModuleOK', false)
+		execution.setVariable('PUAAIVfMod_vfModuleValidationError', null)
+		execution.setVariable('PUAAIVfMod_getVnfResponseCode' ,null)
+		execution.setVariable('PUAAIVfMod_getVnfResponse', '')
+		execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', null)
+		execution.setVariable('PUAAIVfMod_updateVfModuleResponse', '')
+		execution.setVariable('PUAAIVfMod_outVfModule', null)
+	}	
+	
+	/**
+	 * Check for missing elements in the received request.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def xml = execution.getVariable('PrepareUpdateAAIVfModuleRequest')
+			msoLogger.debug('Received request xml:\n' + xml)
+			msoLogger.debug("PrepareUpdateAAIVfModule Request  : " + xml)
+			
+			initProcessVariables(execution)
+			
+			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')
+			execution.setVariable('PUAAIVfMod_vnfId', vnfId)
+
+			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')
+			execution.setVariable('PUAAIVfMod_vfModuleId', vfModuleId)
+			
+			def orchestrationStatus = getRequiredNodeText(execution, xml,'orchestration-status')
+			execution.setVariable('PUAAIVfMod_orchestrationStatus', orchestrationStatus)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+		}
+	}
+	
+	/**
+	 * Using the received vnfId, query AAI to get the corresponding Generic VNF.
+	 * A 200 response is expected with the Generic VNF in the response body.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void getGenericVnf(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.getGenericVnf(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')
+			
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+				
+			msoLogger.debug("PrepareUpdateAAIVfModule: AAI endPoint  : " + endPoint)
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			try {
+				RESTConfig config = new RESTConfig(endPoint);
+				def responseData = ''
+				String aaiRequestId = utils.getRequestID()
+				RESTClient client = new RESTClient(config).
+					addHeader('X-TransactionId', aaiRequestId).
+					addHeader('X-FromAppId', 'MSO').
+					addHeader('Content-Type', 'application/xml').
+					addHeader('Accept','application/xml');
+				if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+					client.addAuthorizationHeader(basicAuthCred)
+				}
+				msoLogger.debug('sending GET to AAI endpoint \'' + endPoint + '\'')
+				APIResponse response = client.httpGet()
+				msoLogger.debug("PrepareUpdateAAIVfModule: - invoking httpGet to AAI")
+				
+				responseData = response.getResponseBodyAsString()
+				execution.setVariable('PUAAIVfMod_getVnfResponseCode', response.getStatusCode())
+				execution.setVariable('PUAAIVfMod_getVnfResponse', responseData)
+				
+				msoLogger.debug("PrepareUpdateAAIVfModule: AAI Response : " + responseData)
+				msoLogger.debug("PrepareUpdateAAIVfModule: AAI ResponseCode : " + response.getStatusCode())
+				
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				msoLogger.error(ex);
+				msoLogger.debug('Exception occurred while executing AAI GET:' + ex.getMessage())
+				execution.setVariable('PUAAIVfMod_getVnfResponseCode', 500)
+				execution.setVariable('PUAAIVfMod_getVnfResponse', 'AAI GET Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in getGenericVnf(): ' + e.getMessage())
+		}
+	}
+	
+	/**
+	 * Validate the VF Module.  That is, confirm that a VF Module with the input VF Module ID
+	 * exists in the retrieved Generic VNF.  Then, check to make sure that if that VF Module
+	 * is the base VF Module and it's not the only VF Module for this Generic VNF, that we're not
+	 * attempting to delete it.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void validateVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.validateVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+		
+		try {
+			def genericVnf = execution.getVariable('PUAAIVfMod_getVnfResponse')
+			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')
+			def vfModuleId = execution.getVariable('PUAAIVfMod_vfModuleId')
+			def vnfName = getNodeTextForce(genericVnf, 'vnf-name')
+			execution.setVariable('PUAAIVfMod_vnfName', vnfName)
+			def VfModule vfModule = findVfModule(genericVnf, vfModuleId)
+			if (vfModule == null) {
+				def String msg = 'VF Module \'' + vfModuleId + '\' does not exist in Generic VNF \'' + vnfId + '\''
+				execution.setVariable('PUAAIVfMod_vfModuleValidationError', msg)
+				execution.setVariable('PUAAIVfMod_vfModuleOK', false)
+			} else {
+				def orchestrationStatus = execution.getVariable('PUAAIVfMod_orchestrationStatus')
+				msoLogger.debug('VF Module \'' + vfModuleId + '\': isBaseVfModule=' + vfModule.isBaseVfModule() +', isOnlyVfModule=' + vfModule.isOnlyVfModule() + ', new orchestration-status=' + orchestrationStatus)
+				if (vfModule.isBaseVfModule() && !vfModule.isOnlyVfModule() && orchestrationStatus.equals('pending-delete')) {
+					def String msg = 'Orchestration status for VF Module \'' + vfModuleId +
+						'\' cannot be set to \'pending-delete\' since it is the base VF Module and it\'s not the only VF Module in Generic VNF \'' + vnfId + '\''
+					execution.setVariable('PUAAIVfMod_vfModuleValidationError', msg)
+					execution.setVariable('PUAAIVfMod_vfModuleOK', false)
+				} else {
+					execution.setVariable('PUAAIVfMod_vfModule', vfModule)
+					execution.setVariable('PUAAIVfMod_vfModuleOK', true)
+				}
+			}
+			
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in validateVfModule(): ' + e.getMessage())
+		}
+	}
+	
+	/**
+	 * Construct and send a PATCH request to AAI to update the VF Module.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void updateVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.updateVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+		
+		try {
+			// Construct payload
+			def VfModule vfModule = (VfModule) execution.getVariable('PUAAIVfMod_vfModule')
+			def Node newVfModuleNode = vfModule.getNode().clone()
+			def orchestrationStatus = execution.getVariable('PUAAIVfMod_orchestrationStatus')
+			def Node orchestrationStatusNode = utils.getChildNode(newVfModuleNode, 'orchestration-status')
+			if (orchestrationStatusNode == null) {
+				// Node doesn't exist, this should never happen, right?
+				new Node(newVfModuleNode, 'orchestration-status', orchestrationStatus)
+			} else {
+				// Node already exists, just give it a new value
+				orchestrationStatusNode.setValue(orchestrationStatus)
+			}
+			def VfModule newVfModule = new VfModule(newVfModuleNode, vfModule.isOnlyVfModule())
+			//def payload = utils.nodeToString(newVfModuleNode)
+					
+			// Construct endpoint
+			def vnfId = execution.getVariable('PUAAIVfMod_vnfId')
+			def vfModuleId = execution.getVariable('PUAAIVfMod_vfModuleId')
+			
+			def payload = """{
+					"vf-module-id": "${vfModuleId}",
+					"orchestration-status": "${orchestrationStatus}"
+				}"""
+			
+			msoLogger.debug("VfModule payload : " + payload)
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "/vf-modules/vf-module/" + UriUtils.encode(vfModuleId, "UTF-8")
+			msoLogger.debug("PrepareUpdateAAIVfModule: AAI endPoint  : " + endPoint)
+			String basicAuthCred = utils.getBasicAuth(UrnPropertiesReader.getVariable("aai.auth", execution),UrnPropertiesReader.getVariable("mso.msoKey", execution))
+			try {
+				RESTConfig config = new RESTConfig(endPoint);
+				def responseData = ''
+                def aaiRequestId = utils.getRequestID()
+				RESTClient client = new RESTClient(config).
+					addHeader('X-TransactionId', aaiRequestId).
+					addHeader('X-FromAppId', 'MSO').
+					addHeader('Content-Type', 'application/merge-patch+json').
+					addHeader('Accept','application/json');
+				if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+					client.addAuthorizationHeader(basicAuthCred)
+				}
+				msoLogger.debug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload)
+				APIResponse response = client.httpPatch(payload)
+				msoLogger.debug("PrepareUpdateAAIVfModule: - invoking httpPatch to AAI")
+
+				responseData = response.getResponseBodyAsString()
+				execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('PUAAIVfMod_updateVfModuleResponse', responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+				msoLogger.debug("PrepareUpdateAAIVfModule: AAI Response : " + responseData)
+				msoLogger.debug("PrepareUpdateAAIVfModule: AAI ResponseCode : " + response.getStatusCode())
+				
+				// Set the output for this flow.  The updated VfModule is an output, the generic VNF name, and for
+				// backward compatibilty, the heat-stack-id is an output
+				execution.setVariable('PUAAIVfMod_outVfModule', newVfModule)
+				def vnfName = execution.getVariable('PUAAIVfMod_vnfName')
+				msoLogger.debug('Output PUAAIVfMod_vnfName set to ' + vnfName)
+				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
+				execution.setVariable('WorkflowResponse', newVfModule)
+				msoLogger.debug('Output PUAAIVfMod_outVfModule set for VF Module Id \'' + newVfModule.getElementText('vf-module-id') + '\'')
+				def heatStackId = newVfModule.getElementText('heat-stack-id')
+				execution.setVariable('PUAAIVfMod_heatStackId', heatStackId)
+				msoLogger.debug('Output PUAAIVfMod_heatStackId set to \'' + heatStackId + '\'')
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI PUT:' + ex.getMessage())
+				execution.setVariable('PUAAIVfMod_updateVfModuleResponseCode', 500)
+				execution.setVariable('PUAAIVfMod_updateVfModuleResponse', 'AAI PATCH Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in updateVfModule(): ' + e.getMessage())
+		}				
+	}
+		
+	/**
+	 * Generates a WorkflowException if the AAI query returns a response code other than 200.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleVnfNotFound(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleVnfNotFound(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error('Error occurred attempting to query AAI, Response Code ' + execution.getVariable('PUAAIVfMod_getVnfResponseCode'));
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('PUAAIVfMod_getVnfResponse'))
+		execution.setVariable('WorkflowException', exception)
+		
+		msoLogger.trace('Exited ' + method)
+	}
+	
+	/**
+	 * Generates a WorkflowException if the VF Module does not pass validation.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleVfModuleValidationError(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleVfModuleValidationError(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+				
+		def String errorMsg = 'VF Module validation error: ' + execution.getVariable('PUAAIVfMod_vfModuleValidationError')
+		msoLogger.error(errorMsg);
+		msoLogger.debug("PrepareUpdateAAIVfModule: Error Message : " + errorMsg)
+		
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000, errorMsg)
+		execution.setVariable('WorkflowException', exception)
+
+		msoLogger.trace('Exited ' + method)
+	}
+	
+	/**
+	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.
+	 * 
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleUpdateVfModuleFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error('Error occurred attempting to update VF Module in AAI, Response Code ' + execution.getVariable('PUAAIVfMod_updateVfModuleResponseCode'));
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('PUAAIVfMod_updateVfModuleResponse'))
+		execution.setVariable('WorkflowException', exception)
+		
+		msoLogger.trace('Exited ' + method)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/RainyDayHandler.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/RainyDayHandler.groovy
index 0f7de9a23e..0d66b8f51b 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/RainyDayHandler.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/RainyDayHandler.groovy
@@ -1,198 +1,190 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

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

-

-

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.json.JSONObject;

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

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

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition

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

-import org.openecomp.mso.client.policy.PolicyClient

-import org.openecomp.mso.client.policy.PolicyClientImpl

-import org.openecomp.mso.client.policy.entities.DictionaryData

-import org.openecomp.mso.client.policy.entities.PolicyDecision

-import org.openecomp.mso.client.policy.entities.Treatments

-import org.openecomp.mso.client.policy.PolicyRestClient

-

-

-import com.att.ecomp.mso.bpmn.core.domain.*

-

-import groovy.json.*

-

-/**

- * This groovy class supports the <class>RainyDayHandler.bpmn</class> process.

- *

- * @author

- *

- * Inputs:

- * @param - msoRequestId

- * @param - isDebugLogEnabled

- * @param - serviceType

- * @param - vnfType

- * @param - currentActivity

- * @param - workStep

- * @param - failedActivity

- * @param - errorCode

- * @param - errorText 

- * @param - vnfName

- *

- * Outputs:

- * @param - WorkflowException

- * @param - handlingCode

- *

- */

-public class RainyDayHandler extends AbstractServiceTaskProcessor {

-

-	String Prefix="RDH_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	

-	JsonUtils jsonUtils = new JsonUtils()

-

-	public void preProcessRequest (DelegateExecution execution) {

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** preProcessRequest of RainyDayHandler *****",  isDebugLogEnabled)

-

-		try {

-			execution.setVariable("prefix", Prefix)

-			// check for required input

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

-			utils.log("DEBUG", "msoRequestId is: " + requestId, isDebugLogEnabled)		

-			def serviceType = execution.getVariable("serviceType")

-			utils.log("DEBUG", "serviceType is: " + serviceType, isDebugLogEnabled)

-			def vnfType = execution.getVariable("vnfType")

-			utils.log("DEBUG", "vnftype is: " + vnfType, isDebugLogEnabled)

-			def currentActivity = execution.getVariable("currentActivity")

-			utils.log("DEBUG", "currentActivity is: " + currentActivity, isDebugLogEnabled)

-			def workStep = execution.getVariable("workStep")

-			utils.log("DEBUG", "workStep is: " + workStep, isDebugLogEnabled)

-			def failedActivity = execution.getVariable("failedActivity")

-			utils.log("DEBUG", "failedActivity is: " + failedActivity, isDebugLogEnabled)

-			def errorCode = execution.getVariable("errorCode")

-			utils.log("DEBUG", "errorCode is: " + errorCode, isDebugLogEnabled)

-			def errorText = execution.getVariable("errorText")

-			utils.log("DEBUG", "errorText is: " + errorText, isDebugLogEnabled)

-			String defaultPolicyDisposition = (String) execution.getVariable('URN_policy_default_disposition')

-			utils.log("DEBUG", "defaultPolicyDisposition is: " + defaultPolicyDisposition, isDebugLogEnabled)

-			execution.setVariable('defaultPolicyDisposition', defaultPolicyDisposition)

-			

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

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

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit preProcessRequest of RainyDayHandler *****",  isDebugLogEnabled)

-	}

-

-	public void queryPolicy (DelegateExecution execution) {

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		String msg = ""

-		utils.log("DEBUG"," ***** queryPolicy of RainyDayHandler *****",  isDebugLogEnabled)

-

-		try {

-

-			// check for input

-			String serviceType = execution.getVariable("serviceType")

-			String vnfType = execution.getVariable("vnfType")

-			

-			utils.log("DEBUG", "serviceType: " + serviceType, isDebugLogEnabled)

-			utils.log("DEBUG", "vnfType: " + vnfType, isDebugLogEnabled)

-			

-			def errorCode = execution.getVariable("errorCode")

-			def bbId = execution.getVariable("currentActivity")

-			def workStep = execution.getVariable("workStep")

-			

-			utils.log("DEBUG", "Before querying policy", isDebugLogEnabled)

-			

-			String decision = 'DENY'

-			String disposition = "Abort"

-			String defaultAllowedTreatments = "rollback, skip, manual, abort"

-			

-			String defaultPolicyDisposition = (String) execution.getVariable('defaultPolicyDisposition')

-			if (defaultPolicyDisposition != null) {

-				utils.log("DEBUG", "Setting disposition to the configured default instead of querying Policy: " + defaultPolicyDisposition, isDebugLogEnabled)

-				disposition = defaultPolicyDisposition

-				utils.log("DEBUG", "Setting default allowed treatments: " + defaultAllowedTreatments, isDebugLogEnabled)

-				execution.setVariable("validResponses", defaultAllowedTreatments)

-			}

-			else {

-			

-				PolicyDecision decisionObject = null

-			

-				try {			

-					PolicyClient policyClient = new PolicyClientImpl()

-					utils.log("DEBUG", "Created policy client", isDebugLogEnabled)

-					decisionObject = policyClient.getDecision(serviceType, vnfType, bbId, workStep, errorCode)

-					utils.log("DEBUG", "Obtained decision object", isDebugLogEnabled)

-					DictionaryData dictClient = policyClient.getAllowedTreatments(bbId, workStep)					

-					Treatments treatments = dictClient.getTreatments()

-					String validResponses = treatments.getString()

-					if (validResponses != null) {

-						validResponses = validResponses.toLowerCase()

-					}

-					utils.log("DEBUG", "Obtained validResponses: " + validResponses, isDebugLogEnabled)

-					execution.setVariable("validResponses", validResponses)

-				

-				} catch(Exception e) {

-					msg = "Exception in queryPolicy " + e.getMessage()

-					utils.log("DEBUG", msg, isDebugLogEnabled)				

-				}

-			

-						

-				if (decisionObject != null) {

-					decision = decisionObject.getDecision()

-					disposition = decisionObject.getDetails()

-					utils.log("DEBUG", "Obtained disposition from policy engine: " + disposition, isDebugLogEnabled)

-				}

-				else {

-					disposition = "Abort"

-				}

-				if (disposition == null) {

-					disposition = "Abort"

-				}

-			}			

-			execution.setVariable("handlingCode", disposition)			

-			

-			utils.log("DEBUG", "Disposition: "+ disposition, isDebugLogEnabled)

-

-		} catch (BpmnError e) {

-			utils.log("DEBUG", "BPMN exception: " + e.errorMessage, isDebugLogEnabled)

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in queryPolicy " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugLogEnabled)

-			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit queryPolicy of RainyDayHandler *****",  isDebugLogEnabled)

-	}

-

-

-

-	

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.client.policy.PolicyClient
+import org.onap.so.client.policy.PolicyClientImpl
+import org.onap.so.client.policy.entities.DictionaryData
+import org.onap.so.client.policy.entities.PolicyDecision
+import org.onap.so.client.policy.entities.Treatments
+import org.onap.so.logger.MsoLogger
+
+
+/**
+ * This groovy class supports the <class>RainyDayHandler.bpmn</class> process.
+ *
+ * @author
+ *
+ * Inputs:
+ * @param - msoRequestId
+ * @param - isDebugLogEnabled
+ * @param - serviceType
+ * @param - vnfType
+ * @param - currentActivity
+ * @param - workStep
+ * @param - failedActivity
+ * @param - errorCode
+ * @param - errorText 
+ * @param - vnfName
+ *
+ * Outputs:
+ * @param - WorkflowException
+ * @param - handlingCode
+ *
+ */
+public class RainyDayHandler extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, RainyDayHandler.class);
+
+
+	String Prefix="RDH_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	
+	JsonUtils jsonUtils = new JsonUtils()
+
+	public void preProcessRequest (DelegateExecution execution) {
+		String msg = ""
+		msoLogger.trace("preProcessRequest of RainyDayHandler ")
+
+		try {
+			execution.setVariable("prefix", Prefix)
+			// check for required input
+			String requestId = execution.getVariable("msoRequestId")
+			msoLogger.debug("msoRequestId is: " + requestId)		
+			def serviceType = execution.getVariable("serviceType")
+			msoLogger.debug("serviceType is: " + serviceType)
+			def vnfType = execution.getVariable("vnfType")
+			msoLogger.debug("vnftype is: " + vnfType)
+			def currentActivity = execution.getVariable("currentActivity")
+			msoLogger.debug("currentActivity is: " + currentActivity)
+			def workStep = execution.getVariable("workStep")
+			msoLogger.debug("workStep is: " + workStep)
+			def failedActivity = execution.getVariable("failedActivity")
+			msoLogger.debug("failedActivity is: " + failedActivity)
+			def errorCode = execution.getVariable("errorCode")
+			msoLogger.debug("errorCode is: " + errorCode)
+			def errorText = execution.getVariable("errorText")
+			msoLogger.debug("errorText is: " + errorText)
+			String defaultPolicyDisposition = (String) UrnPropertiesReader.getVariable("policy.default.disposition",execution)
+			msoLogger.debug("defaultPolicyDisposition is: " + defaultPolicyDisposition)
+			execution.setVariable('defaultPolicyDisposition', defaultPolicyDisposition)
+			
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in preProcessRequest " + ex.getMessage()
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit preProcessRequest of RainyDayHandler ")
+	}
+
+	public void queryPolicy (DelegateExecution execution) {
+		String msg = ""
+		msoLogger.trace("queryPolicy of RainyDayHandler ")
+
+		try {
+
+			// check for input
+			String serviceType = execution.getVariable("serviceType")
+			String vnfType = execution.getVariable("vnfType")
+			
+			msoLogger.debug("serviceType: " + serviceType)
+			msoLogger.debug("vnfType: " + vnfType)
+			
+			def errorCode = execution.getVariable("errorCode")
+			def bbId = execution.getVariable("currentActivity")
+			def workStep = execution.getVariable("workStep")
+			
+			msoLogger.debug("Before querying policy")
+			
+			String decision = 'DENY'
+			String disposition = "Abort"
+			String defaultAllowedTreatments = "rollback, skip, manual, abort"
+			
+			String defaultPolicyDisposition = (String) execution.getVariable('defaultPolicyDisposition')
+			if (defaultPolicyDisposition != null && !defaultPolicyDisposition.isEmpty()) {
+				msoLogger.debug("Setting disposition to the configured default instead of querying Policy: " + defaultPolicyDisposition)
+				disposition = defaultPolicyDisposition
+				msoLogger.debug("Setting default allowed treatments: " + defaultAllowedTreatments)
+				execution.setVariable("validResponses", defaultAllowedTreatments)
+			}
+			else {
+			
+				PolicyDecision decisionObject = null
+			
+				try {			
+					PolicyClient policyClient = new PolicyClientImpl()
+					msoLogger.debug("Created policy client")
+					decisionObject = policyClient.getDecision(serviceType, vnfType, bbId, workStep, errorCode)
+					msoLogger.debug("Obtained decision object")
+					DictionaryData dictClient = policyClient.getAllowedTreatments(bbId, workStep)					
+					Treatments treatments = dictClient.getTreatments()
+					String validResponses = treatments.getString()
+					if (validResponses != null) {
+						validResponses = validResponses.toLowerCase()
+					}
+					msoLogger.debug("Obtained validResponses: " + validResponses)
+					execution.setVariable("validResponses", validResponses)
+				
+				} catch(Exception e) {
+					msg = "Exception in queryPolicy " + e.getMessage()
+					msoLogger.debug(msg)				
+				}
+			
+						
+				if (decisionObject != null) {
+					decision = decisionObject.getDecision()
+					disposition = decisionObject.getDetails()
+					msoLogger.debug("Obtained disposition from policy engine: " + disposition)
+				}
+				else {
+					disposition = "Abort"
+				}
+				if (disposition == null) {
+					disposition = "Abort"
+				}
+			}			
+			execution.setVariable("handlingCode", disposition)			
+			
+			msoLogger.debug("Disposition: "+ disposition)
+
+		} catch (BpmnError e) {
+			msoLogger.debug("BPMN exception: " + e.errorMessage)
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in queryPolicy " + ex.getMessage()
+			msoLogger.debug(msg)
+			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		msoLogger.trace("Exit queryPolicy of RainyDayHandler ")
+	}
+
+
+
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ReceiveWorkflowMessage.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ReceiveWorkflowMessage.groovy
index 1e1afb4d5d..717d0df1ba 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ReceiveWorkflowMessage.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ReceiveWorkflowMessage.groovy
@@ -1,109 +1,133 @@
-package org.openecomp.mso.bpmn.common.scripts;

-

-import groovy.json.*

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

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

-

-

-class ReceiveWorkflowMessage extends AbstractServiceTaskProcessor {

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * Process the incoming variables.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-public void preProcessRequest (DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		def prefix="RCVWFMSG_"

-		execution.setVariable("prefix", prefix)

-		setSuccessIndicator(execution, false)

-

-		try {

-

-			// Confirm that timeout value has been provided in 'RCVWFMSG_timeout'.

-			def timeout = execution.getVariable('RCVWFMSG_timeout')

-			logDebug('Timeout value is \'' + timeout + '\'', isDebugLogEnabled)

-			if ((timeout == null) || (timeout.isEmpty())) {

-				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_timeout\''

-				logDebug(msg, isDebugLogEnabled)

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			// Confirm that message type has been provided in 'RCVWFMSG_messageType'

-			def messageType = execution.getVariable('RCVWFMSG_messageType')

-			logDebug('Message type is \'' + messageType + '\'', isDebugLogEnabled)

-			if ((messageType == null) || (messageType.isEmpty())) {

-				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_messageType\''

-				logDebug(msg, isDebugLogEnabled)

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			// Confirm that correlator value has been provided in 'RCVWFMSG_correlator'

-			def correlator = execution.getVariable('RCVWFMSG_correlator')

-			logDebug('Correlator value is \'' + correlator + '\'', isDebugLogEnabled)

-			if ((correlator == null) || (correlator.isEmpty())) {

-				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_correlator\''

-				logDebug(msg, isDebugLogEnabled)

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-			execution.setVariable(messageType + '_CORRELATOR', correlator)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e

-		} catch (Exception e) {

-			String msg = 'Caught exception in ' + method + ": " + e

-			logDebug(msg, isDebugLogEnabled)

-			logError(msg)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-		}

-	}

-

-	/**

-	 * Process a received message.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void processReceivedMessage(DelegateExecution execution){

-		def method = getClass().getSimpleName() + '.processReceivedMessage(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		String messageType = null;

-		String receivedMessage = null;

-

-		try {

-			messageType = execution.getVariable('RCVWFMSG_messageType')

-			receivedMessage = execution.getVariable(messageType + '_MESSAGE')

-			logDebug(getProcessKey(execution) + ": received message:\n" + receivedMessage, isDebugLogEnabled)

-

-			// The received message is made available to the calling flow in WorkflowResponse

-			execution.setVariable("WorkflowResponse", receivedMessage)

-

-			setSuccessIndicator(execution, true)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (Exception e) {

-			receivedMessage = receivedMessage == null || String.valueOf(receivedMessage).isEmpty() ? "NONE" : receivedMessage

-			String msg = "Error processing received workflow message: " + receivedMessage

-			logDebug(getProcessKey(execution) + ': ' + msg, isDebugLogEnabled)

-			exceptionUtil.buildWorkflowException(execution, 7020, msg)

-		}

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import groovy.json.*
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+class ReceiveWorkflowMessage extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ReceiveWorkflowMessage.class);
+
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * Process the incoming variables.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+public void preProcessRequest (DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		def prefix="RCVWFMSG_"
+		execution.setVariable("prefix", prefix)
+		setSuccessIndicator(execution, false)
+
+		try {
+
+			// Confirm that timeout value has been provided in 'RCVWFMSG_timeout'.
+			def timeout = execution.getVariable('RCVWFMSG_timeout')
+			msoLogger.debug('Timeout value is \'' + timeout + '\'')
+			if ((timeout == null) || (timeout.isEmpty())) {
+				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_timeout\''
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			// Confirm that message type has been provided in 'RCVWFMSG_messageType'
+			def messageType = execution.getVariable('RCVWFMSG_messageType')
+			msoLogger.debug('Message type is \'' + messageType + '\'')
+			if ((messageType == null) || (messageType.isEmpty())) {
+				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_messageType\''
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			// Confirm that correlator value has been provided in 'RCVWFMSG_correlator'
+			def correlator = execution.getVariable('RCVWFMSG_correlator')
+			msoLogger.debug('Correlator value is \'' + correlator + '\'')
+			if ((correlator == null) || (correlator.isEmpty())) {
+				String msg = getProcessKey(execution) + ': Missing or empty input variable \'RCVWFMSG_correlator\''
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+			execution.setVariable(messageType + '_CORRELATOR', correlator)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e
+		} catch (Exception e) {
+			String msg = 'Caught exception in ' + method + ": " + e
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+		}
+	}
+
+	/**
+	 * Process a received message.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void processReceivedMessage(DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.processReceivedMessage(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		String messageType = null;
+		String receivedMessage = null;
+
+		try {
+			messageType = execution.getVariable('RCVWFMSG_messageType')
+			receivedMessage = execution.getVariable(messageType + '_MESSAGE')
+			msoLogger.debug(getProcessKey(execution) + ": received message:\n" + receivedMessage)
+
+			// The received message is made available to the calling flow in WorkflowResponse
+			execution.setVariable("WorkflowResponse", receivedMessage)
+
+			setSuccessIndicator(execution, true)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (Exception e) {
+			receivedMessage = receivedMessage == null || String.valueOf(receivedMessage).isEmpty() ? "NONE" : receivedMessage
+			String msg = "Error processing received workflow message: " + receivedMessage
+			msoLogger.debug(getProcessKey(execution) + ': ' + msg)
+			exceptionUtil.buildWorkflowException(execution, 7020, msg)
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapter.groovy
index 44c9f3f829..852f8d75bd 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapter.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapter.groovy
@@ -1,335 +1,327 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import java.text.SimpleDateFormat

-

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

-

-

-// SDNC Adapter Request/Response processing

-

-public class SDNCAdapter extends AbstractServiceTaskProcessor {

-

-	def Prefix="SDNCA_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	// Script Task: Process SDNC Workflow Request

-	// Params: 	Workflow DelegateExecution

-	// Assume:	Received SDNCAdapterWorkflowRequest is in variable 'sdncAdapterWorkflowRequest'

-	//			Put created SDNCAdapterRequest in variable 'sdncAdapterRequest'

-	public void preProcessRequest (DelegateExecution execution) {

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

-		try{

-

-			utils.log("DEBUG", "=========== Begin PreProcess SDNCAdapterRequestScript  ===========", isDebugEnabled)

-			utils.log("DEBUG", "Incoming sdncAdapterWorkflowRequest:\n" + execution.getVariable("sdncAdapterWorkflowRequest"), isDebugEnabled)

-

-			// Initialize some variables used throughout the flow

-			execution.setVariable("prefix", Prefix)

-			execution.setVariable("sdncAdapterResponse", "")

-			execution.setVariable("asynchronousResponseTimeout", false)

-			execution.setVariable("continueListening", false)

-			execution.setVariable("SDNCA_SuccessIndicator", false)

-			execution.setVariable("SDNCA_InterimNotify", false)

-			

-			// Authorization Info

-			String basicAuthValue = execution.getVariable("URN_mso_adapters_po_auth")

-			utils.log("DEBUG", "Obtained BasicAuth userid password for sdnc adapter:" + basicAuthValue, isDebugEnabled)

-			try {

-				def encodedString = utils.getBasicAuth(basicAuthValue, execution.getVariable("URN_mso_msoKey"))

-				execution.setVariable("BasicAuthHeaderValue",encodedString)

-			} catch (IOException ex) {

-				utils.log("ERROR", "Unable to encode username password string")

-			}

-

-			// TODO Use variables instead of passing xml request - Huh?

-

-			// Get original RequestHeader

-			def sdncwfreq= execution.getVariable("sdncAdapterWorkflowRequest")

-			def requestHeader = utils.getNodeXml(sdncwfreq, "RequestHeader")

-			requestHeader = requestHeader.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")

-			utils.log("DEBUG", "RequestHeader:\n" + requestHeader, isDebugEnabled)

-

-			// Set Callback URL to use from URN Mapping or jBoss Property

-			def origCallbackUrl = utils.getNodeText(requestHeader, "CallbackUrl")

-			def callbackUrlToUse = execution.getVariable("URN_mso_workflow_sdncadapter_callback")

-			MsoUtils msoUtil = new MsoUtils()

-			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")

-			if((useQualifiedHostName!=null) && (useQualifiedHostName.equals("true"))){

-				callbackUrlToUse = msoUtil.getQualifiedHostNameForCallback(callbackUrlToUse)

-			}

-			utils.log("DEBUG", "Callback URL to use:\n" + callbackUrlToUse, isDebugEnabled)

-			requestHeader = requestHeader.replace(origCallbackUrl, callbackUrlToUse)

-

-			// Get parameters from request header

-			def sdnca_svcInstanceId = utils.getNodeText1(requestHeader, "SvcInstanceId") // optional

-			utils.log("DEBUG", "SvcInstanceId: " + sdnca_svcInstanceId, isDebugEnabled)

-			def sdnca_msoAction = utils.getNodeText1(requestHeader, "MsoAction") // optional

-			utils.log("DEBUG", "MsoAction: " + sdnca_msoAction, isDebugEnabled)

-			def sdnca_svcAction = utils.getNodeText(requestHeader, "SvcAction")

-			utils.log("DEBUG", "SvcAction: " + sdnca_svcAction, isDebugEnabled)

-			def sdnca_svcOperation = utils.getNodeText(requestHeader, "SvcOperation")

-			utils.log("DEBUG", "SvcOperation: " + sdnca_svcOperation, isDebugEnabled)

-			def sdncRequestData = utils.getChildNodes(sdncwfreq, "SDNCRequestData")

-			sdncRequestData = sdncRequestData.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")

-			sdncRequestData = sdncRequestData.replaceAll('tag0:', '').replaceAll(':tag0', '')

-			utils.log("DEBUG", "SDNCRequestData:\n" + sdncRequestData, isDebugEnabled)

-			def sdnca_serviceType = ""

-			if (utils.nodeExists(sdncwfreq, "service-type")) {

-				sdnca_serviceType = utils.getNodeText(sdncwfreq, "service-type")

-			}

-			utils.log("DEBUG", "service-type: " + sdnca_serviceType, isDebugEnabled)

-			def serviceConfigActivate = false

-			def source = ''

-			if ((sdnca_svcAction == 'activate') && (sdnca_svcOperation == 'service-configuration-operation') && (sdnca_serviceType == 'uCPE-VMS')) {

-				serviceConfigActivate = true

-				if (utils.nodeExists(sdncwfreq, 'source')) {

-					source = utils.getNodeText(sdncwfreq, 'source')

-				}

-			}

-			execution.setVariable("serviceConfigActivate", serviceConfigActivate)

-			utils.log("DEBUG", "serviceConfigActivate: " + serviceConfigActivate, isDebugEnabled)

-			execution.setVariable("source", source)

-			utils.log("DEBUG", "source: " + source, isDebugEnabled)

-

-			//calling process should pass a generated uuid if sending multiple sdnc requests

-			def requestId = utils.getNodeText(requestHeader, "RequestId")

-			execution.setVariable(Prefix + "requestId", requestId)

-

-			// Prepare SDNC Request to the SDNC Adapter

-			String sdncAdapterRequest = """

-			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">

-			<SOAP-ENV:Body>

-			<aetgt:SDNCAdapterRequest xmlns:aetgt="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:sdncadaptersc="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-			<sdncadapter:RequestHeader xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-			<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>"""

-

-			if (sdnca_svcInstanceId != null) {

-				sdncAdapterRequest += """

-			<sdncadapter:SvcInstanceId>${sdnca_svcInstanceId}</sdncadapter:SvcInstanceId>"""

-			}

-

-			sdncAdapterRequest += """

-			<sdncadapter:SvcAction>${sdnca_svcAction}</sdncadapter:SvcAction>

-			<sdncadapter:SvcOperation>${sdnca_svcOperation}</sdncadapter:SvcOperation>

-			<sdncadapter:CallbackUrl>${callbackUrlToUse}</sdncadapter:CallbackUrl>"""

-

-			if (sdnca_msoAction != null) {

-				sdncAdapterRequest += """

-			<sdncadapter:MsoAction>${sdnca_msoAction}</sdncadapter:MsoAction>"""

-			}

-

-			sdncAdapterRequest += """

-			</sdncadapter:RequestHeader>

-			<sdncadaptersc:RequestData>${sdncRequestData}</sdncadaptersc:RequestData></aetgt:SDNCAdapterRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>"""

-

-			utils.logAudit("Outgoing SDNCAdapterRequest:\n" + sdncAdapterRequest)

-			execution.setVariable("sdncAdapterRequest", sdncAdapterRequest)

-

-			utils.log("DEBUG", execution.getVariable("sdncAdapterRequest"), isDebugEnabled)

-			utils.log("DEBUG", execution.getVariable("URN_mso_adapters_sdnc_endpoint"), isDebugEnabled)

-		}catch(Exception e){

-			utils.log("DEBUG", 'Internal Error occured during PreProcess Method: ' + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 9999, 'Internal Error occured during PreProcess Method') // TODO: what message and error code?

-		}

-		utils.log("DEBUG","=========== End pre Process SDNCRequestScript ===========", isDebugEnabled)

-	}

-

-	public void postProcessResponse (DelegateExecution execution) {

-

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

-		try{

-			utils.log("DEBUG","=========== Begin POSTProcess SDNCAdapter ===========", isDebugEnabled)

-			utils.log("DEBUG","Incoming sdncAdapterCallbackRequest:\n" + execution.getVariable("sdncAdapterCallbackRequest"), isDebugEnabled)

-

-			// Check the sdnccallback request and get the responsecode

-			def sdnccallbackreq = execution.getVariable("sdncAdapterCallbackRequest")

-			def callbackRequestData = ""

-			def callbackHeader = ""

-			utils.logAudit("SDNCAdapterCallback Request :" + sdnccallbackreq)

-			

-			if(sdnccallbackreq != null){

-				callbackHeader = utils.getNodeXml(sdnccallbackreq, "CallbackHeader")

-				callbackRequestData = utils.getNodeXml(sdnccallbackreq, "RequestData")

-

-				callbackHeader = callbackHeader.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")

-				utils.log("DEBUG","SDNCCallbackHeader is:\n" + callbackHeader, isDebugEnabled)

-

-				callbackRequestData = callbackRequestData.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")

-				utils.log("DEBUG","DECODED SDNCCallback RequestData is:\n" + callbackRequestData, isDebugEnabled)

-

-				String sdncAdapterWorkflowResponse ="""

-						<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-						<sdncadapterworkflow:response-data>

-						${callbackHeader}

-						${callbackRequestData}

-						</sdncadapterworkflow:response-data>

-						</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-

-

-				utils.log("DEBUG","Outgoing sdncAdapterWorkflowResponse:\n" + sdncAdapterWorkflowResponse, isDebugEnabled)

-				sdncAdapterWorkflowResponse = utils.formatXml(sdncAdapterWorkflowResponse)

-				utils.logAudit("sdncAdapterWorkflowResponse :" + sdncAdapterWorkflowResponse)

-				execution.setVariable("sdncAdapterResponse", sdncAdapterWorkflowResponse)

-				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead

-				execution.setVariable("WorkflowResponse", sdncAdapterWorkflowResponse)

-

-				// Check final indicator to determine if we are to continue listening or not

-				def String enhancedCallbackRequestData = callbackRequestData.replaceAll("&amp;", "&")

-				enhancedCallbackRequestData = enhancedCallbackRequestData.replaceAll("&lt;", "<")

-				enhancedCallbackRequestData = enhancedCallbackRequestData.replaceAll("&gt;", ">")

-				// replace the data with '&' (ex: subscriber-name= 'FOUR SEASONS HEATING & COOLING'

-				enhancedCallbackRequestData = enhancedCallbackRequestData.replace("&", "&amp;")

-				utils.log("DEBUG","EnhancedCallbackRequestData:\n" + enhancedCallbackRequestData, isDebugEnabled)

-				execution.setVariable("enhancedCallbackRequestData", enhancedCallbackRequestData)

-				def continueListening = false

-				if (utils.nodeExists(enhancedCallbackRequestData, "ack-final-indicator")) {

-					if (utils.getNodeText(enhancedCallbackRequestData, "ack-final-indicator") == 'N') {

-						continueListening = true

-					}

-				}

-				execution.setVariable("continueListening", continueListening)

-				utils.log("DEBUG", "Continue Listening: " + continueListening, isDebugEnabled)

-				execution.setVariable("asynchronousResponseTimeout", false)

-			}else{

-				// Timed out waiting for asynchronous message, build error response

-				exceptionUtil.buildWorkflowException(execution, 500, "SDNC Callback Timeout Error")

-				execution.setVariable("asynchronousResponseTimeout", true)

-				utils.log("DEBUG", "Timed out waiting for asynchronous message", isDebugEnabled)

-			}

-		}catch(Exception e){

-			utils.log("DEBUG", 'Internal Error occured during PostProcess Method: ' + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 9999, 'Internal Error occured during PostProcess Method') // TODO: what message and error code?

-		}

-		utils.log("DEBUG","=========== End POSTProcess SDNCAdapter ===========", isDebugEnabled)

-	}

-

-	public void callbackResponsecheck(DelegateExecution execution){

-

-		def sdnccallbackreq=execution.getVariable("sdncAdapterCallbackRequest")

-		utils.logAudit("sdncAdapterCallbackRequest :" + sdnccallbackreq)

-		if (sdnccallbackreq==null){

-			execution.setVariable("callbackResponseReceived",false);

-		}else{

-			execution.setVariable("callbackResponseReceived",true);

-		}

-	}

-

-	public void resetCallbackRequest(DelegateExecution execution) {

-

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

-

-		utils.log("DEBUG","=========== Begin Reset Callback Info SDNCAdapter ===========", isDebugEnabled)

-

-		// Clear sdncAdapterCallbackRequest variable

-		execution.removeVariable("sdncAdapterCallbackRequest")

-

-		// Determine and set SDNC Timeout Value

-		def enhancedCallbackRequestData = execution.getVariable("enhancedCallbackRequestData")

-		utils.logAudit("sdncAdapter - enhancedCallbackRequestData :" + enhancedCallbackRequestData)

-		def interim = false

-		if (enhancedCallbackRequestData != null) {

-			if (utils.nodeExists(enhancedCallbackRequestData, "ack-final-indicator")) {

-				if (utils.getNodeText(enhancedCallbackRequestData, "ack-final-indicator") == 'N') {

-					interim = true

-				}

-			}

-		}

-		def timeoutValue = execution.getVariable("URN_mso_sdnc_timeout")

-		def sdncAdapterWorkflowRequest = execution.getVariable("sdncAdapterWorkflowRequest")

-		if (interim && utils.nodeExists(sdncAdapterWorkflowRequest, "InterimSDNCTimeOutValueInHours")) {

-			timeoutValue = "PT" + utils.getNodeText(sdncAdapterWorkflowRequest, "InterimSDNCTimeOutValueInHours") + "H"

-		} else if (utils.nodeExists(sdncAdapterWorkflowRequest, "SDNCTimeOutValueInMinutes")) {

-			timeoutValue = "PT" + utils.getNodeText(sdncAdapterWorkflowRequest, "SDNCTimeOutValueInMinutes") + "M"

-		}

-		execution.setVariable("sdncTimeoutValue", timeoutValue)

-		utils.log("DEBUG", "Setting SDNC Timeout Value to " + timeoutValue, isDebugEnabled)

-

-		utils.log("DEBUG","=========== End Reset Callback Info SDNCAdapter ===========", isDebugEnabled)

-	}

-

-

-	public void prepareDBMessage(DelegateExecution execution) {

-

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

-

-		utils.log("DEBUG","=========== Begin Prepare DB Message SDNCAdapter ===========", isDebugEnabled)

-

-		// Create DB Message

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

-		String dbUpdateInterimStageCompletion = """

-			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">

-				<SOAP-ENV:Body>

-					<DBAdapter:updateInterimStageCompletion xmlns:DBAdapter="http://org.openecomp.mso/requestsdb">

-   						<requestId>${dbRequestId}</requestId>

-   						<interimStageCompletion>1</interimStageCompletion>

-   						<lastModifiedBy>BPEL</lastModifiedBy>

-				</DBAdapter:updateInterimStageCompletion>

-				</SOAP-ENV:Body>

-			</SOAP-ENV:Envelope>

-			"""

-

-		execution.setVariable("dbUpdateInterimStageCompletion", dbUpdateInterimStageCompletion)

-		utils.logAudit("sdncAdapter - dbUpdateInterimStageCompletion :" + dbUpdateInterimStageCompletion)

-		utils.log("DEBUG","DB UpdateInterimStageCompletion:\n" + dbUpdateInterimStageCompletion, isDebugEnabled)

-		utils.log("DEBUG","=========== End Prepare DB Message SDNCAdapter ===========", isDebugEnabled)

-	}

-

-	public String generateCurrentTimeInUtc(){

-		final  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");

-		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));

-		final String utcTime = sdf.format(new Date());

-		return utcTime;

-	}

-

-	public void toggleSuccessIndicator(DelegateExecution execution){

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

-		execution.setVariable("SDNCA_SuccessIndicator", true)

-		utils.log("DEBUG","Setting SDNCA Success Indicator to True", isDebugEnabled)

-	}

-

-	public void assignError(DelegateExecution execution){

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

-		utils.log("DEBUG","=========== Started Assign Error ===========", isDebugEnabled)

-		WorkflowException wf = execution.getVariable("WorkflowException")

-		if(wf == null){

-			exceptionUtil.buildWorkflowException(execution, 5000, "SDNCAdapter Encountered an Internal Error") // TODO: Not sure what message and error code we want here.....

-		}else{

-			execution.setVariable("WorkflowException", wf)

-		}

-

-		utils.log("DEBUG","Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"), isDebugEnabled)

-		utils.log("DEBUG","=========== End Assign Error ===========", isDebugEnabled)

-	}

-	

-	public void setTimeout(DelegateExecution execution){

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

-		utils.log("DEBUG","=========== Started SetTimeout ===========", isDebugEnabled)

-		utils.log("DEBUG", "Timer expired, telling correlation service to stop listening", isDebugEnabled)

-		execution.setVariable("asynchronousResponseTimeout", true)

-		

-		utils.log("DEBUG", "Timed out branch sleeping for one second to give success branch a chance to complete if running", isDebugEnabled)

-		Thread.sleep(1000)

-		utils.log("DEBUG","=========== End SetTimeout ===========", isDebugEnabled)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+
+import java.text.SimpleDateFormat
+
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+// SDNC Adapter Request/Response processing
+
+public class SDNCAdapter extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapter.class);
+
+
+	def Prefix="SDNCA_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	// Script Task: Process SDNC Workflow Request
+	// Params: 	Workflow DelegateExecution
+	// Assume:	Received SDNCAdapterWorkflowRequest is in variable 'sdncAdapterWorkflowRequest'
+	//			Put created SDNCAdapterRequest in variable 'sdncAdapterRequest'
+	public void preProcessRequest (DelegateExecution execution) {
+		try{
+
+			msoLogger.trace("Begin PreProcess SDNCAdapterRequestScript  ")
+			msoLogger.debug("Incoming sdncAdapterWorkflowRequest:\n" + execution.getVariable("sdncAdapterWorkflowRequest"))
+
+			// Initialize some variables used throughout the flow
+			execution.setVariable("prefix", Prefix)
+			execution.setVariable("sdncAdapterResponse", "")
+			execution.setVariable("asynchronousResponseTimeout", false)
+			execution.setVariable("continueListening", false)
+			execution.setVariable("SDNCA_SuccessIndicator", false)
+			execution.setVariable("SDNCA_InterimNotify", false)
+
+			// Authorization Info
+			String basicAuthValue = UrnPropertiesReader.getVariable("mso.adapters.po.auth", execution)
+
+			try {
+				def encodedString = utils.getBasicAuth(basicAuthValue, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+				execution.setVariable("BasicAuthHeaderValue",encodedString)
+			} catch (IOException ex) {
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Unable to encode username password string", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			}
+
+			// TODO Use variables instead of passing xml request - Huh?
+
+			// Get original RequestHeader
+			def sdncwfreq= execution.getVariable("sdncAdapterWorkflowRequest")
+			def requestHeader = utils.getNodeXml(sdncwfreq, "RequestHeader")
+			requestHeader = requestHeader.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
+
+			// Set Callback URL to use from URN Mapping or jBoss Property
+			def origCallbackUrl = utils.getNodeText(requestHeader, "CallbackUrl")
+			def callbackUrlToUse = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback", execution)
+			MsoUtils msoUtil = new MsoUtils()
+			def useQualifiedHostName = UrnPropertiesReader.getVariable("mso.use.qualified.host", execution)
+			if((useQualifiedHostName!=null) && (useQualifiedHostName.equals("true"))){
+				callbackUrlToUse = msoUtil.getQualifiedHostNameForCallback(callbackUrlToUse)
+			}
+			msoLogger.debug("Callback URL to use:\n" + callbackUrlToUse)
+			requestHeader = requestHeader.replace(origCallbackUrl, callbackUrlToUse)
+
+			// Get parameters from request header
+			def sdnca_svcInstanceId = utils.getNodeText(requestHeader, "SvcInstanceId") // optional
+			msoLogger.debug("SvcInstanceId: " + sdnca_svcInstanceId)
+			def sdnca_msoAction = utils.getNodeText(requestHeader, "MsoAction") // optional
+			msoLogger.debug("MsoAction: " + sdnca_msoAction)
+			def sdnca_svcAction = utils.getNodeText(requestHeader, "SvcAction")
+			msoLogger.debug("SvcAction: " + sdnca_svcAction)
+			def sdnca_svcOperation = utils.getNodeText(requestHeader, "SvcOperation")
+			msoLogger.debug("SvcOperation: " + sdnca_svcOperation)
+			def sdncRequestData = utils.getChildNodes(sdncwfreq, "SDNCRequestData")
+			sdncRequestData = sdncRequestData.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
+			sdncRequestData = sdncRequestData.replaceAll('tag0:', '').replaceAll(':tag0', '')
+			msoLogger.debug("SDNCRequestData:\n" + sdncRequestData)
+			def sdnca_serviceType = ""
+			if (utils.nodeExists(sdncwfreq, "service-type")) {
+				sdnca_serviceType = utils.getNodeText(sdncwfreq, "service-type")
+			}
+			msoLogger.debug("service-type: " + sdnca_serviceType)
+			def serviceConfigActivate = false
+			def source = ''
+			if ((sdnca_svcAction == 'activate') && (sdnca_svcOperation == 'service-configuration-operation') && (sdnca_serviceType == 'uCPE-VMS')) {
+				serviceConfigActivate = true
+				if (utils.nodeExists(sdncwfreq, 'source')) {
+					source = utils.getNodeText(sdncwfreq, 'source')
+				}
+			}
+			execution.setVariable("serviceConfigActivate", serviceConfigActivate)
+			msoLogger.debug("serviceConfigActivate: " + serviceConfigActivate)
+			execution.setVariable("source", source)
+			msoLogger.debug("source: " + source)
+
+			//calling process should pass a generated uuid if sending multiple sdnc requests
+			def requestId = utils.getNodeText(requestHeader, "RequestId")
+			execution.setVariable(Prefix + "requestId", requestId)
+
+			// Prepare SDNC Request to the SDNC Adapter
+			String sdncAdapterRequest = """
+			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+			<SOAP-ENV:Body>
+			<aetgt:SDNCAdapterRequest xmlns:aetgt="http://org.onap/workflow/sdnc/adapter/schema/v1" xmlns:sdncadaptersc="http://org.onap/workflow/sdnc/adapter/schema/v1">
+			<sdncadapter:RequestHeader xmlns:sdncadapter="http://org.onap/workflow/sdnc/adapter/schema/v1">
+			<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>"""
+
+			if (sdnca_svcInstanceId != null) {
+				sdncAdapterRequest += """
+			<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(sdnca_svcInstanceId)}</sdncadapter:SvcInstanceId>"""
+				execution.setVariable("serviceInstanceId", sdnca_svcInstanceId)
+			}
+
+			sdncAdapterRequest += """
+			<sdncadapter:SvcAction>${MsoUtils.xmlEscape(sdnca_svcAction)}</sdncadapter:SvcAction>
+			<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(sdnca_svcOperation)}</sdncadapter:SvcOperation>
+			<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackUrlToUse)}</sdncadapter:CallbackUrl>"""
+
+			if (sdnca_msoAction != null) {
+				sdncAdapterRequest += """
+			<sdncadapter:MsoAction>${MsoUtils.xmlEscape(sdnca_msoAction)}</sdncadapter:MsoAction>"""
+			}
+
+			sdncAdapterRequest += """
+			</sdncadapter:RequestHeader>
+			<sdncadaptersc:RequestData>
+				${sdncRequestData}
+			</sdncadaptersc:RequestData></aetgt:SDNCAdapterRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>"""
+
+			msoLogger.debug("Outgoing SDNCAdapterRequest:\n" + sdncAdapterRequest)
+			execution.setVariable("sdncAdapterRequest", sdncAdapterRequest)
+
+			msoLogger.debug(UrnPropertiesReader.getVariable("mso.adapters.sdnc.endpoint", execution))
+		}catch(Exception e){
+			msoLogger.debug('Internal Error occured during PreProcess Method: ', e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 9999, 'Internal Error occured during PreProcess Method') // TODO: what message and error code?
+		}
+		msoLogger.trace("End pre Process SDNCRequestScript ")
+	}
+
+	public void postProcessResponse (DelegateExecution execution) {
+
+		try{
+			msoLogger.trace("Begin POSTProcess SDNCAdapter ")
+			msoLogger.trace("Incoming sdncAdapterCallbackRequest:\n" + execution.getVariable("sdncAdapterCallbackRequest"))
+
+			// Check the sdnccallback request and get the responsecode
+			def sdnccallbackreq = execution.getVariable("sdncAdapterCallbackRequest")
+			def callbackRequestData = ""
+			def callbackHeader = ""
+
+			if(sdnccallbackreq != null){
+				callbackHeader = utils.getNodeXml(sdnccallbackreq, "CallbackHeader")
+				callbackRequestData = utils.getNodeXml(sdnccallbackreq, "RequestData")
+
+				callbackHeader = callbackHeader.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
+
+				callbackRequestData = callbackRequestData.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", "")
+				
+				msoLogger.trace("EnhancedCallbackRequestData:\n" + callbackRequestData)
+				execution.setVariable("enhancedCallbackRequestData", callbackRequestData)
+
+				String sdncAdapterWorkflowResponse ="""
+						<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+						<sdncadapterworkflow:response-data>
+						${callbackHeader}
+						${callbackRequestData}
+						</sdncadapterworkflow:response-data>
+						</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""
+
+
+				sdncAdapterWorkflowResponse = utils.formatXml(sdncAdapterWorkflowResponse)
+				execution.setVariable("sdncAdapterResponse", sdncAdapterWorkflowResponse)
+				// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead
+				execution.setVariable("WorkflowResponse", sdncAdapterWorkflowResponse)
+
+				// Check final indicator to determine if we are to continue listening or not
+				def continueListening = false
+				if (utils.nodeExists(callbackRequestData, "ack-final-indicator")) {
+					if (utils.getNodeText(callbackRequestData, "ack-final-indicator") == 'N') {
+						continueListening = true
+					}
+				}
+				execution.setVariable("continueListening", continueListening)
+				msoLogger.debug("Continue Listening: " + continueListening)
+				execution.setVariable("asynchronousResponseTimeout", false)
+			}else{
+				// Timed out waiting for asynchronous message, build error response
+				exceptionUtil.buildWorkflowException(execution, 500, "SDNC Callback Timeout Error")
+				execution.setVariable("asynchronousResponseTimeout", true)
+				msoLogger.debug("Timed out waiting for asynchronous message")
+			}
+		}catch(Exception e){
+			msoLogger.debug('Internal Error occured during PostProcess Method: ' + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 9999, 'Internal Error occured during PostProcess Method') // TODO: what message and error code?
+		}
+		msoLogger.trace("End POSTProcess SDNCAdapter ")
+	}
+
+	public void callbackResponsecheck(DelegateExecution execution){
+
+		def sdnccallbackreq=execution.getVariable("sdncAdapterCallbackRequest")
+		msoLogger.debug("sdncAdapterCallbackRequest :" + sdnccallbackreq)
+		if (sdnccallbackreq==null){
+			execution.setVariable("callbackResponseReceived",false);
+		}else{
+			execution.setVariable("callbackResponseReceived",true);
+		}
+	}
+
+	public void resetCallbackRequest(DelegateExecution execution) {
+
+		msoLogger.trace("Begin Reset Callback Info SDNCAdapter ")
+
+		// Clear sdncAdapterCallbackRequest variable
+		execution.removeVariable("sdncAdapterCallbackRequest")
+
+		// Determine and set SDNC Timeout Value
+		def enhancedCallbackRequestData = execution.getVariable("enhancedCallbackRequestData")
+		msoLogger.debug("sdncAdapter - enhancedCallbackRequestData :" + enhancedCallbackRequestData)
+		def interim = false
+		if (enhancedCallbackRequestData != null) {
+			if (utils.nodeExists(enhancedCallbackRequestData, "ack-final-indicator")) {
+				if (utils.getNodeText(enhancedCallbackRequestData, "ack-final-indicator") == 'N') {
+					interim = true
+				}
+			}
+		}
+		def timeoutValue = UrnPropertiesReader.getVariable("mso.adapters.sdnc.timeout", execution)
+ 		if(timeoutValue==null)
+ 			timeoutValue="PT5M"
+		def sdncAdapterWorkflowRequest = execution.getVariable("sdncAdapterWorkflowRequest")
+		if (interim && utils.nodeExists(sdncAdapterWorkflowRequest, "InterimSDNCTimeOutValueInHours")) {
+			timeoutValue = "PT" + utils.getNodeText(sdncAdapterWorkflowRequest, "InterimSDNCTimeOutValueInHours") + "H"
+		} else if (utils.nodeExists(sdncAdapterWorkflowRequest, "SDNCTimeOutValueInMinutes")) {
+			timeoutValue = "PT" + utils.getNodeText(sdncAdapterWorkflowRequest, "SDNCTimeOutValueInMinutes") + "M"
+		}
+		execution.setVariable("sdncTimeoutValue", timeoutValue)
+		msoLogger.debug("Setting SDNC Timeout Value to " + timeoutValue)
+
+		msoLogger.trace("End Reset Callback Info SDNCAdapter ")
+	}
+
+
+	public void prepareDBMessage(DelegateExecution execution) {
+
+		msoLogger.trace("Begin Prepare DB Message SDNCAdapter ")
+
+		// Create DB Message
+		def dbRequestId = execution.getVariable("mso-request-id")
+		String dbUpdateInterimStageCompletion = """
+			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+				<SOAP-ENV:Body>
+					<DBAdapter:updateInterimStageCompletion xmlns:DBAdapter="http://org.onap.so/requestsdb">
+   						<requestId>${MsoUtils.xmlEscape(dbRequestId)}</requestId>
+   						<interimStageCompletion>1</interimStageCompletion>
+   						<lastModifiedBy>BPEL</lastModifiedBy>
+				</DBAdapter:updateInterimStageCompletion>
+				</SOAP-ENV:Body>
+			</SOAP-ENV:Envelope>
+			"""
+
+		execution.setVariable("dbUpdateInterimStageCompletion", dbUpdateInterimStageCompletion)
+		msoLogger.debug("sdncAdapter - dbUpdateInterimStageCompletion :" + dbUpdateInterimStageCompletion)
+		msoLogger.debug("DB UpdateInterimStageCompletion:\n" + dbUpdateInterimStageCompletion)
+		msoLogger.trace("End Prepare DB Message SDNCAdapter ")
+	}
+
+	public String generateCurrentTimeInUtc(){
+		final  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+		final String utcTime = sdf.format(new Date());
+		return utcTime;
+	}
+
+	public void toggleSuccessIndicator(DelegateExecution execution){
+		execution.setVariable("SDNCA_SuccessIndicator", true)
+		msoLogger.debug("Setting SDNCA Success Indicator to True")
+	}
+
+	public void assignError(DelegateExecution execution){
+		msoLogger.trace("Started Assign Error ")
+		WorkflowException wf = execution.getVariable("WorkflowException")
+		if(wf == null){
+			exceptionUtil.buildWorkflowException(execution, 5000, "SDNCAdapter Encountered an Internal Error") // TODO: Not sure what message and error code we want here.....
+		}else{
+			execution.setVariable("WorkflowException", wf)
+		}
+
+		msoLogger.debug("Outgoing WorkflowException is: " + execution.getVariable("WorkflowException"))
+		msoLogger.trace("End Assign Error ")
+	}
+
+	public void setTimeout(DelegateExecution execution){
+		msoLogger.trace("Started SetTimeout ")
+		msoLogger.debug("Timer expired, telling correlation service to stop listening")
+		execution.setVariable("asynchronousResponseTimeout", true)
+
+		msoLogger.debug("Timed out branch sleeping for one second to give success branch a chance to complete if running")
+		Thread.sleep(1000)
+		msoLogger.trace("End SetTimeout ")
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterRestV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
index 41fcb6d08d..f610ea4782 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterRestV1.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
@@ -1,4 +1,24 @@
-package org.openecomp.mso.bpmn.common.scripts
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
 
 import java.text.SimpleDateFormat
 import java.net.URLEncoder
@@ -12,14 +32,22 @@ import groovy.json.*
 
 import org.json.JSONObject
 
-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.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.domain.RollbackData
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
 
 
 class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapterRestV1.class);
+
 
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 	JsonUtils jsonUtil = new JsonUtils()
@@ -31,8 +59,7 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		def method = getClass().getSimpleName() + '.preProcessRequest(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		def prefix="SDNCREST_"
 		execution.setVariable("prefix", prefix)
@@ -44,17 +71,16 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 			String request = validateRequest(execution, "mso-request-id")
 			String requestType = jsonUtil.getJsonRootProperty(request)
 			execution.setVariable(prefix + 'requestType', requestType)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType, isDebugLogEnabled)
-			utils.logAudit('SDNCAdapterRestV1, request: ' + request)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType)
 
 			// Determine the SDNCAdapter endpoint
 
-			String sdncAdapterEndpoint = execution.getVariable("URN_mso_adapters_sdnc_rest_endpoint")
+			String sdncAdapterEndpoint = UrnPropertiesReader.getVariable("mso.adapters.sdnc.rest.endpoint", execution)
 
 			if (sdncAdapterEndpoint == null || sdncAdapterEndpoint.isEmpty()) {
 				String msg = getProcessKey(execution) + ': mso:adapters:sdnc:rest:endpoint URN mapping is not defined'
-				logDebug(msg, isDebugLogEnabled)
-				logError(msg)
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 			}
 
@@ -73,13 +99,13 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 
 				if (sdncRequestId == null || sdncRequestId.isEmpty()) {
 					String msg = getProcessKey(execution) + ': no sdncRequestId in ' + requestType
-					logDebug(msg, isDebugLogEnabled)
-					logError(msg)
+					msoLogger.debug(msg)
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 				}
 
 				execution.setVariable('SDNCAResponse_CORRELATOR', sdncRequestId)
-				logDebug(getProcessKey(execution) + ': SDNCAResponse_CORRELATOR = ' + sdncRequestId, isDebugLogEnabled)
+				msoLogger.debug(getProcessKey(execution) + ': SDNCAResponse_CORRELATOR = ' + sdncRequestId)
 
 				// Get the bpNotificationUrl from the request (just to make sure it's there)
 
@@ -87,44 +113,45 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 
 				if (bpNotificationUrl == null || bpNotificationUrl.isEmpty()) {
 					String msg = getProcessKey(execution) + ': no bpNotificationUrl in ' + requestType
-					logDebug(msg, isDebugLogEnabled)
-					logError(msg)
+					msoLogger.debug(msg)
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 				}
 
 				sdncAdapterMethod = 'POST'
-				sdncAdapterUrl = sdncAdapterEndpoint + '/services'
+				sdncAdapterUrl = sdncAdapterEndpoint
+
+				RollbackData rollbackData = new RollbackData()
+				rollbackData.setRequestId(sdncRequestId)
+				rollbackData.getAdditionalData().put("service", jsonUtil.getJsonValue(request, requestType + ".sdncService"))
+				rollbackData.getAdditionalData().put("operation", jsonUtil.getJsonValue(request, requestType + ".sdncOperation"))
+				execution.setVariable("RollbackData", rollbackData)
 
 			} else {
 				String msg = getProcessKey(execution) + ': Unsupported request type: ' + requestType
-				logDebug(msg, isDebugLogEnabled)
-				logError(msg)
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 			}
 
 			execution.setVariable(prefix + 'sdncAdapterMethod', sdncAdapterMethod)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterMethod = ' + sdncAdapterMethod, isDebugLogEnabled)
 			execution.setVariable(prefix + 'sdncAdapterUrl', sdncAdapterUrl)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterUrl = ' + sdncAdapterUrl, isDebugLogEnabled)
 			execution.setVariable(prefix + 'sdncAdapterRequest', sdncAdapterRequest)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterRequest = \n' + sdncAdapterRequest, isDebugLogEnabled)
 
 			// Get the Basic Auth credentials for the SDNCAdapter (yes... we ARE using the PO adapters credentials)
 
-			String basicAuthValue = execution.getVariable("URN_mso_adapters_po_auth")
+			String basicAuthValue = UrnPropertiesReader.getVariable("mso.adapters.po.auth", execution)
 
 			if (basicAuthValue == null || basicAuthValue.isEmpty()) {
-				logDebug(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined", isDebugLogEnabled)
-				logError(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined")
+				msoLogger.debug(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined")
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			} else {
-				logDebug(getProcessKey(execution) + ": Obtained BasicAuth credentials for SDNCAdapter:" +
-					basicAuthValue, isDebugLogEnabled)
 				try {
-					def encodedString = utils.getBasicAuth(basicAuthValue, execution.getVariable("URN_mso_msoKey"))
+					def encodedString = utils.getBasicAuth(basicAuthValue, UrnPropertiesReader.getVariable("mso.msoKey", execution))
 					execution.setVariable(prefix + 'basicAuthHeaderValue', encodedString)
 				} catch (IOException ex) {
-					logDebug(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter", isDebugLogEnabled)
-					logError(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter")
+					msoLogger.debug(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter")
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				}
 			}
 
@@ -133,18 +160,28 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 
 			String timeout = jsonUtil.getJsonValue(request, requestType + ".bpTimeout")
 
-			if (timeout == null || timeout.isEmpty()) {
-				timeout = execution.getVariable("URN_mso_sdnc_timeout")
+			// in addition to null/empty, also need to verify that the timer value is a valid duration "P[n]T[n]H|M|S"
+			String timerRegex = "PT[0-9]+[HMS]";
+			if (timeout == null || timeout.isEmpty() || !timeout.matches(timerRegex)) {
+				msoLogger.debug(getProcessKey(execution) + ': preProcessRequest(): null/empty/invalid bpTimeout value. Using "mso.adapters.sdnc.timeout"')
+				timeout = UrnPropertiesReader.getVariable("mso.adapters.sdnc.timeout", execution)
+			}
+
+			// the timeout could still be null at this point if the config parm is missing/undefined
+			// forced to log (so OPs can fix the config) and temporarily use a hard coded value of 10 seconds
+			if (timeout == null) {
+				msoLogger.warnSimple('preProcessRequest()', 'property "mso.adapters.sdnc.timeout" is missing/undefined. Using "PT10S"')
+				timeout = "PT10S"
 			}
 
 			execution.setVariable(prefix + 'timeout', timeout)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'timeout = ' + timeout, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'timeout = ' + timeout)
 		} catch (BpmnError e) {
 			throw e
 		} catch (Exception e) {
 			String msg = 'Caught exception in ' + method + ": " + e
-			logDebug(msg, isDebugLogEnabled)
-			logError(msg)
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 		}
 	}
@@ -156,21 +193,24 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		def method = getClass().getSimpleName() + '.sendRequestToSDNCAdapter(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		String prefix = execution.getVariable('prefix')
 
 		try {
 			String sdncAdapterMethod = execution.getVariable(prefix + 'sdncAdapterMethod')
+			msoLogger.debug("SDNC Method is: " + sdncAdapterMethod)
 			String sdncAdapterUrl = execution.getVariable(prefix + 'sdncAdapterUrl')
+			msoLogger.debug("SDNC Url is: " + sdncAdapterUrl)
 			String sdncAdapterRequest = execution.getVariable(prefix + 'sdncAdapterRequest')
-			utils.logAudit("Outgoing SDNC Rest Request is: " + sdncAdapterRequest)
+			msoLogger.debug("SDNC Rest Request is: " + sdncAdapterRequest)
 
 			RESTConfig config = new RESTConfig(sdncAdapterUrl)
 			RESTClient client = new RESTClient(config).
-				addHeader("Content-Type", "application/json").
-				addAuthorizationHeader(execution.getVariable(prefix + "basicAuthHeaderValue"))
+				addHeader("Content-Type", "application/json")
+					.addHeader("mso-request-id",execution.getVariable("mso-request-id"))
+					.addHeader("mso-service-instance-id",execution.getVariable("mso-service-instance-id"))
+					.addAuthorizationHeader(execution.getVariable(prefix + "basicAuthHeaderValue"))
 
 			APIResponse response
 
@@ -184,8 +224,8 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 				response = client.httpDelete(sdncAdapterRequest)
 			} else {
 				String msg = 'Unsupported HTTP method "' + sdncAdapterMethod + '" in ' + method + ": " + e
-				logDebug(msg, isDebugLogEnabled)
-				logError(msg)
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 			}
 
@@ -195,8 +235,8 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 			throw e
 		} catch (Exception e) {
 			String msg = 'Caught exception in ' + method + ": " + e
-			logDebug(msg, isDebugLogEnabled)
-			logError(msg)
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 		}
 	}
@@ -208,16 +248,16 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		def method = getClass().getSimpleName() + '.processCallback(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		String prefix = execution.getVariable('prefix')
 		String callback = execution.getVariable('SDNCAResponse_MESSAGE')
-		utils.logAudit("Incoming SDNC Rest Callback is: " + callback)
+		String requestId = execution.getVariable("mso-request-id");
+		String serviceInstanceId = execution.getVariable("mso-service-instance-id")
+		utils.logContext(requestId, serviceInstanceId)
+		msoLogger.debug("Incoming SDNC Rest Callback is: " + callback)
 
 		try {
-			logDebug(getProcessKey(execution) + ": received callback:\n" + callback, isDebugLogEnabled)
-
 			int callbackNumber = 1
 			while (execution.getVariable(prefix + 'callback' + callbackNumber) != null) {
 				++callbackNumber
@@ -243,7 +283,7 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		} catch (Exception e) {
 			callback = callback == null || String.valueOf(callback).isEmpty() ? "NONE" : callback
 			String msg = "Received error from SDNCAdapter: " + callback
-			logDebug(getProcessKey(execution) + ': ' + msg, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + msg)
 			exceptionUtil.buildWorkflowException(execution, 5300, msg)
 		}
 	}
@@ -286,8 +326,7 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		def method = getClass().getSimpleName() + '.getLastCallback(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		String prefix = execution.getVariable('prefix')
 
@@ -309,8 +348,8 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 			return callback
 		} catch (Exception e) {
 			String msg = 'Caught exception in ' + method + ": " + e
-			logDebug(msg, isDebugLogEnabled)
-			logError(msg)
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 		}
 	}
@@ -322,21 +361,20 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
 		def method = getClass().getSimpleName() + '.setTimeoutValue(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		String prefix = execution.getVariable('prefix')
 
 		try {
-			def timeoutValue = execution.getVariable("URN_mso_sdnc_timeout")
+			def timeoutValue = UrnPropertiesReader.getVariable("mso.adapters.sdnc.timeout", execution)
 
 			if (execution.getVariable(prefix + 'callback1') != null) {
 				// Waiting for subsequent notifications
 			}
 		} catch (Exception e) {
 			String msg = 'Caught exception in ' + method + ": " + e
-			logDebug(msg, isDebugLogEnabled)
-			logError(msg)
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 		}
 	}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterRestV2.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV2.groovy
index f4a7f055bd..967b9fa93f 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterRestV2.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV2.groovy
@@ -1,4 +1,24 @@
-package org.openecomp.mso.bpmn.common.scripts
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
 
 import java.text.SimpleDateFormat
 import java.net.URLEncoder
@@ -12,17 +32,24 @@ import groovy.json.*
 
 import org.json.JSONObject
 
-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.rest.RESTClient
-import org.openecomp.mso.rest.RESTConfig
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
 
 /**
  * This version of SDNCAdapterRest allows for interim notifications to be sent for
  * any non-final response received from SDNC.
  */
 class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapterRestV2.class);
+
 
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
 	JsonUtils jsonUtil = new JsonUtils()
@@ -34,8 +61,7 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 		def method = getClass().getSimpleName() + '.preProcessRequest(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		def prefix="SDNCREST_"
 		execution.setVariable("prefix", prefix)
@@ -47,17 +73,17 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 			String request = validateRequest(execution, "mso-request-id")
 			String requestType = jsonUtil.getJsonRootProperty(request)
 			execution.setVariable(prefix + 'requestType', requestType)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType, isDebugLogEnabled)
-			utils.logAudit('SDNCAdapterRestV2, request: ' + request)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType)
+			msoLogger.debug('SDNCAdapterRestV2, request: ' + request)
 
 			// Determine the SDNCAdapter endpoint
 
-			String sdncAdapterEndpoint = execution.getVariable("URN_mso_adapters_sdnc_rest_endpoint")
+			String sdncAdapterEndpoint = UrnPropertiesReader.getVariable("mso.adapters.sdnc.rest.endpoint",execution)
 
 			if (sdncAdapterEndpoint == null || sdncAdapterEndpoint.isEmpty()) {
 				String msg = getProcessKey(execution) + ': mso:adapters:sdnc:rest:endpoint URN mapping is not defined'
-				logDebug(msg, isDebugLogEnabled)
-				logError(msg)
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 			}
 
@@ -76,13 +102,13 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 
 				if (sdncRequestId == null || sdncRequestId.isEmpty()) {
 					String msg = getProcessKey(execution) + ': no sdncRequestId in ' + requestType
-					logDebug(msg, isDebugLogEnabled)
-					logError(msg)
+					msoLogger.debug(msg)
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 				}
 
 				execution.setVariable('SDNCAResponse_CORRELATOR', sdncRequestId)
-				logDebug(getProcessKey(execution) + ': SDNCAResponse_CORRELATOR = ' + sdncRequestId, isDebugLogEnabled)
+				msoLogger.debug(getProcessKey(execution) + ': SDNCAResponse_CORRELATOR = ' + sdncRequestId)
 
 				// Get the bpNotificationUrl from the request (just to make sure it's there)
 
@@ -90,44 +116,42 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 
 				if (bpNotificationUrl == null || bpNotificationUrl.isEmpty()) {
 					String msg = getProcessKey(execution) + ': no bpNotificationUrl in ' + requestType
-					logDebug(msg, isDebugLogEnabled)
-					logError(msg)
+					msoLogger.debug(msg)
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 				}
 
 				sdncAdapterMethod = 'POST'
-				sdncAdapterUrl = sdncAdapterEndpoint + '/services'
+				sdncAdapterUrl = sdncAdapterEndpoint
 
 			} else {
 				String msg = getProcessKey(execution) + ': Unsupported request type: ' + requestType
-				logDebug(msg, isDebugLogEnabled)
-				logError(msg)
+				msoLogger.debug(msg)
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 			}
 
 			execution.setVariable(prefix + 'sdncAdapterMethod', sdncAdapterMethod)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterMethod = ' + sdncAdapterMethod, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterMethod = ' + sdncAdapterMethod)
 			execution.setVariable(prefix + 'sdncAdapterUrl', sdncAdapterUrl)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterUrl = ' + sdncAdapterUrl, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterUrl = ' + sdncAdapterUrl)
 			execution.setVariable(prefix + 'sdncAdapterRequest', sdncAdapterRequest)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterRequest = \n' + sdncAdapterRequest, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'sdncAdapterRequest = \n' + sdncAdapterRequest)
 
 			// Get the Basic Auth credentials for the SDNCAdapter (yes... we ARE using the PO adapters credentials)
 
-			String basicAuthValue = execution.getVariable("URN_mso_adapters_po_auth")
+			String basicAuthValue = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
 
 			if (basicAuthValue == null || basicAuthValue.isEmpty()) {
-				logDebug(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined", isDebugLogEnabled)
-				logError(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined")
+				msoLogger.debug(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined")
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			} else {
-				logDebug(getProcessKey(execution) + ": Obtained BasicAuth credentials for SDNCAdapter:" +
-					basicAuthValue, isDebugLogEnabled)
 				try {
-					def encodedString = utils.getBasicAuth(basicAuthValue, execution.getVariable("URN_mso_msoKey"))
+					def encodedString = utils.getBasicAuth(basicAuthValue, UrnPropertiesReader.getVariable("mso.msoKey", execution))
 					execution.setVariable(prefix + 'basicAuthHeaderValue', encodedString)
 				} catch (IOException ex) {
-					logDebug(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter", isDebugLogEnabled)
-					logError(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter")
+					msoLogger.debug(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter")
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": Unable to encode BasicAuth credentials for SDNCAdapter", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 				}
 			}
 
@@ -136,18 +160,28 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 
 			String timeout = jsonUtil.getJsonValue(request, requestType + ".bpTimeout")
 
-			if (timeout == null || timeout.isEmpty()) {
-				timeout = execution.getVariable("URN_mso_sdnc_timeout")
+			// in addition to null/empty, also need to verify that the timer value is a valid duration "P[n]T[n]H|M|S"
+			String timerRegex = "PT[0-9]+[HMS]";
+			if (timeout == null || timeout.isEmpty() || !timeout.matches(timerRegex)) {
+				msoLogger.debug(getProcessKey(execution) + ': preProcessRequest(): null/empty/invalid bpTimeout value. Using "mso.adapters.sdnc.timeout"')
+				timeout = UrnPropertiesReader.getVariable("mso.adapters.sdnc.timeout", execution)
+			}
+
+			// the timeout could still be null at this point if the config parm is missing/undefined
+			// forced to log (so OPs can fix the config) and temporarily use a hard coded value of 10 seconds
+			if (timeout == null) {
+				msoLogger.warnSimple('preProcessRequest()', 'property "mso.adapters.sdnc.timeout" is missing/undefined. Using "PT10S"')
+				timeout = "PT10S"
 			}
 
 			execution.setVariable(prefix + 'timeout', timeout)
-			logDebug(getProcessKey(execution) + ': ' + prefix + 'timeout = ' + timeout, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'timeout = ' + timeout)
 		} catch (BpmnError e) {
 			throw e
 		} catch (Exception e) {
 			String msg = 'Caught exception in ' + method + ": " + e
-			logDebug(msg, isDebugLogEnabled)
-			logError(msg)
+			msoLogger.debug(msg)
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
 			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
 		}
 	}
@@ -159,15 +193,14 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 		def method = getClass().getSimpleName() + '.processCallback(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 
 		String prefix = execution.getVariable('prefix')
 		String callback = execution.getVariable('SDNCAResponse_MESSAGE')
-		utils.logAudit("Incoming SDNC Rest Callback is: " + callback)
+		msoLogger.debug("Incoming SDNC Rest Callback is: " + callback)
 
 		try {
-			logDebug(getProcessKey(execution) + ": received callback:\n" + callback, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ": received callback:\n" + callback)
 
 			int callbackNumber = 1
 			while (execution.getVariable(prefix + 'callback' + callbackNumber) != null) {
@@ -206,7 +239,7 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 		} catch (Exception e) {
 			callback = callback == null || String.valueOf(callback).isEmpty() ? "NONE" : callback
 			String msg = "Received error from SDNCAdapter: " + callback
-			logDebug(getProcessKey(execution) + ': ' + msg, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + msg)
 			exceptionUtil.buildWorkflowException(execution, 5300, msg)
 		}
 	}
@@ -220,15 +253,14 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 		def method = getClass().getSimpleName() + '.prepareInterimNotification(' +
 			'execution=' + execution.getId() +
 			')'
-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
-		logDebug('Entered ' + method, isDebugLogEnabled)
+		msoLogger.trace('Entered ' + method)
 		
 		String prefix = execution.getVariable('prefix')
-		utils.logAudit("Preparing Interim Notification")
+		msoLogger.debug("Preparing Interim Notification")
 
 		try {
 			def interimNotification = execution.getVariable(prefix + "interimNotification")
-			logDebug("Preparing Interim Notification:\n" + JsonUtils.prettyJson(interimNotification), isDebugLogEnabled)
+			msoLogger.debug("Preparing Interim Notification:\n" + JsonUtils.prettyJson(interimNotification))
 			
 			for (int i = 0; ; i++) {
 				def variable = JsonUtils.getJsonParamValue(interimNotification, 'variableList', 'variable', i)
@@ -241,13 +273,13 @@ class SDNCAdapterRestV2 extends SDNCAdapterRestV1 {
 				if ((variableName != null) && !variableName.isEmpty()) {
 					def variableValue = JsonUtils.getJsonValue(variable, "value")
 					execution.setVariable(variableName, variableValue)
-					logDebug("Setting "+ variableName + "=" + variableValue, isDebugLogEnabled)
+					msoLogger.debug("Setting "+ variableName + "=" + variableValue)
 				}
 			}
 			
 		} catch (Exception e) {
 			String msg = "Error preparing interim notification"
-			logDebug(getProcessKey(execution) + ': ' + msg, isDebugLogEnabled)
+			msoLogger.debug(getProcessKey(execution) + ': ' + msg)
 			exceptionUtil.buildWorkflowException(execution, 5300, msg)
 		}
 	}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
index 7aa7b200f3..ba450c1b12 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -1,1043 +1,1024 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-

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

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.springframework.web.util.UriUtils

-

-

-/**

- * @version 1.0

- *

- */

-class SDNCAdapterUtils {

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-

-	private AbstractServiceTaskProcessor taskProcessor

-

-	public SDNCAdapterUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-	}

-

-	String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {

-

-		def utils=new MsoUtils()

-

-		def prefix = execution.getVariable('prefix')

-		def request = taskProcessor.getVariable(execution, requestName)

-		def requestInformation = utils.getNodeXml(request, 'request-information', false)

-		def serviceInformation = utils.getNodeXml(request, 'service-information', false)

-		def featureInformation = utils.getNodeXml(request, 'feature-information', false)

-		def featureParameters = utils.getNodeXml(request, 'feature-parameters', false)

-

-		def requestId = execution.getVariable('testReqId') // for junits

-		if(requestId==null){

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

-		}

-

-		def svcInstanceId = execution.getVariable("mso-service-instance-id")

-

-		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)

-		def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)

-		def nnsFeatureInformation = utils.removeXmlNamespaces(featureInformation)

-		def nnsFeatureParameters = utils.removeXmlNamespaces(featureParameters)

-

-		String sdncAdapterFeatureRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>${serviceOperation}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-						${nnsRequestInformation}

-						${nnsServiceInformation}

-						${nnsFeatureInformation}

-						${nnsFeatureParameters}

-					</sdncadapterworkflow:SDNCRequestData>

-					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${timeoutValueInMinutes}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-		sdncAdapterFeatureRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterFeatureRequest))

-		return sdncAdapterFeatureRequest

-	}

-

-	String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {

-

-		def utils=new MsoUtils()

-

-		def prefix = execution.getVariable('prefix')

-		def request = taskProcessor.getVariable(execution, prefix+'Request')

-		def requestInformation = utils.getNodeXml(request, 'request-information', false)

-		def serviceInformation = utils.getNodeXml(request, 'service-information', false)

-		def vnfInformationList = utils.getNodeXml(request, 'vnf-information-list', false)

-

-		def requestId = execution.getVariable('testReqId') // for junits

-		if(requestId==null){

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

-		}

-

-		def svcInstanceId = execution.getVariable("mso-service-instance-id")

-

-		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)

-		def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)

-		def nnsVnfInformationList = utils.removeXmlNamespaces(vnfInformationList)

-

-		String sdncAdapterActivateVnfRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>${serviceOperation}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

-						<sdncadapter:MsoAction>${msoAction}</sdncadapter:MsoAction>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-						${nnsRequestInformation}

-						${nnsServiceInformation}

-						${nnsVnfInformationList}

-					</sdncadapterworkflow:SDNCRequestData>

-					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${timeoutValueInMinutes}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-		sdncAdapterActivateVnfRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterActivateVnfRequest))

-		return sdncAdapterActivateVnfRequest

-	}

-

-	String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {

-

-		def utils=new MsoUtils()

-

-		def prefix = execution.getVariable('prefix')

-		def request = taskProcessor.getVariable(execution, prefix+'Request')

-

-		def requestInformation = """<request-information>

-										<request-id>${execution.getVariable("mso-request-id")}</request-id>

-										<request-action>torepl</request-action>

-										<source>${execution.getVariable(prefix+"source")}</source>

-										<notification-url>${execution.getVariable(prefix+"notificationUrl")}</notification-url>

-									</request-information>"""

-

-		// Change the value of the 'request-information'.'request-action' element

-		def xml = new XmlSlurper().parseText(requestInformation)

-		if("assign".equalsIgnoreCase(action)){

-			xml.'request-action'.replaceBody('createTrinityBonding')

-		}else if("activate".equalsIgnoreCase(action)){

-			xml.'request-action'.replaceBody('activateTrinityBonding')

-		}else if("delete".equalsIgnoreCase(action)){

-			xml.'request-action'.replaceBody('deleteTrinityBonding')

-		}

-		requestInformation = utils.removeXmlPreamble(groovy.xml.XmlUtil.serialize(xml))

-		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)

-

-		def requestId = execution.getVariable('testReqId') // for junits

-		if(requestId==null){

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

-		}

-

-		def svcInstanceId = execution.getVariable("mso-service-instance-id")

-

-		//Build Service Information

-		// Send serviceName from CANOPI to sdnc for service-type

-		def serviceInformation = """<service-information>

-									      <service-type>${execution.getVariable(prefix+"serviceName")}</service-type>

-									      <service-instance-id>${svcInstanceId}</service-instance-id>

-									      <subscriber-name>${execution.getVariable(prefix+"subscriberName")}</subscriber-name>

-									      <subscriber-global-id>${execution.getVariable(prefix+"subscriberGlobalId")}</subscriber-global-id>

-									</service-information>"""

-

-		//Build Additional Information - vpn or vni

-		// Send serviceType from CANOPI to SDNC for nbnc-request-information service-type

-		def service = execution.getVariable(prefix+"serviceType")

-		def customerId = execution.getVariable(prefix+"customerId")

-		def vpnId = execution.getVariable(prefix+"vpnId")

-		def vpnRt = execution.getVariable(prefix+"vpnRt")

-		def vpnService = execution.getVariable(prefix+"vpnService")

-		def vpnRegion = execution.getVariable(prefix+"vpnRegion")

-		def additionalInfo = ""

-		if("assign".equalsIgnoreCase(action)){

-			additionalInfo = """<vpn-data-list>

-									<vpn-id>${vpnId}</vpn-id>

-									<vpn-rt>${vpnRt}</vpn-rt>

-									<vpn-service>${vpnService}</vpn-service>

-									<vpn-region>${vpnRegion}</vpn-region>

-							 	</vpn-data-list>"""

-		}else if("activate".equalsIgnoreCase(action) || "delete".equalsIgnoreCase(action)){

-			def vniId = execution.getVariable(prefix+'vniId')

-			additionalInfo = "<vni-id>${vniId}</vni-id>"

-		}

-

-		//Set Interface Status

-		def interfaceStatus = "DISABLE"

-		if("activate".equalsIgnoreCase(action)){

-			interfaceStatus = "ENABLE"

-		}

-

-		//Build SDNC Adapter Request

-		String sdncAdapterL3ToHLRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>${serviceOperation}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-						${nnsRequestInformation}

-						${serviceInformation}

-		                <nbnc-request-information>

-							<service-type>${service}</service-type>

-							<customer-id>${customerId}</customer-id>

-							<interface-status>${interfaceStatus}</interface-status>

-							${additionalInfo}

-						</nbnc-request-information>

-					</sdncadapterworkflow:SDNCRequestData>

-					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${timeoutValueInMinutes}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-		sdncAdapterL3ToHLRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterL3ToHLRequest))

-

-		return sdncAdapterL3ToHLRequest

-	}

-

-

-

-	private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,

-

-			String svcOperation, String additionalData) {

-			def utils=new MsoUtils()

-

-			def prefix = execution.getVariable('prefix')

-			def request = taskProcessor.getVariable(execution, prefix+'Request')

-			def requestInformation = utils.getNodeXml(request, 'request-information', false)

-			def serviceInformation = utils.getNodeXml(request, 'service-information', false)

-			def serviceParameters = utils.getNodeXml(request, 'service-parameters', false)

-

-			def requestId = execution.getVariable('testReqId') // for junits

-			if(requestId==null){

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

-			}

-

-			def svcInstanceId = execution.getVariable("mso-service-instance-id")

-			def msoAction = 'gammainternet'

-

-			def timeoutInMinutes = execution.getVariable('URN_mso_sdnc_timeout_firewall_minutes')

-

-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			if (callbackUrl == null || callbackUrl.trim() == "") {

-				logError('mso:workflow:sdncadapter:callback URN is not set')

-				workflowException(execution, 'Internal Error', 9999) // TODO: what message and error code?

-			}

-

-			def l2HomingInformation = utils.getNodeXml(serviceParameters, 'l2-homing-information', false)

-			def internetEvcAccessInformation = utils.getNodeXml(serviceParameters, 'internet-evc-access-information', false)

-			def vrLan = utils.getNodeXml(serviceParameters, 'vr-lan', false)

-			def upceVmsServiceInformation = utils.getNodeXml(serviceParameters, 'ucpe-vms-service-information', false)

-

-

-			def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)

-			def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)

-			def nnsl2HomingInformation = utils.removeXmlNamespaces(l2HomingInformation)

-			def nnsInternetEvcAccessInformation = utils.removeXmlNamespaces(internetEvcAccessInformation)

-			def nnsVrLan = utils.removeXmlNamespaces(vrLan)

-			def nnsUpceVmsServiceInformation = utils.removeXmlNamespaces(upceVmsServiceInformation)

-

-			if (additionalData == null) {

-				additionalData = ""

-			}

-

-			boolean isAic3 = execution.getVariable("isAic3")

-			

-			if(isAic3) {

-				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC3.0")

-			}

-			else {

-				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC2.X")

-			}

-									

-			String content = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>${svcAction}</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>${svcOperation}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

-						<sdncadapter:MsoAction>${msoAction}</sdncadapter:MsoAction>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-						${additionalData}

-						${nnsRequestInformation}

-						${nnsServiceInformation}

-						${nnsl2HomingInformation}

-						${nnsInternetEvcAccessInformation}

-						${nnsVrLan}

-						${nnsUpceVmsServiceInformation}

-					</sdncadapterworkflow:SDNCRequestData>

-						<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${timeoutInMinutes}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-

-			content = utils.removeXmlPreamble(utils.formatXML(content))

-			execution.setVariable(resultVar, content)

-	}

-

-	/**

-	 * Builds an SDNC "reserve" request and stores it in the specified execution

-	 * variable. 

-	 * @param execution the execution

-	 * @param action the type of action: reserve, turnup, etc

-	 * @param resultVar the execution variable in which the result will be stored

-	 */

-	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar) {

-		sdncReservePrep(execution, action, resultVar, false)

-	}

-

-	/**

-	 * Builds an SDNC "reserve" request and stores it in the specified execution

-	 * variable.

-	 * @param execution the execution

-	 * @param action the type of action: reserve, turnup, etc

-	 * @param resultVar the execution variable in which the result will be stored

-	 * @param isAic3 boolean to indicate whether request is for AIC3.0

-	 */

-	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {

-

-		sdncPrep(execution, resultVar, action , 'service-configuration-operation', null, isAic3, this.taskProcessor)

-	}

-

-	/**

-	 * Builds a basic SDNC 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

-	 * @param svcAction the svcAction element value

-	 * @param svcOperation the svcOperation element value

-	 * @param additionalData additional XML content to be inserted into the

-	 *        RequestData element (may be null)

-	 */

-	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,

-		String svcOperation, String additionalData, AbstractServiceTaskProcessor taskProcessor) {

-		sdncPrep(execution, resultVar, svcAction, svcOperation, additionalData, false, taskProcessor)

-	}

-

-	/**

-	 * Builds a basic SDNC 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

-	 * @param svcAction the svcAction element value

-	 * @param svcOperation the svcOperation element value

-	 * @param additionalData additional XML content to be inserted into the RequestData element (may be null)

-	 * @param isAic3 boolean to indicate whether request is for AIC3.0

-	 */

-	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,

-

-			String svcOperation, String additionalData, boolean isAic3, AbstractServiceTaskProcessor taskProcessor) {

-		def method = getClass().getSimpleName() + '.sdncPrep(' +

-			'execution=' + execution.getId() +

-			', resultVar=' + resultVar +

-			', svcAction=' + svcAction +

-			', svcOperation=' + svcOperation +

-			', additionalData=' + (additionalData == null ? "no" : "yes") +

-			')'

-

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

-		taskProcessor.logDebug('Entered ' + method, isDebugLogEnabled)

-		MsoUtils utils = taskProcessor.utils

-		try {

-			def prefix = execution.getVariable('prefix')

-			def request = taskProcessor.getVariable(execution, prefix+'Request')

-			def requestInformation = utils.getNodeXml(request, 'request-information', false)

-			def serviceInformation = utils.getNodeXml(request, 'service-information', false)

-			def serviceParameters = utils.getChildNodes(request, 'service-parameters')

-			def requestAction = utils.getNodeText1(request, 'request-action')

-

-			def timeoutInMinutes = execution.getVariable('URN_mso_sdnc_timeout_firewall_minutes')

-

-			def requestId = execution.getVariable('testReqId') // for junits

-			if(requestId==null){

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

-			}

-

-			def svcInstanceId = execution.getVariable("mso-service-instance-id")

-			def msoAction = 'gammainternet'

-

-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			if (callbackUrl == null || callbackUrl.trim() == "") {

-				taskProcessor.logError('mso:workflow:sdncadapter:callback URN is not set')

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - During PreProcess Request")

-			}

-

-			def l2HomingInformation = utils.getNodeXml(request, 'l2-homing-information', false)

-			def internetEvcAccessInformation = utils.getNodeXml(request, 'internet-evc-access-information', false)

-			def vrLan = utils.getNodeXml(request, 'vr-lan', false)

-			def upceVmsServiceInfo = utils.getNodeXml(request, 'ucpe-vms-service-information', false)

-			def vnfInformationList = utils.getNodeXml(request, 'vnf-information-list', false)

-

-			def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)

-			def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)

-			def nnsl2HomingInformation = utils.removeXmlNamespaces(l2HomingInformation)

-			def nnsInternetEvcAccessInformation = utils.removeXmlNamespaces(internetEvcAccessInformation)

-			def nnsVrLan = utils.removeXmlNamespaces(vrLan)

-			def nnsUpceVmsServiceInfo = utils.removeXmlNamespaces(upceVmsServiceInfo)

-			def nnsVnfInformationList = utils.removeXmlNamespaces(vrLan)

-			def nnsinternetSvcChangeDetails = ""

-

-			if(requestAction!=null && requestAction.equals("ChangeLayer3ServiceProvRequest")){

-				def internetSvcChangeDetails = utils.removeXmlNamespaces(serviceParameters)

-				nnsinternetSvcChangeDetails = """<internet-service-change-details>

-							${internetSvcChangeDetails}

-						</internet-service-change-details>"""

-			}

-

-			if (additionalData == null) {

-				additionalData = ""

-			}

-			

-			if(isAic3) {

-				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC3.0")

-			}

-			else {

-				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC2.X")

-			}

-

-

-			String content = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>${svcAction}</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>${svcOperation}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

-						<sdncadapter:MsoAction>${msoAction}</sdncadapter:MsoAction>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-						${additionalData}

-						${nnsRequestInformation}

-						${nnsServiceInformation}

-						${nnsl2HomingInformation}

-						${nnsInternetEvcAccessInformation}

-						${nnsVrLan}

-						${nnsUpceVmsServiceInfo}

-						${nnsVnfInformationList}

-						${nnsinternetSvcChangeDetails}

-					</sdncadapterworkflow:SDNCRequestData>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-

-			content = utils.removeXmlPreamble(utils.formatXML(content))

-			execution.setVariable(resultVar, content)

-			taskProcessor.logDebug(resultVar + ' = ' + System.lineSeparator() + content, isDebugLogEnabled)

-

-			taskProcessor.logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			taskProcessor.logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error")

-		}

-	}

-	

-	public String updateHomingInfo(String homingInfo, String aicVersion) {

-		String newHomingInfo

-		if(homingInfo == null || homingInfo.trim().length() == 0) {

-			newHomingInfo = "<l2-homing-information><aic-version>" + aicVersion + "</aic-version></l2-homing-information>"

-		}

-		else {

-			newHomingInfo = homingInfo.substring(0, homingInfo.indexOf("</l2-homing-information>")) + "<aic-version>" + aicVersion + "</aic-version></l2-homing-information>"

-		}

-	}

-	

-	/**

-	 * Builds a topology SDNC request and return String request.

-	 * As V2 will use 1607-style request, region instead of aic clli code

-	 * @param execution, the execution

-	 * @param requestXML, the incoming request for the flow

-	 * @param serviceInstanceId, the serviceIntance (if available)

-	 * @param callbackUrl, the call back url

-	 * @param action, the action element value

-	 * @param requestAction the svcOperation element value

-	 * @param cloudRegionId the aai's cloud-region-id

-	 * @param networkId the aai's network-id

-	 * @param additionalData additional XML content to be inserted into the

-	 *   RequestData element (may be null)

-	 */

-	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {

-

-		 def utils=new MsoUtils()

-

-		 // SNDC is expecting request Id for header as unique each call.

-		 String hdrRequestId = ""

-		 String testHdrRequestId = execution.getVariable("testMessageId")  // for test purposes.

-		 if (testHdrRequestId == null) {

-			 hdrRequestId = UUID.randomUUID()  // generate unique

-		 } else {

-			 hdrRequestId = testHdrRequestId

-		 }

-		 

-		 String requestId = ""

-		 try {

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

-		 } catch (Exception ex) {

-			 requestId = utils.getNodeText1(requestXML, "request-id")

-		 }

-

-		 String aicCloudRegion = cloudRegionId

-		 String tenantId = ""

-		 if (utils.nodeExists(requestXML, "tenant-id")) {

-			 tenantId = utils.getNodeText1(requestXML, "tenant-id")

-		 }

-		 String networkType = ""

-		 if (utils.nodeExists(requestXML, "network-type")) {

-			 networkType = utils.getNodeText1(requestXML, "network-type")

-		 }

-

-		 // Replace/Use the value of network-type from aai query (vs input) during Delete Network flows.

-		 if (queryAAIResponse != null) {

-		     networkType = utils.getNodeText1(queryAAIResponse, "network-type")

-		 }

-

-		 String serviceId = ""

-		 if (utils.nodeExists(requestXML, "service-id")) {

-			 serviceId = utils.getNodeText1(requestXML, "service-id")

-		 }

-		 String networkName = ""

-		 if (utils.nodeExists(requestXML, "network-name")) {

-			 networkName = utils.getNodeText1(requestXML, "network-name")

-		 }

-		 String source = ""

-		 if (utils.nodeExists(requestXML, "source")) {

-			 source = utils.getNodeText1(requestXML, "source")

-		 }

-

-		 // get resourceLink from subflow execution variable

-		 String serviceType = ""

-		 String subscriberName = ""

-		 String siRelatedLink = execution.getVariable("GENGSI_siResourceLink")

-		 if (siRelatedLink != null) {

-			 // get service type

-			 int serviceStart = siRelatedLink.indexOf("service-subscription/")

-			 int serviceEnd = siRelatedLink.indexOf("/service-instances/")

-			 serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)

-			 serviceType = UriUtils.decode(serviceType,"UTF-8")

-			 // get subscriber name

-			 int subscriberNameStart = siRelatedLink.indexOf("customers/customer/")

-			 int subscriberNameEnd = siRelatedLink.indexOf("/service-subscriptions/")

-		     subscriberName = siRelatedLink.substring(subscriberNameStart + 19, subscriberNameEnd)

-			 subscriberName = UriUtils.decode(subscriberName,"UTF-8")

-		 }

-

-		 String content =

-			"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-		                                  xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-		                                  xmlns:sdncadapter="http://org.openecomp.mso/workflow/sdnc/adapter/schema/v1"

-		                                  xmlns:ns5="http://org.openecomp/mso/request/types/v1">

-					   <sdncadapter:RequestHeader>

-						  <sdncadapter:RequestId>${hdrRequestId}</sdncadapter:RequestId>

-						  <sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

-						  <sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-						  <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>

-						  <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>

-					   </sdncadapter:RequestHeader>

-					   <sdncadapterworkflow:SDNCRequestData>

-					      <request-information>

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

-					            <request-action>${requestAction}</request-action>

-					            <source>${source}</source>

-					            <notification-url></notification-url>

-					            <order-number></order-number>

-					            <order-version></order-version>

-					         </request-information>

-					         <service-information>

-					            <service-id>${serviceId}</service-id>

-								<service-type>${serviceType}</service-type>

-					            <service-instance-id>${serviceInstanceId}</service-instance-id>

-					            <subscriber-name>${subscriberName}</subscriber-name>

-					         </service-information>

-					         <network-request-information>

-					            <network-id>${networkId}</network-id>

-					            <network-type>${networkType}</network-type>

-					            <network-name>${networkName}</network-name>

-					            <tenant>${tenantId}</tenant>

-					            <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

-					         </network-request-information>

-					   </sdncadapterworkflow:SDNCRequestData>

-				   </aetgt:SDNCAdapterWorkflowRequest>""".trim()

-

-			return content

-	 }

-

-	 /**

-	  * Builds a topology SDNC request and return String request.

-	  * As V2 will use 1607-style request, region instead of aic clli code

-	  * @param execution, the execution

-	  * @param requestXML, the incoming request for the flow

-	  * @param serviceInstanceId, the serviceIntance (if available)

-	  * @param callbackUrl, the call back url

-	  * @param action, the action element value

-	  * @param requestAction the svcOperation element value

-	  * @param cloudRegionId the aai's cloud-region-id

-	  * @param networkId the aai's network-id

-	  * @param additionalData additional XML content to be inserted into the

-	  *   RequestData element (may be null)

-	  */

-	  public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {

-

-		  def utils=new MsoUtils()

-

-		  // SNDC is expecting request Id for header as unique each call.

-		  String hdrRequestId = ""

-		  String testHdrRequestId = execution.getVariable("testMessageId")  // for test purposes.

-		  if (testHdrRequestId == null) {

-		      hdrRequestId = UUID.randomUUID()  // generate unique

-		  } else {

-		      hdrRequestId = testHdrRequestId

-		  }

-

-		  String requestId = ""

-		  String testRequestId = execution.getVariable("testMessageId")  // for test purposes.

-		  if (testRequestId == null) {

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

-			  if (requestId == null) {

-				  requestId = execution.getVariable("msoRequestId")

-			  }		

-		  } else {

-		  	  requestId = testRequestId

-		  }		  

-		  

-		  String aicCloudRegion = cloudRegionId

-		  String tenantId = ""

-		  if (utils.nodeExists(requestXML, "tenant-id")) {

-			  tenantId = utils.getNodeText1(requestXML, "tenant-id")

-		  }

-		  String networkType = ""

-		  if (utils.nodeExists(requestXML, "network-type")) {

-			  networkType = utils.getNodeText1(requestXML, "network-type")

-		  }

-

-		  String subscriptionServiceType = ""

-		  if (utils.nodeExists(requestXML, "subscription-service-type")) {

-			  subscriptionServiceType = utils.getNodeText1(requestXML, "subscription-service-type")

-		  }

-

-		  String globalCustomerId = ""

-		  if (utils.nodeExists(requestXML, "global-customer-id")) {

-			  globalCustomerId = utils.getNodeText1(requestXML, "global-customer-id")

-		  }

-

-		  String serviceId = ""

-		  if (utils.nodeExists(requestXML, "service-id")) {

-			  serviceId = utils.getNodeText1(requestXML, "service-id")

-		  }

-		  String networkName = ""

-		  if (utils.nodeExists(requestXML, "network-name")) {

-			  networkName = utils.getNodeText1(requestXML, "network-name")

-		  }

-		  String source = ""

-		  if (utils.nodeExists(requestXML, "source")) {

-			  source = utils.getNodeText1(requestXML, "source")

-		  }

-

-		  // get resourceLink from subflow execution variable

-		  String serviceType = ""

-		  String subscriberName = ""

-		  String siRelatedLink = execution.getVariable("GENGSI_siResourceLink")

-		  if (siRelatedLink != null) {

-			  // get service type

-			  int serviceStart = siRelatedLink.indexOf("service-subscription/")

-			  int serviceEnd = siRelatedLink.indexOf("/service-instances/")

-			  serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)

-			  serviceType = UriUtils.decode(serviceType,"UTF-8")

-			  // get subscriber name

-			  int subscriberNameStart = siRelatedLink.indexOf("customers/customer/")

-			  int subscriberNameEnd = siRelatedLink.indexOf("/service-subscriptions/")

-			  subscriberName = siRelatedLink.substring(subscriberNameStart + 19, subscriberNameEnd)

-			  subscriberName = UriUtils.decode(subscriberName,"UTF-8")

-		  }

-

-		  // network-information from 'networkModelInfo' // verify the DB Catalog response

-		  String networkModelInfo = utils.getNodeXml(requestXML, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")

-		  String modelInvariantUuid = utils.getNodeText1(networkModelInfo, "modelInvariantUuid") !=null ?

-		                              utils.getNodeText1(networkModelInfo, "modelInvariantUuid") : ""

-		  String modelCustomizationUuid = utils.getNodeText1(networkModelInfo, "modelCustomizationUuid")  !=null ?

-		                                  utils.getNodeText1(networkModelInfo, "modelCustomizationUuid")  : ""

-		  String modelUuid = utils.getNodeText1(networkModelInfo, "modelUuid") !=null ?

-		                     utils.getNodeText1(networkModelInfo, "modelUuid") : ""

-		  String modelVersion = utils.getNodeText1(networkModelInfo, "modelVersion") !=null ?

-		  	                    utils.getNodeText1(networkModelInfo, "modelVersion") : ""

-		  String modelName = utils.getNodeText1(networkModelInfo, "modelName") !=null ?

-		                     utils.getNodeText1(networkModelInfo, "modelName") : ""

-

-		 // service-information from 'networkModelInfo' // verify the DB Catalog response

-		 String serviceModelInfo = utils.getNodeXml(requestXML, "serviceModelInfo", false).replace("tag0:","").replace(":tag0","")

-		 String serviceModelInvariantUuid = utils.getNodeText1(serviceModelInfo, "modelInvariantUuid")  !=null ?

-										    utils.getNodeText1(serviceModelInfo, "modelInvariantUuid")  : ""

-		 String serviceModelUuid = utils.getNodeText1(serviceModelInfo, "modelUuid") !=null ?

-							       utils.getNodeText1(serviceModelInfo, "modelUuid") : ""

-		 String serviceModelVersion = utils.getNodeText1(serviceModelInfo, "modelVersion") !=null ?

-							          utils.getNodeText1(serviceModelInfo, "modelVersion") : ""

-		 String serviceModelName = utils.getNodeText1(serviceModelInfo, "modelName") !=null ?

-						           utils.getNodeText1(serviceModelInfo, "modelName") : ""

-

-

-		  String content =

-		  """<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-   				                                    xmlns:sdncadapter="http://org.openecomp.mso/workflow/sdnc/adapter/schema/v1" 

-                                                    xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-					   <sdncadapter:RequestHeader>

-						  <sdncadapter:RequestId>${hdrRequestId}</sdncadapter:RequestId>

-						  <sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

-						  <sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-						  <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>

-						  <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>

-                          <sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>

-					   </sdncadapter:RequestHeader>

-   					   <sdncadapterworkflow:SDNCRequestData>

-						   <request-information>

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

-						      <request-action>${requestAction}</request-action>

-						      <source>${source}</source>

-						      <notification-url></notification-url>

-						      <order-number></order-number>

-						      <order-version></order-version>

-						   </request-information>

-						   <service-information>

-						      <service-id>${serviceId}</service-id>

-						      <subscription-service-type>${subscriptionServiceType}</subscription-service-type>

-							  <onap-model-information>

-								   <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>

-								   <model-uuid>${serviceModelUuid}</model-uuid>

-								   <model-version>${serviceModelVersion}</model-version>

-								   <model-name>${serviceModelName}</model-name>

-                              </onap-model-information>

-						      <service-instance-id>${serviceInstanceId}</service-instance-id>

-						      <global-customer-id>${globalCustomerId}</global-customer-id>

-						      <subscriber-name>${subscriberName}</subscriber-name>

-						   </service-information>

-						   <network-information>

-						      <network-id>${networkId}</network-id>

-						      <network-type>${networkType}</network-type>

-							  <onap-model-information>

-								   <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>

-								   <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>

-								   <model-uuid>${modelUuid}</model-uuid>

-								   <model-version>${modelVersion}</model-version>

-								   <model-name>${modelName}</model-name>

-							  </onap-model-information>

-						   </network-information>

-						   <network-request-input>

-						     <network-name>${networkName}</network-name>

-					         <tenant>${tenantId}</tenant>

-						     <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

-						     <aic-clli></aic-clli>

-						     <network-input-parameters/>

-						   </network-request-input>

-				      </sdncadapterworkflow:SDNCRequestData>

-                   </aetgt:SDNCAdapterWorkflowRequest>""".trim()

-

-			 return content

-	  }

-

-			/**

-			 * Validates a workflow response.

-			 * @param execution the execution

-			 * @param responseVar the execution variable in which the response is stored

-			 * @param workflowException the WorkflowException Object returned from sdnc call

-			 */

-	public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){

-

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

-		taskProcessor.utils.log("DEBUG", "SDNC Response is: " + response, isDebugLogEnabled)

-		taskProcessor.utils.log("DEBUG", "SuccessIndicator is: " + successIndicator, isDebugLogEnabled)

-

-		try {

-			def prefix = execution.getVariable('prefix')

-			execution.setVariable(prefix+'sdncResponseSuccess', false)

-			taskProcessor.utils.log("DEBUG", "Response" + ' = ' + (response == null ? "" : System.lineSeparator()) + response, isDebugLogEnabled)

-

-			if (successIndicator){

-				if (response == null || response.trim().equals("")) {

-					taskProcessor.utils.log("DEBUG", response + ' is empty');

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "SDNCAdapter Workflow Response is Empty")

-				}else{

-

-					// we need to peer into the request data for error

-					def String sdncAdapterWorkflowResponse = taskProcessor.utils.getNodeXml(response, 'response-data', false)

-					def String decodedXml = decodeXML(sdncAdapterWorkflowResponse).replace('<?xml version="1.0" encoding="UTF-8"?>', "")

-

-					// change '&' to "&amp; (if present as data, ex: subscriber-name = 'FOUR SEASONS HEATING & COOLING_8310006378683'

-					decodedXml = decodedXml.replace("&", "&amp;")

-

-					taskProcessor.utils.log("DEBUG","decodedXml:\n" + decodedXml, isDebugLogEnabled)

-

-					int requestDataResponseCode = 200

-					def String requestDataResponseMessage = ''

-

-					try{

-						if (taskProcessor.utils.nodeExists(decodedXml, "response-message")) {

-							requestDataResponseMessage = taskProcessor.utils.getNodeText(decodedXml, "response-message")

-						} else if (taskProcessor.utils.nodeExists(decodedXml, "ResponseMessage")) {

-							requestDataResponseMessage = taskProcessor.utils.getNodeText(decodedXml, "ResponseMessage")

-						}

-					}catch(Exception e){

-						taskProcessor.utils.log("DEBUG", 'Error caught while decoding resposne ' + e.getMessage(), isDebugLogEnabled)

-					}

-

-					if(taskProcessor.utils.nodeExists(decodedXml, "response-code")) {

-						taskProcessor.utils.log("DEBUG","response-code node Exist ", isDebugLogEnabled)

-						String code = taskProcessor.utils.getNodeText1(decodedXml, "response-code")

-						if(code.isEmpty() || code.equals("")){

-							// if response-code is blank then Success

-							taskProcessor.utils.log("DEBUG","response-code node is empty", isDebugLogEnabled)

-							requestDataResponseCode = 0

-						}else{

-							requestDataResponseCode  = code.toInteger()

-							taskProcessor.utils.log("DEBUG","response-code is: " + requestDataResponseCode, isDebugLogEnabled)

-						}

-					}else if(taskProcessor.utils.nodeExists(decodedXml, "ResponseCode")){

-						taskProcessor.utils.log("DEBUG","ResponseCode node Exist ", isDebugLogEnabled)

-						String code = taskProcessor.utils.getNodeText1(decodedXml, "ResponseCode")

-						if(code.isEmpty() || code.equals("")){

-							// if ResponseCode blank then Success

-							taskProcessor.utils.log("DEBUG","ResponseCode node is empty", isDebugLogEnabled)

-							requestDataResponseCode = 0

-						}else{

-							requestDataResponseCode  = code.toInteger()

-							taskProcessor.utils.log("DEBUG","ResponseCode is: " + requestDataResponseCode, isDebugLogEnabled)

-						}

-					}else{

-						taskProcessor.utils.log("DEBUG","A Response Code DOES NOT Exist.", isDebugLogEnabled)

-						// if a response code does not exist then Success

-						requestDataResponseCode = 0

-					}

-					try{

-

-						execution.setVariable(prefix+'sdncRequestDataResponseCode', requestDataResponseCode.toString())

-						// if a response code is 0 or 2XX then Success

-						if ((requestDataResponseCode >= 200 && requestDataResponseCode <= 299) || requestDataResponseCode == 0) {

-							execution.setVariable(prefix+'sdncResponseSuccess', true)

-							taskProcessor.utils.log("DEBUG", "Setting sdncResponseSuccess to True ", isDebugLogEnabled)

-							taskProcessor.utils.log("DEBUG", "Exited ValidateSDNCResponse Method", isDebugLogEnabled)

-						}else{

-							ExceptionUtil exceptionUtil = new ExceptionUtil()

-							String convertedCode = exceptionUtil.MapSDNCResponseCodeToErrorCode(requestDataResponseCode.toString())

-							int convertedCodeInt = Integer.parseInt(convertedCode)

-							exceptionUtil.buildAndThrowWorkflowException(execution, convertedCodeInt, "Received error from SDN-C: " + requestDataResponseMessage)

-						}

-

-					}catch(Exception e){

-						//TODO proper handling of new, non numerical response codes in 1607 and new error handling for common API

-						requestDataResponseCode = 500

-					}

-

-					taskProcessor.utils.log("DEBUG", "SDNC callback response-code: " + requestDataResponseCode, isDebugLogEnabled)

-					taskProcessor.utils.log("DEBUG", "SDNC callback response-message: " + requestDataResponseMessage, isDebugLogEnabled)

-				}

-

-			}else {

-				taskProcessor.utils.log("DEBUG", 'SDNCAdapter Subflow did NOT complete Successfully.  SuccessIndicator is False. ')

-				if(workflowException != null){

-					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())

-				}else{

-					//TODO : what error code and error message use here

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - SDNCAdapter Subflow did NOT complete successfully.")

-				}

-			}

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			taskProcessor.utils.log("DEBUG", 'END of Validate SDNC Response', isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, 'Internal Error- Unable to validate SDNC Response ');

-		}

-	}

-

-	/**

-			 * Validates a workflow response.

-			 * @param execution the execution

-			 * @param responseVar the execution variable in which the response is stored

-			 * @param responseCodeVar the execution variable in which the response code is stored

-			 * @param errorResponseVar the execution variable in which the error response is stored

-			 */

-			public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {

-

-				def method = getClass().getSimpleName() + '.validateL3BondingSDNCResp(' +

-					'execution=' + execution.getId() +

-					', response=' + response +

-					')'

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

-				taskProcessor.logDebug('Entered ' + method, isDebugLogEnabled)

-				def prefix = execution.getVariable('prefix')

-				TrinityExceptionUtil trinityExceptionUtil = new TrinityExceptionUtil()

-

-				try {

-					execution.setVariable(prefix+'sdncResponseSuccess', false)

-

-					taskProcessor.utils.log("sdncAdapter Success Indicator is: " + success, isDebugLogEnabled)

-					if (success) {

-

-						// we need to look inside the request data for error

-						def String callbackRequestData = taskProcessor.utils.getNodeXml(response, 'RequestData', false)

-						def String decodedXml = decodeXML(callbackRequestData)

-						taskProcessor.utils.log("DEBUG","decodedXml:\n" + decodedXml, isDebugLogEnabled)

-

-						def requestDataResponseCode = '200'

-						def requestDataResponseMessage = ''

-						int intDataResponseCode = 200

-

-						if (taskProcessor.utils.nodeExists(decodedXml, "response-code")) {

-

-							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText(decodedXml, "response-code"))

-							if (taskProcessor.utils.nodeExists(decodedXml, "response-message")) {

-								requestDataResponseMessage  = taskProcessor.utils.getNodeText(decodedXml, "response-message")

-							}

-						}else if(taskProcessor.utils.nodeExists(decodedXml, "ResponseCode")){

-							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText1(decodedXml, "ResponseCode")).toInteger()

-						}else if(taskProcessor.utils.nodeExists(response, "ResponseCode")){

-							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText1(response, "ResponseCode")).toInteger()

-							requestDataResponseMessage  = taskProcessor.utils.getNodeText(response, "ResponseMessage")

-						}

-

-						taskProcessor.utils.log("DEBUG", "SDNC callback response-code: " + requestDataResponseCode, isDebugLogEnabled)

-						taskProcessor.utils.log("DEBUG", "SDNC callback response-message: " + requestDataResponseMessage, isDebugLogEnabled)

-

-						// Get the AAI Status to determine if rollback is needed on ASSIGN

-						def aai_status = ''

-						if (taskProcessor.utils.nodeExists(decodedXml, "aai-status")) {

-							aai_status = ((String) taskProcessor.utils.getNodeText(decodedXml, "aai-status"))

-							taskProcessor.utils.log("DEBUG", "SDNC sent AAI STATUS code: " + aai_status, isDebugLogEnabled)

-						}

-						if (aai_status != null && !aai_status.equals("")) {

-							execution.setVariable(prefix+"AaiStatus",aai_status)

-							taskProcessor.utils.log("DEBUG", "Set variable " + prefix + "AaiStatus: " + execution.getVariable(prefix+"AaiStatus"), isDebugLogEnabled)

-						}

-

-						// Get the result string to determine if rollback is needed on ASSIGN in Add Bonding flow only

-						def sdncResult = ''

-						if (taskProcessor.utils.nodeExists(decodedXml, "result")) {

-							sdncResult = ((String) taskProcessor.utils.getNodeText(decodedXml, "result"))

-							taskProcessor.utils.log("DEBUG", "SDNC sent result: " + sdncResult, isDebugLogEnabled)

-						}

-						if (sdncResult != null && !sdncResult.equals("")) {

-							execution.setVariable(prefix+"SdncResult",sdncResult)

-							taskProcessor.utils.log("DEBUG", "Set variable " + prefix + "SdncResult: " + execution.getVariable(prefix+"SdncResult"), isDebugLogEnabled)

-						}

-

-						try{

-							intDataResponseCode = Integer.parseInt(String.valueOf(requestDataResponseCode))

-						}catch(Exception e){

-							intDataResponseCode = 400

-						}

-

-						taskProcessor.utils.log("DEBUG", "intDataResponseCode " + intDataResponseCode , isDebugLogEnabled)

-

-						// if response-code is not Success (200, 201, etc) we need to throw an exception

-						if ((intDataResponseCode < 200 || intDataResponseCode > 299) && intDataResponseCode != 0) {

-							execution.setVariable(prefix+'ResponseCode', intDataResponseCode)

-							execution.setVariable("L3HLAB_rollback", true)

-							def msg = trinityExceptionUtil.mapSDNCAdapterExceptionToErrorResponse(response, execution)

-							exceptionUtil.buildAndThrowWorkflowException(execution, intDataResponseCode, "Received error from SDN-C: " + msg)

-

-						}

-					}else {

-						taskProcessor.logWarn('sdncAdapter did not complete successfully, sdncAdapter Success Indicator was false ')

-						execution.setVariable("L3HLAB_rollback", true)

-						def msg = trinityExceptionUtil.mapSDNCAdapterExceptionToErrorResponse(response, execution)

-						exceptionUtil.buildAndThrowWorkflowException(execution, responseCode, msg)

-					}

-

-					if (response == null || response.trim().equals("")) {

-						taskProcessor.logWarn('sdncAdapter workflow response is empty');

-						execution.setVariable("L3HLAB_rollback", true)

-						def msg = trinityExceptionUtil.buildException("Exception occurred while validating SDNC response " , execution)

-						exceptionUtil.buildAndThrowWorkflowException(execution, intResponseCode, msg)

-					}

-

-					execution.setVariable(prefix+'sdncResponseSuccess', true)

-					taskProcessor.logDebug('Exited ' + method, isDebugLogEnabled)

-				} catch (BpmnError e) {

-					throw e;

-				} catch (Exception e) {

-					taskProcessor.logError('Caught exception in ' + method, e)

-					execution.setVariable(prefix+"ResponseCode",400)

-					execution.setVariable("L3HLAB_rollback", true)

-					def msg = trinityExceptionUtil.buildException("Exception occurred while validating SDNC response: " + e.getMessage(), execution)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 400, msg)

-				}

-			}

-			

-	public String modelInfoToEcompModelInformation(String jsonModelInfo) {

-		String modelInvariantUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelInvariantUuid")

-		String modelUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelUuid")

-		if (modelUuid == null) {

-			modelUuid = ""

-		}

-		String modelCustomizationUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelCustomizationUuid")

-		String modelCustomizationString = ""

-		if (modelCustomizationUuid != null) {

-			modelCustomizationString = "<model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>"

-		}			

-		String modelVersion = jsonUtil.getJsonValue(jsonModelInfo, "modelVersion")

-		if (modelVersion == null) {

-			modelVersion = ""

-		}		

-		String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")

-		String ecompModelInformation =

-				"""<onap-model-information>

-						<model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>

-						<model-uuid>${modelUuid}</model-uuid>

-						${modelCustomizationString}

-						<model-version>${modelVersion}</model-version>

-						<model-name>${modelName}</model-name>

-				</onap-model-information>"""

-

-		return ecompModelInformation		

-	} 

-

-	/**

-	 * Decode XML - replace &amp; &lt; and &gt; with '&', '<' and '>'

-	 * @param xml - the xml to be decoded

-	 */

-	private String decodeXML(String xml) {

-		def String decodedXml = xml.replaceAll("&amp;", "&")

-		decodedXml = decodedXml.replaceAll("&lt;", "<")

-		decodedXml = decodedXml.replaceAll("&gt;", ">")

-	}

-	

-	

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.json.JsonUtils;
+import org.springframework.web.util.UriUtils
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+/**
+ * @version 1.0
+ *
+ */
+class SDNCAdapterUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapterUtils.class);
+
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+
+	private AbstractServiceTaskProcessor taskProcessor
+
+	public SDNCAdapterUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+	}
+
+	String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {
+		def utils=new MsoUtils()
+
+		def prefix = execution.getVariable('prefix')
+		def request = taskProcessor.getVariable(execution, requestName)
+		def requestInformation = utils.getNodeXml(request, 'request-information', false)
+		def serviceInformation = utils.getNodeXml(request, 'service-information', false)
+		def featureInformation = utils.getNodeXml(request, 'feature-information', false)
+		def featureParameters = utils.getNodeXml(request, 'feature-parameters', false)
+
+		def requestId = execution.getVariable('testReqId') // for junits
+		if(requestId==null){
+			requestId = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+		}
+
+		def svcInstanceId = execution.getVariable("mso-service-instance-id")
+
+		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)
+		def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)
+		def nnsFeatureInformation = utils.removeXmlNamespaces(featureInformation)
+		def nnsFeatureParameters = utils.removeXmlNamespaces(featureParameters)
+
+		String sdncAdapterFeatureRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(svcInstanceId)}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>${MsoUtils.xmlEscape(action)}</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(serviceOperation)}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackURL)}</sdncadapter:CallbackUrl>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+						${nnsRequestInformation}
+						${nnsServiceInformation}
+						${nnsFeatureInformation}
+						${nnsFeatureParameters}
+					</sdncadapterworkflow:SDNCRequestData>
+					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${MsoUtils.xmlEscape(timeoutValueInMinutes)}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+		sdncAdapterFeatureRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterFeatureRequest))
+		return sdncAdapterFeatureRequest
+	}
+
+	String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {
+		def utils=new MsoUtils()
+
+		def prefix = execution.getVariable('prefix')
+		def request = taskProcessor.getVariable(execution, prefix+'Request')
+		def requestInformation = utils.getNodeXml(request, 'request-information', false)
+		def serviceInformation = utils.getNodeXml(request, 'service-information', false)
+		def vnfInformationList = utils.getNodeXml(request, 'vnf-information-list', false)
+
+		def requestId = execution.getVariable('testReqId') // for junits
+		if(requestId==null){
+			requestId = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+		}
+
+		def svcInstanceId = execution.getVariable("mso-service-instance-id")
+
+		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)
+		def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)
+		def nnsVnfInformationList = utils.removeXmlNamespaces(vnfInformationList)
+
+		String sdncAdapterActivateVnfRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(svcInstanceId)}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>${MsoUtils.xmlEscape(action)}</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(serviceOperation)}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackURL)}</sdncadapter:CallbackUrl>
+						<sdncadapter:MsoAction>${MsoUtils.xmlEscape(msoAction)}</sdncadapter:MsoAction>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+						${nnsRequestInformation}
+						${nnsServiceInformation}
+						${nnsVnfInformationList}
+					</sdncadapterworkflow:SDNCRequestData>
+					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${MsoUtils.xmlEscape(timeoutValueInMinutes)}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+		sdncAdapterActivateVnfRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterActivateVnfRequest))
+		return sdncAdapterActivateVnfRequest
+	}
+
+	String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {
+		def utils=new MsoUtils()
+
+		def prefix = execution.getVariable('prefix')
+		def request = taskProcessor.getVariable(execution, prefix+'Request')
+
+		def requestInformation = """<request-information>
+										<request-id>${MsoUtils.xmlEscape(execution.getVariable("mso-request-id"))}</request-id>
+										<request-action>torepl</request-action>
+										<source>${MsoUtils.xmlEscape(execution.getVariable(prefix+"source"))}</source>
+										<notification-url>${MsoUtils.xmlEscape(execution.getVariable(prefix+"notificationUrl"))}</notification-url>
+									</request-information>"""
+
+		// Change the value of the 'request-information'.'request-action' element
+		def xml = new XmlSlurper().parseText(requestInformation)
+		if("assign".equalsIgnoreCase(action)){
+			xml.'request-action'.replaceBody('createTrinityBonding')
+		}else if("activate".equalsIgnoreCase(action)){
+			xml.'request-action'.replaceBody('activateTrinityBonding')
+		}else if("delete".equalsIgnoreCase(action)){
+			xml.'request-action'.replaceBody('deleteTrinityBonding')
+		}
+		requestInformation = utils.removeXmlPreamble(groovy.xml.XmlUtil.serialize(xml))
+		def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)
+
+		def requestId = execution.getVariable('testReqId') // for junits
+		if(requestId==null){
+			requestId = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+		}
+
+		def svcInstanceId = execution.getVariable("mso-service-instance-id")
+
+		//Build Service Information
+		// Send serviceName from CANOPI to sdnc for service-type
+		def serviceInformation = """<service-information>
+									      <service-type>${MsoUtils.xmlEscape(execution.getVariable(prefix+"serviceName"))}</service-type>
+									      <service-instance-id>${MsoUtils.xmlEscape(svcInstanceId)}</service-instance-id>
+									      <subscriber-name>${MsoUtils.xmlEscape(execution.getVariable(prefix+"subscriberName"))}</subscriber-name>
+									      <subscriber-global-id>${MsoUtils.xmlEscape(execution.getVariable(prefix+"subscriberGlobalId"))}</subscriber-global-id>
+									</service-information>"""
+
+		//Build Additional Information - vpn or vni
+		// Send serviceType from CANOPI to SDNC for nbnc-request-information service-type
+		def service = execution.getVariable(prefix+"serviceType")
+		def customerId = execution.getVariable(prefix+"customerId")
+		def vpnId = execution.getVariable(prefix+"vpnId")
+		def vpnRt = execution.getVariable(prefix+"vpnRt")
+		def vpnService = execution.getVariable(prefix+"vpnService")
+		def vpnRegion = execution.getVariable(prefix+"vpnRegion")
+		def additionalInfo = ""
+		if("assign".equalsIgnoreCase(action)){
+			additionalInfo = """<vpn-data-list>
+									<vpn-id>${MsoUtils.xmlEscape(vpnId)}</vpn-id>
+									<vpn-rt>${MsoUtils.xmlEscape(vpnRt)}</vpn-rt>
+									<vpn-service>${MsoUtils.xmlEscape(vpnService)}</vpn-service>
+									<vpn-region>${MsoUtils.xmlEscape(vpnRegion)}</vpn-region>
+							 	</vpn-data-list>"""
+		}else if("activate".equalsIgnoreCase(action) || "delete".equalsIgnoreCase(action)){
+			def vniId = execution.getVariable(prefix+'vniId')
+			additionalInfo = "<vni-id>${MsoUtils.xmlEscape(vniId)}</vni-id>"
+		}
+
+		//Set Interface Status
+		def interfaceStatus = "DISABLE"
+		if("activate".equalsIgnoreCase(action)){
+			interfaceStatus = "ENABLE"
+		}
+
+		//Build SDNC Adapter Request
+		String sdncAdapterL3ToHLRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(svcInstanceId)}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>${MsoUtils.xmlEscape(action)}</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(serviceOperation)}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackURL)}</sdncadapter:CallbackUrl>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+						${nnsRequestInformation}
+						${serviceInformation}
+		                <nbnc-request-information>
+							<service-type>${MsoUtils.xmlEscape(service)}</service-type>
+							<customer-id>${MsoUtils.xmlEscape(customerId)}</customer-id>
+							<interface-status>${MsoUtils.xmlEscape(interfaceStatus)}</interface-status>
+							${additionalInfo}
+						</nbnc-request-information>
+					</sdncadapterworkflow:SDNCRequestData>
+					<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${MsoUtils.xmlEscape(timeoutValueInMinutes)}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+		sdncAdapterL3ToHLRequest = utils.removeXmlPreamble(utils.formatXML(sdncAdapterL3ToHLRequest))
+
+		return sdncAdapterL3ToHLRequest
+	}
+
+
+
+	private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,
+			String svcOperation, String additionalData) {
+			def utils=new MsoUtils()
+
+			def prefix = execution.getVariable('prefix')
+			def request = taskProcessor.getVariable(execution, prefix+'Request')
+			def requestInformation = utils.getNodeXml(request, 'request-information', false)
+			def serviceInformation = utils.getNodeXml(request, 'service-information', false)
+			def serviceParameters = utils.getNodeXml(request, 'service-parameters', false)
+
+			def requestId = execution.getVariable('testReqId') // for junits
+			if(requestId==null){
+				requestId = execution.getVariable("mso-request-id") + "-" +  System.currentTimeMillis()
+			}
+
+			def svcInstanceId = execution.getVariable("mso-service-instance-id")
+			def msoAction = 'gammainternet'
+
+			def timeoutInMinutes = UrnPropertiesReader.getVariable('mso.sdnc.timeout.firewall.minutes',execution)
+
+			def callbackUrl = (String)UrnPropertiesReader.getVariable('mso.workflow.sdncadapter.callback',execution)
+			if (callbackUrl == null || callbackUrl.trim() == "") {
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'mso:workflow:sdncadapter:callback URN is not set', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				workflowException(execution, 'Internal Error', 9999) // TODO: what message and error code?
+			}
+
+			def l2HomingInformation = utils.getNodeXml(serviceParameters, 'l2-homing-information', false)
+			def internetEvcAccessInformation = utils.getNodeXml(serviceParameters, 'internet-evc-access-information', false)
+			def vrLan = utils.getNodeXml(serviceParameters, 'vr-lan', false)
+			def upceVmsServiceInformation = utils.getNodeXml(serviceParameters, 'ucpe-vms-service-information', false)
+
+
+			def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)
+			def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)
+			def nnsl2HomingInformation = utils.removeXmlNamespaces(l2HomingInformation)
+			def nnsInternetEvcAccessInformation = utils.removeXmlNamespaces(internetEvcAccessInformation)
+			def nnsVrLan = utils.removeXmlNamespaces(vrLan)
+			def nnsUpceVmsServiceInformation = utils.removeXmlNamespaces(upceVmsServiceInformation)
+
+			if (additionalData == null) {
+				additionalData = ""
+			}
+
+			boolean isAic3 = execution.getVariable("isAic3")
+			
+			if(isAic3) {
+				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC3.0")
+			}
+			else {
+				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC2.X")
+			}
+									
+			String content = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(svcInstanceId)}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>${MsoUtils.xmlEscape(svcAction)}</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(svcOperation)}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackUrl)}</sdncadapter:CallbackUrl>
+						<sdncadapter:MsoAction>${MsoUtils.xmlEscape(msoAction)}</sdncadapter:MsoAction>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+						${additionalData}
+						${nnsRequestInformation}
+						${nnsServiceInformation}
+						${nnsl2HomingInformation}
+						${nnsInternetEvcAccessInformation}
+						${nnsVrLan}
+						${nnsUpceVmsServiceInformation}
+					</sdncadapterworkflow:SDNCRequestData>
+						<sdncadapterworkflow:SDNCTimeOutValueInMinutes>${MsoUtils.xmlEscape(timeoutInMinutes)}</sdncadapterworkflow:SDNCTimeOutValueInMinutes>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+
+			content = utils.removeXmlPreamble(utils.formatXML(content))
+			execution.setVariable(resultVar, content)
+	}
+
+	/**
+	 * Builds an SDNC "reserve" request and stores it in the specified execution
+	 * variable. 
+	 * @param execution the execution
+	 * @param action the type of action: reserve, turnup, etc
+	 * @param resultVar the execution variable in which the result will be stored
+	 */
+	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar) {
+		sdncReservePrep(execution, action, resultVar, false)
+	}
+
+	/**
+	 * Builds an SDNC "reserve" request and stores it in the specified execution
+	 * variable.
+	 * @param execution the execution
+	 * @param action the type of action: reserve, turnup, etc
+	 * @param resultVar the execution variable in which the result will be stored
+	 * @param isAic3 boolean to indicate whether request is for AIC3.0
+	 */
+	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {
+		sdncPrep(execution, resultVar, action , 'service-configuration-operation', null, isAic3, this.taskProcessor)
+	}
+
+	/**
+	 * Builds a basic SDNC 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
+	 * @param svcAction the svcAction element value
+	 * @param svcOperation the svcOperation element value
+	 * @param additionalData additional XML content to be inserted into the
+	 *        RequestData element (may be null)
+	 */
+	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,
+		String svcOperation, String additionalData, AbstractServiceTaskProcessor taskProcessor) {
+		sdncPrep(execution, resultVar, svcAction, svcOperation, additionalData, false, taskProcessor)
+	}
+
+	/**
+	 * Builds a basic SDNC 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
+	 * @param svcAction the svcAction element value
+	 * @param svcOperation the svcOperation element value
+	 * @param additionalData additional XML content to be inserted into the RequestData element (may be null)
+	 * @param isAic3 boolean to indicate whether request is for AIC3.0
+	 */
+	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,
+			String svcOperation, String additionalData, boolean isAic3, AbstractServiceTaskProcessor taskProcessor) {
+		def method = getClass().getSimpleName() + '.sdncPrep(' +
+			'execution=' + execution.getId() +
+			', resultVar=' + resultVar +
+			', svcAction=' + svcAction +
+			', svcOperation=' + svcOperation +
+			', additionalData=' + (additionalData == null ? "no" : "yes") +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+		MsoUtils utils = taskProcessor.utils
+		try {
+			def prefix = execution.getVariable('prefix')
+			def request = taskProcessor.getVariable(execution, prefix+'Request')
+			def requestInformation = utils.getNodeXml(request, 'request-information', false)
+			def serviceInformation = utils.getNodeXml(request, 'service-information', false)
+			def serviceParameters = utils.getChildNodes(request, 'service-parameters')
+			def requestAction = utils.getNodeText(request, 'request-action')
+
+			def timeoutInMinutes = UrnPropertiesReader.getVariable('mso.sdnc.timeout.firewall.minutes',execution)
+
+			def requestId = execution.getVariable('testReqId') // for junits
+			if(requestId==null){
+				requestId = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+			}
+
+			def svcInstanceId = execution.getVariable("mso-service-instance-id")
+			def msoAction = 'gammainternet'
+
+			def callbackUrl = (String)UrnPropertiesReader.getVariable('mso.workflow.sdncadapter.callback',execution)
+			if (callbackUrl == null || callbackUrl.trim() == "") {
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'mso:workflow:sdncadapter:callback URN is not set', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - During PreProcess Request")
+			}
+
+			def l2HomingInformation = utils.getNodeXml(request, 'l2-homing-information', false)
+			def internetEvcAccessInformation = utils.getNodeXml(request, 'internet-evc-access-information', false)
+			def vrLan = utils.getNodeXml(request, 'vr-lan', false)
+			def upceVmsServiceInfo = utils.getNodeXml(request, 'ucpe-vms-service-information', false)
+			def vnfInformationList = utils.getNodeXml(request, 'vnf-information-list', false)
+
+			def nnsRequestInformation = utils.removeXmlNamespaces(requestInformation)
+			def nnsServiceInformation = utils.removeXmlNamespaces(serviceInformation)
+			def nnsl2HomingInformation = utils.removeXmlNamespaces(l2HomingInformation)
+			def nnsInternetEvcAccessInformation = utils.removeXmlNamespaces(internetEvcAccessInformation)
+			def nnsVrLan = utils.removeXmlNamespaces(vrLan)
+			def nnsUpceVmsServiceInfo = utils.removeXmlNamespaces(upceVmsServiceInfo)
+			def nnsVnfInformationList = utils.removeXmlNamespaces(vrLan)
+			def nnsinternetSvcChangeDetails = ""
+
+			if(requestAction!=null && requestAction.equals("ChangeLayer3ServiceProvRequest")){
+				def internetSvcChangeDetails = utils.removeXmlNamespaces(serviceParameters)
+				nnsinternetSvcChangeDetails = """<internet-service-change-details>
+							${internetSvcChangeDetails}
+						</internet-service-change-details>"""
+			}
+
+			if (additionalData == null) {
+				additionalData = ""
+			}
+			
+			if(isAic3) {
+				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC3.0")
+			}
+			else {
+				nnsl2HomingInformation = updateHomingInfo(nnsl2HomingInformation, "AIC2.X")
+			}
+
+
+			String content = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:sdncadapterworkflow="http://openecomp.com/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${MsoUtils.xmlEscape(requestId)}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(svcInstanceId)}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>${MsoUtils.xmlEscape(svcAction)}</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>${MsoUtils.xmlEscape(svcOperation)}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${MsoUtils.xmlEscape(callbackUrl)}</sdncadapter:CallbackUrl>
+						<sdncadapter:MsoAction>${MsoUtils.xmlEscape(msoAction)}</sdncadapter:MsoAction>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+						${additionalData}
+						${nnsRequestInformation}
+						${nnsServiceInformation}
+						${nnsl2HomingInformation}
+						${nnsInternetEvcAccessInformation}
+						${nnsVrLan}
+						${nnsUpceVmsServiceInfo}
+						${nnsVnfInformationList}
+						${nnsinternetSvcChangeDetails}
+					</sdncadapterworkflow:SDNCRequestData>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+
+			content = utils.removeXmlPreamble(utils.formatXML(content))
+			execution.setVariable(resultVar, content)
+			msoLogger.debug(resultVar + ' = ' + System.lineSeparator() + content)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Internal Error")
+		}
+	}
+	
+	public String updateHomingInfo(String homingInfo, String aicVersion) {
+		String newHomingInfo
+		if(homingInfo == null || homingInfo.trim().length() == 0) {
+			newHomingInfo = "<l2-homing-information><aic-version>" + aicVersion + "</aic-version></l2-homing-information>"
+		}
+		else {
+			newHomingInfo = homingInfo.substring(0, homingInfo.indexOf("</l2-homing-information>")) + "<aic-version>" + aicVersion + "</aic-version></l2-homing-information>"
+		}
+	}
+	
+	/**
+	 * Builds a topology SDNC request and return String request.
+	 * As V2 will use 1607-style request, region instead of aic clli code
+	 * @param execution, the execution
+	 * @param requestXML, the incoming request for the flow
+	 * @param serviceInstanceId, the serviceIntance (if available)
+	 * @param callbackUrl, the call back url
+	 * @param action, the action element value
+	 * @param requestAction the svcOperation element value
+	 * @param cloudRegionId the aai's cloud-region-id
+	 * @param networkId the aai's network-id
+	 * @param additionalData additional XML content to be inserted into the
+	 *   RequestData element (may be null)
+	 */
+	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {
+		 def utils=new MsoUtils()
+
+		 // SNDC is expecting request Id for header as unique each call.
+		 String hdrRequestId = ""
+		 String testHdrRequestId = execution.getVariable("testMessageId")  // for test purposes.
+		 if (testHdrRequestId == null) {
+			 hdrRequestId = UUID.randomUUID()  // generate unique
+		 } else {
+			 hdrRequestId = testHdrRequestId
+		 }
+		 
+		 String requestId = ""
+		 try {
+			 requestId = execution.getVariable("mso-request-id")
+		 } catch (Exception ex) {
+			 requestId = utils.getNodeText(requestXML, "request-id")
+		 }
+
+		 String aicCloudRegion = cloudRegionId
+		 String tenantId = ""
+		 if (utils.nodeExists(requestXML, "tenant-id")) {
+			 tenantId = utils.getNodeText(requestXML, "tenant-id")
+		 }
+		 String networkType = ""
+		 if (utils.nodeExists(requestXML, "network-type")) {
+			 networkType = utils.getNodeText(requestXML, "network-type")
+		 }
+
+		 // Replace/Use the value of network-type from aai query (vs input) during Delete Network flows.
+		 if (queryAAIResponse != null) {
+		     networkType = utils.getNodeText(queryAAIResponse, "network-type")
+		 }
+
+		 String serviceId = ""
+		 if (utils.nodeExists(requestXML, "service-id")) {
+			 serviceId = utils.getNodeText(requestXML, "service-id")
+		 }
+		 String networkName = ""
+		 // Replace/Use the value of network-name from aai query (vs input) if it was already set in AAI
+		 if (queryAAIResponse != null) {
+			 networkName = utils.getNodeText(queryAAIResponse, "network-name")
+		 }
+		 if (networkName.isEmpty() && utils.nodeExists(requestXML, "network-name")) {
+			 networkName = utils.getNodeText(requestXML, "network-name")
+		 }
+		 String source = ""
+		 if (utils.nodeExists(requestXML, "source")) {
+			 source = utils.getNodeText(requestXML, "source")
+		 }
+
+		 // get resourceLink from subflow execution variable
+		 String serviceType = ""
+		 String subscriberName = ""
+		 String siRelatedLink = execution.getVariable("GENGSI_siResourceLink")
+		 if (siRelatedLink != null) {
+			 // get service type
+			 int serviceStart = siRelatedLink.indexOf("service-subscription/")
+			 int serviceEnd = siRelatedLink.indexOf("/service-instances/")
+			 serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
+			 serviceType = UriUtils.decode(serviceType,"UTF-8")
+			 // get subscriber name
+			 int subscriberNameStart = siRelatedLink.indexOf("customers/customer/")
+			 int subscriberNameEnd = siRelatedLink.indexOf("/service-subscriptions/")
+		     subscriberName = siRelatedLink.substring(subscriberNameStart + 19, subscriberNameEnd)
+			 subscriberName = UriUtils.decode(subscriberName,"UTF-8")
+		 }
+
+		 String content =
+			"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
+		                                  xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+		                                  xmlns:sdncadapter="http://org.onap.so/workflow/sdnc/adapter/schema/v1"
+		                                  xmlns:ns5="http://org.onap/so/request/types/v1">
+					   <sdncadapter:RequestHeader>
+						  <sdncadapter:RequestId>${MsoUtils.xmlEscape(hdrRequestId)}</sdncadapter:RequestId>
+						  <sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(serviceInstanceId)}</sdncadapter:SvcInstanceId>
+						  <sdncadapter:SvcAction>${MsoUtils.xmlEscape(action)}</sdncadapter:SvcAction>
+						  <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>
+						  <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>
+					   </sdncadapter:RequestHeader>
+					   <sdncadapterworkflow:SDNCRequestData>
+					      <request-information>
+					            <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
+					            <request-action>${MsoUtils.xmlEscape(requestAction)}</request-action>
+					            <source>${MsoUtils.xmlEscape(source)}</source>
+					            <notification-url></notification-url>
+					            <order-number></order-number>
+					            <order-version></order-version>
+					         </request-information>
+					         <service-information>
+					            <service-id>${MsoUtils.xmlEscape(serviceId)}</service-id>
+								<service-type>${MsoUtils.xmlEscape(serviceType)}</service-type>
+					            <service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+					            <subscriber-name>${MsoUtils.xmlEscape(subscriberName)}</subscriber-name>
+					         </service-information>
+					         <network-request-information>
+					            <network-id>${MsoUtils.xmlEscape(networkId)}</network-id>
+					            <network-type>${MsoUtils.xmlEscape(networkType)}</network-type>
+					            <network-name>${MsoUtils.xmlEscape(networkName)}</network-name>
+					            <tenant>${MsoUtils.xmlEscape(tenantId)}</tenant>
+					            <aic-cloud-region>${MsoUtils.xmlEscape(aicCloudRegion)}</aic-cloud-region>
+					         </network-request-information>
+					   </sdncadapterworkflow:SDNCRequestData>
+				   </aetgt:SDNCAdapterWorkflowRequest>""".trim()
+
+			return content
+	 }
+
+	 /**
+	  * Builds a topology SDNC request and return String request.
+	  * As V2 will use 1607-style request, region instead of aic clli code
+	  * @param execution, the execution
+	  * @param requestXML, the incoming request for the flow
+	  * @param serviceInstanceId, the serviceIntance (if available)
+	  * @param callbackUrl, the call back url
+	  * @param action, the action element value
+	  * @param requestAction the svcOperation element value
+	  * @param cloudRegionId the aai's cloud-region-id
+	  * @param networkId the aai's network-id
+	  * @param additionalData additional XML content to be inserted into the
+	  *   RequestData element (may be null)
+	  */
+	  public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {
+		  def utils=new MsoUtils()
+
+		  // SNDC is expecting request Id for header as unique each call.
+		  String hdrRequestId = ""
+		  String testHdrRequestId = execution.getVariable("testMessageId")  // for test purposes.
+		  if (testHdrRequestId == null) {
+		      hdrRequestId = UUID.randomUUID()  // generate unique
+		  } else {
+		      hdrRequestId = testHdrRequestId
+		  }
+
+		  String requestId = ""
+		  String testRequestId = execution.getVariable("testMessageId")  // for test purposes.
+		  if (testRequestId == null) {
+			  requestId = execution.getVariable("mso-request-id")
+			  if (requestId == null) {
+				  requestId = execution.getVariable("msoRequestId")
+			  }		
+		  } else {
+		  	  requestId = testRequestId
+		  }		  
+		  
+		  String aicCloudRegion = cloudRegionId
+		  String tenantId = ""
+		  if (utils.nodeExists(requestXML, "tenant-id")) {
+			  tenantId = utils.getNodeText(requestXML, "tenant-id")
+		  }
+		  String networkType = ""
+		  if (utils.nodeExists(requestXML, "network-type")) {
+			  networkType = utils.getNodeText(requestXML, "network-type")
+		  }
+
+		  String subscriptionServiceType = ""
+		  if (utils.nodeExists(requestXML, "subscription-service-type")) {
+			  subscriptionServiceType = utils.getNodeText(requestXML, "subscription-service-type")
+		  }
+
+		  String globalCustomerId = ""
+		  if (utils.nodeExists(requestXML, "global-customer-id")) {
+			  globalCustomerId = utils.getNodeText(requestXML, "global-customer-id")
+		  }
+
+		  String serviceId = ""
+		  if (utils.nodeExists(requestXML, "service-id")) {
+			  serviceId = utils.getNodeText(requestXML, "service-id")
+		  }
+		  String networkName = ""
+		  if (utils.nodeExists(requestXML, "network-name")) {
+			  networkName = utils.getNodeText(requestXML, "network-name")
+		  }
+		  String source = ""
+		  if (utils.nodeExists(requestXML, "source")) {
+			  source = utils.getNodeText(requestXML, "source")
+		  }
+
+		  // get resourceLink from subflow execution variable
+		  String serviceType = ""
+		  String subscriberName = ""
+		  String siRelatedLink = execution.getVariable("GENGSI_siResourceLink")
+		  if (siRelatedLink != null) {
+			  // get service type
+			  int serviceStart = siRelatedLink.indexOf("service-subscription/")
+			  int serviceEnd = siRelatedLink.indexOf("/service-instances/")
+			  serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
+			  serviceType = UriUtils.decode(serviceType,"UTF-8")
+			  // get subscriber name
+			  int subscriberNameStart = siRelatedLink.indexOf("customers/customer/")
+			  int subscriberNameEnd = siRelatedLink.indexOf("/service-subscriptions/")
+			  subscriberName = siRelatedLink.substring(subscriberNameStart + 19, subscriberNameEnd)
+			  subscriberName = UriUtils.decode(subscriberName,"UTF-8")
+		  }
+
+		  // network-information from 'networkModelInfo' // verify the DB Catalog response
+		  String networkModelInfo = utils.getNodeXml(requestXML, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
+		  String modelInvariantUuid = utils.getNodeText(networkModelInfo, "modelInvariantUuid") !=null ?
+		                              utils.getNodeText(networkModelInfo, "modelInvariantUuid") : ""
+		  String modelCustomizationUuid = utils.getNodeText(networkModelInfo, "modelCustomizationUuid")  !=null ?
+		                                  utils.getNodeText(networkModelInfo, "modelCustomizationUuid")  : ""
+		  String modelUuid = utils.getNodeText(networkModelInfo, "modelUuid") !=null ?
+		                     utils.getNodeText(networkModelInfo, "modelUuid") : ""
+		  String modelVersion = utils.getNodeText(networkModelInfo, "modelVersion") !=null ?
+		  	                    utils.getNodeText(networkModelInfo, "modelVersion") : ""
+		  String modelName = utils.getNodeText(networkModelInfo, "modelName") !=null ?
+		                     utils.getNodeText(networkModelInfo, "modelName") : ""
+
+		 // service-information from 'networkModelInfo' // verify the DB Catalog response
+		 String serviceModelInfo = utils.getNodeXml(requestXML, "serviceModelInfo", false).replace("tag0:","").replace(":tag0","")
+		 String serviceModelInvariantUuid = utils.getNodeText(serviceModelInfo, "modelInvariantUuid")  !=null ?
+										    utils.getNodeText(serviceModelInfo, "modelInvariantUuid")  : ""
+		 String serviceModelUuid = utils.getNodeText(serviceModelInfo, "modelUuid") !=null ?
+							       utils.getNodeText(serviceModelInfo, "modelUuid") : ""
+		 String serviceModelVersion = utils.getNodeText(serviceModelInfo, "modelVersion") !=null ?
+							          utils.getNodeText(serviceModelInfo, "modelVersion") : ""
+		 String serviceModelName = utils.getNodeText(serviceModelInfo, "modelName") !=null ?
+						           utils.getNodeText(serviceModelInfo, "modelName") : ""
+
+
+		  String content =
+		  """<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
+   				                                    xmlns:sdncadapter="http://org.onap.so/workflow/sdnc/adapter/schema/v1" 
+                                                    xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+					   <sdncadapter:RequestHeader>
+						  <sdncadapter:RequestId>${MsoUtils.xmlEscape(hdrRequestId)}</sdncadapter:RequestId>
+						  <sdncadapter:SvcInstanceId>${MsoUtils.xmlEscape(serviceInstanceId)}</sdncadapter:SvcInstanceId>
+						  <sdncadapter:SvcAction>${MsoUtils.xmlEscape(action)}</sdncadapter:SvcAction>
+						  <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>
+						  <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>
+                          <sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
+					   </sdncadapter:RequestHeader>
+   					   <sdncadapterworkflow:SDNCRequestData>
+						   <request-information>
+						      <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
+						      <request-action>${MsoUtils.xmlEscape(requestAction)}</request-action>
+						      <source>${MsoUtils.xmlEscape(source)}</source>
+						      <notification-url></notification-url>
+						      <order-number></order-number>
+						      <order-version></order-version>
+						   </request-information>
+						   <service-information>
+						      <service-id>${MsoUtils.xmlEscape(serviceId)}</service-id>
+						      <subscription-service-type>${MsoUtils.xmlEscape(subscriptionServiceType)}</subscription-service-type>
+							  <onap-model-information>
+								   <model-invariant-uuid>${MsoUtils.xmlEscape(serviceModelInvariantUuid)}</model-invariant-uuid>
+								   <model-uuid>${MsoUtils.xmlEscape(serviceModelUuid)}</model-uuid>
+								   <model-version>${MsoUtils.xmlEscape(serviceModelVersion)}</model-version>
+								   <model-name>${MsoUtils.xmlEscape(serviceModelName)}</model-name>
+                              </onap-model-information>
+						      <service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+						      <global-customer-id>${MsoUtils.xmlEscape(globalCustomerId)}</global-customer-id>
+						      <subscriber-name>${MsoUtils.xmlEscape(subscriberName)}</subscriber-name>
+						   </service-information>
+						   <network-information>
+						      <network-id>${MsoUtils.xmlEscape(networkId)}</network-id>
+						      <network-type>${MsoUtils.xmlEscape(networkType)}</network-type>
+							  <onap-model-information>
+								   <model-invariant-uuid>${MsoUtils.xmlEscape(modelInvariantUuid)}</model-invariant-uuid>
+								   <model-customization-uuid>${MsoUtils.xmlEscape(modelCustomizationUuid)}</model-customization-uuid>
+								   <model-uuid>${MsoUtils.xmlEscape(modelUuid)}</model-uuid>
+								   <model-version>${MsoUtils.xmlEscape(modelVersion)}</model-version>
+								   <model-name>${MsoUtils.xmlEscape(modelName)}</model-name>
+							  </onap-model-information>
+						   </network-information>
+						   <network-request-input>
+						     <network-name>${MsoUtils.xmlEscape(networkName)}</network-name>
+					         <tenant>${MsoUtils.xmlEscape(tenantId)}</tenant>
+						     <aic-cloud-region>${MsoUtils.xmlEscape(aicCloudRegion)}</aic-cloud-region>
+						     <aic-clli></aic-clli>
+						     <network-input-parameters/>
+						   </network-request-input>
+				      </sdncadapterworkflow:SDNCRequestData>
+                   </aetgt:SDNCAdapterWorkflowRequest>""".trim()
+
+			 return content
+	  }
+
+			/**
+			 * Validates a workflow response.
+			 * @param execution the execution
+			 * @param responseVar the execution variable in which the response is stored
+			 * @param workflowException the WorkflowException Object returned from sdnc call
+			 */
+	public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){
+		msoLogger.debug("SDNC Response is: " + response)
+		msoLogger.debug("SuccessIndicator is: " + successIndicator)
+
+		try {
+			def prefix = execution.getVariable('prefix')
+			execution.setVariable(prefix+'sdncResponseSuccess', false)
+			msoLogger.debug("Response" + ' = ' + (response == null ? "" : System.lineSeparator()) + response)
+
+			if (successIndicator){
+				if (response == null || response.trim().equals("")) {
+					msoLogger.debug(response + ' is empty');
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "SDNCAdapter Workflow Response is Empty")
+				}else{
+
+					// we need to peer into the request data for error
+					def String sdncAdapterWorkflowResponse = taskProcessor.utils.getNodeXml(response, 'response-data', false)
+					def String decodedXml = sdncAdapterWorkflowResponse.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+					decodedXml = taskProcessor.utils.getNodeXml(response, 'RequestData')
+					msoLogger.debug("decodedXml:\n" + decodedXml)
+
+					int requestDataResponseCode = 200
+					def String requestDataResponseMessage = ''
+
+					try{
+						if (taskProcessor.utils.nodeExists(decodedXml, "response-message")) {
+							requestDataResponseMessage = taskProcessor.utils.getNodeText(decodedXml, "response-message")
+						} else if (taskProcessor.utils.nodeExists(sdncAdapterWorkflowResponse, "ResponseMessage")) {
+							requestDataResponseMessage = taskProcessor.utils.getNodeText(sdncAdapterWorkflowResponse, "ResponseMessage")
+						}
+					}catch(Exception e){
+						msoLogger.debug('Error caught while decoding resposne ' + e.getMessage())
+					}
+
+					if(taskProcessor.utils.nodeExists(decodedXml, "response-code")) {
+						msoLogger.debug("response-code node Exist ")
+						String code = taskProcessor.utils.getNodeText(decodedXml, "response-code")
+						if(code.isEmpty() || code.equals("")){
+							// if response-code is blank then Success
+							msoLogger.debug("response-code node is empty")
+							requestDataResponseCode = 0
+						}else{
+							requestDataResponseCode  = code.toInteger()
+							msoLogger.debug("response-code is: " + requestDataResponseCode)
+						}
+					}else if(taskProcessor.utils.nodeExists(sdncAdapterWorkflowResponse, "ResponseCode")){
+						msoLogger.debug("ResponseCode node Exist ")
+						String code = taskProcessor.utils.getNodeText(sdncAdapterWorkflowResponse, "ResponseCode")
+						if(code.isEmpty() || code.equals("")){
+							// if ResponseCode blank then Success
+							msoLogger.debug("ResponseCode node is empty")
+							requestDataResponseCode = 0
+						}else{
+							requestDataResponseCode  = code.toInteger()
+							msoLogger.debug("ResponseCode is: " + requestDataResponseCode)
+						}
+					}else{
+						msoLogger.debug("A Response Code DOES NOT Exist.")
+						// if a response code does not exist then Success
+						requestDataResponseCode = 0
+					}
+					try{
+
+						execution.setVariable(prefix+'sdncRequestDataResponseCode', requestDataResponseCode.toString())
+						// if a response code is 0 or 2XX then Success
+						if ((requestDataResponseCode >= 200 && requestDataResponseCode <= 299) || requestDataResponseCode == 0) {
+							execution.setVariable(prefix+'sdncResponseSuccess', true)
+							msoLogger.debug("Setting sdncResponseSuccess to True ")
+							msoLogger.debug("Exited ValidateSDNCResponse Method")
+						}else{
+							ExceptionUtil exceptionUtil = new ExceptionUtil()
+							String convertedCode = exceptionUtil.MapSDNCResponseCodeToErrorCode(requestDataResponseCode.toString())
+							int convertedCodeInt = Integer.parseInt(convertedCode)
+							exceptionUtil.buildAndThrowWorkflowException(execution, convertedCodeInt, "Received error from SDN-C: " + requestDataResponseMessage)
+						}
+
+					}catch(Exception e){
+						//TODO proper handling of new, non numerical response codes in 1607 and new error handling for common API
+						requestDataResponseCode = 500
+					}
+
+					msoLogger.debug("SDNC callback response-code: " + requestDataResponseCode)
+					msoLogger.debug("SDNC callback response-message: " + requestDataResponseMessage)
+				}
+
+			}else {
+				msoLogger.debug('SDNCAdapter Subflow did NOT complete Successfully.  SuccessIndicator is False. ')
+				if(workflowException != null){
+					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
+				}else{
+					//TODO : what error code and error message use here
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Internal Error - SDNCAdapter Subflow did NOT complete successfully.")
+				}
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.debug('END of Validate SDNC Response')
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, 'Internal Error- Unable to validate SDNC Response ');
+		}
+	}
+
+	/**
+			 * Validates a workflow response.
+			 * @param execution the execution
+			 * @param responseVar the execution variable in which the response is stored
+			 * @param responseCodeVar the execution variable in which the response code is stored
+			 * @param errorResponseVar the execution variable in which the error response is stored
+			 */
+			public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {
+				def method = getClass().getSimpleName() + '.validateL3BondingSDNCResp(' +
+					'execution=' + execution.getId() +
+					', response=' + response +
+					')'
+				msoLogger.trace('Entered ' + method)
+				def prefix = execution.getVariable('prefix')
+				TrinityExceptionUtil trinityExceptionUtil = new TrinityExceptionUtil()
+
+				try {
+					execution.setVariable(prefix+'sdncResponseSuccess', false)
+
+					msoLogger.debug("sdncAdapter Success Indicator is: " + success)
+					if (success) {
+
+						// we need to look inside the request data for error
+						def String callbackRequestData = taskProcessor.utils.getNodeXml(response, 'RequestData', false)
+						def String decodedXml = callbackRequestData
+						msoLogger.debug("decodedXml:\n" + decodedXml)
+
+						def requestDataResponseCode = '200'
+						def requestDataResponseMessage = ''
+						int intDataResponseCode = 200
+
+						if (taskProcessor.utils.nodeExists(decodedXml, "response-code")) {
+
+							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText(decodedXml, "response-code"))
+							if (taskProcessor.utils.nodeExists(decodedXml, "response-message")) {
+								requestDataResponseMessage  = taskProcessor.utils.getNodeText(decodedXml, "response-message")
+							}
+						}else if(taskProcessor.utils.nodeExists(decodedXml, "ResponseCode")){
+							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText(decodedXml, "ResponseCode")).toInteger()
+						}else if(taskProcessor.utils.nodeExists(response, "ResponseCode")){
+							requestDataResponseCode  = ((String) taskProcessor.utils.getNodeText(response, "ResponseCode")).toInteger()
+							requestDataResponseMessage  = taskProcessor.utils.getNodeText(response, "ResponseMessage")
+						}
+
+						msoLogger.debug("SDNC callback response-code: " + requestDataResponseCode)
+						msoLogger.debug("SDNC callback response-message: " + requestDataResponseMessage)
+
+						// Get the AAI Status to determine if rollback is needed on ASSIGN
+						def aai_status = ''
+						if (taskProcessor.utils.nodeExists(decodedXml, "aai-status")) {
+							aai_status = ((String) taskProcessor.utils.getNodeText(decodedXml, "aai-status"))
+							msoLogger.debug("SDNC sent AAI STATUS code: " + aai_status)
+						}
+						if (aai_status != null && !aai_status.equals("")) {
+							execution.setVariable(prefix+"AaiStatus",aai_status)
+							msoLogger.debug("Set variable " + prefix + "AaiStatus: " + execution.getVariable(prefix+"AaiStatus"))
+						}
+
+						// Get the result string to determine if rollback is needed on ASSIGN in Add Bonding flow only
+						def sdncResult = ''
+						if (taskProcessor.utils.nodeExists(decodedXml, "result")) {
+							sdncResult = ((String) taskProcessor.utils.getNodeText(decodedXml, "result"))
+							msoLogger.debug("SDNC sent result: " + sdncResult)
+						}
+						if (sdncResult != null && !sdncResult.equals("")) {
+							execution.setVariable(prefix+"SdncResult",sdncResult)
+							msoLogger.debug("Set variable " + prefix + "SdncResult: " + execution.getVariable(prefix+"SdncResult"))
+						}
+
+						try{
+							intDataResponseCode = Integer.parseInt(String.valueOf(requestDataResponseCode))
+						}catch(Exception e){
+							intDataResponseCode = 400
+						}
+
+						msoLogger.debug("intDataResponseCode " + intDataResponseCode )
+
+						// if response-code is not Success (200, 201, etc) we need to throw an exception
+						if ((intDataResponseCode < 200 || intDataResponseCode > 299) && intDataResponseCode != 0) {
+							execution.setVariable(prefix+'ResponseCode', intDataResponseCode)
+							execution.setVariable("L3HLAB_rollback", true)
+							def msg = trinityExceptionUtil.mapSDNCAdapterExceptionToErrorResponse(response, execution)
+							exceptionUtil.buildAndThrowWorkflowException(execution, intDataResponseCode, "Received error from SDN-C: " + msg)
+
+						}
+					}else {
+						msoLogger.warn(MessageEnum.BPMN_GENERAL_WARNING, 'sdncAdapter did not complete successfully, sdncAdapter Success Indicator was false ', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, 'sdncAdapter did not complete successfully, sdncAdapter Success Indicator was false ');
+						execution.setVariable("L3HLAB_rollback", true)
+						def msg = trinityExceptionUtil.intDataResponseCode(response, execution)
+						exceptionUtil.buildAndThrowWorkflowException(execution, intDataResponseCode, msg)
+					}
+
+					if (response == null || response.trim().equals("")) {
+						msoLogger.warn(MessageEnum.BPMN_GENERAL_WARNING, 'sdncAdapter workflow response is empty', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, 'sdncAdapter workflow response is empty');;
+						execution.setVariable("L3HLAB_rollback", true)
+						def msg = trinityExceptionUtil.buildException("Exception occurred while validating SDNC response " , execution)
+						exceptionUtil.buildAndThrowWorkflowException(execution, intResponseCode, msg)
+					}
+
+					execution.setVariable(prefix+'sdncResponseSuccess', true)
+					msoLogger.trace('Exited ' + method)
+				} catch (BpmnError e) {
+					throw e;
+				} catch (Exception e) {
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+					execution.setVariable(prefix+"ResponseCode",400)
+					execution.setVariable("L3HLAB_rollback", true)
+					def msg = trinityExceptionUtil.buildException("Exception occurred while validating SDNC response: " + e.getMessage(), execution)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 400, msg)
+				}
+			}
+			
+	public String modelInfoToEcompModelInformation(String jsonModelInfo) {
+		String modelInvariantUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelInvariantUuid")
+		String modelUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelUuid")
+		if (modelUuid == null) {
+			modelUuid = ""
+		}
+		String modelCustomizationUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelCustomizationUuid")
+		String modelCustomizationString = ""
+		if (modelCustomizationUuid != null) {
+			modelCustomizationString = "<model-customization-uuid>${MsoUtils.xmlEscape(modelCustomizationUuid)}</model-customization-uuid>"
+		}			
+		String modelVersion = jsonUtil.getJsonValue(jsonModelInfo, "modelVersion")
+		if (modelVersion == null) {
+			modelVersion = ""
+		}		
+		String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")
+		String ecompModelInformation =
+				"""<onap-model-information>
+						<model-invariant-uuid>${MsoUtils.xmlEscape(modelInvariantUuid)}</model-invariant-uuid>
+						<model-uuid>${MsoUtils.xmlEscape(modelUuid)}</model-uuid>
+						${modelCustomizationString}
+						<model-version>${MsoUtils.xmlEscape(modelVersion)}</model-version>
+						<model-name>${MsoUtils.xmlEscape(modelName)}</model-name>
+				</onap-model-information>"""
+
+		return ecompModelInformation		
+	} 
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ServiceTaskProcessor.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ServiceTaskProcessor.groovy
index 0b5d013fe0..4e2ed0970f 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/ServiceTaskProcessor.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ServiceTaskProcessor.groovy
@@ -1,33 +1,33 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.camunda.bpm.engine.delegate.DelegateExecution

-

-

-/**

- * @version 1.0

- *

- */

-public interface ServiceTaskProcessor {

-	  public void preProcessRequest(DelegateExecution execution);

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.camunda.bpm.engine.delegate.DelegateExecution
+
+
+/**
+ * @version 1.0
+ *
+ */
+public interface ServiceTaskProcessor {
+	  public void preProcessRequest(DelegateExecution execution);
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy
new file mode 100644
index 0000000000..8d14ead6e0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy
@@ -0,0 +1,260 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+
+import org.onap.so.bpmn.common.scripts.AaiUtil
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.bpmn.core.domain.InventoryType
+import org.onap.so.bpmn.core.domain.Resource
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.domain.Subscriber
+import org.onap.so.bpmn.core.domain.VnfResource
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+import static org.onap.so.bpmn.common.scripts.GenericUtils.*;
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+/**
+ * This class is contains the scripts used
+ * by the Homing Subflow building block. The
+ * subflow attempts to home the provided
+ * resources by calling sniro.
+ *
+ * @author cb645j
+ *
+ */
+class SniroHomingV1 extends AbstractServiceTaskProcessor{
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SniroHomingV1.class);
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	SniroUtils sniroUtils = new SniroUtils(this)
+
+	/**
+	 * This method validates the incoming variables.
+	 * The method then prepares the sniro request
+	 * and posts it to sniro's rest api.
+	 *
+	 * @param execution
+	 *
+	 * @author cb645j
+	 */
+	public void callSniro(DelegateExecution execution){
+		execution.setVariable("prefix","HOME_")
+		msoLogger.trace("Started Sniro Homing Call Sniro ")
+		try{
+			execution.setVariable("rollbackData", null)
+			execution.setVariable("rolledBack", false)
+
+			String requestId = execution.getVariable("msoRequestId")
+			msoLogger.debug("Incoming Request Id is: "  + requestId)
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			msoLogger.debug("Incoming Service Instance Id is: "  + serviceInstanceId)
+			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+			msoLogger.debug("Incoming Service Decomposition is: "  + serviceDecomposition)
+			String subscriberInfo = execution.getVariable("subscriberInfo")
+			msoLogger.debug("Incoming Subscriber Information is: "  + subscriberInfo)
+
+			if(isBlank(requestId) || isBlank(serviceInstanceId) || isBlank(serviceDecomposition.toString()) || isBlank(subscriberInfo)){
+				exceptionUtil.buildAndThrowWorkflowException(execution, 4000, "A required input variable is missing or null")
+			}else{
+				String subId = jsonUtil.getJsonValue(subscriberInfo, "globalSubscriberId")
+				String subName = jsonUtil.getJsonValue(subscriberInfo, "subscriberName")
+				String subCommonSiteId = ""
+				if(jsonUtil.jsonElementExist(subscriberInfo, "subscriberCommonSiteId")){
+					subCommonSiteId = jsonUtil.getJsonValue(subscriberInfo, "subscriberCommonSiteId")
+				}
+				Subscriber subscriber = new Subscriber(subId, subName, subCommonSiteId)
+
+				String cloudConfiguration = execution.getVariable("cloudConfiguration") // TODO Currently not being used
+				String homingParameters = execution.getVariable("homingParameters") // (aka. request parameters) Should be json format. TODO confirm its json format
+
+				//Authentication
+				String authHeader = UrnPropertiesReader.getVariable("sniro.manager.headers.auth", execution)
+				execution.setVariable("BasicAuthHeaderValue", authHeader)
+
+				//Prepare Callback
+				String timeout = execution.getVariable("timeout")
+				if(isBlank(timeout)){
+					timeout = UrnPropertiesReader.getVariable("sniro.manager.timeout", execution)
+					if(isBlank(timeout)) {
+						timeout = "PT30M";
+					}
+				}
+				msoLogger.debug("Async Callback Timeout will be: " + timeout)
+
+				execution.setVariable("timeout", timeout);
+				execution.setVariable("correlator", requestId);
+				execution.setVariable("messageType", "SNIROResponse");
+
+				//Build Request & Call Sniro
+				String sniroRequest = sniroUtils.buildRequest(execution, requestId, serviceDecomposition, subscriber, homingParameters)
+				execution.setVariable("sniroRequest", sniroRequest)
+				msoLogger.debug("SNIRO Request is: " + sniroRequest)
+
+				String endpoint = UrnPropertiesReader.getVariable("sniro.manager.uri.v1", execution)
+				String host = UrnPropertiesReader.getVariable("sniro.manager.host", execution)
+				String url = host + endpoint
+				msoLogger.debug("Sniro Url is: " + url)
+
+				RESTConfig config = new RESTConfig(url);
+				RESTClient client = new RESTClient(config).addAuthorizationHeader(authHeader).addHeader("Content-Type", "application/json")
+				APIResponse response = client.httpPost(sniroRequest)
+
+				int responseCode = response.getStatusCode()
+				msoLogger.debug("Sniro sync response code is: " + responseCode)
+				msoLogger.debug("Sniro sync response is: " + response.getResponseBodyAsString())
+
+				if(responseCode != 202){
+					exceptionUtil.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from Sniro.")
+				}
+				msoLogger.trace("Completed Sniro Homing Call Sniro")
+			}
+		}catch(BpmnError b){
+			throw b
+		}catch(Exception e){
+			msoLogger.debug("Error encountered within Homing CallSniro method: " + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in Homing CallSniro: " + e.getMessage())
+		}
+	}
+
+	/**
+	 * This method processes the callback response
+	 * and the contained homing solution. It sets
+	 * homing solution assignment and license
+	 * information to the corresponding resources
+	 *
+	 * @param execution
+	 *
+	 * @author cb645j
+	 */
+	public void processHomingSolution(DelegateExecution execution){
+		msoLogger.trace("Started Sniro Homing Process Homing Solution")
+		try{
+			String response = execution.getVariable("asyncCallbackResponse")
+			msoLogger.debug("Sniro Async Callback Response is: " + response)
+
+			sniroUtils.validateCallbackResponse(execution, response)
+
+			ServiceDecomposition decomposition = execution.getVariable("serviceDecomposition")
+			List<Resource> resourceList = decomposition.getServiceResources()
+
+			if(JsonUtils.jsonElementExist(response, "solutionInfo.placementInfo")){
+				String placements = jsonUtil.getJsonValue(response, "solutionInfo.placementInfo")
+				JSONArray arr = new JSONArray(placements)
+				for(int i = 0; i < arr.length(); i++){
+					JSONObject placement = arr.getJSONObject(i)
+					String jsonServiceResourceId = placement.getString("serviceResourceId")
+					for(Resource resource:resourceList){
+						String serviceResourceId = resource.getResourceId()
+						if(serviceResourceId.equalsIgnoreCase(jsonServiceResourceId)){
+							//match
+							String inventoryType = placement.getString("inventoryType")
+							resource.getHomingSolution().setInventoryType(InventoryType.valueOf(inventoryType))
+							resource.getHomingSolution().setCloudRegionId(placement.getString("cloudRegionId"))
+							resource.getHomingSolution().setRehome(placement.getBoolean("isRehome"))
+							JSONArray assignmentArr = placement.getJSONArray("assignmentInfo")
+							Map<String, String> assignmentMap = jsonUtil.entryArrayToMap(execution, assignmentArr.toString(), "variableName", "variableValue")
+							resource.getHomingSolution().setCloudOwner(assignmentMap.get("cloudOwner"))
+							resource.getHomingSolution().setAicClli(assignmentMap.get("aicClli"))
+							resource.getHomingSolution().setAicVersion(assignmentMap.get("aicVersion"))
+							if(inventoryType.equalsIgnoreCase("service")){
+								VnfResource vnf = new VnfResource()
+								vnf.setVnfHostname(assignmentMap.get("vnfHostName"))
+								resource.getHomingSolution().setVnf(vnf)
+								resource.getHomingSolution().setServiceInstanceId(placement.getString("serviceInstanceId"))
+							}
+						}
+					}
+				}
+			}
+
+			if(JsonUtils.jsonElementExist(response, "solutionInfo.licenseInfo")){
+				String licenseInfo = jsonUtil.getJsonValue(response, "solutionInfo.licenseInfo")
+				JSONArray licenseArr = new JSONArray(licenseInfo)
+				for(int l = 0; l < licenseArr.length(); l++){
+					JSONObject license = licenseArr.getJSONObject(l)
+					String jsonServiceResourceId = license.getString("serviceResourceId")
+					for(Resource resource:resourceList){
+						String serviceResourceId = resource.getResourceId()
+						if(serviceResourceId.equalsIgnoreCase(jsonServiceResourceId)){
+							//match
+							String jsonEntitlementPoolList = jsonUtil.getJsonValue(license.toString(), "entitlementPoolList")
+							List<String> entitlementPoolList = jsonUtil.StringArrayToList(execution, jsonEntitlementPoolList)
+							resource.getHomingSolution().getLicense().setEntitlementPoolList(entitlementPoolList)
+
+							String jsonLicenseKeyGroupList = jsonUtil.getJsonValue(license.toString(), "licenseKeyGroupList")
+							List<String> licenseKeyGroupList = jsonUtil.StringArrayToList(execution, jsonLicenseKeyGroupList)
+							resource.getHomingSolution().getLicense().setLicenseKeyGroupList(licenseKeyGroupList)
+						}
+					}
+				}
+			}
+			execution.setVariable("serviceDecomposition", decomposition)
+
+			msoLogger.trace("Completed Sniro Homing Process Homing Solution")
+		}catch(BpmnError b){
+			throw b
+		}catch(Exception e){
+			msoLogger.debug("Error encountered within Homing ProcessHomingSolution method: " + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in Sniro Homing Process Solution")
+		}
+	}
+
+	/**
+	 * This method logs the start of DHVCreateService
+	 * to make debugging easier.
+	 *
+	 * @param - execution
+	 * @author cb645j
+	 */
+	public String logStart(DelegateExecution execution){
+		String requestId = execution.getVariable("testReqId")
+		if(isBlank(requestId)){
+			requestId = execution.getVariable("msoRequestId")
+		}
+		execution.setVariable("DHVCS_requestId", requestId)
+		msoLogger.trace("STARTED Homing Subflow for request: "  + requestId + " ")
+		msoLogger.debug("****** Homing Subflow Global Debug Enabled: " + execution.getVariable("isDebugLogEnabled")  + " *****")
+		msoLogger.trace("STARTED Homing Subflow for request: "  + requestId + " ")
+	}
+
+
+	/**
+	 * Auto-generated method stub
+	 */
+	public void preProcessRequest(DelegateExecution execution){}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SNIROUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroUtils.groovy
index 1233d0423b..fd4ab32215 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SNIROUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroUtils.groovy
@@ -1,334 +1,353 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.json.JSONArray

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

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

-import org.openecomp.mso.bpmn.common.scripts.MsoUtils

-import org.openecomp.mso.bpmn.core.domain.*

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

-import org.apache.commons.lang3.StringUtils

-

-import static  org.openecomp.mso.bpmn.common.scripts.GenericUtils.*

-

-class SNIROUtils{

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-

-	private AbstractServiceTaskProcessor utils

-

-	public MsoUtils msoUtils = new MsoUtils()

-

-	public SNIROUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.utils = taskProcessor

-	}

-

-	/**

-	 * This method builds the service-agnostic

-	 * sniro json request to get a homing solution

-	 * and license solution

-	 *

-	 * @param execution

-	 * @param requestId

-	 * @param decomposition - ServiceDecomposition object

-	 * @param subscriber - Subscriber information

-	 * @param homingParams - Homing/Request parameters

-	 *

-	 * @return request - sniro v2 payload

-	 *

-	 * @author cb645j

-	 */

-	public String buildRequest(DelegateExecution execution, String requestId, ServiceDecomposition decomposition, Subscriber subscriber, String homingParams){

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

-		utils.log("DEBUG", "Started Building Sniro Request", isDebugEnabled)

-		def callbackUrl = utils.createWorkflowMessageAdapterCallbackURL(execution, "SNIROResponse", requestId)

-		def transactionId = requestId

-		//ServiceInstance Info

-		ServiceInstance serviceInstance = decomposition.getServiceInstance()

-		def serviceInstanceId

-		if(serviceInstance == null){

-			utils.log("DEBUG", "Unable to obtain Service Instance Id, ServiceInstance Object is null" , isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - Unable to obtain Service Instance Id, ServiceInstance Object is null")

-		}else{

-			serviceInstanceId = serviceInstance.getInstanceId()

-		}

-		//Model Info

-		ModelInfo model = decomposition.getModelInfo()

-		String modelType = model.getModelType()

-		String modelInvariantId = model.getModelInvariantUuid()

-		String modelVersionId = model.getModelUuid()

-		String modelName = model.getModelName()

-		String modelVersion = model.getModelVersion()

-		//Subscriber Info

-		String subscriberId = subscriber.getGlobalId()

-		String subscriberName = subscriber.getName()

-		String commonSiteId = subscriber.getCommonSiteId()

-		//OrderInfo

-		String orderInfo

-		if(!isBlank(homingParams)){

-			orderInfo = homingParams.replaceAll("\"", "\\\\\"").replaceAll("\n", "").replaceAll("\r", "")

-			orderInfo = StringUtils.normalizeSpace(orderInfo)

-		}

-

-		//Determine RequestType

-		//TODO Figure out better way to determine this

-		String requestType = "initial"

-		List<Resource> resources = decomposition.getServiceResources()

-		for(Resource r:resources){

-			HomingSolution currentSolution = (HomingSolution) r.getCurrentHomingSolution()

-			if(currentSolution != null){

-				requestType = "speed changed"

-			}

-		}

-

-		int timeoutSeconds = 1800

-		String timeout = execution.getVariable("timeout")

-		if(isNotBlank(timeout)){

-			String subT = timeout.substring(2, timeout.length() - 1)

-			int timeoutInt = Integer.parseInt(subT)

-			timeoutSeconds = timeoutInt * 60

-		}

-

-		//Demands

-		String placementDemands = ""

-		StringBuilder sb = new StringBuilder()

-		List<Resource> resourceList = decomposition.getServiceAllottedResources()

-		List<VnfResource> vnfResourceList = decomposition.getServiceVnfs()

-

-		// TODO: We should include both alloted resources and service resources in the placementDeamnds- not one or the other.

-		if(resourceList.isEmpty() || resourceList == null){

-			utils.log("DEBUG", "Allotted Resources List is empty - will try to get service VNFs instead.", isDebugEnabled)

-			resourceList = decomposition.getServiceVnfs()

-		}

-

-		if(resourceList.isEmpty() || resourceList == null){

-			utils.log("DEBUG", "Resources List is Empty", isDebugEnabled)

-		}else{

-			for(Resource resource:resourceList){

-				ModelInfo resourceModelInfo = resource.getModelInfo()

-				ResourceInstance resourceInstance = resource.getResourceInstance()

-				def resourceInstanceType = resource.getResourceType()

-				def serviceResourceId = resource.getResourceId() //TODO - resourceId versus instanceId - should be what is put in AAI, whatever we put here will be what is in response, used to correlate

-				def resourceModuleName = resourceModelInfo.getModelInstanceName()

-				def resouceModelCustomizationId = resourceModelInfo.getModelCustomizationUuid()

-				def resouceModelInvariantId = resourceModelInfo.getModelInvariantUuid()

-				def resouceModelName = resourceModelInfo.getModelName()

-				def resouceModelVersion = resourceModelInfo.getModelVersion()

-				def resouceModelVersionId = resourceModelInfo.getModelUuid()

-				def resouceModelType = resourceModelInfo.getModelType()

-				def tenantId = "" //Optional

-				def tenantName = "" //Optional

-

-

-				String existingPlacement = ""

-				HomingSolution currentPlacement = resource.getCurrentHomingSolution()

-				if(currentPlacement != null){

-					String homedServiceInstanceId = currentPlacement.getServiceInstanceId()

-					existingPlacement =

-					""","existingPlacement": {

-                           "serviceInstanceId": "${homedServiceInstanceId}"

-                    }"""

-				}

-

-

-				String demand =

-					"""{

-						"resourceInstanceType": "${resourceInstanceType}",

-						"serviceResourceId": "${serviceResourceId}",

-						"resourceModuleName": "${resourceModuleName}",

-						"resourceModelInfo": {

-							"modelCustomizationId": "${resouceModelCustomizationId}",

-							"modelInvariantId": "${resouceModelInvariantId}",

-							"modelName": "${resouceModelName}",

-							"modelVersion": "${resouceModelVersion}",

-							"modelVersionId": "${resouceModelVersionId}",

-							"modelType": "${resouceModelType}"

-						},

-						"tenantId": "${tenantId}",

-						"tenantName": "${tenantName}"

-						${existingPlacement}

-					},"""

-

-				placementDemands = sb.append(demand)

-			}

-			placementDemands = placementDemands.substring(0, placementDemands.length() - 1);

-		}

-

-		String licenseDemands = ""

-		sb = new StringBuilder()

-		if(vnfResourceList.isEmpty() || vnfResourceList == null){

-			utils.log("DEBUG", "Vnf Resources List is Empty", isDebugEnabled)

-		}else{

-			for(VnfResource vnfResource:vnfResourceList){

-				ModelInfo vnfResourceModelInfo = vnfResource.getModelInfo()

-				ResourceInstance vnfResourceInstance = vnfResource.getResourceInstance()

-				def resourceInstanceType = vnfResource.getResourceType()

-				def serviceResourceId = vnfResource.getResourceId()

-				def resourceModuleName = vnfResourceModelInfo.getModelInstanceName()

-				def resouceModelCustomizationId = vnfResourceModelInfo.getModelCustomizationUuid()

-				def resouceModelInvariantId = vnfResourceModelInfo.getModelInvariantUuid()

-				def resouceModelName = vnfResourceModelInfo.getModelName()

-				def resouceModelVersion = vnfResourceModelInfo.getModelVersion()

-				def resouceModelVersionId = vnfResourceModelInfo.getModelUuid()

-				def resouceModelType = vnfResourceModelInfo.getModelType()

-

-				String curentLicenseJson = ""

-				HomingSolution currentSol = vnfResource.getCurrentHomingSolution()

-				if(currentSol != null){

-					JSONArray entitlementPoolList = currentSol.getLicense().getEntitlementPoolListAsString()

-					JSONArray licenseKeyGroupList = currentSol.getLicense().getLicenseKeyGroupListAsString()

-					curentLicenseJson =

-					""" ,"existingLicense": [

-                           {

-                                 "entitlementPoolUUID":

-									${entitlementPoolList},

-                                 "licenseKeyGroupUUID":

-									${licenseKeyGroupList}

-

-                           }

-                    	]"""

-				}

-

-				String demand =

-				"""{

-						"resourceInstanceType": "${resourceInstanceType}",

-						"serviceResourceId": "${serviceResourceId}",

-						"resourceModuleName": "${resourceModuleName}",

-						"resourceModelInfo": {

-							"modelCustomizationId": "${resouceModelCustomizationId}",

-							"modelInvariantId": "${resouceModelInvariantId}",

-							"modelName": "${resouceModelName}",

-							"modelVersion": "${resouceModelVersion}",

-							"modelVersionId": "${resouceModelVersionId}",

-							"modelType": "${resouceModelType}"

-						}

-						${curentLicenseJson}

-					},"""

-

-					licenseDemands = sb.append(demand)

-			}

-			licenseDemands = licenseDemands.substring(0, licenseDemands.length() - 1);

-		}

-

-		String request =

-				"""{

-	  	"requestInfo": {

-				"transactionId": "${transactionId}",

-				"requestId": "${requestId}",

-				"callbackUrl": "${callbackUrl}",

-				"sourceId": "mso",

-				"requestType": "${requestType}",

-				"optimizer": [

-					"placement",

-					"license"

-				],

-				"numSolutions": 1,

-				"timeout": ${timeoutSeconds}

-				},

-		"placementInfo": {

-			"serviceModelInfo": {

-				"modelType": "${modelType}",

-				"modelInvariantId": "${modelInvariantId}",

-				"modelVersionId": "${modelVersionId}",

-				"modelName": "${modelName}",

-				"modelVersion": "${modelVersion}"

-				},

-			"subscriberInfo": {

-				"globalSubscriberId": "${subscriberId}",

-				"subscriberName": "${subscriberName}",

-				"subscriberCommonSiteId": "${commonSiteId}"

-				},

-			"demandInfo": {

-				"placementDemand": [

-					${placementDemands}

-				],

-				"licenseDemand": [

-					${licenseDemands}

-				]

-			},

-			"policyId": [],

-			"serviceInstanceId": "${serviceInstanceId}",

-			"orderInfo": "{\\\"requestParameters\\\": ${orderInfo}}"

-		}

-	  }"""

-

-	  	utils.log("DEBUG", "Completed Building Sniro Request", isDebugEnabled)

-		return request

-	}

-

-	/**

-	 * This method validates the callback response

-	 * from Sniro. If the response contains an

-	 * exception the method will build and throw

-	 * a workflow exception.

-	 *

-	 * @param execution

-	 * @param response - the async callback response from sniro

-	 *

-	 * @author cb645j

-	 */

-	public void validateCallbackResponse(DelegateExecution execution, String response){

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

-		String placements = ""

-		if(isBlank(response)){

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Sniro Async Callback Response is Empty")

-		}else{

-			if(JsonUtils.jsonElementExist(response, "solutionInfo.placement")){

-				placements = jsonUtil.getJsonValue(response, "solutionInfo.placement")

-				if(isBlank(placements) || placements.equalsIgnoreCase("[]")){

-					String statusMessage = jsonUtil.getJsonValue(response, "statusMessage")

-					if(isBlank(statusMessage)){

-						utils.log("DEBUG", "Error Occured in Homing: Sniro Async Callback Response does not contain placement solution.", isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Sniro Async Callback Response does not contain placement solution.")

-					}else{

-						utils.log("DEBUG", "Error Occured in Homing: " + statusMessage, isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 400, statusMessage)

-					}

-				}else{

-					return

-				}

-			}else if(JsonUtils.jsonElementExist(response, "requestError") == true){

-				String errorMessage = ""

-				if(response.contains("policyException")){

-					String text = jsonUtil.getJsonValue(response, "requestError.policyException.text")

-					errorMessage = "Sniro Async Callback Response contains a Request Error Policy Exception: " + text

-				}else if(response.contains("serviceException")){

-					String text = jsonUtil.getJsonValue(response, "requestError.serviceException.text")

-					errorMessage = "Sniro Async Callback Response contains a Request Error Service Exception: " + text

-				}else{

-					errorMessage = "Sniro Async Callback Response contains a Request Error. Unable to determine the Request Error Exception."

-				}

-				utils.log("DEBUG", "Error Occured in Homing: " + errorMessage, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 400, errorMessage)

-

-			}else{

-				utils.log("DEBUG", "Error Occured in Homing: Received an Unknown Async Callback Response from Sniro.", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Received an Unknown Async Callback Response from Sniro.")

-			}

-		}

-

-	}

-

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.json.JSONArray
+import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.onap.so.bpmn.common.scripts.ExceptionUtil
+import org.onap.so.bpmn.common.scripts.MsoUtils
+import org.onap.so.bpmn.core.domain.*
+import org.onap.so.bpmn.core.json.JsonUtils
+import org.apache.commons.lang3.StringUtils
+
+import static  org.onap.so.bpmn.common.scripts.GenericUtils.*
+
+import java.time.Duration
+
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+class SniroUtils{
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SniroUtils.class);
+
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+
+	private AbstractServiceTaskProcessor utils
+
+	public MsoUtils msoUtils = new MsoUtils()
+
+	public SniroUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.utils = taskProcessor
+	}
+
+	/**
+	 * This method builds the service-agnostic
+	 * sniro json request to get a homing solution
+	 * and license solution
+	 *
+	 * @param execution
+	 * @param requestId
+	 * @param decomposition - ServiceDecomposition object
+	 * @param subscriber - Subscriber information
+	 * @param homingParams - Homing/Request parameters
+	 *
+	 * @return request - sniro v2 payload
+	 *
+	 * @author cb645j
+	 */
+	public String buildRequest(DelegateExecution execution, String requestId, ServiceDecomposition decomposition, Subscriber subscriber, String homingParams){
+		msoLogger.debug("Started Building Sniro Request")
+		def callbackUrl = utils.createWorkflowMessageAdapterCallbackURL(execution, "SNIROResponse", requestId)
+		def transactionId = requestId
+		//ServiceInstance Info
+		ServiceInstance serviceInstance = decomposition.getServiceInstance()
+		def serviceInstanceId
+		if(serviceInstance == null){
+			msoLogger.debug("Unable to obtain Service Instance Id, ServiceInstance Object is null" )
+			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - Unable to obtain Service Instance Id, ServiceInstance Object is null")
+		}else{
+			serviceInstanceId = serviceInstance.getInstanceId()
+		}
+		String type = decomposition.getServiceType()
+		String serviceType = ""
+		if(isNotBlank(type)){
+			serviceType = """ "serviceType": "${type}", """
+		}
+		//Model Info
+		ModelInfo model = decomposition.getModelInfo()
+		String modelType = model.getModelType()
+		String modelInvariantId = model.getModelInvariantUuid()
+		String modelVersionId = model.getModelUuid()
+		String modelName = model.getModelName()
+		String modelVersion = model.getModelVersion()
+		//Subscriber Info
+		String subscriberId = subscriber.getGlobalId()
+		String subscriberName = subscriber.getName()
+		String commonSiteId = subscriber.getCommonSiteId()
+		//OrderInfo
+		String orderInfo
+		if(!isBlank(homingParams)){
+			orderInfo = homingParams.replaceAll("\"", "\\\\\"").replaceAll("\n", "").replaceAll("\r", "")
+			orderInfo = StringUtils.normalizeSpace(orderInfo)
+		}
+
+		//Determine RequestType
+		//TODO Implement better way to determine this
+		String requestType = "initial"
+		List<Resource> resources = decomposition.getServiceResources()
+		for(Resource r:resources){
+			HomingSolution currentSolution = (HomingSolution) r.getCurrentHomingSolution()
+			if(currentSolution != null){
+				requestType = "speed changed"
+			}
+		}
+
+		String timeout = execution.getVariable("timeout")
+		Duration d = Duration.parse(timeout);
+		long timeoutSeconds = d.getSeconds();
+
+		//Demands
+		String placementDemands = ""
+		StringBuilder sb = new StringBuilder()
+		List<Resource> resourceList = decomposition.getAllottedResources()
+		List<VnfResource> vnfResourceList = decomposition.getVnfResources()
+
+		//TODO should be service agnostic so this is just a temp solution to all vnfs to be sent in placement container for adiod
+		if(resourceList.isEmpty() || resourceList == null){
+			search : {
+				for(VnfResource vnf : vnfResourceList){
+					if(StringUtils.containsIgnoreCase(vnf.getNfRole(), "vce") || StringUtils.containsIgnoreCase(vnf.getNfRole(), "vpe")){
+						resourceList = decomposition.getVnfResources()
+						break search
+					}
+				}
+			}
+		}
+
+		if(resourceList.isEmpty() || resourceList == null){
+			msoLogger.debug("Resources List is Empty")
+		}else{
+			for(Resource resource:resourceList){
+				ModelInfo resourceModelInfo = resource.getModelInfo()
+				ResourceInstance resourceInstance = resource.getResourceInstance()
+				def resourceInstanceType = resource.getResourceType()
+				def serviceResourceId = resource.getResourceId() //TODO - resourceId versus instanceId - should be what is put in AAI, whatever we put here will be what is in response, used to correlate
+				def resourceModuleName = resourceModelInfo.getModelInstanceName()
+				def resouceModelCustomizationId = resourceModelInfo.getModelCustomizationUuid()
+				def resouceModelInvariantId = resourceModelInfo.getModelInvariantUuid()
+				def resouceModelName = resourceModelInfo.getModelName()
+				def resouceModelVersion = resourceModelInfo.getModelVersion()
+				def resouceModelVersionId = resourceModelInfo.getModelUuid()
+				def resouceModelType = resourceModelInfo.getModelType()
+				def tenantId = "" //Optional
+				def tenantName = "" //Optional
+
+
+				String existingPlacement = ""
+				HomingSolution currentPlacement = resource.getCurrentHomingSolution()
+				if(currentPlacement != null){
+					String homedServiceInstanceId = currentPlacement.getServiceInstanceId()
+					existingPlacement =
+					""","existingPlacement": {
+                           "serviceInstanceId": "${homedServiceInstanceId}"
+                    }"""
+				}
+
+
+				String demand =
+					"""{
+						"resourceInstanceType": "${resourceInstanceType}",
+						"serviceResourceId": "${serviceResourceId}",
+						"resourceModuleName": "${resourceModuleName}",
+						"resourceModelInfo": {
+							"modelCustomizationId": "${resouceModelCustomizationId}",
+							"modelInvariantId": "${resouceModelInvariantId}",
+							"modelName": "${resouceModelName}",
+							"modelVersion": "${resouceModelVersion}",
+							"modelVersionId": "${resouceModelVersionId}",
+							"modelType": "${resouceModelType}"
+						},
+						"tenantId": "${tenantId}",
+						"tenantName": "${tenantName}"
+						${existingPlacement}
+					},"""
+
+				placementDemands = sb.append(demand)
+			}
+			placementDemands = placementDemands.substring(0, placementDemands.length() - 1);
+		}
+
+		String licenseDemands = ""
+		sb = new StringBuilder()
+		if(vnfResourceList.isEmpty() || vnfResourceList == null){
+			msoLogger.debug("Vnf Resources List is Empty")
+		}else{
+			for(VnfResource vnfResource:vnfResourceList){
+				ModelInfo vnfResourceModelInfo = vnfResource.getModelInfo()
+				ResourceInstance vnfResourceInstance = vnfResource.getResourceInstance()
+				def resourceInstanceType = vnfResource.getResourceType()
+				def serviceResourceId = vnfResource.getResourceId()
+				def resourceModuleName = vnfResourceModelInfo.getModelInstanceName()
+				def resouceModelCustomizationId = vnfResourceModelInfo.getModelCustomizationUuid()
+				def resouceModelInvariantId = vnfResourceModelInfo.getModelInvariantUuid()
+				def resouceModelName = vnfResourceModelInfo.getModelName()
+				def resouceModelVersion = vnfResourceModelInfo.getModelVersion()
+				def resouceModelVersionId = vnfResourceModelInfo.getModelUuid()
+				def resouceModelType = vnfResourceModelInfo.getModelType()
+
+				String curentLicenseJson = ""
+				HomingSolution currentSol = vnfResource.getCurrentHomingSolution()
+				if(currentSol != null){
+					JSONArray entitlementPoolList = currentSol.getLicense().getEntitlementPoolListAsString()
+					JSONArray licenseKeyGroupList = currentSol.getLicense().getLicenseKeyGroupListAsString()
+					curentLicenseJson =
+					""" ,"existingLicense": {
+                                 "entitlementPoolUUID":
+									${entitlementPoolList},
+                                 "licenseKeyGroupUUID":
+									${licenseKeyGroupList}
+
+                           }"""
+				}
+
+				String demand =
+				"""{
+						"resourceInstanceType": "${resourceInstanceType}",
+						"serviceResourceId": "${serviceResourceId}",
+						"resourceModuleName": "${resourceModuleName}",
+						"resourceModelInfo": {
+							"modelCustomizationId": "${resouceModelCustomizationId}",
+							"modelInvariantId": "${resouceModelInvariantId}",
+							"modelName": "${resouceModelName}",
+							"modelVersion": "${resouceModelVersion}",
+							"modelVersionId": "${resouceModelVersionId}",
+							"modelType": "${resouceModelType}"
+						}
+						${curentLicenseJson}
+					},"""
+
+					licenseDemands = sb.append(demand)
+			}
+			licenseDemands = licenseDemands.substring(0, licenseDemands.length() - 1);
+		}
+
+		String request =
+				"""{
+	  	"requestInfo": {
+				"transactionId": "${transactionId}",
+				"requestId": "${requestId}",
+				"callbackUrl": "${callbackUrl}",
+				"sourceId": "mso",
+				"requestType": "${requestType}",
+				"optimizer": [
+					"placement",
+					"license"
+				],
+				"numSolutions": 1,
+				"timeout": ${timeoutSeconds}
+				},
+		"placementInfo": {
+			${serviceType}
+			"serviceModelInfo": {
+				"modelType": "${modelType}",
+				"modelInvariantId": "${modelInvariantId}",
+				"modelVersionId": "${modelVersionId}",
+				"modelName": "${modelName}",
+				"modelVersion": "${modelVersion}"
+				},
+			"subscriberInfo": {
+				"globalSubscriberId": "${subscriberId}",
+				"subscriberName": "${subscriberName}",
+				"subscriberCommonSiteId": "${commonSiteId}"
+				},
+			"demandInfo": {
+				"placementDemand": [
+					${placementDemands}
+				],
+				"licenseDemand": [
+					${licenseDemands}
+				]
+			},
+			"policyId": [],
+			"serviceInstanceId": "${serviceInstanceId}",
+			"orderInfo": "{\\\"requestParameters\\\": ${orderInfo}}"
+		}
+	  }"""
+
+		msoLogger.debug("Completed Building Sniro Request")
+		return request
+	}
+
+	/**
+	 * This method validates the async callback response from Sniro.
+	 * If the response contains an exception the method will build
+	 * and throw a workflow exception.
+	 *
+	 * @param execution
+	 * @param response - sniro async response
+	 *
+	 * @author cb645j
+	 */
+	//TODO needs updating per sniro changes
+	public void validateCallbackResponse(DelegateExecution execution, String response){
+		try{
+			String placements = ""
+			String licenses = ""
+			if(isBlank(response)){
+				exceptionUtil.buildAndThrowWorkflowException(execution, 5000, "Sniro Async Callback Response is Empty")
+			}else{
+				if(JsonUtils.jsonElementExist(response, "solutionInfo")){
+					if(JsonUtils.jsonElementExist(response, "solutionInfo.placementInfo")){
+						placements = jsonUtil.getJsonValue(response, "solutionInfo.placementInfo")
+					}
+					if(JsonUtils.jsonElementExist(response, "solutionInfo.licenseInfo")){
+						licenses = jsonUtil.getJsonValue(response, "solutionInfo.licenseInfo")
+					}
+					if((isBlank(placements) || placements.equalsIgnoreCase("[]")) && (isBlank(licenses) || licenses.equalsIgnoreCase("[]"))){
+						msoLogger.debug("Sniro Async Response does not contain: licenses or placements")
+						exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Sniro Async Callback Response does not contain: licenses or placements")
+					}else{
+						return
+					}
+				}else if(JsonUtils.jsonElementExist(response, "requestError") == true){
+					String errorMessage = ""
+					if(response.contains("policyException")){
+						String text = jsonUtil.getJsonValue(response, "requestError.policyException.text")
+						errorMessage = "Sniro Async Response contains a policy error: " + text
+					}else if(response.contains("serviceException")){
+						String text = jsonUtil.getJsonValue(response, "requestError.serviceException.text")
+						errorMessage = "Sniro Async Response contains a service error: " + text
+					}else{
+						errorMessage = "Sniro Async Response contains an error: not provided"
+					}
+					msoLogger.debug("Sniro Async Response contains an error: " + errorMessage)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 400, errorMessage)
+
+				}else{
+					msoLogger.debug("Sniro Async Response contains an error: not provided")
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Sniro Async Response contains an error: not provided")
+				}
+			}
+		}catch(BpmnError b){
+			throw b
+		}catch(Exception e){
+			msoLogger.debug("Error encountered within Homing validateCallbackResponse method: " + e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in Sniro Homing Validate Async Response")
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/TrinityExceptionUtil.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtil.groovy
index e75b115b63..3cf1edb8ca 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/TrinityExceptionUtil.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtil.groovy
@@ -1,382 +1,382 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.apache.commons.lang3.*

-

-class TrinityExceptionUtil {

-	

-	

-	

-	public static enum Error {

-		SVC_GENERAL_SERVICE_ERROR("SVC0001","Internal Error"),

-		SVC_BAD_PARAMETER("SVC0002", "Invalid input value for message part %1"),

-		SVC_NO_SERVER_RESOURCES("SVC1000", "No server resources available to process the request"),

-		SVC_DETAILED_SERVICE_ERROR("SVC2000", "The following service error occurred: %1. Error code is %2."),

-		POL_GENERAL_POLICY_ERROR("POL0001", "A policy error occurred."),

-		POL_USER_NOT_PROVISIONED("POL1009", "User has not been provisioned for service"),

-		POL_USER_SUSPENDED("POL1010", "User has been suspended from service"),

-		POL_DETAILED_POLICY_ERROR("POL2000", "The following policy error occurred: %1. Error code is %2."),

-		POL_MSG_SIZE_EXCEEDS_LIMIT("POL9003", "Message content size exceeds the allowable limit")

-	

-

-		private final String msgId

-		private final String msgTxt

-

-		private Error(String msgId, String msgTxt) {

-			this.msgId = msgId

-			this.msgTxt = msgTxt

-		}

-

-		public String getMsgId() {

-		     return msgId

-		  }

-

-		public String getMsgTxt() {

-			return msgTxt

-		}

-

-	}

-

-

-	

-	

-	String mapAdapterExecptionToCommonException(String response, DelegateExecution execution)

-	{

-		def utils=new MsoUtils()

-		def method = getClass().getSimpleName() + '.mapAdapterExecptionToCommonException(' +

-			'execution=' + execution.getId() +

-			')'

-

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

-		utils.log("DEBUG",'Entered ' + method, isDebugLogEnabled)

-

-		

-		def errorCode

-

-		

-		try {

-			  errorCode = MapCategoryToErrorCode(utils.getNodeText(response, "category")) 

-			  execution.setVariable(prefix+"err",errorCode)

-			  String message = buildException(response, execution)

-			  utils.log("DEBUG","=========== End MapAdapterExecptionToWorkflowException ===========",isDebugLogEnabled)

-			  return message

-		}catch (Exception ex) {

-			//Ignore the exception - cases include non xml payload

-			utils.log("DEBUG","error mapping error, ignoring: " + ex,isDebugLogEnabled)

-			utils.log("DEBUG","=========== End MapAdapterExecptionToWorkflowException ===========",isDebugLogEnabled)

-			return buildException(response, execution)

-		} 

-	}

-	

-	/**

-	 * @param response

-	 * @param execution

-	 * @return mapped exception

-	 */

-	String mapAOTSExecptionToCommonException(String response, DelegateExecution execution)

-	{

-		def utils=new MsoUtils()

-

-		def prefix=execution.getVariable("prefix")

-		def method = getClass().getSimpleName() + '.mapAOTSExecptionToCommonException(' +

-			'execution=' + execution.getId() +

-			')'

-

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

-		utils.log("DEBUG",'Entered ' + method, isDebugLogEnabled)

-		

-		

-		try {

-			  def errorCode = utils.getNodeText(response,"code")

-			  def descr = utils.getNodeText(response, "description")

-			  def mappedErr = mapErrorCodetoError(errorCode, descr)

-			  if(mappedErr == Error.SVC_DETAILED_SERVICE_ERROR || mappedError == Error.POL_DETAILED_POLICY_ERROR){

-				  ArrayList myVars = new ArrayList()

-				  myVars.add(descr)

-				  myVars.add(errorCode)

-				  execution.setVariable(prefix+"errVariables", myVars)

-			  }

-			  execution.setVariable(prefix+"err",mappedErr)

-			  def message = buildException("Received error from AOTS: " + descr, execution)

-			  utils.log("DEBUG","=========== End MapAOTSExecptionToCommonException ===========",isDebugLogEnabled)

-			  return message

-		}catch (Exception ex) {

-			//Ignore the exception - cases include non xml payload

-			utils.log("DEBUG","error mapping error, ignoring: " + ex,isDebugLogEnabled)

-			utils.log("DEBUG","=========== End MapAOTSExecptionToCommonException ===========",isDebugLogEnabled)

-			return buildException(response, execution)

-		}

-	}

-	

-	String mapSDNCAdapterExceptionToErrorResponse(String sdncAdapterCallbackRequest, DelegateExecution execution) {

-		def utils=new MsoUtils()

-		def prefix=execution.getVariable("prefix")

-		def method = getClass().getSimpleName() + '.mapSDNCAdapterExceptionToErrorResponse(' +

-			'execution=' + execution.getId() +

-			')'

-

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

-		utils.log("DEBUG",'Entered ' + method, isDebugLogEnabled)

-		

-		def sdncResponseCode

-		String responseCode = execution.getVariable(prefix+"ResponseCode")

-		utils.log("DEBUG",'responseCode to map: ' + responseCode, isDebugLogEnabled)

-		def errorMessage

-		

-		try {

-			

-			if(utils.nodeExists(sdncAdapterCallbackRequest, "RequestData")) {

-				def reqDataXml = StringEscapeUtils.unescapeXml(utils.getNodeXml(sdncAdapterCallbackRequest, "RequestData"))

-				errorMessage = utils.getNodeText(reqDataXml, "response-message")

-				sdncResponseCode = utils.getNodeText(reqDataXml, "response-code")

-			}else{

-				errorMessage = utils.getNodeText(sdncAdapterCallbackRequest, "ResponseMessage")

-				sdncResponseCode = responseCode

-		    }

-			def mappedErr = mapErrorCodetoError(responseCode, errorMessage)

-			errorMessage = errorMessage.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")

-			def modifiedErrorMessage = "Received error from SDN-C: " + errorMessage

-			if(mappedErr == Error.SVC_DETAILED_SERVICE_ERROR || mappedErr == Error.POL_DETAILED_POLICY_ERROR){

-				ArrayList myVars = new ArrayList()

-				myVars.add(errorMessage)

-				myVars.add(sdncResponseCode)

-				execution.setVariable(prefix+"errVariables", myVars)

-			}

-			execution.setVariable(prefix+"err",mappedErr)

-			def message = buildException(modifiedErrorMessage, execution)

-

-			

-			utils.log("DEBUG","=========== End MapSDNCAdapterException ===========",isDebugLogEnabled)

-		    return message

-		}catch (Exception ex) {

-			//Ignore the exception - cases include non xml payload

-			utils.log("DEBUG","error mapping sdnc error, ignoring: " + ex,isDebugLogEnabled)

-			utils.log("DEBUG","=========== End MapSDNCAdapterException ===========",isDebugLogEnabled)

-			return null

-		} 

-		

-	}

-	

-	/**

-	 * @param response message from called component (ex: AAI)

-	 * @param execution

-	 * @return an error response conforming to the common 

-	 */

-	String mapAAIExceptionTCommonException(String response, DelegateExecution execution)

-	{

-		def utils=new MsoUtils()

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def prefix=execution.getVariable("prefix")

-		def method = getClass().getSimpleName() + '.mapAAIExceptionTCommonException(' +

-			'execution=' + execution.getId() +

-			')'

-

-		utils.log("DEBUG",'Entered ' + method, isDebugLogEnabled)

-		def variables

-		def message

-		String errorCode = 'SVC0001'

-		utils.log("DEBUG","response: " + response, isDebugLogEnabled)

-		//they use the same format we do, pass their error along

-		//TODO add Received error from A&AI at beg of text

-		try {

-			 message = utils.getNodeXml(response, "requestError")

-			 message = utils.removeXmlNamespaces(message)

-		} catch (Exception ex) {

-			//Ignore the exception - cases include non xml payload

-				message = buildException("Received error from A&AI, unable to parse",execution)

-			utils.log("DEBUG","error mapping error, ignoring: " + ex,isDebugLogEnabled)

-		}

-		

-		if(message != null) { 

-			 execution.setVariable(prefix+"ErrorResponse",message)

-			 utils.log("ERROR","Fault:"+ execution.getVariable(prefix+"ErrorResponse"))

-			 return message

-		} else {

-			

-				return null

-			

-		}

-	}

-	

-	/**

-	 * @param execution

-	 * @return an error response conforming to the common API with default text msg

-	 */

-	String buildException(execution){

-		return buildException(null, execution)

-	}

-	

-	/**

-	 * @param response message from called component (ex: AAI)

-	 * @param execution

-	 * @return an error response conforming to the common

-	 */

-	String buildException(response, execution){

-		def utils=new MsoUtils()

-		def method = getClass().getSimpleName() + '.buildException(' +

-			'execution=' + execution.getId() +

-			')'

-

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

-		utils.log("DEBUG",'Entered ' + method, isDebugLogEnabled)

-		def prefix=execution.getVariable("prefix")

-		def responseCode = String.valueOf(execution.getVariable(prefix+"ResponseCode"))

-		def variables

-		utils.log("DEBUG","response: " + response, isDebugLogEnabled)

-		

-			try {

-				utils.log("DEBUG","formatting error message" ,isDebugLogEnabled)

-				def msgVars = execution.getVariable(prefix+"errVariables")

-				def myErr = execution.getVariable(prefix+"err")

-				def messageTxt = execution.getVariable(prefix+"errTxt")

-				def messageId = null

-				

-				if(myErr == null){

-					utils.log("DEBUG","mapping response code: " + responseCode, isDebugLogEnabled)

-					myErr = mapErrorCodetoError(responseCode, response)

-					if(myErr == null){

-						//not a service or policy error, just return error code

-						return ""

-					}

-				}

-				messageId = myErr.getMsgId()

-				

-				if(messageTxt == null){

-					if(myErr!=null){

-						messageTxt = myErr.getMsgTxt()

-					}else{

-						messageTxt = response

-					}

-				}

-				

-				if(msgVars==null && (myErr == Error.SVC_DETAILED_SERVICE_ERROR || myErr == Error.POL_DETAILED_POLICY_ERROR)){

-					msgVars = new ArrayList()

-					msgVars.add(response)

-					msgVars.add(responseCode)

-				}

-				

-				def msgVarsXML=""

-				StringBuffer msgVarsBuff = new StringBuffer()

-				if(msgVars!=null){

-					for(String msgVar : msgVars){

-						msgVarsBuff.append(

-							"""

-			<tns:variables>${msgVar}</tns:variables>""")

-					}

-					

-				}

-				def message = ""

-				if(messageId.startsWith("SVC")){

-					message = """<tns:requestError xmlns:tns="http://org.openecomp/mso/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.openecomp/mso/request/types/v1 MsoServiceInstanceTypesV1.xsd">

-	<tns:serviceException>

-		<tns:messageId>${messageId}</tns:messageId>

-		<tns:text>${messageTxt}</tns:text>${msgVarsBuff}

-	</tns:serviceException>

-</tns:requestError>""" 

-				}else{

-					message ="""<tns:requestError xmlns:tns="http://org.openecomp/mso/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.openecomp/mso/request/types/v1 MsoServiceInstanceTypesV1.xsd">

-	<tns:policyException>

-		<tns:messageId>${messageId}</tns:messageId>

-		<tns:text>${messageTxt}</tns:text>${msgVarsBuff}

-	</tns:policyException>

-</tns:requestError>""" 

-				}

-				 utils.log("DEBUG", "message " + message, isDebugLogEnabled)

-				 execution.setVariable(prefix+"ErrorResponse",message)

-				 execution.setVariable(prefix+"err", myErr)

-				 execution.setVariable(prefix+"errTxt", messageTxt)

-				 execution.setVariable(prefix+"errVariables", msgVars)

-				 utils.log("ERROR","Fault:"+ execution.getVariable(prefix+"ErrorResponse"))

-				 return message

-			}catch(Exception ex) {

-				utils.log("DEBUG","error mapping error, return null: " + ex,isDebugLogEnabled)

-				return null

-			}

-

-	}

-	

-	String parseError(DelegateExecution execution){

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

-		def utils=new MsoUtils()

-		def prefix=execution.getVariable("prefix")

-		def text = execution.getVariable(prefix+"errTxt")

-		def msgVars = execution.getVariable(prefix+"errVariables")

-		utils.log("DEBUG",'parsing message: ' + text, isDebugLogEnabled)

-		if(text == null){

-			return 'failed'

-		}

-		if(msgVars!=null && !msgVars.isEmpty()){

-			for(int i=0; i<msgVars.size(); i++){

-				text = text.replaceFirst("%"+(i+1), msgVars[i])

-			}

-		}

-		utils.log("DEBUG",'parsed message is: ' + text, isDebugLogEnabled)

-		return text

-	}

-	

-	

-

-	Error mapErrorCodetoError(responseCode, descr)

-	{

-		

-		if(responseCode==null || responseCode=='0' || responseCode=='500' || responseCode =='408'){

-			return Error.SVC_NO_SERVER_RESOURCES

-		}else if(responseCode == '401' || responseCode == '405' || responseCode == '409' || responseCode == '503'){

-			return null

-		}else if(responseCode == '400'){

-			if(descr==null){

-				return Error.SVC_GENERAL_SERVICE_ERROR

-			}else{

-				return Error.SVC_DETAILED_SERVICE_ERROR

-			}

-		}else if(responseCode == '401'){

-			if(descr==null){

-				return Error.POL_GENERAL_POLICY_ERROR

-			}else{

-				return Error.POL_DETAILED_POLICY_ERROR

-			}

-		}else{

-			return Error.SVC_NO_SERVER_RESOURCES

-		}

-	}

-	

-	String mapCategoryToErrorCode(String errorCategory)

-	{

-		if(errorCategory.equals('OPENSTACK'))

-			return Error.SVC_NO_SERVER_RESOURCES

-		else if (errorCategory.equals('IO'))

-			return Error.SVC_NO_SERVER_RESOURCES

-		else if (errorCategory.equals('INTERNAL'))

-			return Error.SVC_NO_SERVER_RESOURCES

-		else if (errorCategory.equals('USERDATA'))

-			return Error.SVC_GENERAL_SERVICE_ERROR

-		else

-			return Error.SVC_GENERAL_SERVICE_ERROR

-	}

-	

-	

-	

-

-	

-	

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.apache.commons.lang3.*
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+class TrinityExceptionUtil {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, TrinityExceptionUtil.class);
+
+	
+	
+	
+	public static enum Error {
+		SVC_GENERAL_SERVICE_ERROR("SVC0001","Internal Error"),
+		SVC_BAD_PARAMETER("SVC0002", "Invalid input value for message part %1"),
+		SVC_NO_SERVER_RESOURCES("SVC1000", "No server resources available to process the request"),
+		SVC_DETAILED_SERVICE_ERROR("SVC2000", "The following service error occurred: %1. Error code is %2."),
+		POL_GENERAL_POLICY_ERROR("POL0001", "A policy error occurred."),
+		POL_USER_NOT_PROVISIONED("POL1009", "User has not been provisioned for service"),
+		POL_USER_SUSPENDED("POL1010", "User has been suspended from service"),
+		POL_DETAILED_POLICY_ERROR("POL2000", "The following policy error occurred: %1. Error code is %2."),
+		POL_MSG_SIZE_EXCEEDS_LIMIT("POL9003", "Message content size exceeds the allowable limit")
+	
+
+		private final String msgId
+		private final String msgTxt
+
+		private Error(String msgId, String msgTxt) {
+			this.msgId = msgId
+			this.msgTxt = msgTxt
+		}
+
+		public String getMsgId() {
+		     return msgId
+		  }
+
+		public String getMsgTxt() {
+			return msgTxt
+		}
+
+	}
+
+
+	
+	
+	String mapAdapterExecptionToCommonException(String response, DelegateExecution execution)
+	{
+		def utils=new MsoUtils()
+		def method = getClass().getSimpleName() + '.mapAdapterExecptionToCommonException(' +
+			'execution=' + execution.getId() +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+
+		
+		def errorCode
+
+		
+		try {
+			  errorCode = MapCategoryToErrorCode(utils.getNodeText(response, "category")) 
+			  execution.setVariable(prefix+"err",errorCode)
+			  String message = buildException(response, execution)
+			  msoLogger.trace("End MapAdapterExecptionToWorkflowException ")
+			  return message
+		}catch (Exception ex) {
+			//Ignore the exception - cases include non xml payload
+			msoLogger.debug("error mapping error, ignoring: " + ex)
+			msoLogger.trace("End MapAdapterExecptionToWorkflowException ")
+			return buildException(response, execution)
+		} 
+	}
+	
+	/**
+	 * @param response
+	 * @param execution
+	 * @return mapped exception
+	 */
+	String mapAOTSExecptionToCommonException(String response, DelegateExecution execution)
+	{
+		def utils=new MsoUtils()
+
+		def prefix=execution.getVariable("prefix")
+		def method = getClass().getSimpleName() + '.mapAOTSExecptionToCommonException(' +
+			'execution=' + execution.getId() +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+		
+		
+		try {
+			  def errorCode = utils.getNodeText(response,"code")
+			  def descr = utils.getNodeText(response, "description")
+			  def mappedErr = mapErrorCodetoError(errorCode, descr)
+			  if(mappedErr == Error.SVC_DETAILED_SERVICE_ERROR || mappedError == Error.POL_DETAILED_POLICY_ERROR){
+				  ArrayList myVars = new ArrayList()
+				  myVars.add(descr)
+				  myVars.add(errorCode)
+				  execution.setVariable(prefix+"errVariables", myVars)
+			  }
+			  execution.setVariable(prefix+"err",mappedErr)
+			  def message = buildException("Received error from AOTS: " + descr, execution)
+			  msoLogger.trace("End MapAOTSExecptionToCommonException ")
+			  return message
+		}catch (Exception ex) {
+			//Ignore the exception - cases include non xml payload
+			msoLogger.debug("error mapping error, ignoring: " + ex)
+			msoLogger.trace("End MapAOTSExecptionToCommonException ")
+			return buildException(response, execution)
+		}
+	}
+	
+	String mapSDNCAdapterExceptionToErrorResponse(String sdncAdapterCallbackRequest, DelegateExecution execution) {
+		def utils=new MsoUtils()
+		def prefix=execution.getVariable("prefix")
+		def method = getClass().getSimpleName() + '.mapSDNCAdapterExceptionToErrorResponse(' +
+			'execution=' + execution.getId() +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+		
+		def sdncResponseCode
+		String responseCode = execution.getVariable(prefix+"ResponseCode")
+		msoLogger.debug('responseCode to map: ' + responseCode)
+		def errorMessage
+		
+		try {
+			
+			if(utils.nodeExists(sdncAdapterCallbackRequest, "RequestData")) {
+				def reqDataXml = utils.getNodeXml(sdncAdapterCallbackRequest, "RequestData")
+				errorMessage = utils.getNodeText(reqDataXml, "response-message")
+				sdncResponseCode = utils.getNodeText(reqDataXml, "response-code")
+			}else{
+				errorMessage = utils.getNodeText(sdncAdapterCallbackRequest, "ResponseMessage")
+				sdncResponseCode = responseCode
+		    }
+			def mappedErr = mapErrorCodetoError(responseCode, errorMessage)
+			errorMessage = errorMessage
+			def modifiedErrorMessage = "Received error from SDN-C: " + errorMessage
+			if(mappedErr == Error.SVC_DETAILED_SERVICE_ERROR || mappedErr == Error.POL_DETAILED_POLICY_ERROR){
+				ArrayList myVars = new ArrayList()
+				myVars.add(errorMessage)
+				myVars.add(sdncResponseCode)
+				execution.setVariable(prefix+"errVariables", myVars)
+			}
+			execution.setVariable(prefix+"err",mappedErr)
+			def message = buildException(modifiedErrorMessage, execution)
+
+			
+			msoLogger.trace("End MapSDNCAdapterException ")
+		    return message
+		}catch (Exception ex) {
+			//Ignore the exception - cases include non xml payload
+			msoLogger.debug("error mapping sdnc error, ignoring: " + ex)
+			msoLogger.trace("End MapSDNCAdapterException ")
+			return null
+		} 
+		
+	}
+	
+	/**
+	 * @param response message from called component (ex: AAI)
+	 * @param execution
+	 * @return an error response conforming to the common 
+	 */
+	String mapAAIExceptionTCommonException(String response, DelegateExecution execution)
+	{
+		def utils=new MsoUtils()
+		def prefix=execution.getVariable("prefix")
+		def method = getClass().getSimpleName() + '.mapAAIExceptionTCommonException(' +
+			'execution=' + execution.getId() +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+		def variables
+		def message
+		String errorCode = 'SVC0001'
+		msoLogger.debug("response: " + response)
+		//they use the same format we do, pass their error along
+		//TODO add Received error from A&AI at beg of text
+		try {
+			 message = utils.getNodeXml(response, "requestError")
+			 message = utils.removeXmlNamespaces(message)
+		} catch (Exception ex) {
+			//Ignore the exception - cases include non xml payload
+				message = buildException("Received error from A&AI, unable to parse",execution)
+			msoLogger.debug("error mapping error, ignoring: " + ex)
+		}
+		
+		if(message != null) { 
+			 execution.setVariable(prefix+"ErrorResponse",message)
+			 msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Fault", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, execution.getVariable(prefix+"ErrorResponse"));
+			 return message
+		} else {
+			
+				return null
+			
+		}
+	}
+	
+	/**
+	 * @param execution
+	 * @return an error response conforming to the common API with default text msg
+	 */
+	String buildException(execution){
+		return buildException(null, execution)
+	}
+	
+	/**
+	 * @param response message from called component (ex: AAI)
+	 * @param execution
+	 * @return an error response conforming to the common
+	 */
+	String buildException(response, execution){
+		def utils=new MsoUtils()
+		def method = getClass().getSimpleName() + '.buildException(' +
+			'execution=' + execution.getId() +
+			')'
+
+		msoLogger.trace('Entered ' + method)
+		def prefix=execution.getVariable("prefix")
+		def responseCode = String.valueOf(execution.getVariable(prefix+"ResponseCode"))
+		def variables
+		msoLogger.debug("response: " + response)
+		
+			try {
+				msoLogger.debug("formatting error message" )
+				def msgVars = execution.getVariable(prefix+"errVariables")
+				def myErr = execution.getVariable(prefix+"err")
+				def messageTxt = execution.getVariable(prefix+"errTxt")
+				def messageId = null
+				
+				if(myErr == null){
+					msoLogger.debug("mapping response code: " + responseCode)
+					myErr = mapErrorCodetoError(responseCode, response)
+					if(myErr == null){
+						//not a service or policy error, just return error code
+						return ""
+					}
+				}
+				messageId = myErr.getMsgId()
+				
+				if(messageTxt == null){
+					if(myErr!=null){
+						messageTxt = myErr.getMsgTxt()
+					}else{
+						messageTxt = response
+					}
+				}
+				
+				if(msgVars==null && (myErr == Error.SVC_DETAILED_SERVICE_ERROR || myErr == Error.POL_DETAILED_POLICY_ERROR)){
+					msgVars = new ArrayList()
+					msgVars.add(response)
+					msgVars.add(responseCode)
+				}
+				
+				def msgVarsXML=""
+				StringBuffer msgVarsBuff = new StringBuffer()
+				if(msgVars!=null){
+					for(String msgVar : msgVars){
+						msgVarsBuff.append(
+							"""
+			<tns:variables>${MsoUtils.xmlEscape(msgVar)}</tns:variables>""")
+					}
+					
+				}
+				def message = ""
+				if(messageId.startsWith("SVC")){
+					message = """<tns:requestError xmlns:tns="http://org.onap/so/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.onap/so/request/types/v1 MsoServiceInstanceTypesV1.xsd">
+	<tns:serviceException>
+		<tns:messageId>${MsoUtils.xmlEscape(messageId)}</tns:messageId>
+		<tns:text>${MsoUtils.xmlEscape(messageTxt)}</tns:text>${msgVarsBuff}
+	</tns:serviceException>
+</tns:requestError>""" 
+				}else{
+					message ="""<tns:requestError xmlns:tns="http://org.onap/so/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.onap/so/request/types/v1 MsoServiceInstanceTypesV1.xsd">
+	<tns:policyException>
+		<tns:messageId>${MsoUtils.xmlEscape(messageId)}</tns:messageId>
+		<tns:text>${MsoUtils.xmlEscape(messageTxt)}</tns:text>${msgVarsBuff}
+	</tns:policyException>
+</tns:requestError>""" 
+				}
+				 msoLogger.debug("message " + message)
+				 execution.setVariable(prefix+"ErrorResponse",message)
+				 execution.setVariable(prefix+"err", myErr)
+				 execution.setVariable(prefix+"errTxt", messageTxt)
+				 execution.setVariable(prefix+"errVariables", msgVars)
+				 msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "Fault", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, execution.getVariable(prefix+"ErrorResponse"));
+				 return message
+			}catch(Exception ex) {
+				msoLogger.debug("error mapping error, return null: " + ex)
+				return null
+			}
+
+	}
+	
+	String parseError(DelegateExecution execution){
+		def utils=new MsoUtils()
+		def prefix=execution.getVariable("prefix")
+		def text = execution.getVariable(prefix+"errTxt")
+		def msgVars = execution.getVariable(prefix+"errVariables")
+		msoLogger.debug('parsing message: ' + text)
+		if(text == null){
+			return 'failed'
+		}
+		if(msgVars!=null && !msgVars.isEmpty()){
+			for(int i=0; i<msgVars.size(); i++){
+				text = text.replaceFirst("%"+(i+1), msgVars[i])
+			}
+		}
+		msoLogger.debug('parsed message is: ' + text)
+		return text
+	}
+	
+	
+
+	Error mapErrorCodetoError(responseCode, descr)
+	{
+		
+		if(responseCode==null || responseCode=='0' || responseCode=='500' || responseCode =='408'){
+			return Error.SVC_NO_SERVER_RESOURCES
+		}else if(responseCode == '401' || responseCode == '405' || responseCode == '409' || responseCode == '503'){
+			return null
+		}else if(responseCode == '400'){
+			if(descr==null){
+				return Error.SVC_GENERAL_SERVICE_ERROR
+			}else{
+				return Error.SVC_DETAILED_SERVICE_ERROR
+			}
+		}else if(responseCode == '401'){
+			if(descr==null){
+				return Error.POL_GENERAL_POLICY_ERROR
+			}else{
+				return Error.POL_DETAILED_POLICY_ERROR
+			}
+		}else{
+			return Error.SVC_NO_SERVER_RESOURCES
+		}
+	}
+	
+	String mapCategoryToErrorCode(String errorCategory)
+	{
+		if(errorCategory.equals('OPENSTACK'))
+			return Error.SVC_NO_SERVER_RESOURCES
+		else if (errorCategory.equals('IO'))
+			return Error.SVC_NO_SERVER_RESOURCES
+		else if (errorCategory.equals('INTERNAL'))
+			return Error.SVC_NO_SERVER_RESOURCES
+		else if (errorCategory.equals('USERDATA'))
+			return Error.SVC_GENERAL_SERVICE_ERROR
+		else
+			return Error.SVC_GENERAL_SERVICE_ERROR
+	}
+	
+	
+	
+
+	
+	
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
index 84d9ffdb6b..7d7b9e103f 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
@@ -1,347 +1,345 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {

-

-	private XmlParser xmlParser = new XmlParser()

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * Initialize the flow's variables.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable('prefix', 'UAAIGenVnf_')

-		execution.setVariable('UAAIGenVnf_vnfId', null)

-		execution.setVariable('UAAIGenVnf_personaModelId', null)

-		execution.setVariable('UAAIGenVnf_personaModelVersion', null)

-		execution.setVariable("UAAIGenVnf_ipv4OamAddress", null)

-		execution.setVariable('UAAIGenVnf_managementV6Address', null)

-		execution.setVariable('UAAIGenVnf_orchestrationStatus', null)

-		execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode' ,null)

-		execution.setVariable('UAAIGenVnf_getGenericVnfResponse', '')

-		execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', null)

-		execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', '')

-	}

-

-	/**

-	 * Check for missing elements in the received request.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def xml = execution.getVariable('UpdateAAIGenericVnfRequest')

-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

-			utils.logAudit("UpdateAAIGenericVnf Request XML: " + xml)

-			initProcessVariables(execution)

-

-			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')

-			execution.setVariable('UAAIGenVnf_vnfId', vnfId)

-

-			def personaModelId = getNodeTextForce(xml,'persona-model-id')

-			if (personaModelId != null && !personaModelId.isEmpty()) {

-				execution.setVariable('UAAIGenVnf_personaModelId', personaModelId)

-			}

-

-			def personaModelVersion = getNodeTextForce(xml,'persona-model-version')

-			if (personaModelVersion != null && !personaModelVersion.isEmpty()) {

-				execution.setVariable('UAAIGenVnf_personaModelVersion', personaModelVersion)

-			}

-

-			def ipv4OamAddress = getNodeTextForce(xml, 'ipv4-oam-address')

-			if (ipv4OamAddress != null && !ipv4OamAddress.isEmpty()) {

-				execution.setVariable('UAAIGenVnf_ipv4OamAddress', ipv4OamAddress)

-			}

-

-			def managementV6Address = getNodeTextForce(xml, 'management-v6-address')

-			if (managementV6Address != null && !managementV6Address.isEmpty()) {

-				execution.setVariable('UAAIGenVnf_managementV6Address', managementV6Address)

-			}

-			

-			def orchestrationStatus = getNodeTextForce(xml, 'orchestration-status')

-			if (orchestrationStatus != null && !orchestrationStatus.isEmpty()) {

-				execution.setVariable('UAAIGenVnf_orchestrationStatus', orchestrationStatus)

-			}

-

-			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())

-		}

-	}

-

-	/**

-	 * Using the received vnfId, query AAI to get the corresponding Generic VNF.

-	 * A 200 response is expected with the VF Module in the response body.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void getGenericVnf(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.getGenericVnf(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('UAAIGenVnf_vnfId')

-

-			// Construct endpoint

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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"

-

-			try {

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				utils.logAudit("Sending GET to AAI endpoint: " + endPoint)

-

-				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode', response.getStatusCode())

-				execution.setVariable('UAAIGenVnf_getGenericVnfResponse', responseData)

-				utils.logAudit("UpdateAAIGenericVnf Response data: " + responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode', 500)

-				execution.setVariable('UAAIGenVnf_getGenericVnfResponse', '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 getGenericVnf(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Construct and send a PUT request to AAI to update the Generic VNF.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void updateGenericVnf(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.updateGenericVnf(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('UAAIGenVnf_vnfId')

-			def genericVnf = execution.getVariable('UAAIGenVnf_getGenericVnfResponse')

-			def origRequest = execution.getVariable('UpdateAAIGenericVnfRequest')

-

-			utils.logAudit("UpdateGenericVnf Request: " + origRequest)

-			// Confirm resource-version is in retrieved Generic VNF

-			def Node genericVnfNode = xmlParser.parseText(genericVnf)

-			if (utils.getChildNode(genericVnfNode, 'resource-version') == null) {

-				def msg = 'Can\'t update Generic VNF ' + vnfId + ' since \'resource-version\' is missing'

-				logError(msg)

-				throw new Exception(msg)

-			}

-

-			// Handle persona-model-id/persona-model-version

-

-			def String newPersonaModelId = execution.getVariable('UAAIGenVnf_personaModelId')

-			def String newPersonaModelVersion = execution.getVariable('UAAIGenVnf_personaModelVersion')

-			def String personaModelVersionEntry = ""

-			if (newPersonaModelId != null || newPersonaModelVersion != null) {

-

-				// Confirm "new" persona-model-id is same as "current" persona-model-id

-				def Node currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'model-invariant-id')

-				if (currPersonaModelIdNode == null) {

-					// check the old attribute name

-					currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'persona-model-id')

-				}

-				def String currPersonaModelId = ''

-				if (currPersonaModelIdNode != null) {

-					currPersonaModelId = currPersonaModelIdNode.text()

-				}

-				if (!newPersonaModelId.equals(currPersonaModelId)) {

-					def msg = 'Can\'t update Generic VNF ' + vnfId + ' since there is \'persona-model-id\' mismatch between the current and new values'

-					logError(msg)

-					throw new Exception(msg)

-				}

-

-				// Construct payload

-				personaModelVersionEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'model-version-id')

-			}

-

-			// Handle ipv4-oam-address

-			def String ipv4OamAddress = execution.getVariable('UAAIGenVnf_ipv4OamAddress')

-			def String ipv4OamAddressEntry = ""

-			if (ipv4OamAddress != null) {

-				// Construct payload

-				ipv4OamAddressEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'ipv4-oam-address')

-			}

-

-			// Handle management-v6-address

-			def String managementV6Address = execution.getVariable('UAAIGenVnf_managementV6Address')

-			def String managementV6AddressEntry = ""

-			if (managementV6Address != null) {

-				// Construct payload

-				managementV6AddressEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'management-v6-address')

-			}

-			

-			// Handle orchestration-status

-			def String orchestrationStatus = execution.getVariable('UAAIGenVnf_orchestrationStatus')

-			def String orchestrationStatusEntry = ""

-			if (orchestrationStatus != null) {

-				// Construct payload

-				orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')

-			}

-

-			def payload = """

-					{	${personaModelVersionEntry}

-						${ipv4OamAddressEntry}

-						${managementV6AddressEntry}

-						${orchestrationStatusEntry}

-						"vnf-id": "${vnfId}"					

-					}

-			"""

-

-			// Construct endpoint

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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")

-

-			try {

-				logDebug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload, isDebugLogEnabled)

-				utils.logAudit("Sending PATCH to AAI endpoint: " + endPoint)

-

-				APIResponse response = aaiUriUtil.executeAAIPatchCall(execution, endPoint, payload)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', response.getStatusCode())

-				execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', responseData)

-				utils.logAudit("UpdateAAIGenericVnf Response Data: " + responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI PATCH:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', 500)

-				execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', 'AAI PATCH 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 updateGenericVnf(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Sets up json attributes for PATCH request for Update

-	 * 

-	 * @param origRequest Incoming update request with Generic VNF element(s) to be updated.

-	 * @param genericVnf Current Generic VNF retrieved from AAI.

-	 * @param element Name of element to be inserted.

-	 */

-	public String updateGenericVnfNode(String origRequest, Node genericVnfNode, String elementName) {

-

-		if (!utils.nodeExists(origRequest, elementName)) {

-			return ""

-		}

-		def elementValue = utils.getNodeText(origRequest, elementName)

-

-		if (elementValue.equals('DELETE')) {

-			// Set the element being deleted to null

-			return """"${elementName}": null,"""

-		}

-		else {

-			return """"${elementName}": "${elementValue}","""		

-		}

-		

-	}

-

-	/**

-	 * Generates a WorkflowException if the AAI query returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleAAIQueryFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to query AAI, Response Code ' +

-			execution.getVariable('UAAIGenVnf_getGenericVnfResponseCode') + ', Error Response ' +

-			execution.getVariable('UAAIGenVnf_getGenericVnfResponse'))

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('UAAIGenVnf_getGenericVnfResponse'))

-		execution.setVariable('WorkflowException', exception)

-

-		utils.logAudit("Workflow Exception occurred when handling Quering AAI: " + exception.getErrorMessage())

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-

-	/**

-	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleUpdateGenericVnfFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleUpdateGenericVnfFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to update Generic VNF in AAI, Response Code ' +

-			execution.getVariable('UAAIGenVnf_updateGenericVnfResponseCode') + ', Error Response ' +

-			execution.getVariable('UAAIGenVnf_updateGenericVnfResponse'))

-

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('UAAIGenVnf_updateGenericVnfResponse'))

-		execution.setVariable('WorkflowException', exception)

-

-		utils.logAudit("Workflow Exception occurred when Updating GenericVnf: " + exception.getErrorMessage())

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, UpdateAAIGenericVnf.class);
+
+
+	private XmlParser xmlParser = new XmlParser()
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * Initialize the flow's variables.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable('prefix', 'UAAIGenVnf_')
+		execution.setVariable('UAAIGenVnf_vnfId', null)
+		execution.setVariable('UAAIGenVnf_personaModelId', null)
+		execution.setVariable('UAAIGenVnf_personaModelVersion', null)
+		execution.setVariable("UAAIGenVnf_ipv4OamAddress", null)
+		execution.setVariable('UAAIGenVnf_managementV6Address', null)
+		execution.setVariable('UAAIGenVnf_orchestrationStatus', null)
+		execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode' ,null)
+		execution.setVariable('UAAIGenVnf_getGenericVnfResponse', '')
+		execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', null)
+		execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', '')
+	}
+
+	/**
+	 * Check for missing elements in the received request.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def xml = execution.getVariable('UpdateAAIGenericVnfRequest')
+			msoLogger.debug('Received request xml:\n' + xml)
+			msoLogger.debug("UpdateAAIGenericVnf Request XML: " + xml)
+			initProcessVariables(execution)
+
+			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')
+			execution.setVariable('UAAIGenVnf_vnfId', vnfId)
+
+			def personaModelId = getNodeTextForce(xml,'persona-model-id')
+			if (personaModelId != null && !personaModelId.isEmpty()) {
+				execution.setVariable('UAAIGenVnf_personaModelId', personaModelId)
+			}
+
+			def personaModelVersion = getNodeTextForce(xml,'persona-model-version')
+			if (personaModelVersion != null && !personaModelVersion.isEmpty()) {
+				execution.setVariable('UAAIGenVnf_personaModelVersion', personaModelVersion)
+			}
+
+			def ipv4OamAddress = getNodeTextForce(xml, 'ipv4-oam-address')
+			if (ipv4OamAddress != null && !ipv4OamAddress.isEmpty()) {
+				execution.setVariable('UAAIGenVnf_ipv4OamAddress', ipv4OamAddress)
+			}
+
+			def managementV6Address = getNodeTextForce(xml, 'management-v6-address')
+			if (managementV6Address != null && !managementV6Address.isEmpty()) {
+				execution.setVariable('UAAIGenVnf_managementV6Address', managementV6Address)
+			}
+			
+			def orchestrationStatus = getNodeTextForce(xml, 'orchestration-status')
+			if (orchestrationStatus != null && !orchestrationStatus.isEmpty()) {
+				execution.setVariable('UAAIGenVnf_orchestrationStatus', orchestrationStatus)
+			}
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Using the received vnfId, query AAI to get the corresponding Generic VNF.
+	 * A 200 response is expected with the VF Module in the response body.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void getGenericVnf(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.getGenericVnf(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('UAAIGenVnf_vnfId')
+
+			// Construct endpoint
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+
+			try {
+				msoLogger.debug('sending GET to AAI endpoint \'' + endPoint + '\'')
+				msoLogger.debug("Sending GET to AAI endpoint: " + endPoint)
+
+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode', response.getStatusCode())
+				execution.setVariable('UAAIGenVnf_getGenericVnfResponse', responseData)
+				msoLogger.debug("UpdateAAIGenericVnf Response data: " + responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				msoLogger.error(e);
+				msoLogger.debug('Exception occurred while executing AAI GET:' + ex.getMessage())
+				execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode', 500)
+				execution.setVariable('UAAIGenVnf_getGenericVnfResponse', 'AAI GET Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in getGenericVnf(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Construct and send a PUT request to AAI to update the Generic VNF.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void updateGenericVnf(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.updateGenericVnf(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('UAAIGenVnf_vnfId')
+			def genericVnf = execution.getVariable('UAAIGenVnf_getGenericVnfResponse')
+			def origRequest = execution.getVariable('UpdateAAIGenericVnfRequest')
+
+			msoLogger.debug("UpdateGenericVnf Request: " + origRequest)
+			// Confirm resource-version is in retrieved Generic VNF
+			def Node genericVnfNode = xmlParser.parseText(genericVnf)
+			if (utils.getChildNode(genericVnfNode, 'resource-version') == null) {
+				def msg = 'Can\'t update Generic VNF ' + vnfId + ' since \'resource-version\' is missing'
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				throw new Exception(msg)
+			}
+
+			// Handle persona-model-id/persona-model-version
+
+			def String newPersonaModelId = execution.getVariable('UAAIGenVnf_personaModelId')
+			def String newPersonaModelVersion = execution.getVariable('UAAIGenVnf_personaModelVersion')
+			def String personaModelVersionEntry = ""
+			if (newPersonaModelId != null || newPersonaModelVersion != null) {
+
+				// Confirm "new" persona-model-id is same as "current" persona-model-id
+				def Node currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'model-invariant-id')
+				if (currPersonaModelIdNode == null) {
+					// check the old attribute name
+					currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'persona-model-id')
+				}
+				def String currPersonaModelId = ''
+				if (currPersonaModelIdNode != null) {
+					currPersonaModelId = currPersonaModelIdNode.text()
+				}
+				if (!newPersonaModelId.equals(currPersonaModelId)) {
+					def msg = 'Can\'t update Generic VNF ' + vnfId + ' since there is \'persona-model-id\' mismatch between the current and new values'
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					throw new Exception(msg)
+				}
+
+				// Construct payload
+				personaModelVersionEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'model-version-id')
+			}
+
+			// Handle ipv4-oam-address
+			def String ipv4OamAddress = execution.getVariable('UAAIGenVnf_ipv4OamAddress')
+			def String ipv4OamAddressEntry = ""
+			if (ipv4OamAddress != null) {
+				// Construct payload
+				ipv4OamAddressEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'ipv4-oam-address')
+			}
+
+			// Handle management-v6-address
+			def String managementV6Address = execution.getVariable('UAAIGenVnf_managementV6Address')
+			def String managementV6AddressEntry = ""
+			if (managementV6Address != null) {
+				// Construct payload
+				managementV6AddressEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'management-v6-address')
+			}
+			
+			// Handle orchestration-status
+			def String orchestrationStatus = execution.getVariable('UAAIGenVnf_orchestrationStatus')
+			def String orchestrationStatusEntry = ""
+			if (orchestrationStatus != null) {
+				// Construct payload
+				orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')
+			}
+
+			def payload = """
+					{	${personaModelVersionEntry}
+						${ipv4OamAddressEntry}
+						${managementV6AddressEntry}
+						${orchestrationStatusEntry}
+						"vnf-id": "${vnfId}"					
+					}
+			"""
+
+			// Construct endpoint
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + UriUtils.encode(vnfId, "UTF-8")
+
+			try {
+				msoLogger.debug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload)
+				msoLogger.debug("Sending PATCH to AAI endpoint: " + endPoint)
+
+				APIResponse response = aaiUriUtil.executeAAIPatchCall(execution, endPoint, payload)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', response.getStatusCode())
+				execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', responseData)
+				msoLogger.debug("UpdateAAIGenericVnf Response Data: " + responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI PATCH:' + ex.getMessage())
+				execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', 500)
+				execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', 'AAI PATCH Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in updateGenericVnf(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Sets up json attributes for PATCH request for Update
+	 * 
+	 * @param origRequest Incoming update request with Generic VNF element(s) to be updated.
+	 * @param genericVnf Current Generic VNF retrieved from AAI.
+	 * @param element Name of element to be inserted.
+	 */
+	public String updateGenericVnfNode(String origRequest, Node genericVnfNode, String elementName) {
+
+		if (!utils.nodeExists(origRequest, elementName)) {
+			return ""
+		}
+		def elementValue = utils.getNodeText(origRequest, elementName)
+
+		if (elementValue.equals('DELETE')) {
+			// Set the element being deleted to null
+			return """"${elementName}": null,"""
+		}
+		else {
+			return """"${elementName}": "${elementValue}","""		
+		}
+		
+	}
+
+	/**
+	 * Generates a WorkflowException if the AAI query returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error( 'Error occurred attempting to query AAI, Response Code ' + execution.getVariable('UAAIGenVnf_getGenericVnfResponseCode'));
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('UAAIGenVnf_getGenericVnfResponse'))
+		execution.setVariable('WorkflowException', exception)
+
+		msoLogger.debug("Workflow Exception occurred when handling Quering AAI: " + exception.getErrorMessage())
+		msoLogger.trace('Exited ' + method)
+	}
+
+	/**
+	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleUpdateGenericVnfFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleUpdateGenericVnfFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error('Error occurred attempting to update Generic VNF in AAI, Response Code ' + execution.getVariable('UAAIGenVnf_updateGenericVnfResponseCode'));
+
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('UAAIGenVnf_updateGenericVnfResponse'))
+		execution.setVariable('WorkflowException', exception)
+
+		msoLogger.debug("Workflow Exception occurred when Updating GenericVnf: " + exception.getErrorMessage())
+		msoLogger.trace('Exited ' + method)
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIVfModule.groovy
index b3a9423727..68b2df213a 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIVfModule.groovy
@@ -1,382 +1,369 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-public class UpdateAAIVfModule extends AbstractServiceTaskProcessor {

-

-	private XmlParser xmlParser = new XmlParser()

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * Initialize the flow's variables.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void initProcessVariables(DelegateExecution execution) {

-		execution.setVariable('prefix', 'UAAIVfMod_')

-		execution.setVariable('UAAIVfMod_vnfId', null)

-		execution.setVariable('UAAIVfMod_vfModuleId', null)

-		execution.setVariable('UAAIVfMod_orchestrationStatus', null)

-		execution.setVariable('UAAIVfMod_heatStackId', null)

-		execution.setVariable('UAAIVfMod_volumeGroupId', null)

-		execution.setVariable('UAAIVfMod_getVfModuleResponseCode' ,null)

-		execution.setVariable('UAAIVfMod_getVfModuleResponse', '')

-		execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', null)

-		execution.setVariable('UAAIVfMod_updateVfModuleResponse', '')

-	}

-

-	/**

-	 * Check for missing elements in the received request.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def xml = execution.getVariable('UpdateAAIVfModuleRequest')

-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

-			utils.logAudit("UpdateAAIVfModule Request XML: " + xml)

-			initProcessVariables(execution)

-

-			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')

-			execution.setVariable('UAAIVfMod_vnfId', vnfId)

-

-			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')

-			execution.setVariable('UAAIVfMod_vfModuleId', vfModuleId)

-

-			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())

-		}

-	}

-

-	/**

-	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VF Module.

-	 * A 200 response is expected with the VF Module in the response body.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void getVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.getVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('UAAIVfMod_vnfId')

-			def vfModuleId = execution.getVariable('UAAIVfMod_vfModuleId')

-

-			// Construct endpoint

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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") + '/vf-modules/vf-module/' + UriUtils.encode(vfModuleId, "UTF-8")

-

-			try {

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				utils.logAudit("UpdateAAIVfModule sending GET to AAI endpoint: " + endPoint)

-

-				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('UAAIVfMod_getVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('UAAIVfMod_getVfModuleResponse', responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-				utils.logAudit("UpdateAAIVfModule response data: " + responseData)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('UAAIVfMod_getVfModuleResponseCode', 500)

-				execution.setVariable('UAAIVfMod_getVfModuleResponse', '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 getVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Construct and send a PATCH request to AAI to update the VF Module.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void updateVfModule(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.updateVfModule(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('UAAIVfMod_vnfId')

-			def vfModuleId = execution.getVariable('UAAIVfMod_vfModuleId')

-			def vfModule = execution.getVariable('UAAIVfMod_getVfModuleResponse')

-			def origRequest = execution.getVariable('UpdateAAIVfModuleRequest')

-			def Node vfModuleNode = xmlParser.parseText(vfModule)

-			

-			utils.logAudit("UpdateAAIVfModule request: " + origRequest)

-			// Confirm resource-version is in retrieved VF Module

-			if (utils.getChildNode(vfModuleNode, 'resource-version') == null) {

-				def msg = 'Can\'t update VF Module ' + vfModuleId + ' since \'resource-version\' is missing'

-				logError(msg)

-				throw new Exception(msg)

-			}

-			

-			// TEMPORARY!!! Disable Volume Group Check

-			// Check volume-group-id conditions

-			//def checkVgiResult = checkVolumeGroupId(origRequest, vfModuleNode, isDebugLogEnabled)

-			//if (checkVgiResult != null) {

-			//	def msg = 'Can\'t update VF Module ' + vfModuleId + ': ' + checkVgiResult

-			//	logError(msg)

-			//	throw new Exception(msg)

-			//}

-			

-			// Handle persona-model-id/persona-model-version

-			def boolean doPersonaModelVersion = true

-			def String newPersonaModelId = utils.getNodeText1(origRequest, 'persona-model-id')

-			def String newPersonaModelVersion = utils.getNodeText1(origRequest, 'persona-model-version')

-			if ((newPersonaModelId == null) || (newPersonaModelVersion == null)) {

-				doPersonaModelVersion = false

-			} else {

-				// Confirm "new" persona-model-id is same as "current" persona-model-id

-				def String currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-invariant-id')

-				if (currPersonaModelId == null) {

-					// check the old attribute name

-					currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-version-id')

-				}

-				if (currPersonaModelId == null) {

-					currPersonaModelId = ''

-				}

-				if (!newPersonaModelId.equals(currPersonaModelId)) {

-					def msg = 'Can\'t update VF Module ' + vfModuleId + ' since there is \'persona-model-id\' mismatch between the current and new values'

-					logError(msg)

-					throw new Exception(msg)

-				}

-			}

-			

-			// Construct payload

-			String orchestrationStatusEntry = updateVfModuleNode(origRequest, vfModuleNode, 'orchestration-status')

-			String heatStackIdEntry = updateVfModuleNode(origRequest, vfModuleNode, 'heat-stack-id')

-			String personaModelVersionEntry = ""

-			if (doPersonaModelVersion) {

-				personaModelVersionEntry = updateVfModuleNode(origRequest, vfModuleNode, 'persona-model-version')

-			}

-			String contrailServiceInstanceFqdnEntry = updateVfModuleNode(origRequest, vfModuleNode, 'contrail-service-instance-fqdn')

-			def payload = """

-					{	${orchestrationStatusEntry}

-						${heatStackIdEntry}

-						${personaModelVersionEntry}

-						${contrailServiceInstanceFqdnEntry}

-						"vf-module-id": "${vfModuleId}"						

-					}

-			"""

-

-

-			// Construct endpoint

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			def 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") + '/vf-modules/vf-module/' + UriUtils.encode(vfModuleId, "UTF-8")

-

-			try {

-				logDebug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload, isDebugLogEnabled)

-				utils.logAudit("Sending PATCH to AAI endpoint: " + endPoint)

-

-				APIResponse response = aaiUriUtil.executeAAIPatchCall(execution, endPoint, payload)

-				def responseData = response.getResponseBodyAsString()

-				execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('UAAIVfMod_updateVfModuleResponse', responseData)

-				utils.logAudit("UpdateAAIVfModule Response data: " + responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI PATCH:' + ex.getMessage(),isDebugLogEnabled)

-				execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', 500)

-				execution.setVariable('UAAIVfMod_updateVfModuleResponse', 'AAI PATCH 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 updateVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Sets up json attributes for PATCH request for Update

-	 *

-	 * @param origRequest Incoming update request with VF Module elements to be updated.

-	 * @param vfModule Current VF Module retrieved from AAI.

-	 * @param element Name of element to be inserted.

-	 */	

-	private String updateVfModuleNode(String origRequest, Node vfModuleNode, String elementName) {

-

-		if (!utils.nodeExists(origRequest, elementName)) {

-			return "" 

-		}

-		def elementValue = utils.getNodeText(origRequest, elementName)

-

-		if (elementValue.equals('DELETE')) {

-			// Set the element being deleted to null

-			return """"${elementName}": null,"""

-		}

-		else {

-			return """"${elementName}": "${elementValue}","""

-		}		

-	}

-

-	

-	/**

-	 * Check the Volume Group ID from the incoming update request against the Volume Group ID from the

-	 * given VF Module.  If they are equal or if they are both 'null', then that is acceptable and 'null'

-	 * is returned.  Otherwise a message describing how the values are unacceptable/incompatible is returned.

-	 * 

-	 * @param origRequest Incoming update request with VF Module elements to be updated.

-	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.

-	 * @param isDebugLogEnabled Is DEBUG log enabled?

-	 * @return 'null' if the Volume Group IDs are acceptable. Otherwise return a message describing how the

-	 * values are unacceptable/incompatible.

-	 */

-	private String checkVolumeGroupId(String origRequest, Node vfModuleNode, String isDebugLogEnabled) {

-		def requestVolumeGroupId = utils.getNodeText1(origRequest, 'volume-group-id')

-		def currVolumeGroupId = getCurrVolumeGroupId(vfModuleNode)

-		

-		logDebug('Check volume-group-id: volume-group-id in original request is \'' + requestVolumeGroupId +

-			'\', volume-group-id from VF Module is \'' + currVolumeGroupId + '\'', isDebugLogEnabled)

-		

-		def result = null

-		

-		if (requestVolumeGroupId == null) {

-			if (currVolumeGroupId == null) {

-				// This is OK

-			} else {

-				result = 'Cannot detach a volume group from an existing VF Module'

-			}

-		} else {

-			if (currVolumeGroupId == null) {

-				result = 'Cannot add a volume gruop to an existing VF Module'

-			} else {

-				if (!requestVolumeGroupId.equals(currVolumeGroupId)) {

-					result = 'Cannot change the volume group on an existing VF Module'

-				}

-			}

-		}

-		

-		return result

-	}

-	

-	/**

-	 * Find and return the value of the Volume Group ID for the specified VF Module.  If

-	 * the value of the Volume Group ID cannot be found for any reason, 'null' is returned.

-	 * 

-	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.

-	 * @return the value of the Volume Group ID for the specified VF Module.  If the

-	 * value of the Volume Group ID cannot be found for any reason, 'null' is returned.

-	 */

-	private String getCurrVolumeGroupId(Node vfModuleNode) {

-		def Node relationshipList = utils.getChildNode(vfModuleNode, 'relationship-list')

-		if (relationshipList == null) {

-			return null

-		}

-		def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

-		for (Node relationshipNode in relationships) {

-			def String relatedTo = utils.getChildNodeText(relationshipNode, 'related-to')

-			if ((relatedTo != null) && relatedTo.equals('volume-group')) {

-				def NodeList relationshipDataList = utils.getIdenticalChildren(relationshipNode, 'relationship-data')

-				for (Node relationshipDataNode in relationshipDataList) {

-					def String relationshipKey = utils.getChildNodeText(relationshipDataNode, 'relationship-key')

-					if ((relationshipKey != null) && relationshipKey.equals('volume-group.volume-group-id')) {

-						return utils.getChildNodeText(relationshipDataNode, 'relationship-value')

-					}

-				}

-			}

-		}

-		return null

-	}

-

-	/**

-	 * Generates a WorkflowException if the AAI query returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleAAIQueryFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to query AAI, Response Code ' +

-			execution.getVariable('UAAIVfMod_getVfModuleResponseCode') + ', Error Response ' +

-			execution.getVariable('UAAIVfMod_getVfModuleResponse'))

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('UAAIVfMod_getVfModuleResponse'))

-		execution.setVariable('WorkflowException', exception)

-		utils.logAudit("UpdateAAIVfModule query failure: " + exception.getErrorMessage())

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-

-	/**

-	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleUpdateVfModuleFailure(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		logError('Error occurred attempting to update VF Module in AAI, Response Code ' +

-			execution.getVariable('UAAIVfMod_updateVfModuleResponseCode') + ', Error Response ' +

-			execution.getVariable('UAAIVfMod_updateVfModuleResponse'))

-		String processKey = getProcessKey(execution);

-		WorkflowException exception = new WorkflowException(processKey, 5000,

-			execution.getVariable('UAAIVfMod_updateVfModuleResponse'))

-		execution.setVariable('WorkflowException', exception)

-

-		utils.logAudit("UpdateAAIVfModule failure: " + exception.getErrorMessage())

-		logDebug('Exited ' + method, isDebugLogEnabled)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.springframework.web.util.UriUtils
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+public class UpdateAAIVfModule extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, UpdateAAIVfModule.class);
+
+
+	private XmlParser xmlParser = new XmlParser()
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * Initialize the flow's variables.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void initProcessVariables(DelegateExecution execution) {
+		execution.setVariable('prefix', 'UAAIVfMod_')
+		execution.setVariable('UAAIVfMod_vnfId', null)
+		execution.setVariable('UAAIVfMod_vfModuleId', null)
+		execution.setVariable('UAAIVfMod_orchestrationStatus', null)
+		execution.setVariable('UAAIVfMod_heatStackId', null)
+		execution.setVariable('UAAIVfMod_volumeGroupId', null)
+		execution.setVariable('UAAIVfMod_getVfModuleResponseCode' ,null)
+		execution.setVariable('UAAIVfMod_getVfModuleResponse', '')
+		execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', null)
+		execution.setVariable('UAAIVfMod_updateVfModuleResponse', '')
+	}
+
+	/**
+	 * Check for missing elements in the received request.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void preProcessRequest(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def xml = execution.getVariable('UpdateAAIVfModuleRequest')
+			msoLogger.debug('Received request xml:\n' + xml)
+			initProcessVariables(execution)
+
+			def vnfId = getRequiredNodeText(execution, xml,'vnf-id')
+			execution.setVariable('UAAIVfMod_vnfId', vnfId)
+
+			def vfModuleId = getRequiredNodeText(execution, xml,'vf-module-id')
+			execution.setVariable('UAAIVfMod_vfModuleId', vfModuleId)
+
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VF Module.
+	 * A 200 response is expected with the VF Module in the response body.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void getVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.getVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('UAAIVfMod_vnfId')
+			def vfModuleId = execution.getVariable('UAAIVfMod_vfModuleId')
+
+			// Construct endpoint
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + UriUtils.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + UriUtils.encode(vfModuleId, "UTF-8")
+
+			try {
+				msoLogger.debug('sending GET to AAI endpoint \'' + endPoint + '\'')
+				msoLogger.debug("UpdateAAIVfModule sending GET to AAI endpoint: " + endPoint)
+
+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('UAAIVfMod_getVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('UAAIVfMod_getVfModuleResponse', responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+				msoLogger.debug("UpdateAAIVfModule response data: " + responseData)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI GET:' + ex.getMessage())
+				execution.setVariable('UAAIVfMod_getVfModuleResponseCode', 500)
+				execution.setVariable('UAAIVfMod_getVfModuleResponse', 'AAI GET Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in getVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Construct and send a PATCH request to AAI to update the VF Module.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void updateVfModule(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.updateVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def vnfId = execution.getVariable('UAAIVfMod_vnfId')
+			def vfModuleId = execution.getVariable('UAAIVfMod_vfModuleId')
+			def vfModule = execution.getVariable('UAAIVfMod_getVfModuleResponse')
+			def origRequest = execution.getVariable('UpdateAAIVfModuleRequest')
+			def Node vfModuleNode = xmlParser.parseText(vfModule)
+			
+			msoLogger.debug("UpdateAAIVfModule request: " + origRequest)
+			// Confirm resource-version is in retrieved VF Module
+			if (utils.getChildNode(vfModuleNode, 'resource-version') == null) {
+				def msg = 'Can\'t update VF Module ' + vfModuleId + ' since \'resource-version\' is missing'
+				msoLogger.error(msg);
+				throw new Exception(msg)
+			}
+			
+			// Handle persona-model-id/persona-model-version
+			def boolean doPersonaModelVersion = true
+			def String newPersonaModelId = utils.getNodeText(origRequest, 'persona-model-id')
+			def String newPersonaModelVersion = utils.getNodeText(origRequest, 'persona-model-version')
+			if ((newPersonaModelId == null) || (newPersonaModelVersion == null)) {
+				doPersonaModelVersion = false
+			} else {
+				// Confirm "new" persona-model-id is same as "current" persona-model-id
+				def String currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-invariant-id')
+				if (currPersonaModelId == null) {
+					// check the old attribute name
+					currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-version-id')
+				}
+				if (currPersonaModelId == null) {
+					currPersonaModelId = ''
+				}
+				if (!newPersonaModelId.equals(currPersonaModelId)) {
+					def msg = 'Can\'t update VF Module ' + vfModuleId + ' since there is \'persona-model-id\' mismatch between the current and new values'
+					msoLogger.error(msg)
+					throw new Exception(msg)
+				}
+			}
+			
+			// Construct payload
+			String orchestrationStatusEntry = updateVfModuleNode(origRequest, vfModuleNode, 'orchestration-status')
+			String heatStackIdEntry = updateVfModuleNode(origRequest, vfModuleNode, 'heat-stack-id')
+			String personaModelVersionEntry = ""
+			if (doPersonaModelVersion) {
+				personaModelVersionEntry = updateVfModuleNode(origRequest, vfModuleNode, 'persona-model-version')
+			}
+			String contrailServiceInstanceFqdnEntry = updateVfModuleNode(origRequest, vfModuleNode, 'contrail-service-instance-fqdn')
+			def payload = """
+					{	${orchestrationStatusEntry}
+						${heatStackIdEntry}
+						${personaModelVersionEntry}
+						${contrailServiceInstanceFqdnEntry}
+						"vf-module-id": "${vfModuleId}"						
+					}
+			"""
+
+
+			// Construct endpoint
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			msoLogger.debug('AAI URI is: ' + aai_uri)
+			String endPoint = UrnPropertiesReader.getVariable("aai.endpoint", execution) + aai_uri + '/' + UriUtils.encode(vnfId, "UTF-8") + '/vf-modules/vf-module/' + UriUtils.encode(vfModuleId, "UTF-8")
+
+			try {
+				msoLogger.debug('sending PATCH to AAI endpoint \'' + endPoint + '\'' + 'with payload \n' + payload)
+				msoLogger.debug("Sending PATCH to AAI endpoint: " + endPoint)
+
+				APIResponse response = aaiUriUtil.executeAAIPatchCall(execution, endPoint, payload)
+				def responseData = response.getResponseBodyAsString()
+				execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('UAAIVfMod_updateVfModuleResponse', responseData)
+				msoLogger.debug("UpdateAAIVfModule Response data: " + responseData)
+				msoLogger.debug('Response code:' + response.getStatusCode())
+				msoLogger.debug('Response:' + System.lineSeparator() + responseData)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				msoLogger.debug('Exception occurred while executing AAI PATCH:' + ex.getMessage())
+				execution.setVariable('UAAIVfMod_updateVfModuleResponseCode', 500)
+				execution.setVariable('UAAIVfMod_updateVfModuleResponse', 'AAI PATCH Failed:' + ex.getMessage())
+			}
+			msoLogger.trace('Exited ' + method)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in updateVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Sets up json attributes for PATCH request for Update
+	 *
+	 * @param origRequest Incoming update request with VF Module elements to be updated.
+	 * @param vfModule Current VF Module retrieved from AAI.
+	 * @param element Name of element to be inserted.
+	 */	
+	private String updateVfModuleNode(String origRequest, Node vfModuleNode, String elementName) {
+
+		if (!utils.nodeExists(origRequest, elementName)) {
+			return "" 
+		}
+		def elementValue = utils.getNodeText(origRequest, elementName)
+
+		if (elementValue.equals('DELETE')) {
+			// Set the element being deleted to null
+			return """"${elementName}": null,"""
+		}
+		else {
+			return """"${elementName}": "${elementValue}","""
+		}		
+	}
+
+	
+	/**
+	 * Check the Volume Group ID from the incoming update request against the Volume Group ID from the
+	 * given VF Module.  If they are equal or if they are both 'null', then that is acceptable and 'null'
+	 * is returned.  Otherwise a message describing how the values are unacceptable/incompatible is returned.
+	 * 
+	 * @param origRequest Incoming update request with VF Module elements to be updated.
+	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.
+	 * @param isDebugLogEnabled Is DEBUG log enabled?
+	 * @return 'null' if the Volume Group IDs are acceptable. Otherwise return a message describing how the
+	 * values are unacceptable/incompatible.
+	 */
+	private String checkVolumeGroupId(String origRequest, Node vfModuleNode, String isDebugLogEnabled) {
+		def requestVolumeGroupId = utils.getNodeText(origRequest, 'volume-group-id')
+		def currVolumeGroupId = getCurrVolumeGroupId(vfModuleNode)
+		
+		msoLogger.debug('Check volume-group-id: volume-group-id in original request is \'' + requestVolumeGroupId + '\', volume-group-id from VF Module is \'' + currVolumeGroupId + '\'')
+		
+		def result = null
+		
+		if (requestVolumeGroupId == null) {
+			if (currVolumeGroupId == null) {
+				// This is OK
+			} else {
+				result = 'Cannot detach a volume group from an existing VF Module'
+			}
+		} else {
+			if (currVolumeGroupId == null) {
+				result = 'Cannot add a volume gruop to an existing VF Module'
+			} else {
+				if (!requestVolumeGroupId.equals(currVolumeGroupId)) {
+					result = 'Cannot change the volume group on an existing VF Module'
+				}
+			}
+		}
+		
+		return result
+	}
+	
+	/**
+	 * Find and return the value of the Volume Group ID for the specified VF Module.  If
+	 * the value of the Volume Group ID cannot be found for any reason, 'null' is returned.
+	 * 
+	 * @param vfModuleNode VF Module (as a Node) retrieved from AAI.
+	 * @return the value of the Volume Group ID for the specified VF Module.  If the
+	 * value of the Volume Group ID cannot be found for any reason, 'null' is returned.
+	 */
+	private String getCurrVolumeGroupId(Node vfModuleNode) {
+		def Node relationshipList = utils.getChildNode(vfModuleNode, 'relationship-list')
+		if (relationshipList == null) {
+			return null
+		}
+		def NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
+		for (Node relationshipNode in relationships) {
+			def String relatedTo = utils.getChildNodeText(relationshipNode, 'related-to')
+			if ((relatedTo != null) && relatedTo.equals('volume-group')) {
+				def NodeList relationshipDataList = utils.getIdenticalChildren(relationshipNode, 'relationship-data')
+				for (Node relationshipDataNode in relationshipDataList) {
+					def String relationshipKey = utils.getChildNodeText(relationshipDataNode, 'relationship-key')
+					if ((relationshipKey != null) && relationshipKey.equals('volume-group.volume-group-id')) {
+						return utils.getChildNodeText(relationshipDataNode, 'relationship-value')
+					}
+				}
+			}
+		}
+		return null
+	}
+
+	/**
+	 * Generates a WorkflowException if the AAI query returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleAAIQueryFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleAAIQueryFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error( 'Error occurred attempting to query AAI, Response Code ' + execution.getVariable('UAAIVfMod_getVfModuleResponseCode'));
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('UAAIVfMod_getVfModuleResponse'))
+		execution.setVariable('WorkflowException', exception)
+		msoLogger.debug("UpdateAAIVfModule query failure: " + exception.getErrorMessage())
+		msoLogger.trace('Exited ' + method)
+	}
+
+	/**
+	 * Generates a WorkflowException if updating a VF Module in AAI returns a response code other than 200.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleUpdateVfModuleFailure(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.handleUpdateVfModuleFailure(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		msoLogger.error('Error occurred attempting to update VF Module in AAI, Response Code ' + execution.getVariable('UAAIVfMod_updateVfModuleResponseCode'));
+		String processKey = getProcessKey(execution);
+		WorkflowException exception = new WorkflowException(processKey, 5000,
+			execution.getVariable('UAAIVfMod_updateVfModuleResponse'))
+		execution.setVariable('WorkflowException', exception)
+
+		msoLogger.debug("UpdateAAIVfModule failure: " + exception.getErrorMessage())
+		msoLogger.trace('Exited ' + method)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModule.groovy
index 74ff8b3642..b20cc38b8b 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModule.groovy
@@ -1,87 +1,93 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import org.apache.commons.lang3.*

-

-public class VfModule implements Serializable {

-	

-	/**

-	 * Class representing a VF Module Node. Fields of this class include indicators

-	 * as to whether the VF Module is the only VF Module in its containing Generic VNF

-	 * and whether the VF Module is the base VF Module in its containing Generic VNF.

-	 */

-

-	private Node node

-	private Boolean onlyVfModule

-	private Boolean baseVfModule

-

-	/**

-	 * Constructor.

-	 *

-	 * @param node Node representing the VF Module xml.

-	 * @param onlyVfModule Is this VF Module the only VF Module in its containing Generic VNF?

-	 */

-	public VfModule(Node node, boolean onlyVfModule) {

-		this.node = node

-		this.onlyVfModule = onlyVfModule

-		this.baseVfModule = getElementText('is-base-vf-module').equals('true')

-	}

-

-	/**

-	 * Get the Node representing the VF Module xml.

-	 *

-	 * @return the Node representing the VF Module xml.

-	 */

-	public Node getNode() {

-		return node

-	}

-

-	public String getElementText(String childNodeName) {

-		def Node childNode = (new MsoUtils()).getChildNode(node, childNodeName)

-		if (childNode == null) {

-			return ''

-		} else {

-			return childNode.text()

-		}

-	}

-

-	/**

-	 * Is this VF Module the only VF Module in its containing Generic VNF?

-	 *

-	 * @return true if this VF Module is the only VF Module in its containing Generic VNF;

-	 * false otherwise.

-	 */

-	public boolean isOnlyVfModule() {

-		return onlyVfModule

-	}

-

-	/**

-	 * Is this VF Module the base VF Module in its containing Generic VNF?

-	 *

-	 * @return true if this VF Module is the base VF Module in its containing Generic VNF;

-	 * false otherwise.

-	 */

-	public boolean isBaseVfModule() {

-		return baseVfModule

-	}

-}

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import org.apache.commons.lang3.*
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+public class VfModule implements Serializable {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VfModule.class);
+
+	
+	/**
+	 * Class representing a VF Module Node. Fields of this class include indicators
+	 * as to whether the VF Module is the only VF Module in its containing Generic VNF
+	 * and whether the VF Module is the base VF Module in its containing Generic VNF.
+	 */
+
+	private Node node
+	private Boolean onlyVfModule
+	private Boolean baseVfModule
+
+	/**
+	 * Constructor.
+	 *
+	 * @param node Node representing the VF Module xml.
+	 * @param onlyVfModule Is this VF Module the only VF Module in its containing Generic VNF?
+	 */
+	public VfModule(Node node, boolean onlyVfModule) {
+		this.node = node
+		this.onlyVfModule = onlyVfModule
+		this.baseVfModule = getElementText('is-base-vf-module').equals('true')
+	}
+
+	/**
+	 * Get the Node representing the VF Module xml.
+	 *
+	 * @return the Node representing the VF Module xml.
+	 */
+	public Node getNode() {
+		return node
+	}
+
+	public String getElementText(String childNodeName) {
+		def Node childNode = (new MsoUtils()).getChildNode(node, childNodeName)
+		if (childNode == null) {
+			return ''
+		} else {
+			return childNode.text()
+		}
+	}
+
+	/**
+	 * Is this VF Module the only VF Module in its containing Generic VNF?
+	 *
+	 * @return true if this VF Module is the only VF Module in its containing Generic VNF;
+	 * false otherwise.
+	 */
+	public boolean isOnlyVfModule() {
+		return onlyVfModule
+	}
+
+	/**
+	 * Is this VF Module the base VF Module in its containing Generic VNF?
+	 *
+	 * @return true if this VF Module is the base VF Module in its containing Generic VNF;
+	 * false otherwise.
+	 */
+	public boolean isBaseVfModule() {
+		return baseVfModule
+	}
+}
+
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy
index e0b9c3020c..fec140da33 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy
@@ -1,1285 +1,1285 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts;

-

-import java.io.ObjectInputStream.BlockDataInputStream

-

-//import groovy.util.Node;

-

-import javax.xml.parsers.DocumentBuilder

-import javax.xml.parsers.DocumentBuilderFactory

-

-import org.apache.commons.lang3.*

-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

-

-

-public abstract class VfModuleBase extends AbstractServiceTaskProcessor {

-	

-	protected XmlParser xmlParser = new XmlParser()

-	

-	/**

-	 * Get the XmlParser.

-	 * 

-	 * @return the XmlParser.

-	 */

-	protected XmlParser getXmlParser() {

-		return xmlParser

-	}

-	

-	/**

-	 * Find the VF Module with specified ID in the specified Generic VF.  If no such

-	 * VF Module is found, null is returned.

-	 * 

-	 * @param genericVnf The Generic VNF in which to search for the specified VF Moduel.

-	 * @param vfModuleId The ID of the VF Module for which to search.

-	 * @return a VFModule object for the found VF Module or null if no VF Module is found.

-	 */

-	protected VfModule findVfModule(String genericVnf, String vfModuleId) {

-		

-		def genericVnfNode = xmlParser.parseText(genericVnf)

-		def vfModulesNode = utils.getChildNode(genericVnfNode, 'vf-modules')

-		if (vfModulesNode == null) {

-			return null

-		}

-		def vfModuleList = utils.getIdenticalChildren(vfModulesNode, 'vf-module')

-		for (vfModuleNode in vfModuleList) {

-			def vfModuleIdNode = utils.getChildNode(vfModuleNode, 'vf-module-id')

-			if ((vfModuleIdNode != null) && (vfModuleIdNode.text().equals(vfModuleId))) {

-				return new VfModule(vfModuleNode, (vfModuleList.size() == 1))

-			}

-		}

-		return null

-	}

-	

-	/**

-	 * Transform all '*_network' parameter specifications from the incoming '*-params' root

-	 * element to a corresponding list of 'vnf-networks' specifications (typically used when

-	 * invoking the VNF Rest Adpater). Each element in '*-params' whose name attribute ends

-	 * with '_network' is used to create an 'vnf-networks' element.

-	 * 

-	 * @param paramsNode A Node representing a '*-params' element.

-	 * @return a String of 'vnf-networks' elements, one for each 'param' element whose name

-	 * attribute ends with '_network'.

-	 */

-	protected String transformNetworkParamsToVnfNetworks(String paramsRootXml) {

-		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {

-			return ''

-		}

-		def String vnfNetworks = ''

-		try {

-			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)

-			def paramsNode = xmlParser.parseText(paramsRootXml)

-			def params = utils.getIdenticalChildren(paramsNode, 'param')

-			for (param in params) {

-				def String attrName = (String) param.attribute('name')

-				if (attrName.endsWith('_network')) {

-					def networkRole = attrName.substring(0, (attrName.length()-'_network'.length()))

-					def networkName = param.text()

-					String vnfNetwork = """

-						<vnf-networks>

-							<network-role>${networkRole}</network-role>

-							<network-name>${networkName}</network-name>

-						</vnf-networks>

-					"""

-					vnfNetworks = vnfNetworks + vnfNetwork

-				}

-			}

-		} catch (Exception e) {

-			logWarn('Exception transforming \'_network\' params to vnfNetworks', e)

-		}

-		return vnfNetworks

-	}

-	

-	/**

-	 * Transform the parameter specifications from the incoming '*-params' root element to

-	 * a corresponding list of 'entry's (typically used when invoking the VNF Rest Adpater).

-	 * Each element in '*-params' is used to create an 'entry' element.

-	 *

-	 * @param paramsNode A Node representing a '*-params' element.

-	 * @return a String of 'entry' elements, one for each 'param' element.

-	 */

-	protected String transformParamsToEntries(String paramsRootXml) {

-		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {

-			return ''

-		}

-		def String entries = ''

-		try {

-			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)

-			def paramsNode = xmlParser.parseText(paramsRootXml)

-			def params = utils.getIdenticalChildren(paramsNode, 'param')

-			for (param in params) {

-				def key = (String) param.attribute('name')

-				if (key == null) {

-					key = ''

-				}

-				def value = (String) param.text()

-				String entry = """

-					<entry>

-						<key>${key}</key>

-						<value>${value}</value>

-					</entry>

-				"""

-				entries = entries + entry

-			}

-		} catch (Exception e) {

-			logWarn('Exception transforming params to entries', e)

-		}

-		return entries

-	}

-	

-	/**

-	 * Transform the parameter specifications from the incoming '*-params' root element to

-	 * a corresponding list of 'entry's (typically used when invoking the VNF Rest Adpater).

-	 * Each element in '*-params' is used to create an 'entry' element.

-	 *

-	 * @param paramsNode A Node representing a '*-params' element.

-	 * @return a String of 'entry' elements, one for each 'param' element.

-	 */

-	protected String transformVolumeParamsToEntries(String paramsRootXml) {

-		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {

-			return ''

-		}

-		def String entries = ''

-		try {

-			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)

-			def paramsNode = xmlParser.parseText(paramsRootXml)

-			def params = utils.getIdenticalChildren(paramsNode, 'param')

-			for (param in params) {

-				def key = (String) param.attribute('name')

-				if (key == null) {

-					key = ''

-				}

-				if ( !(key in ['vnf_id', 'vnf_name', 'vf_module_id', 'vf_module_name'])) {

-					def value = (String) param.text()

-					String entry = """

-						<entry>

-							<key>${key}</key>

-							<value>${value}</value>

-						</entry>

-					"""

-					entries = entries + entry

-				}

-			}

-		} catch (Exception e) {

-			logWarn('Exception transforming params to entries', e)

-		}

-		return entries

-	}

-	

-	/**

-	 * 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.

-	 */

-	protected String getTenantIdFromVolumeGroup(String volumeGroupXml) {

-		def groovy.util.Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)

-		def groovy.util.Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')

-		if (relationshipList != null) {

-			def groovy.util.NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

-			for (groovy.util.Node relationship in relationships) {

-				def groovy.util.Node relatedTo = utils.getChildNode(relationship, 'related-to')

-				if ((relatedTo != null) && (relatedTo.text().equals('tenant'))) {

-					def groovy.util.NodeList relationshipDataList = utils.getIdenticalChildren(relationship, 'relationship-data')

-					for (groovy.util.Node relationshipData in relationshipDataList) {

-						def groovy.util.Node relationshipKey = utils.getChildNode(relationshipData, 'relationship-key')

-						if ((relationshipKey != null) && (relationshipKey.text().equals('tenant.tenant-id'))) {

-							def groovy.util.Node relationshipValue = utils.getChildNode(relationshipData, 'relationship-value')

-							if (relationshipValue != null) {

-								return relationshipValue.text()

-							}

-						}

-					}

-				}

-			}

-		}

-		return null

-	}

-	

-	

-	/*

-	 * Parses VNF parameters passed in on the incoming requests and SDNC parameters returned from SDNC get response

-	 * and puts them into the format expected by VNF adapter.

-	 * @param vnfParamsMap -  map of VNF parameters passed in the request body

-	 * @param sdncGetResponse - response string from SDNC GET topology request

-	 * @param vnfId

-	 * @param vnfName

-	 * @param vfModuleId

-	 * @param vfModuleName

-	 * @param vfModuleIndex - can be null

-	 * @return a String of key/value entries for vfModuleParams

-	 */

-	  

-	 

-	 protected String buildVfModuleParams(Map<String, String> vnfParamsMap, String sdncGetResponse, String vnfId, String vnfName,

-		String vfModuleId, String vfModuleName, String vfModuleIndex, String environmentContext, String workloadContext) {

-		

-		//Get SDNC Response Data

-		

-		String data = utils.getNodeXml(sdncGetResponse, "response-data")

-		data = data.replaceAll("&lt;", "<")

-		data = data.replaceAll("&gt;", ">")

-

-		String serviceData = utils.getNodeXml(data, "service-data")

-		serviceData = utils.removeXmlPreamble(serviceData)

-		serviceData = utils.removeXmlNamespaces(serviceData)

-		String vnfRequestInfo = utils.getNodeXml(serviceData, "vnf-request-information")

-		String oldVnfId = utils.getNodeXml(vnfRequestInfo, "vnf-id")

-		oldVnfId = utils.removeXmlPreamble(oldVnfId)

-		oldVnfId = utils.removeXmlNamespaces(oldVnfId)

-		serviceData = serviceData.replace(oldVnfId, "")

-		def vnfId1 = utils.getNodeText1(serviceData, "vnf-id")

-		

-		Map<String, String> paramsMap = new HashMap<String, String>()

-		

-		if (vfModuleIndex != null) {

-			paramsMap.put("vf_module_index", "${vfModuleIndex}")

-		}

-

-		// Add-on data

-		paramsMap.put("vnf_id", "${vnfId}")

-		paramsMap.put("vnf_name", "${vnfName}")

-		paramsMap.put("vf_module_id", "${vfModuleId}")

-		paramsMap.put("vf_module_name", "${vfModuleName}")

-		paramsMap.put("environment_context", "${environmentContext}")

-		paramsMap.put("workload_context", "${workloadContext}")

-		

-		InputSource source = new InputSource(new StringReader(data));

-		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-		docFactory.setNamespaceAware(true)

-		DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-		Document responseXml = docBuilder.parse(source)

-

-

-		// Availability Zones Data

-		

-		NodeList aZonesList = responseXml.getElementsByTagNameNS("*", "availability-zones")

-		String aZonePosition = "0"

-		for (int z = 0; z < aZonesList.getLength(); z++) {

-			Node node = aZonesList.item(z)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node

-				String aZoneValue = utils.getElementText(eElement, "availability-zone")

-				aZonePosition = z.toString()

-				paramsMap.put("availability_zone_${aZonePosition}", "${aZoneValue}")

-			}

-		}

-		

-		// Map of network-roles and network-tags from vm-networks

-		

-		NodeList vmNetworksListGlobal = responseXml.getElementsByTagNameNS("*", "vm-networks")

-		Map<String, String> networkRoleMap = new HashMap<String, String>()

-		for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){

-			Node nodeNetworkKey = vmNetworksListGlobal.item(n)

-			if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElementNetworkKey = (Element) nodeNetworkKey

-				String networkRole = utils.getElementText(eElementNetworkKey, "network-role")

-				String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")

-				if (networkRoleValue.isEmpty()) {

-					networkRoleValue = networkRole

-				}

-				networkRoleMap.put(networkRole, networkRoleValue)				

-			}

-		}		

-

-		// VNF Networks Data

-		

-		StringBuilder sbNet = new StringBuilder()

-		

-		NodeList vnfNetworkList = responseXml.getElementsByTagNameNS("*", "vnf-networks")

-		for (int x = 0; x < vnfNetworkList.getLength(); x++) {

-			Node node = vnfNetworkList.item(x)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node				

-				String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")

-				String networkRole = utils.getElementText(eElement, "network-role")

-				if (vnfNetworkKey.isEmpty()) {

-					vnfNetworkKey = networkRoleMap.get(networkRole)

-					if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {

-						vnfNetworkKey = networkRole

-					}					

-				}				

-				String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")

-				String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")

-				String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")

-				String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")

-				String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")

-				paramsMap.put("${vnfNetworkKey}_net_id", "${vnfNetworkNeutronIdValue}")

-				paramsMap.put("${vnfNetworkKey}_net_name", "${vnfNetworkNetNameValue}")

-				paramsMap.put("${vnfNetworkKey}_subnet_id", "${vnfNetworkSubNetIdValue}")

-				paramsMap.put("${vnfNetworkKey}_v6_subnet_id", "${vnfNetworkV6SubNetIdValue}")

-				paramsMap.put("${vnfNetworkKey}_net_fqdn", "${vnfNetworkNetFqdnValue}")

-				

-				NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")

-				StringBuffer sriovFilterBuf = new StringBuffer()

-				String values = ""

-				for(int i = 0; i < sriovVlanFilterList.getLength(); i++){

-					Node node1 = sriovVlanFilterList.item(i)

-					if (node1.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement1 = (Element) node1

-						String value = utils.getElementText(eElement1, "sriov-vlan-filter")

-						if (i != sriovVlanFilterList.getLength() - 1) {

-							values = sriovFilterBuf.append(value + ",")

-						}

-						else {

-							values = sriovFilterBuf.append(value);

-						}

-					}

-				}

-				if (!values.isEmpty()) {

-						paramsMap.put("${vnfNetworkKey}_ATT_VF_VLAN_FILTER", "${values}")

-					}

-				}

-		}

-

-		// VNF-VMS Data

-		

-		def key

-		def value

-		def networkKey

-		def networkValue

-		def floatingIPKey

-		def floatingIPKeyValue

-		def floatingIPV6Key

-		def floatingIPV6KeyValue

-		StringBuilder sb = new StringBuilder()

-

-		NodeList vmsList = responseXml.getElementsByTagNameNS("*","vnf-vms")

-		for (int x = 0; x < vmsList.getLength(); x++) {

-			Node node = vmsList.item(x)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node

-				key = utils.getElementText(eElement, "vm-type")

-				String values

-				String position = "0"

-				StringBuilder sb1 = new StringBuilder()

-				NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")

-				NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")

-				for(int i = 0; i < valueList.getLength(); i++){

-					Node node1 = valueList.item(i)

-					if (node1.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement1 = (Element) node1

-						value = utils.getElementText(eElement1, "vm-name")

-						if (i != valueList.getLength() - 1) {

-							values = sb1.append(value + ",")

-						}

-						else {

-							values = sb1.append(value);

-						}

-						position = i.toString()

-						paramsMap.put("${key}_name_${position}", "${value}")

-					}

-				}

-				for(int n = 0; n < vmNetworksList.getLength(); n++){

-					String floatingIpKeyValueStr = ""

-					String floatingIpV6KeyValueStr = ""

-					Node nodeNetworkKey = vmNetworksList.item(n)

-					if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElementNetworkKey = (Element) nodeNetworkKey

-						String ipAddressValues

-						String ipV6AddressValues

-						String networkPosition = "0"

-						StringBuilder sb2 = new StringBuilder()

-						StringBuilder sb3 = new StringBuilder()

-						StringBuilder sb4 = new StringBuilder()

-						networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")

-						if (networkKey.isEmpty()) {

-							networkKey = utils.getElementText(eElementNetworkKey, "network-role")

-						}

-						floatingIPKey = key + '_' + networkKey + '_floating_ip'

-						floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")

-						if(!floatingIPKeyValue.isEmpty()){

-							paramsMap.put("$floatingIPKey", "$floatingIPKeyValue")

-						}

-						floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'

-						floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")

-						if(!floatingIPV6KeyValue.isEmpty()){

-							paramsMap.put("$floatingIPV6Key", "$floatingIPV6KeyValue")

-						}

-						NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")

-						for(int a = 0; a < networkIpsList.getLength(); a++){

-							Node ipAddress = networkIpsList.item(a)

-							if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementIpAddress = (Element) ipAddress

-								String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")

-								if (a != networkIpsList.getLength() - 1) {

-									ipAddressValues = sb2.append(ipAddressValue + ",")

-								}

-								else {

-									ipAddressValues = sb2.append(ipAddressValue);

-								}

-								networkPosition = a.toString()

-								paramsMap.put("${key}_${networkKey}_ip_${networkPosition}", "${ipAddressValue}")

-							}

-						}

-						

-						paramsMap.put("${key}_${networkKey}_ips", "${ipAddressValues}")

-						

-						NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")

-						String interfaceRoutePrefixValues = sb3.append("[")

-						

-						for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){

-							Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)

-							if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix

-								String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")

-								if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {

-									interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")

-								}

-								if (a != interfaceRoutePrefixesList.getLength() - 1) {

-									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")

-								}

-								else {

-									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")

-								}

-							}

-						}

-						interfaceRoutePrefixValues = sb3.append("]")

-						if (interfaceRoutePrefixesList.getLength() > 0) {

-							paramsMap.put("${key}_${networkKey}_route_prefixes", "${interfaceRoutePrefixValues}")

-						}

-						

-						NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")

-						for(int a = 0; a < networkIpsV6List.getLength(); a++){

-							Node ipV6Address = networkIpsV6List.item(a)

-							if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementIpV6Address = (Element) ipV6Address

-								String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")

-								if (a != networkIpsV6List.getLength() - 1) {

-									ipV6AddressValues = sb4.append(ipV6AddressValue + ",")

-								}

-								else {

-									ipV6AddressValues = sb4.append(ipV6AddressValue);

-								}

-								networkPosition = a.toString()

-								paramsMap.put("${key}_${networkKey}_v6_ip_${networkPosition}", "${ipV6AddressValue}")

-							}

-						}

-						paramsMap.put("${key}_${networkKey}_v6_ips", "${ipV6AddressValues}")

-					}

-				}

-				paramsMap.put("${key}_names", "${values}")

-			}

-		}

-	//SDNC Response Params

-		String sdncResponseParams = ""

-		List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]

-		String vnfParamsChildNodes = utils.getChildNodes(data, "vnf-parameters")

-		if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){

-			// No SDNC params

-		}else{

-			NodeList paramsList = responseXml.getElementsByTagNameNS("*", "vnf-parameters")

-			for (int z = 0; z < paramsList.getLength(); z++) {

-				Node node = paramsList.item(z)

-				Element eElement = (Element) node

-				String vnfParameterName = utils.getElementText(eElement, "vnf-parameter-name")

-				if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {

-					String vnfParameterValue = utils.getElementText(eElement, "vnf-parameter-value")

-					paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")

-				}

-			}

-		}

-		

-		// Parameters received from the request should overwrite any parameters received from SDNC

-		if (vnfParamsMap != null) {

-			for (Map.Entry<String, String> entry : vnfParamsMap.entrySet()) {

-				String vnfKey = entry.getKey()

-				String vnfValue = entry.getValue()

-				paramsMap.put("$vnfKey", "$vnfValue")

-			}

-		}

-		

-		StringBuilder sbParams = new StringBuilder()

-		def vfModuleParams = ""

-		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>

-						"""

-	

-			vfModuleParams = sbParams.append(paramsXml)

-		}

-		

-		return vfModuleParams

-	

-	}

-	

-			

-			/*

-			 * Parses VNF parameters passed in on the incoming requests and SDNC parameters returned from SDNC get response

-			 * for both VNF and VF Module

-			 * and puts them into the format expected by VNF adapter.

-			 * @param vnfParamsMap -  map of VNF parameters passed in the request body

-			 * @param vnfSdncGetResponse - response string from SDNC GET VNF topology request

-			 * @param vfmoduleSdncGetResponse - response string from SDNC GET VF Module topology request

-			 * @param vnfId

-			 * @param vnfName

-			 * @param vfModuleId

-			 * @param vfModuleName

-			 * @param vfModuleIndex - can be null

-			 * @return a String of key/value entries for vfModuleParams

-			 */			  

-			 

-			 protected String buildVfModuleParamsFromCombinedTopologies(Map<String, String> vnfParamsMap, String vnfSdncGetResponse, String vfmoduleSdncGetResponse, String vnfId, String vnfName,

-					String vfModuleId, String vfModuleName, String vfModuleIndex, String environmentContext, String workloadContext) {

-					

-					// Set up initial parameters

-					

-					Map<String, String> paramsMap = new HashMap<String, String>()

-					

-					if (vfModuleIndex != null) {

-						paramsMap.put("vf_module_index", "${vfModuleIndex}")

-					}

-		

-					// Add-on data

-					paramsMap.put("vnf_id", "${vnfId}")

-					paramsMap.put("vnf_name", "${vnfName}")

-					paramsMap.put("vf_module_id", "${vfModuleId}")

-					paramsMap.put("vf_module_name", "${vfModuleName}")

-					paramsMap.put("environment_context","${environmentContext}")		

-					paramsMap.put("workload_context", "${workloadContext}")			

-					

-					//Get SDNC Response Data for VNF

-					

-					String vnfData = utils.getNodeXml(vnfSdncGetResponse, "response-data")

-					vnfData = vnfData.replaceAll("&lt;", "<")

-					vnfData = vnfData.replaceAll("&gt;", ">")

-		

-					String vnfTopology = utils.getNodeXml(vnfData, "vnf-topology")

-					vnfTopology = utils.removeXmlPreamble(vnfTopology)

-					vnfTopology = utils.removeXmlNamespaces(vnfTopology)

-										

-					InputSource sourceVnf = new InputSource(new StringReader(vnfData));

-					DocumentBuilderFactory docFactoryVnf = DocumentBuilderFactory.newInstance();

-					docFactoryVnf.setNamespaceAware(true)

-					DocumentBuilder docBuilderVnf = docFactoryVnf.newDocumentBuilder()

-					Document responseXmlVnf = docBuilderVnf.parse(sourceVnf)

-				

-					// Availability Zones Data

-					

-					NodeList aZonesList = responseXmlVnf.getElementsByTagNameNS("*", "availability-zones")

-					String aZonePosition = "0"

-					for (int z = 0; z < aZonesList.getLength(); z++) {

-						Node node = aZonesList.item(z)

-						if (node.getNodeType() == Node.ELEMENT_NODE) {

-							Element eElement = (Element) node

-							String aZoneValue = utils.getElementText(eElement, "availability-zone")

-							aZonePosition = z.toString()

-							paramsMap.put("availability_zone_${aZonePosition}", "${aZoneValue}")

-						}

-					}

-					

-					//Get SDNC Response Data for VF Module

-					

-					String vfModuleData = utils.getNodeXml(vfmoduleSdncGetResponse, "response-data")

-					vfModuleData = vfModuleData.replaceAll("&lt;", "<")

-					vfModuleData = vfModuleData.replaceAll("&gt;", ">")

-		

-					String vfModuleTopology = utils.getNodeXml(vfModuleData, "vf-module-topology")

-					vfModuleTopology = utils.removeXmlPreamble(vfModuleTopology)

-					vfModuleTopology = utils.removeXmlNamespaces(vfModuleTopology)

-					String vfModuleTopologyIdentifier = utils.getNodeXml(vfModuleTopology, "vf-module-topology-identifier")

-					

-					InputSource sourceVfModule = new InputSource(new StringReader(vfModuleData));

-					DocumentBuilderFactory docFactoryVfModule = DocumentBuilderFactory.newInstance();

-					docFactoryVfModule.setNamespaceAware(true)

-					DocumentBuilder docBuilderVfModule = docFactoryVfModule.newDocumentBuilder()

-					Document responseXmlVfModule = docBuilderVfModule.parse(sourceVfModule)

-					

-					// Map of network-roles and network-tags from vm-networks

-					

-					NodeList vmNetworksListGlobal = responseXmlVfModule.getElementsByTagNameNS("*", "vm-networks")

-					Map<String, String> networkRoleMap = new HashMap<String, String>()

-					for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){

-						Node nodeNetworkKey = vmNetworksListGlobal.item(n)

-						if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-							Element eElementNetworkKey = (Element) nodeNetworkKey

-							String networkRole = utils.getElementText(eElementNetworkKey, "network-role")

-							String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")

-							if (networkRoleValue.isEmpty()) {

-								networkRoleValue = networkRole

-							}

-							networkRoleMap.put(networkRole, networkRoleValue)

-						}

-					}			

-		

-					// VNF Networks Data

-					

-					StringBuilder sbNet = new StringBuilder()

-					

-					NodeList vnfNetworkList = responseXmlVnf.getElementsByTagNameNS("*", "vnf-networks")

-					for (int x = 0; x < vnfNetworkList.getLength(); x++) {

-						Node node = vnfNetworkList.item(x)

-						if (node.getNodeType() == Node.ELEMENT_NODE) {

-							Element eElement = (Element) node							

-							String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")

-							String networkRole = utils.getElementText(eElement, "network-role")

-							if (vnfNetworkKey.isEmpty()) {

-								vnfNetworkKey = networkRoleMap.get(networkRole)

-								if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {

-									vnfNetworkKey = networkRole

-								}					

-							}	

-							String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")

-							String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")

-							String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")

-							String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")

-							String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")

-							paramsMap.put("${vnfNetworkKey}_net_id", "${vnfNetworkNeutronIdValue}")

-							paramsMap.put("${vnfNetworkKey}_net_name", "${vnfNetworkNetNameValue}")

-							paramsMap.put("${vnfNetworkKey}_subnet_id", "${vnfNetworkSubNetIdValue}")

-							paramsMap.put("${vnfNetworkKey}_v6_subnet_id", "${vnfNetworkV6SubNetIdValue}")

-							paramsMap.put("${vnfNetworkKey}_net_fqdn", "${vnfNetworkNetFqdnValue}")

-							

-							NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")

-							StringBuffer sriovFilterBuf = new StringBuffer()

-							String values = ""

-							for(int i = 0; i < sriovVlanFilterList.getLength(); i++){

-								Node node1 = sriovVlanFilterList.item(i)

-								if (node1.getNodeType() == Node.ELEMENT_NODE) {

-									Element eElement1 = (Element) node1

-									String value = utils.getElementText(eElement1, "sriov-vlan-filter")

-									if (i != sriovVlanFilterList.getLength() - 1) {

-										values = sriovFilterBuf.append(value + ",")

-									}

-									else {

-										values = sriovFilterBuf.append(value);

-									}

-								}

-							}

-							if (!values.isEmpty()) {

-									paramsMap.put("${vnfNetworkKey}_ATT_VF_VLAN_FILTER", "${values}")

-								}

-							}

-					}

-					

-					

-				

-					// VMS Data

-					

-					def key

-					def value

-					def networkKey

-					def networkValue

-					def floatingIPKey

-					def floatingIPKeyValue

-					def floatingIPV6Key

-					def floatingIPV6KeyValue

-					StringBuilder sb = new StringBuilder()

-		

-					NodeList vmsList = responseXmlVfModule.getElementsByTagNameNS("*","vm")

-					for (int x = 0; x < vmsList.getLength(); x++) {

-						Node node = vmsList.item(x)

-						if (node.getNodeType() == Node.ELEMENT_NODE) {

-							Element eElement = (Element) node

-							key = utils.getElementText(eElement, "vm-type")

-							String values

-							String position = "0"

-							StringBuilder sb1 = new StringBuilder()

-							NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")

-							NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")

-							for(int i = 0; i < valueList.getLength(); i++){

-								Node node1 = valueList.item(i)

-								if (node1.getNodeType() == Node.ELEMENT_NODE) {

-									Element eElement1 = (Element) node1

-									value = utils.getElementText(eElement1, "vm-name")

-									if (i != valueList.getLength() - 1) {

-										values = sb1.append(value + ",")

-									}

-									else {

-										values = sb1.append(value);

-									}

-									position = i.toString()

-									paramsMap.put("${key}_name_${position}", "${value}")

-								}

-							}

-							for(int n = 0; n < vmNetworksList.getLength(); n++){

-								String floatingIpKeyValueStr = ""

-								String floatingIpV6KeyValueStr = ""

-								Node nodeNetworkKey = vmNetworksList.item(n)

-								if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-									Element eElementNetworkKey = (Element) nodeNetworkKey

-									String ipAddressValues

-									String ipV6AddressValues

-									String networkPosition = "0"

-									StringBuilder sb2 = new StringBuilder()

-									StringBuilder sb3 = new StringBuilder()

-									StringBuilder sb4 = new StringBuilder()

-									networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")

-									if (networkKey.isEmpty()) {

-										networkKey = utils.getElementText(eElementNetworkKey, "network-role")

-									}

-									floatingIPKey = key + '_' + networkKey + '_floating_ip'

-									floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")

-									if(!floatingIPKeyValue.isEmpty()){

-										paramsMap.put("$floatingIPKey", "$floatingIPKeyValue")

-									}

-									floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'

-									floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")

-									if(!floatingIPV6KeyValue.isEmpty()){

-										paramsMap.put("$floatingIPV6Key", "$floatingIPV6KeyValue")

-									}

-									NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")

-									for(int a = 0; a < networkIpsList.getLength(); a++){

-										Node ipAddress = networkIpsList.item(a)

-										if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {

-											Element eElementIpAddress = (Element) ipAddress

-											String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")

-											if (a != networkIpsList.getLength() - 1) {

-												ipAddressValues = sb2.append(ipAddressValue + ",")

-											}

-											else {

-												ipAddressValues = sb2.append(ipAddressValue);

-											}

-											networkPosition = a.toString()

-											paramsMap.put("${key}_${networkKey}_ip_${networkPosition}", "${ipAddressValue}")

-										}

-									}

-									

-									paramsMap.put("${key}_${networkKey}_ips", "${ipAddressValues}")

-									

-									NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")

-									String interfaceRoutePrefixValues = sb3.append("[")

-									

-									for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){

-										Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)

-										if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {

-											Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix

-											String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")

-											if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {

-												interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")

-											}

-											if (a != interfaceRoutePrefixesList.getLength() - 1) {

-												interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")

-											}

-											else {

-												interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")

-											}

-										}

-									}

-									interfaceRoutePrefixValues = sb3.append("]")

-									if (interfaceRoutePrefixesList.getLength() > 0) {

-										paramsMap.put("${key}_${networkKey}_route_prefixes", "${interfaceRoutePrefixValues}")

-									}

-									

-									NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")

-									for(int a = 0; a < networkIpsV6List.getLength(); a++){

-										Node ipV6Address = networkIpsV6List.item(a)

-										if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {

-											Element eElementIpV6Address = (Element) ipV6Address

-											String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")

-											if (a != networkIpsV6List.getLength() - 1) {

-												ipV6AddressValues = sb4.append(ipV6AddressValue + ",")

-											}

-											else {

-												ipV6AddressValues = sb4.append(ipV6AddressValue);

-											}

-											networkPosition = a.toString()

-											paramsMap.put("${key}_${networkKey}_v6_ip_${networkPosition}", "${ipV6AddressValue}")

-										}

-									}

-									paramsMap.put("${key}_${networkKey}_v6_ips", "${ipV6AddressValues}")

-								}

-							}

-							paramsMap.put("${key}_names", "${values}")

-						}

-					}

-				//SDNC Response Params

-					List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]

-					

-					String vnfParamsChildNodes = utils.getChildNodes(vnfData, "param")

-					if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){

-						// No SDNC params for VNF

-					}else{

-						NodeList paramsList = responseXmlVnf.getElementsByTagNameNS("*", "param")

-						for (int z = 0; z < paramsList.getLength(); z++) {

-							Node node = paramsList.item(z)

-							Element eElement = (Element) node

-							String vnfParameterName = utils.getElementText(eElement, "name")

-							if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {

-								String vnfParameterValue = utils.getElementText(eElement, "value")

-								paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")

-							}

-						}

-					}

-					

-					String vfModuleParamsChildNodes = utils.getChildNodes(vfModuleData, "param")

-					if(vfModuleParamsChildNodes == null || vfModuleParamsChildNodes.length() < 1){

-						// No SDNC params for VF Module

-					}else{

-						NodeList paramsList = responseXmlVfModule.getElementsByTagNameNS("*", "param")

-						for (int z = 0; z < paramsList.getLength(); z++) {

-							Node node = paramsList.item(z)

-							Element eElement = (Element) node

-							String vnfParameterName = utils.getElementText(eElement, "name")

-							if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {

-								String vnfParameterValue = utils.getElementText(eElement, "value")

-								paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")

-							}

-						}

-					}

-					

-				// Parameters received from the request should overwrite any parameters received from SDNC

-				if (vnfParamsMap != null) {

-					for (Map.Entry<String, String> entry : vnfParamsMap.entrySet()) {

-						String vnfKey = entry.getKey()

-						String vnfValue = entry.getValue()

-						paramsMap.put("$vnfKey", "$vnfValue")

-					}

-				}

-				

-				StringBuilder sbParams = new StringBuilder()

-				def vfModuleParams = ""

-				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>

-					"""

-		

-					vfModuleParams = sbParams.append(paramsXml)

-				}

-				

-				return vfModuleParams

-				

-			}

-	

-

-	/*

-	 * VBNG specific method that parses VNF parameters passed in on the 

-	 * incoming requests and SDNC parameters returned from SDNC get response

-	 * and puts them into the format expected by VNF adapter.

-	 * @param vnfParamsMap -  map of VNF parameters passed in the request body

-	 * @param sdncGetResponse - response string from SDNC GET topology request

-	 * @param vnfId

-	 * @param vnfName

-	 * @param vfModuleId

-	 * @param vfModuleName

-	 * @return a String of key/value entries for vfModuleParams

-	 */

-	

-	protected String buildVfModuleParamsVbng(String vnfParams, String sdncGetResponse, String vnfId, String vnfName,

-			String vfModuleId, String vfModuleName) {

-				

-		//Get SDNC Response Data

-				

-		String data = utils.getNodeXml(sdncGetResponse, "response-data")

-		data = data.replaceAll("&lt;", "<")

-		data = data.replaceAll("&gt;", ">")

-	

-		

-	

-		// Add-on data

-		String vnfInfo =

-			"""<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>${vfModuleId}</value>

-			</entry>

-			<entry>

-				<key>vf_module_name</key>

-				<value>${vfModuleName}</value>

-			</entry>"""

-	

-		utils.logAudit("vnfInfo: " + vnfInfo)

-		InputSource source = new InputSource(new StringReader(data));

-		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-		docFactory.setNamespaceAware(true)

-		DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-		Document responseXml = docBuilder.parse(source)

-	

-	

-		// Availability Zones Data

-		String aZones = ""

-		StringBuilder sbAZone = new StringBuilder()

-		NodeList aZonesList = responseXml.getElementsByTagNameNS("*", "availability-zones")

-		String aZonePosition = "0"

-		for (int z = 0; z < aZonesList.getLength(); z++) {

-			Node node = aZonesList.item(z)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node

-				String aZoneValue = utils.getElementText(eElement, "availability-zone")

-				aZonePosition = z.toString()

-				String aZoneXml =

-					"""<entry>

-						<key>availability_zone_${aZonePosition}</key>

-						<value>${aZoneValue}</value>

-					</entry>"""

-				aZones = sbAZone.append(aZoneXml)

-			}

-		}

-		

-		// Map of network-roles and network-tags from vm-networks

-		

-		NodeList vmNetworksListGlobal = responseXml.getElementsByTagNameNS("*", "vm-networks")

-		Map<String, String> networkRoleMap = new HashMap<String, String>()

-		for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){

-			Node nodeNetworkKey = vmNetworksListGlobal.item(n)

-			if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElementNetworkKey = (Element) nodeNetworkKey

-				String networkRole = utils.getElementText(eElementNetworkKey, "network-role")

-				String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")

-				if (networkRoleValue.isEmpty()) {

-					networkRoleValue = networkRole

-				}

-				networkRoleMap.put(networkRole, networkRoleValue)

-			}

-		}

-	

-		// VNF Networks Data

-		String vnfNetworkNetId = ""

-		String vnfNetworkNetName = ""

-		String vnfNetworkSubNetId = ""

-		String vnfNetworkV6SubNetId = ""

-		String vnfNetworkNetFqdn = ""

-		String vnfNetworksSriovVlanFilters = ""

-		StringBuilder sbNet = new StringBuilder()

-		StringBuilder sbNet2 = new StringBuilder()

-		StringBuilder sbNet3 = new StringBuilder()

-		StringBuilder sbNet4 = new StringBuilder()

-		StringBuilder sbNet5 = new StringBuilder()

-		StringBuilder sbNet6 = new StringBuilder()

-		NodeList vnfNetworkList = responseXml.getElementsByTagNameNS("*", "vnf-networks")

-		for (int x = 0; x < vnfNetworkList.getLength(); x++) {

-			Node node = vnfNetworkList.item(x)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node

-				String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")

-				String networkRole = utils.getElementText(eElement, "network-role")

-				if (vnfNetworkKey.isEmpty()) {

-					vnfNetworkKey = networkRoleMap.get(networkRole)

-					if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {

-						vnfNetworkKey = networkRole

-					}					

-				}

-				String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")

-				String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")

-				String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")

-				String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")

-				String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")

-				String vnfNetworkNetIdXml =

-						"""<entry>

-							<key>${vnfNetworkKey}_net_id</key>

-							<value>${vnfNetworkNeutronIdValue}</value>

-						</entry>"""

-				vnfNetworkNetId = sbNet.append(vnfNetworkNetIdXml)

-				String vnfNetworkNetNameXml =

-						"""<entry>

-						<key>${vnfNetworkKey}_net_name</key>

-						<value>${vnfNetworkNetNameValue}</value>

-				</entry>"""

-				vnfNetworkNetName = sbNet2.append(vnfNetworkNetNameXml)

-				String vnfNetworkSubNetIdXml =

-						"""<entry>

-						<key>${vnfNetworkKey}_subnet_id</key>

-						<value>${vnfNetworkSubNetIdValue}</value>

-				</entry>"""

-				vnfNetworkSubNetId = sbNet3.append(vnfNetworkSubNetIdXml)

-				String vnfNetworkV6SubNetIdXml =

-						"""<entry>

-						<key>${vnfNetworkKey}_v6_subnet_id</key>

-						<value>${vnfNetworkV6SubNetIdValue}</value>

-				</entry>"""

-				vnfNetworkV6SubNetId = sbNet5.append(vnfNetworkV6SubNetIdXml)

-				String vnfNetworkNetFqdnXml =

-						"""<entry>

-						<key>${vnfNetworkKey}_net_fqdn</key>

-						<value>${vnfNetworkNetFqdnValue}</value>

-				</entry>"""

-				vnfNetworkNetFqdn = sbNet4.append(vnfNetworkNetFqdnXml)

-						

-				NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")

-				StringBuffer sriovFilterBuf = new StringBuffer()

-				String values = ""

-				for(int i = 0; i < sriovVlanFilterList.getLength(); i++){

-					Node node1 = sriovVlanFilterList.item(i)

-					if (node1.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement1 = (Element) node1

-						String value = utils.getElementText(eElement1, "sriov-vlan-filter")

-						if (i != sriovVlanFilterList.getLength() - 1) {

-							values = sriovFilterBuf.append(value + ",")

-						}

-						else {

-							values = sriovFilterBuf.append(value);

-						}

-					}

-				}

-				if (!values.isEmpty()) {

-						String vnfNetworkSriovVlanFilterXml =

-								"""<entry>

-						<key>${vnfNetworkKey}_ATT_VF_VLAN_FILTER</key>

-						<value>${values}</value>

-					</entry>"""

-						vnfNetworksSriovVlanFilters = sbNet6.append(vnfNetworkSriovVlanFilterXml)

-				}

-			}

-		}

-	

-		// VNF-VMS Data

-		String vnfVMS = ""

-		String vnfVMSPositions = ""

-		String vmNetworks = ""

-		String vmNetworksPositions = ""

-		String vmNetworksPositionsV6 = ""

-		String interfaceRoutePrefixes = ""

-		def key

-		def value

-		def networkKey

-		def networkValue

-		def floatingIPKey

-		def floatingIPKeyValue

-		def floatingIPV6Key

-		def floatingIPV6KeyValue

-		StringBuilder sb = new StringBuilder()

-		StringBuilder sbPositions = new StringBuilder()

-		StringBuilder sbVmNetworks = new StringBuilder()

-		StringBuilder sbNetworksPositions = new StringBuilder()

-		StringBuilder sbInterfaceRoutePrefixes = new StringBuilder()

-		StringBuilder sbNetworksPositionsV6 = new StringBuilder()

-

-		NodeList vmsList = responseXml.getElementsByTagNameNS("*","vnf-vms")

-		for (int x = 0; x < vmsList.getLength(); x++) {

-			Node node = vmsList.item(x)

-			if (node.getNodeType() == Node.ELEMENT_NODE) {

-				Element eElement = (Element) node

-				key = utils.getElementText(eElement, "vm-type")

-				String values

-				String position = "0"

-				StringBuilder sb1 = new StringBuilder()

-				NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")

-				NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")

-				for(int i = 0; i < valueList.getLength(); i++){

-					Node node1 = valueList.item(i)

-					if (node1.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElement1 = (Element) node1

-						value = utils.getElementText(eElement1, "vm-name")

-						if (i != valueList.getLength() - 1) {

-							values = sb1.append(value + ",")

-						}

-						else {

-							values = sb1.append(value);

-						}

-						position = i.toString()

-						String vnfPositionXml =

-								"""<entry>

-								<key>${key}_name_${position}</key>

-								<value>${value}</value>

-							</entry>"""

-						vnfVMSPositions = sbPositions.append(vnfPositionXml)

-					}

-				}

-				for(int n = 0; n < vmNetworksList.getLength(); n++){

-					String floatingIpKeyValueStr = ""

-					String floatingIpV6KeyValueStr = ""

-					Node nodeNetworkKey = vmNetworksList.item(n)

-					if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {

-						Element eElementNetworkKey = (Element) nodeNetworkKey

-						String ipAddressValues

-						String ipV6AddressValues

-						String networkPosition = "0"

-						StringBuilder sb2 = new StringBuilder()

-						StringBuilder sb3 = new StringBuilder()

-						StringBuilder sb4 = new StringBuilder()

-						networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")

-						if (networkKey.isEmpty()) {

-							networkKey = utils.getElementText(eElementNetworkKey, "network-role")

-						}

-						floatingIPKey = key + '_' + networkKey + '_floating_ip'

-						floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")

-						if(!floatingIPKeyValue.isEmpty()){

-							floatingIpKeyValueStr = """<entry>

-								<key>$floatingIPKey</key>

-								<value>$floatingIPKeyValue</value>

-							</entry>"""

-						}

-						floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'

-						floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")

-						if(!floatingIPV6KeyValue.isEmpty()){

-							floatingIpV6KeyValueStr = """<entry>

-								<key>$floatingIPV6Key</key>

-								<value>$floatingIPV6KeyValue</value>

-							</entry>"""

-						}

-						NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")

-						for(int a = 0; a < networkIpsList.getLength(); a++){

-							Node ipAddress = networkIpsList.item(a)

-							if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementIpAddress = (Element) ipAddress

-								String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")

-								if (a != networkIpsList.getLength() - 1) {

-									ipAddressValues = sb2.append(ipAddressValue + ",")

-								}

-								else {

-									ipAddressValues = sb2.append(ipAddressValue);

-								}

-								networkPosition = a.toString()

-								String vmNetworksPositionsXml =

-												"""<entry>

-										<key>${key}_${networkKey}_ip_${networkPosition}</key>

-										<value>${ipAddressValue}</value>

-									</entry>"""

-								vmNetworksPositions = sbNetworksPositions.append(vmNetworksPositionsXml)

-							}

-						}

-						vmNetworksPositions = sbNetworksPositions.append(floatingIpKeyValueStr).append(floatingIpV6KeyValueStr)

-							

-						String vmNetworksXml =

-										"""<entry>

-								<key>${key}_${networkKey}_ips</key>

-								<value>${ipAddressValues}</value>

-							</entry>"""

-						vmNetworks = sbVmNetworks.append(vmNetworksXml)

-								

-						NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")

-						String interfaceRoutePrefixValues = sb3.append("[")

-								

-						for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){

-							Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)

-							if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix

-								String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")

-								if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {

-									interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")

-								}

-								if (a != interfaceRoutePrefixesList.getLength() - 1) {

-									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")

-								}

-								else {

-									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")

-								}

-							}

-						}

-						interfaceRoutePrefixValues = sb3.append("]")

-						if (interfaceRoutePrefixesList.getLength() > 0) {

-							String interfaceRoutePrefixesXml =

-													"""<entry>

-											<key>${key}_${networkKey}_route_prefixes</key>

-											<value>${interfaceRoutePrefixValues}</value>

-										</entry>"""					

-							interfaceRoutePrefixes = sbInterfaceRoutePrefixes.append(interfaceRoutePrefixesXml)

-						}

-							

-						NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")

-						for(int a = 0; a < networkIpsV6List.getLength(); a++){

-							Node ipV6Address = networkIpsV6List.item(a)

-							if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElementIpV6Address = (Element) ipV6Address

-								String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")

-								if (a != networkIpsV6List.getLength() - 1) {

-									ipV6AddressValues = sb4.append(ipV6AddressValue + ",")

-								}

-								else {

-									ipV6AddressValues = sb4.append(ipV6AddressValue);

-								}

-								networkPosition = a.toString()

-								String vmNetworksPositionsV6Xml =

-										"""<entry>

-										<key>${key}_${networkKey}_v6_ip_${networkPosition}</key>

-										<value>${ipV6AddressValue}</value>

-										</entry>"""

-								vmNetworksPositionsV6 = sbNetworksPositionsV6.append(vmNetworksPositionsV6Xml)

-							}

-						}

-						String vmNetworksV6Xml =

-								"""<entry>

-								<key>${key}_${networkKey}_v6_ips</key>

-								<value>${ipV6AddressValues}</value>

-							</entry>"""

-						vmNetworks = sbVmNetworks.append(vmNetworksV6Xml)

-					}

-				}

-				String vnfXml =

-								"""<entry>

-				<key>${key}_names</key>

-				<value>${values}</value>

-					</entry>"""

-				vnfVMS = sb.append(vnfXml)

-			}

-		}

-	//SDNC Response Params

-		String sdncResponseParams = ""

-		List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]

-		String vnfParamsChildNodes = utils.getChildNodes(data, "vnf-parameters")

-		if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){

-			// No SDNC params

-		}else{

-			NodeList paramsList = responseXml.getElementsByTagNameNS("*", "vnf-parameters")

-			for (int z = 0; z < paramsList.getLength(); z++) {

-				Node node = paramsList.item(z)

-				Element eElement = (Element) node

-				String vnfParameterName = utils.getElementText(eElement, "vnf-parameter-name")

-				if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {

-					String vnfParameterValue = utils.getElementText(eElement, "vnf-parameter-value")

-					String paraEntry =

-						"""<entry>

-							<key>${vnfParameterName}</key>

-							<value>${vnfParameterValue}</value>

-						</entry>"""

-					sdncResponseParams = sb.append(paraEntry)

-				}

-			}

-		}

-	

-	

-		def vfModuleParams = """

-		${vnfInfo}

-		${aZones}

-		${vnfNetworkNetId}

-		${vnfNetworkNetName}

-		${vnfNetworkSubNetId}

-		${vnfNetworkV6SubNetId}

-		${vnfNetworkNetFqdn}

-		${vnfNetworksSriovVlanFilters}

-        ${vnfVMS}

-        ${vnfVMSPositions}

-		${vmNetworks}

-		${vmNetworksPositions}

-		${vmNetworksPositionsV6}

-		${interfaceRoutePrefixes}

-		${vnfParams}

-		${sdncResponseParams}"""

-			

-		return vfModuleParams

-			

-	}

-	

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts;
+
+import java.io.ObjectInputStream.BlockDataInputStream
+
+import java.io.ObjectInputStream.BlockDataInputStream
+
+//import groovy.util.Node;
+
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+
+import org.apache.commons.lang3.*
+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 org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+
+public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VfModuleBase.class);
+
+	
+	protected XmlParser xmlParser = new XmlParser()
+	
+	/**
+	 * Get the XmlParser.
+	 * 
+	 * @return the XmlParser.
+	 */
+	protected XmlParser getXmlParser() {
+		return xmlParser
+	}
+	
+	/**
+	 * Find the VF Module with specified ID in the specified Generic VF.  If no such
+	 * VF Module is found, null is returned.
+	 * 
+	 * @param genericVnf The Generic VNF in which to search for the specified VF Moduel.
+	 * @param vfModuleId The ID of the VF Module for which to search.
+	 * @return a VFModule object for the found VF Module or null if no VF Module is found.
+	 */
+	protected VfModule findVfModule(String genericVnf, String vfModuleId) {
+		
+		def genericVnfNode = xmlParser.parseText(genericVnf)
+		def vfModulesNode = utils.getChildNode(genericVnfNode, 'vf-modules')
+		if (vfModulesNode == null) {
+			return null
+		}
+		def vfModuleList = utils.getIdenticalChildren(vfModulesNode, 'vf-module')
+		for (vfModuleNode in vfModuleList) {
+			def vfModuleIdNode = utils.getChildNode(vfModuleNode, 'vf-module-id')
+			if ((vfModuleIdNode != null) && (vfModuleIdNode.text().equals(vfModuleId))) {
+				return new VfModule(vfModuleNode, (vfModuleList.size() == 1))
+			}
+		}
+		return null
+	}
+	
+	/**
+	 * Transform all '*_network' parameter specifications from the incoming '*-params' root
+	 * element to a corresponding list of 'vnf-networks' specifications (typically used when
+	 * invoking the VNF Rest Adpater). Each element in '*-params' whose name attribute ends
+	 * with '_network' is used to create an 'vnf-networks' element.
+	 * 
+	 * @param paramsNode A Node representing a '*-params' element.
+	 * @return a String of 'vnf-networks' elements, one for each 'param' element whose name
+	 * attribute ends with '_network'.
+	 */
+	protected String transformNetworkParamsToVnfNetworks(String paramsRootXml) {
+		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {
+			return ''
+		}
+		def String vnfNetworks = ''
+		try {
+			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)
+			def paramsNode = xmlParser.parseText(paramsRootXml)
+			def params = utils.getIdenticalChildren(paramsNode, 'param')
+			for (param in params) {
+				def String attrName = (String) param.attribute('name')
+				if (attrName.endsWith('_network')) {
+					def networkRole = attrName.substring(0, (attrName.length()-'_network'.length()))
+					def networkName = param.text()
+					String vnfNetwork = """
+						<vnf-networks>
+							<network-role>${MsoUtils.xmlEscape(networkRole)}</network-role>
+							<network-name>${MsoUtils.xmlEscape(networkName)}</network-name>
+						</vnf-networks>
+					"""
+					vnfNetworks = vnfNetworks + vnfNetwork
+				}
+			}
+		} catch (Exception e) {
+			msoLogger.warn(MessageEnum.BPMN_GENERAL_WARNING, 'Exception transforming network params to vnfNetworks', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, 'Exception is: \n' + e);
+		}
+		return vnfNetworks
+	}
+	
+	/**
+	 * Transform the parameter specifications from the incoming '*-params' root element to
+	 * a corresponding list of 'entry's (typically used when invoking the VNF Rest Adpater).
+	 * Each element in '*-params' is used to create an 'entry' element.
+	 *
+	 * @param paramsNode A Node representing a '*-params' element.
+	 * @return a String of 'entry' elements, one for each 'param' element.
+	 */
+	protected String transformParamsToEntries(String paramsRootXml) {
+		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {
+			return ''
+		}
+		def String entries = ''
+		try {
+			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)
+			def paramsNode = xmlParser.parseText(paramsRootXml)
+			def params = utils.getIdenticalChildren(paramsNode, 'param')
+			for (param in params) {
+				def key = (String) param.attribute('name')
+				if (key == null) {
+					key = ''
+				}
+				def value = (String) param.text()
+				String entry = """
+					<entry>
+						<key>${MsoUtils.xmlEscape(key)}</key>
+						<value>${MsoUtils.xmlEscape(value)}</value>
+					</entry>
+				"""
+				entries = entries + entry
+			}
+		} catch (Exception e) {
+			msoLogger.warn(MessageEnum.BPMN_GENERAL_WARNING, 'Exception transforming params to entries', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, 'Exception transforming params to entries', e);
+		}
+		return entries
+	}
+	
+	/**
+	 * Transform the parameter specifications from the incoming '*-params' root element to
+	 * a corresponding list of 'entry's (typically used when invoking the VNF Rest Adpater).
+	 * Each element in '*-params' is used to create an 'entry' element.
+	 *
+	 * @param paramsNode A Node representing a '*-params' element.
+	 * @return a String of 'entry' elements, one for each 'param' element.
+	 */
+	protected String transformVolumeParamsToEntries(String paramsRootXml) {
+		if ((paramsRootXml == null) || (paramsRootXml.isEmpty())) {
+			return ''
+		}
+		def String entries = ''
+		try {
+			paramsRootXml = utils.removeXmlNamespaces(paramsRootXml)
+			def paramsNode = xmlParser.parseText(paramsRootXml)
+			def params = utils.getIdenticalChildren(paramsNode, 'param')
+			for (param in params) {
+				def key = (String) param.attribute('name')
+				if (key == null) {
+					key = ''
+				}
+				if ( !(key in ['vnf_id', 'vnf_name', 'vf_module_id', 'vf_module_name'])) {
+					def value = (String) param.text()
+					String entry = """
+						<entry>
+							<key>${MsoUtils.xmlEscape(key)}</key>
+							<value>${MsoUtils.xmlEscape(value)}</value>
+						</entry>
+					"""
+					entries = entries + entry
+				}
+			}
+		} catch (Exception e) {
+			msoLogger.warn(MessageEnum.BPMN_GENERAL_WARNING, 'Exception transforming params to entries', "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, 'Exception transforming params to entries', e);
+		}
+		return entries
+	}
+	
+	/**
+	 * 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.
+	 */
+	protected String getTenantIdFromVolumeGroup(String volumeGroupXml) {
+		def groovy.util.Node volumeGroupNode = xmlParser.parseText(volumeGroupXml)
+		def groovy.util.Node relationshipList = utils.getChildNode(volumeGroupNode, 'relationship-list')
+		if (relationshipList != null) {
+			def groovy.util.NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')
+			for (groovy.util.Node relationship in relationships) {
+				def groovy.util.Node relatedTo = utils.getChildNode(relationship, 'related-to')
+				if ((relatedTo != null) && (relatedTo.text().equals('tenant'))) {
+					def groovy.util.NodeList relationshipDataList = utils.getIdenticalChildren(relationship, 'relationship-data')
+					for (groovy.util.Node relationshipData in relationshipDataList) {
+						def groovy.util.Node relationshipKey = utils.getChildNode(relationshipData, 'relationship-key')
+						if ((relationshipKey != null) && (relationshipKey.text().equals('tenant.tenant-id'))) {
+							def groovy.util.Node relationshipValue = utils.getChildNode(relationshipData, 'relationship-value')
+							if (relationshipValue != null) {
+								return relationshipValue.text()
+							}
+						}
+					}
+				}
+			}
+		}
+		return null
+	}
+	
+	
+	/*
+	 * Parses VNF parameters passed in on the incoming requests and SDNC parameters returned from SDNC get response
+	 * and puts them into the format expected by VNF adapter.
+	 * @param vnfParamsMap -  map of VNF parameters passed in the request body
+	 * @param sdncGetResponse - response string from SDNC GET topology request
+	 * @param vnfId
+	 * @param vnfName
+	 * @param vfModuleId
+	 * @param vfModuleName
+	 * @param vfModuleIndex - can be null
+	 * @return a String of key/value entries for vfModuleParams
+	 */
+	  
+	 
+	 protected String buildVfModuleParams(Map<String, String> vnfParamsMap, String sdncGetResponse, String vnfId, String vnfName,
+		String vfModuleId, String vfModuleName, String vfModuleIndex, String environmentContext, String workloadContext) {
+		
+		//Get SDNC Response Data
+		
+		String data = utils.getNodeXml(sdncGetResponse, "response-data")
+
+		String serviceData = utils.getNodeXml(data, "service-data")
+		serviceData = utils.removeXmlPreamble(serviceData)
+		serviceData = utils.removeXmlNamespaces(serviceData)
+		String vnfRequestInfo = utils.getNodeXml(serviceData, "vnf-request-information")
+		String oldVnfId = utils.getNodeXml(vnfRequestInfo, "vnf-id")
+		oldVnfId = utils.removeXmlPreamble(oldVnfId)
+		oldVnfId = utils.removeXmlNamespaces(oldVnfId)
+		serviceData = serviceData.replace(oldVnfId, "")
+		def vnfId1 = utils.getNodeText(serviceData, "vnf-id")
+		
+		Map<String, String> paramsMap = new HashMap<String, String>()
+		
+		if (vfModuleIndex != null) {
+			paramsMap.put("vf_module_index", "${vfModuleIndex}")
+		}
+
+		// Add-on data
+		paramsMap.put("vnf_id", "${vnfId}")
+		paramsMap.put("vnf_name", "${vnfName}")
+		paramsMap.put("vf_module_id", "${vfModuleId}")
+		paramsMap.put("vf_module_name", "${vfModuleName}")
+		paramsMap.put("environment_context", "${environmentContext}")
+		paramsMap.put("workload_context", "${workloadContext}")
+		
+		InputSource source = new InputSource(new StringReader(data));
+		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+		docFactory.setNamespaceAware(true)
+		DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+		Document responseXml = docBuilder.parse(source)
+
+
+		// Availability Zones Data
+		
+		NodeList aZonesList = responseXml.getElementsByTagNameNS("*", "availability-zones")
+		String aZonePosition = "0"
+		for (int z = 0; z < aZonesList.getLength(); z++) {
+			Node node = aZonesList.item(z)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				String aZoneValue = utils.getElementText(eElement, "availability-zone")
+				aZonePosition = z.toString()
+				paramsMap.put("availability_zone_${aZonePosition}", "${aZoneValue}")
+			}
+		}
+
+		// Map of network-roles and network-tags from vm-networks
+		
+		NodeList vmNetworksListGlobal = responseXml.getElementsByTagNameNS("*", "vm-networks")
+		Map<String, String> networkRoleMap = new HashMap<String, String>()
+		for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){
+			Node nodeNetworkKey = vmNetworksListGlobal.item(n)
+			if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElementNetworkKey = (Element) nodeNetworkKey
+				String networkRole = utils.getElementText(eElementNetworkKey, "network-role")
+				String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")
+				if (networkRoleValue.isEmpty()) {
+					networkRoleValue = networkRole
+				}
+				networkRoleMap.put(networkRole, networkRoleValue)				
+			}
+		}		
+
+		// VNF Networks Data
+		
+		StringBuilder sbNet = new StringBuilder()
+		
+		NodeList vnfNetworkList = responseXml.getElementsByTagNameNS("*", "vnf-networks")
+		for (int x = 0; x < vnfNetworkList.getLength(); x++) {
+			Node node = vnfNetworkList.item(x)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")
+				String networkRole = utils.getElementText(eElement, "network-role")
+				if (vnfNetworkKey.isEmpty()) {
+					vnfNetworkKey = networkRoleMap.get(networkRole)
+					if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {
+						vnfNetworkKey = networkRole
+					}					
+				}				
+				String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")
+				String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")
+				String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")
+				String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")
+				String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")
+				paramsMap.put("${vnfNetworkKey}_net_id", "${vnfNetworkNeutronIdValue}")
+				paramsMap.put("${vnfNetworkKey}_net_name", "${vnfNetworkNetNameValue}")
+				paramsMap.put("${vnfNetworkKey}_subnet_id", "${vnfNetworkSubNetIdValue}")
+				paramsMap.put("${vnfNetworkKey}_v6_subnet_id", "${vnfNetworkV6SubNetIdValue}")
+				paramsMap.put("${vnfNetworkKey}_net_fqdn", "${vnfNetworkNetFqdnValue}")
+				
+				NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")
+				StringBuffer sriovFilterBuf = new StringBuffer()
+				String values = ""
+				for(int i = 0; i < sriovVlanFilterList.getLength(); i++){
+					Node node1 = sriovVlanFilterList.item(i)
+					if (node1.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement1 = (Element) node1
+						String value = utils.getElementText(eElement1, "sriov-vlan-filter")
+						if (i != sriovVlanFilterList.getLength() - 1) {
+							values = sriovFilterBuf.append(value + ",")
+						}
+						else {
+							values = sriovFilterBuf.append(value);
+						}
+					}
+				}
+				if (!values.isEmpty()) {
+						paramsMap.put("${vnfNetworkKey}_ATT_VF_VLAN_FILTER", "${values}")
+					}
+				}
+		}
+
+		// VNF-VMS Data
+		
+		def key
+		def value
+		def networkKey
+		def networkValue
+		def floatingIPKey
+		def floatingIPKeyValue
+		def floatingIPV6Key
+		def floatingIPV6KeyValue
+		StringBuilder sb = new StringBuilder()
+
+		NodeList vmsList = responseXml.getElementsByTagNameNS("*","vnf-vms")
+		for (int x = 0; x < vmsList.getLength(); x++) {
+			Node node = vmsList.item(x)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				key = utils.getElementText(eElement, "vm-type")
+				String values
+				String position = "0"
+				StringBuilder sb1 = new StringBuilder()
+				NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")
+				NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")
+				for(int i = 0; i < valueList.getLength(); i++){
+					Node node1 = valueList.item(i)
+					if (node1.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement1 = (Element) node1
+						value = utils.getElementText(eElement1, "vm-name")
+						if (i != valueList.getLength() - 1) {
+							values = sb1.append(value + ",")
+						}
+						else {
+							values = sb1.append(value);
+						}
+						position = i.toString()
+						paramsMap.put("${key}_name_${position}", "${value}")
+					}
+				}
+				for(int n = 0; n < vmNetworksList.getLength(); n++){
+					String floatingIpKeyValueStr = ""
+					String floatingIpV6KeyValueStr = ""
+					Node nodeNetworkKey = vmNetworksList.item(n)
+					if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElementNetworkKey = (Element) nodeNetworkKey
+						String ipAddressValues
+						String ipV6AddressValues
+						String networkPosition = "0"
+						StringBuilder sb2 = new StringBuilder()
+						StringBuilder sb3 = new StringBuilder()
+						StringBuilder sb4 = new StringBuilder()
+						networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")
+						if (networkKey.isEmpty()) {
+							networkKey = utils.getElementText(eElementNetworkKey, "network-role")
+						}
+						floatingIPKey = key + '_' + networkKey + '_floating_ip'
+						floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")
+						if(!floatingIPKeyValue.isEmpty()){
+							paramsMap.put("$floatingIPKey", "$floatingIPKeyValue")
+						}
+						floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'
+						floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")
+						if(!floatingIPV6KeyValue.isEmpty()){
+							paramsMap.put("$floatingIPV6Key", "$floatingIPV6KeyValue")
+						}
+						NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")
+						for(int a = 0; a < networkIpsList.getLength(); a++){
+							Node ipAddress = networkIpsList.item(a)
+							if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementIpAddress = (Element) ipAddress
+								String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")
+								if (a != networkIpsList.getLength() - 1) {
+									ipAddressValues = sb2.append(ipAddressValue + ",")
+								}
+								else {
+									ipAddressValues = sb2.append(ipAddressValue);
+								}
+								networkPosition = a.toString()
+								paramsMap.put("${key}_${networkKey}_ip_${networkPosition}", "${ipAddressValue}")
+							}
+						}
+						
+						paramsMap.put("${key}_${networkKey}_ips", "${ipAddressValues}")
+						
+						NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")
+						String interfaceRoutePrefixValues = sb3.append("[")
+						
+						for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){
+							Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)
+							if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix
+								String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")
+								if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {
+									interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")
+								}
+								if (a != interfaceRoutePrefixesList.getLength() - 1) {
+									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")
+								}
+								else {
+									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")
+								}
+							}
+						}
+						interfaceRoutePrefixValues = sb3.append("]")
+						if (interfaceRoutePrefixesList.getLength() > 0) {
+							paramsMap.put("${key}_${networkKey}_route_prefixes", "${interfaceRoutePrefixValues}")
+						}
+						
+						NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")
+						for(int a = 0; a < networkIpsV6List.getLength(); a++){
+							Node ipV6Address = networkIpsV6List.item(a)
+							if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementIpV6Address = (Element) ipV6Address
+								String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")
+								if (a != networkIpsV6List.getLength() - 1) {
+									ipV6AddressValues = sb4.append(ipV6AddressValue + ",")
+								}
+								else {
+									ipV6AddressValues = sb4.append(ipV6AddressValue);
+								}
+								networkPosition = a.toString()
+								paramsMap.put("${key}_${networkKey}_v6_ip_${networkPosition}", "${ipV6AddressValue}")
+							}
+						}
+						paramsMap.put("${key}_${networkKey}_v6_ips", "${ipV6AddressValues}")
+					}
+				}
+				paramsMap.put("${key}_names", "${values}")
+			}
+		}
+	//SDNC Response Params
+		String sdncResponseParams = ""
+		List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]
+		String vnfParamsChildNodes = utils.getChildNodes(data, "vnf-parameters")
+		if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){
+			// No SDNC params
+		}else{
+			NodeList paramsList = responseXml.getElementsByTagNameNS("*", "vnf-parameters")
+			for (int z = 0; z < paramsList.getLength(); z++) {
+				Node node = paramsList.item(z)
+				Element eElement = (Element) node
+				String vnfParameterName = utils.getElementText(eElement, "vnf-parameter-name")
+				if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {
+					String vnfParameterValue = utils.getElementText(eElement, "vnf-parameter-value")
+					paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")
+				}
+			}
+		}
+		
+		// Parameters received from the request should overwrite any parameters received from SDNC
+		if (vnfParamsMap != null) {
+			for (Map.Entry<String, String> entry : vnfParamsMap.entrySet()) {
+				String vnfKey = entry.getKey()
+				String vnfValue = entry.getValue()
+				paramsMap.put("$vnfKey", "$vnfValue")
+			}
+		}
+		
+		StringBuilder sbParams = new StringBuilder()
+		def vfModuleParams = ""
+		for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+			String paramsXml
+			String paramName = entry.getKey()
+			String paramValue = entry.getValue()
+			paramsXml =
+					"""<entry>
+							<key>${MsoUtils.xmlEscape(paramName)}</key>
+							<value>${MsoUtils.xmlEscape(paramValue)}</value>
+						</entry>
+						"""
+	
+			vfModuleParams = sbParams.append(paramsXml)
+		}
+		
+		return vfModuleParams
+	
+	}
+	
+			
+			/*
+			 * Parses VNF parameters passed in on the incoming requests and SDNC parameters returned from SDNC get response
+			 * for both VNF and VF Module
+			 * and puts them into the format expected by VNF adapter.
+			 * @param vnfParamsMap -  map of VNF parameters passed in the request body
+			 * @param vnfSdncGetResponse - response string from SDNC GET VNF topology request
+			 * @param vfmoduleSdncGetResponse - response string from SDNC GET VF Module topology request
+			 * @param vnfId
+			 * @param vnfName
+			 * @param vfModuleId
+			 * @param vfModuleName
+			 * @param vfModuleIndex - can be null
+			 * @return a String of key/value entries for vfModuleParams
+			 */			  
+			 
+			 protected String buildVfModuleParamsFromCombinedTopologies(Map<String, String> vnfParamsMap, String vnfSdncGetResponse, String vfmoduleSdncGetResponse, String vnfId, String vnfName,
+					String vfModuleId, String vfModuleName, String vfModuleIndex, String environmentContext, String workloadContext) {
+					
+					// Set up initial parameters
+					
+					Map<String, String> paramsMap = new HashMap<String, String>()
+					
+					if (vfModuleIndex != null) {
+						paramsMap.put("vf_module_index", "${vfModuleIndex}")
+					}
+		
+					// Add-on data
+					paramsMap.put("vnf_id", "${vnfId}")
+					paramsMap.put("vnf_name", "${vnfName}")
+					paramsMap.put("vf_module_id", "${vfModuleId}")
+					paramsMap.put("vf_module_name", "${vfModuleName}")
+					paramsMap.put("environment_context","${environmentContext}")		
+					paramsMap.put("workload_context", "${workloadContext}")			
+					
+					//Get SDNC Response Data for VNF
+					
+					String vnfData = utils.getNodeXml(vnfSdncGetResponse, "response-data")
+		
+					String vnfTopology = utils.getNodeXml(vnfData, "vnf-topology")
+					vnfTopology = utils.removeXmlPreamble(vnfTopology)
+					vnfTopology = utils.removeXmlNamespaces(vnfTopology)
+										
+					InputSource sourceVnf = new InputSource(new StringReader(vnfData));
+					DocumentBuilderFactory docFactoryVnf = DocumentBuilderFactory.newInstance();
+					docFactoryVnf.setNamespaceAware(true)
+					DocumentBuilder docBuilderVnf = docFactoryVnf.newDocumentBuilder()
+					Document responseXmlVnf = docBuilderVnf.parse(sourceVnf)
+				
+					// Availability Zones Data
+					
+					NodeList aZonesList = responseXmlVnf.getElementsByTagNameNS("*", "availability-zones")
+					String aZonePosition = "0"
+					for (int z = 0; z < aZonesList.getLength(); z++) {
+						Node node = aZonesList.item(z)
+						if (node.getNodeType() == Node.ELEMENT_NODE) {
+							Element eElement = (Element) node
+							String aZoneValue = utils.getElementText(eElement, "availability-zone")
+							aZonePosition = z.toString()
+							paramsMap.put("availability_zone_${aZonePosition}", "${aZoneValue}")
+						}
+					}
+		
+					//Get SDNC Response Data for VF Module
+					
+					String vfModuleData = utils.getNodeXml(vfmoduleSdncGetResponse, "response-data")
+		
+					String vfModuleTopology = utils.getNodeXml(vfModuleData, "vf-module-topology")
+					vfModuleTopology = utils.removeXmlPreamble(vfModuleTopology)
+					vfModuleTopology = utils.removeXmlNamespaces(vfModuleTopology)
+					String vfModuleTopologyIdentifier = utils.getNodeXml(vfModuleTopology, "vf-module-topology-identifier")
+					
+					InputSource sourceVfModule = new InputSource(new StringReader(vfModuleData));
+					DocumentBuilderFactory docFactoryVfModule = DocumentBuilderFactory.newInstance();
+					docFactoryVfModule.setNamespaceAware(true)
+					DocumentBuilder docBuilderVfModule = docFactoryVfModule.newDocumentBuilder()
+					Document responseXmlVfModule = docBuilderVfModule.parse(sourceVfModule)
+					
+					// Map of network-roles and network-tags from vm-networks
+					
+					NodeList vmNetworksListGlobal = responseXmlVfModule.getElementsByTagNameNS("*", "vm-networks")
+					Map<String, String> networkRoleMap = new HashMap<String, String>()
+					for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){
+						Node nodeNetworkKey = vmNetworksListGlobal.item(n)
+						if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+							Element eElementNetworkKey = (Element) nodeNetworkKey
+							String networkRole = utils.getElementText(eElementNetworkKey, "network-role")
+							String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")
+							if (networkRoleValue.isEmpty()) {
+								networkRoleValue = networkRole
+							}
+							networkRoleMap.put(networkRole, networkRoleValue)
+						}
+					}			
+		
+					// VNF Networks Data
+					
+					StringBuilder sbNet = new StringBuilder()
+					
+					NodeList vnfNetworkList = responseXmlVnf.getElementsByTagNameNS("*", "vnf-networks")
+					for (int x = 0; x < vnfNetworkList.getLength(); x++) {
+						Node node = vnfNetworkList.item(x)
+						if (node.getNodeType() == Node.ELEMENT_NODE) {
+							Element eElement = (Element) node
+							String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")
+							String networkRole = utils.getElementText(eElement, "network-role")
+							if (vnfNetworkKey.isEmpty()) {
+								vnfNetworkKey = networkRoleMap.get(networkRole)
+								if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {
+									vnfNetworkKey = networkRole
+								}					
+							}	
+							String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")
+							String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")
+							String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")
+							String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")
+							String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")
+							paramsMap.put("${vnfNetworkKey}_net_id", "${vnfNetworkNeutronIdValue}")
+							paramsMap.put("${vnfNetworkKey}_net_name", "${vnfNetworkNetNameValue}")
+							paramsMap.put("${vnfNetworkKey}_subnet_id", "${vnfNetworkSubNetIdValue}")
+							paramsMap.put("${vnfNetworkKey}_v6_subnet_id", "${vnfNetworkV6SubNetIdValue}")
+							paramsMap.put("${vnfNetworkKey}_net_fqdn", "${vnfNetworkNetFqdnValue}")
+							
+							NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")
+							StringBuffer sriovFilterBuf = new StringBuffer()
+							String values = ""
+							for(int i = 0; i < sriovVlanFilterList.getLength(); i++){
+								Node node1 = sriovVlanFilterList.item(i)
+								if (node1.getNodeType() == Node.ELEMENT_NODE) {
+									Element eElement1 = (Element) node1
+									String value = utils.getElementText(eElement1, "sriov-vlan-filter")
+									if (i != sriovVlanFilterList.getLength() - 1) {
+										values = sriovFilterBuf.append(value + ",")
+									}
+									else {
+										values = sriovFilterBuf.append(value);
+									}
+								}
+							}
+							if (!values.isEmpty()) {
+									paramsMap.put("${vnfNetworkKey}_ATT_VF_VLAN_FILTER", "${values}")
+								}
+							}
+					}
+					
+		
+				
+					// VMS Data
+					
+					def key
+					def value
+					def networkKey
+					def networkValue
+					def floatingIPKey
+					def floatingIPKeyValue
+					def floatingIPV6Key
+					def floatingIPV6KeyValue
+					StringBuilder sb = new StringBuilder()
+		
+					NodeList vmsList = responseXmlVfModule.getElementsByTagNameNS("*","vm")
+					for (int x = 0; x < vmsList.getLength(); x++) {
+						Node node = vmsList.item(x)
+						if (node.getNodeType() == Node.ELEMENT_NODE) {
+							Element eElement = (Element) node
+							key = utils.getElementText(eElement, "vm-type")
+							String values
+							String position = "0"
+							StringBuilder sb1 = new StringBuilder()
+							NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")
+							NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")
+							for(int i = 0; i < valueList.getLength(); i++){
+								Node node1 = valueList.item(i)
+								if (node1.getNodeType() == Node.ELEMENT_NODE) {
+									Element eElement1 = (Element) node1
+									value = utils.getElementText(eElement1, "vm-name")
+									if (i != valueList.getLength() - 1) {
+										values = sb1.append(value + ",")
+									}
+									else {
+										values = sb1.append(value);
+									}
+									position = i.toString()
+									paramsMap.put("${key}_name_${position}", "${value}")
+								}
+							}
+							for(int n = 0; n < vmNetworksList.getLength(); n++){
+								String floatingIpKeyValueStr = ""
+								String floatingIpV6KeyValueStr = ""
+								Node nodeNetworkKey = vmNetworksList.item(n)
+								if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+									Element eElementNetworkKey = (Element) nodeNetworkKey
+									String ipAddressValues
+									String ipV6AddressValues
+									String networkPosition = "0"
+									StringBuilder sb2 = new StringBuilder()
+									StringBuilder sb3 = new StringBuilder()
+									StringBuilder sb4 = new StringBuilder()
+									networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")
+									if (networkKey.isEmpty()) {
+										networkKey = utils.getElementText(eElementNetworkKey, "network-role")
+									}
+									floatingIPKey = key + '_' + networkKey + '_floating_ip'
+									floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")
+									if(!floatingIPKeyValue.isEmpty()){
+										paramsMap.put("$floatingIPKey", "$floatingIPKeyValue")
+									}
+									floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'
+									floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")
+									if(!floatingIPV6KeyValue.isEmpty()){
+										paramsMap.put("$floatingIPV6Key", "$floatingIPV6KeyValue")
+									}
+									NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")
+									for(int a = 0; a < networkIpsList.getLength(); a++){
+										Node ipAddress = networkIpsList.item(a)
+										if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {
+											Element eElementIpAddress = (Element) ipAddress
+											String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")
+											if (a != networkIpsList.getLength() - 1) {
+												ipAddressValues = sb2.append(ipAddressValue + ",")
+											}
+											else {
+												ipAddressValues = sb2.append(ipAddressValue);
+											}
+											networkPosition = a.toString()
+											paramsMap.put("${key}_${networkKey}_ip_${networkPosition}", "${ipAddressValue}")
+										}
+									}
+									
+									paramsMap.put("${key}_${networkKey}_ips", "${ipAddressValues}")
+									
+									NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")
+									String interfaceRoutePrefixValues = sb3.append("[")
+									
+									for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){
+										Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)
+										if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {
+											Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix
+											String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")
+											if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {
+												interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")
+											}
+											if (a != interfaceRoutePrefixesList.getLength() - 1) {
+												interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")
+											}
+											else {
+												interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")
+											}
+										}
+									}
+									interfaceRoutePrefixValues = sb3.append("]")
+									if (interfaceRoutePrefixesList.getLength() > 0) {
+										paramsMap.put("${key}_${networkKey}_route_prefixes", "${interfaceRoutePrefixValues}")
+									}
+									
+									NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")
+									for(int a = 0; a < networkIpsV6List.getLength(); a++){
+										Node ipV6Address = networkIpsV6List.item(a)
+										if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {
+											Element eElementIpV6Address = (Element) ipV6Address
+											String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")
+											if (a != networkIpsV6List.getLength() - 1) {
+												ipV6AddressValues = sb4.append(ipV6AddressValue + ",")
+											}
+											else {
+												ipV6AddressValues = sb4.append(ipV6AddressValue);
+											}
+											networkPosition = a.toString()
+											paramsMap.put("${key}_${networkKey}_v6_ip_${networkPosition}", "${ipV6AddressValue}")
+										}
+									}
+									paramsMap.put("${key}_${networkKey}_v6_ips", "${ipV6AddressValues}")
+								}
+							}
+							paramsMap.put("${key}_names", "${values}")
+						}
+					}
+				//SDNC Response Params
+					List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]
+					
+					String vnfParamsChildNodes = utils.getChildNodes(vnfData, "param")
+					if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){
+						// No SDNC params for VNF
+					}else{
+						NodeList paramsList = responseXmlVnf.getElementsByTagNameNS("*", "param")
+						for (int z = 0; z < paramsList.getLength(); z++) {
+							Node node = paramsList.item(z)
+							Element eElement = (Element) node
+							String vnfParameterName = utils.getElementText(eElement, "name")
+							if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {
+								String vnfParameterValue = utils.getElementText(eElement, "value")
+								paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")
+							}
+						}
+					}
+					
+					String vfModuleParamsChildNodes = utils.getChildNodes(vfModuleData, "param")
+					if(vfModuleParamsChildNodes == null || vfModuleParamsChildNodes.length() < 1){
+						// No SDNC params for VF Module
+					}else{
+						NodeList paramsList = responseXmlVfModule.getElementsByTagNameNS("*", "param")
+						for (int z = 0; z < paramsList.getLength(); z++) {
+							Node node = paramsList.item(z)
+							Element eElement = (Element) node
+							String vnfParameterName = utils.getElementText(eElement, "name")
+							if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {
+								String vnfParameterValue = utils.getElementText(eElement, "value")
+								paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")
+							}
+						}
+					}
+					
+				// Parameters received from the request should overwrite any parameters received from SDNC
+				if (vnfParamsMap != null) {
+					for (Map.Entry<String, String> entry : vnfParamsMap.entrySet()) {
+						String vnfKey = entry.getKey()
+						String vnfValue = entry.getValue()
+						paramsMap.put("$vnfKey", "$vnfValue")
+					}
+				}
+				
+				StringBuilder sbParams = new StringBuilder()
+				def vfModuleParams = ""
+				for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+					String paramsXml
+					String paramName = entry.getKey()
+					String paramValue = entry.getValue()
+					paramsXml =
+							"""<entry>
+						<key>${MsoUtils.xmlEscape(paramName)}</key>
+						<value>${MsoUtils.xmlEscape(paramValue)}</value>
+					</entry>
+					"""
+		
+					vfModuleParams = sbParams.append(paramsXml)
+				}
+				
+				return vfModuleParams
+				
+			}
+	
+
+	/*
+	 * VBNG specific method that parses VNF parameters passed in on the 
+	 * incoming requests and SDNC parameters returned from SDNC get response
+	 * and puts them into the format expected by VNF adapter.
+	 * @param vnfParamsMap -  map of VNF parameters passed in the request body
+	 * @param sdncGetResponse - response string from SDNC GET topology request
+	 * @param vnfId
+	 * @param vnfName
+	 * @param vfModuleId
+	 * @param vfModuleName
+	 * @return a String of key/value entries for vfModuleParams
+	 */
+	
+	protected String buildVfModuleParamsVbng(String vnfParams, String sdncGetResponse, String vnfId, String vnfName,
+			String vfModuleId, String vfModuleName) {
+				
+		//Get SDNC Response Data
+				
+		String data = utils.getNodeXml(sdncGetResponse, "response-data")
+	
+		
+	
+		// Add-on data
+		String vnfInfo =
+			"""<entry>
+				<key>vnf_id</key>
+				<value>${MsoUtils.xmlEscape(vnfId)}</value>
+			</entry>
+			<entry>
+				<key>vnf_name</key>
+				<value>${MsoUtils.xmlEscape(vnfName)}</value>
+			</entry>
+			<entry>
+				<key>vf_module_id</key>
+				<value>${MsoUtils.xmlEscape(vfModuleId)}</value>
+			</entry>
+			<entry>
+				<key>vf_module_name</key>
+				<value>${MsoUtils.xmlEscape(vfModuleName)}</value>
+			</entry>"""
+	
+		msoLogger.debug("vnfInfo: " + vnfInfo)
+		InputSource source = new InputSource(new StringReader(data));
+		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+		docFactory.setNamespaceAware(true)
+		DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+		Document responseXml = docBuilder.parse(source)
+	
+	
+		// Availability Zones Data
+		String aZones = ""
+		StringBuilder sbAZone = new StringBuilder()
+		NodeList aZonesList = responseXml.getElementsByTagNameNS("*", "availability-zones")
+		String aZonePosition = "0"
+		for (int z = 0; z < aZonesList.getLength(); z++) {
+			Node node = aZonesList.item(z)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				String aZoneValue = utils.getElementText(eElement, "availability-zone")
+				aZonePosition = z.toString()
+				String aZoneXml =
+					"""<entry>
+						<key>availability_zone_${MsoUtils.xmlEscape(aZonePosition)}</key>
+						<value>${MsoUtils.xmlEscape(aZoneValue)}</value>
+					</entry>"""
+				aZones = sbAZone.append(aZoneXml)
+			}
+		}
+	
+		// Map of network-roles and network-tags from vm-networks
+		
+		NodeList vmNetworksListGlobal = responseXml.getElementsByTagNameNS("*", "vm-networks")
+		Map<String, String> networkRoleMap = new HashMap<String, String>()
+		for(int n = 0; n < vmNetworksListGlobal.getLength(); n++){
+			Node nodeNetworkKey = vmNetworksListGlobal.item(n)
+			if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElementNetworkKey = (Element) nodeNetworkKey
+				String networkRole = utils.getElementText(eElementNetworkKey, "network-role")
+				String networkRoleValue = utils.getElementText(eElementNetworkKey, "network-role-tag")
+				if (networkRoleValue.isEmpty()) {
+					networkRoleValue = networkRole
+				}
+				networkRoleMap.put(networkRole, networkRoleValue)
+			}
+		}
+	
+		// VNF Networks Data
+		String vnfNetworkNetId = ""
+		String vnfNetworkNetName = ""
+		String vnfNetworkSubNetId = ""
+		String vnfNetworkV6SubNetId = ""
+		String vnfNetworkNetFqdn = ""
+		String vnfNetworksSriovVlanFilters = ""
+		StringBuilder sbNet = new StringBuilder()
+		StringBuilder sbNet2 = new StringBuilder()
+		StringBuilder sbNet3 = new StringBuilder()
+		StringBuilder sbNet4 = new StringBuilder()
+		StringBuilder sbNet5 = new StringBuilder()
+		StringBuilder sbNet6 = new StringBuilder()
+		NodeList vnfNetworkList = responseXml.getElementsByTagNameNS("*", "vnf-networks")
+		for (int x = 0; x < vnfNetworkList.getLength(); x++) {
+			Node node = vnfNetworkList.item(x)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				String vnfNetworkKey = utils.getElementText(eElement, "network-role-tag")
+				String networkRole = utils.getElementText(eElement, "network-role")
+				if (vnfNetworkKey.isEmpty()) {
+					vnfNetworkKey = networkRoleMap.get(networkRole)
+					if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) {
+						vnfNetworkKey = networkRole
+					}					
+				}
+				String vnfNetworkNeutronIdValue = utils.getElementText(eElement, "neutron-id")
+				String vnfNetworkNetNameValue = utils.getElementText(eElement, "network-name")
+				String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")
+				String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")
+				String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")
+				String vnfNetworkNetIdXml =
+						"""<entry>
+							<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_net_id</key>
+							<value>${MsoUtils.xmlEscape(vnfNetworkNeutronIdValue)}</value>
+						</entry>"""
+				vnfNetworkNetId = sbNet.append(vnfNetworkNetIdXml)
+				String vnfNetworkNetNameXml =
+						"""<entry>
+						<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_net_name</key>
+						<value>${MsoUtils.xmlEscape(vnfNetworkNetNameValue)}</value>
+				</entry>"""
+				vnfNetworkNetName = sbNet2.append(vnfNetworkNetNameXml)
+				String vnfNetworkSubNetIdXml =
+						"""<entry>
+						<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_subnet_id</key>
+						<value>${MsoUtils.xmlEscape(vnfNetworkSubNetIdValue)}</value>
+				</entry>"""
+				vnfNetworkSubNetId = sbNet3.append(vnfNetworkSubNetIdXml)
+				String vnfNetworkV6SubNetIdXml =
+						"""<entry>
+						<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_v6_subnet_id</key>
+						<value>${MsoUtils.xmlEscape(vnfNetworkV6SubNetIdValue)}</value>
+				</entry>"""
+				vnfNetworkV6SubNetId = sbNet5.append(vnfNetworkV6SubNetIdXml)
+				String vnfNetworkNetFqdnXml =
+						"""<entry>
+						<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_net_fqdn</key>
+						<value>${MsoUtils.xmlEscape(vnfNetworkNetFqdnValue)}</value>
+				</entry>"""
+				vnfNetworkNetFqdn = sbNet4.append(vnfNetworkNetFqdnXml)
+						
+				NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")
+				StringBuffer sriovFilterBuf = new StringBuffer()
+				String values = ""
+				for(int i = 0; i < sriovVlanFilterList.getLength(); i++){
+					Node node1 = sriovVlanFilterList.item(i)
+					if (node1.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement1 = (Element) node1
+						String value = utils.getElementText(eElement1, "sriov-vlan-filter")
+						if (i != sriovVlanFilterList.getLength() - 1) {
+							values = sriovFilterBuf.append(value + ",")
+						}
+						else {
+							values = sriovFilterBuf.append(value);
+						}
+					}
+				}
+				if (!values.isEmpty()) {
+						String vnfNetworkSriovVlanFilterXml =
+								"""<entry>
+						<key>${MsoUtils.xmlEscape(vnfNetworkKey)}_ATT_VF_VLAN_FILTER</key>
+						<value>${MsoUtils.xmlEscape(values)}</value>
+					</entry>"""
+						vnfNetworksSriovVlanFilters = sbNet6.append(vnfNetworkSriovVlanFilterXml)
+				}
+			}
+		}
+	
+		// VNF-VMS Data
+		String vnfVMS = ""
+		String vnfVMSPositions = ""
+		String vmNetworks = ""
+		String vmNetworksPositions = ""
+		String vmNetworksPositionsV6 = ""
+		String interfaceRoutePrefixes = ""
+		def key
+		def value
+		def networkKey
+		def networkValue
+		def floatingIPKey
+		def floatingIPKeyValue
+		def floatingIPV6Key
+		def floatingIPV6KeyValue
+		StringBuilder sb = new StringBuilder()
+		StringBuilder sbPositions = new StringBuilder()
+		StringBuilder sbVmNetworks = new StringBuilder()
+		StringBuilder sbNetworksPositions = new StringBuilder()
+		StringBuilder sbInterfaceRoutePrefixes = new StringBuilder()
+		StringBuilder sbNetworksPositionsV6 = new StringBuilder()
+
+		NodeList vmsList = responseXml.getElementsByTagNameNS("*","vnf-vms")
+		for (int x = 0; x < vmsList.getLength(); x++) {
+			Node node = vmsList.item(x)
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element eElement = (Element) node
+				key = utils.getElementText(eElement, "vm-type")
+				String values
+				String position = "0"
+				StringBuilder sb1 = new StringBuilder()
+				NodeList valueList = eElement.getElementsByTagNameNS("*","vm-names")
+				NodeList vmNetworksList = eElement.getElementsByTagNameNS("*","vm-networks")
+				for(int i = 0; i < valueList.getLength(); i++){
+					Node node1 = valueList.item(i)
+					if (node1.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElement1 = (Element) node1
+						value = utils.getElementText(eElement1, "vm-name")
+						if (i != valueList.getLength() - 1) {
+							values = sb1.append(value + ",")
+						}
+						else {
+							values = sb1.append(value);
+						}
+						position = i.toString()
+						String vnfPositionXml =
+								"""<entry>
+								<key>${MsoUtils.xmlEscape(key)}_name_${MsoUtils.xmlEscape(position)}</key>
+								<value>${MsoUtils.xmlEscape(value)}</value>
+							</entry>"""
+						 nfVMSPositions = sbPositions.append(vnfPositionXml)
+					}
+				}
+				for(int n = 0; n < vmNetworksList.getLength(); n++){
+					String floatingIpKeyValueStr = ""
+					String floatingIpV6KeyValueStr = ""
+					Node nodeNetworkKey = vmNetworksList.item(n)
+					if (nodeNetworkKey.getNodeType() == Node.ELEMENT_NODE) {
+						Element eElementNetworkKey = (Element) nodeNetworkKey
+						String ipAddressValues
+						String ipV6AddressValues
+						String networkPosition = "0"
+						StringBuilder sb2 = new StringBuilder()
+						StringBuilder sb3 = new StringBuilder()
+						StringBuilder sb4 = new StringBuilder()
+						networkKey = utils.getElementText(eElementNetworkKey, "network-role-tag")
+						if (networkKey.isEmpty()) {
+							networkKey = utils.getElementText(eElementNetworkKey, "network-role")
+						}
+						floatingIPKey = key + '_' + networkKey + '_floating_ip'
+						floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")
+						if(!floatingIPKeyValue.isEmpty()){
+							floatingIpKeyValueStr = """<entry>
+								<key>$floatingIPKey</key>
+								<value>$floatingIPKeyValue</value>
+							</entry>"""
+						}
+						floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'
+						floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")
+						if(!floatingIPV6KeyValue.isEmpty()){
+							floatingIpV6KeyValueStr = """<entry>
+								<key>$floatingIPV6Key</key>
+								<value>$floatingIPV6KeyValue</value>
+							</entry>"""
+						}
+						NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")
+						for(int a = 0; a < networkIpsList.getLength(); a++){
+							Node ipAddress = networkIpsList.item(a)
+							if (ipAddress.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementIpAddress = (Element) ipAddress
+								String ipAddressValue = utils.getElementText(eElementIpAddress, "ip-address")
+								if (a != networkIpsList.getLength() - 1) {
+									ipAddressValues = sb2.append(ipAddressValue + ",")
+								}
+								else {
+									ipAddressValues = sb2.append(ipAddressValue);
+								}
+								networkPosition = a.toString()
+								String vmNetworksPositionsXml =
+												"""<entry>
+										<key>${MsoUtils.xmlEscape(key)}_${MsoUtils.xmlEscape(networkKey)}_ip_${MsoUtils.xmlEscape(networkPosition)}</key>
+										<value>${MsoUtils.xmlEscape(ipAddressValue)}</value>
+									</entry>"""
+								vmNetworksPositions = sbNetworksPositions.append(vmNetworksPositionsXml)
+							}
+						}
+						vmNetworksPositions = sbNetworksPositions.append(floatingIpKeyValueStr).append(floatingIpV6KeyValueStr)
+							
+						String vmNetworksXml =
+										"""<entry>
+								<key>${MsoUtils.xmlEscape(key)}_${MsoUtils.xmlEscape(networkKey)}_ips</key>
+								<value>${MsoUtils.xmlEscape(ipAddressValues)}</value>
+							</entry>"""
+						vmNetworks = sbVmNetworks.append(vmNetworksXml)
+								
+						NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")
+						String interfaceRoutePrefixValues = sb3.append("[")
+								
+						for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){
+							Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)
+							if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix
+								String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")
+								if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {
+									interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")
+								}
+								if (a != interfaceRoutePrefixesList.getLength() - 1) {
+									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")
+								}
+								else {
+									interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")
+								}
+							}
+						}
+						interfaceRoutePrefixValues = sb3.append("]")
+						if (interfaceRoutePrefixesList.getLength() > 0) {
+							String interfaceRoutePrefixesXml =
+													"""<entry>
+											<key>${MsoUtils.xmlEscape(key)}_${MsoUtils.xmlEscape(networkKey)}_route_prefixes</key>
+											<value>${MsoUtils.xmlEscape(interfaceRoutePrefixValues)}</value>
+										</entry>"""					
+							interfaceRoutePrefixes = sbInterfaceRoutePrefixes.append(interfaceRoutePrefixesXml)
+						}
+							
+						NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")
+						for(int a = 0; a < networkIpsV6List.getLength(); a++){
+							Node ipV6Address = networkIpsV6List.item(a)
+							if (ipV6Address.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElementIpV6Address = (Element) ipV6Address
+								String ipV6AddressValue = utils.getElementText(eElementIpV6Address, "ip-address-ipv6")
+								if (a != networkIpsV6List.getLength() - 1) {
+									ipV6AddressValues = sb4.append(ipV6AddressValue + ",")
+								}
+								else {
+									ipV6AddressValues = sb4.append(ipV6AddressValue);
+								}
+								networkPosition = a.toString()
+								String vmNetworksPositionsV6Xml =
+										"""<entry>
+										<key>${MsoUtils.xmlEscape(key)}_${MsoUtils.xmlEscape(networkKey)}_v6_ip_${MsoUtils.xmlEscape(networkPosition)}</key>
+										<value>${MsoUtils.xmlEscape(ipV6AddressValue)}</value>
+										</entry>"""
+								vmNetworksPositionsV6 = sbNetworksPositionsV6.append(vmNetworksPositionsV6Xml)
+							}
+						}
+						String vmNetworksV6Xml =
+								"""<entry>
+								<key>${MsoUtils.xmlEscape(key)}_${MsoUtils.xmlEscape(networkKey)}_v6_ips</key>
+								<value>${MsoUtils.xmlEscape(ipV6AddressValues)}</value>
+							</entry>"""
+						vmNetworks = sbVmNetworks.append(vmNetworksV6Xml)
+					}
+				}
+				String vnfXml =
+								"""<entry>
+				<key>${MsoUtils.xmlEscape(key)}_names</key>
+				<value>${MsoUtils.xmlEscape(values)}</value>
+					</entry>"""
+				vnfVMS = sb.append(vnfXml)
+			}
+		}
+	//SDNC Response Params
+		String sdncResponseParams = ""
+		List<String> sdncResponseParamsToSkip = ["vnf_id", "vf_module_id", "vnf_name", "vf_module_name"]
+		String vnfParamsChildNodes = utils.getChildNodes(data, "vnf-parameters")
+		if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){
+			// No SDNC params
+		}else{
+			NodeList paramsList = responseXml.getElementsByTagNameNS("*", "vnf-parameters")
+			for (int z = 0; z < paramsList.getLength(); z++) {
+				Node node = paramsList.item(z)
+				Element eElement = (Element) node
+				String vnfParameterName = utils.getElementText(eElement, "vnf-parameter-name")
+				if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {
+					String vnfParameterValue = utils.getElementText(eElement, "vnf-parameter-value")
+					String paraEntry =
+						"""<entry>
+							<key>${MsoUtils.xmlEscape(vnfParameterName)}</key>
+							<value>${MsoUtils.xmlEscape(vnfParameterValue)}</value>
+						</entry>"""
+					sdncResponseParams = sb.append(paraEntry)
+				}
+			}
+		}
+	
+	
+		def vfModuleParams = """
+		${vnfInfo}
+		${aZones}
+		${vnfNetworkNetId}
+		${vnfNetworkNetName}
+		${vnfNetworkSubNetId}
+		${vnfNetworkV6SubNetId}
+		${vnfNetworkNetFqdn}
+		${vnfNetworksSriovVlanFilters}
+        ${vnfVMS}
+        ${vnfVMSPositions}
+		${vmNetworks}
+		${vmNetworksPositions}
+		${vmNetworksPositionsV6}
+		${interfaceRoutePrefixes}
+		${vnfParams}
+		${sdncResponseParams}"""
+			
+		return vfModuleParams
+			
+	}
+	
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
index 2a8dd95c33..6e09837274 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
@@ -1,548 +1,553 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import groovy.json.JsonBuilder

-import groovy.json.JsonSlurper

-

-import org.json.JSONObject

-import org.json.XML

-import org.openecomp.mso.bpmn.core.xml.XmlTool

-

-class VidUtils {

-	

-	public MsoUtils utils = new MsoUtils()

-	private AbstractServiceTaskProcessor taskProcessor

-

-	public VidUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-	}

-	

-	/**

-	 * Create a volume-request XML using a JSON string

-	 * @param jsonReq - JSON request from VID

-	 * @param action

-	 * @return

-	 */

-	public String createXmlVolumeRequest(String jsonReq, String action, String serviceInstanceId) {

-		def jsonSlurper = new JsonSlurper()

-		try{

-			Map reqMap = jsonSlurper.parseText(jsonReq)

-			return createXmlVolumeRequest(reqMap, action, serviceInstanceId)

-		}

-		catch(Exception e) {

-			throw e

-		}

-	}

-

-	/**

-	 * Create a volume-request XML using a map

-	 * @param requestMap - map created from VID JSON

-	 * @param action

-	 * @param serviceInstanceId

-	 * @return

-	 */

-	public String createXmlVolumeRequest(Map requestMap, String action, String serviceInstanceId) {

-		createXmlVolumeRequest(requestMap, action, serviceInstanceId, '')

-	}

-	

-

-	/**

-	 * Create a volume-request XML using a map

-	 * @param requestMap

-	 * @param action

-	 * @param serviceInstanceId

-	 * @param volumeGroupId

-	 * @return

-	 */

-	public String createXmlVolumeRequest(Map requestMap, String action, String serviceInstanceId, String volumeGroupId) {

-		def vnfType = ''

-		def serviceName = ''

-		def modelCustomizationName = ''

-		def asdcServiceModelVersion = ''

-		

-		def suppressRollback = requestMap.requestDetails.requestInfo.suppressRollback

-		

-		def backoutOnFailure = ""

-		if(suppressRollback != null){

-			if ( suppressRollback == true) {

-				backoutOnFailure = "false"

-			} else if ( suppressRollback == false) {

-				backoutOnFailure = "true"

-			}

-		}

-		

-		def volGrpName = requestMap.requestDetails.requestInfo?.instanceName ?: ''

-		def serviceId = requestMap.requestDetails.requestParameters?.serviceId ?: ''

-		def relatedInstanceList = requestMap.requestDetails.relatedInstanceList

-		relatedInstanceList.each {

-			if (it.relatedInstance.modelInfo?.modelType == 'service') {

-				serviceName = it.relatedInstance.modelInfo?.modelName

-				asdcServiceModelVersion = it.relatedInstance.modelInfo?.modelVersion

-			}

-			if (it.relatedInstance.modelInfo?.modelType == 'vnf') {

-				modelCustomizationName = it.relatedInstance.modelInfo?.modelInstanceName

-			}

-		}

-		

-		vnfType = serviceName + '/' + modelCustomizationName

-		

-		def userParams = requestMap.requestDetails?.requestParameters?.userParams

-		def userParamsNode = ''

-		if(userParams != null) {

-			userParamsNode = buildUserParams(userParams)

-		}

-		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''

-		

-		def xmlReq = """

-		<volume-request xmlns="http://www.w3.org/2001/XMLSchema">

-			<request-info>

-				<action>${action}</action>

-				<source>${requestMap.requestDetails.requestInfo.source}</source>

-				<service-instance-id>${serviceInstanceId}</service-instance-id>

-			</request-info>

-			<volume-inputs>

-				<volume-group-id>${volumeGroupId}</volume-group-id>

-				<volume-group-name>${volGrpName}</volume-group-name>

-				<vnf-type>${vnfType}</vnf-type>

-				<vf-module-model-name>${requestMap.requestDetails.modelInfo.modelName}</vf-module-model-name>

-				<asdc-service-model-version>${asdcServiceModelVersion}</asdc-service-model-version>

-				<aic-cloud-region>${requestMap.requestDetails.cloudConfiguration.lcpCloudRegionId}</aic-cloud-region>

-				<tenant-id>${requestMap.requestDetails.cloudConfiguration.tenantId}</tenant-id>

-				<service-id>${serviceId}</service-id>

-				<backout-on-failure>${backoutOnFailure}</backout-on-failure>

-				<model-customization-id>${modelCustomizationId}</model-customization-id>

-			</volume-inputs>

-			<volume-params>

-				$userParamsNode

-			</volume-params>

-		</volume-request>

-		"""

-		// return a pretty-print of the volume-request xml without the preamble

-		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "") 

-	}

-	

-	/**

-	 * A common method that can be used to build volume-params node from a map. 

-	 * @param Map userParams

-	 * @return

-	 */

-	public String buildUserParams(userParams) {

-		if (userParams == null) return ""

-		def xml = ""

-		def key = ""

-		def value = ""

-		userParams.each {it ->

-			key = it.name.replaceAll(/\B[A-Z]/) { '_' + it }.toLowerCase()

-			value = it.value

-			xml += "<param name=\"${key}\">${value}</param>"

-		}

-

-		return xml

-	}

-

-	/**

-	 * A common method that can be used to extract 'requestDetails' 

-	 * @param String json

-	 * @return String json requestDetails  

-	 */

-	@Deprecated

-	public getJsonRequestDetails(String jsonInput) {

-		String rtn = ""

-		if (jsonInput.isEmpty() || jsonInput == null) {

-			return rtn

-		} else {

-			def jsonMapObject = new JsonSlurper().parseText(jsonInput)

-			if (jsonMapObject instanceof Map) {

-				String jsonString = new JsonBuilder(jsonMapObject.requestDetails)

-				rtn = '{'+"requestDetails"+":"+jsonString+'}'

-				return rtn

-			} else {

-			    return rtn

-			}	

-		}

-	}

-	

-	/**

-	 * A common method that can be used to extract 'requestDetails' in Xml

-	 * @param String json

-	 * @return String xml requestDetails

-	 */

-	@Deprecated

-	public getJsonRequestDetailstoXml(String jsonInput) {

-		String rtn = null

-		def jsonString = getJsonRequestDetails(jsonInput)

-		if (jsonString == null) {

-			return rtn

-		} else {

-		    JSONObject jsonObj = new JSONObject(jsonString)

-			return XmlTool.normalize(XML.toString(jsonObj))

-		}

-	}

-	

-	/**

-	 * Create a network-request XML using a map

- 	 * @param execution 

-	 * @param xmlRequestDetails - requestDetails in xml 

-	 * @return

-	 * Note: See latest version: createXmlNetworkRequestInstance()

-	 */

-

-	public String createXmlNetworkRequestInfra(execution, def networkJsonIncoming) {

-	

-		def requestId = execution.getVariable("requestId")

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

-		def requestAction = execution.getVariable("requestAction")

-		def networkId = (execution.getVariable("networkId")) != null ? execution.getVariable("networkId") : ""

-		

-		def jsonSlurper = new JsonSlurper()

-		try {

-			Map reqMap = jsonSlurper.parseText(networkJsonIncoming)

-			def instanceName =  reqMap.requestDetails.requestInfo.instanceName

-			def modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationId

-			if (modelCustomizationId == null) {

-				modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationUuid !=null ?  

-				                        reqMap.requestDetails.modelInfo.modelCustomizationUuid : ""

-			}

-			def modelName = reqMap.requestDetails.modelInfo.modelName

-			def lcpCloudRegionId = reqMap.requestDetails.cloudConfiguration.lcpCloudRegionId

-			def tenantId = reqMap.requestDetails.cloudConfiguration.tenantId

-			def serviceId = reqMap.requestDetails.requestInfo.productFamilyId 

-			def suppressRollback = reqMap.requestDetails.requestInfo.suppressRollback.toString()

-			def backoutOnFailure = "true"

-			if(suppressRollback != null){

-				if (suppressRollback == true || suppressRollback == "true") {

-					backoutOnFailure = "false"

-				} else if (suppressRollback == false || suppressRollback == "false") {

-					backoutOnFailure = "true"

-				}

-			}

-		

-			//def userParams = reqMap.requestDetails.requestParameters.userParams

-			//def userParamsNode = buildUserParams(userParams)

-			def userParams = reqMap.requestDetails?.requestParameters?.userParams

-			def userParamsNode = ''

-			if(userParams != null) {

-				userParamsNode = buildUserParams(userParams)

-			}

-			

-			//'sdncVersion' = current, '1610' (non-RPC SDNC) or '1702' (RPC SDNC)

-			def sdncVersion =  execution.getVariable("sdncVersion")

-			

-			def xmlReq = """

-			<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 

-			 <request-info> 

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

-			 	<action>${requestAction}</action> 

-			 	<source>VID</source> 

-			 	<service-instance-id>${serviceInstanceId}</service-instance-id>

-			 </request-info> 

-			 <network-inputs> 

-			 	<network-id>${networkId}</network-id> 

-			 	<network-name>${instanceName}</network-name> 

-			 	<network-type>${modelName}</network-type>

-				<modelCustomizationId>${modelCustomizationId}</modelCustomizationId> 

-			 	<aic-cloud-region>${lcpCloudRegionId}</aic-cloud-region> 

-			 	<tenant-id>${tenantId}</tenant-id>

-			 	<service-id>${serviceId}</service-id> 

-			 	<backout-on-failure>${backoutOnFailure}</backout-on-failure>

-                <sdncVersion>${sdncVersion}</sdncVersion>

-			 </network-inputs> 

-			 <network-params>

-				${userParamsNode}

-			 </network-params> 

-			</network-request>

-			"""

-			// return a pretty-print of the volume-request xml without the preamble

-			return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "")

-			

-		} catch(Exception e) {

-			throw e

-		}

-	}

-	

-	/**

-	 * Create a network-request XML using a map, 

- 	 * @param execution 

-	 * @return

-	 */

-	public String createXmlNetworkRequestInstance(execution) {

-

-		def networkModelUuid = ""

-		def networkModelName = ""

-		def networkModelVersion = ""

-		def networkModelCustomizationUuid = ""

-		def networkModelInvariantUuid = ""

-		

-		// verify the DB Catalog response JSON structure

-		def networkModelInfo = execution.getVariable("networkModelInfo")

-		def jsonSlurper = new JsonSlurper()

-		if (networkModelInfo != null) {

-			try {

-				Map modelMap = jsonSlurper.parseText(networkModelInfo)

-				if (modelMap != null) {

-					if (networkModelInfo.contains("modelUuid")) {

-						networkModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""

-					}

-					if (networkModelInfo.contains("modelName")) {

-						networkModelName = modelMap.modelName !=null ? modelMap.modelName : ""

-					}

-					if (networkModelInfo.contains("modelVersion")) {

-						networkModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""

-					}

-					if (networkModelInfo.contains("modelCustomizationUuid")) {

-						networkModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""

-					}

-					if (networkModelInfo.contains("modelInvariantUuid")) {

-						networkModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""

-					}

-				}

-			} catch (Exception ex) {

-		    	throw ex

-			}

-		}		

-		

-		def serviceModelUuid = ""

-		def serviceModelName = ""

-		def serviceModelVersion = ""

-		def serviceModelCustomizationUuid = ""

-		def serviceModelInvariantUuid = ""

-		

-		// verify the DB Catalog response JSON structure

-		def serviceModelInfo = execution.getVariable("serviceModelInfo")

-		def jsonServiceSlurper = new JsonSlurper()

-		if (serviceModelInfo != null) {

-			try {

-				Map modelMap = jsonServiceSlurper.parseText(serviceModelInfo)

-				if (modelMap != null) {

-					if (serviceModelInfo.contains("modelUuid")) {

-						serviceModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""

-					}

-					if (serviceModelInfo.contains("modelName")) {

-						serviceModelName = modelMap.modelName !=null ? modelMap.modelName : ""

-					}

-					if (serviceModelInfo.contains("modelVersion")) {

-						serviceModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""

-					}

-					if (serviceModelInfo.contains("modelCustomizationUuid")) {

-						serviceModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""

-					}

-					if (serviceModelInfo.contains("modelInvariantUuid")) {

-						serviceModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""

-					}

-				}

-			} catch (Exception ex) {

-				throw ex

-			}

-		}

-		

-		

-		def subscriptionServiceType = execution.getVariable("subscriptionServiceType") != null ? execution.getVariable("subscriptionServiceType") : ""

-		def globalSubscriberId = execution.getVariable("globalSubscriberId") != null ? execution.getVariable("globalSubscriberId") : ""

-		def requestId = execution.getVariable("msoRequestId")

-		def serviceInstanceId = execution.getVariable("serviceInstanceId") != null ? execution.getVariable("serviceInstanceId") : ""

-		def networkId = (execution.getVariable("networkId")) != null ? execution.getVariable("networkId") : "" // optional

-		def networkName =  execution.getVariable("networkName") != null ? execution.getVariable("networkName") : "" // optional

-		def aicCloudReqion = execution.getVariable("lcpCloudRegionId") != null ? execution.getVariable("lcpCloudRegionId") : ""

-		def tenantId = execution.getVariable("tenantId") != null ? execution.getVariable("tenantId") : ""

-		def serviceId = execution.getVariable("productFamilyId") != null ? execution.getVariable("productFamilyId") : ""

-		def failIfExist = execution.getVariable("failIfExists") != null ? execution.getVariable("failIfExists") : ""

-		def suppressRollback = execution.getVariable("disableRollback")   

-		def backoutOnFailure = "true"

-		if(suppressRollback != null){

-			if (suppressRollback == true || suppressRollback == "true") {

-				backoutOnFailure = "false"

-			} else if (suppressRollback == false || suppressRollback == "false") {

-				backoutOnFailure = "true"

-			}

-		}

-		

-		//'sdncVersion' = current, '1610' (non-RPC SDNC) or '1702' (RPC SDNC)

-		def sdncVersion =  execution.getVariable("sdncVersion")

-		

-		def source = "VID"

-		def action = execution.getVariable("action")

-				

-		def userParamsNode = ""

-		def userParams = execution.getVariable("networkInputParams")

-		if(userParams != null) {

-		   userParamsNode = buildUserParams(userParams)

-		}

-		

-		def xmlReq = """

-		<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 

-		 <request-info> 

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

-		 	<action>${action}</action> 

-		 	<source>${source}</source> 

-		 	<service-instance-id>${serviceInstanceId}</service-instance-id>

-		 </request-info> 

-		 <network-inputs> 

-		 	<network-id>${networkId}</network-id> 

-		 	<network-name>${networkName}</network-name> 

-		 	<network-type>${networkModelName}</network-type>

-		 	<subscription-service-type>${subscriptionServiceType}</subscription-service-type>

-            <global-customer-id>${globalSubscriberId}</global-customer-id>

-		 	<aic-cloud-region>${aicCloudReqion}</aic-cloud-region> 

-		 	<tenant-id>${tenantId}</tenant-id>

-		 	<service-id>${serviceId}</service-id> 

-		 	<backout-on-failure>${backoutOnFailure}</backout-on-failure>

-			<failIfExist>${failIfExist}</failIfExist>

-            <networkModelInfo>

-              <modelName>${networkModelName}</modelName>

-              <modelUuid>${networkModelUuid}</modelUuid>

-              <modelInvariantUuid>${networkModelInvariantUuid}</modelInvariantUuid>            

-              <modelVersion>${networkModelVersion}</modelVersion>

-              <modelCustomizationUuid>${networkModelCustomizationUuid}</modelCustomizationUuid>

-		    </networkModelInfo>

-            <serviceModelInfo>

-              <modelName>${serviceModelName}</modelName>

-              <modelUuid>${serviceModelUuid}</modelUuid>

-              <modelInvariantUuid>${serviceModelInvariantUuid}</modelInvariantUuid>            

-              <modelVersion>${serviceModelVersion}</modelVersion>

-              <modelCustomizationUuid>${serviceModelCustomizationUuid}</modelCustomizationUuid>

-             

-		    </serviceModelInfo>										      			

-            <sdncVersion>${sdncVersion}</sdncVersion>                    

-		 </network-inputs>

-		 <network-params>

-			${userParamsNode}

-		 </network-params> 

-		</network-request>

-		"""

-		// return a pretty-print of the volume-request xml without the preamble

-		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "")

-			

-	}

-	

-	/**

-	 * Create a vnf-request XML using a map

-	 * @param requestMap - map created from VID JSON 

-	 * @param action

-	 * @return

-	 */

-	public String createXmlVfModuleRequest(execution, Map requestMap, String action, String serviceInstanceId) {

-				

-		//def relatedInstanceList = requestMap.requestDetails.relatedInstanceList

-		

-		//relatedInstanceList.each {

-		//	if (it.relatedInstance.modelInfo.modelType == 'vnf') {

-		//		vnfType = it.relatedInstance.modelInfo.modelName

-		//		vnfId = it.relatedInstance.modelInfo.modelInvariantId

-		//	}

-		//}

-		

-		def vnfName = ''

-		def asdcServiceModelInfo = ''

-				

-		def relatedInstanceList = requestMap.requestDetails?.relatedInstanceList

-		

-		

-		if (relatedInstanceList != null) {

-			relatedInstanceList.each {

-				if (it.relatedInstance.modelInfo?.modelType == 'service') {

-					asdcServiceModelInfo = it.relatedInstance.modelInfo?.modelVersion

-				}

-				if (it.relatedInstance.modelInfo.modelType == 'vnf') {

-					vnfName = it.relatedInstance.instanceName ?: ''

-				}

-			}

-		}

-		

-		def vnfType = execution.getVariable('vnfType')

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

-

-		def vfModuleId = execution.getVariable('vfModuleId')

-		def volumeGroupId = execution.getVariable('volumeGroupId')

-		def userParams = requestMap.requestDetails?.requestParameters?.userParams

-		

-		

-		def userParamsNode = ''

-		if(userParams != null) {

-			userParamsNode = buildUserParams(userParams)

-		}

-		

-		def isBaseVfModule = "false"

-		if (execution.getVariable('isBaseVfModule') == true) {

-			isBaseVfModule = "true"		

-		}

-		

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

-		def vfModuleName = requestMap.requestDetails?.requestInfo?.instanceName ?: ''

-		def vfModuleModelName = requestMap.requestDetails?.modelInfo?.modelName ?: ''

-		def suppressRollback = requestMap.requestDetails?.requestInfo?.suppressRollback

-		

-		def backoutOnFailure = ""

-		if(suppressRollback != null){

-			if ( suppressRollback == true) {

-				backoutOnFailure = "false"

-			} else if ( suppressRollback == false) {

-				backoutOnFailure = "true"

-			}

-		}

-		

-		def serviceId = requestMap.requestDetails?.requestParameters?.serviceId ?: ''

-		def aicCloudRegion = requestMap.requestDetails?.cloudConfiguration?.lcpCloudRegionId ?: ''

-		def tenantId = requestMap.requestDetails?.cloudConfiguration?.tenantId ?: ''

-		def personaModelId = requestMap.requestDetails?.modelInfo?.modelInvariantUuid ?: ''

-		def personaModelVersion = requestMap.requestDetails?.modelInfo?.modelUuid ?: ''

-		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''

-		

-		def xmlReq = """

-		<vnf-request>

-			<request-info>

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

-				<action>${action}</action>

-				<source>VID</source>

-				<!-- new 1610 field -->

-				<service-instance-id>${serviceInstanceId}</service-instance-id>

-			</request-info>

-			<vnf-inputs>

-				<!-- not in use in 1610 -->

-				<vnf-name>${vnfName}</vnf-name>					

-				<vnf-type>${vnfType}</vnf-type>

-				<vnf-id>${vnfId}</vnf-id>

-				<volume-group-id>${volumeGroupId}</volume-group-id>

-				<vf-module-id>${vfModuleId}</vf-module-id>

-				<vf-module-name>${vfModuleName}</vf-module-name>				

-				<vf-module-model-name>${vfModuleModelName}</vf-module-model-name>

-				<model-customization-id>${modelCustomizationId}</model-customization-id>

-				<is-base-vf-module>${isBaseVfModule}</is-base-vf-module>

-				<asdc-service-model-version>${asdcServiceModelInfo}</asdc-service-model-version>

-				<aic-cloud-region>${aicCloudRegion}</aic-cloud-region>				

-				<tenant-id>${tenantId}</tenant-id>

-				<service-id>${serviceId}</service-id>

-				<backout-on-failure>${backoutOnFailure}</backout-on-failure>

-				<persona-model-id>${personaModelId}</persona-model-id>

-				<persona-model-version>${personaModelVersion}</persona-model-version>

-			</vnf-inputs>

-			<vnf-params>

-				$userParamsNode

-			</vnf-params>

-		</vnf-request>

-		"""

-	

-		// return a pretty-print of the volume-request xml without the preamble

-		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "") 

-	}

-	

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import groovy.json.JsonBuilder
+import groovy.json.JsonSlurper
+
+import org.json.JSONObject
+import org.json.XML
+import org.onap.so.bpmn.core.xml.XmlTool
+import org.onap.so.logger.MsoLogger
+import org.onap.so.logger.MessageEnum
+
+
+class VidUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VidUtils.class);
+	
+	public MsoUtils utils = new MsoUtils()
+	private AbstractServiceTaskProcessor taskProcessor
+
+	public VidUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+	}
+	
+	/**
+	 * Create a volume-request XML using a JSON string
+	 * @param jsonReq - JSON request from VID
+	 * @param action
+	 * @return
+	 */
+	public String createXmlVolumeRequest(String jsonReq, String action, String serviceInstanceId) {
+		def jsonSlurper = new JsonSlurper()
+		try{
+			Map reqMap = jsonSlurper.parseText(jsonReq)
+			return createXmlVolumeRequest(reqMap, action, serviceInstanceId)
+		}
+		catch(Exception e) {
+			throw e
+		}
+	}
+
+	/**
+	 * Create a volume-request XML using a map
+	 * @param requestMap - map created from VID JSON
+	 * @param action
+	 * @param serviceInstanceId
+	 * @return
+	 */
+	public String createXmlVolumeRequest(Map requestMap, String action, String serviceInstanceId) {
+		createXmlVolumeRequest(requestMap, action, serviceInstanceId, '')
+	}
+	
+
+	/**
+	 * Create a volume-request XML using a map
+	 * @param requestMap
+	 * @param action
+	 * @param serviceInstanceId
+	 * @param volumeGroupId
+	 * @return
+	 */
+	public String createXmlVolumeRequest(Map requestMap, String action, String serviceInstanceId, String volumeGroupId) {
+		def vnfType = ''
+		def serviceName = ''
+		def modelCustomizationName = ''
+		def asdcServiceModelVersion = ''
+		
+		def suppressRollback = requestMap.requestDetails.requestInfo.suppressRollback
+		
+		def backoutOnFailure = ""
+		if(suppressRollback != null){
+			if ( suppressRollback == true) {
+				backoutOnFailure = "false"
+			} else if ( suppressRollback == false) {
+				backoutOnFailure = "true"
+			}
+		}
+		
+		def volGrpName = requestMap.requestDetails.requestInfo?.instanceName ?: ''
+		def serviceId = requestMap.requestDetails.requestParameters?.serviceId ?: ''
+		def relatedInstanceList = requestMap.requestDetails.relatedInstanceList
+		relatedInstanceList.each {
+			if (it.relatedInstance.modelInfo?.modelType == 'service') {
+				serviceName = it.relatedInstance.modelInfo?.modelName
+				asdcServiceModelVersion = it.relatedInstance.modelInfo?.modelVersion
+			}
+			if (it.relatedInstance.modelInfo?.modelType == 'vnf') {
+				modelCustomizationName = it.relatedInstance.modelInfo?.modelInstanceName
+			}
+		}
+		
+		vnfType = serviceName + '/' + modelCustomizationName
+		
+		def userParams = requestMap.requestDetails?.requestParameters?.userParams
+		def userParamsNode = ''
+		if(userParams != null) {
+			userParamsNode = buildUserParams(userParams)
+		}
+		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''
+		
+		def xmlReq = """
+		<volume-request xmlns="http://www.w3.org/2001/XMLSchema">
+			<request-info>
+				<action>${MsoUtils.xmlEscape(action)}</action>
+				<source>${MsoUtils.xmlEscape(requestMap.requestDetails.requestInfo.source)}</source>
+				<service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+			</request-info>
+			<volume-inputs>
+				<volume-group-id>${MsoUtils.xmlEscape(volumeGroupId)}</volume-group-id>
+				<volume-group-name>${MsoUtils.xmlEscape(volGrpName)}</volume-group-name>
+				<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+				<vf-module-model-name>${MsoUtils.xmlEscape(requestMap.requestDetails.modelInfo.modelName)}</vf-module-model-name>
+				<asdc-service-model-version>${MsoUtils.xmlEscape(asdcServiceModelVersion)}</asdc-service-model-version>
+				<aic-cloud-region>${MsoUtils.xmlEscape(requestMap.requestDetails.cloudConfiguration.lcpCloudRegionId)}</aic-cloud-region>
+				<tenant-id>${MsoUtils.xmlEscape(requestMap.requestDetails.cloudConfiguration.tenantId)}</tenant-id>
+				<service-id>${MsoUtils.xmlEscape(serviceId)}</service-id>
+				<backout-on-failure>${MsoUtils.xmlEscape(backoutOnFailure)}</backout-on-failure>
+				<model-customization-id>${MsoUtils.xmlEscape(modelCustomizationId)}</model-customization-id>
+			</volume-inputs>
+			<volume-params>
+				$userParamsNode
+			</volume-params>
+		</volume-request>
+		"""
+		// return a pretty-print of the volume-request xml without the preamble
+		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "") 
+	}
+	
+	/**
+	 * A common method that can be used to build volume-params node from a map. 
+	 * @param Map userParams
+	 * @return
+	 */
+	public String buildUserParams(userParams) {
+		if (userParams == null) return ""
+		def xml = ""
+		def key = ""
+		def value = ""
+		userParams.each {it ->
+			key = it.name.replaceAll(/\B[A-Z]/) { '_' + it }.toLowerCase()
+			value = it.value
+			xml += "<param name=\"${key}\">${MsoUtils.xmlEscape(value)}</param>"
+		}
+
+		return xml
+	}
+
+	/**
+	 * A common method that can be used to extract 'requestDetails' 
+	 * @param String json
+	 * @return String json requestDetails  
+	 */
+	@Deprecated
+	public getJsonRequestDetails(String jsonInput) {
+		String rtn = ""
+		if (jsonInput.isEmpty() || jsonInput == null) {
+			return rtn
+		} else {
+			def jsonMapObject = new JsonSlurper().parseText(jsonInput)
+			if (jsonMapObject instanceof Map) {
+				String jsonString = new JsonBuilder(jsonMapObject.requestDetails)
+				rtn = '{'+"requestDetails"+":"+jsonString+'}'
+				return rtn
+			} else {
+			    return rtn
+			}	
+		}
+	}
+	
+	/**
+	 * A common method that can be used to extract 'requestDetails' in Xml
+	 * @param String json
+	 * @return String xml requestDetails
+	 */
+	@Deprecated
+	public getJsonRequestDetailstoXml(String jsonInput) {
+		String rtn = null
+		def jsonString = getJsonRequestDetails(jsonInput)
+		if (jsonString == null) {
+			return rtn
+		} else {
+		    JSONObject jsonObj = new JSONObject(jsonString)
+			return XmlTool.normalize(XML.toString(jsonObj))
+		}
+	}
+	
+	/**
+	 * Create a network-request XML using a map
+ 	 * @param execution 
+	 * @param xmlRequestDetails - requestDetails in xml 
+	 * @return
+	 * Note: See latest version: createXmlNetworkRequestInstance()
+	 */
+
+	public String createXmlNetworkRequestInfra(execution, def networkJsonIncoming) {
+	
+		def requestId = execution.getVariable("requestId")
+		def serviceInstanceId = execution.getVariable("serviceInstanceId")
+		def requestAction = execution.getVariable("requestAction")
+		def networkId = (execution.getVariable("networkId")) != null ? execution.getVariable("networkId") : ""
+		
+		def jsonSlurper = new JsonSlurper()
+		try {
+			Map reqMap = jsonSlurper.parseText(networkJsonIncoming)
+			def instanceName =  reqMap.requestDetails.requestInfo.instanceName
+			def modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationId
+			if (modelCustomizationId == null) {
+				modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationUuid !=null ?  
+				                        reqMap.requestDetails.modelInfo.modelCustomizationUuid : ""
+			}
+			def modelName = reqMap.requestDetails.modelInfo.modelName
+			def lcpCloudRegionId = reqMap.requestDetails.cloudConfiguration.lcpCloudRegionId
+			def tenantId = reqMap.requestDetails.cloudConfiguration.tenantId
+			def serviceId = reqMap.requestDetails.requestInfo.productFamilyId 
+			def suppressRollback = reqMap.requestDetails.requestInfo.suppressRollback.toString()
+			def backoutOnFailure = "true"
+			if(suppressRollback != null){
+				if (suppressRollback == true || suppressRollback == "true") {
+					backoutOnFailure = "false"
+				} else if (suppressRollback == false || suppressRollback == "false") {
+					backoutOnFailure = "true"
+				}
+			}
+		
+			//def userParams = reqMap.requestDetails.requestParameters.userParams
+			//def userParamsNode = buildUserParams(userParams)
+			def userParams = reqMap.requestDetails?.requestParameters?.userParams
+			def userParamsNode = ''
+			if(userParams != null) {
+				userParamsNode = buildUserParams(userParams)
+			}
+			
+			//'sdncVersion' = current, '1610' (non-RPC SDNC) or '1702' (RPC SDNC)
+			def sdncVersion =  execution.getVariable("sdncVersion")
+			
+			def xmlReq = """
+			<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 
+			 <request-info> 
+	            <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
+			 	<action>${MsoUtils.xmlEscape(requestAction)}</action> 
+			 	<source>VID</source> 
+			 	<service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+			 </request-info> 
+			 <network-inputs> 
+			 	<network-id>${MsoUtils.xmlEscape(networkId)}</network-id> 
+			 	<network-name>${MsoUtils.xmlEscape(instanceName)}</network-name> 
+			 	<network-type>${MsoUtils.xmlEscape(modelName)}</network-type>
+				<modelCustomizationId>${MsoUtils.xmlEscape(modelCustomizationId)}</modelCustomizationId> 
+			 	<aic-cloud-region>${MsoUtils.xmlEscape(lcpCloudRegionId)}</aic-cloud-region> 
+			 	<tenant-id>${MsoUtils.xmlEscape(tenantId)}</tenant-id>
+			 	<service-id>${MsoUtils.xmlEscape(serviceId)}</service-id> 
+			 	<backout-on-failure>${MsoUtils.xmlEscape(backoutOnFailure)}</backout-on-failure>
+                <sdncVersion>${MsoUtils.xmlEscape(sdncVersion)}</sdncVersion>
+			 </network-inputs> 
+			 <network-params>
+				${userParamsNode}
+			 </network-params> 
+			</network-request>
+			"""
+			// return a pretty-print of the volume-request xml without the preamble
+			return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "")
+			
+		} catch(Exception e) {
+			msoLogger.debug("Error in Vid Utils",e.getCause())
+			e.printStackTrace();
+			throw e
+		}
+	}
+	
+	/**
+	 * Create a network-request XML using a map, 
+ 	 * @param execution 
+	 * @return
+	 */
+	public String createXmlNetworkRequestInstance(execution) {
+
+		def networkModelUuid = ""
+		def networkModelName = ""
+		def networkModelVersion = ""
+		def networkModelCustomizationUuid = ""
+		def networkModelInvariantUuid = ""
+		
+		// verify the DB Catalog response JSON structure
+		def networkModelInfo = execution.getVariable("networkModelInfo")
+		def jsonSlurper = new JsonSlurper()
+		if (networkModelInfo != null) {
+			try {
+				Map modelMap = jsonSlurper.parseText(networkModelInfo)
+				if (modelMap != null) {
+					if (networkModelInfo.contains("modelUuid")) {
+						networkModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""
+					}
+					if (networkModelInfo.contains("modelName")) {
+						networkModelName = modelMap.modelName !=null ? modelMap.modelName : ""
+					}
+					if (networkModelInfo.contains("modelVersion")) {
+						networkModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""
+					}
+					if (networkModelInfo.contains("modelCustomizationUuid")) {
+						networkModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""
+					}
+					if (networkModelInfo.contains("modelInvariantUuid")) {
+						networkModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""
+					}
+				}
+			} catch (Exception ex) {
+		    	throw ex
+			}
+		}		
+		
+		def serviceModelUuid = ""
+		def serviceModelName = ""
+		def serviceModelVersion = ""
+		def serviceModelCustomizationUuid = ""
+		def serviceModelInvariantUuid = ""
+		
+		// verify the DB Catalog response JSON structure
+		def serviceModelInfo = execution.getVariable("serviceModelInfo")
+		def jsonServiceSlurper = new JsonSlurper()
+		if (serviceModelInfo != null) {
+			try {
+				Map modelMap = jsonServiceSlurper.parseText(serviceModelInfo)
+				if (modelMap != null) {
+					if (serviceModelInfo.contains("modelUuid")) {
+						serviceModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""
+					}
+					if (serviceModelInfo.contains("modelName")) {
+						serviceModelName = modelMap.modelName !=null ? modelMap.modelName : ""
+					}
+					if (serviceModelInfo.contains("modelVersion")) {
+						serviceModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""
+					}
+					if (serviceModelInfo.contains("modelCustomizationUuid")) {
+						serviceModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""
+					}
+					if (serviceModelInfo.contains("modelInvariantUuid")) {
+						serviceModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""
+					}
+				}
+			} catch (Exception ex) {
+				throw ex
+			}
+		}
+		
+		
+		def subscriptionServiceType = execution.getVariable("subscriptionServiceType") != null ? execution.getVariable("subscriptionServiceType") : ""
+		def globalSubscriberId = execution.getVariable("globalSubscriberId") != null ? execution.getVariable("globalSubscriberId") : ""
+		def requestId = execution.getVariable("msoRequestId")
+		def serviceInstanceId = execution.getVariable("serviceInstanceId") != null ? execution.getVariable("serviceInstanceId") : ""
+		def networkId = (execution.getVariable("networkId")) != null ? execution.getVariable("networkId") : "" // optional
+		def networkName =  execution.getVariable("networkName") != null ? execution.getVariable("networkName") : "" // optional
+		def aicCloudReqion = execution.getVariable("lcpCloudRegionId") != null ? execution.getVariable("lcpCloudRegionId") : ""
+		def tenantId = execution.getVariable("tenantId") != null ? execution.getVariable("tenantId") : ""
+		def serviceId = execution.getVariable("productFamilyId") != null ? execution.getVariable("productFamilyId") : ""
+		def failIfExist = execution.getVariable("failIfExists") != null ? execution.getVariable("failIfExists") : ""
+		def suppressRollback = execution.getVariable("disableRollback")   
+		def backoutOnFailure = "true"
+		if(suppressRollback != null){
+			if (suppressRollback == true || suppressRollback == "true") {
+				backoutOnFailure = "false"
+			} else if (suppressRollback == false || suppressRollback == "false") {
+				backoutOnFailure = "true"
+			}
+		}
+		
+		//'sdncVersion' = current, '1610' (non-RPC SDNC) or '1702' (RPC SDNC)
+		def sdncVersion =  execution.getVariable("sdncVersion")
+		
+		def source = "VID"
+		def action = execution.getVariable("action")
+				
+		def userParamsNode = ""
+		def userParams = execution.getVariable("networkInputParams")
+		if(userParams != null) {
+		   userParamsNode = buildUserParams(userParams)
+		}
+		
+		def xmlReq = """
+		<network-request xmlns="http://www.w3.org/2001/XMLSchema"> 
+		 <request-info> 
+            <request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
+		 	<action>${MsoUtils.xmlEscape(action)}</action> 
+		 	<source>${MsoUtils.xmlEscape(source)}</source> 
+		 	<service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+		 </request-info> 
+		 <network-inputs> 
+		 	<network-id>${MsoUtils.xmlEscape(networkId)}</network-id> 
+		 	<network-name>${MsoUtils.xmlEscape(networkName)}</network-name> 
+		 	<network-type>${MsoUtils.xmlEscape(networkModelName)}</network-type>
+		 	<subscription-service-type>${MsoUtils.xmlEscape(subscriptionServiceType)}</subscription-service-type>
+            <global-customer-id>${MsoUtils.xmlEscape(globalSubscriberId)}</global-customer-id>
+		 	<aic-cloud-region>${MsoUtils.xmlEscape(aicCloudReqion)}</aic-cloud-region> 
+		 	<tenant-id>${MsoUtils.xmlEscape(tenantId)}</tenant-id>
+		 	<service-id>${MsoUtils.xmlEscape(serviceId)}</service-id> 
+		 	<backout-on-failure>${MsoUtils.xmlEscape(backoutOnFailure)}</backout-on-failure>
+			<failIfExist>${MsoUtils.xmlEscape(failIfExist)}</failIfExist>
+            <networkModelInfo>
+              <modelName>${MsoUtils.xmlEscape(networkModelName)}</modelName>
+              <modelUuid>${MsoUtils.xmlEscape(networkModelUuid)}</modelUuid>
+              <modelInvariantUuid>${MsoUtils.xmlEscape(networkModelInvariantUuid)}</modelInvariantUuid>            
+              <modelVersion>${MsoUtils.xmlEscape(networkModelVersion)}</modelVersion>
+              <modelCustomizationUuid>${MsoUtils.xmlEscape(networkModelCustomizationUuid)}</modelCustomizationUuid>
+		    </networkModelInfo>
+            <serviceModelInfo>
+              <modelName>${MsoUtils.xmlEscape(serviceModelName)}</modelName>
+              <modelUuid>${MsoUtils.xmlEscape(serviceModelUuid)}</modelUuid>
+              <modelInvariantUuid>${MsoUtils.xmlEscape(serviceModelInvariantUuid)}</modelInvariantUuid>            
+              <modelVersion>${MsoUtils.xmlEscape(serviceModelVersion)}</modelVersion>
+              <modelCustomizationUuid>${MsoUtils.xmlEscape(serviceModelCustomizationUuid)}</modelCustomizationUuid>
+             
+		    </serviceModelInfo>										      			
+            <sdncVersion>${MsoUtils.xmlEscape(sdncVersion)}</sdncVersion>                    
+		 </network-inputs>
+		 <network-params>
+			${userParamsNode}
+		 </network-params> 
+		</network-request>
+		"""
+		// return a pretty-print of the volume-request xml without the preamble
+		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "")
+			
+	}
+	
+	/**
+	 * Create a vnf-request XML using a map
+	 * @param requestMap - map created from VID JSON 
+	 * @param action
+	 * @return
+	 */
+	public String createXmlVfModuleRequest(execution, Map requestMap, String action, String serviceInstanceId) {
+				
+		//def relatedInstanceList = requestMap.requestDetails.relatedInstanceList
+		
+		//relatedInstanceList.each {
+		//	if (it.relatedInstance.modelInfo.modelType == 'vnf') {
+		//		vnfType = it.relatedInstance.modelInfo.modelName
+		//		vnfId = it.relatedInstance.modelInfo.modelInvariantId
+		//	}
+		//}
+		
+		def vnfName = ''
+		def asdcServiceModelInfo = ''
+				
+		def relatedInstanceList = requestMap.requestDetails?.relatedInstanceList
+		
+		
+		if (relatedInstanceList != null) {
+			relatedInstanceList.each {
+				if (it.relatedInstance.modelInfo?.modelType == 'service') {
+					asdcServiceModelInfo = it.relatedInstance.modelInfo?.modelVersion
+				}
+				if (it.relatedInstance.modelInfo.modelType == 'vnf') {
+					vnfName = it.relatedInstance.instanceName ?: ''
+				}
+			}
+		}
+		
+		def vnfType = execution.getVariable('vnfType')
+		def vnfId = execution.getVariable('vnfId')
+
+		def vfModuleId = execution.getVariable('vfModuleId')
+		def volumeGroupId = execution.getVariable('volumeGroupId')
+		def userParams = requestMap.requestDetails?.requestParameters?.userParams
+		
+		
+		def userParamsNode = ''
+		if(userParams != null) {
+			userParamsNode = buildUserParams(userParams)
+		}
+		
+		def isBaseVfModule = "false"
+		if (execution.getVariable('isBaseVfModule') == true) {
+			isBaseVfModule = "true"		
+		}
+		
+		def requestId = execution.getVariable("mso-request-id")		
+		def vfModuleName = requestMap.requestDetails?.requestInfo?.instanceName ?: ''
+		def vfModuleModelName = requestMap.requestDetails?.modelInfo?.modelName ?: ''
+		def suppressRollback = requestMap.requestDetails?.requestInfo?.suppressRollback
+		
+		def backoutOnFailure = ""
+		if(suppressRollback != null){
+			if ( suppressRollback == true) {
+				backoutOnFailure = "false"
+			} else if ( suppressRollback == false) {
+				backoutOnFailure = "true"
+			}
+		}
+		
+		def serviceId = requestMap.requestDetails?.requestParameters?.serviceId ?: ''
+		def aicCloudRegion = requestMap.requestDetails?.cloudConfiguration?.lcpCloudRegionId ?: ''
+		def tenantId = requestMap.requestDetails?.cloudConfiguration?.tenantId ?: ''
+		def personaModelId = requestMap.requestDetails?.modelInfo?.modelInvariantUuid ?: ''
+		def personaModelVersion = requestMap.requestDetails?.modelInfo?.modelUuid ?: ''
+		def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''
+		
+		def xmlReq = """
+		<vnf-request>
+			<request-info>
+				<request-id>${MsoUtils.xmlEscape(requestId)}</request-id>
+				<action>${MsoUtils.xmlEscape(action)}</action>
+				<source>VID</source>
+				<service-instance-id>${MsoUtils.xmlEscape(serviceInstanceId)}</service-instance-id>
+			</request-info>
+			<vnf-inputs>
+				<!-- not in use in 1610 -->
+				<vnf-name>${MsoUtils.xmlEscape(vnfName)}</vnf-name>					
+				<vnf-type>${MsoUtils.xmlEscape(vnfType)}</vnf-type>
+				<vnf-id>${MsoUtils.xmlEscape(vnfId)}</vnf-id>
+				<volume-group-id>${MsoUtils.xmlEscape(volumeGroupId)}</volume-group-id>
+				<vf-module-id>${MsoUtils.xmlEscape(vfModuleId)}</vf-module-id>
+				<vf-module-name>${MsoUtils.xmlEscape(vfModuleName)}</vf-module-name>				
+				<vf-module-model-name>${MsoUtils.xmlEscape(vfModuleModelName)}</vf-module-model-name>
+				<model-customization-id>${MsoUtils.xmlEscape(modelCustomizationId)}</model-customization-id>
+				<is-base-vf-module>${MsoUtils.xmlEscape(isBaseVfModule)}</is-base-vf-module>
+				<asdc-service-model-version>${MsoUtils.xmlEscape(asdcServiceModelInfo)}</asdc-service-model-version>
+				<aic-cloud-region>${MsoUtils.xmlEscape(aicCloudRegion)}</aic-cloud-region>				
+				<tenant-id>${MsoUtils.xmlEscape(tenantId)}</tenant-id>
+				<service-id>${MsoUtils.xmlEscape(serviceId)}</service-id>
+				<backout-on-failure>${MsoUtils.xmlEscape(backoutOnFailure)}</backout-on-failure>
+				<persona-model-id>${MsoUtils.xmlEscape(personaModelId)}</persona-model-id>
+				<persona-model-version>${MsoUtils.xmlEscape(personaModelVersion)}</persona-model-version>
+			</vnf-inputs>
+			<vnf-params>
+				$userParamsNode
+			</vnf-params>
+		</vnf-request>
+		"""
+	
+		// return a pretty-print of the volume-request xml without the preamble
+		return groovy.xml.XmlUtil.serialize(xmlReq.normalize().replaceAll("\t", "").replaceAll("\n", "")).replaceAll("(<\\?[^<]*\\?>\\s*[\\r\\n]*)?", "") 
+	}
+	
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterRestV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1.groovy
index 5f2a845ef2..52f45c205c 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterRestV1.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1.groovy
@@ -1,413 +1,419 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-

-class VnfAdapterRestV1 extends AbstractServiceTaskProcessor {

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	// VNF Response Processing

-	public void preProcessRequest (DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		def prefix="VNFREST_"

-		execution.setVariable("prefix", prefix)

-		setSuccessIndicator(execution, false)

-

-		try {

-			String request = validateRequest(execution, "mso-request-id")

-

-			// Get the request type (the name of the root element) from the request

-

-			Node root = new XmlParser().parseText(request)

-			String requestType = root.name()

-			execution.setVariable(prefix + 'requestType', requestType)

-			logDebug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType, isDebugLogEnabled)

-

-			utils.logAudit('VnfAdapterRestV1, request: ' + request)

-			// Get the messageId from the request

-

-			String messageId = getChildText(root, 'messageId')

-

-			if ('rollbackVolumeGroupRequest'.equals(requestType)) {

-				messageId = getMessageIdForVolumeGroupRollback(root)

-			}

-			

-			if (messageId == null || messageId.isEmpty()) {

-				String msg = getProcessKey(execution) + ': no messageId in ' + requestType

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			execution.setVariable('VNFAResponse_CORRELATOR', messageId)

-			logDebug(getProcessKey(execution) + ': VNFAResponse_CORRELATOR = ' + messageId, isDebugLogEnabled)

-

-			// Get the notificationUrl from the request

-

-			String notificationUrl = getChildText(root, 'notificationUrl')

-

-			if (notificationUrl == null || notificationUrl.isEmpty()) {

-				String msg = getProcessKey(execution) + ': no notificationUrl in ' + requestType

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			execution.setVariable(prefix + 'notificationUrl', notificationUrl)

-			logDebug(getProcessKey(execution) + ': ' + prefix + 'notificationUrl = ' + notificationUrl, isDebugLogEnabled)

-

-			// Determine the VnfAdapter endpoint

-

-			String vnfAdapterEndpoint = execution.getVariable("URN_mso_adapters_vnf_rest_endpoint")

-

-			if (vnfAdapterEndpoint == null || vnfAdapterEndpoint.isEmpty()) {

-				String msg = getProcessKey(execution) + ': mso:adapters:vnf:rest:endpoint URN mapping is not defined'

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			while (vnfAdapterEndpoint.endsWith('/')) {

-				vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, vnfAdapterEndpoint.length()-1)

-			}

-

-			String vnfAdapterMethod = null

-			String vnfAdapterUrl = null

-			String vnfAdapterRequest = request

-

-			if ('createVfModuleRequest'.equals(requestType)) {

-				String vnfId = getChildText(root, 'vnfId')

-

-				if (vnfId == null || vnfId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'POST'

-				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') + '/vf-modules'

-

-			} else if ('updateVfModuleRequest'.equals(requestType)) {

-				String vnfId = getChildText(root, 'vnfId')

-

-				if (vnfId == null || vnfId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				String vfModuleId = getChildText(root, 'vfModuleId')

-

-				if (vfModuleId == null || vfModuleId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'PUT'

-				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +

-					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8')

-

-			} else if ('deleteVfModuleRequest'.equals(requestType)) {

-				String vnfId = getChildText(root, 'vnfId')

-

-				if (vnfId == null || vnfId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				String vfModuleId = getChildText(root, 'vfModuleId')

-

-				if (vfModuleId == null || vfModuleId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'DELETE'

-				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +

-					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8')

-

-			} else if ('rollbackVfModuleRequest'.equals(requestType)) {

-				Node vfModuleRollbackNode = getChild(root, 'vfModuleRollback')

-

-				if (vfModuleRollbackNode == null) {

-					String msg = getProcessKey(execution) + ': no vfModuleRollback in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				String vnfId = getChildText(vfModuleRollbackNode, 'vnfId')

-

-				if (vnfId == null || vnfId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				String vfModuleId = getChildText(vfModuleRollbackNode, 'vfModuleId')

-

-				if (vfModuleId == null || vfModuleId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'DELETE'

-				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +

-					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8') + '/rollback'

-

-			} else if ('createVolumeGroupRequest'.equals(requestType)) {

-				vnfAdapterMethod = 'POST'

-				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {

-					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))

-				}

-				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups'

-

-			} else if ('updateVolumeGroupRequest'.equals(requestType)) {

-				String volumeGroupId = getChildText(root, 'volumeGroupId')

-

-				if (volumeGroupId == null || volumeGroupId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'PUT'

-				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {

-					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))

-				}

-				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')

-

-			} else if ('deleteVolumeGroupRequest'.equals(requestType)) {

-				String volumeGroupId = getChildText(root, 'volumeGroupId')

-

-				if (volumeGroupId == null || volumeGroupId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'DELETE'

-				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {

-					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))

-				}

-				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')

-

-			} else if ('rollbackVolumeGroupRequest'.equals(requestType)) {

-				String volumeGroupId = root.'volumeGroupRollback'.'volumeGroupId'.text()

-

-				if (volumeGroupId == null || volumeGroupId.isEmpty()) {

-					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType

-					logError(msg)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-				}

-

-				vnfAdapterMethod = 'DELETE'

-				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {

-					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))

-				}

-				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')  + '/rollback'

-

-			} else {

-				String msg = getProcessKey(execution) + ': Unsupported request type: ' + requestType

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			execution.setVariable(prefix + 'vnfAdapterMethod', vnfAdapterMethod)

-			logDebug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterMethod = ' + vnfAdapterMethod, isDebugLogEnabled)

-			execution.setVariable(prefix + 'vnfAdapterUrl', vnfAdapterUrl)

-			logDebug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterUrl = ' + vnfAdapterUrl, isDebugLogEnabled)

-			execution.setVariable(prefix + 'vnfAdapterRequest', vnfAdapterRequest)

-			logDebug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterRequest = \n' + vnfAdapterRequest, isDebugLogEnabled)

-

-			// Get the Basic Auth credentials for the VnfAdapter

-

-			String basicAuthValue = execution.getVariable("URN_mso_adapters_po_auth")

-

-			if (basicAuthValue == null || basicAuthValue.isEmpty()) {

-				logError(getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined")

-			} else {

-				logDebug(getProcessKey(execution) + ": Obtained BasicAuth credentials for VnfAdapter:" +

-					basicAuthValue, isDebugLogEnabled)

-				try {

-					def encodedString = utils.getBasicAuth(basicAuthValue, execution.getVariable("URN_mso_msoKey"))

-					execution.setVariable(prefix + 'basicAuthHeaderValue', encodedString)

-				} catch (IOException ex) {

-					logError(getProcessKey(execution) + ": Unable to encode BasicAuth credentials for VnfAdapter")

-				}

-			}

-

-		} catch (BpmnError e) {

-			logDebug(" Rethrowing MSOWorkflowException", isDebugLogEnabled)

-			throw e

-		} catch (Exception e) {

-			String msg = 'Caught exception in ' + method + ": " + e

-			logError(msg)

-			logDebug(msg)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-		}

-	}

-

-	public String getMessageIdForVolumeGroupRollback(Node root) {

-		return root.'volumeGroupRollback'.'messageId'.text()

-	}

-	

-	/**

-	 * This method is used instead of an HTTP Connector task because the

-	 * connector does not allow DELETE with a body.

-	 */

-	public void sendRequestToVnfAdapter(DelegateExecution execution) {

-		def method = getClass().getSimpleName() + '.sendRequestToVnfAdapter(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		String prefix = execution.getVariable('prefix')

-

-		try {

-			String vnfAdapterMethod = execution.getVariable(prefix + 'vnfAdapterMethod')

-			String vnfAdapterUrl = execution.getVariable(prefix + 'vnfAdapterUrl')

-			String vnfAdapterRequest = execution.getVariable(prefix + 'vnfAdapterRequest')

-

-			RESTConfig config = new RESTConfig(vnfAdapterUrl)

-			RESTClient client = new RESTClient(config).

-				addHeader("Content-Type", "application/xml").

-				addAuthorizationHeader(execution.getVariable(prefix + "basicAuthHeaderValue"));

-

-			APIResponse response;

-

-			if ("GET".equals(vnfAdapterMethod)) {

-				response = client.httpGet()

-			} else if ("PUT".equals(vnfAdapterMethod)) {

-				response = client.httpPut(vnfAdapterRequest)

-			} else if ("POST".equals(vnfAdapterMethod)) {

-				response = client.httpPost(vnfAdapterRequest)

-			} else if ("DELETE".equals(vnfAdapterMethod)) {

-				response = client.httpDelete(vnfAdapterRequest)

-			} else {

-				String msg = 'Unsupported HTTP method "' + vnfAdapterMethod + '" in ' + method + ": " + e

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			execution.setVariable(prefix + "vnfAdapterStatusCode", response.getStatusCode())

-			execution.setVariable(prefix + "vnfAdapterResponse", response.getResponseBodyAsString())

-		} catch (BpmnError e) {

-			throw e

-		} catch (Exception e) {

-			String msg = 'Caught exception in ' + method + ": " + e

-			logError(msg)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-		}

-	}

-

-	public void processCallback(DelegateExecution execution){

-		def method = getClass().getSimpleName() + '.processCallback(' +

-			'execution=' + execution.getId() +

-			')'

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

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		String callback = execution.getVariable('VNFAResponse_MESSAGE')

-

-		try {

-			logDebug(getProcessKey(execution) + ": received callback:\n" + callback, isDebugLogEnabled)

-

-			// The XML callback is available to the calling flow in any case,

-			// even if a WorkflowException is generated.

-			execution.setVariable(getProcessKey(execution) + 'Response', callback)

-			// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead.

-			execution.setVariable("WorkflowResponse", callback)

-

-			Node root = new XmlParser().parseText(callback)

-			if (root.name().endsWith('Exception')) {

-				vnfAdapterWorkflowException(execution, callback)

-			}

-		} catch (Exception e) {

-			e.printStackTrace()

-			callback = callback == null || String.valueOf(callback).isEmpty() ? "NONE" : callback

-			String msg = "Received error from VnfAdapter: " + callback

-			logDebug(getProcessKey(execution) + ': ' + msg, isDebugLogEnabled)

-			exceptionUtil.buildWorkflowException(execution, 7020, msg)

-		}

-	}

-

-	/**

-	 * Tries to parse the response as XML to extract the information to create

-	 * a WorkflowException.  If the response cannot be parsed, a more generic

-	 * WorkflowException is created.

-	 */

-	public void vnfAdapterWorkflowException(DelegateExecution execution, Object response) {

-		try {

-			Node root = new XmlParser().parseText(response)

-			String category = getChildText(root, "category")

-			category = category == null || category.isEmpty() ? "" : " category='" + category + "'"

-			String message = getChildText(root, "message")

-			message = message == null || message.isEmpty() ? "" : " message='" + message + "'"

-			String rolledBack = getChildText(root, "rolledBack")

-			rolledBack = rolledBack == null || rolledBack.isEmpty() ? "" : " rolledBack='" + rolledBack + "'"

-			exceptionUtil.buildWorkflowException(execution, 7020, "Received " + root.name() +

-				" from VnfAdapter:" + category + message + rolledBack);

-		} catch (Exception e) {

-			response = response == null || String.valueOf(response).isEmpty() ? "NONE" : response

-			exceptionUtil.buildWorkflowException(execution, 7020, "Received error from VnfAdapter: " + response)

-		}

-	}

-

-	/**

-	 * Gets the named child of the specified node.

-	 * @param node the node

-	 * @param name the child name

-	 * @return the child node, or null if no such child exists

-	 */

-	private Node getChild(Node node, String name) {

-		for (Node child : node.children()) {

-			if (child.name() == name) {

-				return child

-			}

-		}

-		return null

-	}

-

-	/**

-	 * Gets the text of the named child of the specified node.

-	 * @param node the node

-	 * @param name the child name

-	 * @return the child node text, or null if no such child exists

-	 */

-	private String getChildText(Node node, String name) {

-		Node child = getChild(node, name)

-		return child == null ? null : child.text()

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.apache.commons.lang3.*
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.UrnPropertiesReader
+import org.onap.so.rest.APIResponse
+import org.onap.so.rest.RESTClient
+import org.onap.so.rest.RESTConfig
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+class VnfAdapterRestV1 extends AbstractServiceTaskProcessor {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterRestV1.class);
+
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	// VNF Response Processing
+	public void preProcessRequest (DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		def prefix="VNFREST_"
+		execution.setVariable("prefix", prefix)
+		setSuccessIndicator(execution, false)
+
+		try {
+			String request = validateRequest(execution, "mso-request-id")
+
+			// Get the request type (the name of the root element) from the request
+
+			Node root = new XmlParser().parseText(request)
+			String requestType = root.name()
+			execution.setVariable(prefix + 'requestType', requestType)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'requestType = ' + requestType)
+
+			msoLogger.debug('VnfAdapterRestV1, request: ' + request)
+			// Get the messageId from the request
+
+			String messageId = getChildText(root, 'messageId')
+
+			if ('rollbackVolumeGroupRequest'.equals(requestType)) {
+				messageId = getMessageIdForVolumeGroupRollback(root)
+			}
+			
+			if (messageId == null || messageId.isEmpty()) {
+				String msg = getProcessKey(execution) + ': no messageId in ' + requestType
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			execution.setVariable('VNFAResponse_CORRELATOR', messageId)
+			msoLogger.debug(getProcessKey(execution) + ': VNFAResponse_CORRELATOR = ' + messageId)
+
+			// Get the notificationUrl from the request
+
+			String notificationUrl = getChildText(root, 'notificationUrl')
+
+			if (notificationUrl == null || notificationUrl.isEmpty()) {
+				String msg = getProcessKey(execution) + ': no notificationUrl in ' + requestType
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			execution.setVariable(prefix + 'notificationUrl', notificationUrl)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'notificationUrl = ' + notificationUrl)
+
+			// Determine the VnfAdapter endpoint
+
+			String vnfAdapterEndpoint = UrnPropertiesReader.getVariable("mso.adapters.vnf.rest.endpoint", execution)
+
+			if (vnfAdapterEndpoint == null || vnfAdapterEndpoint.isEmpty()) {
+				String msg = getProcessKey(execution) + ': mso:adapters:vnf:rest:endpoint URN mapping is not defined'
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			while (vnfAdapterEndpoint.endsWith('/')) {
+				vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, vnfAdapterEndpoint.length()-1)
+			}
+
+			String vnfAdapterMethod = null
+			String vnfAdapterUrl = null
+			String vnfAdapterRequest = request
+
+			if ('createVfModuleRequest'.equals(requestType)) {
+				String vnfId = getChildText(root, 'vnfId')
+
+				if (vnfId == null || vnfId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'POST'
+				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') + '/vf-modules'
+
+			} else if ('updateVfModuleRequest'.equals(requestType)) {
+				String vnfId = getChildText(root, 'vnfId')
+
+				if (vnfId == null || vnfId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				String vfModuleId = getChildText(root, 'vfModuleId')
+
+				if (vfModuleId == null || vfModuleId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'PUT'
+				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +
+					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8')
+
+			} else if ('deleteVfModuleRequest'.equals(requestType)) {
+				String vnfId = getChildText(root, 'vnfId')
+
+				if (vnfId == null || vnfId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				String vfModuleId = getChildText(root, 'vfModuleId')
+
+				if (vfModuleId == null || vfModuleId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'DELETE'
+				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +
+					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8')
+
+			} else if ('rollbackVfModuleRequest'.equals(requestType)) {
+				Node vfModuleRollbackNode = getChild(root, 'vfModuleRollback')
+
+				if (vfModuleRollbackNode == null) {
+					String msg = getProcessKey(execution) + ': no vfModuleRollback in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				String vnfId = getChildText(vfModuleRollbackNode, 'vnfId')
+
+				if (vnfId == null || vnfId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vnfId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				String vfModuleId = getChildText(vfModuleRollbackNode, 'vfModuleId')
+
+				if (vfModuleId == null || vfModuleId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no vfModuleId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'DELETE'
+				vnfAdapterUrl = vnfAdapterEndpoint + '/' + URLEncoder.encode(vnfId, 'UTF-8') +
+					'/vf-modules/' + URLEncoder.encode(vfModuleId, 'UTF-8') + '/rollback'
+
+			} else if ('createVolumeGroupRequest'.equals(requestType)) {
+				vnfAdapterMethod = 'POST'
+				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {
+					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))
+				}
+				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups'
+
+			} else if ('updateVolumeGroupRequest'.equals(requestType)) {
+				String volumeGroupId = getChildText(root, 'volumeGroupId')
+
+				if (volumeGroupId == null || volumeGroupId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'PUT'
+				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {
+					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))
+				}
+				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')
+
+			} else if ('deleteVolumeGroupRequest'.equals(requestType)) {
+				String volumeGroupId = getChildText(root, 'volumeGroupId')
+
+				if (volumeGroupId == null || volumeGroupId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'DELETE'
+				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {
+					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))
+				}
+				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')
+
+			} else if ('rollbackVolumeGroupRequest'.equals(requestType)) {
+				String volumeGroupId = getVolumeGroupIdFromRollbackRequest(root)
+
+				if (volumeGroupId == null || volumeGroupId.isEmpty()) {
+					String msg = getProcessKey(execution) + ': no volumeGroupId in ' + requestType
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+				}
+
+				vnfAdapterMethod = 'DELETE'
+				if (vnfAdapterEndpoint.endsWith('v1/vnfs')) {
+					vnfAdapterEndpoint = vnfAdapterEndpoint.substring(0, (vnfAdapterEndpoint.length()-'/vnfs'.length()))
+				}
+				vnfAdapterUrl = vnfAdapterEndpoint + '/volume-groups/' + URLEncoder.encode(volumeGroupId, 'UTF-8')  + '/rollback'
+
+			} else {
+				String msg = getProcessKey(execution) + ': Unsupported request type: ' + requestType
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			execution.setVariable(prefix + 'vnfAdapterMethod', vnfAdapterMethod)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterMethod = ' + vnfAdapterMethod)
+			execution.setVariable(prefix + 'vnfAdapterUrl', vnfAdapterUrl)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterUrl = ' + vnfAdapterUrl)
+			execution.setVariable(prefix + 'vnfAdapterRequest', vnfAdapterRequest)
+			msoLogger.debug(getProcessKey(execution) + ': ' + prefix + 'vnfAdapterRequest = \n' + vnfAdapterRequest)
+
+			// Get the Basic Auth credentials for the VnfAdapter
+
+			String basicAuthValue = UrnPropertiesReader.getVariable("mso.adapters.po.auth", execution)
+
+			if (basicAuthValue == null || basicAuthValue.isEmpty()) {
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": mso:adapters:po:auth URN mapping is not defined", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			} else {
+				try {
+					def encodedString = utils.getBasicAuth(basicAuthValue, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+					execution.setVariable(prefix + 'basicAuthHeaderValue', encodedString)
+				} catch (IOException ex) {
+					msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, getProcessKey(execution) + ": Unable to encode BasicAuth credentials for VnfAdapter", "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				}
+			}
+
+		} catch (BpmnError e) {
+			msoLogger.debug(" Rethrowing MSOWorkflowException")
+			throw e
+		} catch (Exception e) {
+			String msg = 'Caught exception in ' + method + ": " + e
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			msoLogger.debug(msg)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+		}
+	}
+	
+	public String getVolumeGroupIdFromRollbackRequest(Node root) {
+		return root.'volumeGroupRollback'.'volumeGroupId'.text()
+	}
+
+	public String getMessageIdForVolumeGroupRollback(Node root) {
+		return root.'volumeGroupRollback'.'messageId'.text()
+	}
+	
+	/**
+	 * This method is used instead of an HTTP Connector task because the
+	 * connector does not allow DELETE with a body.
+	 */
+	public void sendRequestToVnfAdapter(DelegateExecution execution) {
+		def method = getClass().getSimpleName() + '.sendRequestToVnfAdapter(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		String prefix = execution.getVariable('prefix')
+
+		try {
+			String vnfAdapterMethod = execution.getVariable(prefix + 'vnfAdapterMethod')
+			String vnfAdapterUrl = execution.getVariable(prefix + 'vnfAdapterUrl')
+			String vnfAdapterRequest = execution.getVariable(prefix + 'vnfAdapterRequest')
+
+			RESTConfig config = new RESTConfig(vnfAdapterUrl)
+			RESTClient client = new RESTClient(config).
+				addHeader("Content-Type", "application/xml").
+				addAuthorizationHeader(execution.getVariable(prefix + "basicAuthHeaderValue"));
+
+			APIResponse response;
+
+			if ("GET".equals(vnfAdapterMethod)) {
+				response = client.httpGet()
+			} else if ("PUT".equals(vnfAdapterMethod)) {
+				response = client.httpPut(vnfAdapterRequest)
+			} else if ("POST".equals(vnfAdapterMethod)) {
+				response = client.httpPost(vnfAdapterRequest)
+			} else if ("DELETE".equals(vnfAdapterMethod)) {
+				response = client.httpDelete(vnfAdapterRequest)
+			} else {
+				String msg = 'Unsupported HTTP method "' + vnfAdapterMethod + '" in ' + method + ": " + e
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			execution.setVariable(prefix + "vnfAdapterStatusCode", response.getStatusCode())
+			execution.setVariable(prefix + "vnfAdapterResponse", response.getResponseBodyAsString())
+		} catch (BpmnError e) {
+			throw e
+		} catch (Exception e) {
+			String msg = 'Caught exception in ' + method + ": " + e
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "");
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+		}
+	}
+
+	public void processCallback(DelegateExecution execution){
+		def method = getClass().getSimpleName() + '.processCallback(' +
+			'execution=' + execution.getId() +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		String callback = execution.getVariable('VNFAResponse_MESSAGE')
+
+		try {
+			msoLogger.debug(getProcessKey(execution) + ": received callback:\n" + callback)
+
+			// The XML callback is available to the calling flow in any case,
+			// even if a WorkflowException is generated.
+			execution.setVariable(getProcessKey(execution) + 'Response', callback)
+			// TODO: Should deprecate use of processKey+Response variable for the response. Will use "WorkflowResponse" instead.
+			execution.setVariable("WorkflowResponse", callback)
+
+			Node root = new XmlParser().parseText(callback)
+			if (root.name().endsWith('Exception')) {
+				vnfAdapterWorkflowException(execution, callback)
+			}
+		} catch (Exception e) {
+			e.printStackTrace()
+			callback = callback == null || String.valueOf(callback).isEmpty() ? "NONE" : callback
+			String msg = "Received error from VnfAdapter: " + callback
+			msoLogger.debug(getProcessKey(execution) + ': ' + msg)
+			exceptionUtil.buildWorkflowException(execution, 7020, msg)
+		}
+	}
+
+	/**
+	 * Tries to parse the response as XML to extract the information to create
+	 * a WorkflowException.  If the response cannot be parsed, a more generic
+	 * WorkflowException is created.
+	 */
+	public void vnfAdapterWorkflowException(DelegateExecution execution, Object response) {
+		try {
+			Node root = new XmlParser().parseText(response)
+			String category = getChildText(root, "category")
+			category = category == null || category.isEmpty() ? "" : " category='" + category + "'"
+			String message = getChildText(root, "message")
+			message = message == null || message.isEmpty() ? "" : " message='" + message + "'"
+			String rolledBack = getChildText(root, "rolledBack")
+			rolledBack = rolledBack == null || rolledBack.isEmpty() ? "" : " rolledBack='" + rolledBack + "'"
+			exceptionUtil.buildWorkflowException(execution, 7020, "Received " + root.name() +
+				" from VnfAdapter:" + category + message + rolledBack);
+		} catch (Exception e) {
+			response = response == null || String.valueOf(response).isEmpty() ? "NONE" : response
+			exceptionUtil.buildWorkflowException(execution, 7020, "Received error from VnfAdapter: " + response)
+		}
+	}
+
+	/**
+	 * Gets the named child of the specified node.
+	 * @param node the node
+	 * @param name the child name
+	 * @return the child node, or null if no such child exists
+	 */
+	private Node getChild(Node node, String name) {
+		for (Node child : node.children()) {
+			if (child.name() == name) {
+				return child
+			}
+		}
+		return null
+	}
+
+	/**
+	 * Gets the text of the named child of the specified node.
+	 * @param node the node
+	 * @param name the child name
+	 * @return the child node text, or null if no such child exists
+	 */
+	private String getChildText(Node node, String name) {
+		Node child = getChild(node, name)
+		return child == null ? null : child.text()
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterUtils.groovy
index 9c1a472a67..8c979fca0b 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterUtils.groovy
@@ -1,86 +1,90 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

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

-import org.camunda.bpm.engine.delegate.DelegateExecution;

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

-

-class VnfAdapterUtils {

-

-	private AbstractServiceTaskProcessor taskProcessor

-

-	public VnfAdapterUtils(AbstractServiceTaskProcessor taskProcessor) {

-		this.taskProcessor = taskProcessor

-	}

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	public void validateVnfResponse(DelegateExecution execution, String responseVar, String responseCodeVar, String errorResponseVar) {

-		def method = getClass().getSimpleName() + '.validateVnfResponse(' +

-			'execution=' + execution.getId() +

-			', responseVar=' + responseVar +

-			', responseCodeVar=' + responseCodeVar +

-			', errorResponseVar=' + errorResponseVar +

-			')'

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

-		taskProcessor.logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def prefix = execution.getVariable('prefix')

-

-			def response = execution.getVariable(responseVar)

-			def responseCode = execution.getVariable(responseCodeVar)

-			def errorResponse = execution.getVariable(errorResponseVar)

-

-			// The following if statement never appears to be true as any VNF Adapter error seems to be stored in 'errorResponse'.

-			// Also, the value is stored as a WorkflowException object, not a String. Added the else if to provide the proper

-			// functionality but leaving the original code in case it is hit under some circumstances.

-			if (response.contains("WorkflowException")) {

-				execution.setVariable(prefix + "ErrorResponse", response)

-				//execution.setVariable(prefix + "ResponseCode", responseCode)

-				taskProcessor.logDebug(" Sub Vnf flow Error WorkflowException Response - " + "\n" + response, isDebugLogEnabled)

-				throw new BpmnError("MSOWorkflowException")

-			} else if (errorResponse != null && errorResponse instanceof WorkflowException) {

-				// Not sure the variables with the associated prefix are still used

-				execution.setVariable(prefix + "ErrorResponse", errorResponse.getErrorMessage())

-				execution.setVariable(prefix + "ResponseCode", errorResponse.getErrorCode())

-				taskProcessor.logDebug("Sub Vnf flow Error WorkflowException " + prefix + "ErrorResponse" + " - " +

-					errorResponse.getErrorMessage(), isDebugLogEnabled)

-				// this is the important part to ensure we hit the Fallout Handler

-				throw new BpmnError("MSOWorkflowException")

-			} else if (errorResponse != null && errorResponse instanceof WorkflowException) {

-				// Not sure the variables with the associated prefix are still used

-				execution.setVariable(prefix + "ErrorResponse", errorResponse.getErrorMessage())

-				execution.setVariable(prefix + "ResponseCode", errorResponse.getErrorCode())

-				taskProcessor.logDebug("Sub Vnf flow Error WorkflowException " + prefix + "ErrorResponse" + " - " +

-					errorResponse.getErrorMessage(), isDebugLogEnabled)

-				// this is the important part to ensure we hit the Fallout Handler

-				throw new BpmnError("MSOWorkflowException")

-			}

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			taskProcessor.logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, 'Internal Error- Unable to validate VNF Response ' + e.getMessage())

-		}

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.logger.MessageEnum
+import org.onap.so.logger.MsoLogger
+
+
+
+class VnfAdapterUtils {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterUtils.class);
+
+
+	private AbstractServiceTaskProcessor taskProcessor
+
+	public VnfAdapterUtils(AbstractServiceTaskProcessor taskProcessor) {
+		this.taskProcessor = taskProcessor
+	}
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	public void validateVnfResponse(DelegateExecution execution, String responseVar, String responseCodeVar, String errorResponseVar) {
+		def method = getClass().getSimpleName() + '.validateVnfResponse(' +
+			'execution=' + execution.getId() +
+			', responseVar=' + responseVar +
+			', responseCodeVar=' + responseCodeVar +
+			', errorResponseVar=' + errorResponseVar +
+			')'
+		msoLogger.trace('Entered ' + method)
+
+		try {
+			def prefix = execution.getVariable('prefix')
+
+			def response = execution.getVariable(responseVar)
+			def responseCode = execution.getVariable(responseCodeVar)
+			def errorResponse = execution.getVariable(errorResponseVar)
+
+			// The following if statement never appears to be true as any VNF Adapter error seems to be stored in 'errorResponse'.
+			// Also, the value is stored as a WorkflowException object, not a String. Added the else if to provide the proper
+			// functionality but leaving the original code in case it is hit under some circumstances.
+			if (response.contains("WorkflowException")) {
+				execution.setVariable(prefix + "ErrorResponse", response)
+				//execution.setVariable(prefix + "ResponseCode", responseCode)
+				msoLogger.debug(" Sub Vnf flow Error WorkflowException Response - " + "\n" + response)
+				throw new BpmnError("MSOWorkflowException")
+			} else if (errorResponse != null && errorResponse instanceof WorkflowException) {
+				// Not sure the variables with the associated prefix are still used
+				execution.setVariable(prefix + "ErrorResponse", errorResponse.getErrorMessage())
+				execution.setVariable(prefix + "ResponseCode", errorResponse.getErrorCode())
+				msoLogger.debug("Sub Vnf flow Error WorkflowException " + prefix + "ErrorResponse" + " - " + errorResponse.getErrorMessage())
+				// this is the important part to ensure we hit the Fallout Handler
+				throw new BpmnError("MSOWorkflowException")
+			} else if (errorResponse != null && errorResponse instanceof WorkflowException) {
+				// Not sure the variables with the associated prefix are still used
+				execution.setVariable(prefix + "ErrorResponse", errorResponse.getErrorMessage())
+				execution.setVariable(prefix + "ResponseCode", errorResponse.getErrorCode())
+				msoLogger.debug("Sub Vnf flow Error WorkflowException " + prefix + "ErrorResponse" + " - " + errorResponse.getErrorMessage())
+				// this is the important part to ensure we hit the Fallout Handler
+				throw new BpmnError("MSOWorkflowException")
+			}
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 5000, 'Internal Error- Unable to validate VNF Response ' + e.getMessage())
+		}
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy
deleted file mode 100644
index 8d9defdb86..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteService.groovy
+++ /dev/null
@@ -1,309 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import static org.apache.commons.lang3.StringUtils.*

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-/**

- * This class supports the GenericDeleteService Sub Flow.

- * This Generic sub flow can be used by any flow for the

- * goal of deleting a Service-Instance or Service-Subscription.

- * The calling flow must set the GENDS_type variable as "service-instance"

- * or "service-subscription".

- *

- * If the resource-version is not provided by the calling flow

- * then this sub flow will query the service-instance or

- * service-subscription, prior to deleting it, in order to

- * obtain this resource version.  Upon successful completion of

- * this sub flow the GENDS_SuccessIndicator will be true.  A

- * MSOWorkflowException will be thrown if an error occurs within this flow.

- *

- * Please map variables to the corresponding variable names

- * below.

- *

- * Note - if this sub flow receives a Not Found (404) response

- * from AAI at any time this will be considered an acceptable

- * response.

- *

- *

- * Variable Mapping Below

- *

- * In Mapping Variables:

- *   For Service-Instance:

- *     @param - GENDS_serviceInstanceId

- *     @param - GENDS_serviceType

- *     @param - GENDS_globalCustomerId

- *     @param - GENDS_type

- *     @param (Optional) - GENDS_resourceVersion

- *

- *   For Service-Subscription:

- *     @param - GENDS_serviceType

- *     @param - GENDS_globalCustomerId

- *     @param - GENDS_type

- *     @param (Optional) - GENDS_resourceVersion

- *

- *

- * Out Mapping Variables:

- *    @param - GENDS_FoundIndicator

- *    @param - WorkflowException

- *

- *

- */

-class GenericDeleteService extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENDS_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * determines if the resource version was provided

-	 *

-	 * @param - execution

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteService PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENDS_resourceVersionProvidedFlag", true)

-		execution.setVariable("GENDS_SuccessIndicator", false)

-		execution.setVariable("GENDS_FoundIndicator", false)

-

-		try{

-			// Get Variables

-			String globalCustomerId = execution.getVariable("GENDS_globalCustomerId")

-			String serviceInstanceId = execution.getVariable("GENDS_serviceInstanceId")

-			String serviceType = execution.getVariable("GENDS_serviceType")

-			String type = execution.getVariable("GENDS_type")

-

-			if(type != null){

-				utils.log("DEBUG", "Incoming GENDS_type is: " + type, isDebugEnabled)

-				if(isBlank(globalCustomerId) || isBlank(serviceType)){

-					utils.log("DEBUG", "Incoming Required Variable is null!", isDebugEnabled)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")

-				}else{

-					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-					utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

-					if(type.equalsIgnoreCase("service-instance")){

-						if(isBlank(serviceInstanceId)){

-							utils.log("DEBUG", "Incoming Required Variable is null!", isDebugEnabled)

-							exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")

-						}else{

-							utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-							utils.log("DEBUG", "Preparing Delete Service-Instance Process", isDebugEnabled)

-						}

-					}else if(type.equalsIgnoreCase("service-subscription")){

-						utils.log("DEBUG", "Preparing Delete Service-Subscription Process", isDebugEnabled)

-					}else{

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")

-					}

-				}

-

-				String resourceVersion = execution.getVariable('GENDS_resourceVersion')

-				if(isBlank(resourceVersion)){

-					utils.log("DEBUG", "Service Instance Resource Version is NOT Provided", isDebugEnabled)

-					execution.setVariable("GENDS_resourceVersionProvidedFlag", false)

-				}else{

-					utils.log("DEBUG", "Incoming SI Resource Version is: " + resourceVersion, isDebugEnabled)

-				}

-

-			}else{

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENDS_type is null. Variable is Required.")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericDeleteService PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericDeleteService PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericDeleteService PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a GET call to AAI for the service instance

-	 * or service-subscription so that the objects's resource-version

-	 * can be obtained.

-	 *

-	 * @param - execution

-	 */

-	public void getServiceResourceVersion(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteService GetServiceResourceVersion Process*** ", isDebugEnabled)

-		try {

-			String serviceType = execution.getVariable("GENDS_serviceType")

-			utils.log("DEBUG", " Incoming GENDS_serviceType is: " + serviceType, isDebugEnabled)

-			String globalCustomerId = execution.getVariable("GENDS_globalCustomerId")

-			utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-			String type = execution.getVariable("GENDS_type")

-			String serviceEndpoint = ""

-

-			if(type.equalsIgnoreCase("service-instance")){

-				String serviceInstanceId = execution.getVariable("GENDS_serviceInstanceId")

-				utils.log("DEBUG", " Incoming GENDS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-				serviceEndpoint = UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")

-

-			}else if(type.equalsIgnoreCase("service-subscription")){

-				serviceEndpoint = UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")

-			}

-

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-

-			String serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + serviceEndpoint

-

-			execution.setVariable("GENDS_serviceAaiPath", serviceAaiPath)

-			utils.log("DEBUG", "GET Service Instance AAI Path is: " + "\n" + serviceAaiPath, isDebugEnabled)

-			utils.logAudit("GenericDeleteService GET AAI Path: " + serviceAaiPath)

-			

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, serviceAaiPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENDS_getServiceResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("GET Service Instance response code: " + responseCode)

-			

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			aaiResponse = aaiResponse.replaceAll("&", "&amp;")

-			execution.setVariable("GENDS_getServiceResponse", aaiResponse)

-

-			utils.logAudit("GET Service Instance response : " + aaiResponse)

-			//Process Response

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET Service Received a Good Response: \n" + aaiResponse, isDebugEnabled)

-				execution.setVariable("GENDS_SuccessIndicator", true)

-				execution.setVariable("GENDS_FoundIndicator", true)

-				String resourceVersion = utils.getNodeText1(aaiResponse, "resource-version")

-				execution.setVariable("GENDS_resourceVersion", resourceVersion)

-				utils.log("DEBUG", type + " Resource Version is: " + resourceVersion, isDebugEnabled)

-

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Service Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENDS_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") // for junits

-			}

-			else{

-				utils.log("DEBUG", "  GET Service Received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericDeleteService GetServiceResourceVersion method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetServiceResourceVersion")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericDeleteService GetServiceResourceVersion Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a DELETE call to AAI for the provided

-	 * service-instance or service-subscription.

-	 *

-	 * @param - execution

-	 */

-	public void deleteServiceObject(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteService DeleteServiceObject Process*** ", isDebugEnabled)

-		try {

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String type = execution.getVariable("GENDS_type")

-			String serviceAaiPath = execution.getVariable("GENDS_serviceAaiPath")

-			String serviceEndpoint = ""

-

-			if(isEmpty(serviceAaiPath)){

-				String serviceType = execution.getVariable("GENDS_serviceType")

-				utils.log("DEBUG", " Incoming GENDS_serviceType is: " + serviceType, isDebugEnabled)

-				String globalCustomerId = execution.getVariable("GENDS_globalCustomerId")

-				utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

-				if(type.equalsIgnoreCase("service-instance")){

-					String serviceInstanceId = execution.getVariable("GENDS_serviceInstanceId")

-					utils.log("DEBUG", " Incoming GENDS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

-					serviceEndpoint = UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")

-

-				}else if(type.equalsIgnoreCase("service-subscription")){

-					serviceEndpoint = UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8")

-				}

-

-				String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-				String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

-				logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-

-				serviceAaiPath = "${aai_endpoint}${aai_uri}/"  + serviceEndpoint

-			}

-

-			String resourceVersion = execution.getVariable("GENDS_resourceVersion")

-			utils.log("DEBUG", "Incoming Resource Version is: " + resourceVersion, isDebugEnabled)

-			if(resourceVersion !=null){

-				serviceAaiPath = serviceAaiPath +'?resource-version=' + UriUtils.encode(resourceVersion,"UTF-8")

-			}

-

-			execution.setVariable("GENDS_deleteServiceAaiPath", serviceAaiPath)

-			utils.log("DEBUG", "DELETE Service AAI Path is: " + "\n" + serviceAaiPath, isDebugEnabled)

-			utils.logAudit("DELETE Service AAI Path: " + serviceAaiPath)

-			

-			APIResponse response = aaiUriUtil.executeAAIDeleteCall(execution, serviceAaiPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENDS_deleteServiceResponseCode", responseCode)

-			utils.log("DEBUG", "  DELETE Service response code is: " + responseCode, isDebugEnabled)

-			utils.logAudit("DELETE Service Response Code: " + responseCode)

-

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENDS_deleteServiceResponse", aaiResponse)

-			utils.logAudit("DELETE Service Response: " + aaiResponse)

-			

-			//Process Response

-			if(responseCode == 200 || responseCode == 204){

-				utils.log("DEBUG", "  DELETE Service Received a Good Response", isDebugEnabled)

-				execution.setVariable("GENDS_FoundIndicator", true)

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "  DELETE Service Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENDS_FoundIndicator", false)

-			}else{

-				utils.log("DEBUG", "DELETE Service Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericDeleteService DeleteServiceObject method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Delete Service Object")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericDeleteService DeleteServiceObject Process*** ", isDebugEnabled)

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy
deleted file mode 100644
index d6a49d9f51..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import static org.apache.commons.lang3.StringUtils.*

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-

-/**

- * TODO: Support getting vnf type = vpe

- *

- * This class supports the GenericGetVnf Sub Flow.

- * This Generic sub flow can be used by any flow for accomplishing

- * the goal of getting a Vnf Object (from AAI).  The flow currently

- * supports the querying of 2 types of Vnfs, generic-vnf and vce. The

- * type must be provided by the calling flow and the type should

- * be mapped to the variable GENDV_type. The type should either be

- * "generic-vnf" or "vce".  If the Vnf Id is not provided by the calling

- * flow then this sub flow will execute the query to get the

- * Vnf using the Vnf Name. Therefore, the calling flow must provide

- * either the Vnf Id or Vnf Name.

- *

- * Upon successful completion of this sub flow the

- * GENDV_SuccessIndicator will be true and the query response payload

- * will be set to GENDV_vnf.  An MSOWorkflowException will

- * be thrown upon unsuccessful completion or if an error occurs

- * at any time during this sub flow. Please map variables

- * to the corresponding variable names below.

- *

- * Note - if this sub flow receives a Not Found (404) response

- * from AAI at any time this will be considered an acceptable

- * successful response however the GENDV_FoundIndicator

- * set to false.  This will allow the calling flow to distinguish

- * between the two success scenarios, "Success where Vnf is found"

- * and "Success where Vnf is NOT found".

- *

- *

- * Variable Mapping Below

- *

- * In Mapping Variables:

- *   @param - GENDV_vnfId

- *   @param - GENDV_type

- *   @param (Optional) - GENDV_resourceVersion

- *

- *

- * Out Mapping Variables:

- *   @param - GENDV_SuccessIndicator

- *   @param - GENDV_FoundIndicator

- *   @param - WorkflowException

- *

- *

- */

-class GenericDeleteVnf extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENDV_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * determines if the resource version was provided

-	 *

-	 * @param - execution

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteVnf PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENDV_resourceVersionProvided", true)

-		execution.setVariable("GENDV_SuccessIndicator", false)

-		execution.setVariable("GENDV_FoundIndicator", false)

-

-		try{

-			// Get Variables

-			String vnfId = execution.getVariable("GENDV_vnfId")

-			String type = execution.getVariable("GENDV_type")

-

-			if(isBlank(type) || isBlank(vnfId)){

-				utils.log("ERROR", "Incoming Required Variable is null!", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Required Variable is Missing or Null!")

-			}else{

-				utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)

-

-				String resourceVersion = execution.getVariable("GENDV_resourceVersion")

-				if(isBlank(resourceVersion)){

-					utils.log("DEBUG", "Vnf Resource Version is NOT Provided", isDebugEnabled)

-					execution.setVariable("GENDV_resourceVersionProvided", false)

-				}else{

-					utils.log("DEBUG", "Incoming Vnf Resource Version is: " + resourceVersion, isDebugEnabled)

-				}

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericDeleteVnf PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericDeleteVnf PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericDeleteVnf PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a GET call to AAI for the Vnf

-	 * so that the Vnf's resource-version can be

-	 * obtained.

-	 *

-	 * @param - execution

-	 */

-	public void getVnfResourceVersion(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteVnf GetVnfResourceVersion Process*** ", isDebugEnabled)

-		try {

-			String vnfId = execution.getVariable("GENDV_vnfId")

-			String type = execution.getVariable("GENDV_type")

-			utils.log("DEBUG", "Type of Vnf Getting is: " + type, isDebugEnabled)

-

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-

-			//Determine Type of Vnf Querying For

-			def aai_uri = ""

-			if(type.equals("generic-vnf")){

-				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			}else if(type.equals("vce")){

-				aai_uri = aaiUriUtil.getNetworkVceUri(execution)

-			}else{

-				utils.log("DEBUG", "Invalid Incoming GENDV_type", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENDV_type")

-			}

-

-			String getVnfPath = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8")

-

-			execution.setVariable("GENDV_getVnfPath", getVnfPath)

-			utils.logAudit("Get Vnf Resource Version Url is: " + getVnfPath)

-

-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getVnfPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENDV_getVnfResponseCode", responseCode)

-			utils.log("DEBUG", "  GET Vnf response code is: " + responseCode, isDebugEnabled)

-

-			utils.logAudit("GenericDeleteVnf Get VNF Response Code: " + responseCode)

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENDV_getVnfResponse", aaiResponse)

-

-			utils.logAudit("GenericDeleteVnf Get VNF Response: " + aaiResponse)

-			//Process Response

-			if(responseCode == 200 || responseCode == 202){

-				utils.log("DEBUG", "GET Vnf Received a Good Response: \n" + aaiResponse, isDebugEnabled)

-				execution.setVariable("GENDV_FoundIndicator", true)

-				if(utils.nodeExists(aaiResponse, "resource-version")){

-					String resourceVersion = utils.getNodeText1(aaiResponse, "resource-version")

-					execution.setVariable("GENDV_resourceVersion", resourceVersion)

-					utils.log("DEBUG", "SI Resource Version is: " + resourceVersion, isDebugEnabled)

-				}else{

-					utils.log("DEBUG", "GET Vnf for Resource Version Response Does NOT Contain a resource-version", isDebugEnabled)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Unable to obtain Vnf resource-version. GET Vnf Response Does NOT Contain a resource-version")

-				}

-

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "GET Vnf Received a Not Found (404) Response", isDebugEnabled)

-				execution.setVariable("GENDV_SuccessIndicator", true)

-				execution.setVariable("WorkflowResponse", "  ") // for junits

-			}

-			else{

-				utils.log("DEBUG", "  GET Vnf Received a Bad Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericDeleteVnf GetVnfResourceVersion method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During GetVnfResourceVersion")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericDeleteVnf GetVnfResourceVersion Process*** ", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a DELETE call to AAI for the provided

-	 * Vnf.

-	 *

-	 * @param - execution

-	 */

-	public void deleteVnf(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericDeleteVnf DeleteVnf Process*** ", isDebugEnabled)

-		try {

-			String vnfId = execution.getVariable("GENDV_vnfId")

-			String type = execution.getVariable("GENDV_type")

-			utils.log("DEBUG", "Type of Vnf Getting is: " + type, isDebugEnabled)

-			String resourceVersion = execution.getVariable("GENDV_resourceVersion")

-			utils.log("DEBUG", "Incoming Vnf Resource Version is: " + resourceVersion, isDebugEnabled)

-

-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-

-			//Determine Type of Vnf Querying For

-			def aai_uri = ""

-			if(type.equals("generic-vnf")){

-				aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			}else if(type.equals("vce")){

-				aai_uri = aaiUriUtil.getNetworkVceUri(execution)

-			}else{

-				utils.log("DEBUG", "Invalid Incoming GENDV_type", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENDV_type")

-			}

-

-			String deleteVnfPath = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") +'?resource-version=' + UriUtils.encode(resourceVersion,"UTF-8")

-

-			execution.setVariable("GENDV_deleteVnfPath", deleteVnfPath)

-			utils.logAudit("Delete Vnf Url is: " + deleteVnfPath)

-

-			APIResponse response = aaiUriUtil.executeAAIDeleteCall(execution, deleteVnfPath)

-			int responseCode = response.getStatusCode()

-			execution.setVariable("GENDV_deleteVnfResponseCode", responseCode)

-			utils.log("DEBUG", "  DELETE Vnf response code is: " + responseCode, isDebugEnabled)

-

-			utils.logAudit("GenericDeleteVnf Delete VNF Response Code: " + responseCode)

-			String aaiResponse = response.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENDV_deleteVnfResponse", aaiResponse)

-

-			utils.logAudit("GenericDeleteVnf Delete VNF Response: " + aaiResponse)

-			//Process Response

-			if(responseCode == 204){

-				utils.log("DEBUG", "  DELETE Vnf Received a Good Response", isDebugEnabled)

-				execution.setVariable("GENDV_FoundIndicator", true)

-			}else if(responseCode == 404){

-				utils.log("DEBUG", "  DELETE Vnf Received a Not Found (404) Response", isDebugEnabled)

-			}else if(responseCode == 412){

-				utils.log("DEBUG", "DELETE Vnf Received a Resource Version Mismatch Error: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 412, "Delete Vnf Received a resource-version Mismatch Error Response from AAI")

-			}else{

-				utils.log("DEBUG", "DELETE Vnf Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error encountered within GenericDeleteVnf DeleteVnf method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Delete Vnf")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericDeleteVnf DeleteVnf Process*** ", isDebugEnabled)

-	}

-

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericNotificationService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericNotificationService.groovy
deleted file mode 100644
index 7f3b41d6ec..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericNotificationService.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openecomp.mso.bpmn.common.scripts
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.delegate.DelegateExecution
-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 java.text.SimpleDateFormat
-
-public class GenericNotificationService  extends AbstractServiceTaskProcessor {	
-	
-	
-
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	
-	public void preProcessRequest (DelegateExecution execution) {
-		
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutVnf.groovy
deleted file mode 100644
index e814950b94..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutVnf.groovy
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.scripts

-

-import static org.apache.commons.lang3.StringUtils.*

-

-import org.apache.commons.lang3.*

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

-import org.camunda.bpm.engine.delegate.DelegateExecution

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-/**

- * TODO: Support Putting vnf type = vpe and vce

- *

- * This class supports the GenericPutVnf Sub Flow.

- * This Generic sub flow can be used by any flow for accomplishing

- * the goal of Creating/Updating(PUT) a Vnf Object (in AAI).  The flow

- * supports the Creating/Updating of 3 types of Vnfs (generic-vnf, vce, and vpe).

- * The "type" must be provided by the calling flow and this type should

- * be mapped to the variable GENPV_type. The type should either be

- * "generic-vnf", "vce", or "vpe".  In addition, the Vnf Id and

- * payload should be provided.

- *

- * Upon successful completion of this sub flow the

- * GENPV_SuccessIndicator.  An MSOWorkflowException will

- * be thrown if an error occurs at any time during this

- * sub flow. Please map input variables to the corresponding

- * variable names below.

- *

- *

- * Incoming Required Variables:

- * @param - GENPV_vnfId

- * @param - GENPV_vnfPayload

- * @param - GENPV_type

- *

- *

- * Outgoing Variables:

- * @param - GENPV_SuccessIndicator

- * @param - WorkflowException

- */

-class GenericPutVnf  extends AbstractServiceTaskProcessor{

-

-	String Prefix = "GENPV_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-	/**

-	 * This method validates the incoming variables and

-	 * generates a Vnf Id if one is not provided.

-	 *

-	 * @param - execution

-	 */

-	public void preProcessRequest(DelegateExecution execution) {

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericPutVnf PreProcessRequest Process*** ", isDebugEnabled)

-

-		execution.setVariable("GENPV_SuccessIndicator", false)

-		execution.setVariable("GENPV_FoundIndicator", false)

-

-		try{

-			// Get Variables

-			String payload = execution.getVariable("GENPV_vnfPayload")

-			utils.log("DEBUG", "Incoming Vnf Payload is: " + payload, isDebugEnabled)

-			String type = execution.getVariable("GENPV_type")

-			utils.log("DEBUG", "Incoming Type of Vnf is: " + type, isDebugEnabled)

-

-			if(isBlank(payload) || isBlank(type)){

-				utils.log("ERROR", "Incoming Vnf Payload and/or Type is null. These Variables are required!", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Vnf Payload and/or Type is null. These Variables are required!")

-			}else{

-				String vnfId = execution.getVariable("GENPV_vnfId")

-				if(isBlank(vnfId)){

-					vnfId = UUID.randomUUID().toString()

-					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)

-					execution.setVariable("GENPV_vnfId", vnfId)

-				}else{

-					utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)

-				}

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericPutVnf PreProcessRequest method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericPutVnf PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED GenericPutVnf PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	/**

-	 * This method executes a Put call to AAI to create

-	 * or update a Vnf Object using the provided payload

-	 *

-	 * @param - execution

-	 */

-	public void putVnf(DelegateExecution execution){

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

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED GenericPutVnf PutVnf Process*** ", isDebugEnabled)

-		try {

-			String vnfId = execution.getVariable("GENPV_vnfId")

-			String payload = execution.getVariable("GENPV_vnfPayload")

-			String type = execution.getVariable("GENPV_type")

-

-			AaiUtil aaiUtil = new AaiUtil(this)

-			def aai_uri = ""

-			if(type.equals("generic-vnf")){

-				aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)

-			}else if(type.equals("vce")){

-				aai_uri = aaiUtil.getNetworkVceUri(execution)

-			}else if(type.equals("vpe")){

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "GenericPutVnf does not yet support getting type of vnf = vpe")

-			}else{

-				utils.log("DEBUG", "Invalid Incoming GENGV_type", isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Invalid Incoming GENPV_type")

-			}

-			utils.log("DEBUG", "Using AAI Uri: " + aai_uri, isDebugEnabled)

-

-			String path = "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8")

-			utils.log("DEBUG", "PUT Vnf Endpoint is: " + path, isDebugEnabled)

-

-			String putVnfAAIPath = execution.getVariable("URN_aai_endpoint") + path

-			execution.setVariable("GENPV_putVnfAAIPath", putVnfAAIPath)

-			utils.logAudit("PUT Vnf Url is: " + putVnfAAIPath)

-

-			APIResponse apiResponse = aaiUtil.executeAAIPutCall(execution, putVnfAAIPath, payload)

-			int responseCode = apiResponse.getStatusCode()

-			execution.setVariable("GENPV_putVnfResponseCode", responseCode)

-			utils.logAudit("AAI Response Code: " + responseCode)

-			String aaiResponse = apiResponse.getResponseBodyAsString()

-			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENPV_putVnfResponse", aaiResponse)

-			utils.logAudit("AAI Response: " + aaiResponse)

-

-			if(responseCode == 200 || responseCode == 201){

-				utils.log("DEBUG", "PUT Vnf Received a Good Response Code.", isDebugEnabled)

-			}else{

-				utils.log("DEBUG", "PUT Vnf Received a Bad Response Code. Response Code is: " + responseCode, isDebugEnabled)

-				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("ERROR", " Error encountered within GenericPutVnf PutVnf method!" + e, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During PutVnf")

-		}

-		utils.log("DEBUG", " *** COMPLETED GenericPutVnf PutVnf Process*** ", isDebugEnabled)

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
deleted file mode 100644
index baebf794d5..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.openecomp.mso.bpmn.common.scripts

-

-import org.apache.commons.lang3.StringUtils;

-

-class GenericUtils extends StringUtils{

-

-	@Override

-	public static boolean isBlank(final CharSequence cs) {

-		int strLen;

-		if (cs == null || (strLen = cs.length()) == 0 || cs.equals("null"))  {

-			return true;

-		}

-		for (int i = 0; i < strLen; i++) {

-			if (!Character.isWhitespace(cs.charAt(i))) {

-				return false;

-			}

-		}

-		return true;

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy
deleted file mode 100755
index 0fdd790137..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.scripts
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil
-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
-import org.openecomp.mso.bpmn.core.domain.InventoryType
-import org.openecomp.mso.bpmn.core.domain.Resource
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition
-import org.openecomp.mso.bpmn.core.domain.Subscriber
-import org.openecomp.mso.bpmn.core.domain.VnfResource
-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.AbstractServiceTaskProcessor
-
-import org.json.JSONArray
-import org.json.JSONObject
-
-import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*;
-
-/**
- * This class is contains the scripts used
- * by the Homing Subflow building block. The
- * subflow attempts to home the provided
- * resources by calling sniro.
- *
- * @author cb645j
- *
- */
-class SniroHoming extends AbstractServiceTaskProcessor {
-
-    ExceptionUtil exceptionUtil = new ExceptionUtil()
-    JsonUtils jsonUtil = new JsonUtils()
-    SNIROUtils sniroUtils = new SNIROUtils(this)
-
-    /**
-     * This method validates the incoming variables.
-     * The method then prepares the sniro request
-     * and posts it to sniro's rest api.
-     *
-     * @param execution
-     *
-     * @author cb645j
-     */
-    public void callSniro(DelegateExecution execution) {
-        def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        execution.setVariable("prefix", "HOME_")
-        utils.log("DEBUG", "*** Started Homing Call Sniro ***", isDebugEnabled)
-        try {
-            execution.setVariable("rollbackData", null)
-            execution.setVariable("rolledBack", false)
-
-            String requestId = execution.getVariable("msoRequestId")
-            utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
-            String serviceInstanceId = execution.getVariable("serviceInstanceId")
-            utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
-            ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-            utils.log("DEBUG", "Incoming Service Decomposition is: " + serviceDecomposition, isDebugEnabled)
-            String subscriberInfo = execution.getVariable("subscriberInfo")
-            utils.log("DEBUG", "Incoming Subscriber Information is: " + subscriberInfo, isDebugEnabled)
-
-            if (isBlank(requestId) || isBlank(serviceInstanceId) || isBlank(serviceDecomposition.toString()) || isBlank(subscriberInfo)) {
-                exceptionUtil.buildAndThrowWorkflowException(execution, 4000, "A required input variable is missing or null")
-            } else {
-                String subId = jsonUtil.getJsonValue(subscriberInfo, "globalSubscriberId")
-                String subName = jsonUtil.getJsonValue(subscriberInfo, "subscriberName")
-                String subCommonSiteId = ""
-                if (jsonUtil.jsonElementExist(subscriberInfo, "subscriberCommonSiteId")) {
-                    subCommonSiteId = jsonUtil.getJsonValue(subscriberInfo, "subscriberCommonSiteId")
-                }
-                Subscriber subscriber = new Subscriber(subId, subName, subCommonSiteId)
-
-                String cloudConfiguration = execution.getVariable("cloudConfiguration") // TODO Currently not being used
-                String homingParameters = execution.getVariable("homingParameters")
-                // (aka. request parameters) Should be json format. TODO confirm its json format
-
-                //Authentication
-                def authHeader = ""
-                String basicAuth = execution.getVariable("URN_mso_sniro_auth")
-                String msokey = execution.getVariable("URN_mso_msoKey")
-                String basicAuthValue = utils.encrypt(basicAuth, msokey)
-                if (basicAuthValue != null) {
-                    utils.log("DEBUG", "Obtained BasicAuth username and password for SNIRO Adapter: " + basicAuthValue, isDebugEnabled)
-                    try {
-                        authHeader = utils.getBasicAuth(basicAuthValue, msokey)
-                        execution.setVariable("BasicAuthHeaderValue", authHeader)
-                    } catch (Exception ex) {
-                        utils.log("DEBUG", "Unable to encode username and password string: " + ex, isDebugEnabled)
-                        exceptionUtil.buildAndThrowWorkflowException(execution, 401, "Internal Error - Unable to encode username and password string")
-                    }
-                } else {
-                    utils.log("DEBUG", "Unable to obtain BasicAuth - BasicAuth value null", isDebugEnabled)
-                    exceptionUtil.buildAndThrowWorkflowException(execution, 401, "Internal Error - BasicAuth value null")
-                }
-
-                //Prepare Callback
-                String timeout = execution.getVariable("timeout")
-                if (isBlank(timeout)) {
-                    timeout = execution.getVariable("URN_mso_sniro_timeout");
-                    if (isBlank(timeout)) {
-                        timeout = "PT30M";
-                    }
-                }
-                utils.log("DEBUG", "Async Callback Timeout will be: " + timeout, isDebugEnabled)
-
-                execution.setVariable("timeout", timeout);
-                execution.setVariable("correlator", requestId);
-                execution.setVariable("messageType", "SNIROResponse");
-
-                //Build Request & Call Sniro
-                String sniroRequest = sniroUtils.buildRequest(execution, requestId, serviceDecomposition, subscriber, homingParameters)
-                execution.setVariable("sniroRequest", sniroRequest)
-                utils.log("DEBUG", "SNIRO Request is: " + sniroRequest, isDebugEnabled)
-
-                String endpoint = execution.getVariable("URN_mso_service_agnostic_sniro_endpoint")
-                String host = execution.getVariable("URN_mso_service_agnostic_sniro_host")
-                String url = host + endpoint
-                utils.log("DEBUG", "Posting to Sniro Url: " + url, isDebugEnabled)
-
-                logDebug("URL to be used is: " + url, isDebugEnabled)
-
-                RESTConfig config = new RESTConfig(url)
-                RESTClient client = new RESTClient(config).addAuthorizationHeader(authHeader).addHeader("Content-Type", "application/json")
-                APIResponse response = client.httpPost(sniroRequest)
-
-                int responseCode = response.getStatusCode()
-                execution.setVariable("syncResponseCode", responseCode);
-                logDebug("SNIRO sync response code is: " + responseCode, isDebugEnabled)
-                String syncResponse = response.getResponseBodyAsString()
-                execution.setVariable("syncResponse", syncResponse);
-                logDebug("SNIRO sync response is: " + syncResponse, isDebugEnabled)
-
-                utils.log("DEBUG", "*** Completed Homing Call Sniro ***", isDebugEnabled)
-            }
-        } catch (BpmnError b) {
-            throw b
-        } catch (Exception e) {
-            utils.log("DEBUG", "Error encountered within Homing CallSniro method: " + e, isDebugEnabled)
-            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in Homing CallSniro: " + e.getMessage())
-        }
-    }
-
-    /**
-     * This method processes the callback response
-     * and the contained homing solution. It sets
-     * homing solution assignment and license
-     * information to the corresponding resources
-     *
-     * @param execution
-     *
-     * @author cb645j
-     */
-    public void processHomingSolution(DelegateExecution execution) {
-        def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        utils.log("DEBUG", "*** Started Homing Process Homing Solution ***", isDebugEnabled)
-        try {
-            String response = execution.getVariable("asyncCallbackResponse")
-            utils.log("DEBUG", "Sniro Async Callback Response is: " + response, isDebugEnabled)
-            utils.logAudit("Sniro Async Callback Response is: " + response)
-
-            sniroUtils.validateCallbackResponse(execution, response)
-            String placements = jsonUtil.getJsonValue(response, "solutionInfo.placement")
-
-            ServiceDecomposition decomposition = execution.getVariable("serviceDecomposition")
-            utils.log("DEBUG", "Service Decomposition: " + decomposition, isDebugEnabled)
-
-            List<Resource> resourceList = decomposition.getServiceResources()
-            JSONArray arr = new JSONArray(placements)
-            for (int i = 0; i < arr.length(); i++) {
-                JSONObject placement = arr.getJSONObject(i)
-                String jsonServiceResourceId = placement.getString("serviceResourceId")
-                for (Resource resource : resourceList) {
-                    String serviceResourceId = resource.getResourceId()
-                    if (serviceResourceId.equalsIgnoreCase(jsonServiceResourceId)) {
-                        //match
-                        String inventoryType = placement.getString("inventoryType")
-                        resource.getHomingSolution().setInventoryType(InventoryType.valueOf(inventoryType))
-                        resource.getHomingSolution().setCloudRegionId(placement.getString("cloudRegionId"))
-                        resource.getHomingSolution().setRehome(placement.getBoolean("isRehome"))
-                        JSONArray assignmentArr = placement.getJSONArray("assignmentInfo")
-                        Map<String, String> assignmentMap = jsonUtil.entryArrayToMap(execution, assignmentArr.toString(), "variableName", "variableValue")
-                        resource.getHomingSolution().setCloudOwner(assignmentMap.get("cloudOwner"))
-                        resource.getHomingSolution().setAicClli(assignmentMap.get("aicClli"))
-                        resource.getHomingSolution().setAicVersion(assignmentMap.get("aicVersion"))
-                        if (inventoryType.equalsIgnoreCase("service")) {
-                            VnfResource vnf = new VnfResource()
-                            vnf.setVnfHostname(assignmentMap.get("vnfHostName"))
-                            resource.getHomingSolution().setVnf(vnf)
-                            resource.getHomingSolution().setServiceInstanceId(placement.getString("serviceInstanceId"))
-                        }
-                    }
-                }
-            }
-            if (JsonUtils.jsonElementExist(response, "solutionInfo.licenseInfo")) {
-                String licenseInfo = jsonUtil.getJsonValue(response, "solutionInfo.licenseInfo")
-                JSONArray licenseArr = new JSONArray(licenseInfo)
-                for (int l = 0; l < licenseArr.length(); l++) {
-                    JSONObject license = licenseArr.getJSONObject(l)
-                    String jsonServiceResourceId = license.getString("serviceResourceId")
-                    for (Resource resource : resourceList) {
-                        String serviceResourceId = resource.getResourceId()
-                        if (serviceResourceId.equalsIgnoreCase(jsonServiceResourceId)) {
-                            //match
-                            String jsonEntitlementPoolList = jsonUtil.getJsonValue(license.toString(), "entitlementPoolList")
-                            List<String> entitlementPoolList = jsonUtil.StringArrayToList(execution, jsonEntitlementPoolList)
-                            resource.getHomingSolution().getLicense().setEntitlementPoolList(entitlementPoolList)
-
-                            String jsonLicenseKeyGroupList = jsonUtil.getJsonValue(license.toString(), "licenseKeyGroupList")
-                            List<String> licenseKeyGroupList = jsonUtil.StringArrayToList(execution, jsonLicenseKeyGroupList)
-                            resource.getHomingSolution().getLicense().setLicenseKeyGroupList(licenseKeyGroupList)
-                        }
-                    }
-                }
-            }
-            execution.setVariable("serviceDecomposition", decomposition)
-            execution.setVariable("homingSolution", placements) //TODO - can be removed as output variable
-
-            utils.log("DEBUG", "*** Completed Homing Process Homing Solution ***", isDebugEnabled)
-        } catch (BpmnError b) {
-            throw b
-        } catch (Exception e) {
-            utils.log("DEBUG", "Error encountered within Homing ProcessHomingSolution method: " + e, isDebugEnabled)
-            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in Homing ProcessHomingSolution")
-        }
-    }
-
-    /**
-     * This method logs the start of DHVCreateService
-     * to make debugging easier.
-     *
-     * @param - execution
-     * @author cb645j
-     */
-    public String logStart(DelegateExecution execution) {
-        def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        String requestId = execution.getVariable("testReqId")
-        if (isBlank(requestId)) {
-            requestId = execution.getVariable("msoRequestId")
-        }
-        execution.setVariable("DHVCS_requestId", requestId)
-        utils.log("DEBUG", "***** STARTED Homing Subflow for request: " + requestId + " *****", "true")
-        utils.log("DEBUG", "****** Homing Subflow Global Debug Enabled: " + isDebugEnabled + " *****", "true")
-        utils.logAudit("***** STARTED Homing Subflow for request: " + requestId + " *****")
-    }
-
-    /**
-     * Auto-generated method stub
-     */
-    public void preProcessRequest(DelegateExecution execution) {}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/PayloadClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/PayloadClient.java
index 5a0de6f5e9..d3ddc60d3e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/PayloadClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/PayloadClient.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,26 +18,36 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload;
-
-import org.openecomp.mso.bpmn.appc.payload.beans.*;
+package org.onap.so.bpmn.appc.payload;
 
 import java.util.Optional;
 
+import org.onap.so.bpmn.appc.payload.beans.ConfigurationParametersHealthCheck;
+import org.onap.so.bpmn.appc.payload.beans.ConfigurationParametersQuiesce;
+import org.onap.so.bpmn.appc.payload.beans.ConfigurationParametersResumeTraffic;
+import org.onap.so.bpmn.appc.payload.beans.ConfigurationParametersUpgrade;
+import org.onap.so.bpmn.appc.payload.beans.HealthCheckAction;
+import org.onap.so.bpmn.appc.payload.beans.QuiesceTrafficAction;
+import org.onap.so.bpmn.appc.payload.beans.RequestParametersHealthCheck;
+import org.onap.so.bpmn.appc.payload.beans.ResumeTrafficAction;
+import org.onap.so.bpmn.appc.payload.beans.SnapshotAction;
+import org.onap.so.bpmn.appc.payload.beans.StartStopAction;
+import org.onap.so.bpmn.appc.payload.beans.UpgradeAction;
+import org.onap.so.bpmn.core.json.JsonUtils;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class PayloadClient {
 
 	protected static ObjectMapper mapper = new ObjectMapper();
 	
+	private PayloadClient() {}
 	
 	public static Optional<String> upgradeFormat(Optional<String> payload, String vnfName) throws JsonProcessingException{
 			UpgradeAction payloadResult = new UpgradeAction();
 			ConfigurationParametersUpgrade configParams = new ConfigurationParametersUpgrade();
-		    String payloadString = payload.get();
+		    String payloadString = payload.isPresent() ? payload.get() : "";
 			String existingSoftware = JsonUtils.getJsonValue(payloadString, "existing-software-version");
 			String newSoftware = JsonUtils.getJsonValue(payloadString, "new-software-version");
 			configParams.setExistingSoftwareVersion(existingSoftware);
@@ -58,7 +68,7 @@ public class PayloadClient {
 	public static Optional<String> quiesceTrafficFormat(Optional<String> payload, String vnfName) throws JsonProcessingException{
 			QuiesceTrafficAction payloadResult = new QuiesceTrafficAction();
 			ConfigurationParametersQuiesce configParams = new ConfigurationParametersQuiesce();
-			String payloadString = payload.get();
+			String payloadString = payload.isPresent() ? payload.get() : "";
 			String operationsTimeout = JsonUtils.getJsonValue(payloadString, "operations-timeout");
 			configParams.setOperationsTimeout(operationsTimeout);
 			configParams.setVnfName(vnfName);
@@ -68,7 +78,7 @@ public class PayloadClient {
 	
 	public static Optional<String> startStopFormat(String aicIdentity) throws JsonProcessingException{
 			StartStopAction payloadResult = new StartStopAction();
-			payloadResult.setAICIdentity(aicIdentity);
+			payloadResult.setAicIdentity(aicIdentity);
 			return Optional.of(mapper.writeValueAsString(payloadResult));
 	}
 	
@@ -90,20 +100,4 @@ public class PayloadClient {
 			return Optional.of(mapper.writeValueAsString(payloadResult));
 	}
 	
-	/*public Optional<String>  verifySnapshotFormat(Optional<String> payload) throws Exception, JsonProcessingException, JsonMappingException{
-		final Snapshot check = mapper.readValue(payload.get(), Snapshot.class);
-		return Optional.of(mapper.writeValueAsString(check));
-	}
-	
-	public Optional<String> verifyUpgradeFormat(Optional<String> payload) throws Exception, JsonProcessingException, JsonMappingException{
-		final UpdateCheck check = mapper.readValue(payload.get(), UpdateCheck.class);
-		return Optional.of(mapper.writeValueAsString(check));
-	}
-	
-	public Optional<String> verifyQuiesceTrafficFormat(Optional<String> payload)throws Exception, JsonProcessingException, JsonMappingException{
-		final QuiesceTraffic check = mapper.readValue(payload.get(), QuiesceTraffic.class);
-		return Optional.of(mapper.writeValueAsString(check));
-	}
-	*/
-	
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigModifyAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigModifyAction.java
index 09ad2bf439..3c39a8d66c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigModifyAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigModifyAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,42 +18,42 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"request-parameters",

-"configuration-parameters"

-})

-public class ConfigModifyAction {

-

-@JsonProperty("request-parameters")

-private RequestParametersConfigModify requestParameters;

-@JsonProperty("configuration-parameters")

-private ConfigurationParametersConfigModify configurationParameters;

-

-@JsonProperty("request-parameters")

-public RequestParametersConfigModify getRequestParameters() {

-return requestParameters;

-}

-

-@JsonProperty("request-parameters")

-public void setRequestParameters(RequestParametersConfigModify requestParameters) {

-this.requestParameters = requestParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public ConfigurationParametersConfigModify getConfigurationParameters() {

-return configurationParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public void setConfigurationParameters(ConfigurationParametersConfigModify configurationParameters) {

-this.configurationParameters = configurationParameters;

-}

-

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"request-parameters",
+"configuration-parameters"
+})
+public class ConfigModifyAction {
+
+@JsonProperty("request-parameters")
+private RequestParametersConfigModify requestParameters;
+@JsonProperty("configuration-parameters")
+private ConfigurationParametersConfigModify configurationParameters;
+
+@JsonProperty("request-parameters")
+public RequestParametersConfigModify getRequestParameters() {
+return requestParameters;
+}
+
+@JsonProperty("request-parameters")
+public void setRequestParameters(RequestParametersConfigModify requestParameters) {
+this.requestParameters = requestParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public ConfigurationParametersConfigModify getConfigurationParameters() {
+return configurationParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public void setConfigurationParameters(ConfigurationParametersConfigModify configurationParameters) {
+this.configurationParameters = configurationParameters;
+}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersConfigModify.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersConfigModify.java
index dda7856168..c88169bb80 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersConfigModify.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersConfigModify.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,41 +18,41 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"node0_hostname",

-"node0_backup_router_address"

-})

-public class ConfigurationParametersConfigModify {

-

-@JsonProperty("node0_hostname")

-private String node0Hostname;

-@JsonProperty("node0_backup_router_address")

-private String node0BackupRouterAddress;

-

-@JsonProperty("node0_hostname")

-public String getNode0Hostname() {

-return node0Hostname;

-}

-

-@JsonProperty("node0_hostname")

-public void setNode0Hostname(String node0Hostname) {

-this.node0Hostname = node0Hostname;

-}

-

-@JsonProperty("node0_backup_router_address")

-public String getNode0BackupRouterAddress() {

-return node0BackupRouterAddress;

-}

-

-@JsonProperty("node0_backup_router_address")

-public void setNode0BackupRouterAddress(String node0BackupRouterAddress) {

-this.node0BackupRouterAddress = node0BackupRouterAddress;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"node0_hostname",
+"node0_backup_router_address"
+})
+public class ConfigurationParametersConfigModify {
+
+@JsonProperty("node0_hostname")
+private String node0Hostname;
+@JsonProperty("node0_backup_router_address")
+private String node0BackupRouterAddress;
+
+@JsonProperty("node0_hostname")
+public String getNode0Hostname() {
+return node0Hostname;
+}
+
+@JsonProperty("node0_hostname")
+public void setNode0Hostname(String node0Hostname) {
+this.node0Hostname = node0Hostname;
+}
+
+@JsonProperty("node0_backup_router_address")
+public String getNode0BackupRouterAddress() {
+return node0BackupRouterAddress;
+}
+
+@JsonProperty("node0_backup_router_address")
+public void setNode0BackupRouterAddress(String node0BackupRouterAddress) {
+this.node0BackupRouterAddress = node0BackupRouterAddress;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersHealthCheck.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersHealthCheck.java
index 000b1bdbf7..a8964f3bc5 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersHealthCheck.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersHealthCheck.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;
+package org.onap.so.bpmn.appc.payload.beans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -42,4 +42,4 @@ return vnfName;
 public void setVnfName(String vnfName) {
 this.vnfName = vnfName;
 }
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersQuiesce.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersQuiesce.java
index e354d9ca2e..878a136962 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersQuiesce.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersQuiesce.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,42 +18,42 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"vnf_name",

-"operations_timeout"

-})

-public class ConfigurationParametersQuiesce {

-

-@JsonProperty("vnf_name")

-private String vnfName;

-@JsonProperty("operations_timeout")

-private String operationsTimeout;

-

-@JsonProperty("vnf_name")

-public String getVnfName() {

-return vnfName;

-}

-

-@JsonProperty("vnf_name")

-public void setVnfName(String vnfName) {

-this.vnfName = vnfName;

-}

-

-@JsonProperty("operations_timeout")

-public String getOperationsTimeout() {

-return operationsTimeout;

-}

-

-@JsonProperty("operations_timeout")

-public void setOperationsTimeout(String operationsTimeout) {

-this.operationsTimeout = operationsTimeout;

-}

-

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"vnf_name",
+"operations_timeout"
+})
+public class ConfigurationParametersQuiesce {
+
+@JsonProperty("vnf_name")
+private String vnfName;
+@JsonProperty("operations_timeout")
+private String operationsTimeout;
+
+@JsonProperty("vnf_name")
+public String getVnfName() {
+return vnfName;
+}
+
+@JsonProperty("vnf_name")
+public void setVnfName(String vnfName) {
+this.vnfName = vnfName;
+}
+
+@JsonProperty("operations_timeout")
+public String getOperationsTimeout() {
+return operationsTimeout;
+}
+
+@JsonProperty("operations_timeout")
+public void setOperationsTimeout(String operationsTimeout) {
+this.operationsTimeout = operationsTimeout;
+}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersResumeTraffic.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersResumeTraffic.java
index 820618e828..6b5e59f2e0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersResumeTraffic.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersResumeTraffic.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"vnf_name"

-})

-public class ConfigurationParametersResumeTraffic {

-

-@JsonProperty("vnf_name")

-private String vnfName;

-

-@JsonProperty("vnf_name")

-public String getVnfName() {

-return vnfName;

-}

-

-@JsonProperty("vnf_name")

-public void setVnfName(String vnfName) {

-this.vnfName = vnfName;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"vnf_name"
+})
+public class ConfigurationParametersResumeTraffic {
+
+@JsonProperty("vnf_name")
+private String vnfName;
+
+@JsonProperty("vnf_name")
+public String getVnfName() {
+return vnfName;
+}
+
+@JsonProperty("vnf_name")
+public void setVnfName(String vnfName) {
+this.vnfName = vnfName;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersUpgrade.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersUpgrade.java
index 0845e7c37d..ff51b06dbe 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ConfigurationParametersUpgrade.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigurationParametersUpgrade.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,54 +18,54 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"vnf_name",

-"existing-software-version",

-"new-software-version"

-})

-public class ConfigurationParametersUpgrade {

-@JsonProperty("vnf_name")

-private String vnfName;

-@JsonProperty("existing-software-version")

-private String existingSoftwareVersion;

-@JsonProperty("new-software-version")

-private String newSoftwareVersion;

-

-@JsonProperty("vnf_name")

-public String getVnfName() {

-return vnfName;

-}

-

-@JsonProperty("vnf_name")

-public void setVnfName(String vnfName) {

-this.vnfName = vnfName;

-}

-

-@JsonProperty("existing-software-version")

-public String getExistingSoftwareVersion() {

-return existingSoftwareVersion;

-}

-

-@JsonProperty("existing-software-version")

-public void setExistingSoftwareVersion(String existingSoftwareVersion) {

-this.existingSoftwareVersion = existingSoftwareVersion;

-}

-

-@JsonProperty("new-software-version")

-public String getNewSoftwareVersion() {

-return newSoftwareVersion;

-}

-

-@JsonProperty("new-software-version")

-public void setNewSoftwareVersion(String newSoftwareVersion) {

-this.newSoftwareVersion = newSoftwareVersion;

-}

-

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"vnf_name",
+"existing-software-version",
+"new-software-version"
+})
+public class ConfigurationParametersUpgrade {
+@JsonProperty("vnf_name")
+private String vnfName;
+@JsonProperty("existing-software-version")
+private String existingSoftwareVersion;
+@JsonProperty("new-software-version")
+private String newSoftwareVersion;
+
+@JsonProperty("vnf_name")
+public String getVnfName() {
+return vnfName;
+}
+
+@JsonProperty("vnf_name")
+public void setVnfName(String vnfName) {
+this.vnfName = vnfName;
+}
+
+@JsonProperty("existing-software-version")
+public String getExistingSoftwareVersion() {
+return existingSoftwareVersion;
+}
+
+@JsonProperty("existing-software-version")
+public void setExistingSoftwareVersion(String existingSoftwareVersion) {
+this.existingSoftwareVersion = existingSoftwareVersion;
+}
+
+@JsonProperty("new-software-version")
+public String getNewSoftwareVersion() {
+return newSoftwareVersion;
+}
+
+@JsonProperty("new-software-version")
+public void setNewSoftwareVersion(String newSoftwareVersion) {
+this.newSoftwareVersion = newSoftwareVersion;
+}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/HealthCheckAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/HealthCheckAction.java
index 53408f1ead..4d194650c4 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/HealthCheckAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/HealthCheckAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,42 +18,41 @@
  * ============LICENSE_END=========================================================
  */
 
-

-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"request-parameters",

-"configuration-parameters"

-})

-public class HealthCheckAction {

-

-@JsonProperty("request-parameters")

-private RequestParametersHealthCheck requestParameters;

-@JsonProperty("configuration-parameters")

-private ConfigurationParametersHealthCheck configurationParameters;

-

-@JsonProperty("request-parameters")

-public RequestParametersHealthCheck getRequestParameters() {

-return requestParameters;

-}

-

-@JsonProperty("request-parameters")

-public void setRequestParameters(RequestParametersHealthCheck requestParameters) {

-this.requestParameters = requestParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public ConfigurationParametersHealthCheck getConfigurationParameters() {

-return configurationParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public void setConfigurationParameters(ConfigurationParametersHealthCheck configurationParameters) {

-this.configurationParameters = configurationParameters;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"request-parameters",
+"configuration-parameters"
+})
+public class HealthCheckAction {
+
+@JsonProperty("request-parameters")
+private RequestParametersHealthCheck requestParameters;
+@JsonProperty("configuration-parameters")
+private ConfigurationParametersHealthCheck configurationParameters;
+
+@JsonProperty("request-parameters")
+public RequestParametersHealthCheck getRequestParameters() {
+return requestParameters;
+}
+
+@JsonProperty("request-parameters")
+public void setRequestParameters(RequestParametersHealthCheck requestParameters) {
+this.requestParameters = requestParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public ConfigurationParametersHealthCheck getConfigurationParameters() {
+return configurationParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public void setConfigurationParameters(ConfigurationParametersHealthCheck configurationParameters) {
+this.configurationParameters = configurationParameters;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/QuiesceTrafficAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/QuiesceTrafficAction.java
index cbe8ee0b91..0b16c6ca90 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/QuiesceTrafficAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/QuiesceTrafficAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,29 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-

-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"configuration-parameters"

-})

-public class QuiesceTrafficAction {

-

-@JsonProperty("configuration-parameters")

-private ConfigurationParametersQuiesce configurationParameters;

-

-@JsonProperty("configuration-parameters")

-public ConfigurationParametersQuiesce getConfigurationParameters() {

-return configurationParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public void setConfigurationParameters(ConfigurationParametersQuiesce configurationParameters) {

-this.configurationParameters = configurationParameters;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"configuration-parameters"
+})
+public class QuiesceTrafficAction {
+
+@JsonProperty("configuration-parameters")
+private ConfigurationParametersQuiesce configurationParameters;
+
+@JsonProperty("configuration-parameters")
+public ConfigurationParametersQuiesce getConfigurationParameters() {
+return configurationParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public void setConfigurationParameters(ConfigurationParametersQuiesce configurationParameters) {
+this.configurationParameters = configurationParameters;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/RequestParametersConfigModify.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersConfigModify.java
index 41b3314e7c..58c9234d60 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/RequestParametersConfigModify.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersConfigModify.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,29 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"vnf-host-ip-address"

-})

-public class RequestParametersConfigModify {

-

-@JsonProperty("vnf-host-ip-address")

-private String vnfHostIpAddress;

-

-@JsonProperty("vnf-host-ip-address")

-public String getVnfHostIpAddress() {

-return vnfHostIpAddress;

-}

-

-@JsonProperty("vnf-host-ip-address")

-public void setVnfHostIpAddress(String vnfHostIpAddress) {

-this.vnfHostIpAddress = vnfHostIpAddress;

-}

-

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"vnf-host-ip-address"
+})
+public class RequestParametersConfigModify {
+
+@JsonProperty("vnf-host-ip-address")
+private String vnfHostIpAddress;
+
+@JsonProperty("vnf-host-ip-address")
+public String getVnfHostIpAddress() {
+return vnfHostIpAddress;
+}
+
+@JsonProperty("vnf-host-ip-address")
+public void setVnfHostIpAddress(String vnfHostIpAddress) {
+this.vnfHostIpAddress = vnfHostIpAddress;
+}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/RequestParametersHealthCheck.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersHealthCheck.java
index dcdb4fb71e..ca87ad6d15 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/RequestParametersHealthCheck.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersHealthCheck.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;
+package org.onap.so.bpmn.appc.payload.beans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -44,4 +44,4 @@ public void setVnfName(String vnfName) {
 this.vnfName = vnfName;
 }
 
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ResumeTrafficAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ResumeTrafficAction.java
index de4fe25cd7..b642a376fe 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/ResumeTrafficAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ResumeTrafficAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"configuration-parameters"

-})

-public class ResumeTrafficAction {

-

-@JsonProperty("configuration-parameters")

-private ConfigurationParametersResumeTraffic configurationParameters;

-

-@JsonProperty("configuration-parameters")

-public ConfigurationParametersResumeTraffic getConfigurationParameters() {

-return configurationParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public void setConfigurationParameters(ConfigurationParametersResumeTraffic configurationParameters) {

-this.configurationParameters = configurationParameters;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"configuration-parameters"
+})
+public class ResumeTrafficAction {
+
+@JsonProperty("configuration-parameters")
+private ConfigurationParametersResumeTraffic configurationParameters;
+
+@JsonProperty("configuration-parameters")
+public ConfigurationParametersResumeTraffic getConfigurationParameters() {
+return configurationParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public void setConfigurationParameters(ConfigurationParametersResumeTraffic configurationParameters) {
+this.configurationParameters = configurationParameters;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/SnapshotAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/SnapshotAction.java
index bb74798300..0499e5d6c0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/SnapshotAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/SnapshotAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,42 +18,42 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"vm-id",

-"identity-url"

-})

-public class SnapshotAction {

-

-@JsonProperty("vm-id")

-private String vmId;

-@JsonProperty("identity-url")

-private String identityUrl;

-

-@JsonProperty("vm-id")

-public String getVmId() {

-return vmId;

-}

-

-@JsonProperty("vm-id")

-public void setVmId(String vmId) {

-this.vmId = vmId;

-}

-

-@JsonProperty("identity-url")

-public String getIdentityUrl() {

-return identityUrl;

-}

-

-@JsonProperty("identity-url")

-public void setIdentityUrl(String identityUrl) {

-this.identityUrl = identityUrl;

-}

-

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"vm-id",
+"identity-url"
+})
+public class SnapshotAction {
+
+@JsonProperty("vm-id")
+private String vmId;
+@JsonProperty("identity-url")
+private String identityUrl;
+
+@JsonProperty("vm-id")
+public String getVmId() {
+return vmId;
+}
+
+@JsonProperty("vm-id")
+public void setVmId(String vmId) {
+this.vmId = vmId;
+}
+
+@JsonProperty("identity-url")
+public String getIdentityUrl() {
+return identityUrl;
+}
+
+@JsonProperty("identity-url")
+public void setIdentityUrl(String identityUrl) {
+this.identityUrl = identityUrl;
+}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/StartStopAction.java
index 988c282076..f2b5b905a5 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/StartStopAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,38 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-	" AICIdentity "

-})

-public class StartStopAction {

-

-	@JsonProperty(" AICIdentity ")

-	private String aICIdentity;

-

-	@JsonProperty(" AICIdentity ")

-	public String getAICIdentity() {

-		return aICIdentity;

-	}

-

-	@JsonProperty(" AICIdentity ")

-	public void setAICIdentity(String aICIdentity) {

-		this.aICIdentity = aICIdentity;

-	}
+package org.onap.so.bpmn.appc.payload.beans;
 
-	public String getaICIdentity() {
-		return aICIdentity;
-	}
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+	" AICIdentity "
+})
+public class StartStopAction {
 
-	public void setaICIdentity(String aICIdentity) {
-		this.aICIdentity = aICIdentity;
+	@JsonProperty(" AICIdentity ")
+	private String aicIdentity;
+
+	@JsonProperty(" AICIdentity ")
+	public String getAicIdentity() {
+		return aicIdentity;
 	}
 
-

-}
\ No newline at end of file
+	@JsonProperty(" AICIdentity ")
+	public void setAicIdentity(String aicIdentity) {
+		this.aicIdentity = aicIdentity;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/UpgradeAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/UpgradeAction.java
index 3486fa73ba..3e07f328ce 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/UpgradeAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/UpgradeAction.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.appc.payload.beans;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonPropertyOrder;

-

-@JsonInclude(JsonInclude.Include.NON_NULL)

-@JsonPropertyOrder({

-"configuration-parameters"

-})

-public class UpgradeAction {

-

-@JsonProperty("configuration-parameters")

-private ConfigurationParametersUpgrade configurationParameters;

-

-@JsonProperty("configuration-parameters")

-public ConfigurationParametersUpgrade getConfigurationParameters() {

-return configurationParameters;

-}

-

-@JsonProperty("configuration-parameters")

-public void setConfigurationParameters(ConfigurationParametersUpgrade configurationParameters) {

-this.configurationParameters = configurationParameters;

-}

-}
\ No newline at end of file
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"configuration-parameters"
+})
+public class UpgradeAction {
+
+@JsonProperty("configuration-parameters")
+private ConfigurationParametersUpgrade configurationParameters;
+
+@JsonProperty("configuration-parameters")
+public ConfigurationParametersUpgrade getConfigurationParameters() {
+return configurationParameters;
+}
+
+@JsonProperty("configuration-parameters")
+public void setConfigurationParameters(ConfigurationParametersUpgrade configurationParameters) {
+this.configurationParameters = configurationParameters;
+}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/ActionPreProcessor.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/ActionPreProcessor.java
new file mode 100644
index 0000000000..19ab520c6c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/ActionPreProcessor.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+
+/**
+ * interface to be extended by the classes, where pre processing is required
+ */
+public interface ActionPreProcessor {
+
+    /**
+     * method to bind and return the action
+     *
+     * @return
+     */
+    String getAction();
+
+    /**
+     * method to preform certain pre processing task before BB execution
+     *
+     * @param execution
+     * @return
+     */
+    boolean process(DelegateExecution execution);
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java
index 64e5adc091..a2f6637b5b 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java
@@ -1,46 +1,37 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import javax.ws.rs.ApplicationPath;

-import javax.ws.rs.core.Application;

-

-@ApplicationPath("/")

-public class WorkflowResourceApplication extends Application {

-    private Set<Object> singletons = new HashSet<>();

-    private Set<Class<?>> classes = new HashSet<>();

-

-    public WorkflowResourceApplication() {

-    }

-

-    @Override

-    public Set<Class<?>> getClasses() {

-        return classes;

-    }

-

-    @Override

-    public Set<Object> getSingletons() {

-        return singletons;

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.onap.so.bpmn.common.exceptions.RequiredExecutionVariableExeception;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+
+public interface BuildingBlockExecution {
+
+	public GeneralBuildingBlock getGeneralBuildingBlock();
+	public <T> T getVariable(String key);
+	public <T> T getRequiredVariable(String key) throws RequiredExecutionVariableExeception;
+	public void setVariable(String key, Serializable value);
+	public Map<ResourceKey, String> getLookupMap();
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/Status.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DefaultToShortClassNameBeanNameGenerator.java
index e9750a2b3b..5a126ffe7d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/Status.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DefaultToShortClassNameBeanNameGenerator.java
@@ -18,23 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.adapter.requests.db.entities;
+package org.onap.so.bpmn.common;
 
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.AnnotationBeanNameGenerator;
+import org.springframework.util.ClassUtils;
 
-/*
- * Enum for Status values returned by API Handler to Tail-F
-*/
-public enum Status {
-                    PENDING, INPROGRESS, COMPLETED, FAILED, TIMEOUT;
-
-    public boolean isFinished () {
-        switch (this) {
-            case COMPLETED:
-            case FAILED:
-            case TIMEOUT:
-                return true;
-            default:
-                return false;
-        }
-    }
+public class DefaultToShortClassNameBeanNameGenerator extends AnnotationBeanNameGenerator {
+	
+	@Override
+	protected String buildDefaultBeanName(BeanDefinition definition) {
+		return ClassUtils.getShortName(definition.getBeanClassName());
+	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java
new file mode 100644
index 0000000000..ef564c6af4
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java
@@ -0,0 +1,118 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.bpmn.common.exceptions.MalformedBuildingBlockInputException;
+import org.onap.so.bpmn.common.exceptions.MissingBuildingBlockInputException;
+import org.onap.so.bpmn.common.exceptions.RequiredExecutionVariableExeception;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+
+public class DelegateExecutionImpl implements BuildingBlockExecution, Serializable {
+
+	private final Map<String, Serializable> seedMap;
+	private transient DelegateExecution execution;
+	private static final String INVALID_INPUT_MISSING = "Expected variable of \"%s\" not found in execution";
+	private static final String INVALID_INPUT_CLASS_CAST = "Expected variable of \"%s\" was the wrong object type in the execution";
+
+	private static final String MISSING_MSG = "Execution variable \"gBBInput\" cannot be null when executing building blocks";
+	private static final String MALFORMED_MSG = "Execution variable \"gBBInput\" must contain an element of type GeneralBuildingBlock";
+	
+	public DelegateExecutionImpl(Map<String, Serializable> seedMap) {
+		this.seedMap = seedMap;
+	}
+	
+	public DelegateExecutionImpl(DelegateExecution execution) {
+		this.seedMap = new HashMap<>();
+		execution.getVariables().forEach((key, value) -> {
+			if (value instanceof Serializable) {
+				seedMap.put(key, (Serializable)value);
+			}
+		});
+		/* must occur for junit tests to work */
+		this.execution = execution;
+	}
+	@Override
+	public GeneralBuildingBlock getGeneralBuildingBlock() {
+		try {
+			GeneralBuildingBlock generalBuildingBlock =  (GeneralBuildingBlock) execution.getVariable("gBBInput");
+			
+			if (generalBuildingBlock == null) {
+				throw new MissingBuildingBlockInputException(MISSING_MSG);
+			}
+			
+			return generalBuildingBlock;
+		} catch (ClassCastException e) {
+			throw new MalformedBuildingBlockInputException(MALFORMED_MSG, e);
+		}
+	}
+
+	@Override
+	public <T> T getVariable(String key) {
+		return this.get(key);
+	}
+
+	@Override
+	public <T> T getRequiredVariable(String key) throws RequiredExecutionVariableExeception {
+		final T result;
+	
+		result = this.get(key);
+		if (result == null) {
+			throw new RequiredExecutionVariableExeception(String.format(INVALID_INPUT_MISSING, key));
+
+		}
+		return result;
+	}
+
+	@Override
+	public void setVariable(String key, Serializable value) {
+		this.execution.setVariable(key, value);
+	}
+	
+	@Override
+	public Map<ResourceKey, String> getLookupMap() {
+		return this.get("lookupKeyMap");
+	}
+	
+	public DelegateExecution getDelegateExecution() {
+		return this.execution;
+	}
+	
+	public void setDelegateExecution(DelegateExecution execution) {
+		this.execution = execution;
+		this.seedMap.forEach((key, value) -> {
+			if (!execution.hasVariable(key)) {
+				execution.setVariable(key, value);
+			}
+		});
+	}
+	
+	protected <T> T get(String key) {
+		final Object value = this.execution.getVariable(key);
+	
+		return (T)value;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectExecution.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectExecution.java
new file mode 100644
index 0000000000..56b059ec16
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectExecution.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.springframework.stereotype.Component;
+
+@Component
+public class InjectExecution {
+
+	public DelegateExecutionImpl execute (DelegateExecution execution, DelegateExecutionImpl impl) {
+		
+		impl.setDelegateExecution(execution);
+		return impl;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java
new file mode 100644
index 0000000000..f1c2c8dda6
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import org.onap.so.client.aai.AAICommonObjectMapperProvider;
+import org.onap.so.client.aai.AAIResourcesClient;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.sdno.SDNOValidator;
+import org.onap.so.client.sdno.SDNOValidatorImpl;
+import org.springframework.stereotype.Component;
+
+/*
+ * This object is intended to be a helper for acquiring classes
+ * that cannot be acquired via Spring injection.
+ * 
+ * It brings two benefits:
+ * 
+ * 1) Enforces acquisition of a new copy of these classes every
+ *    time to help with picking up properties files changes, etc
+ * 2) The classes are exposed in such a way that mocks of them can
+ *    still be injected when testing the Spring objects that use
+ *    them 
+ */
+
+@Component
+public class InjectionHelper {
+	public AAIResourcesClient getAaiClient() {
+		return new AAIResourcesClient();
+	}
+	
+	public SDNOValidator getSdnoValidator() {
+		return new SDNOValidatorImpl();
+	}
+
+	public AAICommonObjectMapperProvider getAaiCommonObjectMapperProvider() {
+		return new AAICommonObjectMapperProvider();
+	}
+	
+	public AAIResultWrapper getAaiResultWrapper(String json) {
+		return new AAIResultWrapper(json);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/SpringContextHelper.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/SpringContextHelper.java
new file mode 100644
index 0000000000..edc544d939
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/SpringContextHelper.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextHelper implements ApplicationContextAware {
+
+	private static ApplicationContext context;
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		context = applicationContext;
+	}
+
+	public static ApplicationContext getAppContext() {
+		return context;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MalformedBuildingBlockInputException.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MalformedBuildingBlockInputException.java
new file mode 100644
index 0000000000..1da989bfb7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MalformedBuildingBlockInputException.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.exceptions;
+
+public class MalformedBuildingBlockInputException extends RuntimeException {
+	private static final long serialVersionUID = -9168146273898271648L;
+
+	public MalformedBuildingBlockInputException() {
+		super();
+	}
+
+	public MalformedBuildingBlockInputException(String message) {
+		super(message);
+	}
+
+	public MalformedBuildingBlockInputException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public MalformedBuildingBlockInputException(Throwable cause) {
+		super(cause);
+	}
+
+	protected MalformedBuildingBlockInputException(String message, Throwable cause,
+			boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MissingBuildingBlockInputException.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MissingBuildingBlockInputException.java
new file mode 100644
index 0000000000..5ad28a5ba0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/MissingBuildingBlockInputException.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.exceptions;
+
+public class MissingBuildingBlockInputException extends RuntimeException {
+	private static final long serialVersionUID = 7098084383189271401L;
+
+	public MissingBuildingBlockInputException() {
+		super();
+	}
+
+	public MissingBuildingBlockInputException(String message) {
+		super(message);
+	}
+
+	public MissingBuildingBlockInputException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public MissingBuildingBlockInputException(Throwable cause) {
+		super(cause);
+	}
+
+	protected MissingBuildingBlockInputException(String message, Throwable cause,
+			boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/RequestsDbAdapterClientTest.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/RequiredExecutionVariableExeception.java
index 2c35151895..8c77bb445e 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/RequestsDbAdapterClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/exceptions/RequiredExecutionVariableExeception.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,33 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.adapter.requests.db;

-

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class RequestsDbAdapterClientTest {

-

-	@BeforeClass

-	public static void setUp() {

-		System.setProperty("mso.config.path", "src/test/resources");

-	}

-	

-	@Test

-	public void updateInfraRequestTest()

-	{

-		

-	}

-	

-	@Test

-	public void getInfraRequestTest()

-	{

-		

-	}

-	

-	@Test

-	public void getSiteStatusTest()

-	{

-		

-	}

-}

+package org.onap.so.bpmn.common.exceptions;
+
+public class RequiredExecutionVariableExeception extends Exception {
+
+	private static final long serialVersionUID = 5135274986874563746L;
+
+	public RequiredExecutionVariableExeception(String message) {
+		super(message);
+	}
+	
+	public RequiredExecutionVariableExeception(String message, Throwable t) {
+		super(message, t);
+	}
+	
+	public RequiredExecutionVariableExeception(Throwable t) {
+		super(t);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnIntegerParam.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnIntegerParam.java
index 033c6876bd..80479e19c0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnIntegerParam.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnIntegerParam.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.recipe;
+package org.onap.so.bpmn.common.recipe;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnParam.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnParam.java
index 4b58b51560..01285cd5ec 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnParam.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnParam.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.recipe;
+package org.onap.so.bpmn.common.recipe;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnRestClient.java
index 6a17d600cb..bbaebb64dc 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/BpmnRestClient.java
@@ -1,224 +1,205 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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.common.recipe;

-

-import java.io.IOException;

-import java.security.GeneralSecurityException;

-

-import javax.xml.bind.DatatypeConverter;

-

-import org.apache.http.HttpResponse;

-import org.apache.http.client.ClientProtocolException;

-import org.apache.http.client.HttpClient;

-import org.apache.http.client.config.RequestConfig;

-import org.apache.http.client.methods.HttpPost;

-import org.apache.http.entity.StringEntity;

-import org.apache.http.impl.client.HttpClientBuilder;

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-import org.openecomp.mso.properties.MsoJavaProperties;

-import org.openecomp.mso.properties.MsoPropertiesFactory;

-import org.openecomp.mso.utils.CryptoUtils;

-

-/**

- * Support to call resource recipes from the BPMN workflow.

- * Such as call resource recipe in service workflow.

- * <br>

- * <p>

- * </p>

- * 

- * @author

- * @version ONAP Beijing Release 2018-02-27

- */

-public class BpmnRestClient {

-

-    public static final String DEFAULT_BPEL_AUTH = "admin:admin";

-

-    public static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f";

-

-    public static final String CONTENT_TYPE_JSON = "application/json";

-

-    public static final String CAMUNDA_AUTH = "camundaAuth";

-

-    private static final  String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA";

-

-    private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();

-

-    private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-

-    private static boolean noProperties = true;

-    

-    //because for NS it will take a long time the time out of the resouce will be 2 hours.

-    private static final String DEFAULT_TIME_OUT = "7200";

-

-    public synchronized static MsoJavaProperties loadMsoProperties() {

-        MsoJavaProperties msoProperties;

-        try {

-            msoProperties = msoPropertiesFactory.getMsoJavaProperties(MSO_PROP_APIHANDLER_INFRA);

-        } catch(Exception e) {

-            msoLogger.error(MessageEnum.APIH_LOAD_PROPERTIES_FAIL, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.DataError,

-                    "Exception when loading MSO Properties", e);

-            return null;

-        }

-

-        if(msoProperties != null && msoProperties.size() > 0) {

-            noProperties = false;

-            msoLogger.info(MessageEnum.APIH_PROPERTY_LOAD_SUC, "", "");

-            return msoProperties;

-        } else {

-            msoLogger.error(MessageEnum.APIH_NO_PROPERTIES, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.DataError,

-                    "No MSO APIH_INFRA Properties found");

-            return null;

-        }

-    }

-

-    public synchronized static final boolean getNoPropertiesState() {

-        return noProperties;

-    }

-

-    /**

-     * post the recipe Uri

-     * <br>

-     * 

-     * @param recipeUri The request recipe uri

-     * @param requestId the request id

-     * @param recipeTimeout The recipe time out

-     * @param requestAction The request action

-     * @param serviceInstanceId The service instance id

-     * @param serviceType The service Type

-     * @param requestDetails The request Details, these information is from runtime

-     * @param recipeParamXsd The recipe params, its from recipe design

-     * @return The response of the recipe.

-     * @throws ClientProtocolException

-     * @throws IOException

-     * @since ONAP Beijing Release

-     */

-    public static HttpResponse post(String recipeUri, String requestId, int recipeTimeout, String requestAction, String serviceInstanceId, String serviceType,

-            String requestDetails, String recipeParamXsd) throws ClientProtocolException, IOException {

-

-        HttpClient client = HttpClientBuilder.create().build();

-

-        HttpPost post = new HttpPost(recipeUri);

-        MsoJavaProperties props = loadMsoProperties();

-        msoLogger.debug("call the bpmn,  url:" + recipeUri);

-        String jsonReq = wrapResourceRequest(requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, requestDetails, recipeParamXsd);

-

-        StringEntity input = new StringEntity(jsonReq);

-        input.setContentType(CONTENT_TYPE_JSON);

-        String encryptedCredentials;

-        if(props != null) {

-            encryptedCredentials = props.getProperty(CAMUNDA_AUTH, null);

-            if(encryptedCredentials != null) {

-                String userCredentials = getEncryptedPropValue(encryptedCredentials, DEFAULT_BPEL_AUTH, ENCRYPTION_KEY);

-                if(userCredentials != null) {

-                    post.addHeader("Authorization", "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));

-                }

-            }

-        }

-        post.setEntity(input);

-        return client.execute(post);

-    }

-

-    /**

-     * prepare the resource recipe bpmn request.

-     * <br>

-     * 

-     * @param requestId

-     * @param recipeTimeout

-     * @param requestAction

-     * @param serviceInstanceId

-     * @param serviceType

-     * @param requestDetails

-     * @param recipeParams

-     * @return

-     * @since ONAP Beijing Release

-     */

-    private static String wrapResourceRequest(String requestId, int recipeTimeout, String requestAction, String serviceInstanceId, String serviceType,

-            String requestDetails, String recipeParams) {

-        String jsonReq = null;

-        if(requestId == null) {

-            requestId = "";

-        }

-        if(requestAction == null) {

-            requestAction = "";

-        }

-        if(serviceInstanceId == null) {

-            serviceInstanceId = "";

-        }

-

-        if(requestDetails == null) {

-            requestDetails = "";

-        }

-

-        try {

-            ResourceRecipeRequest recipeRequest = new ResourceRecipeRequest();

-            BpmnParam resourceInput = new BpmnParam();

-            BpmnParam host = new BpmnParam();

-            BpmnParam requestIdInput = new BpmnParam();

-            BpmnParam requestActionInput = new BpmnParam();

-            BpmnParam serviceInstanceIdInput = new BpmnParam();

-            BpmnParam serviceTypeInput = new BpmnParam();

-            BpmnParam recipeParamsInput = new BpmnParam();

-            BpmnParam recipeTimeoutInput = new BpmnParam();

-            recipeTimeoutInput.setValue(DEFAULT_TIME_OUT);

-            // host.setValue(parseURL());

-            requestIdInput.setValue(requestId);

-            requestActionInput.setValue(requestAction);

-            serviceInstanceIdInput.setValue(serviceInstanceId);

-            serviceTypeInput.setValue(serviceType);

-            recipeParamsInput.setValue(recipeParams);

-            resourceInput.setValue(requestDetails);

-            recipeRequest.setHost(host);

-            recipeRequest.setRequestId(requestIdInput);

-            recipeRequest.setRequestAction(requestActionInput);

-            recipeRequest.setServiceInstanceId(serviceInstanceIdInput);

-            recipeRequest.setServiceType(serviceTypeInput);

-            recipeRequest.setRecipeParams(recipeParamsInput);

-            recipeRequest.setResourceInput(resourceInput);

-            recipeRequest.setRecipeTimeout(recipeTimeoutInput);

-            jsonReq = recipeRequest.toString();

-            msoLogger.debug("request body is " + jsonReq);

-        } catch(Exception e) {

-            msoLogger.error(MessageEnum.APIH_WARP_REQUEST, "Camunda", "wrapVIDRequest", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH Warp request",

-                    e);

-        }

-        return jsonReq;

-    }

-

-    /**

-     * <br>

-     * 

-     * @param prop

-     * @param defaultValue

-     * @param encryptionKey

-     * @return

-     * @since ONAP Beijing Release

-     */

-    protected static String getEncryptedPropValue(String prop, String defaultValue, String encryptionKey) {

-        try {

-            return CryptoUtils.decrypt(prop, encryptionKey);

-        } catch(GeneralSecurityException e) {

-            msoLogger.debug("Security exception", e);

-        }

-        return defaultValue;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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.onap.so.bpmn.common.recipe;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import javax.xml.bind.DatatypeConverter;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.CryptoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Support to call resource recipes from the BPMN workflow.
+ * Such as call resource recipe in service workflow.
+ * <br>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version ONAP Beijing Release 2018-02-27
+ */
+@Component
+public class BpmnRestClient {
+
+    public static final String DEFAULT_BPEL_AUTH = "admin:admin";
+
+    public static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
+
+    public static final String CONTENT_TYPE_JSON = "application/json";
+
+    public static final String CAMUNDA_AUTH = "camundaAuth";
+
+    private static final  String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA";
+    @Autowired
+    private UrnPropertiesReader urnPropertiesReader;
+    private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, BpmnRestClient.class);
+
+    private static boolean noProperties = true;
+
+    //because for NS it will take a long time the time out of the resouce will be 2 hours.
+    private static final String DEFAULT_TIME_OUT = "7200";
+
+    public synchronized final boolean getNoPropertiesState() {
+        return noProperties;
+    }
+
+    /**
+     * post the recipe Uri
+     * <br>
+     * 
+     * @param recipeUri The request recipe uri
+     * @param requestId the request id
+     * @param recipeTimeout The recipe time out
+     * @param requestAction The request action
+     * @param serviceInstanceId The service instance id
+     * @param serviceType The service Type
+     * @param requestDetails The request Details, these information is from runtime
+     * @param recipeParamXsd The recipe params, its from recipe design
+     * @return The response of the recipe.
+     * @throws ClientProtocolException
+     * @throws IOException
+     * @since ONAP Beijing Release
+     */
+    public HttpResponse post(String recipeUri, String requestId, int recipeTimeout, String requestAction, String serviceInstanceId, String serviceType,
+            String requestDetails, String recipeParamXsd) throws ClientProtocolException, IOException {
+
+        HttpClient client = HttpClientBuilder.create().build();
+
+        HttpPost post = new HttpPost(recipeUri);
+        RequestConfig requestConfig =
+                RequestConfig.custom().setSocketTimeout(recipeTimeout).setConnectTimeout(recipeTimeout).setConnectionRequestTimeout(recipeTimeout).build();
+        post.setConfig(requestConfig);
+        msoLogger.debug("call the bpmn,  url:" + recipeUri);
+        String jsonReq = wrapResourceRequest(requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, requestDetails, recipeParamXsd);
+
+        StringEntity input = new StringEntity(jsonReq);
+        input.setContentType(CONTENT_TYPE_JSON);
+        String encryptedCredentials;
+        encryptedCredentials = urnPropertiesReader.getVariable(CAMUNDA_AUTH);
+        if(encryptedCredentials != null) {
+            String userCredentials = getEncryptedPropValue(encryptedCredentials, DEFAULT_BPEL_AUTH, ENCRYPTION_KEY);
+            if(userCredentials != null) {
+                post.addHeader("Authorization", "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));
+            }
+        }
+        
+        post.setEntity(input);
+        return client.execute(post);
+    }
+
+    /**
+     * prepare the resource recipe bpmn request.
+     * <br>
+     * 
+     * @param requestId
+     * @param recipeTimeout
+     * @param requestAction
+     * @param serviceInstanceId
+     * @param serviceType
+     * @param requestDetails
+     * @param recipeParams
+     * @return
+     * @since ONAP Beijing Release
+     */
+    private String wrapResourceRequest(String requestId, int recipeTimeout, String requestAction, String serviceInstanceId, String serviceType,
+            String requestDetails, String recipeParams) {
+        String jsonReq = null;
+        if(requestId == null) {
+            requestId = "";
+        }
+        if(requestAction == null) {
+            requestAction = "";
+        }
+        if(serviceInstanceId == null) {
+            serviceInstanceId = "";
+        }
+
+        if(requestDetails == null) {
+            requestDetails = "";
+        }
+
+        try {
+            ResourceRecipeRequest recipeRequest = new ResourceRecipeRequest();
+            BpmnParam resourceInput = new BpmnParam();
+            BpmnParam host = new BpmnParam();
+            BpmnParam requestIdInput = new BpmnParam();
+            BpmnParam requestActionInput = new BpmnParam();
+            BpmnParam serviceInstanceIdInput = new BpmnParam();
+            BpmnParam serviceTypeInput = new BpmnParam();
+            BpmnParam recipeParamsInput = new BpmnParam();
+            BpmnIntegerParam recipeTimeoutInput = new BpmnIntegerParam();
+            recipeTimeoutInput.setValue(recipeTimeout);
+            // host.setValue(parseURL());
+            requestIdInput.setValue(requestId);
+            requestActionInput.setValue(requestAction);
+            serviceInstanceIdInput.setValue(serviceInstanceId);
+            serviceTypeInput.setValue(serviceType);
+            recipeParamsInput.setValue(recipeParams);
+            resourceInput.setValue(requestDetails);
+            recipeRequest.setHost(host);
+            recipeRequest.setRequestId(requestIdInput);
+            recipeRequest.setRequestAction(requestActionInput);
+            recipeRequest.setServiceInstanceId(serviceInstanceIdInput);
+            recipeRequest.setServiceType(serviceTypeInput);
+            recipeRequest.setRecipeParams(recipeParamsInput);
+            recipeRequest.setResourceInput(resourceInput);
+            recipeRequest.setRecipeTimeout(recipeTimeoutInput);
+            jsonReq = recipeRequest.toString();
+            msoLogger.trace("request body is " + jsonReq);
+        } catch(Exception e) {
+            msoLogger.error(MessageEnum.APIH_WARP_REQUEST, "Camunda", "wrapVIDRequest", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH Warp request",
+                    e);
+        }
+        return jsonReq;
+    }
+
+    /**
+     * <br>
+     * 
+     * @param prop
+     * @param defaultValue
+     * @param encryptionKey
+     * @return
+     * @since ONAP Beijing Release
+     */
+    protected String getEncryptedPropValue(String prop, String defaultValue, String encryptionKey) {
+        try {
+            return CryptoUtils.decrypt(prop, encryptionKey);
+        } catch(GeneralSecurityException e) {
+            msoLogger.debug("Security exception", e);
+        }
+        return defaultValue;
+    }
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/ResourceInput.java
index 42547faa1e..4c345babc8 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/ResourceInput.java
@@ -17,10 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.recipe;
+package org.onap.so.bpmn.common.recipe;
 
-import org.openecomp.mso.bpmn.core.domain.ModelInfo;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.bpmn.core.domain.ModelInfo;
+import org.onap.so.logger.MsoLogger;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -42,7 +42,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 @JsonRootName("variables")
 public class ResourceInput {
 
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
+	private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL, ResourceInput.class);
 	
     @JsonProperty("resourceInstanceName")
     private String resourceInstanceName;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/ResourceRecipeRequest.java
index 3ec43e10ae..4c6edfa099 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/recipe/ResourceRecipeRequest.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.recipe;
+package org.onap.so.bpmn.common.recipe;
 
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.logger.MsoLogger;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 @JsonRootName("variables")
 public class ResourceRecipeRequest {
 
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
+	private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL, ResourceRecipeRequest.class);
 	
     @JsonProperty("resourceInput")
     private BpmnParam resourceInput;
@@ -61,7 +61,7 @@ public class ResourceRecipeRequest {
     private BpmnParam recipeParams;
 
     @JsonProperty("mso-service-request-timeout")
-    private BpmnParam recipeTimeout;
+    private BpmnIntegerParam recipeTimeout;
     
     @JsonProperty("resourceInput")
     public BpmnParam getResourceInput() {
@@ -134,12 +134,12 @@ public class ResourceRecipeRequest {
     }
 
     @JsonProperty("mso-service-request-timeout")
-    public BpmnParam getRecipeTimeout() {
+    public BpmnIntegerParam getRecipeTimeout() {
 		return recipeTimeout;
 	}
     
     @JsonProperty("mso-service-request-timeout")
-	public void setRecipeTimeout(BpmnParam recipeTimeout) {
+	public void setRecipeTimeout(BpmnIntegerParam recipeTimeout) {
 		this.recipeTimeout = recipeTimeout;
 	}
 
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
index d1ec60a1cd..ca2da772fb 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.resource;
+package org.onap.so.bpmn.common.resource;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,11 +30,9 @@ import java.util.Map;
 import java.util.Optional;
 
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
 
 import org.camunda.bpm.engine.runtime.Execution;
-import org.jboss.resteasy.client.jaxrs.ResteasyClient;
-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
-import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
@@ -42,10 +40,12 @@ import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.onap.sdc.toscaparser.api.Property;
 import org.onap.sdc.toscaparser.api.functions.GetInput;
 import org.onap.sdc.toscaparser.api.parameters.Input;
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.bpmn.core.json.JsonUtils;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -59,9 +59,8 @@ public class ResourceRequestBuilder {
 
     public static String SERVICE_URL_TOSCA_CSAR = "/v3/serviceToscaCsar?serviceModelUuid=";
 
-    private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
+    private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA, ResourceRequestBuilder.class);
 
-   
     static JsonUtils jsonUtil = new JsonUtils();
 
         /**
@@ -72,7 +71,7 @@ public class ResourceRequestBuilder {
      *     "requestInputs":{K,V}
      * }
      * <br>
-     *
+     * 
      * @param execution Execution context
      * @param serviceUuid The service template uuid
      * @param resourceCustomizationUuid The resource customization uuid
@@ -82,7 +81,7 @@ public class ResourceRequestBuilder {
      */
     @SuppressWarnings("unchecked")
     public static String buildResourceRequestParameters(Execution execution, String serviceUuid, String resourceCustomizationUuid, String serviceParameters) {
-        List<String> resourceList = jsonUtil.StringArrayToList(execution, (String)JsonUtils.getJsonValue(serviceParameters, "resources")); 
+        List<String> resourceList = jsonUtil.StringArrayToList(execution, (String)JsonUtils.getJsonValue(serviceParameters, "resources"));
         //Get the right location str for resource. default is an empty array.
         String locationConstraints ="[]";
         String resourceInputsFromUui = "";
@@ -127,6 +126,7 @@ public class ResourceRequestBuilder {
             throws SdcToscaParserException {
 
         Map<String, Object> resouceRequest = new HashMap<>();
+
         String csarpath = null;
         try {
             csarpath = getCsarFromUuid(serviceUuid);
@@ -183,12 +183,10 @@ public class ResourceRequestBuilder {
     }
 
     private static String getCsarFromUuid(String uuid) throws Exception {
-
-        ResteasyClient client = new ResteasyClientBuilder().build();
-		Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
-		String catalogEndPoint = properties.get("mso.catalog.db.endpoint");
-		ResteasyWebTarget target = client.target(catalogEndPoint + SERVICE_URL_TOSCA_CSAR + uuid);
-        Response response = target.request().get();
+		String catalogEndPoint = UrnPropertiesReader.getVariable("mso.catalog.db.endpoint");
+    	HttpClient client = new HttpClient(UriBuilder.fromUri(catalogEndPoint + SERVICE_URL_TOSCA_CSAR + uuid).build().toURL(), "application/json", TargetEntity.CATALOG_DB);
+    	
+        Response response = client.get();
         String value = response.readEntity(String.class);
 
         HashMap<String, String> map = new Gson().fromJson(value, new TypeToken<HashMap<String, String>>() {}.getType());
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/CryptoHandler.java
index 13cff65018..093dac39c3 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/CryptoHandler.java
@@ -1,68 +1,68 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.common.util;

-import java.io.IOException;

-import java.security.GeneralSecurityException;

-import org.openecomp.mso.logger.MsoLogger;

-import java.util.Properties;

-

-public class CryptoHandler implements ICryptoHandler {

-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-

-	private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";

-	private static String msoAaiEncryptedPwd;

-

-        @Override

-	public String getMsoAaiPassword() {

-	Properties keyProp = new Properties ();

-		try {

-		keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("urn.properties"));

-			msoAaiEncryptedPwd =(String) keyProp.get ("mso.AaiEncrypted.Pwd");

-			return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);

-		} catch (GeneralSecurityException | IOException e) {

-			LOGGER.debug("GeneralSecurityException :",e);

-			return null;

-		}

-	}

-

-

-	@Override

-	public String encryptMsoPassword(String plainMsoPwd) {

-		try {

-			return CryptoUtils.encrypt(plainMsoPwd, msoKey);

-		} catch (GeneralSecurityException e) {

-			LOGGER.debug("GeneralSecurityException :",e);

-			return null;

-		}

-	}

-

-	@Override

-	public String decryptMsoPassword(String encryptedPwd) {

-		try {

-			return CryptoUtils.decrypt(encryptedPwd, msoKey);

-		} catch (GeneralSecurityException e) {

-			LOGGER.debug("GeneralSecurityException :",e);

-			return null;

-		}

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.onap.so.bpmn.common.util;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Properties;
+import org.onap.so.utils.CryptoUtils;
+
+import org.onap.so.logger.MsoLogger;
+
+public class CryptoHandler implements ICryptoHandler {
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CryptoHandler.class);
+	private static final String GENERAL_SECURITY_EXCEPTION_PREFIX = "GeneralSecurityException :";
+	private static final String MSO_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
+	private static final String PROPERTY_KEY = "mso.AaiEncrypted.Pwd";
+
+    @Override
+	public String getMsoAaiPassword() {
+    	Properties keyProp = new Properties ();
+		try {
+			keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("urn.properties"));
+			return CryptoUtils.decrypt((String) keyProp.get(PROPERTY_KEY), MSO_KEY);
+		} catch (GeneralSecurityException | IOException e) {
+			LOGGER.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
+			return null;
+		}
+	}
+
+
+	@Override
+	public String encryptMsoPassword(String plainMsoPwd) {
+		try {
+			return CryptoUtils.encrypt(plainMsoPwd, MSO_KEY);
+		} catch (GeneralSecurityException e) {
+			LOGGER.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
+			return null;
+		}
+	}
+
+	@Override
+	public String decryptMsoPassword(String encryptedPwd) {
+		try {
+			return CryptoUtils.decrypt(encryptedPwd, MSO_KEY);
+		} catch (GeneralSecurityException e) {
+			LOGGER.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
+			return null;
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/ICryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/ICryptoHandler.java
index acf92f5aa8..6314a849d2 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/ICryptoHandler.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/ICryptoHandler.java
@@ -1,27 +1,27 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.util;

-

-public interface ICryptoHandler {

-	public String getMsoAaiPassword();

-	public String encryptMsoPassword(String plainPwd);

-	public String decryptMsoPassword(String encryptedPwd);

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.util;
+
+public interface ICryptoHandler {
+	public String getMsoAaiPassword();
+	public String encryptMsoPassword(String plainPwd);
+	public String decryptMsoPassword(String encryptedPwd);
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowCallbackResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowCallbackResponse.java
index 25669d7625..13d2126805 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowCallbackResponse.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowCallbackResponse.java
@@ -1,52 +1,52 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-/**

- * @version 1.0

- * Workflow Response bean to generate workflow response in JSON format

- */

-public class WorkflowCallbackResponse {

-	

-	private String response;

-	private int statusCode;

-	private String message;

-	

-	public String getResponse() {

-		return response;

-	}

-	public void setResponse(String response) {

-		this.response = response;

-	}

-	public int getStatusCode() {

-		return statusCode;

-	}

-	public void setStatusCode(int statusCode) {

-		this.statusCode = statusCode;

-	}

-	public String getMessage() {

-		return message;

-	}

-	public void setMessage(String message) {

-		this.message = message;

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.workflow.context;
+
+
+/**
+ * @version 1.0
+ * Workflow Response bean to generate workflow response in JSON format
+ */
+public class WorkflowCallbackResponse {
+	
+	private String response;
+	private int statusCode;
+	private String message;
+	
+	public String getResponse() {
+		return response;
+	}
+	public void setResponse(String response) {
+		this.response = response;
+	}
+	public int getStatusCode() {
+		return statusCode;
+	}
+	public void setStatusCode(int statusCode) {
+		this.statusCode = statusCode;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowContext.java
index fc0ba44974..3ec7773791 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowContext.java
@@ -1,96 +1,98 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.concurrent.Delayed;

-import java.util.concurrent.TimeUnit;

-

-import org.jboss.resteasy.spi.AsynchronousResponse;

-

-/**

- * @version 1.0

- * Workflow context object used to send timeout response, if workflow instance does not write the response in time

- */

-public class WorkflowContext implements Delayed {

-	private final String processKey;

-	private final String requestId;

-	private final AsynchronousResponse asynchronousResponse;

-	private final long startTime;

-	private final long timeout;

-	

-	public WorkflowContext(String processKey, String requestId,

-			AsynchronousResponse asynchronousResponse, long timeout) {

-		this.processKey = processKey;

-		this.requestId = requestId;

-		this.asynchronousResponse = asynchronousResponse;

-		this.timeout = timeout;

-		this.startTime = System.currentTimeMillis();

-	}

-	

-	public String getRequestId() {

-		return requestId;

-	}

-

-	public String getProcessKey() {

-		return processKey;

-	}

-

-	public AsynchronousResponse getAsynchronousResponse() {

-		return asynchronousResponse;

-	}

-

-	public long getTimeout() {

-		return timeout;

-	}

-

-	public long getStartTime() {

-		return startTime;

-	}

-

-	/**

-	 * Required implementation by Delay queue

-	 * Returns the elapsed time for this context

-	 */

-	@Override

-	public long getDelay(TimeUnit unit) {

-		// 0 or negative means this object is considered to be expired

-		return unit.convert(startTime + timeout - System.currentTimeMillis(), unit);

-	}

-

-	/**

-	 * Required implementation by Delay queue

-	 * Compares the object to determine whether the object can be marked as expired

-	 */

-	@Override

-	public int compareTo(Delayed object) {

-		WorkflowContext that = (WorkflowContext) object;

-		long thisEndTime = startTime + timeout;

-		long thatEndTime = that.startTime + that.timeout;

-

-		if (thisEndTime < thatEndTime) {

-			return -1;

-		} else if (thisEndTime > thatEndTime) {

-			return 1;

-		} else {

-			return 0;

-		}

-	}

-}

+package org.onap.so.bpmn.common.workflow.context;
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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=========================================================
+ */
+
+
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * @version 1.0
+ * Workflow context object used to send timeout response, if workflow instance does not write the response in time
+ */
+public class WorkflowContext implements Delayed {
+	private final String processKey;
+	private final String requestId;
+
+	private final long startTime;
+	private final long timeout;
+	
+	private final WorkflowResponse workflowResponse;
+	
+	public WorkflowContext(String processKey, String requestId, long timeout, WorkflowResponse workflowResponse) {
+		this.processKey = processKey;
+		this.requestId = requestId;		
+		this.timeout = timeout;
+		this.startTime = System.currentTimeMillis(); 
+		this.workflowResponse = workflowResponse;
+	}
+	
+	public String getRequestId() {
+		return requestId;
+	}
+
+	public String getProcessKey() {
+		return processKey;
+	}
+
+
+	public long getTimeout() {
+		return timeout;
+	}
+
+	public long getStartTime() {
+		return startTime;
+	}
+	
+	public WorkflowResponse getWorkflowResponse() {
+		return workflowResponse;
+	}
+
+	/**
+	 * Required implementation by Delay queue
+	 * Returns the elapsed time for this context
+	 */
+	@Override
+	public long getDelay(TimeUnit unit) {
+		// 0 or negative means this object is considered to be expired
+		return unit.convert(startTime + timeout - System.currentTimeMillis(), unit);
+	}
+
+	/**
+	 * Required implementation by Delay queue
+	 * Compares the object to determine whether the object can be marked as expired
+	 */
+	@Override
+	public int compareTo(Delayed object) {
+		WorkflowContext that = (WorkflowContext) object;
+		long thisEndTime = startTime + timeout;
+		long thatEndTime = that.startTime + that.timeout;
+
+		if (thisEndTime < thatEndTime) {
+			return -1;
+		} else if (thisEndTime > thatEndTime) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowContextHolder.java
index 4dfae8b2a3..39c32de77d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowContextHolder.java
@@ -1,3 +1,4 @@
+package org.onap.so.bpmn.common.workflow.context;
 /*-
  * ============LICENSE_START=======================================================
  * ONAP - SO
@@ -18,29 +19,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.workflow.service;
+
 
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.TimeUnit;
 
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.spi.AsynchronousResponse;
-import org.slf4j.MDC;
-
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.stereotype.Component;
 
 /**
  * Workflow Context Holder instance which can be accessed elsewhere either in groovy scripts or Java
  * @version 1.0
  *
  */
+
+@Component
 public class WorkflowContextHolder {
 
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL,WorkflowContextHolder.class);
 	private static final String logMarker = "[WORKFLOW-CONTEXT-HOLDER]";
 	private static WorkflowContextHolder instance = null;
+	
+	
+	private long defaultContextTimeout=60000;
 
 	/**
 	 * Delay Queue which holds workflow context holder objects
@@ -97,70 +99,34 @@ public class WorkflowContextHolder {
 	 * @param callbackResponse
 	 * @return
 	 */
-	public Response processCallback(String processKey, String processInstanceId,
-			String requestId, WorkflowCallbackResponse callbackResponse) {
+	public void processCallback(String processKey, String processInstanceId,
+			String requestId, WorkflowCallbackResponse callbackResponse) {		
 		WorkflowResponse workflowResponse = new WorkflowResponse();
-		WorkflowContext workflowContext = getWorkflowContext(requestId);
-
-		if (workflowContext == null) {
-			msoLogger.debug("Unable to correlate workflow context for request id: " + requestId
-				+ ":processInstance Id:" + processInstanceId
-				+ ":process key:" + processKey);
-			workflowResponse.setMessage("Fail");
-			workflowResponse.setMessageCode(400);
-			workflowResponse.setContent("Unable to correlate workflow context, bad request. Request Id: " + requestId);
-			return Response.serverError().entity(workflowResponse).build();
-		}
-
-		responseQueue.remove(workflowContext);
-
-		msoLogger.debug("Using callback response for request id: " + requestId);
-		workflowResponse.setContent(callbackResponse.getResponse());
-		workflowResponse.setProcessInstanceId(processInstanceId);
+		workflowResponse.setResponse(callbackResponse.getResponse());
+		workflowResponse.setProcessInstanceID(processInstanceId);
 		workflowResponse.setMessageCode(callbackResponse.getStatusCode());
 		workflowResponse.setMessage(callbackResponse.getMessage());
-		sendWorkflowResponseToClient(processKey, workflowContext, workflowResponse);
-		return Response.ok().entity(workflowResponse).build();
-	}
-	
-	/**
-	 * Send the response to client asynchronously when invoked by the BPMN process
-	 * @param processKey
-	 * @param workflowContext
-	 * @param workflowResponse
-	 */
-	private void sendWorkflowResponseToClient(String processKey, WorkflowContext workflowContext,
-			WorkflowResponse workflowResponse) {
-		msoLogger.debug(logMarker + "Sending the response for request id: " + workflowContext.getRequestId());
-		recordEvents(processKey, workflowResponse, workflowContext.getStartTime());
-		Response response = Response.status(workflowResponse.getMessageCode()).entity(workflowResponse).build();
-		AsynchronousResponse asyncResp = workflowContext.getAsynchronousResponse();
-		asyncResp.setResponse(response);
+		WorkflowContext context = new WorkflowContext(processKey, requestId, defaultContextTimeout,workflowResponse);
+		put(context);
 	}
 
+
 	/**
 	 * Timeout thread which monitors the delay queue for expired context and send timeout response
 	 * to client
-	 *git review -R
+	 *
 	 * */
 	private class TimeoutThread extends Thread {
+		@Override
 		public void run() {
 			while (!isInterrupted()) {
 				try {
 					WorkflowContext requestObject = responseQueue.take();
+					MsoLogger.setLogContext(requestObject.getRequestId(), null);
 					msoLogger.debug("Time remaining for request id: " + requestObject.getRequestId() + ":" + requestObject.getDelay(TimeUnit.MILLISECONDS));
 					msoLogger.debug("Preparing timeout response for " + requestObject.getProcessKey() + ":" + ":" + requestObject.getRequestId());
-					WorkflowResponse response = new WorkflowResponse();
-					response.setMessage("Fail");
-					response.setContent("Request timedout, request id:" + requestObject.getRequestId());
-					//response.setProcessInstanceID(requestObject.getProcessInstance().getProcessInstanceId());
-					recordEvents(requestObject.getProcessKey(), response, requestObject.getStartTime());
-					response.setMessageCode(500);
-					Response result = Response.status(500).entity(response).build();
-					requestObject.getAsynchronousResponse().setResponse(result);
-					msoLogger.debug("Sending timeout response for request id:" + requestObject.getRequestId() + ":response:" + response);
 				} catch (InterruptedException e) {
-					break;
+					Thread.currentThread().interrupt();
 				} catch (Exception e) {
 					msoLogger.debug("WorkflowContextHolder timeout thread caught exception: " + e);
 				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
@@ -168,21 +134,7 @@ public class WorkflowContextHolder {
 				
 				}
 			}
-
 			msoLogger.debug("WorkflowContextHolder timeout thread interrupted, quitting");
 		}
 	}
-	
-	private static void recordEvents(String processKey, WorkflowResponse response,
-			long startTime) {
-
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + response.getMessage() + " for processKey: "
-				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);
-		
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 
-				+ response.getMessage() + " for processKey: " 
-				+ processKey + " with content: " + response.getContent());
-		
-	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowResponse.java
index 02702e3b3c..f5aa0b33c6 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/workflow/context/WorkflowResponse.java
@@ -1,97 +1,78 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.Map;

-

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-/**

- * A synchronous response from a workflow.

- */

-public class WorkflowResponse {

-

-	@JsonProperty("processInstanceId")

-	private String processInstanceId;

-

-	@JsonProperty("messageCode")

-	private int messageCode;

-

-	@JsonProperty("message")

-	private String message;

-	

-	@JsonProperty("variables")

-	private Map<String,String> variables;

-

-	@JsonProperty("content")

-	private String content;

-

-	public String getProcessInstanceId() {

-		return processInstanceId;

-	}

-

-	public void setProcessInstanceId(String processInstanceId) {

-		this.processInstanceId = processInstanceId;

-	}

-

-	public int getMessageCode() {

-		return messageCode;

-	}

-

-	public void setMessageCode(int messageCode) {

-		this.messageCode = messageCode;

-	}

-

-	public String getMessage() {

-		return message;

-	}

-

-	public void setMessage(String message) {

-		this.message = message;

-	}

-

-	public Map<String,String> getVariables() {

-		return variables;

-	}

-

-	public void setVariables(Map<String,String> variables) {

-		this.variables = variables;

-	}

-

-	public String getContent() {

-		return content;

-	}

-

-	public void setContent(String content) {

-		this.content = content;

-	}

-

-	@Override

-	public String toString() {

-		return getClass().getSimpleName() + "["

-			+ "processInstanceId=" + processInstanceId

-			+ ",messageCode=" + messageCode

-			+ ",message=" + message

-			+ ",variables=" + variables

-			+ ",content=" + content

-			+ "]";

-	}

-}
\ No newline at end of file
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.workflow.context;
+
+import java.util.Map;
+
+/**
+ * @version 1.0
+ * Synchronous workflow response bean 
+ *
+ */
+
+public class WorkflowResponse {
+
+	private String response;
+	private String message;
+	private String processInstanceID;
+	private Map<String,String> variables;
+	private int messageCode;
+	
+	public String getResponse() {
+		return response;
+	}
+	public void setResponse(String response) {
+		this.response = response;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public String getProcessInstanceID() {
+		return processInstanceID;
+	}
+	public void setProcessInstanceID(String pID) {
+		this.processInstanceID = pID;
+	}
+	public Map<String, String> getVariables() {
+		return variables;
+	}
+	public void setVariables(Map<String, String> variables) {
+		this.variables = variables;
+	}
+	public void setMessageCode(int messageCode) {
+		this.messageCode = messageCode;
+	}
+	
+	public int getMessageCode() {
+		return messageCode;
+	}
+	
+	@Override
+	public String toString() {
+		return "WorkflowResponse [response=" + response + ", message=" + message + ", processInstanceID="
+				+ processInstanceID + ", variables=" + variables + ", messageCode=" + messageCode + "]";
+	}
+	
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionBean.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java
index f566418ade..1f83c3135e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionBean.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java
@@ -18,31 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.adapter.requests.db.entities;
-
+package org.onap.so.bpmn.servicedecomposition;
 
 import java.io.Serializable;
-
-/**
- * Jax-WS Fault Bean for MsoRequestsDB Exception
- */
-public class MsoRequestsDbExceptionBean implements Serializable {
-
-    private static final long serialVersionUID = 1360000062602372639L;
-
-    private String message;
-
-	public MsoRequestsDbExceptionBean () {}
-
-	public MsoRequestsDbExceptionBean (String message) {
-		this.message = message;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Metadatum;
+
+public class Metadata implements Serializable{
+	
+	private static final long serialVersionUID = 4981393122007858950L;
+	
+	@JsonProperty("metadatum")
+	private List<Metadatum> metadatum = new ArrayList<Metadatum>();
+
+	public List<Metadatum> getMetadatum() {
+		return metadatum;
+	}	
 }
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/CommonObjectMapperProviderTest.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/ShallowCopy.java
index e1b1770180..1263e7ba7c 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/CommonObjectMapperProviderTest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/ShallowCopy.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 - 2018 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.
@@ -18,27 +18,31 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.policy;
+package org.onap.so.bpmn.servicedecomposition;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.junit.Test;
 
-public class CommonObjectMapperProviderTest {
+import javax.persistence.Id;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public interface ShallowCopy<T> {
+	default T shallowCopyId() {
+		try {
+			T obj = (T) this.getClass().newInstance();
+			for (Field field : this.getClass().getDeclaredFields()) {
+				if (field.isAnnotationPresent(Id.class)) {
+					String fieldName = Character.toUpperCase(field.getName().charAt(0)) + field.getName().substring(1);
+					Method setter = this.getClass().getMethod("set" + fieldName, field.getType());
+					Method getter = this.getClass().getMethod("get" + fieldName, null);
+					setter.invoke(obj, getter.invoke(this, null));
+				}
+			}
+			return obj;
+		}catch(Exception e){
+			throw new RuntimeException(e);
+		}
 
-    @Test
-    public void shouldSetCorrectMapperProperties() throws Exception {
-        // given
-        CommonObjectMapperProvider provider = new CommonObjectMapperProvider();
-        // when
-        ObjectMapper context = provider.getContext(Object.class);
-        // then
-        assertThat(context.isEnabled(MapperFeature.USE_ANNOTATIONS)).isTrue();
-        assertThat(context.isEnabled(SerializationFeature.WRAP_ROOT_VALUE)).isFalse();
-        assertThat(context.isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE)).isFalse();
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/AllottedResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/AllottedResource.java
new file mode 100644
index 0000000000..775d80db75
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/AllottedResource.java
@@ -0,0 +1,129 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.homingobjects.SolutionCandidates;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoAllottedResource;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+@JsonRootName("allotted-resource")
+public class AllottedResource extends SolutionCandidates implements Serializable, ShallowCopy<AllottedResource> {
+
+	private static final long serialVersionUID = 8674239064804424306L;
+
+	@Id
+	@JsonProperty("id")
+	private String id;
+	@JsonProperty("target-network-role")
+	private String targetNetworkRole;
+	@JsonProperty("self-link")
+	private String selflink;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("operational-status")
+	private String operationalStatus;
+	@JsonProperty("type")
+    private String type;
+	@JsonProperty("role")
+    private String role;
+    @JsonProperty("model-info-allotted-resource")
+    private ModelInfoAllottedResource modelInfoAllottedResource;
+    @JsonProperty("service-instance")
+    private ServiceInstance parentServiceInstance;
+
+	public ModelInfoAllottedResource getModelInfoAllottedResource() {
+		return modelInfoAllottedResource;
+	}
+	public void setModelInfoAllottedResource(ModelInfoAllottedResource modelInfoAllottedResource) {
+		this.modelInfoAllottedResource = modelInfoAllottedResource;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getTargetNetworkRole() {
+		return targetNetworkRole;
+	}
+	public void setTargetNetworkRole(String targetNetworkRole) {
+		this.targetNetworkRole = targetNetworkRole;
+	}
+	public String getSelflink() {
+		return selflink;
+	}
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+	public String getOperationalStatus() {
+		return operationalStatus;
+	}
+	public void setOperationalStatus(String operationalStatus) {
+		this.operationalStatus = operationalStatus;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getRole() {
+		return role;
+	}
+	public void setRole(String role) {
+		this.role = role;
+	}
+	public ServiceInstance getParentServiceInstance() {
+		return parentServiceInstance;
+	}
+	public void setParentServiceInstance(ServiceInstance parentServiceInstance) {
+		this.parentServiceInstance = parentServiceInstance;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof AllottedResource)) {
+			return false;
+		}
+		AllottedResource castOther = (AllottedResource) other;
+		return new EqualsBuilder().append(id, castOther.id).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(id).toHashCode();
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CloudRegion.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CloudRegion.java
new file mode 100644
index 0000000000..f39253e6aa
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CloudRegion.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+public class CloudRegion implements Serializable, ShallowCopy<CloudRegion> {
+
+	private static final long serialVersionUID = 680593168655326021L;
+
+	@Id
+	@JsonProperty("lcp-cloud-region-id")
+	private String lcpCloudRegionId;
+	@Id
+	@JsonProperty("cloud-owner")
+	private String cloudOwner;
+	@JsonProperty("tenant-id")
+	private String tenantId;
+	@JsonProperty("complex")
+	private String complex;
+	@JsonProperty("cloud-region-version")
+	private String cloudRegionVersion;
+
+	public String getLcpCloudRegionId() {
+		return lcpCloudRegionId;
+	}
+	public void setLcpCloudRegionId(String lcpCloudRegionId) {
+		this.lcpCloudRegionId = lcpCloudRegionId;
+	}
+	public String getTenantId() {
+		return tenantId;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+	public String getCloudOwner() {
+		return cloudOwner;
+	}
+	public void setCloudOwner(String cloudOwner) {
+		this.cloudOwner = cloudOwner;
+	}
+	/**
+	 * i.e. aic version
+	 */
+	public String getCloudRegionVersion() {
+		return cloudRegionVersion;
+	}
+	/**
+	 * i.e. aic version
+	 */
+	public void setCloudRegionVersion(String cloudRegionVersion) {
+		this.cloudRegionVersion = cloudRegionVersion;
+	}
+	/**
+	 * i.e. aic clli, physical location id, site id
+	 */
+	public String getComplex() {
+		return complex;
+	}
+	/**
+	 * i.e. aic clli, physical location id, site id
+	 */
+	public void setComplex(String complex) {
+		this.complex = complex;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof CloudRegion)) {
+			return false;
+		}
+		CloudRegion castOther = (CloudRegion) other;
+		return new EqualsBuilder().append(lcpCloudRegionId, castOther.lcpCloudRegionId)
+				.append(cloudOwner, castOther.cloudOwner).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(lcpCloudRegionId).append(cloudOwner).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Collection.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Collection.java
new file mode 100644
index 0000000000..6bbdb1ed67
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Collection.java
@@ -0,0 +1,97 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoCollection;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+
+@JsonRootName("collection")
+public class Collection implements Serializable, ShallowCopy<Collection> {
+	
+	private static final long serialVersionUID = 6389915895863066288L;
+
+	@Id
+	@JsonProperty("id")
+	private String id;
+	@JsonProperty("model-info-collection")
+	private ModelInfoCollection modelInfoCollection;
+	@JsonProperty("instance-group")
+	private InstanceGroup instanceGroup;
+	@JsonProperty("orchestration-status")
+    private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("name")
+	private String name;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public ModelInfoCollection getModelInfoCollection() {
+		return modelInfoCollection;
+	}
+	public void setModelInfoCollection(ModelInfoCollection modelInfoCollection) {
+		this.modelInfoCollection = modelInfoCollection;
+	}
+	public InstanceGroup getInstanceGroup() {
+		return instanceGroup;
+	}
+	public void setInstanceGroup(InstanceGroup instanceGroup) {
+		this.instanceGroup = instanceGroup;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Collection)) {
+			return false;
+		}
+		Collection castOther = (Collection) other;
+		return new EqualsBuilder().append(id, castOther.id).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(id).toHashCode();
+	}
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Configuration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Configuration.java
new file mode 100644
index 0000000000..bcff93c5af
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Configuration.java
@@ -0,0 +1,230 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.Metadata;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import javax.persistence.Id;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("configuration")
+public class Configuration implements Serializable, ShallowCopy<Configuration> {
+	private static final long serialVersionUID = 4525487672816730299L;
+
+	@Id
+	@JsonProperty("configuration-id")
+	private String configurationId;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("tunnel-bandwidth")
+	private String tunnelBandwidth;
+	@JsonProperty("vendor-allowed-max-bandwidth")
+	private String vendorAllowedMaxBandwidth;
+	@JsonProperty("management-option")
+	private String managementOption;
+	@JsonProperty("configuration-name")
+	private String configurationName;
+	@JsonProperty("configuration-type")
+	private String configurationType;
+	@JsonProperty("configuration-sub-type")
+	private String configurationSubType;
+	@JsonProperty("operational-status")
+	private String operationalStatus;
+	@JsonProperty("configuration-selflink")
+	private String configurationSelflink;
+	@JsonProperty("metadata")
+	private Metadata metadata;
+	@JsonProperty("forwarder-evcs")
+	private List<ForwarderEvc> forwarderEvcs = new ArrayList<ForwarderEvc>();
+	@JsonProperty("evcs")
+	private List<Evc> evcs = new ArrayList<Evc>();
+	@JsonProperty("model-info-configuration")
+	private ModelInfoConfiguration modelInfoConfiguration;
+	
+	@JsonProperty("related-configuration")
+	private Configuration relatedConfiguration;
+	
+	@JsonProperty("l3-network")
+	private L3Network network;
+	
+	@JsonProperty("l-interface")
+	private LInterface lInterface;
+
+	public ModelInfoConfiguration getModelInfoConfiguration() {
+		return modelInfoConfiguration;
+	}
+
+	public void setModelInfoConfiguration(ModelInfoConfiguration modelInfoConfiguration) {
+		this.modelInfoConfiguration = modelInfoConfiguration;
+	}
+
+	public List<ForwarderEvc> getForwarderEvcs() {
+		return forwarderEvcs;
+	}
+
+	public List<Evc> getEvcs() {
+		return evcs;
+	}
+
+	public String getConfigurationId() {
+		return configurationId;
+	}
+
+	public void setConfigurationId(String configurationId) {
+		this.configurationId = configurationId;
+	}
+
+	public String getManagementOption() {
+		return managementOption;
+	}
+
+	public void setManagementOption(String managementOption) {
+		this.managementOption = managementOption;
+	}
+
+	public String getConfigurationName() {
+		return configurationName;
+	}
+
+	public void setConfigurationName(String configurationName) {
+		this.configurationName = configurationName;
+	}
+
+	public String getConfigurationType() {
+		return configurationType;
+	}
+
+	public void setConfigurationType(String configurationType) {
+		this.configurationType = configurationType;
+	}
+
+	public String getConfigurationSubType() {
+		return configurationSubType;
+	}
+
+	public void setConfigurationSubType(String configurationSubType) {
+		this.configurationSubType = configurationSubType;
+	}
+
+	public String getOperationalStatus() {
+		return operationalStatus;
+	}
+
+	public void setOperationalStatus(String operationalStatus) {
+		this.operationalStatus = operationalStatus;
+	}
+
+	public String getConfigurationSelflink() {
+		return configurationSelflink;
+	}
+
+	public void setConfigurationSelflink(String configurationSelflink) {
+		this.configurationSelflink = configurationSelflink;
+	}
+
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+
+	public String getTunnelBandwidth() {
+		return tunnelBandwidth;
+	}
+
+	public void setTunnelBandwidth(String tunnelBandwidth) {
+		this.tunnelBandwidth = tunnelBandwidth;
+	}
+
+	public String getVendorAllowedMaxBandwidth() {
+		return vendorAllowedMaxBandwidth;
+	}
+
+	public void setVendorAllowedMaxBandwidth(String vendorAllowedMaxBandwidth) {
+		this.vendorAllowedMaxBandwidth = vendorAllowedMaxBandwidth;
+	}
+
+	public Metadata getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Metadata metadata) {
+		this.metadata = metadata;
+	}
+
+	public Configuration getRelatedConfiguration() {
+		return relatedConfiguration;
+	}
+
+	public void setRelatedConfiguration(Configuration relatedConfiguration) {
+		this.relatedConfiguration = relatedConfiguration;
+	}
+
+	public void setForwarderEvcs(List<ForwarderEvc> forwarderEvcs) {
+		this.forwarderEvcs = forwarderEvcs;
+	}
+
+	public void setEvcs(List<Evc> evcs) {
+		this.evcs = evcs;
+	}
+
+	public L3Network getNetwork() {
+		return network;
+	}
+
+	public void setNetwork(L3Network network) {
+		this.network = network;
+	}
+
+	public LInterface getlInterface() {
+		return lInterface;
+	}
+
+	public void setlInterface(LInterface lInterface) {
+		this.lInterface = lInterface;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Configuration)) {
+			return false;
+		}
+		Configuration castOther = (Configuration) other;
+		return new EqualsBuilder().append(configurationId, castOther.configurationId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(configurationId).toHashCode();
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java
new file mode 100644
index 0000000000..937c79be1d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("ctag-assignment")
+public class CtagAssignment implements Serializable, ShallowCopy<CtagAssignment> {
+	
+	private static final long serialVersionUID = 2314290576523243571L;
+
+	@Id
+	@JsonProperty("vlan-id-inner")
+	private long vlanIdInner;
+	
+	public long getVlanIdInner() {
+		return vlanIdInner;
+	}
+
+	public void setVlanIdInner(long vlanIdInner) {
+		this.vlanIdInner = vlanIdInner;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof CtagAssignment)) {
+			return false;
+		}
+		CtagAssignment castOther = (CtagAssignment) other;
+		return new EqualsBuilder().append(vlanIdInner, castOther.vlanIdInner).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vlanIdInner).toHashCode();
+	}
+
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Customer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Customer.java
new file mode 100644
index 0000000000..985f51035c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Customer.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("customer")
+public class Customer implements Serializable, ShallowCopy<Customer> {
+
+	private static final long serialVersionUID = 2006599484099139618L;
+
+	@Id
+	@JsonProperty("global-customer-id")
+	private String globalCustomerId;
+	@JsonProperty("subscriber-name")
+	private String subscriberName;
+	@JsonProperty("subscriber-type")
+	private String subscriberType;
+	@JsonProperty("subscriber-common-site-id")
+	private String subscriberCommonSiteId;
+	@JsonProperty("service-subscription")
+    private ServiceSubscription serviceSubscription;
+    @JsonProperty("vpn-bindings")
+	private List<VpnBinding> vpnBindings = new ArrayList<>();
+
+	public String getGlobalCustomerId() {
+		return globalCustomerId;
+	}
+	public void setGlobalCustomerId(String globalCustomerId) {
+		this.globalCustomerId = globalCustomerId;
+	}
+	public String getSubscriberName() {
+		return subscriberName;
+	}
+	public void setSubscriberName(String subscriberName) {
+		this.subscriberName = subscriberName;
+	}
+	public String getSubscriberType() {
+		return subscriberType;
+	}
+	public void setSubscriberType(String subscriberType) {
+		this.subscriberType = subscriberType;
+	}
+	public String getSubscriberCommonSiteId() {
+		return subscriberCommonSiteId;
+	}
+	public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {
+		this.subscriberCommonSiteId = subscriberCommonSiteId;
+	}
+	public ServiceSubscription getServiceSubscription() {
+		return serviceSubscription;
+	}
+	public void setServiceSubscription(ServiceSubscription serviceSubscription) {
+		this.serviceSubscription = serviceSubscription;
+	}
+	public List<VpnBinding> getVpnBindings() {
+		return vpnBindings;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Customer)) {
+			return false;
+		}
+		Customer castOther = (Customer) other;
+		return new EqualsBuilder().append(globalCustomerId, castOther.globalCustomerId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(globalCustomerId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Entitlement.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Entitlement.java
new file mode 100644
index 0000000000..fdcb59d3c3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Entitlement.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("entitlement")
+public class Entitlement implements Serializable, ShallowCopy<Entitlement>{
+	
+	private static final long serialVersionUID = 5186878328988717088L;
+
+	@Id
+	@JsonProperty("group-uuid")
+    private String groupUuid;
+	@Id
+	@JsonProperty("resource-uuid")
+    private String resourceUuid;
+
+	public String getGroupUuid() {
+		return groupUuid;
+	}
+	public void setGroupUuid(String groupUuid) {
+		this.groupUuid = groupUuid;
+	}
+	public String getResourceUuid() {
+		return resourceUuid;
+	}
+	public void setResourceUuid(String resourceUuid) {
+		this.resourceUuid = resourceUuid;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Entitlement)) {
+			return false;
+		}
+		Entitlement castOther = (Entitlement) other;
+		return new EqualsBuilder().append(groupUuid, castOther.groupUuid).append(resourceUuid, castOther.resourceUuid)
+				.isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(groupUuid).append(resourceUuid).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Evc.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Evc.java
new file mode 100644
index 0000000000..3ef0f71386
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Evc.java
@@ -0,0 +1,164 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("evc")
+public class Evc implements Serializable, ShallowCopy<Evc> {
+
+	private static final long serialVersionUID = -3556506672371317659L;
+
+	@Id
+	@JsonProperty("evc-id")
+    private String evcId;
+	@JsonProperty("forwarding-path-topology")
+    private String forwardingPathTopology;
+	@JsonProperty("cir-value")
+    private String cirValue;
+	@JsonProperty("cir-units")
+    private String cirUnits;
+	@JsonProperty("connection-diversity-group-id")
+    private String connectionDiversityGroupId;
+	@JsonProperty("service-hours")
+    private String serviceHours;
+	@JsonProperty("esp-evc-circuit-id")
+    private String espEvcCircuitId;
+	@JsonProperty("esp-evc-cir-value")
+    private String espEvcCirValue;
+	@JsonProperty("esp-evc-cir-units")
+    private String espEvcCirUnits;
+	@JsonProperty("esp-itu-code")
+    private String espItuCode;
+    @JsonProperty("collector-pop-clli")
+    private String collectorPopClli;
+    @JsonProperty("inter-connect-type-ingress")
+    private String interConnectTypeIngress;
+    @JsonProperty("tagmode-access-ingress")
+    private String tagmodeAccessIngress;
+    @JsonProperty("tagmode-access-egress")
+    private String tagmodeAccessEgress;
+
+	public String getEvcId() {
+		return evcId;
+	}
+	public void setEvcId(String evcId) {
+		this.evcId = evcId;
+	}
+	public String getForwardingPathTopology() {
+		return forwardingPathTopology;
+	}
+	public void setForwardingPathTopology(String forwardingPathTopology) {
+		this.forwardingPathTopology = forwardingPathTopology;
+	}
+	public String getCirValue() {
+		return cirValue;
+	}
+	public void setCirValue(String cirValue) {
+		this.cirValue = cirValue;
+	}
+	public String getCirUnits() {
+		return cirUnits;
+	}
+	public void setCirUnits(String cirUnits) {
+		this.cirUnits = cirUnits;
+	}
+	public String getConnectionDiversityGroupId() {
+		return connectionDiversityGroupId;
+	}
+	public void setConnectionDiversityGroupId(String connectionDiversityGroupId) {
+		this.connectionDiversityGroupId = connectionDiversityGroupId;
+	}
+	public String getServiceHours() {
+		return serviceHours;
+	}
+	public void setServiceHours(String serviceHours) {
+		this.serviceHours = serviceHours;
+	}
+	public String getEspEvcCircuitId() {
+		return espEvcCircuitId;
+	}
+	public void setEspEvcCircuitId(String espEvcCircuitId) {
+		this.espEvcCircuitId = espEvcCircuitId;
+	}
+	public String getEspEvcCirValue() {
+		return espEvcCirValue;
+	}
+	public void setEspEvcCirValue(String espEvcCirValue) {
+		this.espEvcCirValue = espEvcCirValue;
+	}
+	public String getEspEvcCirUnits() {
+		return espEvcCirUnits;
+	}
+	public void setEspEvcCirUnits(String espEvcCirUnits) {
+		this.espEvcCirUnits = espEvcCirUnits;
+	}
+	public String getEspItuCode() {
+		return espItuCode;
+	}
+	public void setEspItuCode(String espItuCode) {
+		this.espItuCode = espItuCode;
+	}
+	public String getCollectorPopClli() {
+		return collectorPopClli;
+	}
+	public void setCollectorPopClli(String collectorPopClli) {
+		this.collectorPopClli = collectorPopClli;
+	}
+	public String getInterConnectTypeIngress() {
+		return interConnectTypeIngress;
+	}
+	public void setInterConnectTypeIngress(String interConnectTypeIngress) {
+		this.interConnectTypeIngress = interConnectTypeIngress;
+	}
+	public String getTagmodeAccessIngress() {
+		return tagmodeAccessIngress;
+	}
+	public void setTagmodeAccessIngress(String tagmodeAccessIngress) {
+		this.tagmodeAccessIngress = tagmodeAccessIngress;
+	}
+	public String getTagmodeAccessEgress() {
+		return tagmodeAccessEgress;
+	}
+	public void setTagmodeAccessEgress(String tagmodeAccessEgress) {
+		this.tagmodeAccessEgress = tagmodeAccessEgress;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Evc)) {
+			return false;
+		}
+		Evc castOther = (Evc) other;
+		return new EqualsBuilder().append(evcId, castOther.evcId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(evcId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ForwarderEvc.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ForwarderEvc.java
new file mode 100644
index 0000000000..70f7d5af42
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ForwarderEvc.java
@@ -0,0 +1,103 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("forwarder-evc")
+public class ForwarderEvc implements Serializable, ShallowCopy<ForwarderEvc> {
+
+	private static final long serialVersionUID = 3822241337439817708L;
+
+	@Id
+	@JsonProperty("forwarder-evc-id")
+	private String forwarderEvcId;
+	@JsonProperty("circuit-id")
+	private String circuitId;
+	@JsonProperty("ivlan")
+	private String ivlan;
+	@JsonProperty("svlan")
+	private String svlan;
+	@JsonProperty("cvlan")
+	private String cvlan;
+
+	public String getForwarderEvcId() {
+		return forwarderEvcId;
+	}
+
+	public void setForwarderEvcId(String forwarderEvcId) {
+		this.forwarderEvcId = forwarderEvcId;
+	}
+
+	public String getCircuitId() {
+		return circuitId;
+	}
+
+	public void setCircuitId(String circuitId) {
+		this.circuitId = circuitId;
+	}
+
+	public String getIvlan() {
+		return ivlan;
+	}
+
+	public void setIvlan(String ivlan) {
+		this.ivlan = ivlan;
+	}
+
+	public String getSvlan() {
+		return svlan;
+	}
+
+	public void setSvlan(String svlan) {
+		this.svlan = svlan;
+	}
+
+	public String getCvlan() {
+		return cvlan;
+	}
+
+	public void setCvlan(String cvlan) {
+		this.cvlan = cvlan;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof ForwarderEvc)) {
+			return false;
+		}
+		ForwarderEvc castOther = (ForwarderEvc) other;
+		return new EqualsBuilder().append(forwarderEvcId, castOther.forwarderEvcId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(forwarderEvcId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
new file mode 100644
index 0000000000..218763a006
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
@@ -0,0 +1,510 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.License;
+import org.onap.so.bpmn.servicedecomposition.homingobjects.SolutionInfo;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("generic-vnf")
+public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
+
+	private static final long serialVersionUID = -5107610336831330403L;
+
+	@Id
+	@JsonProperty("vnf-id")
+	private String vnfId;
+	@JsonProperty("vnf-name")
+	private String vnfName;
+	@JsonProperty("vnf-type")
+	private String vnfType;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("vf-modules")
+	private List<VfModule> vfModules = new ArrayList<>();
+	@JsonProperty("volume-groups")
+	private List<VolumeGroup> volumeGroups = new ArrayList<>();
+	@JsonProperty("line-of-business")
+	private LineOfBusiness lineOfBusiness;
+	@JsonProperty("platform")
+	private Platform platform;
+	@JsonProperty("cascaded")
+	private boolean cascaded;
+	@JsonProperty("cloud-params")
+	private Map<String, String> cloudParams = new HashMap<>();
+	@JsonProperty("cloud-context")
+	private CloudRegion cloudRegion;
+	@JsonProperty("solution")
+	private SolutionInfo solution;
+	@JsonProperty("vnf-name-2")
+	private String vnfName2;
+	@JsonProperty("service-id")
+	private String serviceId;
+	@JsonProperty("regional-resource-zone")
+	private String regionalResourceZone;
+	@JsonProperty("prov-status")
+	private String provStatus;
+	@JsonProperty("operational-status")
+	private String operationalStatus;
+	@JsonProperty("equipment-role")
+	private String equipmentRole;
+	@JsonProperty("management-option")
+	private String managementOption;
+	@JsonProperty("ipv4-oam-address")
+	private String ipv4OamAddress;
+	@JsonProperty("ipv4-loopback0-address")
+	private String ipv4Loopback0Address;
+	@JsonProperty("nm-lan-v6-address")
+	private String nmLanV6Address;
+	@JsonProperty("management-v6-address")
+	private String managementV6Address;
+	@JsonProperty("vcpu")
+	private Long vcpu;
+	@JsonProperty("vcpu-units")
+	private String vcpuUnits;
+	@JsonProperty("vmemory")
+	private Long vmemory;
+	@JsonProperty("vmemory-units")
+	private String vmemoryUnits;
+	@JsonProperty("vdisk")
+	private Long vdisk;
+	@JsonProperty("vdisk-units")
+	private String vdiskUnits;
+	@JsonProperty("in-maint")
+	private boolean inMaint;
+	@JsonProperty("is-closed-loop-disabled")
+	private boolean isClosedLoopDisabled;
+	@JsonProperty("summary-status")
+	private String summaryStatus;
+	@JsonProperty("encrypted-access-flag")
+	private Boolean encryptedAccessFlag;
+	@JsonProperty("as-number")
+	private String asNumber;
+	@JsonProperty("regional-resource-subzone")
+	private String regionalResourceSubzone;
+	@JsonProperty("self-link")
+	private String selflink;
+	@JsonProperty("ipv4-oam-gateway-address")
+	private String ipv4OamGatewayAddress;
+	@JsonProperty("ipv4-oam-gateway-address-prefix-length")
+	private Integer ipv4OamGatewayAddressPrefixLength;
+	@JsonProperty("vlan-id-outer")
+	private Long vlanIdOuter;
+	@JsonProperty("nm-profile-name")
+	private String nmProfileName;
+	@JsonProperty("l-interfaces")
+	private List<LInterface> lInterfaces = new ArrayList<>();
+	@JsonProperty("lag-interfaces")
+	private List<LagInterface> lagInterfaces = new ArrayList<>();
+	@JsonProperty("license")
+	private License license;
+	@JsonProperty("entitlements") //TODO remove, duplicated
+	private List<Entitlement> entitlements = new ArrayList<>();
+	@JsonProperty("model-info-generic-vnf")
+	private ModelInfoGenericVnf modelInfoGenericVnf;
+	@JsonProperty("instance-groups")
+    private List<InstanceGroup> instanceGroups = new ArrayList<InstanceGroup>();
+	@JsonProperty("call-homing")
+	private boolean callHoming;
+
+
+	public List<InstanceGroup> getInstanceGroups() {
+		return instanceGroups;
+	}
+
+	public List<VolumeGroup> getVolumeGroups() {
+		return volumeGroups;
+	}
+
+	public ModelInfoGenericVnf getModelInfoGenericVnf() {
+		return modelInfoGenericVnf;
+	}
+
+	public void setModelInfoGenericVnf(ModelInfoGenericVnf modelInfoGenericVnf) {
+		this.modelInfoGenericVnf = modelInfoGenericVnf;
+	}
+
+	public String getVnfName2() {
+		return vnfName2;
+	}
+
+	public void setVnfName2(String vnfName2) {
+		this.vnfName2 = vnfName2;
+	}
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getRegionalResourceZone() {
+		return regionalResourceZone;
+	}
+
+	public void setRegionalResourceZone(String regionalResourceZone) {
+		this.regionalResourceZone = regionalResourceZone;
+	}
+
+	public String getProvStatus() {
+		return provStatus;
+	}
+
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+
+	public String getOperationalStatus() {
+		return operationalStatus;
+	}
+
+	public void setOperationalStatus(String operationalStatus) {
+		this.operationalStatus = operationalStatus;
+	}
+
+	public String getEquipmentRole() {
+		return equipmentRole;
+	}
+
+	public void setEquipmentRole(String equipmentRole) {
+		this.equipmentRole = equipmentRole;
+	}
+
+	public String getManagementOption() {
+		return managementOption;
+	}
+
+	public void setManagementOption(String managementOption) {
+		this.managementOption = managementOption;
+	}
+
+	public String getIpv4OamAddress() {
+		return ipv4OamAddress;
+	}
+
+	public void setIpv4OamAddress(String ipv4OamAddress) {
+		this.ipv4OamAddress = ipv4OamAddress;
+	}
+
+	public String getIpv4Loopback0Address() {
+		return ipv4Loopback0Address;
+	}
+
+	public void setIpv4Loopback0Address(String ipv4Loopback0Address) {
+		this.ipv4Loopback0Address = ipv4Loopback0Address;
+	}
+
+	public String getNmLanV6Address() {
+		return nmLanV6Address;
+	}
+
+	public void setNmLanV6Address(String nmLanV6Address) {
+		this.nmLanV6Address = nmLanV6Address;
+	}
+
+	public String getManagementV6Address() {
+		return managementV6Address;
+	}
+
+	public void setManagementV6Address(String managementV6Address) {
+		this.managementV6Address = managementV6Address;
+	}
+
+	public Long getVcpu() {
+		return vcpu;
+	}
+
+	public void setVcpu(Long vcpu) {
+		this.vcpu = vcpu;
+	}
+
+	public String getVcpuUnits() {
+		return vcpuUnits;
+	}
+
+	public void setVcpuUnits(String vcpuUnits) {
+		this.vcpuUnits = vcpuUnits;
+	}
+
+	public List<LInterface> getlInterfaces() {
+		return lInterfaces;
+	}
+
+	public List<LagInterface> getLagInterfaces() {
+		return lagInterfaces;
+	}
+
+	public List<Entitlement> getEntitlements() {
+		return entitlements;
+	}
+
+	public List<VfModule> getVfModules() {
+		return vfModules;
+	}
+
+	public Long getVmemory() {
+		return vmemory;
+	}
+
+	public void setVmemory(Long vmemory) {
+		this.vmemory = vmemory;
+	}
+
+	public String getVmemoryUnits() {
+		return vmemoryUnits;
+	}
+
+	public void setVmemoryUnits(String vmemoryUnits) {
+		this.vmemoryUnits = vmemoryUnits;
+	}
+
+	public Long getVdisk() {
+		return vdisk;
+	}
+
+	public void setVdisk(Long vdisk) {
+		this.vdisk = vdisk;
+	}
+
+	public String getVdiskUnits() {
+		return vdiskUnits;
+	}
+
+	public void setVdiskUnits(String vdiskUnits) {
+		this.vdiskUnits = vdiskUnits;
+	}
+
+	public boolean isInMaint() {
+		return inMaint;
+	}
+
+	public void setInMaint(boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+
+	public boolean isClosedLoopDisabled() {
+		return isClosedLoopDisabled;
+	}
+
+	public void setClosedLoopDisabled(boolean isClosedLoopDisabled) {
+		this.isClosedLoopDisabled = isClosedLoopDisabled;
+	}
+
+	public String getSummaryStatus() {
+		return summaryStatus;
+	}
+
+	public void setSummaryStatus(String summaryStatus) {
+		this.summaryStatus = summaryStatus;
+	}
+
+	public Boolean getEncryptedAccessFlag() {
+		return encryptedAccessFlag;
+	}
+
+	public void setEncryptedAccessFlag(Boolean encryptedAccessFlag) {
+		this.encryptedAccessFlag = encryptedAccessFlag;
+	}
+
+	public String getAsNumber() {
+		return asNumber;
+	}
+
+	public void setAsNumber(String asNumber) {
+		this.asNumber = asNumber;
+	}
+
+	public String getRegionalResourceSubzone() {
+		return regionalResourceSubzone;
+	}
+
+	public void setRegionalResourceSubzone(String regionalResourceSubzone) {
+		this.regionalResourceSubzone = regionalResourceSubzone;
+	}
+
+	public License getLicense() {
+		return license;
+	}
+
+	public void setLicense(License license) {
+		this.license = license;
+	}
+
+	public String getSelflink() {
+		return selflink;
+	}
+
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+
+	public String getIpv4OamGatewayAddress() {
+		return ipv4OamGatewayAddress;
+	}
+
+	public void setIpv4OamGatewayAddress(String ipv4OamGatewayAddress) {
+		this.ipv4OamGatewayAddress = ipv4OamGatewayAddress;
+	}
+
+	public Integer getIpv4OamGatewayAddressPrefixLength() {
+		return ipv4OamGatewayAddressPrefixLength;
+	}
+
+	public void setIpv4OamGatewayAddressPrefixLength(Integer ipv4OamGatewayAddressPrefixLength) {
+		this.ipv4OamGatewayAddressPrefixLength = ipv4OamGatewayAddressPrefixLength;
+	}
+
+	public Long getVlanIdOuter() {
+		return vlanIdOuter;
+	}
+
+	public void setVlanIdOuter(Long vlanIdOuter) {
+		this.vlanIdOuter = vlanIdOuter;
+	}
+
+	public String getNmProfileName() {
+		return nmProfileName;
+	}
+
+	public void setNmProfileName(String nmProfileName) {
+		this.nmProfileName = nmProfileName;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVnfName() {
+		return vnfName;
+	}
+
+	public void setVnfName(String vnfName) {
+		this.vnfName = vnfName;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+
+	public LineOfBusiness getLineOfBusiness() {
+		return lineOfBusiness;
+	}
+
+	public void setLineOfBusiness(LineOfBusiness lineOfBusiness) {
+		this.lineOfBusiness = lineOfBusiness;
+	}
+
+	public Platform getPlatform() {
+		return platform;
+	}
+
+	public void setPlatform(Platform platform) {
+		this.platform = platform;
+	}
+
+	public boolean isCascaded() {
+		return cascaded;
+	}
+
+	public void setCascaded(boolean cascaded) {
+		this.cascaded = cascaded;
+	}
+
+	public Map<String, String> getCloudParams() {
+		return cloudParams;
+	}
+
+	public void setCloudParams(Map<String, String> cloudParams) {
+		this.cloudParams = cloudParams;
+	}
+
+	public SolutionInfo getSolution() {
+		return solution;
+	}
+
+	public void setSolution(SolutionInfo solution) {
+		this.solution = solution;
+	}
+
+	public CloudRegion getCloudRegion() {
+		return cloudRegion;
+	}
+
+	public void setCloudRegion(CloudRegion cloudRegion) {
+		this.cloudRegion = cloudRegion;
+	}
+
+	public boolean isCallHoming() {
+		return callHoming;
+	}
+
+	public void setCallHoming(boolean callHoming) {
+			this.callHoming = callHoming;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof GenericVnf)) {
+			return false;
+		}
+		GenericVnf castOther = (GenericVnf) other;
+		return new EqualsBuilder().append(vnfId, castOther.vnfId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vnfId).toHashCode();
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/HostRoute.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/HostRoute.java
new file mode 100644
index 0000000000..75356ac9db
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/HostRoute.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("host-route")
+public class HostRoute implements Serializable, ShallowCopy<HostRoute>{
+
+	private static final long serialVersionUID = -2468793257174064133L;
+
+	@Id
+	@JsonProperty("host-route-id")
+    private String hostRouteId;
+	@JsonProperty("route-prefix")
+    private String routePrefix;
+	@JsonProperty("next-hop")
+    private String nextHop;
+	@JsonProperty("next-hop-type")
+    private String nextHopType;
+
+	public String getHostRouteId() {
+		return hostRouteId;
+	}
+	public void setHostRouteId(String hostRouteId) {
+		this.hostRouteId = hostRouteId;
+	}
+	public String getRoutePrefix() {
+		return routePrefix;
+	}
+	public void setRoutePrefix(String routePrefix) {
+		this.routePrefix = routePrefix;
+	}
+	public String getNextHop() {
+		return nextHop;
+	}
+	public void setNextHop(String nextHop) {
+		this.nextHop = nextHop;
+	}
+	public String getNextHopType() {
+		return nextHopType;
+	}
+	public void setNextHopType(String nextHopType) {
+		this.nextHopType = nextHopType;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof HostRoute)) {
+			return false;
+		}
+		HostRoute castOther = (HostRoute) other;
+		return new EqualsBuilder().append(hostRouteId, castOther.hostRouteId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(hostRouteId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/InstanceGroup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/InstanceGroup.java
new file mode 100644
index 0000000000..deb8c8e393
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/InstanceGroup.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoInstanceGroup;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("instance-group")
+public class InstanceGroup  implements Serializable, ShallowCopy<InstanceGroup> {
+
+	private static final long serialVersionUID = -2330859693128099141L;
+	
+	@Id
+	@JsonProperty("id")
+	private String id;
+	@JsonProperty("description")
+	private String description;
+	@JsonProperty("resource-version")
+	private String resourceVersion;
+	@JsonProperty("instance-group-name")
+	private String instanceGroupName;
+	@JsonProperty("model-info-instance-group")
+	private ModelInfoInstanceGroup modelInfoInstanceGroup;
+	@JsonProperty("instance-group-function")
+	private String instanceGroupFunction;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+	public String getInstanceGroupName() {
+		return instanceGroupName;
+	}
+	public void setInstanceGroupName(String instanceGroupName) {
+		this.instanceGroupName = instanceGroupName;
+	}
+	public ModelInfoInstanceGroup getModelInfoInstanceGroup() {
+		return modelInfoInstanceGroup;
+	}
+	public void setModelInfoInstanceGroup(ModelInfoInstanceGroup modelInfoInstanceGroup) {
+		this.modelInfoInstanceGroup = modelInfoInstanceGroup;
+	}
+	public String getInstanceGroupFunction() {
+		return instanceGroupFunction;
+	}
+	public void setInstanceGroupFunction(String instanceGroupFunction) {
+		this.instanceGroupFunction = instanceGroupFunction;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof InstanceGroup)) {
+			return false;
+		}
+		InstanceGroup castOther = (InstanceGroup) other;
+		return new EqualsBuilder().append(id, castOther.id).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(id).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv4AddressList.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv4AddressList.java
new file mode 100644
index 0000000000..55b8a752b6
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv4AddressList.java
@@ -0,0 +1,108 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("l3-interface-ipv4-address-list")
+public class L3InterfaceIpv4AddressList implements Serializable, ShallowCopy<L3InterfaceIpv4AddressList>{
+
+	private static final long serialVersionUID = -1566884527411610879L;
+
+	@Id
+	@JsonProperty("l3-interface-ipv4-address")
+    private String l3InterfaceIpv4Address;
+	@JsonProperty("l3-interface-ipv4-prefix-length")
+    private Long l3InterfaceIpv4PrefixLength;
+	@JsonProperty("vlan-id-inner")
+    private Long vlanIdInner;
+	@JsonProperty("vlan-id-outer")
+    private Long vlanIdOuter;
+	@JsonProperty("is-floating")
+    private Boolean isFloating;
+	@JsonProperty("neutron-network-id")
+    private String neutronNetworkId;
+	@JsonProperty("neutron-subnet-id")
+    private String neutronSubnetId;
+
+	public String getL3InterfaceIpv4Address() {
+		return l3InterfaceIpv4Address;
+	}
+	public void setL3InterfaceIpv4Address(String l3InterfaceIpv4Address) {
+		this.l3InterfaceIpv4Address = l3InterfaceIpv4Address;
+	}
+	public Long getL3InterfaceIpv4PrefixLength() {
+		return l3InterfaceIpv4PrefixLength;
+	}
+	public void setL3InterfaceIpv4PrefixLength(Long l3InterfaceIpv4PrefixLength) {
+		this.l3InterfaceIpv4PrefixLength = l3InterfaceIpv4PrefixLength;
+	}
+	public Long getVlanIdInner() {
+		return vlanIdInner;
+	}
+	public void setVlanIdInner(Long vlanIdInner) {
+		this.vlanIdInner = vlanIdInner;
+	}
+	public Long getVlanIdOuter() {
+		return vlanIdOuter;
+	}
+	public void setVlanIdOuter(Long vlanIdOuter) {
+		this.vlanIdOuter = vlanIdOuter;
+	}
+	public Boolean getIsFloating() {
+		return isFloating;
+	}
+	public void setIsFloating(Boolean isFloating) {
+		this.isFloating = isFloating;
+	}
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+	public String getNeutronSubnetId() {
+		return neutronSubnetId;
+	}
+	public void setNeutronSubnetId(String neutronSubnetId) {
+		this.neutronSubnetId = neutronSubnetId;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof L3InterfaceIpv4AddressList)) {
+			return false;
+		}
+		L3InterfaceIpv4AddressList castOther = (L3InterfaceIpv4AddressList) other;
+		return new EqualsBuilder().append(l3InterfaceIpv4Address, castOther.l3InterfaceIpv4Address).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(l3InterfaceIpv4Address).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv6AddressList.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv6AddressList.java
new file mode 100644
index 0000000000..209c64762f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3InterfaceIpv6AddressList.java
@@ -0,0 +1,123 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("l3-interface-ipv6-address-list")
+public class L3InterfaceIpv6AddressList implements Serializable, ShallowCopy<L3InterfaceIpv6AddressList> {
+
+	private static final long serialVersionUID = -414901751774739052L;
+
+	@Id
+	@JsonProperty("l3-interface-ipv6-address")
+	private String l3InterfaceIpv6Address;
+	@JsonProperty("l3-interface-ipv6-prefix-length")
+	private Long l3InterfaceIpv6PrefixLength;
+	@JsonProperty("vlan-id-inner")
+	private Long vlanIdInner;
+	@JsonProperty("vlan-id-outer")
+	private Long vlanIdOuter;
+	@JsonProperty("is-floating")
+	private Boolean isFloating;
+	@JsonProperty("neutron-network-id")
+	private String neutronNetworkId;
+	@JsonProperty("neutron-subnet-id")
+	private String neutronSubnetId;
+
+	public String getL3InterfaceIpv6Address() {
+		return l3InterfaceIpv6Address;
+	}
+
+	public void setL3InterfaceIpv6Address(String l3InterfaceIpv6Address) {
+		this.l3InterfaceIpv6Address = l3InterfaceIpv6Address;
+	}
+
+	public Long getL3InterfaceIpv6PrefixLength() {
+		return l3InterfaceIpv6PrefixLength;
+	}
+
+	public void setL3InterfaceIpv6PrefixLength(Long l3InterfaceIpv6PrefixLength) {
+		this.l3InterfaceIpv6PrefixLength = l3InterfaceIpv6PrefixLength;
+	}
+
+	public Long getVlanIdInner() {
+		return vlanIdInner;
+	}
+
+	public void setVlanIdInner(Long vlanIdInner) {
+		this.vlanIdInner = vlanIdInner;
+	}
+
+	public Long getVlanIdOuter() {
+		return vlanIdOuter;
+	}
+
+	public void setVlanIdOuter(Long vlanIdOuter) {
+		this.vlanIdOuter = vlanIdOuter;
+	}
+
+	public Boolean getIsFloating() {
+		return isFloating;
+	}
+
+	public void setIsFloating(Boolean isFloating) {
+		this.isFloating = isFloating;
+	}
+
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+
+	public String getNeutronSubnetId() {
+		return neutronSubnetId;
+	}
+
+	public void setNeutronSubnetId(String neutronSubnetId) {
+		this.neutronSubnetId = neutronSubnetId;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof L3InterfaceIpv6AddressList)) {
+			return false;
+		}
+		L3InterfaceIpv6AddressList castOther = (L3InterfaceIpv6AddressList) other;
+		return new EqualsBuilder().append(l3InterfaceIpv6Address, castOther.l3InterfaceIpv6Address).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(l3InterfaceIpv6Address).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java
new file mode 100644
index 0000000000..51cd998073
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java
@@ -0,0 +1,269 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("l3Network")
+public class L3Network implements Serializable, ShallowCopy<L3Network> {
+
+	private static final long serialVersionUID = 4434492567957111317L;
+	
+	@Id
+	@JsonProperty("network-id")
+	private String networkId;
+	@JsonProperty("cascaded")
+	private boolean cascaded;
+	@JsonProperty("cloud-params")
+	private Map<String, String> cloudParams = new HashMap<>();
+	@JsonProperty("network-name")
+    private String networkName;
+	@JsonProperty("neutron-network-id")
+	private String neutronNetworkId;
+	@JsonProperty("network-type")
+	private String networkType;
+	@JsonProperty("network-technology")
+	private String networkTechnology;
+	@JsonProperty("network-role")
+	private String networkRole;
+	@JsonProperty("is-bound-to-vpn")
+    private boolean isBoundToVpn;
+	@JsonProperty("service-id")
+    private String serviceId;
+	@JsonProperty("network-role-instance")
+    private Long networkRoleInstance;
+	@JsonProperty("orchestration-status")
+    private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("heat-stack-id")
+    private String heatStackId;
+	@JsonProperty("contrail-network-fqdn")
+    private String contrailNetworkFqdn;
+	@JsonProperty("network-policies")
+	private List<NetworkPolicy> networkPolicies = new ArrayList<>();
+	@JsonProperty("contrail-network-route-table-references")
+	private List<RouteTableReference> contrailNetworkRouteTableReferences = new ArrayList<>();
+	@JsonProperty("widget-model-id")
+    private String widgetModelId;
+	@JsonProperty("widget-model-version")
+    private String widgetModelVersion;
+	@JsonProperty("physical-network-name")
+    private String physicalNetworkName;
+	@JsonProperty("is-provider-network")
+    private boolean isProviderNetwork;
+	@JsonProperty("is-shared-network")
+    private boolean isSharedNetwork;
+	@JsonProperty("is-external-network")
+    private boolean isExternalNetwork;
+	@JsonProperty("self-link")
+    private String selflink;
+	@JsonProperty("operational-status")
+    private String operationalStatus;
+	@JsonProperty("subnets")
+    private List<Subnet> subnets = new ArrayList<>();
+	@JsonProperty("ctag-assignments")
+    private List<CtagAssignment> ctagAssignments = new ArrayList<>();
+	@JsonProperty("segmentation-assignments")
+    private List<SegmentationAssignment> segmentationAssignments = new ArrayList<>();
+	@JsonProperty("model-info-network")
+	private ModelInfoNetwork modelInfoNetwork;
+
+	public ModelInfoNetwork getModelInfoNetwork() {
+		return modelInfoNetwork;
+	}
+	public void setModelInfoNetwork(ModelInfoNetwork modelInfoNetwork) {
+		this.modelInfoNetwork = modelInfoNetwork;
+	}
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+	public String getNetworkId() {
+		return networkId;
+	}
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+	public String getNetworkName() {
+		return networkName;
+	}
+	public void setNetworkName(String networkName) {
+		this.networkName = networkName;
+	}
+	public String getNetworkType() {
+		return networkType;
+	}
+	public void setNetworkType(String networkType) {
+		this.networkType = networkType;
+	}
+	public String getNetworkTechnology() {
+		return networkTechnology;
+	}
+	public void setNetworkTechnology(String networkTechnology) {
+		this.networkTechnology = networkTechnology;
+	}
+	public String getNetworkRole() {
+		return networkRole;
+	}
+	public void setNetworkRole(String networkRole) {
+		this.networkRole = networkRole;
+	}
+	public boolean isBoundToVpn() {
+		return isBoundToVpn;
+	}
+	public void setIsBoundToVpn(boolean isBoundToVpn) {
+		this.isBoundToVpn = isBoundToVpn;
+	}
+	public String getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+	public Long getNetworkRoleInstance() {
+		return networkRoleInstance;
+	}
+	public void setNetworkRoleInstance(Long networkRoleInstance) {
+		this.networkRoleInstance = networkRoleInstance;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public String getHeatStackId() {
+		return heatStackId;
+	}
+	public void setHeatStackId(String heatStackId) {
+		this.heatStackId = heatStackId;
+	}
+	public String getContrailNetworkFqdn() {
+		return contrailNetworkFqdn;
+	}
+	public void setContrailNetworkFqdn(String contrailNetworkFqdn) {
+		this.contrailNetworkFqdn = contrailNetworkFqdn;
+	}
+	public List<NetworkPolicy> getNetworkPolicies() {
+		return networkPolicies;
+	}
+	public List<RouteTableReference> getContrailNetworkRouteTableReferences() {
+		return contrailNetworkRouteTableReferences;
+	}
+	public String getWidgetModelId() {
+		return widgetModelId;
+	}
+	public void setWidgetModelId(String widgetModelId) {
+		this.widgetModelId = widgetModelId;
+	}
+	public String getWidgetModelVersion() {
+		return widgetModelVersion;
+	}
+	public void setWidgetModelVersion(String widgetModelVersion) {
+		this.widgetModelVersion = widgetModelVersion;
+	}
+	public String getPhysicalNetworkName() {
+		return physicalNetworkName;
+	}
+	public void setPhysicalNetworkName(String physicalNetworkName) {
+		this.physicalNetworkName = physicalNetworkName;
+	}
+	public boolean isProviderNetwork() {
+		return isProviderNetwork;
+	}
+	public void setIsProviderNetwork(boolean isProviderNetwork) {
+		this.isProviderNetwork = isProviderNetwork;
+	}
+	public boolean isSharedNetwork() {
+		return isSharedNetwork;
+	}
+	public void setIsSharedNetwork(boolean isSharedNetwork) {
+		this.isSharedNetwork = isSharedNetwork;
+	}
+	public boolean isExternalNetwork() {
+		return isExternalNetwork;
+	}
+	public void setIsExternalNetwork(boolean isExternalNetwork) {
+		this.isExternalNetwork = isExternalNetwork;
+	}
+	public String getSelflink() {
+		return selflink;
+	}
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+	public String getOperationalStatus() {
+		return operationalStatus;
+	}
+	public void setOperationalStatus(String operationalStatus) {
+		this.operationalStatus = operationalStatus;
+	}
+
+	public List<Subnet> getSubnets() {
+		return subnets;
+	}
+	public List<CtagAssignment> getCtagAssignments() {
+		return ctagAssignments;
+	}
+	public List<SegmentationAssignment> getSegmentationAssignments() {
+		return segmentationAssignments;
+	}
+	public boolean isCascaded() {
+		return cascaded;
+	}
+	public void setIsCascaded(boolean cascaded) {
+		this.cascaded = cascaded;
+	}
+	public Map<String, String> getCloudParams() {
+		return cloudParams;
+	}
+	public void setCloudParams(Map<String, String> cloudParams) {
+		this.cloudParams = cloudParams;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof L3Network)) {
+			return false;
+		}
+		L3Network castOther = (L3Network) other;
+		return new EqualsBuilder().append(networkId, castOther.networkId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(networkId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
new file mode 100644
index 0000000000..4bba39ee62
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
@@ -0,0 +1,191 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("l-interface")
+public class LInterface implements Serializable, ShallowCopy<LInterface>{
+
+	private static final long serialVersionUID = 5629921809747079453L;
+
+	@Id
+	@JsonProperty("interface-name")
+    private String interfaceName;
+	@JsonProperty("interface-role")
+    private String interfaceRole;
+	@JsonProperty("v6-wan-link-ip")
+    private String v6WanLinkIp;
+	@JsonProperty("self-link")
+    private String selflink;
+	@JsonProperty("interface-id")
+    private String interfaceId;
+	@JsonProperty("macaddr")
+    private String macaddr;
+	@JsonProperty("network-name")
+    private String networkName;
+	@JsonProperty("management-option")
+    private String managementOption;
+	@JsonProperty("interface-description")
+    private String interfaceDescription;
+	@JsonProperty("is-port-mirrored")
+    private boolean isPortMirrored;
+	@JsonProperty("in-maint")
+    private boolean inMaint;
+	@JsonProperty("prov-status")
+    private String provStatus;
+	@JsonProperty("is-ip-unnumbered")
+    private boolean isIpUnnumbered;
+	@JsonProperty("allowed-address-pairs")
+    private String allowedAddressPairs;
+	@JsonProperty("vlans")
+    private List<Vlan> vlans = new ArrayList<Vlan>();
+	@JsonProperty("sriov-vfs")
+    private List<SriovVf> sriovVfs = new ArrayList<SriovVf>();
+	@JsonProperty("l-interfaces")
+    private List<LInterface> lInterfaces = new ArrayList<LInterface>();
+	@JsonProperty("l3-interface-ipv4-address-list")
+    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
+	@JsonProperty("l3-interface-ipv6-address-list")
+    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
+
+	public String getInterfaceName() {
+		return interfaceName;
+	}
+	public void setInterfaceName(String interfaceName) {
+		this.interfaceName = interfaceName;
+	}
+	public String getInterfaceRole() {
+		return interfaceRole;
+	}
+	public void setInterfaceRole(String interfaceRole) {
+		this.interfaceRole = interfaceRole;
+	}
+	public String getV6WanLinkIp() {
+		return v6WanLinkIp;
+	}
+	public void setV6WanLinkIp(String v6WanLinkIp) {
+		this.v6WanLinkIp = v6WanLinkIp;
+	}
+	public String getSelflink() {
+		return selflink;
+	}
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+	public String getInterfaceId() {
+		return interfaceId;
+	}
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+	public String getMacaddr() {
+		return macaddr;
+	}
+	public void setMacaddr(String macaddr) {
+		this.macaddr = macaddr;
+	}
+	public String getNetworkName() {
+		return networkName;
+	}
+	public void setNetworkName(String networkName) {
+		this.networkName = networkName;
+	}
+	public String getManagementOption() {
+		return managementOption;
+	}
+	public void setManagementOption(String managementOption) {
+		this.managementOption = managementOption;
+	}
+	public String getInterfaceDescription() {
+		return interfaceDescription;
+	}
+	public void setInterfaceDescription(String interfaceDescription) {
+		this.interfaceDescription = interfaceDescription;
+	}
+	public boolean isPortMirrored() {
+		return isPortMirrored;
+	}
+	public void setPortMirrored(boolean isPortMirrored) {
+		this.isPortMirrored = isPortMirrored;
+	}
+	public boolean isInMaint() {
+		return inMaint;
+	}
+	public void setInMaint(boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+	public String getProvStatus() {
+		return provStatus;
+	}
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+	public boolean isIpUnnumbered() {
+		return isIpUnnumbered;
+	}
+	public void setIpUnnumbered(boolean isIpUnnumbered) {
+		this.isIpUnnumbered = isIpUnnumbered;
+	}
+	public String getAllowedAddressPairs() {
+		return allowedAddressPairs;
+	}
+	public void setAllowedAddressPairs(String allowedAddressPairs) {
+		this.allowedAddressPairs = allowedAddressPairs;
+	}
+	public List<Vlan> getVlans() {
+		return vlans;
+	}
+	public List<SriovVf> getSriovVfs() {
+		return sriovVfs;
+	}
+	public List<LInterface> getlInterfaces() {
+		return lInterfaces;
+	}
+	public List<L3InterfaceIpv4AddressList> getL3InterfaceIpv4AddressList() {
+		return l3InterfaceIpv4AddressList;
+	}
+	public List<L3InterfaceIpv6AddressList> getL3InterfaceIpv6AddressList() {
+		return l3InterfaceIpv6AddressList;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof LInterface)) {
+			return false;
+		}
+		LInterface castOther = (LInterface) other;
+		return new EqualsBuilder().append(interfaceName, castOther.interfaceName).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(interfaceName).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java
new file mode 100644
index 0000000000..8a3248e92c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java
@@ -0,0 +1,123 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("lag-interface")
+public class LagInterface implements Serializable, ShallowCopy<LagInterface>{
+
+	private static final long serialVersionUID = -7493461787172382640L;
+
+	@Id
+	@JsonProperty("interface-name")
+    private String interfaceName;
+	@JsonProperty("interface-description")
+    private String interfaceDescription;
+	@JsonProperty("speed-value")
+    private String speedValue;
+	@JsonProperty("speed-units")
+    private String speedUnits;
+	@JsonProperty("interface-id")
+    private String interfaceId;
+	@JsonProperty("interface-role")
+    private String interfaceRole;
+	@JsonProperty("prov-status")
+    private String provStatus;
+	@JsonProperty("in-maint")
+    private boolean inMaint;
+	@JsonProperty("l-interfaces")
+    private List<LInterface> lInterfaces = new ArrayList<>();
+
+	public String getInterfaceName() {
+		return interfaceName;
+	}
+	public void setInterfaceName(String interfaceName) {
+		this.interfaceName = interfaceName;
+	}
+	public String getInterfaceDescription() {
+		return interfaceDescription;
+	}
+	public void setInterfaceDescription(String interfaceDescription) {
+		this.interfaceDescription = interfaceDescription;
+	}
+	public String getSpeedValue() {
+		return speedValue;
+	}
+	public void setSpeedValue(String speedValue) {
+		this.speedValue = speedValue;
+	}
+	public String getSpeedUnits() {
+		return speedUnits;
+	}
+	public void setSpeedUnits(String speedUnits) {
+		this.speedUnits = speedUnits;
+	}
+	public String getInterfaceId() {
+		return interfaceId;
+	}
+	public void setInterfaceId(String interfaceId) {
+		this.interfaceId = interfaceId;
+	}
+	public String getInterfaceRole() {
+		return interfaceRole;
+	}
+	public void setInterfaceRole(String interfaceRole) {
+		this.interfaceRole = interfaceRole;
+	}
+	public String getProvStatus() {
+		return provStatus;
+	}
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+	public boolean isInMaint() {
+		return inMaint;
+	}
+	public void setInMaint(boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+	public List<LInterface> getlInterfaces() {
+		return lInterfaces;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof LagInterface)) {
+			return false;
+		}
+		LagInterface castOther = (LagInterface) other;
+		return new EqualsBuilder().append(interfaceName, castOther.interfaceName).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(interfaceName).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LineOfBusiness.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LineOfBusiness.java
new file mode 100644
index 0000000000..5868da563c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LineOfBusiness.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("line-of-business")
+public class LineOfBusiness implements Serializable, ShallowCopy<LineOfBusiness> {
+
+	private static final long serialVersionUID = -7697815326894443926L;
+
+	@Id
+	@JsonProperty("line-of-business-name")
+	private String lineOfBusinessName;
+
+	public String getLineOfBusinessName() {
+		return lineOfBusinessName;
+	}
+
+	public void setLineOfBusinessName(String lineOfBusinessName) {
+		this.lineOfBusinessName = lineOfBusinessName;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof LineOfBusiness)) {
+			return false;
+		}
+		LineOfBusiness castOther = (LineOfBusiness) other;
+		return new EqualsBuilder().append(lineOfBusinessName, castOther.lineOfBusinessName).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(lineOfBusinessName).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Metadatum.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Metadatum.java
new file mode 100644
index 0000000000..2e7d278901
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Metadatum.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+public class Metadatum implements Serializable, ShallowCopy<Metadatum>{
+	
+	private static final long serialVersionUID = -2259570072414712965L;
+
+	@Id
+	@JsonProperty("metaname")
+	private String metaname;
+	@JsonProperty("metaval")
+	private String metaval;
+	
+	public String getMetaname() {
+		return metaname;
+	}
+	public void setMetaname(String metaname) {
+		this.metaname = metaname;
+	}
+	public String getMetaval() {
+		return metaval;
+	}
+	public void setMetaval(String metaval) {
+		this.metaval = metaval;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Metadatum)) {
+			return false;
+		}
+		Metadatum castOther = (Metadatum) other;
+		return new EqualsBuilder().append(metaname, castOther.metaname).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(metaname).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/NetworkPolicy.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/NetworkPolicy.java
new file mode 100644
index 0000000000..a920a585cb
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/NetworkPolicy.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+public class NetworkPolicy implements Serializable, ShallowCopy<NetworkPolicy>{
+
+	private static final long serialVersionUID = 8925599588239522447L;
+	
+	@Id
+	@JsonProperty("network-policy-id")
+	private String networkPolicyId;
+	@JsonProperty("network-policy-fqdn")
+	private String networkPolicyFqdn;
+	@JsonProperty("heat-stack-id")
+	private String heatStackId;
+	@JsonProperty("resource-version")
+	private String resourceVersion;
+	
+	public String getNetworkPolicyId() {
+		return this.networkPolicyId;
+	}
+	
+	public void setNetworkPolicyId(String networkPolicyId) {
+		this.networkPolicyId = networkPolicyId;
+	}
+	
+	public String getNetworkPolicyFqdn() {
+		return this.networkPolicyFqdn;
+	}
+	
+	public void setNetworkPolicyFqdn(String networkPolicyFqdn) {
+		this.networkPolicyFqdn = networkPolicyFqdn;
+	}
+	
+	public String getHeatStackId() {
+		return this.heatStackId;
+	}
+	
+	public void setHeatStackId(String heatStackId) {
+		this.heatStackId = heatStackId;
+	}
+	
+	public String getResourceVersion() {
+		return this.resourceVersion;
+	}
+	
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof NetworkPolicy)) {
+			return false;
+		}
+		NetworkPolicy castOther = (NetworkPolicy) other;
+		return new EqualsBuilder().append(networkPolicyId, castOther.networkPolicyId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(networkPolicyId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/OwningEntity.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/OwningEntity.java
new file mode 100644
index 0000000000..e28e41ed46
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/OwningEntity.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("owning-entity")
+public class OwningEntity implements Serializable, ShallowCopy<OwningEntity> {
+
+	private static final long serialVersionUID = -6565917570694869603L;
+	
+	@Id
+	@JsonProperty("owning-entity-id")
+	private String owningEntityId;
+	@JsonProperty("owning-entity-name")
+	private String owningEntityName;
+
+	public String getOwningEntityId() {
+		return owningEntityId;
+	}
+	public void setOwningEntityId(String owningEntityId) {
+		this.owningEntityId = owningEntityId;
+	}
+	public String getOwningEntityName() {
+		return owningEntityName;
+	}
+	public void setOwningEntityName(String owningEntityName) {
+		this.owningEntityName = owningEntityName;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof OwningEntity)) {
+			return false;
+		}
+		OwningEntity castOther = (OwningEntity) other;
+		return new EqualsBuilder().append(owningEntityId, castOther.owningEntityId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(owningEntityId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java
new file mode 100644
index 0000000000..498d096e65
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+
+public class PServer implements Serializable, ShallowCopy<PServer> {
+
+	private static final long serialVersionUID = 1378547515775540874L;
+
+	@Id
+    @JsonProperty("pserver-id")
+	private String pserverId;
+    @JsonProperty("hostname")
+	private String hostname;
+    @JsonProperty("physical-links")
+	private List<PhysicalLink> physicalLinks = new ArrayList<PhysicalLink>(); //TODO techincally there is a pInterface between (pserver <--> physical-link) but dont really need that pojo
+
+	public String getPserverId(){
+		return pserverId;
+	}
+
+	public void setPserverId(String pserverId){
+		this.pserverId = pserverId;
+	}
+
+	public String getHostname(){
+		return hostname;
+	}
+
+	public void setHostname(String hostname){
+		this.hostname = hostname;
+	}
+
+	public List<PhysicalLink> getPhysicalLinks(){
+		return physicalLinks;
+	}
+
+	@Override
+		public boolean equals(final Object other){
+			if(!(other instanceof PServer)){
+				return false;
+			}
+			PServer castOther = (PServer) other;
+			return new EqualsBuilder().append(pserverId, castOther.pserverId).isEquals();
+		}
+
+	@Override
+		public int hashCode(){
+			return new HashCodeBuilder().append(pserverId).toHashCode();
+		}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java
new file mode 100644
index 0000000000..4f54139386
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java
@@ -0,0 +1,149 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("physical-link")
+public class PhysicalLink implements Serializable, ShallowCopy<PhysicalLink> {
+
+	private static final long serialVersionUID = -6378347998443741227L;
+
+	@Id
+    @JsonProperty("link-name")
+	private String linkName;
+    @JsonProperty("interface-name")
+	private String interfaceName;
+    @JsonProperty("service-provider-name")
+	private String serviceProviderName;
+    @JsonProperty("circuit-id")
+	private String circuitId;
+    @JsonProperty("management-option")
+	private String managementOption;
+    @JsonProperty("bandwidth-up")
+	private int bandwidthUp;
+    @JsonProperty("bandwidth-down")
+	private int bandwidthDown;
+    @JsonProperty("bandwidth-units")
+	private String bandwidthUnits;
+    @JsonProperty("wan-port")
+	private String wanPort;
+
+
+	public String getLinkName(){
+		return linkName;
+	}
+
+	public void setLinkName(String linkName){
+		this.linkName = linkName;
+	}
+
+	public String getInterfaceName(){
+		return interfaceName;
+	}
+
+	public void setInterfaceName(String interfaceName){
+		this.interfaceName = interfaceName;
+	}
+
+
+	public String getServiceProviderName(){
+		return serviceProviderName;
+	}
+
+
+	public void setServiceProviderName(String serviceProviderName){
+		this.serviceProviderName = serviceProviderName;
+	}
+
+	public String getCircuitId(){
+		return circuitId;
+	}
+
+	public void setCircuitId(String circuitId){
+		this.circuitId = circuitId;
+	}
+
+	public String getManagementOption(){
+		return managementOption;
+	}
+
+	public void setManagementOption(String managementOption){
+		this.managementOption = managementOption;
+	}
+
+	public int getBandwidthUp(){
+		return bandwidthUp;
+	}
+
+	public void setBandwidthUp(int bandwidthUp){
+		this.bandwidthUp = bandwidthUp;
+	}
+
+	public int getBandwidthDown(){
+		return bandwidthDown;
+	}
+
+	public void setBandwidthDown(int bandwidthDown){
+		this.bandwidthDown = bandwidthDown;
+	}
+
+	public String getBandwidthUnits(){
+		return bandwidthUnits;
+	}
+
+	public void setBandwidthUnits(String bandwidthUnits){
+		this.bandwidthUnits = bandwidthUnits;
+	}
+
+	public String getWanPort(){
+		return wanPort;
+	}
+
+	public void setWanPort(String wanPort){
+		this.wanPort = wanPort;
+	}
+
+
+	@Override
+	public boolean equals(final Object other){
+		if(!(other instanceof PhysicalLink)){
+			return false;
+		}
+		PhysicalLink castOther = (PhysicalLink) other;
+		return new EqualsBuilder().append(linkName, castOther.linkName).isEquals();
+	}
+
+	@Override
+	public int hashCode(){
+		return new HashCodeBuilder().append(linkName).toHashCode();
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Platform.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Platform.java
new file mode 100644
index 0000000000..642417fa56
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Platform.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("platform")
+public class Platform implements Serializable, ShallowCopy<Platform> {
+
+	private static final long serialVersionUID = -9127507763010448699L;
+
+	@Id
+	@JsonProperty("platform-name")
+	private String platformName;
+
+	public String getPlatformName() {
+		return platformName;
+	}
+
+	public void setPlatformName(String platformName) {
+		this.platformName = platformName;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Platform)) {
+			return false;
+		}
+		Platform castOther = (Platform) other;
+		return new EqualsBuilder().append(platformName, castOther.platformName).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(platformName).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Pnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Pnf.java
new file mode 100644
index 0000000000..2ec4108343
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Pnf.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("pnf")
+public class Pnf implements Serializable, ShallowCopy<Pnf> {
+
+	private static final long serialVersionUID = -2544848120774529501L;
+
+	@Id
+    @JsonProperty("pnf-id")
+    private String pnfId;
+
+    @JsonProperty("pnf-name")
+    private String pnfName;
+
+    @JsonProperty("role")
+    private String role;
+
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+
+    @JsonProperty("cloud-region")
+    private CloudRegion cloudRegion;
+
+
+	public String getPnfId() {
+		return pnfId;
+	}
+
+	public void setPnfId(String pnfId) {
+		this.pnfId = pnfId;
+	}
+
+	public String getPnfName() {
+		return pnfName;
+	}
+
+	public void setPnfName(String pnfName) {
+		this.pnfName = pnfName;
+	}
+
+	/**
+	 * Distinguishes Primary or Secondary
+	 */
+	public String getRole() {
+		return role;
+	}
+
+	/**
+	 * Distinguishes Primary or Secondary
+	 */
+	public void setRole(String role) {
+		this.role = role;
+	}
+
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+
+	public CloudRegion getCloudRegion() {
+		return cloudRegion;
+	}
+
+	public void setCloudRegion(CloudRegion cloudRegion) {
+		this.cloudRegion = cloudRegion;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Pnf)) {
+			return false;
+		}
+		Pnf castOther = (Pnf) other;
+		return new EqualsBuilder().append(pnfId, castOther.pnfId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(pnfId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Project.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Project.java
new file mode 100644
index 0000000000..a815f6af1a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Project.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("project")
+public class Project implements Serializable, ShallowCopy<Project> {
+
+	private static final long serialVersionUID = 2449880559554533585L;
+	
+	@Id
+	@JsonProperty("project-name")
+	private String projectName;
+
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Project)) {
+			return false;
+		}
+		Project castOther = (Project) other;
+		return new EqualsBuilder().append(projectName, castOther.projectName).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(projectName).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTableReference.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTableReference.java
new file mode 100644
index 0000000000..0d8c3201bc
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTableReference.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+public class RouteTableReference implements Serializable, ShallowCopy<RouteTableReference> {
+
+	private static final long serialVersionUID = -698474994443040491L;
+	
+	@Id
+	@JsonProperty("route-table-reference-id")
+	private String routeTableReferenceId;
+	@JsonProperty("route-table-reference-fqdn")
+	private String routeTableReferenceFqdn;
+	@JsonProperty("resource-version")
+	private String resourceVersion;
+	
+	public String getRouteTableReferenceId() {
+		return routeTableReferenceId;
+	}
+	public void setRouteTableReferenceId(String routeTableReferenceId) {
+		this.routeTableReferenceId = routeTableReferenceId;
+	}
+	public String getRouteTableReferenceFqdn() {
+		return routeTableReferenceFqdn;
+	}
+	public void setRouteTableReferenceFqdn(String routeTableReferenceFqdn) {
+		this.routeTableReferenceFqdn = routeTableReferenceFqdn;
+	}
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof RouteTableReference)) {
+			return false;
+		}
+		RouteTableReference castOther = (RouteTableReference) other;
+		return new EqualsBuilder().append(routeTableReferenceId, castOther.routeTableReferenceId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(routeTableReferenceId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTarget.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTarget.java
new file mode 100644
index 0000000000..fc97306cfe
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/RouteTarget.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("route-target")
+public class RouteTarget implements Serializable, ShallowCopy<RouteTarget> {
+	private static final long serialVersionUID = -4635525992843470461L;
+	
+	@Id
+	@JsonProperty("global-route-target")
+    protected String globalRouteTarget;
+	@Id
+    @JsonProperty("route-target-role")
+    protected String routeTargetRole;
+    @JsonProperty("resource-version")
+    protected String resourceVersion;
+
+    public String getGlobalRouteTarget() {
+        return globalRouteTarget;
+    }
+
+    public void setGlobalRouteTarget(String value) {
+        this.globalRouteTarget = value;
+    }
+
+    public String getRouteTargetRole() {
+        return routeTargetRole;
+    }
+
+    public void setRouteTargetRole(String value) {
+        this.routeTargetRole = value;
+    }
+
+    public String getResourceVersion() {
+        return resourceVersion;
+    }
+
+    public void setResourceVersion(String value) {
+        this.resourceVersion = value;
+    }
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof RouteTarget)) {
+			return false;
+		}
+		RouteTarget castOther = (RouteTarget) other;
+		return new EqualsBuilder().append(globalRouteTarget, castOther.globalRouteTarget)
+				.append(routeTargetRole, castOther.routeTargetRole).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(globalRouteTarget).append(routeTargetRole).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SegmentationAssignment.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SegmentationAssignment.java
new file mode 100644
index 0000000000..a299f1ef42
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SegmentationAssignment.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("segmentation-assignment")
+public class SegmentationAssignment implements Serializable, ShallowCopy<SegmentationAssignment>{
+
+	private static final long serialVersionUID = 5751570091375657521L;
+
+	@Id
+	@JsonProperty("segmentation-id")
+    private String segmentationId;
+
+	public String getSegmentationId() {
+		return segmentationId;
+	}
+	public void setSegmentationId(String segmentationId) {
+		this.segmentationId = segmentationId;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof SegmentationAssignment)) {
+			return false;
+		}
+		SegmentationAssignment castOther = (SegmentationAssignment) other;
+		return new EqualsBuilder().append(segmentationId, castOther.segmentationId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(segmentationId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java
new file mode 100644
index 0000000000..259a988262
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java
@@ -0,0 +1,206 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.Metadata;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.homingobjects.SolutionInfo;
+
+@JsonRootName("service-instance")
+public class ServiceInstance implements Serializable, ShallowCopy<ServiceInstance> {
+
+	private static final long serialVersionUID = -1843348234891739356L;
+
+	@Id
+	@JsonProperty("service-instance-id")
+	private String serviceInstanceId;
+	@JsonProperty("service-instance-name")
+	private String serviceInstanceName;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("owning-entity")
+	private OwningEntity owningEntity;
+	@JsonProperty("project")
+	private Project project;
+	@JsonProperty("collection")
+	private Collection collection;
+	@JsonProperty("vnfs")
+	private List<GenericVnf> vnfs = new ArrayList<>();
+	@JsonProperty("pnfs")
+	private List<Pnf> pnfs = new ArrayList<>();
+	@JsonProperty("allotted-resources")
+	private List<AllottedResource> allottedResources = new ArrayList<>();
+	@JsonProperty("networks")
+	private List<L3Network> networks = new ArrayList<>();
+	@JsonProperty("vpn-bonding-links")
+	private List<VpnBondingLink> vpnBondingLinks = new ArrayList<>();
+	@JsonProperty("vhn-portal-url")
+    private String vhnPortalUrl;
+	@JsonProperty("service-instance-location-id")
+    private String serviceInstanceLocationId;
+	@JsonProperty("selflink")
+    private String selflink;
+	@JsonProperty("metadata")
+    private Metadata metadata;
+	@JsonProperty("configurations")
+	private List<Configuration> configurations = new ArrayList<>();
+	@JsonProperty("solution-info")
+	private SolutionInfo solutionInfo;
+	@JsonProperty("model-info-service-instance")
+	private ModelInfoServiceInstance modelInfoServiceInstance;
+
+	public List<GenericVnf> getVnfs() {
+		return vnfs;
+	}
+	public List<AllottedResource> getAllottedResources() {
+		return allottedResources;
+	}
+	public List<L3Network> getNetworks() {
+		return networks;
+	}
+	public ModelInfoServiceInstance getModelInfoServiceInstance() {
+		return modelInfoServiceInstance;
+	}
+	public void setModelInfoServiceInstance(ModelInfoServiceInstance modelInfoServiceInstance) {
+		this.modelInfoServiceInstance = modelInfoServiceInstance;
+	}
+	public List<Configuration> getConfigurations() {
+		return configurations;
+	}
+	public void setConfigurations(List<Configuration> configurations) {
+		this.configurations = configurations;
+	}
+	public String getVhnPortalUrl() {
+		return vhnPortalUrl;
+	}
+
+	public void setVhnPortalUrl(String vhnPortalUrl) {
+		this.vhnPortalUrl = vhnPortalUrl;
+	}
+
+	public String getServiceInstanceLocationId() {
+		return serviceInstanceLocationId;
+	}
+
+	public void setServiceInstanceLocationId(String serviceInstanceLocationId) {
+		this.serviceInstanceLocationId = serviceInstanceLocationId;
+	}
+
+	public String getSelflink() {
+		return selflink;
+	}
+
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+
+	public Metadata getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Metadata metadata) {
+		this.metadata = metadata;
+	}
+
+	public String getServiceInstanceId() {
+		return serviceInstanceId;
+	}
+
+	public void setServiceInstanceId(String serviceInstanceId) {
+		this.serviceInstanceId = serviceInstanceId;
+	}
+
+	public String getServiceInstanceName() {
+		return serviceInstanceName;
+	}
+
+	public void setServiceInstanceName(String serviceInstanceName) {
+		this.serviceInstanceName = serviceInstanceName;
+	}
+
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+
+	public OwningEntity getOwningEntity() {
+		return owningEntity;
+	}
+
+	public void setOwningEntity(OwningEntity owningEntity) {
+		this.owningEntity = owningEntity;
+	}
+
+	public Project getProject() {
+		return project;
+	}
+
+	public void setProject(Project project) {
+		this.project = project;
+	}
+
+	public Collection getCollection() {
+		return collection;
+	}
+	public void setCollection(Collection collection) {
+		this.collection = collection;
+	}
+	public List<VpnBondingLink> getVpnBondingLinks() {
+		return vpnBondingLinks;
+	}
+	public List<Pnf> getPnfs() {
+		return pnfs;
+	}
+	public SolutionInfo getSolutionInfo() {
+		return solutionInfo;
+	}
+	public void setSolutionInfo(SolutionInfo solutionInfo) {
+		this.solutionInfo = solutionInfo;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof ServiceInstance)) {
+			return false;
+		}
+		ServiceInstance castOther = (ServiceInstance) other;
+		return new EqualsBuilder().append(serviceInstanceId, castOther.serviceInstanceId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(serviceInstanceId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceProxy.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceProxy.java
new file mode 100644
index 0000000000..fa076770d7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceProxy.java
@@ -0,0 +1,108 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.homingobjects.SolutionCandidates;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceProxy;
+
+import java.io.Serializable;
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+@JsonRootName("service-proxy")
+public class ServiceProxy extends SolutionCandidates implements Serializable, ShallowCopy<ServiceProxy> {
+    private static final long serialVersionUID = 1491890223056651430L;
+
+    @Id
+    @JsonProperty("id")
+    private String id;
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("service-instance")
+    private ServiceInstance serviceInstance;
+
+    @JsonProperty("model-info-service-proxy")
+    private ModelInfoServiceProxy modelInfoServiceProxy;
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * Way to identify the type of proxy
+	 * i.e. "infrastructure", "transport", etc.
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Way to identify the type of proxy
+	 * i.e. "infrastructure", "transport", etc.
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public ServiceInstance getServiceInstance() {
+		return serviceInstance;
+	}
+
+	public void setServiceInstance(ServiceInstance serviceInstance) {
+		this.serviceInstance = serviceInstance;
+	}
+
+	public ModelInfoServiceProxy getModelInfoServiceProxy() {
+		return modelInfoServiceProxy;
+	}
+
+	public void setModelInfoServiceProxy(ModelInfoServiceProxy modelInfoServiceProxy) {
+		this.modelInfoServiceProxy = modelInfoServiceProxy;
+	}
+
+	@Override
+	public boolean equals(final Object other){
+		if(!(other instanceof ServiceProxy)){
+			return false;
+		}
+		ServiceProxy castOther = (ServiceProxy) other;
+		return new EqualsBuilder().append(id, castOther.id).isEquals();
+	}
+
+	@Override
+	public int hashCode(){
+		return new HashCodeBuilder().append(id).toHashCode();
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java
new file mode 100644
index 0000000000..56f95516b1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("service-subscription")
+public class ServiceSubscription implements Serializable, ShallowCopy<ServiceSubscription>{
+
+	private static final long serialVersionUID = 9064449329296611436L;
+
+	@Id
+	@JsonProperty("service-type")
+	private String serviceType;
+	@JsonProperty("temp-ub-sub-account-id")
+	private String tempUbSubAccountId;
+	@JsonProperty("service-instances")
+	private List<ServiceInstance> serviceInstances = new ArrayList<ServiceInstance>();
+
+	public String getServiceType() {
+		return serviceType;
+	}
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+	public String getTempUbSubAccountId() {
+		return tempUbSubAccountId;
+	}
+	public void setTempUbSubAccountId(String tempUbSubAccountId) {
+		this.tempUbSubAccountId = tempUbSubAccountId;
+	}
+	public List<ServiceInstance> getServiceInstances() {
+		return serviceInstances;
+	}
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof ServiceSubscription)) {
+			return false;
+		}
+		ServiceSubscription castOther = (ServiceSubscription) other;
+		return new EqualsBuilder().append(serviceType, castOther.serviceType).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(serviceType).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SriovVf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SriovVf.java
new file mode 100644
index 0000000000..fcea22819e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/SriovVf.java
@@ -0,0 +1,156 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("sriov-vf")
+public class SriovVf implements Serializable, ShallowCopy<SriovVf>{
+
+	private static final long serialVersionUID = -7790331637399859914L;
+
+	@Id
+	@JsonProperty("pci-id")
+    private String pciId;
+	@JsonProperty("vf-vlan-filter")
+    private String vfVlanFilter;
+	@JsonProperty("vf-mac-filter")
+    private String vfMacFilter;
+	@JsonProperty("vf-vlan-strip")
+    private Boolean vfVlanStrip;
+	@JsonProperty("vf-vlan-anti-spoof-check")
+    private Boolean vfVlanAntiSpoofCheck;
+	@JsonProperty("vf-mac-anti-spoof-check")
+    private Boolean vfMacAntiSpoofCheck;
+	@JsonProperty("vf-mirrors")
+    private String vfMirrors;
+	@JsonProperty("vf-broadcast-allow")
+    private Boolean vfBroadcastAllow;
+	@JsonProperty("vf-unknown-multicast-allow")
+    private Boolean vfUnknownMulticastAllow;
+	@JsonProperty("vf-unknown-unicast-allow")
+    private Boolean vfUnknownUnicastAllow;
+	@JsonProperty("vf-insert-stag")
+    private Boolean vfInsertStag;
+	@JsonProperty("vf-link-status")
+    private String vfLinkStatus;
+	@JsonProperty("neutron-network-id")
+    private String neutronNetworkId;
+
+	public String getPciId() {
+		return pciId;
+	}
+	public void setPciId(String pciId) {
+		this.pciId = pciId;
+	}
+	public String getVfVlanFilter() {
+		return vfVlanFilter;
+	}
+	public void setVfVlanFilter(String vfVlanFilter) {
+		this.vfVlanFilter = vfVlanFilter;
+	}
+	public String getVfMacFilter() {
+		return vfMacFilter;
+	}
+	public void setVfMacFilter(String vfMacFilter) {
+		this.vfMacFilter = vfMacFilter;
+	}
+	public Boolean getVfVlanStrip() {
+		return vfVlanStrip;
+	}
+	public void setVfVlanStrip(Boolean vfVlanStrip) {
+		this.vfVlanStrip = vfVlanStrip;
+	}
+	public Boolean getVfVlanAntiSpoofCheck() {
+		return vfVlanAntiSpoofCheck;
+	}
+	public void setVfVlanAntiSpoofCheck(Boolean vfVlanAntiSpoofCheck) {
+		this.vfVlanAntiSpoofCheck = vfVlanAntiSpoofCheck;
+	}
+	public Boolean getVfMacAntiSpoofCheck() {
+		return vfMacAntiSpoofCheck;
+	}
+	public void setVfMacAntiSpoofCheck(Boolean vfMacAntiSpoofCheck) {
+		this.vfMacAntiSpoofCheck = vfMacAntiSpoofCheck;
+	}
+	public String getVfMirrors() {
+		return vfMirrors;
+	}
+	public void setVfMirrors(String vfMirrors) {
+		this.vfMirrors = vfMirrors;
+	}
+	public Boolean getVfBroadcastAllow() {
+		return vfBroadcastAllow;
+	}
+	public void setVfBroadcastAllow(Boolean vfBroadcastAllow) {
+		this.vfBroadcastAllow = vfBroadcastAllow;
+	}
+	public Boolean getVfUnknownMulticastAllow() {
+		return vfUnknownMulticastAllow;
+	}
+	public void setVfUnknownMulticastAllow(Boolean vfUnknownMulticastAllow) {
+		this.vfUnknownMulticastAllow = vfUnknownMulticastAllow;
+	}
+	public Boolean getVfUnknownUnicastAllow() {
+		return vfUnknownUnicastAllow;
+	}
+	public void setVfUnknownUnicastAllow(Boolean vfUnknownUnicastAllow) {
+		this.vfUnknownUnicastAllow = vfUnknownUnicastAllow;
+	}
+	public Boolean getVfInsertStag() {
+		return vfInsertStag;
+	}
+	public void setVfInsertStag(Boolean vfInsertStag) {
+		this.vfInsertStag = vfInsertStag;
+	}
+	public String getVfLinkStatus() {
+		return vfLinkStatus;
+	}
+	public void setVfLinkStatus(String vfLinkStatus) {
+		this.vfLinkStatus = vfLinkStatus;
+	}
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof SriovVf)) {
+			return false;
+		}
+		SriovVf castOther = (SriovVf) other;
+		return new EqualsBuilder().append(pciId, castOther.pciId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(pciId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java
new file mode 100644
index 0000000000..cb23f3a3b9
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java
@@ -0,0 +1,173 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("subnet")
+public class Subnet implements Serializable, ShallowCopy<Subnet>{
+
+	private static final long serialVersionUID = -6789344717555598319L;
+
+	@Id
+	@JsonProperty("subnet-id")
+    private String subnetId;
+	@JsonProperty("subnet-name")
+    private String subnetName;
+	@JsonProperty("neutron-subnet-id")
+    private String neutronSubnetId;
+	@JsonProperty("gateway-address")
+    private String gatewayAddress;
+	@JsonProperty("network-start-address")
+    private String networkStartAddress;
+	@JsonProperty("cidr-mask")
+    private String cidrMask;
+	@JsonProperty("ip-version")
+    private String ipVersion;
+	@JsonProperty("orchestration-status")
+    private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("dhcp-enabled")
+    private boolean dhcpEnabled;
+	@JsonProperty("dhcp-start")
+    private String dhcpStart;
+	@JsonProperty("dhcp-end")
+    private String dhcpEnd;
+	@JsonProperty("subnet-role")
+    private String subnetRole;
+	@JsonProperty("ip-assignment-direction")
+    private String ipAssignmentDirection;
+	@JsonProperty("subnet-sequence")
+    private Integer subnetSequence;
+	@JsonProperty("host-routes")
+    private List<HostRoute> hostRoutes = new ArrayList<>();
+
+	public String getSubnetId() {
+		return subnetId;
+	}
+	public void setSubnetId(String subnetId) {
+		this.subnetId = subnetId;
+	}
+	public String getSubnetName() {
+		return subnetName;
+	}
+	public void setSubnetName(String subnetName) {
+		this.subnetName = subnetName;
+	}
+	public String getNeutronSubnetId() {
+		return neutronSubnetId;
+	}
+	public void setNeutronSubnetId(String neutronSubnetId) {
+		this.neutronSubnetId = neutronSubnetId;
+	}
+	public String getGatewayAddress() {
+		return gatewayAddress;
+	}
+	public void setGatewayAddress(String gatewayAddress) {
+		this.gatewayAddress = gatewayAddress;
+	}
+	public String getNetworkStartAddress() {
+		return networkStartAddress;
+	}
+	public void setNetworkStartAddress(String networkStartAddress) {
+		this.networkStartAddress = networkStartAddress;
+	}
+	public String getCidrMask() {
+		return cidrMask;
+	}
+	public void setCidrMask(String cidrMask) {
+		this.cidrMask = cidrMask;
+	}
+	public String getIpVersion() {
+		return ipVersion;
+	}
+	public void setIpVersion(String ipVersion) {
+		this.ipVersion = ipVersion;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public boolean isDhcpEnabled() {
+		return dhcpEnabled;
+	}
+	public void setDhcpEnabled(boolean dhcpEnabled) {
+		this.dhcpEnabled = dhcpEnabled;
+	}
+	public String getDhcpStart() {
+		return dhcpStart;
+	}
+	public void setDhcpStart(String dhcpStart) {
+		this.dhcpStart = dhcpStart;
+	}
+	public String getDhcpEnd() {
+		return dhcpEnd;
+	}
+	public void setDhcpEnd(String dhcpEnd) {
+		this.dhcpEnd = dhcpEnd;
+	}
+	public String getSubnetRole() {
+		return subnetRole;
+	}
+	public void setSubnetRole(String subnetRole) {
+		this.subnetRole = subnetRole;
+	}
+	public String getIpAssignmentDirection() {
+		return ipAssignmentDirection;
+	}
+	public void setIpAssignmentDirection(String ipAssignmentDirection) {
+		this.ipAssignmentDirection = ipAssignmentDirection;
+	}
+	public Integer getSubnetSequence() {
+		return subnetSequence;
+	}
+	public void setSubnetSequence(Integer subnetSequence) {
+		this.subnetSequence = subnetSequence;
+	}
+	public List<HostRoute> getHostRoutes() {
+		return hostRoutes;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Subnet)) {
+			return false;
+		}
+		Subnet castOther = (Subnet) other;
+		return new EqualsBuilder().append(subnetId, castOther.subnetId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(subnetId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java
new file mode 100644
index 0000000000..fba78d7a87
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("vf-module")
+public class VfModule implements Serializable, ShallowCopy<VfModule> {
+	
+	private static final long serialVersionUID = 6570087672008609773L;
+
+	@Id
+	@JsonProperty("vf-module-id")
+	private String vfModuleId;
+	@JsonProperty("vf-module-name")
+	private String vfModuleName;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("cloud-params")
+	private Map<String, String> cloudParams = new HashMap<>();
+	@JsonProperty("cascaded")
+	private boolean cascaded;
+	@JsonProperty("heat-stack-id")
+    private String heatStackId;
+	@JsonProperty("contrail-service-instance-fqdn")
+    private String contrailServiceInstanceFqdn;
+	@JsonProperty("module-index")
+    private Integer moduleIndex;
+	@JsonProperty("selflink")
+    private String selflink;
+	@JsonProperty("model-info-vf-module")
+	private ModelInfoVfModule modelInfoVfModule;
+
+	public ModelInfoVfModule getModelInfoVfModule() {
+		return modelInfoVfModule;
+	}
+	public void setModelInfoVfModule(ModelInfoVfModule modelInfoVfModule) {
+		this.modelInfoVfModule = modelInfoVfModule;
+	}
+	public String getHeatStackId() {
+		return heatStackId;
+	}
+	public void setHeatStackId(String heatStackId) {
+		this.heatStackId = heatStackId;
+	}
+	public String getContrailServiceInstanceFqdn() {
+		return contrailServiceInstanceFqdn;
+	}
+	public void setContrailServiceInstanceFqdn(String contrailServiceInstanceFqdn) {
+		this.contrailServiceInstanceFqdn = contrailServiceInstanceFqdn;
+	}
+	public Integer getModuleIndex() {
+		return moduleIndex;
+	}
+	public void setModuleIndex(Integer moduleIndex) {
+		this.moduleIndex = moduleIndex;
+	}
+	public String getSelflink() {
+		return selflink;
+	}
+	public void setSelflink(String selflink) {
+		this.selflink = selflink;
+	}
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+	public String getVfModuleName() {
+		return vfModuleName;
+	}
+	public void setVfModuleName(String vfModuleName) {
+		this.vfModuleName = vfModuleName;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public Map<String, String> getCloudParams() {
+		return cloudParams;
+	}
+	public void setCloudParams(Map<String, String> cloudParams) {
+		this.cloudParams = cloudParams;
+	}
+	public boolean isCascaded() {
+		return cascaded;
+	}
+	public void setCascaded(boolean cascaded) {
+		this.cascaded = cascaded;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof VfModule)) {
+			return false;
+		}
+		VfModule castOther = (VfModule) other;
+		return new EqualsBuilder().append(vfModuleId, castOther.vfModuleId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vfModuleId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
new file mode 100644
index 0000000000..65eeedc44c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
@@ -0,0 +1,162 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+import javax.persistence.Id;
+
+@JsonRootName("vlan")
+public class Vlan implements Serializable, ShallowCopy<Vlan>{
+
+	private static final long serialVersionUID = 1260512753640402946L;
+
+	@Id
+	@JsonProperty("vlan-interface")
+    private String vlanInterface;
+	@JsonProperty("vlan-id-inner")
+    private Long vlanIdInner;
+	@JsonProperty("vlan-id-outer")
+    private Long vlanIdOuter;
+	@JsonProperty("speed-value")
+    private String speedValue;
+	@JsonProperty("speed-units")
+    private String speedUnits;
+	@JsonProperty("vlan-description")
+    private String vlanDescription;
+	@JsonProperty("backdoor-connection")
+    private String backdoorConnection;
+	@JsonProperty("vpn-key")
+    private String vpnKey;
+	@JsonProperty("orchestration-status")
+    private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("in-maint")
+    private boolean inMaint;
+	@JsonProperty("prov-status")
+    private String provStatus;
+	@JsonProperty("is-ip-unnumbered")
+    private boolean isIpUnnumbered;
+	@JsonProperty("l3-interface-ipv4-address-list")
+    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
+	@JsonProperty("l3-interface-ipv6-address-list")
+    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
+
+	public String getVlanInterface() {
+		return vlanInterface;
+	}
+	public void setVlanInterface(String vlanInterface) {
+		this.vlanInterface = vlanInterface;
+	}
+	public Long getVlanIdInner() {
+		return vlanIdInner;
+	}
+	public void setVlanIdInner(Long vlanIdInner) {
+		this.vlanIdInner = vlanIdInner;
+	}
+	public Long getVlanIdOuter() {
+		return vlanIdOuter;
+	}
+	public void setVlanIdOuter(Long vlanIdOuter) {
+		this.vlanIdOuter = vlanIdOuter;
+	}
+	public String getSpeedValue() {
+		return speedValue;
+	}
+	public void setSpeedValue(String speedValue) {
+		this.speedValue = speedValue;
+	}
+	public String getSpeedUnits() {
+		return speedUnits;
+	}
+	public void setSpeedUnits(String speedUnits) {
+		this.speedUnits = speedUnits;
+	}
+	public String getVlanDescription() {
+		return vlanDescription;
+	}
+	public void setVlanDescription(String vlanDescription) {
+		this.vlanDescription = vlanDescription;
+	}
+	public String getBackdoorConnection() {
+		return backdoorConnection;
+	}
+	public void setBackdoorConnection(String backdoorConnection) {
+		this.backdoorConnection = backdoorConnection;
+	}
+	public String getVpnKey() {
+		return vpnKey;
+	}
+	public void setVpnKey(String vpnKey) {
+		this.vpnKey = vpnKey;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public boolean isInMaint() {
+		return inMaint;
+	}
+	public void setInMaint(boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+	public String getProvStatus() {
+		return provStatus;
+	}
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+	public boolean isIpUnnumbered() {
+		return isIpUnnumbered;
+	}
+	public void setIpUnnumbered(boolean isIpUnnumbered) {
+		this.isIpUnnumbered = isIpUnnumbered;
+	}
+	public List<L3InterfaceIpv4AddressList> getL3InterfaceIpv4AddressList() {
+		return l3InterfaceIpv4AddressList;
+	}
+	public List<L3InterfaceIpv6AddressList> getL3InterfaceIpv6AddressList() {
+		return l3InterfaceIpv6AddressList;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof Vlan)) {
+			return false;
+		}
+		Vlan castOther = (Vlan) other;
+		return new EqualsBuilder().append(vlanInterface, castOther.vlanInterface).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vlanInterface).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java
new file mode 100644
index 0000000000..565a151077
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java
@@ -0,0 +1,121 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("volume-group")
+public class VolumeGroup implements Serializable, ShallowCopy<VolumeGroup> {
+
+	private static final long serialVersionUID = 870124265764370922L;
+	
+	@Id
+	@JsonProperty("volume-group-id")
+	private String volumeGroupId;
+	@JsonProperty("volume-group-name")
+	private String volumeGroupName;
+	@JsonProperty("vnf-type")
+	private String vnfType;
+	@JsonProperty("orchestration-status")
+	private OrchestrationStatus orchestrationStatus;
+	@JsonProperty("cloud-params")
+	private Map<String, String> cloudParams = new HashMap<>();
+	@JsonProperty("cascaded")
+	private boolean cascaded;
+	@JsonProperty("heat-stack-id")
+	private String heatStackId;
+	@JsonProperty("model-info-vf-module")
+	private ModelInfoVfModule modelInfoVfModule;
+
+	public ModelInfoVfModule getModelInfoVfModule() {
+		return modelInfoVfModule;
+	}
+	public void setModelInfoVfModule(ModelInfoVfModule modelInfoVfModule) {
+		this.modelInfoVfModule = modelInfoVfModule;
+	}
+	public String getHeatStackId() {
+		return heatStackId;
+	}
+	public void setHeatStackId(String heatStackId) {
+		this.heatStackId = heatStackId;
+	}
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+	public String getVolumeGroupName() {
+		return volumeGroupName;
+	}
+	public void setVolumeGroupName(String volumeGroupName) {
+		this.volumeGroupName = volumeGroupName;
+	}
+	public String getVnfType() {
+		return vnfType;
+	}
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+	public OrchestrationStatus getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+	public Map<String, String> getCloudParams() {
+		return cloudParams;
+	}
+	public void setCloudParams(Map<String, String> cloudParams) {
+		this.cloudParams = cloudParams;
+	}
+	public boolean isCascaded() {
+		return cascaded;
+	}
+	public void setCascaded(boolean cascaded) {
+		this.cascaded = cascaded;
+	}
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof VolumeGroup)) {
+			return false;
+		}
+		VolumeGroup castOther = (VolumeGroup) other;
+		return new EqualsBuilder().append(volumeGroupId, castOther.volumeGroupId).isEquals();
+	}
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(volumeGroupId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBinding.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBinding.java
new file mode 100644
index 0000000000..36e1af443c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBinding.java
@@ -0,0 +1,141 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+
+@JsonRootName("vpn-binding")
+public class VpnBinding implements Serializable, ShallowCopy<VpnBinding> {
+	private static final long serialVersionUID = 3283413795353486924L;
+
+	@Id
+	@JsonProperty("vpn-id")
+    private String vpnId;
+    @JsonProperty("vpn-name")
+    private String vpnName;
+    @JsonProperty("vpn-platform")
+    private String vpnPlatform;
+    @JsonProperty("vpn-type")
+    private String vpnType;
+    @JsonProperty("vpn-region")
+    private String vpnRegion;
+    @JsonProperty("customer-vpn-id")
+    private String customerVpnId;
+    @JsonProperty("route-distinguisher")
+    private String routeDistinguisher;
+    @JsonProperty("resource-version")
+    private String resourceVersion;
+    @JsonProperty("route-targets")
+    private List<RouteTarget> routeTargets = new ArrayList<>();
+
+    public String getVpnId() {
+        return vpnId;
+    }
+
+    public void setVpnId(String value) {
+        this.vpnId = value;
+    }
+
+    public String getVpnName() {
+        return vpnName;
+    }
+
+    public void setVpnName(String value) {
+        this.vpnName = value;
+    }
+
+    public String getVpnPlatform() {
+        return vpnPlatform;
+    }
+
+    public void setVpnPlatform(String value) {
+        this.vpnPlatform = value;
+    }
+
+    public String getVpnType() {
+        return vpnType;
+    }
+
+    public void setVpnType(String value) {
+        this.vpnType = value;
+    }
+
+    public String getVpnRegion() {
+        return vpnRegion;
+    }
+
+    public void setVpnRegion(String value) {
+        this.vpnRegion = value;
+    }
+
+    public String getCustomerVpnId() {
+        return customerVpnId;
+    }
+
+    public void setCustomerVpnId(String value) {
+        this.customerVpnId = value;
+    }
+
+    public String getRouteDistinguisher() {
+        return routeDistinguisher;
+    }
+
+    public void setRouteDistinguisher(String value) {
+        this.routeDistinguisher = value;
+    }
+
+    public String getResourceVersion() {
+        return resourceVersion;
+    }
+
+    public void setResourceVersion(String value) {
+        this.resourceVersion = value;
+    }
+
+    public List<RouteTarget> getRouteTargets() {
+        return routeTargets;
+    }
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof VpnBinding)) {
+			return false;
+		}
+		VpnBinding castOther = (VpnBinding) other;
+		return new EqualsBuilder().append(vpnId, castOther.vpnId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vpnId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java
new file mode 100644
index 0000000000..dec3d48203
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.bbobjects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import javax.persistence.Id;
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("vpn-bonding-link")
+public class VpnBondingLink implements Serializable, ShallowCopy<VpnBondingLink> {
+
+    private static final long serialVersionUID = -8355973761714642727L;
+
+    @Id
+    @JsonProperty("vpn-bonding-link-id")
+    private String vpnBondingLinkId;
+
+    @JsonProperty("configurations")
+    private List<Configuration> configurations = new ArrayList<Configuration>();
+
+    @JsonProperty("service-proxies")
+    private List<ServiceProxy> serviceProxies = new ArrayList<ServiceProxy>();
+
+    public String getVpnBondingLinkId() {
+        return vpnBondingLinkId;
+    }
+
+    public void setVpnBondingLinkId(String vpnBondingLinkId) {
+        this.vpnBondingLinkId = vpnBondingLinkId;
+    }
+
+	public List<Configuration> getConfigurations() {
+		return configurations;
+	}
+
+	public List<ServiceProxy> getServiceProxies() {
+		return serviceProxies;
+	}
+
+	public ServiceProxy getServiceProxy(String id) {
+		ServiceProxy serviceProxy = null;
+		for(ServiceProxy s : serviceProxies){
+			if(s.getId().equals(id)){
+				serviceProxy = s;
+			}
+		}
+		return serviceProxy;
+	}
+
+    //TODO temp solution until references are updated to use getConfigurationByType
+    public Configuration getVnrConfiguration() {
+    	Configuration configuration = null;
+    	for(Configuration c:configurations){
+    		if(containsIgnoreCase(c.getConfigurationType(), "vlan") || containsIgnoreCase(c.getConfigurationType(), "vnr")){
+    			configuration = c;
+    		}
+    	}
+        return configuration;
+    }
+
+    //TODO temp solution until references are updatedd
+    public void setVnrConfiguration(Configuration vnrConfiguration) {
+    	if(vnrConfiguration.getConfigurationType() == null){
+    		vnrConfiguration.setConfigurationType("vlan");
+    	}
+    	configurations.add(vnrConfiguration);
+    }
+
+    //TODO temp solution until references are updated to use getConfigurationByType
+    public Configuration getVrfConfiguration() {
+    	Configuration configuration = null;
+    	for(Configuration c:configurations){
+    		if(containsIgnoreCase(c.getConfigurationType(), "vrf")){
+    			configuration = c;
+    		}
+    	}
+    		return configuration;
+    	}
+
+    //TODO temp solution until references are updated
+    public void setVrfConfiguration(Configuration vrfConfiguration) {
+    	if(vrfConfiguration.getConfigurationType() == null){
+    		vrfConfiguration.setConfigurationType("vrf");
+    	}
+    	configurations.add(vrfConfiguration);
+    }
+
+    //TODO temp solution until references are updated to use getServiceProxyByType
+    public ServiceProxy getInfrastructureServiceProxy() {
+    	ServiceProxy serviceProxy = null;
+    	for(ServiceProxy sp:serviceProxies){
+    		if(sp.getType().equals("infrastructure")){
+    			serviceProxy = sp;
+    		}
+    	}
+        return serviceProxy;
+    }
+
+    //TODO temp solution until references are updated
+    public void setInfrastructureServiceProxy(ServiceProxy infrastructureServiceProxy) {
+    	infrastructureServiceProxy.setType("infrastructure");
+    	serviceProxies.add(infrastructureServiceProxy);
+    }
+
+    //TODO temp solution until references are updated to use getServiceProxyByType
+    public ServiceProxy getTransportServiceProxy() {
+    	ServiceProxy serviceProxy = null;
+    	for(ServiceProxy sp:serviceProxies){
+    		if(sp != null){
+    			if(sp.getType().equals("transport")){
+    				serviceProxy = sp;
+    			}
+    		}
+    	}
+    	return serviceProxy;
+    }
+
+    //TODO temp solution until references are updated
+    public void setTransportServiceProxy(ServiceProxy transportServiceProxy) {
+    	transportServiceProxy.setType("transport");
+    	serviceProxies.add(transportServiceProxy);
+    }
+
+	@Override
+	public boolean equals(final Object other) {
+		if (!(other instanceof VpnBondingLink)) {
+			return false;
+		}
+		VpnBondingLink castOther = (VpnBondingLink) other;
+		return new EqualsBuilder().append(vpnBondingLinkId, castOther.vpnBondingLinkId).isEquals();
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(vpnBondingLinkId).toHashCode();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java
new file mode 100644
index 0000000000..5746dcd586
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.entities;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("buildingBlock")
+public class BuildingBlock implements Serializable{
+	
+	private static final long serialVersionUID = -1144315411128866052L;
+	
+	@JsonProperty("mso-id")
+	private String msoId;
+	@JsonProperty("bpmn-flow-name")
+	private String bpmnFlowName;
+	@JsonProperty("key")
+	private String key;
+	@JsonProperty("is-virtual-link")
+	private boolean isVirtualLink;
+
+	public String getBpmnFlowName() {
+		return bpmnFlowName;
+	}
+	public void setBpmnFlowName(String bpmnFlowName) {
+		this.bpmnFlowName = bpmnFlowName;
+	}
+	public String getMsoId() {
+		return msoId;
+	}
+	public void setMsoId(String msoId) {
+		this.msoId = msoId;
+	}
+	public String getKey() {
+		return key;
+	}
+	public void setKey(String key) {
+		this.key = key;
+	}
+	public boolean getIsVirtualLink() {
+		return isVirtualLink;
+	}
+	public void setIsVirtualLink(boolean isVirtualLink) {
+		this.isVirtualLink = isVirtualLink;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
new file mode 100644
index 0000000000..36a24bd1e1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
@@ -0,0 +1,103 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.entities;
+
+import java.io.Serializable;
+
+import org.onap.so.serviceinstancebeans.RequestDetails;
+
+public class ExecuteBuildingBlock implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BuildingBlock buildingBlock;
+	private String requestId;
+	private String apiVersion;
+	private String resourceId;
+	private String requestAction;
+	private String vnfType;
+	private boolean aLaCarte;
+	private boolean homing;
+	private WorkflowResourceIds workflowResourceIds;
+	private RequestDetails requestDetails;
+	
+	public BuildingBlock getBuildingBlock() {
+		return buildingBlock;
+	}
+	public void setBuildingBlock(BuildingBlock buildingBlock) {
+		this.buildingBlock = buildingBlock;
+	}
+	public String getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(String requestId) {
+		this.requestId = requestId;
+	}
+	public String getApiVersion() {
+		return apiVersion;
+	}
+	public void setApiVersion(String apiVersion) {
+		this.apiVersion = apiVersion;
+	}
+	public String getResourceId() {
+		return resourceId;
+	}
+	public void setResourceId(String resourceId) {
+		this.resourceId = resourceId;
+	}
+	public String getRequestAction() {
+		return requestAction;
+	}
+	public void setRequestAction(String requestAction) {
+		this.requestAction = requestAction;
+	}
+	public boolean isaLaCarte() {
+		return aLaCarte;
+	}
+	public void setaLaCarte(boolean aLaCarte) {
+		this.aLaCarte = aLaCarte;
+	}
+	public String getVnfType() {
+		return vnfType;
+	}
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+	public boolean isHoming() {
+		return homing;
+	}
+	public void setHoming(boolean homing) {
+		this.homing = homing;
+	}
+	public WorkflowResourceIds getWorkflowResourceIds() {
+		return workflowResourceIds;
+	}
+	public void setWorkflowResourceIds(WorkflowResourceIds workflowResourceIds) {
+		this.workflowResourceIds = workflowResourceIds;
+	}
+	public RequestDetails getRequestDetails() {
+		return requestDetails;
+	}
+	public void setRequestDetails(RequestDetails requestDetails) {
+		this.requestDetails = requestDetails;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/GeneralBuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/GeneralBuildingBlock.java
new file mode 100644
index 0000000000..adea99c4f3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/GeneralBuildingBlock.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.entities;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+
+public class GeneralBuildingBlock implements Serializable {
+	private static final String INVALID_INPUT_MISSING = "Expected building block input of \"%s\" not found in decomposition";
+	private static final String INVALID_INPUT_CLASS_CAST = "Expected building block input of \"%s\" was the wrong object type in the decomposition";
+
+	private static final long serialVersionUID = -429247436428110843L;
+
+	private RequestContext requestContext;
+	private OrchestrationContext orchContext;
+	private Map<String, String> userInput;
+	private CloudRegion cloudRegion;
+
+	private Customer customer;
+	private ServiceInstance serviceInstance;
+
+	public CloudRegion getCloudRegion() {
+		return cloudRegion;
+	}
+
+	public void setCloudRegion(CloudRegion cloudRegion) {
+		this.cloudRegion = cloudRegion;
+	}
+
+	public RequestContext getRequestContext() {
+		return requestContext;
+	}
+
+	public void setRequestContext(RequestContext requestContext) {
+		this.requestContext = requestContext;
+	}
+
+	public OrchestrationContext getOrchContext() {
+		return orchContext;
+	}
+
+	public void setOrchContext(OrchestrationContext orchContext) {
+		this.orchContext = orchContext;
+	}
+
+	public Map<String, String> getUserInput() {
+		return userInput;
+	}
+
+	public void setUserInput(Map<String, String> userInput) {
+		this.userInput = userInput;
+	}
+
+	public Customer getCustomer() {
+		return customer;
+	}
+
+	public void setCustomer(Customer customer) {
+		this.customer = customer;
+	}
+
+	public ServiceInstance getServiceInstance() {
+		return serviceInstance;
+	}
+
+	public void setServiceInstance(ServiceInstance serviceInstance) {
+		this.serviceInstance = serviceInstance;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java
new file mode 100644
index 0000000000..4662db23a1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.entities;
+
+public enum ResourceKey {
+	SERVICE_INSTANCE_ID, 
+	GENERIC_VNF_ID, 
+	NETWORK_ID, 
+	VOLUME_GROUP_ID, 
+	VF_MODULE_ID,
+	ALLOTTED_RESOURCE_ID,
+	CONFIGURATION_ID,
+	NETWORK_COLLECTION_ID,
+	VPN_ID,
+    VPN_BONDING_LINK_ID;
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/WorkflowResourceIds.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/WorkflowResourceIds.java
new file mode 100644
index 0000000000..433315b2ed
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/WorkflowResourceIds.java
@@ -0,0 +1,103 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.entities;
+
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class WorkflowResourceIds implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8591599114353940105L;
+	private String serviceInstanceId;
+	private String vnfId;
+	private String networkId;
+	private String volumeGroupId;
+	private String vfModuleId;
+	private String networkCollectionId;
+	private String configurationId;
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("serviceInstanceId", serviceInstanceId).append("vnfId", vnfId)
+				.append("networkId", networkId).append("volumeGroupId", volumeGroupId).append("vfModuleId", vfModuleId)
+				.append("networkCollectionId", networkCollectionId).append("configurationId", configurationId)
+				.toString();
+	}
+
+	public String getServiceInstanceId() {
+		return serviceInstanceId;
+	}
+
+	public void setServiceInstanceId(String serviceInstanceId) {
+		this.serviceInstanceId = serviceInstanceId;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getNetworkCollectionId() {
+		return networkCollectionId;
+	}
+
+	public void setNetworkCollectionId(String networkCollectionId) {
+		this.networkCollectionId = networkCollectionId;
+	}
+
+	public String getConfigurationId() {
+		return configurationId;
+	}
+
+	public void setConfigurationId(String configurationId) {
+		this.configurationId = configurationId;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/exceptions/InvalidBuildingBlockInputException.java
index 4625bfb74f..21828871db 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterResponse.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/exceptions/InvalidBuildingBlockInputException.java
@@ -18,36 +18,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdnc.sync;
+package org.onap.so.bpmn.servicedecomposition.entities.exceptions;
 
+public class InvalidBuildingBlockInputException extends Exception {
+	private static final long serialVersionUID = 221404474263656742L;
+	
+    public InvalidBuildingBlockInputException() {
+        super();
+    }
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+    public InvalidBuildingBlockInputException(String message) {
+        super(message);
+    }
 
+    public InvalidBuildingBlockInputException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-//SDNCAdapter to BPEL Sync Response(ACK) - async response(s) follow
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "SDNCAdapterResponse")
-public class SDNCAdapterResponse {
-
+    public InvalidBuildingBlockInputException(Throwable cause) {
+        super(cause);
+    }
 
+    protected InvalidBuildingBlockInputException(String message, Throwable cause,
+                        boolean enableSuppression,
+                        boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/License.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/License.java
new file mode 100644
index 0000000000..e1a12bbad9
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/License.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.generalobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+@JsonRootName("license")
+public class License implements Serializable {
+
+	private static final long serialVersionUID = 2345786874755685318L;
+
+	@JsonProperty("entitlement-pool-uuids")
+	private List<String> entitlementPoolUuids = new ArrayList<String>();
+	@JsonProperty("license-key-group-uuids")
+	private List<String> licenseKeyGroupUuids = new ArrayList<String>();
+
+
+	public List<String> getEntitlementPoolUuids() {
+		return entitlementPoolUuids;
+	}
+	public void setEntitlementPoolUuids(List<String> entitlementPoolUuids) {
+		this.entitlementPoolUuids = entitlementPoolUuids;
+	}
+	public List<String> getLicenseKeyGroupUuids() {
+		return licenseKeyGroupUuids;
+	}
+	public void setLicenseKeyGroupUuids(List<String> licenseKeyGroupUuids) {
+		this.licenseKeyGroupUuids = licenseKeyGroupUuids;
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java
new file mode 100644
index 0000000000..d594c73638
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.generalobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+
+@JsonRootName("orchestration-context")
+public class OrchestrationContext implements Serializable {
+
+	private static final long serialVersionUID = 6843015923244810369L;
+	
+	@JsonProperty("is-rollback-enabled")
+	private boolean isRollbackEnabled;
+
+	public boolean getIsRollbackEnabled() {
+		return this.isRollbackEnabled;
+	}
+
+	public void setIsRollbackEnabled(boolean isRollbackEnabled) {
+		this.isRollbackEnabled = isRollbackEnabled;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
new file mode 100644
index 0000000000..7715651b68
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
@@ -0,0 +1,115 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.generalobjects;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName("request-context")
+public class RequestContext implements Serializable{
+	
+	private static final long serialVersionUID = -6482733428879732822L;
+
+	@JsonProperty("product-family-id")
+	private String productFamilyId;
+	@JsonProperty("source")
+	private String source;
+	@JsonProperty("requestor-id")
+	private String requestorId;
+	@JsonProperty("subscription-service-type")
+	private String subscriptionServiceType;
+	@JsonProperty("user-params")
+	private HashMap<String, String> userParams;
+	@JsonProperty("action")
+	private String action;
+	@JsonProperty("callback-url")
+	private String callbackURL;
+	@JsonProperty("service-uri")
+	private String serviceURI;
+	@JsonProperty("mso-request-id")
+	private String msoRequestId;
+	@JsonProperty("requestParameters")
+	private RequestParameters requestParameters;
+	
+	public String getServiceURI() {
+		return serviceURI;
+	}
+	public void setServiceURI(String serviceURI) {
+		this.serviceURI = serviceURI;
+	}
+	public String getProductFamilyId() {
+		return productFamilyId;
+	}
+	public void setProductFamilyId(String productFamilyId) {
+		this.productFamilyId = productFamilyId;
+	}
+	public String getSource() {
+		return source;
+	}
+	public void setSource(String source) {
+		this.source = source;
+	}
+	public String getRequestorId() {
+		return requestorId;
+	}
+	public void setRequestorId(String requestorId) {
+		this.requestorId = requestorId;
+	}
+	public String getSubscriptionServiceType() {
+		return subscriptionServiceType;
+	}
+	public void setSubscriptionServiceType(String subscriptionServiceType) {
+		this.subscriptionServiceType = subscriptionServiceType;
+	}
+	public HashMap<String, String> getUserParams() {
+		return userParams;
+	}
+	public void setUserParams(HashMap<String, String> userParams) {
+		this.userParams = userParams;
+	}
+	public String getAction() {
+		return action;
+	}
+	public void setAction(String action) {
+		this.action = action;
+	}
+	public String getCallbackURL() {
+		return callbackURL;
+	}
+	public void setCallbackURL(String callbackURL) {
+		this.callbackURL = callbackURL;
+	}
+	public String getMsoRequestId() {
+		return msoRequestId;
+	}
+	public void setMsoRequestId(String msoRequestId) {
+		this.msoRequestId = msoRequestId;
+	}
+	public RequestParameters getRequestParameters() {
+		return requestParameters;
+	}
+	public void setRequestParameters(RequestParameters requestParameters) {
+		this.requestParameters = requestParameters;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestParameters.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestParameters.java
new file mode 100644
index 0000000000..24c0548641
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestParameters.java
@@ -0,0 +1,112 @@
+/*-
+ * ============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.onap.so.bpmn.servicedecomposition.generalobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.so.logger.MsoLogger;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "requestParameters")
+@JsonInclude(Include.NON_DEFAULT)
+public class RequestParameters implements Serializable {
+
+	private static final MsoLogger log = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, RequestParameters.class);
+
+	private static final long serialVersionUID = -5979049912538894930L;
+	@JsonProperty("subscriptionServiceType")
+	private String subscriptionServiceType;
+	@JsonProperty("userParams")
+	private List<Map<String, Object>> userParams = new ArrayList<>();
+	@JsonProperty("aLaCarte")
+	private Boolean aLaCarte;
+
+
+	public String getSubscriptionServiceType() {
+		return subscriptionServiceType;
+	}
+
+	public void setSubscriptionServiceType(String subscriptionServiceType) {
+		this.subscriptionServiceType = subscriptionServiceType;
+	}
+	@JsonProperty("aLaCarte")
+	public Boolean getALaCarte() {
+		return aLaCarte;
+	}
+	@JsonProperty("aLaCarte")
+	public void setaLaCarte(Boolean aLaCarte) {
+		this.aLaCarte = aLaCarte;
+	}
+
+	public Boolean isaLaCarte() {
+		return aLaCarte;
+	}
+
+	public List<Map<String, Object>> getUserParams() {
+		return userParams;
+	}
+
+	public void setUserParams(List<Map<String, Object>> userParams) {
+		this.userParams = userParams;
+	}
+
+	public Object getUserParamValue(String name) {
+		if (userParams != null) {
+			for (Map<String, Object> param : userParams) {
+				if (param.get(name) != null) {
+					return param.get(name);
+				}
+			}
+		}
+		return null;
+	}
+
+
+	@JsonInclude(Include.NON_NULL)
+	public String toJsonString(){
+		String json = "";
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(Include.NON_NULL);
+		ObjectWriter ow = mapper.writer();
+		try{
+			json = ow.writeValueAsString(this);
+		}catch (Exception e){
+			log.error("Unable to convert Sniro Manager Request to string", e);
+		}
+		return json;
+	}
+
+	@Override
+	public String toString() {
+		return "RequestParameters [subscriptionServiceType="
+				+ subscriptionServiceType + ", userParams=" + userParams
+				+ ", aLaCarte=" + aLaCarte + "]";
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/Candidate.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/Candidate.java
new file mode 100644
index 0000000000..01846681db
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/Candidate.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.homingobjects;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+public class Candidate implements Serializable {
+
+
+	private static final long serialVersionUID = -3959572501582849328L;
+
+	@JsonProperty("candidateType")
+	private CandidateType candidateType;
+	@JsonProperty("candidates")
+	private List<String> candidates;
+
+	/**
+	 * list of candidates
+	 * i.e. actual serviceInstanceId, actual vnfName, actual cloudRegionId, etc.
+	 */
+	public List<String> getCandidates() {
+		return candidates;
+	}
+
+	/**
+	 * list of candidates
+	 * i.e. actual serviceInstanceId, actual vnfName, actual cloudRegionId, etc.
+	 */
+	public void setCandidates(List<String> candidates) {
+		this.candidates = candidates;
+	}
+
+	/**
+	 * Way to identify the type of candidate
+	 * i.e. "serviceInstanceId", "vnfName", "cloudRegionId", etc.
+	 */
+	public CandidateType getCandidateType(){
+		return candidateType;
+	}
+
+	/**
+	 * Way to identify the type of candidate
+	 * i.e. "serviceInstanceId", "vnfName", "cloudRegionId", etc.
+	 */
+	public void setCandidateType(CandidateType candidateType){
+		this.candidateType = candidateType;
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCSvcAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/CandidateType.java
index 91e3a59276..9540b9148e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCSvcAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/CandidateType.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 - 2018 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.
@@ -18,29 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdnc.beans;

-

-public enum SDNCSvcAction {

-	ACTIVATE("activate"),

-	DELETE("delete"),

-	ASSIGN("assign"),

-	ROLLBACK("rollback"),

-	UNASSIGN("unassign"),

-	DEACTIVATE("deactivate"),

-	CHANGE_DELETE("changedelete"),

-	CHANGE_ASSIGN("changeassign"),

-	CREATE("create"),

-	ENABLE("enable"),

-	DISABLE("disable");

-	

-	private final String name;

-	

-	private SDNCSvcAction(String name) {

-		this.name = name;

-	}

-	

-	@Override

-	public String toString() {

-		return name;

-	}

-}

+package org.onap.so.bpmn.servicedecomposition.homingobjects;
+
+public enum CandidateType {
+	SERVICE_INSTANCE_ID("serviceInstanceId"),
+	CLOUD_REGION_ID("cloudRegionId"),
+	VNF_ID("vnfId"),
+	VNF_NAME("vnfName");
+
+	private final String name;
+
+	private CandidateType(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+	//TODO added to get PojoTest to work
+	public String getName(){
+		return name;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionCandidates.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionCandidates.java
new file mode 100644
index 0000000000..0cbd88b665
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionCandidates.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.homingobjects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.so.bpmn.servicedecomposition.homingobjects.Candidate;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class SolutionCandidates implements Serializable{
+
+	private static final long serialVersionUID = 2188754118148819627L;
+
+	@JsonProperty("requiredCandidates")
+	private List<Candidate> requiredCandidates = new ArrayList<Candidate>();
+	@JsonProperty("excludedCandidates")
+	private List<Candidate> excludedCandidates = new ArrayList<Candidate>();
+	//TODO figure out best way to do this
+	@JsonProperty("existingCandidates")
+	private List<Candidate> existingCandidates = new ArrayList<Candidate>();
+
+
+	public List<Candidate> getRequiredCandidates() {
+		return requiredCandidates;
+	}
+	public void addRequiredCandidates(Candidate requiredCandidate) {
+		this.requiredCandidates.add(requiredCandidate);
+	}
+	public List<Candidate> getExcludedCandidates() {
+		return excludedCandidates;
+	}
+	public void addExcludedCandidates(Candidate excludedCandidate) {
+		this.excludedCandidates.add(excludedCandidate);
+	}
+
+	public List<Candidate> getExistingCandidates(){
+		return existingCandidates;
+	}
+
+
+
+
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java
new file mode 100644
index 0000000000..17e42b4396
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.homingobjects;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+
+@JsonRootName("solution")
+public class SolutionInfo implements Serializable {
+
+	private static final long serialVersionUID = 6903399488466840832L;
+
+	@JsonProperty("solution-id") //identifies which solution
+	private int solutionId;
+	@JsonProperty("homed")
+	private boolean homed;
+	@JsonProperty("is-rehome")
+	private boolean isRehome;
+	@JsonProperty("targeted-cloud")
+	private CloudRegion targetedCloudRegion;
+
+
+	public boolean isHomed() {
+		return homed;
+	}
+
+	public void setHomed(boolean homed) {
+		this.homed = homed;
+	}
+
+	public boolean isRehome() {
+		return isRehome;
+	}
+
+	public void setRehome(boolean isRehome) {
+		this.isRehome = isRehome;
+	}
+
+	/**
+	 * Identifies which solution when multiple solutions exist for a
+	 * given resource or resource pair.
+	 * i.e. 1, 2, 3....
+	 */
+	public int getSolutionId() {
+		return solutionId;
+	}
+
+	/**
+	 * Identifies which solution when multiple solutions exist for a
+	 * given resource or resource pair.
+	 * i.e. 1, 2, 3....
+	 */
+	public void setSolutionId(int solutionId) {
+		this.solutionId = solutionId;
+	}
+
+	/**
+	 * Identifies where the resource should be created for
+	 * homed equals false scenarios. Will return null if resource
+	 * was homed.
+	 */
+	public CloudRegion getTargetedCloudRegion() {
+		return targetedCloudRegion;
+	}
+
+	/**
+	 * Identifies where the resource should be created for
+	 * homed equals false scenarios. Will return null if resource
+	 * was homed.
+	 */
+	public void setTargetedCloudRegion(CloudRegion targetedCloudRegion) {
+		this.targetedCloudRegion = targetedCloudRegion;
+	}
+
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoAllottedResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoAllottedResource.java
new file mode 100644
index 0000000000..b4f2e85e55
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoAllottedResource.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoAllottedResource extends ModelInfoMetadata implements Serializable{
+
+	private static final long serialVersionUID = -5240932898637922018L;
+
+	@JsonProperty("max-instances")
+	private String MaxInstances;
+	@JsonProperty("min-instances")
+	private String MinInstances;
+	@JsonProperty("nf-naming-code")
+	private String NfNamingCode;
+	@JsonProperty("nf-role")
+	private String NfRole;
+	@JsonProperty("nf-type")
+	private String NfType;
+	@JsonProperty("nf-function")
+	private String NfFunction;
+	@JsonProperty("target-network-role")
+	private String TarNetworkRole;
+	@JsonProperty("providing-service-model-invariant-uuid")
+	private String ProvidingServiceModelInvariantUUID;
+	@JsonProperty("providing-service-model-name")
+	private String ProvidingServiceModelName;
+	@JsonProperty("providing-service-model-uuid")
+	private String ProvidingServiceModelUUID;
+	@JsonProperty("description")
+	private String Description;
+	@JsonProperty("created")
+	private String Created;
+	@JsonProperty("tosca-node-type")
+	private String ToscaNodeType;
+	@JsonProperty("subcategory")
+	private String Subcategory;
+//	private ModelInfoMetadata modelInfoMetadata;
+
+
+	public String getMaxInstances() {
+		return MaxInstances;
+	}
+	public void setMaxInstances(String maxInstances) {
+		MaxInstances = maxInstances;
+	}
+	public String getMinInstances() {
+		return MinInstances;
+	}
+	public void setMinInstances(String minInstances) {
+		MinInstances = minInstances;
+	}
+	public String getNfNamingCode() {
+		return NfNamingCode;
+	}
+	public void setNfNamingCode(String nfNamingCode) {
+		NfNamingCode = nfNamingCode;
+	}
+	public String getNfRole() {
+		return NfRole;
+	}
+	public void setNfRole(String nfRole) {
+		NfRole = nfRole;
+	}
+	public String getNfType() {
+		return NfType;
+	}
+	public void setNfType(String nfType) {
+		NfType = nfType;
+	}
+	public String getNfFunction() {
+		return NfFunction;
+	}
+	public void setNfFunction(String nfFunction) {
+		NfFunction = nfFunction;
+	}
+	public String getTarNetworkRole() {
+		return TarNetworkRole;
+	}
+	public void setTarNetworkRole(String tarNetworkRole) {
+		TarNetworkRole = tarNetworkRole;
+	}
+	public String getProvidingServiceModelInvariantUUID() {
+		return ProvidingServiceModelInvariantUUID;
+	}
+	public void setProvidingServiceModelInvariantUUID(String providingServiceModelInvariantUUID) {
+		ProvidingServiceModelInvariantUUID = providingServiceModelInvariantUUID;
+	}
+	public String getProvidingServiceModelName() {
+		return ProvidingServiceModelName;
+	}
+	public void setProvidingServiceModelName(String providingServiceModelName) {
+		ProvidingServiceModelName = providingServiceModelName;
+	}
+	public String getProvidingServiceModelUUID() {
+		return ProvidingServiceModelUUID;
+	}
+	public void setProvidingServiceModelUUID(String providingServiceModelUUID) {
+		ProvidingServiceModelUUID = providingServiceModelUUID;
+	}
+	public String getDescription() {
+		return Description;
+	}
+	public void setDescription(String description) {
+		Description = description;
+	}
+	public String getCreated() {
+		return Created;
+	}
+	public void setCreated(String created) {
+		Created = created;
+	}
+	public String getToscaNodeType() {
+		return ToscaNodeType;
+	}
+	public void setToscaNodeType(String toscaNodeType) {
+		ToscaNodeType = toscaNodeType;
+	}
+	public String getSubcategory() {
+		return Subcategory;
+	}
+	public void setSubcategory(String subcategory) {
+		Subcategory = subcategory;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java
new file mode 100644
index 0000000000..6ceac935f1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoCollection  implements Serializable {
+
+	private static final long serialVersionUID = 8380534468706675508L;
+	
+	@JsonProperty("model-version-id")
+	private String modelVersionId;
+	@JsonProperty("model-invariant-uuid")
+	private String modelInvariantUUID;
+	@JsonProperty("collection-function")
+	private String collectionFunction;
+	@JsonProperty("collection-role")
+	private String collectionRole;
+	@JsonProperty("collection-type")
+	private String collectionType;
+	@JsonProperty("description")
+	private String description;
+	@JsonProperty("quantity")
+	private int quantity;
+	
+	public String getModelVersionId() {
+		return modelVersionId;
+	}
+	public void setModelVersionId(String modelVersionId) {
+		this.modelVersionId = modelVersionId;
+	}
+	public String getModelInvariantUUID() {
+		return this.modelInvariantUUID;
+	}
+	public void setModelInvariantUUID(String modelInvariantUUID) {
+		this.modelInvariantUUID = modelInvariantUUID;
+	}
+	public String getCollectionFunction() {
+		return collectionFunction;
+	}
+	public void setCollectionFunction(String collectionFunction) {
+		this.collectionFunction = collectionFunction;
+	}
+	public String getCollectionRole() {
+		return collectionRole;
+	}
+	public void setCollectionRole(String collectionRole) {
+		this.collectionRole = collectionRole;
+	}
+	public String getCollectionType() {
+		return collectionType;
+	}
+	public void setCollectionType(String collectionType) {
+		this.collectionType = collectionType;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public int getQuantity() {
+		return quantity;
+	}
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+	
+	
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java
new file mode 100644
index 0000000000..9d3aa5934b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoConfiguration.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoConfiguration implements Serializable{
+
+	private static final long serialVersionUID = -387242776138157250L;
+	
+	@JsonProperty("model-invariant-id")
+	private String modelInvariantId;
+	@JsonProperty("model-version-id")
+	private String modelVersionId;
+	@JsonProperty("model-customization-id")
+	private String modelCustomizationId;
+	
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+	public String getModelVersionId() {
+		return modelVersionId;
+	}
+	public void setModelVersionId(String modelVersionId) {
+		this.modelVersionId = modelVersionId;
+	}
+	public String getModelCustomizationId() {
+		return modelCustomizationId;
+	}
+	public void setModelCustomizationId(String modelCustomizationId) {
+		this.modelCustomizationId = modelCustomizationId;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoGenericVnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoGenericVnf.java
new file mode 100644
index 0000000000..6b53272a75
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoGenericVnf.java
@@ -0,0 +1,145 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoGenericVnf extends ModelInfoMetadata implements Serializable{
+
+	private static final long serialVersionUID = -5963022750248280669L;
+
+	@JsonProperty("tosca-node-type")
+	private String ToscaNodeType;
+	@JsonProperty("description")
+	private String Description;
+	@JsonProperty("orchestration-mode")
+	private String OrchestrationMode;
+	@JsonProperty("aic-version-min")
+	private String AicVersionMin;
+	@JsonProperty("aic-version-max")
+	private String AicVersionMax;
+	@JsonProperty("min-instances")
+	private String MinInstances;
+	@JsonProperty("max-instances")
+	private String MaxInstances;
+	@JsonProperty("availability-zone-max-count")
+	private String AvailabilityZoneMaxCount;
+	@JsonProperty("nf-function")
+	private String NfFunction;
+	@JsonProperty("nf-type")
+	private String NfType;
+	@JsonProperty("nf-role")
+	private String NfRole;
+	@JsonProperty("nf-naming-code")
+	private String NfNamingCode;
+	@JsonProperty("multi-stage-design")
+	private String MultiStageDesign;
+	@JsonProperty("created")
+	private String Created;
+
+
+	public String getToscaNodeType() {
+		return ToscaNodeType;
+	}
+	public void setToscaNodeType(String toscaNodeType) {
+		ToscaNodeType = toscaNodeType;
+	}
+	public String getDescription() {
+		return Description;
+	}
+	public void setDescription(String description) {
+		Description = description;
+	}
+	public String getOrchestrationMode() {
+		return OrchestrationMode;
+	}
+	public void setOrchestrationMode(String orchestrationMode) {
+		OrchestrationMode = orchestrationMode;
+	}
+	public String getAicVersionMin() {
+		return AicVersionMin;
+	}
+	public void setAicVersionMin(String aicVersionMin) {
+		AicVersionMin = aicVersionMin;
+	}
+	public String getAicVersionMax() {
+		return AicVersionMax;
+	}
+	public void setAicVersionMax(String aicVersionMax) {
+		AicVersionMax = aicVersionMax;
+	}
+	public String getMinInstances() {
+		return MinInstances;
+	}
+	public void setMinInstances(String minInstances) {
+		MinInstances = minInstances;
+	}
+	public String getMaxInstances() {
+		return MaxInstances;
+	}
+	public void setMaxInstances(String maxInstances) {
+		MaxInstances = maxInstances;
+	}
+	public String getAvailabilityZoneMaxCount() {
+		return AvailabilityZoneMaxCount;
+	}
+	public void setAvailabilityZoneMaxCount(String availabilityZoneMaxCount) {
+		AvailabilityZoneMaxCount = availabilityZoneMaxCount;
+	}
+	public String getNfFunction() {
+		return NfFunction;
+	}
+	public void setNfFunction(String nfFunction) {
+		NfFunction = nfFunction;
+	}
+	public String getNfType() {
+		return NfType;
+	}
+	public void setNfType(String nfType) {
+		NfType = nfType;
+	}
+	public String getNfRole() {
+		return NfRole;
+	}
+	public void setNfRole(String nfRole) {
+		NfRole = nfRole;
+	}
+	public String getNfNamingCode() {
+		return NfNamingCode;
+	}
+	public void setNfNamingCode(String nfNamingCode) {
+		NfNamingCode = nfNamingCode;
+	}
+	public String getMultiStageDesign() {
+		return MultiStageDesign;
+	}
+	public void setMultiStageDesign(String multiStageDesign) {
+		MultiStageDesign = multiStageDesign;
+	}
+	public String getCreated() {
+		return Created;
+	}
+	public void setCreated(String created) {
+		Created = created;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java
new file mode 100644
index 0000000000..1f02fea071
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoInstanceGroup.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoInstanceGroup  implements Serializable {
+	
+	private static final long serialVersionUID = -8279040393230356226L;
+	
+	public static final String TYPE_L3_NETWORK = "L3-NETWORK";
+	public static final String TYPE_NETWORK_INSTANCE_GROUP = "networkInstanceGroup";
+	public static final String TYPE_VNFC = "VNFC";
+		
+	@JsonProperty("model-uuid")
+	private String ModelUUID;
+	@JsonProperty("model-invariant-uuid")
+	private String ModelInvariantUUID;
+	@JsonProperty("type")
+	private String type;
+	@JsonProperty("instance-group-role")
+	private String instanceGroupRole;
+	@JsonProperty("function")
+	private String function;
+	@JsonProperty("description")
+	private String description;
+	
+	public String getModelUUID() {
+		return ModelUUID;
+	}
+	public void setModelUUID(String modelUUID) {
+		ModelUUID = modelUUID;
+	}
+	public String getModelInvariantUUID() {
+		return ModelInvariantUUID;
+	}
+	public void setModelInvariantUUID(String modelInvariantUUID) {
+		ModelInvariantUUID = modelInvariantUUID;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getInstanceGroupRole() {
+		return instanceGroupRole;
+	}
+	public void setInstanceGroupRole(String instanceGroupRole) {
+		this.instanceGroupRole = instanceGroupRole;
+	}
+	public String getFunction() {
+		return function;
+	}
+	public void setFunction(String function) {
+		this.function = function;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoMetadata.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoMetadata.java
new file mode 100644
index 0000000000..c873912922
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoMetadata.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoMetadata implements Serializable{
+
+	private static final long serialVersionUID = -2182850364281359289L;
+
+	@JsonProperty("model-customization-uuid")
+	private String modelCustomizationUuid;
+	@JsonProperty("model-invariant-uuid")
+	private String modelInvariantUuid;
+	@JsonProperty("model-uuid")
+	private String modelUuid;
+	@JsonProperty("model-version")
+	private String modelVersion;
+	@JsonProperty("model-instance-name")
+	private String modelInstanceName;
+	@JsonProperty("model-name")
+	private String modelName;
+
+
+	public String getModelCustomizationUuid() {
+		return modelCustomizationUuid;
+	}
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+	public String getModelInvariantUuid() {
+		return modelInvariantUuid;
+	}
+	public void setModelInvariantUuid(String modelInvariantUuid) {
+		this.modelInvariantUuid = modelInvariantUuid;
+	}
+	public String getModelUuid() {
+		return modelUuid;
+	}
+	public void setModelUuid(String modelUuid) {
+		this.modelUuid = modelUuid;
+	}
+	public String getModelVersion() {
+		return modelVersion;
+	}
+	public void setModelVersion(String modelVersion) {
+		this.modelVersion = modelVersion;
+	}
+	public String getModelInstanceName() {
+		return modelInstanceName;
+	}
+	public void setModelInstanceName(String modelInstanceName) {
+		this.modelInstanceName = modelInstanceName;
+	}
+	public String getModelName() {
+		return modelName;
+	}
+	public void setModelName(String modelName) {
+		this.modelName = modelName;
+	}
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoNetwork.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoNetwork.java
new file mode 100644
index 0000000000..22233e94a5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoNetwork.java
@@ -0,0 +1,169 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoNetwork implements Serializable{
+
+	private static final long serialVersionUID = -3612850497900637132L;
+	
+	@JsonProperty("model-customization-uuid")
+	private String ModelCustomizationUUID;
+	@JsonProperty("model-instance-name")
+	private String ModelInstanceName;
+	@JsonProperty("network-technology")
+	private String NetworkTechnology;
+	@JsonProperty("network-type")
+	private String NetworkType;
+	@JsonProperty("network-scope")
+	private String NetworkScope;
+	@JsonProperty("network-role")
+	private String NetworkRole;
+	@JsonProperty("description")
+	private String Description;
+	@JsonProperty("created")
+	private Timestamp Created;
+	@JsonProperty("model-version")
+	private String ModelVersion;
+	@JsonProperty("model-invariant-uuid")
+	private String ModelInvariantUUID;
+	@JsonProperty("model-name")
+	private String ModelName;
+	@JsonProperty("model-uuid")
+	private String ModelUUID;
+	@JsonProperty("neutron-network-type")
+	private String NeutronNetworkType;
+	@JsonProperty("aic-version-min")
+	private String AicVersionMin;
+	@JsonProperty("aic-version-max")
+	private String AicVersionMax;
+	@JsonProperty("orchestration-mode")
+	private String OrchestrationMode;
+	@JsonProperty("tosca-node-type")
+	private String ToscaNodeType;
+	
+	public String getModelCustomizationUUID() {
+		return ModelCustomizationUUID;
+	}
+	public void setModelCustomizationUUID(String modelCustomizationUUID) {
+		ModelCustomizationUUID = modelCustomizationUUID;
+	}
+	public String getModelInstanceName() {
+		return ModelInstanceName;
+	}
+	public void setModelInstanceName(String modelInstanceName) {
+		ModelInstanceName = modelInstanceName;
+	}
+	public String getNetworkTechnology() {
+		return NetworkTechnology;
+	}
+	public void setNetworkTechnology(String networkTechnology) {
+		NetworkTechnology = networkTechnology;
+	}
+	public String getNetworkType() {
+		return NetworkType;
+	}
+	public void setNetworkType(String networkType) {
+		NetworkType = networkType;
+	}
+	public String getNetworkScope() {
+		return NetworkScope;
+	}
+	public void setNetworkScope(String networkScope) {
+		NetworkScope = networkScope;
+	}
+	public String getNetworkRole() {
+		return NetworkRole;
+	}
+	public void setNetworkRole(String networkRole) {
+		NetworkRole = networkRole;
+	}
+	public String getDescription() {
+		return Description;
+	}
+	public void setDescription(String description) {
+		Description = description;
+	}
+	public Timestamp getCreated() {
+		return Created;
+	}
+	public void setCreated(Timestamp created) {
+		Created = created;
+	}
+	public String getModelVersion() {
+		return ModelVersion;
+	}
+	public void setModelVersion(String modelVersion) {
+		ModelVersion = modelVersion;
+	}
+	public String getModelInvariantUUID() {
+		return ModelInvariantUUID;
+	}
+	public void setModelInvariantUUID(String modelInvariantUUID) {
+		ModelInvariantUUID = modelInvariantUUID;
+	}
+	public String getModelName() {
+		return ModelName;
+	}
+	public void setModelName(String modelName) {
+		ModelName = modelName;
+	}
+	public String getModelUUID() {
+		return ModelUUID;
+	}
+	public void setModelUUID(String modelUUID) {
+		ModelUUID = modelUUID;
+	}
+	public String getNeutronNetworkType() {
+		return NeutronNetworkType;
+	}
+	public void setNeutronNetworkType(String neutronNetworkType) {
+		NeutronNetworkType = neutronNetworkType;
+	}
+	public String getAicVersionMin() {
+		return AicVersionMin;
+	}
+	public void setAicVersionMin(String aicVersionMin) {
+		AicVersionMin = aicVersionMin;
+	}
+	public String getAicVersionMax() {
+		return AicVersionMax;
+	}
+	public void setAicVersionMax(String aicVersionMax) {
+		AicVersionMax = aicVersionMax;
+	}
+	public String getOrchestrationMode() {
+		return OrchestrationMode;
+	}
+	public void setOrchestrationMode(String orchestrationMode) {
+		OrchestrationMode = orchestrationMode;
+	}
+	public String getToscaNodeType() {
+		return ToscaNodeType;
+	}
+	public void setToscaNodeType(String toscaNodeType) {
+		ToscaNodeType = toscaNodeType;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java
new file mode 100644
index 0000000000..ac206d3dd0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceInstance.java
@@ -0,0 +1,81 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoServiceInstance extends ModelInfoMetadata implements Serializable {
+
+	private static final long serialVersionUID = -1812787934683419141L;
+
+	@JsonProperty("description")
+	private String description;
+	@JsonProperty("created")
+	private String created;
+	@JsonProperty("service-type")
+	private String serviceType;
+	@JsonProperty("service-role")
+	private String serviceRole;
+	@JsonProperty("environment-context")
+	private String environmentContext;
+	@JsonProperty("workload-context")
+	private String workloadContext;
+
+
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public String getCreated() {
+		return created;
+	}
+	public void setCreated(String created) {
+		this.created = created;
+	}
+	public String getServiceType() {
+		return serviceType;
+	}
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+	public String getServiceRole() {
+		return serviceRole;
+	}
+	public void setServiceRole(String serviceRole) {
+		this.serviceRole = serviceRole;
+	}
+	public String getEnvironmentContext() {
+		return environmentContext;
+	}
+	public void setEnvironmentContext(String environmentContext) {
+		this.environmentContext = environmentContext;
+	}
+	public String getWorkloadContext() {
+		return workloadContext;
+	}
+	public void setWorkloadContext(String workloadContext) {
+		this.workloadContext = workloadContext;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceProxy.java
index af429db1f2..b2494384f4 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestProperties.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoServiceProxy.java
@@ -18,12 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.adapter.vnf;
+package org.onap.so.bpmn.servicedecomposition.modelinfo;
 
-import org.openecomp.mso.client.RestProperties;
 
-public interface AdapterRestProperties extends RestProperties {
+import java.io.Serializable;
+
+
+public class ModelInfoServiceProxy extends ModelInfoMetadata implements Serializable {
+
+    private static final long serialVersionUID = -6256897576261215926L;
+
 
-	public String getAuth();
-	public String getKey();
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoVfModule.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoVfModule.java
new file mode 100644
index 0000000000..593f8c2532
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoVfModule.java
@@ -0,0 +1,136 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.modelinfo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ModelInfoVfModule implements Serializable {
+
+	private static final long serialVersionUID = 636556989022688657L;
+	
+	@JsonProperty("model-customization-uuid")
+	private String ModelCustomizationUUID;
+	@JsonProperty("model-name")
+	private String ModelName;
+	@JsonProperty("model-uuid")
+	private String ModelUUID;
+	@JsonProperty("model-invariant-uuid")
+	private String ModelInvariantUUID;
+	@JsonProperty("model-version")
+	private String ModelVersion;
+	@JsonProperty("description")
+	private String Description;
+	@JsonProperty("is-base-boolean")
+	private Boolean IsBaseBoolean;
+	@JsonProperty("min-instances")
+	private String MinInstances;
+	@JsonProperty("max-instances")
+	private String MaxInstances;
+	@JsonProperty("availability-zone-count")
+	private String AvailabilityZoneCount;
+	@JsonProperty("label")
+	private String Label;
+	@JsonProperty("initial-count")
+	private String InitialCount;
+	@JsonProperty("created")
+	private String Created;
+	
+	public String getModelCustomizationUUID() {
+		return ModelCustomizationUUID;
+	}
+	public void setModelCustomizationUUID(String modelCustomizationUUID) {
+		ModelCustomizationUUID = modelCustomizationUUID;
+	}
+	public String getModelName() {
+		return ModelName;
+	}
+	public void setModelName(String modelName) {
+		ModelName = modelName;
+	}
+	public String getModelUUID() {
+		return ModelUUID;
+	}
+	public void setModelUUID(String modelUUID) {
+		ModelUUID = modelUUID;
+	}
+	public String getModelInvariantUUID() {
+		return ModelInvariantUUID;
+	}
+	public void setModelInvariantUUID(String modelInvariantUUID) {
+		ModelInvariantUUID = modelInvariantUUID;
+	}
+	public String getModelVersion() {
+		return ModelVersion;
+	}
+	public void setModelVersion(String modelVersion) {
+		ModelVersion = modelVersion;
+	}
+	public String getDescription() {
+		return Description;
+	}
+	public void setDescription(String description) {
+		Description = description;
+	}
+	public Boolean getIsBaseBoolean() {
+		return IsBaseBoolean;
+	}
+	public void setIsBaseBoolean(Boolean isBaseBoolean) {
+		IsBaseBoolean = isBaseBoolean;
+	}
+	public String getMinInstances() {
+		return MinInstances;
+	}
+	public void setMinInstances(String minInstances) {
+		MinInstances = minInstances;
+	}
+	public String getMaxInstances() {
+		return MaxInstances;
+	}
+	public void setMaxInstances(String maxInstances) {
+		MaxInstances = maxInstances;
+	}
+	public String getAvailabilityZoneCount() {
+		return AvailabilityZoneCount;
+	}
+	public void setAvailabilityZoneCount(String availabilityZoneCount) {
+		AvailabilityZoneCount = availabilityZoneCount;
+	}
+	public String getLabel() {
+		return Label;
+	}
+	public void setLabel(String label) {
+		Label = label;
+	}
+	public String getInitialCount() {
+		return InitialCount;
+	}
+	public void setInitialCount(String initialCount) {
+		InitialCount = initialCount;
+	}
+	public String getCreated() {
+		return Created;
+	}
+	public void setCreated(String created) {
+		Created = created;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncCommonResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoVolumeGroup.java
index cd98860efe..d3bf99ccb8 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncCommonResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoVolumeGroup.java
@@ -18,16 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common.workflow.service;
+package org.onap.so.bpmn.servicedecomposition.modelinfo;
 
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
+import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class WorkflowAsyncCommonResource extends WorkflowAsyncResource {
+public class ModelInfoVolumeGroup extends ModelInfoVfModule implements Serializable {
 
-	@Override
-    public String getProcessEngineName() {
-		return "default";
-	}
+	private static final long serialVersionUID = -1157856848495642223L;
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java
new file mode 100644
index 0000000000..ac96aceec3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+public enum AssignFlows {
+
+	SERVICE_INSTANCE("AssignServiceInstanceBB"),
+	VNF("AssignVnfBB"),
+	VF_MODULE("AssignVfModuleBB"),
+	NETWORK_A_LA_CARTE("AssignNetwork1802BB"),
+	NETWORK_MACRO("AssignNetworkBB"),
+	VOLUME_GROUP("AssignVolumeGroupBB"),
+	NETWORK_COLLECTION("CreateNetworkCollectionBB"),
+	FABRIC_CONFIGURATION("AssignFabricConfigurationBB");
+	
+	private final String flowName;
+	
+	private AssignFlows(String flowName) {
+		this.flowName = flowName;
+	}
+	
+	@Override
+	public String toString() {
+		return this.flowName;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
new file mode 100644
index 0000000000..aa68114011
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -0,0 +1,1586 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.delegate.JavaDelegate;
+import org.javatuples.Pair;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.DelegateExecutionImpl;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.RouteTableReference;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.entities.WorkflowResourceIds;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.client.aai.AAICommonObjectMapperProvider;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.Relationships;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.db.catalog.beans.VnfcInstanceGroupCustomization;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.ModelType;
+import org.onap.so.serviceinstancebeans.Networks;
+import org.onap.so.serviceinstancebeans.RelatedInstance;
+import org.onap.so.serviceinstancebeans.RelatedInstanceList;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+import org.onap.so.serviceinstancebeans.Resources;
+import org.onap.so.serviceinstancebeans.VfModules;
+import org.onap.so.serviceinstancebeans.Vnfs;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+@Component("BBInputSetup")
+public class BBInputSetup implements JavaDelegate {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, BBInputSetup.class);
+	private static final String FLOW_VAR_NAME = "flowToBeCalled";
+	private static final String LOOKUP_KEY_MAP_VAR_NAME = "lookupKeyMap";
+	private static final String GBB_INPUT_VAR_NAME = "gBBInput";
+	private static final String EXECUTE_BB_VAR_NAME = "buildingBlock";
+	private static final String CLOUD_OWNER = "att-aic";
+	private static final String VOLUME_GROUP = "VolumeGroup";
+	private static final String VF_MODULE = "VfModule";
+	private static final String NETWORK = "Network";
+	private static final String VNF = "Vnf";
+	private static final String NETWORK_COLLECTION = "NetworkCollection";
+
+	@Autowired
+	private BBInputSetupUtils bbInputSetupUtils;
+
+	@Autowired
+	private BBInputSetupMapperLayer mapperLayer;
+
+	@Autowired
+	private ExceptionBuilder exceptionUtil;
+
+	private ObjectMapper mapper = new ObjectMapper();
+
+	public BBInputSetupUtils getBbInputSetupUtils() {
+		return bbInputSetupUtils;
+	}
+
+	public void setBbInputSetupUtils(BBInputSetupUtils bbInputSetupUtils) {
+		this.bbInputSetupUtils = bbInputSetupUtils;
+	}
+
+	public BBInputSetupMapperLayer getMapperLayer() {
+		return mapperLayer;
+	}
+
+	public void setMapperLayer(BBInputSetupMapperLayer mapperLayer) {
+		this.mapperLayer = mapperLayer;
+	}
+
+	@Override
+	public void execute(DelegateExecution execution) throws Exception {
+		try {
+			GeneralBuildingBlock outputBB = null;
+			ExecuteBuildingBlock executeBB = this.getExecuteBBFromExecution(execution);
+			String resourceId = executeBB.getResourceId();
+			String requestAction = executeBB.getRequestAction();
+			String vnfType = executeBB.getVnfType();
+			boolean aLaCarte = executeBB.isaLaCarte();
+			boolean homing = executeBB.isHoming();
+			Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+			outputBB = this.getGBB(executeBB, lookupKeyMap, requestAction, aLaCarte, resourceId, vnfType);
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationFeature.INDENT_OUTPUT);
+			msoLogger.debug("GeneralBB: " + mapper.writeValueAsString(outputBB));
+
+			setHomingFlag(outputBB, homing, lookupKeyMap);
+
+			execution.setVariable(FLOW_VAR_NAME, executeBB.getBuildingBlock().getBpmnFlowName());
+			execution.setVariable(GBB_INPUT_VAR_NAME, outputBB);
+			execution.setVariable(LOOKUP_KEY_MAP_VAR_NAME, lookupKeyMap);
+
+			BuildingBlockExecution gBuildingBlockExecution = new DelegateExecutionImpl(execution);
+			execution.setVariable("gBuildingBlockExecution", gBuildingBlockExecution);
+			execution.setVariable("RetryCount", 1);
+			execution.setVariable("handlingCode", "Success");
+		} catch (Exception e) {
+			msoLogger.error(e);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, e.getMessage());
+		}
+	}
+
+	protected void setHomingFlag(GeneralBuildingBlock outputBB, boolean homing, Map<ResourceKey, String> lookupKeyMap) {
+
+		if (lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID) != null && homing && outputBB != null) {
+			for (GenericVnf vnf : outputBB.getCustomer().getServiceSubscription().getServiceInstances().get(0).getVnfs()) {
+				if (vnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+					vnf.setCallHoming(homing);
+				}
+			}
+		}
+	}
+
+	protected ExecuteBuildingBlock getExecuteBBFromExecution(DelegateExecution execution) {
+		return (ExecuteBuildingBlock) execution.getVariable(EXECUTE_BB_VAR_NAME);
+	}
+
+	protected GeneralBuildingBlock getGBB(ExecuteBuildingBlock executeBB, Map<ResourceKey, String> lookupKeyMap,
+			String requestAction, boolean aLaCarte, String resourceId, String vnfType) throws Exception {
+		String requestId = executeBB.getRequestId();
+		this.populateLookupKeyMapWithIds(executeBB.getWorkflowResourceIds(), lookupKeyMap);
+		RequestDetails requestDetails = executeBB.getRequestDetails();
+		if(requestDetails == null) {
+			requestDetails = bbInputSetupUtils.getRequestDetails(requestId);
+		}
+		ModelType modelType = requestDetails.getModelInfo().getModelType();
+		if (aLaCarte && modelType.equals(ModelType.service)) {
+			return this.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId);
+		} else if (aLaCarte && !modelType.equals(ModelType.service)) {
+			return this.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId,
+					vnfType);
+		} else {
+			return this.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		}
+	}
+
+	protected void populateLookupKeyMapWithIds(WorkflowResourceIds workflowResourceIds,
+			Map<ResourceKey, String> lookupKeyMap) {
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, workflowResourceIds.getServiceInstanceId());
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, workflowResourceIds.getNetworkId());
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, workflowResourceIds.getVnfId());
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, workflowResourceIds.getVfModuleId());
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, workflowResourceIds.getVolumeGroupId());
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, workflowResourceIds.getConfigurationId());
+	}
+
+	protected GeneralBuildingBlock getGBBALaCarteNonService(ExecuteBuildingBlock executeBB,
+			RequestDetails requestDetails, Map<ResourceKey, String> lookupKeyMap, String requestAction,
+			String resourceId, String vnfType) throws Exception {
+		String bbName = executeBB.getBuildingBlock().getBpmnFlowName();
+		String serviceInstanceId = lookupKeyMap.get(ResourceKey.SERVICE_INSTANCE_ID);
+		org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance = null;
+		if (serviceInstanceId != null) {
+			aaiServiceInstance = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId);
+		}
+		Service service = null;
+		if (aaiServiceInstance != null) {
+			service = bbInputSetupUtils.getCatalogServiceByModelUUID(aaiServiceInstance.getModelVersionId());
+		}
+		if (aaiServiceInstance != null && service != null) {
+			ServiceInstance serviceInstance = this.getExistingServiceInstance(aaiServiceInstance);
+			serviceInstance.setModelInfoServiceInstance(this.mapperLayer.mapCatalogServiceIntoServiceInstance(service));
+			this.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance, lookupKeyMap,
+					resourceId, vnfType);
+			return this.populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance, executeBB, requestAction, null);
+		} else {
+			msoLogger.debug("Related Service Instance from AAI: " + aaiServiceInstance);
+			msoLogger.debug("Related Service Instance Model Info from AAI: " + service);
+			throw new Exception("Could not find relevant information for related Service Instance");
+		}
+	}
+
+	protected void populateObjectsOnAssignAndCreateFlows(RequestDetails requestDetails, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId, String vnfType)
+			throws Exception {
+		ModelInfo modelInfo = requestDetails.getModelInfo();
+		String instanceName = requestDetails.getRequestInfo().getInstanceName();
+		ModelType modelType = modelInfo.getModelType();
+		RelatedInstanceList[] relatedInstanceList = requestDetails.getRelatedInstanceList();
+
+		org.onap.so.serviceinstancebeans.Platform platform = requestDetails.getPlatform();
+		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = requestDetails.getLineOfBusiness();
+
+		if (modelType.equals(ModelType.network)) {
+			this.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId, null);
+		} else if (modelType.equals(ModelType.vnf)) {
+			this.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName, serviceInstance,
+					lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
+		} else if (modelType.equals(ModelType.volumeGroup)) {
+			this.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+					relatedInstanceList, instanceName, vnfType, null);
+		} else if (modelType.equals(ModelType.vfModule)) {
+			this.populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+					relatedInstanceList, instanceName, null, requestDetails.getCloudConfiguration());
+		} else {
+			return;
+		}
+	}
+
+	protected void populateConfiguration(ModelInfo modelInfo, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId, String instanceName) {
+		boolean foundByName = false;
+		boolean foundById = false;
+		for (Configuration configuration : serviceInstance.getConfigurations()) {
+			if (lookupKeyMap.get(ResourceKey.CONFIGURATION_ID) != null
+					&& configuration.getConfigurationId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.CONFIGURATION_ID))) {
+				foundById = true;
+				org.onap.aai.domain.yang.Configuration aaiConfiguration = bbInputSetupUtils.getAAIConfiguration(configuration.getConfigurationId());
+				if(aaiConfiguration!=null){
+					modelInfo.setModelCustomizationUuid(aaiConfiguration.getModelCustomizationId());
+				}
+				this.mapCatalogConfiguration(configuration, modelInfo, service);
+			} else if (instanceName != null && configuration.getConfigurationName().equalsIgnoreCase(instanceName)) {
+				foundByName = true;
+				lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, configuration.getConfigurationId());
+				org.onap.aai.domain.yang.Configuration aaiConfiguration = bbInputSetupUtils.getAAIConfiguration(configuration.getConfigurationId());
+				if(aaiConfiguration!=null){
+					modelInfo.setModelCustomizationUuid(aaiConfiguration.getModelCustomizationId());
+				}
+				this.mapCatalogConfiguration(configuration, modelInfo, service);
+			}
+		}
+		if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.FABRIC_CONFIGURATION.toString())) {
+			Configuration configuration = this.createConfiguration(lookupKeyMap, instanceName, resourceId);
+			serviceInstance.getConfigurations().add(configuration);
+			this.mapCatalogConfiguration(configuration, modelInfo, service);
+		}
+	}
+
+	protected Configuration createConfiguration(Map<ResourceKey, String> lookupKeyMap,
+			String instanceName, String resourceId) {
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, resourceId);
+		Configuration configuration = new Configuration();
+		configuration.setConfigurationId(resourceId);
+		configuration.setConfigurationName(instanceName);
+		configuration.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		return configuration;
+	}
+
+	protected void mapCatalogConfiguration(Configuration configuration, ModelInfo modelInfo, Service service) {
+		ConfigurationResourceCustomization configurationResourceCustomization = findConfigurationResourceCustomization(modelInfo, service);
+		if (configurationResourceCustomization != null) {
+			configuration.setModelInfoConfiguration(this.mapperLayer.mapCatalogConfigurationToConfiguration(configurationResourceCustomization));
+		}
+	}
+
+	protected ConfigurationResourceCustomization findConfigurationResourceCustomization(ModelInfo modelInfo, Service service) {
+		for (ConfigurationResourceCustomization resourceCust : service.getConfigurationCustomizations()) {
+			if (resourceCust.getModelCustomizationUUID().equalsIgnoreCase(modelInfo.getModelCustomizationUuid())) {
+				return resourceCust;
+			}
+		}
+		return null;
+	}
+
+	protected void populateVfModule(ModelInfo modelInfo, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId,
+			RelatedInstanceList[] relatedInstanceList, String instanceName, List<Map<String, String>> instanceParams, CloudConfiguration cloudConfiguration) throws Exception {
+		boolean foundByName = false;
+		boolean foundById = false;
+		String vnfModelCustomizationUUID = null;
+		if (relatedInstanceList != null) {
+			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
+				RelatedInstance relatedInstance = relatedInstList.getRelatedInstance();
+				if (relatedInstance.getModelInfo().getModelType().equals(ModelType.vnf)) {
+					vnfModelCustomizationUUID = relatedInstance.getModelInfo().getModelCustomizationId();
+				}
+				if (relatedInstance.getModelInfo().getModelType().equals(ModelType.volumeGroup)) {
+					lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, relatedInstance.getInstanceId());
+				}
+			}
+		}
+		GenericVnf vnf = null;
+		for (GenericVnf tempVnf : serviceInstance.getVnfs()) {
+			if (tempVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+				vnf = tempVnf;
+				vnfModelCustomizationUUID = this.bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
+						.getModelCustomizationId();
+				ModelInfo vnfModelInfo = new ModelInfo();
+				vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
+				this.mapCatalogVnf(tempVnf, vnfModelInfo, service);
+				for(VolumeGroup volumeGroup : tempVnf.getVolumeGroups()) {
+					String volumeGroupCustId = 
+							this.bbInputSetupUtils.getAAIVolumeGroup(CLOUD_OWNER, 
+									cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId()).getModelCustomizationId();
+					if(modelInfo.getModelCustomizationId().equalsIgnoreCase(volumeGroupCustId)) {
+						lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
+					}
+				}
+				break;
+			}
+		}
+		if (vnf != null) {
+			for (VfModule vfModule : vnf.getVfModules()) {
+				if (lookupKeyMap.get(ResourceKey.VF_MODULE_ID) != null
+						&& vfModule.getVfModuleId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VF_MODULE_ID))) {
+					foundById = true;
+					this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+				} else if (instanceName != null && vfModule.getVfModuleName().equalsIgnoreCase(instanceName)) {
+					foundByName = true;
+					lookupKeyMap.put(ResourceKey.VF_MODULE_ID, vfModule.getVfModuleId());
+					this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+				}
+			}
+			if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VF_MODULE.toString())) {
+				VfModule vfModule = this.createVfModule(lookupKeyMap,
+						resourceId, instanceName, instanceParams);
+				this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+				vnf.getVfModules().add(vfModule);
+			}
+		} else {
+			msoLogger.debug("Related VNF instance Id not found:  " + lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+			throw new Exception("Could not find relevant information for related VNF");
+		}
+	}
+
+	protected void mapCatalogVfModule(VfModule vfModule, ModelInfo modelInfo, Service service,
+			String vnfModelCustomizationUUID) {
+		if(modelInfo.getModelCustomizationUuid() != null) {
+			modelInfo.setModelCustomizationId(modelInfo.getModelCustomizationUuid());
+		}
+		VnfResourceCustomization vnfResourceCustomization = null;
+		for (VnfResourceCustomization resourceCust : service.getVnfCustomizations()) {
+			if (resourceCust.getModelCustomizationUUID().equalsIgnoreCase(vnfModelCustomizationUUID)) {
+				vnfResourceCustomization = resourceCust;
+				break;
+			}
+		}
+		if (vnfResourceCustomization != null) {
+			VfModuleCustomization vfResourceCustomization = vnfResourceCustomization.getVfModuleCustomizations()
+					.stream() // Convert to steam
+					.filter(x -> modelInfo.getModelCustomizationId().equalsIgnoreCase(x.getModelCustomizationUUID()))// find
+																														// what
+																														// we
+																														// want
+					.findAny() // If 'findAny' then return found
+					.orElse(null);
+			if (vfResourceCustomization != null) {
+				vfModule.setModelInfoVfModule(this.mapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization));
+			}
+		}
+	}
+
+	protected VfModule createVfModule(Map<ResourceKey, String> lookupKeyMap, String vfModuleId, String instanceName, List<Map<String, String>> instanceParams) {
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, vfModuleId);
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId(vfModuleId);
+		vfModule.setVfModuleName(instanceName);
+		vfModule.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		if(instanceParams != null) {
+			for(Map<String, String> params : instanceParams) {
+				vfModule.getCloudParams().putAll(params);
+			}
+		}
+		return vfModule;
+	}
+
+	protected void populateVolumeGroup(ModelInfo modelInfo, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId,
+			RelatedInstanceList[] relatedInstanceList, String instanceName, String vnfType, List<Map<String, String>> instanceParams) throws Exception {
+		boolean foundByName = false;
+		boolean foundById = false;
+		String vnfModelCustomizationUUID = null;
+		if (relatedInstanceList != null) {
+			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
+				RelatedInstance relatedInstance = relatedInstList.getRelatedInstance();
+				if (relatedInstance.getModelInfo().getModelType().equals(ModelType.vnf)) {
+					vnfModelCustomizationUUID = relatedInstance.getModelInfo().getModelCustomizationUuid();
+				}
+			}
+		}
+		GenericVnf vnf = null;
+		for (GenericVnf tempVnf : serviceInstance.getVnfs()) {
+			if (tempVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+				vnf = tempVnf;
+				vnfModelCustomizationUUID = this.bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
+						.getModelCustomizationId();
+				ModelInfo vnfModelInfo = new ModelInfo();
+				vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
+				this.mapCatalogVnf(tempVnf, vnfModelInfo, service);
+				break;
+			}
+		}
+		if (vnf != null && vnfModelCustomizationUUID != null) {
+			for (VolumeGroup volumeGroup : vnf.getVolumeGroups()) {
+				if (lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID) != null && volumeGroup.getVolumeGroupId()
+						.equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID))) {
+					foundById = true;
+					this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
+				} else if (instanceName != null && volumeGroup.getVolumeGroupName().equalsIgnoreCase(instanceName)) {
+					foundByName = true;
+					lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
+					this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
+				}
+			}
+			if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VOLUME_GROUP.toString())) {
+				if (vnfType == null || vnfType.isEmpty()) {
+					vnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
+				}
+				VolumeGroup volumeGroup = this.createVolumeGroup(lookupKeyMap, resourceId, instanceName, vnfType, instanceParams);
+				vnf.getVolumeGroups().add(volumeGroup);
+				this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
+			}
+		} else {
+			msoLogger.debug("Related VNF instance Id not found:  " + lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+			throw new Exception("Could not find relevant information for related VNF");
+		}
+	}
+
+	protected VolumeGroup createVolumeGroup(Map<ResourceKey, String> lookupKeyMap, String volumeGroupId, String instanceName, String vnfType, List<Map<String, String>> instanceParams) {
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroupId);
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId(volumeGroupId);
+		volumeGroup.setVolumeGroupName(instanceName);
+		volumeGroup.setVnfType(vnfType);
+		volumeGroup.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		if(instanceParams != null) {
+			for(Map<String, String> params : instanceParams) {
+				volumeGroup.getCloudParams().putAll(params);
+			}
+		}
+		return volumeGroup;
+	}
+
+	protected void mapCatalogVolumeGroup(VolumeGroup volumeGroup, ModelInfo modelInfo, Service service,
+			String vnfModelCustomizationUUID) {
+		VfModuleCustomization vfResourceCustomization = getVfResourceCustomization(modelInfo, service,
+				vnfModelCustomizationUUID);
+		if (vfResourceCustomization != null) {
+			volumeGroup.setModelInfoVfModule(this.mapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization));
+		}
+	}
+
+	protected VfModuleCustomization getVfResourceCustomization(ModelInfo modelInfo, Service service,
+			String vnfModelCustomizationUUID) {
+		VnfResourceCustomization vnfResourceCustomization = null;
+		for (VnfResourceCustomization resourceCust : service.getVnfCustomizations()) {
+			if (resourceCust.getModelCustomizationUUID().equalsIgnoreCase(vnfModelCustomizationUUID)) {
+				vnfResourceCustomization = resourceCust;
+				break;
+			}
+		}
+		if (vnfResourceCustomization != null) {
+			for (VfModuleCustomization vfResourceCust : vnfResourceCustomization.getVfModuleCustomizations()) {
+				if (vfResourceCust.getModelCustomizationUUID()
+						.equalsIgnoreCase(modelInfo.getModelCustomizationUuid())) {
+					return vfResourceCust;
+				}
+			}
+
+		}
+		return null;
+	}
+
+	protected void populateGenericVnf(ModelInfo modelInfo, String instanceName,
+			org.onap.so.serviceinstancebeans.Platform platform,
+			org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap,
+			RelatedInstanceList[] relatedInstanceList, String resourceId, String vnfType, List<Map<String, String>> instanceParams) {
+		boolean foundByName = false;
+		boolean foundById = false;
+		ModelInfo instanceGroupModelInfo = null;
+		String instanceGroupId = null;
+		if (relatedInstanceList != null) {
+			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
+				RelatedInstance relatedInstance = relatedInstList.getRelatedInstance();
+				if (relatedInstance.getModelInfo().getModelType().equals(ModelType.networkCollection)) {
+					instanceGroupModelInfo = relatedInstance.getModelInfo();
+					instanceGroupId = relatedInstance.getInstanceId();
+				}
+			}
+		}
+		for (GenericVnf genericVnf : serviceInstance.getVnfs()) {
+			if (lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID) != null
+					&& genericVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+				foundById = true;
+				org.onap.aai.domain.yang.GenericVnf vnf = bbInputSetupUtils.getAAIGenericVnf(genericVnf.getVnfId());
+				if(vnf!=null){
+					modelInfo.setModelCustomizationUuid(vnf.getModelCustomizationId());
+				}
+				this.mapCatalogVnf(genericVnf, modelInfo, service);
+			} else if (instanceName != null && genericVnf.getVnfName().equalsIgnoreCase(instanceName)) {
+				foundByName = true;
+				lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, genericVnf.getVnfId());
+				org.onap.aai.domain.yang.GenericVnf vnf = bbInputSetupUtils.getAAIGenericVnf(genericVnf.getVnfId());
+				if(vnf!=null){
+					modelInfo.setModelCustomizationUuid(vnf.getModelCustomizationId());
+				}
+				this.mapCatalogVnf(genericVnf, modelInfo, service);
+			}
+		}
+		if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VNF.toString())) {
+			if(vnfType == null || vnfType.isEmpty()) {
+				vnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
+			}
+			GenericVnf genericVnf = this.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+					resourceId, vnfType, instanceParams);
+			serviceInstance.getVnfs().add(genericVnf);
+			this.mapCatalogVnf(genericVnf, modelInfo, service);
+			this.mapVnfcCollectionInstanceGroup(genericVnf, modelInfo, service);
+			if (instanceGroupId != null && instanceGroupModelInfo != null)
+				this.mapNetworkCollectionInstanceGroup(genericVnf, instanceGroupId);
+		}
+	}
+
+	protected void mapVnfcCollectionInstanceGroup(GenericVnf genericVnf, ModelInfo modelInfo, Service service) {
+		VnfResourceCustomization vnfResourceCustomization = getVnfResourceCustomizationFromService(modelInfo, service);
+		if(vnfResourceCustomization != null) {
+		List<VnfcInstanceGroupCustomization> vnfcInstanceGroups = vnfResourceCustomization
+				.getVnfcInstanceGroupCustomizations();
+		for (VnfcInstanceGroupCustomization vnfcInstanceGroupCust : vnfcInstanceGroups) {
+			InstanceGroup instanceGroup = this.createInstanceGroup();
+				instanceGroup.setModelInfoInstanceGroup(this.mapperLayer
+						.mapCatalogInstanceGroupToInstanceGroup(null, vnfcInstanceGroupCust.getInstanceGroup()));
+			instanceGroup.getModelInfoInstanceGroup().setFunction(vnfcInstanceGroupCust.getFunction());
+			instanceGroup.setDescription(vnfcInstanceGroupCust.getDescription());
+			genericVnf.getInstanceGroups().add(instanceGroup);
+		}
+	}
+	}
+
+	protected void mapNetworkCollectionInstanceGroup(GenericVnf genericVnf, String instanceGroupId) {
+		org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = this.bbInputSetupUtils
+				.getAAIInstanceGroup(instanceGroupId);
+		InstanceGroup instanceGroup = this.mapperLayer.mapAAIInstanceGroupIntoInstanceGroup(aaiInstanceGroup);
+		instanceGroup.setModelInfoInstanceGroup(this.mapperLayer.mapCatalogInstanceGroupToInstanceGroup(
+				null, this.bbInputSetupUtils.getCatalogInstanceGroup(aaiInstanceGroup.getModelVersionId())));
+		genericVnf.getInstanceGroups().add(instanceGroup);
+	}
+
+	protected GenericVnf createGenericVnf(Map<ResourceKey, String> lookupKeyMap, String instanceName,
+			org.onap.so.serviceinstancebeans.Platform platform,
+			org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness, String vnfId, String vnfType, List<Map<String, String>> instanceParams) {
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, vnfId);
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId(vnfId);
+		genericVnf.setVnfName(instanceName);
+		genericVnf.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		genericVnf.setVnfType(vnfType);
+		if (platform != null) {
+			genericVnf.setPlatform(this.mapperLayer.mapRequestPlatform(platform));
+		}
+		if (lineOfBusiness != null) {
+			genericVnf.setLineOfBusiness(this.mapperLayer.mapRequestLineOfBusiness(lineOfBusiness));
+		}
+		if(instanceParams != null) {
+			for(Map<String, String> params : instanceParams) {
+				genericVnf.getCloudParams().putAll(params);
+			}
+		}
+		return genericVnf;
+	}
+
+	protected void mapCatalogVnf(GenericVnf genericVnf, ModelInfo modelInfo, Service service) {
+		VnfResourceCustomization vnfResourceCustomization = getVnfResourceCustomizationFromService(modelInfo, service);
+		if (vnfResourceCustomization != null) {
+			genericVnf.setModelInfoGenericVnf(this.mapperLayer.mapCatalogVnfToVnf(vnfResourceCustomization));
+		}
+	}
+
+	protected VnfResourceCustomization getVnfResourceCustomizationFromService(ModelInfo modelInfo, Service service) {
+		VnfResourceCustomization vnfResourceCustomization = null;
+		for (VnfResourceCustomization resourceCust : service.getVnfCustomizations()) {
+			if (resourceCust.getModelCustomizationUUID().equalsIgnoreCase(modelInfo.getModelCustomizationUuid())) {
+				vnfResourceCustomization = resourceCust;
+				break;
+			}
+		}
+		return vnfResourceCustomization;
+	}
+
+	protected void populateL3Network(String instanceName, ModelInfo modelInfo, Service service, String bbName,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId, List<Map<String, String>> instanceParams) {
+		boolean foundByName = false;
+		boolean foundById = false;
+		for (L3Network network : serviceInstance.getNetworks()) {
+			if (lookupKeyMap.get(ResourceKey.NETWORK_ID) != null
+					&& network.getNetworkId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.NETWORK_ID))) {
+				foundById = true;
+				this.mapCatalogNetwork(network, modelInfo, service);
+			} else if (instanceName != null && network.getNetworkName().equalsIgnoreCase(instanceName)) {
+				foundByName = true;
+				lookupKeyMap.put(ResourceKey.NETWORK_ID, network.getNetworkId());
+				this.mapCatalogNetwork(network, modelInfo, service);
+			}
+		}
+		if (!foundByName && !foundById 
+				&& (bbName.equalsIgnoreCase(AssignFlows.NETWORK_A_LA_CARTE.toString()) 
+						|| bbName.equalsIgnoreCase(AssignFlows.NETWORK_MACRO.toString()))) {
+			L3Network l3Network = this.createNetwork(lookupKeyMap, instanceName, resourceId, instanceParams);
+			serviceInstance.getNetworks().add(l3Network);
+			this.mapCatalogNetwork(l3Network, modelInfo, service);
+		}
+	}
+
+	protected L3Network createNetwork(Map<ResourceKey, String> lookupKeyMap, String instanceName,
+			String networkId, List<Map<String, String>> instanceParams) {
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, networkId);
+		L3Network network = new L3Network();
+		network.setNetworkId(networkId);
+		network.setNetworkName(instanceName);
+		network.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		if(instanceParams != null) {
+			for(Map<String, String> params : instanceParams) {
+				network.getCloudParams().putAll(params);
+			}
+		}
+		return network;
+	}
+
+	protected void mapCatalogNetwork(L3Network network, ModelInfo modelInfo, Service service) {
+		NetworkResourceCustomization networkResourceCustomization = null;
+		for (NetworkResourceCustomization resourceCust : service.getNetworkCustomizations()) {
+			if (resourceCust.getModelCustomizationUUID().equalsIgnoreCase(modelInfo.getModelCustomizationUuid())) {
+				networkResourceCustomization = resourceCust;
+				break;
+			}
+		}
+		if (networkResourceCustomization != null) {
+			network.setModelInfoNetwork(this.mapperLayer.mapCatalogNetworkToNetwork(networkResourceCustomization));
+		}
+	}
+
+	protected GeneralBuildingBlock getGBBALaCarteService(ExecuteBuildingBlock executeBB, RequestDetails requestDetails,
+			Map<ResourceKey, String> lookupKeyMap, String requestAction, String resourceId) throws Exception {
+		Customer customer = getCustomerAndServiceSubscription(requestDetails, resourceId);
+		if (customer != null) {
+			Project project = null;
+			OwningEntity owningEntity = null;
+
+			if (requestDetails.getProject() != null)
+				project = mapperLayer.mapRequestProject(requestDetails.getProject());
+			if (requestDetails.getOwningEntity() != null)
+				owningEntity = mapperLayer.mapRequestOwningEntity(requestDetails.getOwningEntity());
+
+
+			Service service = bbInputSetupUtils
+					.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId());
+			if (service == null) {
+				service = bbInputSetupUtils.getCatalogServiceByModelVersionAndModelInvariantUUID(
+						requestDetails.getModelInfo().getModelVersion(),
+						requestDetails.getModelInfo().getModelInvariantId());
+			if(service == null) {
+					throw new Exception("Could not find service for model version Id: "
+							+ requestDetails.getModelInfo().getModelVersionId() + " and for model invariant Id: "
+							+ requestDetails.getModelInfo().getModelInvariantId());
+				}
+			}
+			ServiceInstance serviceInstance = this.getALaCarteServiceInstance(service, requestDetails, customer,
+					project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+					executeBB.getBuildingBlock().getBpmnFlowName());
+			return this.populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance, executeBB, requestAction, customer);
+		} else {
+			throw new Exception("Could not find customer");
+		}
+	}
+
+	protected Customer getCustomerAndServiceSubscription(RequestDetails requestDetails, String resourceId) {
+		Customer customer;
+		if (requestDetails.getSubscriberInfo() != null) {
+			customer = this.getCustomerFromRequest(requestDetails);
+		} else {
+			customer = this.getCustomerFromURI(resourceId);
+		}
+		if (customer != null) {
+			ServiceSubscription serviceSubscription = null;
+			serviceSubscription = getServiceSubscription(requestDetails, customer);
+			if (serviceSubscription == null) {
+				serviceSubscription = getServiceSubscriptionFromURI(resourceId, customer);
+			}
+			customer.setServiceSubscription(serviceSubscription);
+			return customer;
+		} else {
+			return null;
+		}
+	}
+
+	protected ServiceSubscription getServiceSubscriptionFromURI(String resourceId, Customer customer) {
+		Map<String, String> uriKeys = bbInputSetupUtils.getURIKeysFromServiceInstance(resourceId);
+		String subscriptionServiceType = uriKeys.get("service-type");
+		org.onap.aai.domain.yang.ServiceSubscription serviceSubscriptionAAI = bbInputSetupUtils
+				.getAAIServiceSubscription(customer.getGlobalCustomerId(), subscriptionServiceType);
+		if (serviceSubscriptionAAI != null) {
+			return mapperLayer.mapAAIServiceSubscription(serviceSubscriptionAAI);
+		} else {
+			return null;
+		}
+	}
+
+	protected Customer getCustomerFromURI(String resourceId) {
+		Map<String, String> uriKeys = bbInputSetupUtils.getURIKeysFromServiceInstance(resourceId);
+		String globalCustomerId = uriKeys.get("global-customer-id");
+		org.onap.aai.domain.yang.Customer customerAAI = this.bbInputSetupUtils.getAAICustomer(globalCustomerId);
+		if (customerAAI != null) {
+			return mapperLayer.mapAAICustomer(customerAAI);
+		} else {
+			return null;
+		}
+	}
+
+	protected GeneralBuildingBlock populateGBBWithSIAndAdditionalInfo(RequestDetails requestDetails,
+			ServiceInstance serviceInstance, ExecuteBuildingBlock executeBB, String requestAction, Customer customer) {
+		GeneralBuildingBlock outputBB = new GeneralBuildingBlock();
+		OrchestrationContext orchContext = mapperLayer.mapOrchestrationContext(requestDetails);
+		RequestContext requestContext = mapperLayer.mapRequestContext(requestDetails);
+		requestContext.setAction(requestAction);
+		requestContext.setMsoRequestId(executeBB.getRequestId());
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = bbInputSetupUtils
+				.getCloudRegion(requestDetails.getCloudConfiguration(), CLOUD_OWNER);
+		CloudRegion cloudRegion = mapperLayer.mapCloudRegion(requestDetails.getCloudConfiguration(), aaiCloudRegion,
+				CLOUD_OWNER);
+		outputBB.setOrchContext(orchContext);
+		outputBB.setRequestContext(requestContext);
+		outputBB.setCloudRegion(cloudRegion);
+		if(customer == null){
+			Map<String, String> uriKeys = bbInputSetupUtils.getURIKeysFromServiceInstance(serviceInstance.getServiceInstanceId());
+			String globalCustomerId = uriKeys.get("global-customer-id");
+			String subscriptionServiceType = uriKeys.get("service-type");
+			customer = mapCustomer(globalCustomerId, subscriptionServiceType);
+		}
+		outputBB.setServiceInstance(serviceInstance);
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		outputBB.setCustomer(customer);
+		return outputBB;
+	}
+
+	protected ServiceSubscription getServiceSubscription(RequestDetails requestDetails, Customer customer) {
+		org.onap.aai.domain.yang.ServiceSubscription aaiServiceSubscription = bbInputSetupUtils
+				.getAAIServiceSubscription(customer.getGlobalCustomerId(),
+						requestDetails.getRequestParameters().getSubscriptionServiceType());
+		if (aaiServiceSubscription != null) {
+		return mapperLayer.mapAAIServiceSubscription(aaiServiceSubscription);
+		} else {
+			return null;
+		}
+	}
+
+	protected Customer getCustomerFromRequest(RequestDetails requestDetails) {
+		org.onap.aai.domain.yang.Customer aaiCustomer = bbInputSetupUtils
+				.getAAICustomer(requestDetails.getSubscriberInfo().getGlobalSubscriberId());
+		if (aaiCustomer != null) {
+		return mapperLayer.mapAAICustomer(aaiCustomer);
+		} else {
+			return null;
+		}
+	}
+
+	protected ServiceInstance getALaCarteServiceInstance(Service service, RequestDetails requestDetails,
+			Customer customer, Project project, OwningEntity owningEntity, Map<ResourceKey, String> lookupKeyMap,
+			String serviceInstanceId, boolean aLaCarte, String bbName) throws Exception {
+		ServiceInstance serviceInstance = this.getServiceInstanceHelper(requestDetails, customer, project, owningEntity,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = this.bbInputSetupUtils
+				.getAAIServiceInstanceById(serviceInstanceId);
+		if (serviceInstanceAAI != null
+				&& !serviceInstanceAAI.getModelVersionId().equalsIgnoreCase(service.getModelUUID())) {
+			Service tempService = this.bbInputSetupUtils
+					.getCatalogServiceByModelUUID(serviceInstanceAAI.getModelVersionId());
+			if (tempService != null) {
+				serviceInstance
+						.setModelInfoServiceInstance(mapperLayer.mapCatalogServiceIntoServiceInstance(tempService));
+				return serviceInstance;
+			} else {
+				throw new Exception(
+						"Could not find model of existing SI. Service Instance in AAI already exists with different model version id: "
+								+ serviceInstanceAAI.getModelVersionId());
+			}
+		}
+		serviceInstance.setModelInfoServiceInstance(mapperLayer.mapCatalogServiceIntoServiceInstance(service));
+		return serviceInstance;
+	}
+
+	protected GeneralBuildingBlock getGBBMacro(ExecuteBuildingBlock executeBB, RequestDetails requestDetails,
+			Map<ResourceKey, String> lookupKeyMap, String requestAction, String resourceId, String vnfType)
+			throws Exception {
+		String bbName = executeBB.getBuildingBlock().getBpmnFlowName();
+		String key = executeBB.getBuildingBlock().getKey();
+		GeneralBuildingBlock gBB = this.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap, requestAction,
+				resourceId);
+		RequestParameters requestParams = requestDetails.getRequestParameters();
+		Service service = null;
+		if (gBB != null && gBB.getServiceInstance() != null
+				&& gBB.getServiceInstance().getModelInfoServiceInstance() != null
+				&& gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid() != null) {
+			service = bbInputSetupUtils.getCatalogServiceByModelUUID(
+					gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		} else {
+			throw new Exception("Could not get service instance for macro request");
+		}
+		if (requestParams != null && requestParams.getUserParams() != null) {
+			for(Map<String, Object> userParams : requestParams.getUserParams()) {
+				if(userParams.containsKey("service")) {
+					String input = mapper.writeValueAsString(userParams.get("service"));
+					return getGBBMacroUserParams(executeBB, requestDetails, lookupKeyMap, vnfType, bbName, key, gBB,
+							requestParams, service, input);
+				}
+			}
+		}
+		if (requestAction.equalsIgnoreCase("deactivateInstance")) {
+			return gBB;
+		} else if (requestAction.equalsIgnoreCase("createInstance")) {
+		return getGBBMacroNoUserParamsCreate(executeBB, lookupKeyMap, bbName, key, gBB, service);
+		} else if (requestAction.equalsIgnoreCase("deleteInstance")
+				|| requestAction.equalsIgnoreCase("unassignInstance")
+				|| requestAction.equalsIgnoreCase("activateInstance")
+				|| requestAction.equalsIgnoreCase("activateFabricConfiguration")) {
+			return getGBBMacroExistingService(executeBB, lookupKeyMap, bbName, gBB, service, requestAction,
+					requestDetails.getCloudConfiguration());
+		} else {
+		throw new IllegalArgumentException(
+				"No user params on requestAction: assignInstance. Please specify user params.");
+		}
+	}
+
+	protected GeneralBuildingBlock getGBBMacroNoUserParamsCreate(ExecuteBuildingBlock executeBB,
+			Map<ResourceKey, String> lookupKeyMap, String bbName, String key, GeneralBuildingBlock gBB, Service service)
+			throws Exception {
+		ServiceInstance serviceInstance = gBB.getServiceInstance();
+		if (bbName.contains(NETWORK) && !bbName.contains(NETWORK_COLLECTION)) {
+			String networkId = lookupKeyMap.get(ResourceKey.NETWORK_ID);
+			ModelInfo networkModelInfo = new ModelInfo();
+			if(!executeBB.getBuildingBlock().getIsVirtualLink()) {
+				NetworkResourceCustomization networkCust = getNetworkCustomizationByKey(key, service);
+				if (networkCust != null) {
+					networkModelInfo.setModelCustomizationUuid(networkCust.getModelCustomizationUUID());
+					this.populateL3Network(null, networkModelInfo, service, bbName, serviceInstance, lookupKeyMap,
+							networkId, null);
+				} else {
+					msoLogger.debug("Could not find a network customization with key: " + key);
+				}
+			} else {
+				msoLogger.debug("Orchestrating on Collection Network Resource Customization");
+				serviceInstance.getNetworks().add(getVirtualLinkL3Network(lookupKeyMap, bbName, key, networkId));
+			}
+		} else if(bbName.contains("Configuration")) {
+			String configurationId = lookupKeyMap.get(ResourceKey.CONFIGURATION_ID);
+			ModelInfo configurationModelInfo = new ModelInfo();
+			configurationModelInfo.setModelCustomizationUuid(key);
+			ConfigurationResourceCustomization configurationCust = findConfigurationResourceCustomization(configurationModelInfo, service);
+			if(configurationCust != null) {
+				this.populateConfiguration(configurationModelInfo, service, bbName, serviceInstance, lookupKeyMap, configurationId, null);
+			} else {
+				msoLogger.debug("Could not find a configuration customization with key: " + key);
+			}
+		}
+		if (executeBB.getWorkflowResourceIds() != null) {
+			this.populateNetworkCollectionAndInstanceGroupAssign(service, bbName, serviceInstance,
+					executeBB.getWorkflowResourceIds().getNetworkCollectionId(), key);
+		}
+		return gBB;
+	}
+
+	protected L3Network getVirtualLinkL3Network(Map<ResourceKey, String> lookupKeyMap, String bbName, String key,
+			String networkId) {
+		CollectionNetworkResourceCustomization collectionNetworkResourceCust = bbInputSetupUtils.getCatalogCollectionNetworkResourceCustByID(key);
+		if(collectionNetworkResourceCust != null && (bbName.equalsIgnoreCase(AssignFlows.NETWORK_A_LA_CARTE.toString()) 
+				|| bbName.equalsIgnoreCase(AssignFlows.NETWORK_MACRO.toString()))) {
+			NetworkResourceCustomization networkResourceCustomization = 
+					mapperLayer.mapCollectionNetworkResourceCustToNetworkResourceCust(collectionNetworkResourceCust);
+			L3Network l3Network = createNetwork(lookupKeyMap, null, networkId, null);
+			l3Network.setModelInfoNetwork(mapperLayer.mapCatalogNetworkToNetwork(networkResourceCustomization));
+			return l3Network;
+		}
+		return null;
+	}
+
+	protected NetworkResourceCustomization getNetworkCustomizationByKey(String key, Service service) {
+		for (NetworkResourceCustomization networkCust : service.getNetworkCustomizations()) {
+			if (networkCust.getModelCustomizationUUID().equalsIgnoreCase(key)) {
+				return networkCust;
+			}
+		}
+		return null;
+	}
+
+	protected GeneralBuildingBlock getGBBMacroExistingService(ExecuteBuildingBlock executeBB,
+			Map<ResourceKey, String> lookupKeyMap, String bbName, GeneralBuildingBlock gBB, Service service,
+			String requestAction, CloudConfiguration cloudConfiguration) throws Exception {
+		ServiceInstance serviceInstance = gBB.getServiceInstance();
+		if (cloudConfiguration != null && requestAction.equalsIgnoreCase("deleteInstance")) {
+			org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = bbInputSetupUtils.getCloudRegion(cloudConfiguration,
+					CLOUD_OWNER);
+			CloudRegion cloudRegion = mapperLayer.mapCloudRegion(cloudConfiguration, aaiCloudRegion, CLOUD_OWNER);
+			gBB.setCloudRegion(cloudRegion);
+		}
+		if (bbName.contains(VNF)) {
+			for (GenericVnf genericVnf : serviceInstance.getVnfs()) {
+				if (lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID) != null
+						&& genericVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+					org.onap.aai.domain.yang.GenericVnf vnf = bbInputSetupUtils.getAAIGenericVnf(genericVnf.getVnfId());
+					ModelInfo modelInfo = new ModelInfo();
+					if (vnf != null) {
+						modelInfo.setModelCustomizationUuid(vnf.getModelCustomizationId());
+					}
+					this.mapCatalogVnf(genericVnf, modelInfo, service);
+				}
+			}
+		} else if (bbName.contains(VF_MODULE)) {
+			for (GenericVnf vnf : serviceInstance.getVnfs()) {
+				for (VfModule vfModule : vnf.getVfModules()) {
+					if (lookupKeyMap.get(ResourceKey.VF_MODULE_ID) != null
+							&& vfModule.getVfModuleId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VF_MODULE_ID))) {
+						String vnfModelCustomizationUUID = this.bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
+								.getModelCustomizationId();
+						ModelInfo vnfModelInfo = new ModelInfo();
+						vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
+						this.mapCatalogVnf(vnf, vnfModelInfo, service);
+						lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, vnf.getVnfId());
+						String vfModuleCustomizationUUID = this.bbInputSetupUtils
+								.getAAIVfModule(vnf.getVnfId(), vfModule.getVfModuleId()).getModelCustomizationId();
+						ModelInfo vfModuleModelInfo = new ModelInfo();
+						vfModuleModelInfo.setModelCustomizationId(vfModuleCustomizationUUID);
+						this.mapCatalogVfModule(vfModule, vfModuleModelInfo, service, vnfModelCustomizationUUID);
+						break;
+					}
+				}
+			}
+		} else if (bbName.contains(VOLUME_GROUP)) {
+			for (GenericVnf vnf : serviceInstance.getVnfs()) {
+				for (VolumeGroup volumeGroup : vnf.getVolumeGroups()) {
+					if (lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID) != null && volumeGroup.getVolumeGroupId()
+							.equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID))) {
+						String vnfModelCustomizationUUID = this.bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
+								.getModelCustomizationId();
+						ModelInfo vnfModelInfo = new ModelInfo();
+						vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
+						this.mapCatalogVnf(vnf, vnfModelInfo, service);
+						lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, vnf.getVnfId());
+						if (cloudConfiguration != null) {
+							String volumeGroupCustomizationUUID = this.bbInputSetupUtils.getAAIVolumeGroup(CLOUD_OWNER,
+									cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId())
+									.getModelCustomizationId();
+							ModelInfo volumeGroupModelInfo = new ModelInfo();
+							volumeGroupModelInfo.setModelCustomizationId(volumeGroupCustomizationUUID);
+							this.mapCatalogVolumeGroup(volumeGroup, volumeGroupModelInfo, service,
+									vnfModelCustomizationUUID);
+						}
+						break;
+					}
+				}
+			}
+		} else if (bbName.contains(NETWORK)) {
+			for (L3Network network : serviceInstance.getNetworks()) {
+				if (lookupKeyMap.get(ResourceKey.NETWORK_ID) != null
+						&& network.getNetworkId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.NETWORK_ID))) {
+					String networkCustomizationUUID = this.bbInputSetupUtils.getAAIL3Network(network.getNetworkId())
+							.getModelCustomizationId();
+					ModelInfo modelInfo = new ModelInfo();
+					modelInfo.setModelCustomizationUuid(networkCustomizationUUID);
+					this.mapCatalogNetwork(network, modelInfo, service);
+					break;
+				}
+			}
+		} else if (bbName.contains("Fabric")) {
+			for(Configuration configuration : serviceInstance.getConfigurations()) {
+				if(lookupKeyMap.get(ResourceKey.CONFIGURATION_ID) != null
+						&& configuration.getConfigurationId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.CONFIGURATION_ID))) {
+					String configurationCustUUID = this.bbInputSetupUtils.getAAIConfiguration(configuration.getConfigurationId())
+							.getModelCustomizationId();
+					ModelInfo modelInfo = new ModelInfo();
+					modelInfo.setModelCustomizationUuid(configurationCustUUID);
+					this.mapCatalogConfiguration(configuration, modelInfo, service);
+					break;
+				}
+			}
+		}
+		if (executeBB.getWorkflowResourceIds() != null) {
+			this.populateNetworkCollectionAndInstanceGroupAssign(service, bbName, serviceInstance,
+					executeBB.getWorkflowResourceIds().getNetworkCollectionId(), executeBB.getBuildingBlock().getKey());
+		}
+		return gBB;
+	}
+
+	protected GeneralBuildingBlock getGBBMacroUserParams(ExecuteBuildingBlock executeBB, RequestDetails requestDetails,
+			Map<ResourceKey, String> lookupKeyMap, String vnfType, String bbName, String key, GeneralBuildingBlock gBB,
+			RequestParameters requestParams, Service service, String input) throws Exception {
+		ServiceInstance serviceInstance = gBB.getServiceInstance();
+		org.onap.so.serviceinstancebeans.Service serviceMacro = mapper.readValue(input,
+				org.onap.so.serviceinstancebeans.Service.class);
+
+		Resources resources = serviceMacro.getResources();
+		Vnfs vnfs = null;
+		VfModules vfModules = null;
+		Networks networks = null;
+		CloudConfiguration cloudConfiguration = requestDetails.getCloudConfiguration();
+		CloudRegion cloudRegion = getCloudRegionFromMacroRequest(cloudConfiguration, resources);
+		gBB.setCloudRegion(cloudRegion);
+		if (bbName.contains(VNF)) {
+			vnfs = findVnfsByKey(key, resources, vnfs);
+			String vnfId = lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID);
+			// This stores the vnf id in request db to be retrieved later when
+			// working on a vf module or volume group
+			InfraActiveRequests request = this.bbInputSetupUtils.getInfraActiveRequest(executeBB.getRequestId());
+			if (request != null) {
+				this.bbInputSetupUtils.updateInfraActiveRequestVnfId(request, vnfId);
+			}
+			this.populateGenericVnf(vnfs.getModelInfo(), vnfs.getInstanceName(), vnfs.getPlatform(),
+					vnfs.getLineOfBusiness(), service, bbName, serviceInstance, lookupKeyMap, null, vnfId, vnfType, vnfs.getInstanceParams());
+		} else if (bbName.contains(VF_MODULE) || bbName.contains(VOLUME_GROUP)) {
+			Pair<Vnfs, VfModules> vnfsAndVfModules = getVfModulesAndItsVnfsByKey(key, resources);
+			vfModules = vnfsAndVfModules.getValue1();
+			vnfs = vnfsAndVfModules.getValue0();
+			lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, getVnfId(executeBB, lookupKeyMap));
+			if (vnfs == null) {
+				throw new Exception("Could not find Vnf to orchestrate VfModule");
+			}
+			ModelInfo modelInfo = vfModules.getModelInfo();
+			if (bbName.contains(VOLUME_GROUP)) {
+				String volumeGroupId = lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID);
+				this.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, volumeGroupId, null,
+						vfModules.getVolumeGroupInstanceName(), vnfType, vfModules.getInstanceParams());
+			} else {
+				String vfModuleId = lookupKeyMap.get(ResourceKey.VF_MODULE_ID);
+				CloudConfiguration cloudConfig = new CloudConfiguration();
+				cloudConfig.setLcpCloudRegionId(cloudRegion.getLcpCloudRegionId());
+				this.populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap, vfModuleId, null,
+						vfModules.getInstanceName(), vfModules.getInstanceParams(), cloudConfig);
+			}
+		} else if (bbName.contains(NETWORK)) {
+			networks = findNetworksByKey(key, resources);
+			String networkId = lookupKeyMap.get(ResourceKey.NETWORK_ID);
+			this.populateL3Network(networks.getInstanceName(), networks.getModelInfo(), service, bbName,
+					serviceInstance, lookupKeyMap, networkId, networks.getInstanceParams());
+		} else if (bbName.contains("Configuration")) {
+			String configurationId = lookupKeyMap.get(ResourceKey.CONFIGURATION_ID);
+			ModelInfo configurationModelInfo = new ModelInfo();
+			configurationModelInfo.setModelCustomizationUuid(key);
+			ConfigurationResourceCustomization configurationCust = findConfigurationResourceCustomization(configurationModelInfo, service);
+			if(configurationCust != null) {
+				this.populateConfiguration(configurationModelInfo, service, bbName, serviceInstance, lookupKeyMap, configurationId, null);
+			} else {
+				msoLogger.debug("Could not find a configuration customization with key: " + key);
+			}
+		}
+		return gBB;
+	}
+	
+	protected Networks findNetworksByKey(String key, Resources resources) {
+		for (Networks networks : resources.getNetworks()) {
+			if (networks.getModelInfo().getModelCustomizationId().equalsIgnoreCase(key)) {
+				return networks;
+			}
+		}
+		return null;
+	}
+
+	protected Pair<Vnfs, VfModules> getVfModulesAndItsVnfsByKey(String key, Resources resources) {
+		for (Vnfs vnfs : resources.getVnfs()) {
+			for (VfModules vfModules : vnfs.getVfModules()) {
+				if (vfModules.getModelInfo().getModelCustomizationId().equalsIgnoreCase(key)) {
+					return new Pair<Vnfs, VfModules>(vnfs, vfModules);
+				}
+			}
+		}
+		return null;
+	}
+
+	protected Vnfs findVnfsByKey(String key, Resources resources, Vnfs vnfs) {
+		for (Vnfs tempVnfs : resources.getVnfs()) {
+			if (tempVnfs.getModelInfo().getModelCustomizationId().equalsIgnoreCase(key)) {
+				vnfs = tempVnfs;
+				break;
+			}
+		}
+		return vnfs;
+	}
+
+	protected CloudRegion getCloudRegionFromMacroRequest(CloudConfiguration cloudConfiguration, Resources resources) {
+		if(cloudConfiguration == null) {
+			for(Vnfs vnfs : resources.getVnfs()) {
+				if(cloudConfiguration == null) {
+					cloudConfiguration = vnfs.getCloudConfiguration();
+				} else {
+					break;
+				}
+				for(VfModules vfModules : vnfs.getVfModules()) {
+					if(cloudConfiguration == null) {
+						cloudConfiguration = vfModules.getCloudConfiguration();
+					} else {
+						break;
+					}
+				}
+			}
+			for(Networks networks : resources.getNetworks()) {
+				if(cloudConfiguration == null) {
+				cloudConfiguration = networks.getCloudConfiguration();
+				} else {
+					break;
+			}
+		}
+		}
+		if(cloudConfiguration != null) {
+			org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = bbInputSetupUtils.getCloudRegion(cloudConfiguration,
+					CLOUD_OWNER);
+			return mapperLayer.mapCloudRegion(cloudConfiguration, aaiCloudRegion, CLOUD_OWNER);
+		} else {
+			msoLogger.debug("Could not find any cloud configuration for this request.");
+			return null;
+		}
+	}
+
+	protected String getVnfId(ExecuteBuildingBlock executeBB, Map<ResourceKey, String> lookupKeyMap) {
+		String vnfId = lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID);
+		if (vnfId == null) {
+			InfraActiveRequests request = this.bbInputSetupUtils.getInfraActiveRequest(executeBB.getRequestId());
+			vnfId = request.getVnfId();
+		}
+
+		return vnfId;
+	}
+
+	protected String generateRandomUUID() {
+		return UUID.randomUUID().toString();
+	}
+
+	protected ServiceInstance getServiceInstanceHelper(RequestDetails requestDetails, Customer customer,
+			Project project, OwningEntity owningEntity, Map<ResourceKey, String> lookupKeyMap, String serviceInstanceId,
+			boolean aLaCarte, Service service, String bbName) throws Exception {
+		if (requestDetails.getRequestInfo().getInstanceName() == null && aLaCarte
+				&& bbName.equalsIgnoreCase(AssignFlows.SERVICE_INSTANCE.toString())) {
+			throw new Exception("Request invalid missing: RequestInfo:InstanceName");
+		} else {
+			org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = null;
+			if (aLaCarte && bbName.equalsIgnoreCase(AssignFlows.SERVICE_INSTANCE.toString())) {
+				serviceInstanceAAI = bbInputSetupUtils
+					.getAAIServiceInstanceByName(requestDetails.getRequestInfo().getInstanceName(), customer);
+			}
+			if (serviceInstanceId != null && serviceInstanceAAI == null) {
+				serviceInstanceAAI = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId);
+			}
+			if (serviceInstanceAAI != null) {
+				lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstanceId);
+				return this.getExistingServiceInstance(serviceInstanceAAI);
+			} else {
+				return createServiceInstance(requestDetails, project, owningEntity, lookupKeyMap,
+						serviceInstanceId);
+			}
+		}
+	}
+
+	protected ServiceInstance createServiceInstance(RequestDetails requestDetails, Project project,
+													OwningEntity owningEntity, Map<ResourceKey, String> lookupKeyMap, String serviceInstanceId) {
+		ServiceInstance serviceInstance = new ServiceInstance();
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstanceId);
+		serviceInstance.setServiceInstanceId(serviceInstanceId);
+		if(requestDetails.getRequestInfo() != null) {
+		serviceInstance.setServiceInstanceName(requestDetails.getRequestInfo().getInstanceName());
+		}
+		serviceInstance.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		serviceInstance.setProject(project);
+		serviceInstance.setOwningEntity(owningEntity);
+		return serviceInstance;
+	}
+
+	public ServiceInstance getExistingServiceInstance(org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI)
+			throws Exception {
+		ServiceInstance serviceInstance = mapperLayer.mapAAIServiceInstanceIntoServiceInstance(serviceInstanceAAI);
+		if (serviceInstanceAAI.getRelationshipList() != null
+				&& serviceInstanceAAI.getRelationshipList().getRelationship() != null
+				&& !serviceInstanceAAI.getRelationshipList().getRelationship().isEmpty()) {
+			addRelationshipsToSI(serviceInstanceAAI, serviceInstance);
+		}
+		return serviceInstance;
+	}
+
+	protected void populateNetworkCollectionAndInstanceGroupAssign(Service service, String bbName,
+			ServiceInstance serviceInstance, String resourceId, String key) throws Exception {
+		if (serviceInstance.getCollection() == null
+				&& bbName.equalsIgnoreCase(AssignFlows.NETWORK_COLLECTION.toString())) {
+			Collection collection = this.createCollection(resourceId);
+			serviceInstance.setCollection(collection);
+			this.mapCatalogCollection(service, serviceInstance.getCollection(), key);
+			if(isVlanTagging(service, key)) {
+			InstanceGroup instanceGroup = this.createInstanceGroup();
+			serviceInstance.getCollection().setInstanceGroup(instanceGroup);
+				this.mapCatalogNetworkCollectionInstanceGroup(service,
+						serviceInstance.getCollection().getInstanceGroup(), key);
+			}
+		}
+	}
+
+	protected CollectionResourceCustomization findCatalogNetworkCollection(Service service, String key) {
+		for(CollectionResourceCustomization collectionCust : service.getCollectionResourceCustomizations()){
+			if(collectionCust.getModelCustomizationUUID().equalsIgnoreCase(key)) {
+				return collectionCust;
+			}
+		}
+			return null;
+	}
+			
+	protected boolean isVlanTagging(Service service, String key) {
+		CollectionResourceCustomization collectionCust = findCatalogNetworkCollection(service, key);
+		if (collectionCust != null) {
+			CollectionResource collectionResource = collectionCust.getCollectionResource();
+			if (collectionResource != null
+					&& collectionResource.getInstanceGroup() != null
+					&& collectionResource.getInstanceGroup().getToscaNodeType() != null
+					&& collectionResource.getInstanceGroup().getToscaNodeType().contains("NetworkCollection")) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected void mapCatalogNetworkCollectionInstanceGroup(Service service, InstanceGroup instanceGroup, String key) {
+		CollectionResourceCustomization collectionCust = this.findCatalogNetworkCollection(service, key);
+		org.onap.so.db.catalog.beans.InstanceGroup catalogInstanceGroup = collectionCust.getCollectionResource().getInstanceGroup();
+		instanceGroup.setModelInfoInstanceGroup(
+				mapperLayer.mapCatalogInstanceGroupToInstanceGroup(collectionCust, catalogInstanceGroup));
+		}
+
+	protected void mapCatalogCollection(Service service, Collection collection, String key) {
+		CollectionResourceCustomization collectionCust = findCatalogNetworkCollection(service, key);
+		if (collectionCust != null) {
+			CollectionResource collectionResource = collectionCust.getCollectionResource();
+			if (collectionResource != null) {
+				collection.setModelInfoCollection(
+						mapperLayer.mapCatalogCollectionToCollection(collectionCust, collectionResource));
+			}
+		}
+	}
+
+	protected Collection createCollection(String collectionId) {
+		Collection collection = new Collection();
+		collection.setId(collectionId);
+		collection.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		return collection;
+	}
+
+	protected InstanceGroup createInstanceGroup() {
+		InstanceGroup instanceGroup = new InstanceGroup();
+		String instanceGroupId = this.generateRandomUUID();
+		instanceGroup.setId(instanceGroupId);
+		return instanceGroup;
+	}
+
+	protected void addRelationshipsToSI(org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI,
+			ServiceInstance serviceInstance) throws Exception {
+		AAIResultWrapper serviceInstanceWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(serviceInstanceAAI));
+		Optional<Relationships> relationshipsOp = serviceInstanceWrapper.getRelationships();
+		Relationships relationships = null;
+		if (relationshipsOp.isPresent()) {
+			relationships = relationshipsOp.get();
+		} else {
+			return;
+		}
+
+		this.mapProject(relationships.getByType(AAIObjectType.PROJECT), serviceInstance);
+		this.mapOwningEntity(relationships.getByType(AAIObjectType.OWNING_ENTITY), serviceInstance);
+		this.mapL3Networks(relationships.getRelatedAAIUris(AAIObjectType.L3_NETWORK), serviceInstance.getNetworks());
+		this.mapGenericVnfs(relationships.getRelatedAAIUris(AAIObjectType.GENERIC_VNF), serviceInstance.getVnfs());
+		this.mapCollection(relationships.getByType(AAIObjectType.COLLECTION), serviceInstance);
+		this.mapConfigurations(relationships.getRelatedAAIUris(AAIObjectType.CONFIGURATION), serviceInstance.getConfigurations());
+	}
+
+	protected void mapConfigurations(List<AAIResourceUri> relatedAAIUris, List<Configuration> configurations) {
+		for (AAIResourceUri aaiResourceUri : relatedAAIUris) {
+			configurations.add(mapConfiguration(aaiResourceUri));
+		}
+	}
+
+	protected Configuration mapConfiguration(AAIResourceUri aaiResourceUri) {
+		AAIResultWrapper aaiConfigurationWrapper = this.bbInputSetupUtils.getAAIResourceDepthOne(aaiResourceUri);
+		Optional<org.onap.aai.domain.yang.Configuration> aaiConfigurationOp = aaiConfigurationWrapper
+				.asBean(org.onap.aai.domain.yang.Configuration.class);
+		if (!aaiConfigurationOp.isPresent()) {
+			return null;
+		}
+
+		return this.mapperLayer.mapAAIConfiguration(aaiConfigurationOp.get());
+	}
+
+	protected void mapGenericVnfs(List<AAIResourceUri> list, List<GenericVnf> genericVnfs) {
+		for (AAIResourceUri aaiResourceUri : list) {
+			genericVnfs.add(this.mapGenericVnf(aaiResourceUri));
+		}
+	}
+
+	protected GenericVnf mapGenericVnf(AAIResourceUri aaiResourceUri) {
+		AAIResultWrapper aaiGenericVnfWrapper = this.bbInputSetupUtils.getAAIResourceDepthOne(aaiResourceUri);
+		Optional<org.onap.aai.domain.yang.GenericVnf> aaiGenericVnfOp = aaiGenericVnfWrapper
+				.asBean(org.onap.aai.domain.yang.GenericVnf.class);
+		if (!aaiGenericVnfOp.isPresent()) {
+			return null;
+		}
+
+		GenericVnf genericVnf = this.mapperLayer.mapAAIGenericVnfIntoGenericVnf(aaiGenericVnfOp.get());
+
+		Optional<Relationships> relationshipsOp = aaiGenericVnfWrapper.getRelationships();
+		if (relationshipsOp.isPresent()) {
+			Relationships relationships = relationshipsOp.get();
+			this.mapPlatform(relationships.getByType(AAIObjectType.PLATFORM), genericVnf);
+			this.mapLineOfBusiness(relationships.getByType(AAIObjectType.LINE_OF_BUSINESS), genericVnf);
+			genericVnf.getVolumeGroups().addAll(mapVolumeGroups(relationships.getByType(AAIObjectType.VOLUME_GROUP)));
+			genericVnf.getInstanceGroups().addAll(mapInstanceGroups(relationships.getByType(AAIObjectType.INSTANCE_GROUP)));
+		}
+
+		return genericVnf;
+	}
+
+	protected List<InstanceGroup> mapInstanceGroups(List<AAIResultWrapper> instanceGroups) {
+		List<InstanceGroup> instanceGroupsList = new ArrayList<>();
+		for (AAIResultWrapper volumeGroupWrapper : instanceGroups) {
+			instanceGroupsList.add(this.mapInstanceGroup(volumeGroupWrapper));
+		}
+		return instanceGroupsList;
+	}
+
+	protected InstanceGroup mapInstanceGroup(AAIResultWrapper instanceGroupWrapper) {
+		Optional<org.onap.aai.domain.yang.InstanceGroup> aaiInstanceGroupOp = instanceGroupWrapper
+				.asBean(org.onap.aai.domain.yang.InstanceGroup.class);
+		org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = null;
+
+		if (!aaiInstanceGroupOp.isPresent()) {
+			return null;
+		}
+
+		aaiInstanceGroup = aaiInstanceGroupOp.get();
+		InstanceGroup instanceGroup = this.mapperLayer.mapAAIInstanceGroupIntoInstanceGroup(aaiInstanceGroup);
+		instanceGroup.setModelInfoInstanceGroup(this.mapperLayer.mapCatalogInstanceGroupToInstanceGroup(null,
+				this.bbInputSetupUtils.getCatalogInstanceGroup(aaiInstanceGroup.getModelVersionId())));
+		return instanceGroup;
+	}
+
+	protected List<VolumeGroup> mapVolumeGroups(List<AAIResultWrapper> volumeGroups) {
+		List<VolumeGroup> volumeGroupsList = new ArrayList<>();
+		for (AAIResultWrapper volumeGroupWrapper : volumeGroups) {
+			volumeGroupsList.add(this.mapVolumeGroup(volumeGroupWrapper));
+		}
+		return volumeGroupsList;
+	}
+
+	protected VolumeGroup mapVolumeGroup(AAIResultWrapper volumeGroupWrapper) {
+		Optional<org.onap.aai.domain.yang.VolumeGroup> aaiVolumeGroupOp = volumeGroupWrapper
+				.asBean(org.onap.aai.domain.yang.VolumeGroup.class);
+		org.onap.aai.domain.yang.VolumeGroup aaiVolumeGroup = null;
+
+		if (!aaiVolumeGroupOp.isPresent()) {
+			return null;
+		}
+
+		aaiVolumeGroup = aaiVolumeGroupOp.get();
+		return this.mapperLayer.mapAAIVolumeGroup(aaiVolumeGroup);
+	}
+
+	protected void mapLineOfBusiness(List<AAIResultWrapper> lineOfBusinesses, GenericVnf genericVnf) {
+		if (!lineOfBusinesses.isEmpty()) {
+			AAIResultWrapper lineOfBusinessWrapper = lineOfBusinesses.get(0);
+			Optional<org.onap.aai.domain.yang.LineOfBusiness> aaiLineOfBusinessOp = lineOfBusinessWrapper
+					.asBean(org.onap.aai.domain.yang.LineOfBusiness.class);
+			org.onap.aai.domain.yang.LineOfBusiness aaiLineOfBusiness = null;
+			if (!aaiLineOfBusinessOp.isPresent()) {
+				return;
+			}
+			aaiLineOfBusiness = aaiLineOfBusinessOp.get();
+
+			LineOfBusiness lineOfBusiness = this.mapperLayer.mapAAILineOfBusiness(aaiLineOfBusiness);
+			genericVnf.setLineOfBusiness(lineOfBusiness);
+		}
+	}
+
+	protected void mapPlatform(List<AAIResultWrapper> platforms, GenericVnf genericVnf) {
+		if (!platforms.isEmpty()) {
+			AAIResultWrapper platformWrapper = platforms.get(0);
+			Optional<org.onap.aai.domain.yang.Platform> aaiPlatformOp = platformWrapper
+					.asBean(org.onap.aai.domain.yang.Platform.class);
+			org.onap.aai.domain.yang.Platform aaiPlatform = null;
+			if (!aaiPlatformOp.isPresent()) {
+				return;
+			}
+			aaiPlatform = aaiPlatformOp.get();
+
+			Platform platform = this.mapperLayer.mapAAIPlatform(aaiPlatform);
+			genericVnf.setPlatform(platform);
+		}
+	}
+
+	protected void mapCollection(List<AAIResultWrapper> collections, ServiceInstance serviceInstance) {
+		if (!collections.isEmpty()) {
+			AAIResultWrapper collectionWrapper = collections.get(0);
+			Optional<org.onap.aai.domain.yang.Collection> aaiCollectionOp = collectionWrapper
+					.asBean(org.onap.aai.domain.yang.Collection.class);
+			org.onap.aai.domain.yang.Collection aaiCollection = null;
+			if (!aaiCollectionOp.isPresent()) {
+				return;
+			}
+			aaiCollection = aaiCollectionOp.get();
+
+			Collection collection = this.mapperLayer.mapAAICollectionIntoCollection(aaiCollection);
+			
+			Optional<Relationships> relationshipsOp = collectionWrapper.getRelationships();
+			Relationships relationships = null;
+			if (relationshipsOp.isPresent()) {
+				relationships = relationshipsOp.get();
+			} else {
+				serviceInstance.setCollection(collection);
+				return;
+			}
+			List<InstanceGroup> instanceGroupsList = mapInstanceGroups(relationships.getByType(AAIObjectType.INSTANCE_GROUP));
+			if(!instanceGroupsList.isEmpty()) {
+				collection.setInstanceGroup(instanceGroupsList.get(0));
+			}
+			serviceInstance.setCollection(collection);
+		}
+	}
+
+	protected void mapL3Networks(List<AAIResourceUri> list, List<L3Network> l3Networks) {
+		for (AAIResourceUri aaiResourceUri : list) {
+			l3Networks.add(this.mapL3Network(aaiResourceUri));
+		}
+	}
+
+	protected L3Network mapL3Network(AAIResourceUri aaiResourceUri) {
+		AAIResultWrapper aaiNetworkWrapper = this.bbInputSetupUtils.getAAIResourceDepthTwo(aaiResourceUri);
+		Optional<org.onap.aai.domain.yang.L3Network> aaiL3NetworkOp = aaiNetworkWrapper
+				.asBean(org.onap.aai.domain.yang.L3Network.class);
+		org.onap.aai.domain.yang.L3Network aaiL3Network = null;
+
+		if (!aaiL3NetworkOp.isPresent()) {
+			return null;
+		}
+
+		aaiL3Network = aaiL3NetworkOp.get();
+		L3Network network = this.mapperLayer.mapAAIL3Network(aaiL3Network);
+
+		Optional<Relationships> relationshipsOp = aaiNetworkWrapper.getRelationships();
+		if (relationshipsOp.isPresent()) {
+			Relationships relationships = relationshipsOp.get();
+			this.mapNetworkPolicies(relationships.getByType(AAIObjectType.NETWORK_POLICY),
+					network.getNetworkPolicies());
+			this.mapRouteTableReferences(relationships.getByType(AAIObjectType.ROUTE_TABLE_REFERENCE),
+					network.getContrailNetworkRouteTableReferences());
+		}
+
+		return network;
+	}
+
+	protected void mapNetworkPolicies(List<AAIResultWrapper> aaiNetworkPolicies, List<NetworkPolicy> networkPolicies) {
+		for (AAIResultWrapper networkPolicyWrapper : aaiNetworkPolicies) {
+			networkPolicies.add(this.mapNetworkPolicy(networkPolicyWrapper));
+		}
+	}
+
+	protected NetworkPolicy mapNetworkPolicy(AAIResultWrapper networkPolicyWrapper) {
+		Optional<org.onap.aai.domain.yang.NetworkPolicy> aaiNetworkPolicyOp = networkPolicyWrapper
+				.asBean(org.onap.aai.domain.yang.NetworkPolicy.class);
+		org.onap.aai.domain.yang.NetworkPolicy aaiNetworkPolicy = null;
+
+		if (!aaiNetworkPolicyOp.isPresent()) {
+			return null;
+		}
+
+		aaiNetworkPolicy = aaiNetworkPolicyOp.get();
+		return this.mapperLayer.mapAAINetworkPolicy(aaiNetworkPolicy);
+	}
+
+	protected void mapRouteTableReferences(List<AAIResultWrapper> routeTableReferences,
+			List<RouteTableReference> contrailNetworkRouteTableReferences) {
+		for (AAIResultWrapper routeTableReferenceWrapper : routeTableReferences) {
+			contrailNetworkRouteTableReferences.add(this.mapRouteTableReference(routeTableReferenceWrapper));
+		}
+	}
+
+	protected RouteTableReference mapRouteTableReference(AAIResultWrapper routeTableReferenceWrapper) {
+		Optional<org.onap.aai.domain.yang.RouteTableReference> aaiRouteTableReferenceOp = routeTableReferenceWrapper
+				.asBean(org.onap.aai.domain.yang.RouteTableReference.class);
+		org.onap.aai.domain.yang.RouteTableReference aaiRouteTableReference = null;
+
+		if (!aaiRouteTableReferenceOp.isPresent()) {
+			return null;
+		}
+
+		aaiRouteTableReference = aaiRouteTableReferenceOp.get();
+		return this.mapperLayer.mapAAIRouteTableReferenceIntoRouteTableReference(aaiRouteTableReference);
+	}
+
+	protected void mapOwningEntity(List<AAIResultWrapper> owningEntities, ServiceInstance serviceInstance) {
+		if (!owningEntities.isEmpty()) {
+			AAIResultWrapper owningEntityWrapper = owningEntities.get(0);
+			Optional<org.onap.aai.domain.yang.OwningEntity> aaiOwningEntityOp = owningEntityWrapper
+					.asBean(org.onap.aai.domain.yang.OwningEntity.class);
+			org.onap.aai.domain.yang.OwningEntity aaiOwningEntity = null;
+			if (!aaiOwningEntityOp.isPresent()) {
+				return;
+			}
+			aaiOwningEntity = aaiOwningEntityOp.get();
+
+			OwningEntity owningEntity = this.mapperLayer.mapAAIOwningEntity(aaiOwningEntity);
+			serviceInstance.setOwningEntity(owningEntity);
+		}
+	}
+
+	protected void mapProject(List<AAIResultWrapper> projects, ServiceInstance serviceInstance) {
+		if (!projects.isEmpty()) {
+			AAIResultWrapper projectWrapper = projects.get(0);
+			Optional<org.onap.aai.domain.yang.Project> aaiProjectOp = projectWrapper
+					.asBean(org.onap.aai.domain.yang.Project.class);
+			org.onap.aai.domain.yang.Project aaiProject = null;
+			if (!aaiProjectOp.isPresent()) {
+				return;
+			}
+			aaiProject = aaiProjectOp.get();
+
+			Project project = this.mapperLayer.mapAAIProject(aaiProject);
+			serviceInstance.setProject(project);
+		}
+	}
+	protected Customer mapCustomer(String globalCustomerId, String subscriptionServiceType) {
+		org.onap.aai.domain.yang.Customer aaiCustomer = this.bbInputSetupUtils.getAAICustomer(globalCustomerId);
+		org.onap.aai.domain.yang.ServiceSubscription aaiServiceSubscription = this.bbInputSetupUtils
+				.getAAIServiceSubscription(globalCustomerId, subscriptionServiceType);
+		Customer customer = this.mapperLayer.mapAAICustomer(aaiCustomer);
+		ServiceSubscription serviceSubscription = this.mapperLayer.mapAAIServiceSubscription(aaiServiceSubscription);
+		if(serviceSubscription != null){
+			customer.setServiceSubscription(serviceSubscription);
+		}
+		return customer;
+	}
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
new file mode 100644
index 0000000000..04f9cdcb86
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -0,0 +1,464 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.AllottedResource;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CtagAssignment;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Entitlement;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Evc;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ForwarderEvc;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LagInterface;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.RouteTableReference;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.SegmentationAssignment;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Subnet;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.License;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestParameters;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoCollection;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoInstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.InstanceGroup;
+import org.onap.so.db.catalog.beans.InstanceGroupType;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.springframework.stereotype.Component;
+
+@Component("BBInputSetupMapperLayer")
+public class BBInputSetupMapperLayer {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL,
+			BBInputSetupMapperLayer.class);
+
+	private ModelMapper modelMapper = new ModelMapper();
+
+	public Customer mapAAICustomer(org.onap.aai.domain.yang.Customer customerAAI) {
+		return modelMapper.map(customerAAI, Customer.class);
+	}
+
+	public ServiceSubscription mapAAIServiceSubscription(
+			org.onap.aai.domain.yang.ServiceSubscription serviceSubscriptionAAI) {
+		return modelMapper.map(serviceSubscriptionAAI, ServiceSubscription.class);
+	}
+
+	protected Project mapAAIProject(org.onap.aai.domain.yang.Project aaiProject) {
+		return modelMapper.map(aaiProject, Project.class);
+	}
+
+	protected OwningEntity mapAAIOwningEntity(org.onap.aai.domain.yang.OwningEntity aaiOwningEntity) {
+		return modelMapper.map(aaiOwningEntity, OwningEntity.class);
+	}
+
+	protected Platform mapAAIPlatform(org.onap.aai.domain.yang.Platform aaiPlatform) {
+		return modelMapper.map(aaiPlatform, Platform.class);
+	}
+
+	protected LineOfBusiness mapAAILineOfBusiness(org.onap.aai.domain.yang.LineOfBusiness aaiLineOfBusiness) {
+		return modelMapper.map(aaiLineOfBusiness, LineOfBusiness.class);
+	}
+
+	protected SegmentationAssignment mapAAISegmentationAssignment(
+			org.onap.aai.domain.yang.SegmentationAssignment aaiSegmentationAssignment) {
+		return modelMapper.map(aaiSegmentationAssignment, SegmentationAssignment.class);
+	}
+
+	protected CtagAssignment mapAAICtagAssignment(org.onap.aai.domain.yang.CtagAssignment aaiCtagAssignment) {
+		return modelMapper.map(aaiCtagAssignment, CtagAssignment.class);
+	}
+
+	protected Subnet mapAAISubnet(org.onap.aai.domain.yang.Subnet aaiSubnet) {
+		return modelMapper.map(aaiSubnet, Subnet.class);
+	}
+
+	protected License mapAAILicense(org.onap.aai.domain.yang.License aaiLicense) {
+		return modelMapper.map(aaiLicense, License.class);
+	}
+
+	protected Entitlement mapAAIEntitlement(org.onap.aai.domain.yang.Entitlement aaiEntitlement) {
+		return modelMapper.map(aaiEntitlement, Entitlement.class);
+	}
+
+	protected LagInterface mapAAILagInterface(org.onap.aai.domain.yang.LagInterface aaiLagInterface) {
+		return modelMapper.map(aaiLagInterface, LagInterface.class);
+	}
+
+	protected VfModule mapAAIVfModule(org.onap.aai.domain.yang.VfModule aaiVfModule) {
+		VfModule vfModule = modelMapper.map(aaiVfModule, VfModule.class);
+		vfModule.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiVfModule.getOrchestrationStatus()));
+		return vfModule;
+	}
+
+	public NetworkPolicy mapAAINetworkPolicy(org.onap.aai.domain.yang.NetworkPolicy aaiNetworkPolicy) {
+		return modelMapper.map(aaiNetworkPolicy, NetworkPolicy.class);
+	}
+
+	protected VolumeGroup mapAAIVolumeGroup(org.onap.aai.domain.yang.VolumeGroup aaiVolumeGroup) {
+		VolumeGroup volumeGroup = modelMapper.map(aaiVolumeGroup, VolumeGroup.class);
+		volumeGroup.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiVolumeGroup.getOrchestrationStatus()));
+		return volumeGroup;
+	}
+
+	protected void setPlatformAndLOBIntoServiceInstance(Platform platformMSO, LineOfBusiness lineOfBusinessMSO,
+			ServiceInstance serviceInstance, Map<ResourceKey, String> resourcesToBeOrchestrated) {
+		String vnfId = resourcesToBeOrchestrated.get(ResourceKey.GENERIC_VNF_ID);
+		if (vnfId != null && !serviceInstance.getVnfs().isEmpty()) {
+			for (GenericVnf vnf : serviceInstance.getVnfs()) {
+				if (vnf.getVnfId().equalsIgnoreCase(vnfId)) {
+					vnf.setPlatform(platformMSO);
+					vnf.setLineOfBusiness(lineOfBusinessMSO);
+					break;
+				}
+			}
+		}
+	}
+
+	public ModelInfoServiceInstance mapCatalogServiceIntoServiceInstance(Service service) {
+		return modelMapper.map(service, ModelInfoServiceInstance.class);
+	}
+
+	protected ModelInfoInstanceGroup mapCatalogInstanceGroupToInstanceGroup(CollectionResourceCustomization collectionCust, InstanceGroup instanceGroup) {
+		ModelInfoInstanceGroup modelInfoInstanceGroup = modelMapper.map(instanceGroup, ModelInfoInstanceGroup.class);
+		if(instanceGroup.getType().equals(InstanceGroupType.L3_NETWORK))
+			modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_L3_NETWORK);
+		else
+			modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_VNFC);
+		if(collectionCust != null) {
+			List<CollectionResourceInstanceGroupCustomization> instanceGroupCustList = instanceGroup.getCollectionInstanceGroupCustomizations();
+			for(CollectionResourceInstanceGroupCustomization collectionInsatnceGroupCust : instanceGroupCustList) {
+				if(collectionInsatnceGroupCust.getModelCustomizationUUID().equalsIgnoreCase(collectionCust.getModelCustomizationUUID())) {
+					modelInfoInstanceGroup.setFunction(collectionInsatnceGroupCust.getFunction());
+					modelInfoInstanceGroup.setDescription(collectionInsatnceGroupCust.getDescription());
+					break;
+				}
+			}
+		}
+		return modelInfoInstanceGroup;
+	}
+
+	protected ModelInfoCollection mapCatalogCollectionToCollection(CollectionResourceCustomization collectionCust,
+			CollectionResource collectionResource) {
+		ModelInfoCollection modelInfoCollection = new ModelInfoCollection();
+		modelInfoCollection.setCollectionFunction(collectionCust.getFunction());
+		modelInfoCollection.setCollectionRole(collectionCust.getRole());
+		modelInfoCollection.setCollectionType(collectionCust.getType());
+		modelInfoCollection.setDescription(collectionResource.getDescription());
+		modelInfoCollection.setModelInvariantUUID(collectionResource.getModelInvariantUUID());
+		modelInfoCollection.setModelVersionId(collectionResource.getModelUUID());
+		return modelInfoCollection;
+	}
+
+	public ServiceInstance mapAAIServiceInstanceIntoServiceInstance(
+			org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance) {
+		ServiceInstance serviceInstance = modelMapper.map(aaiServiceInstance, ServiceInstance.class);
+		if (aaiServiceInstance.getAllottedResources() != null) {
+			for (org.onap.aai.domain.yang.AllottedResource allottedResource : aaiServiceInstance.getAllottedResources()
+					.getAllottedResource()) {
+				serviceInstance.getAllottedResources().add(mapAAIAllottedResource(allottedResource));
+			}
+		}
+		serviceInstance.setOrchestrationStatus(
+				this.mapOrchestrationStatusFromAAI(aaiServiceInstance.getOrchestrationStatus()));
+		return serviceInstance;
+	}
+
+	protected AllottedResource mapAAIAllottedResource(org.onap.aai.domain.yang.AllottedResource aaiAllottedResource) {
+		AllottedResource allottedResource = modelMapper.map(aaiAllottedResource, AllottedResource.class);
+		return allottedResource;
+	}
+
+	protected L3Network mapAAIL3Network(org.onap.aai.domain.yang.L3Network aaiL3Network) {
+		L3Network network = modelMapper.map(aaiL3Network, L3Network.class);
+		mapAllSubnetsIntoL3Network(aaiL3Network, network);
+		mapAllCtagAssignmentsIntoL3Network(aaiL3Network, network);
+		mapAllSegmentationAssignmentsIntoL3Network(aaiL3Network, network);
+		network.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiL3Network.getOrchestrationStatus()));
+		return network;
+	}
+
+	protected void mapAllSegmentationAssignmentsIntoL3Network(org.onap.aai.domain.yang.L3Network aaiL3Network,
+			L3Network network) {
+		if (aaiL3Network.getSegmentationAssignments() != null) {
+			for (org.onap.aai.domain.yang.SegmentationAssignment aaiSegmentationAssignment : aaiL3Network
+					.getSegmentationAssignments().getSegmentationAssignment()) {
+				network.getSegmentationAssignments().add(mapAAISegmentationAssignment(aaiSegmentationAssignment));
+			}
+		}
+	}
+
+	protected void mapAllCtagAssignmentsIntoL3Network(org.onap.aai.domain.yang.L3Network aaiL3Network,
+			L3Network network) {
+		if (aaiL3Network.getCtagAssignments() != null) {
+			for (org.onap.aai.domain.yang.CtagAssignment aaiCtagAssignment : aaiL3Network.getCtagAssignments()
+					.getCtagAssignment()) {
+				network.getCtagAssignments().add(mapAAICtagAssignment(aaiCtagAssignment));
+			}
+		}
+	}
+
+	protected void mapAllSubnetsIntoL3Network(org.onap.aai.domain.yang.L3Network aaiL3Network, L3Network network) {
+		if (aaiL3Network.getSubnets() != null) {
+			for (org.onap.aai.domain.yang.Subnet aaiSubnet : aaiL3Network.getSubnets().getSubnet()) {
+				network.getSubnets().add(mapAAISubnet(aaiSubnet));
+			}
+		}
+	}
+
+	protected GenericVnf mapAAIGenericVnfIntoGenericVnf(org.onap.aai.domain.yang.GenericVnf aaiGenericVnf) {
+		GenericVnf genericVnf = modelMapper.map(aaiGenericVnf, GenericVnf.class);
+		mapAllVfModulesIntoGenericVnf(aaiGenericVnf, genericVnf);
+		mapAllLagInterfacesIntoGenericVnf(aaiGenericVnf, genericVnf);
+		mapAllEntitlementsIntoGenericVnf(aaiGenericVnf, genericVnf);
+		mapAllLicensesIntoGenericVnf(aaiGenericVnf, genericVnf);
+		genericVnf.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiGenericVnf.getOrchestrationStatus()));
+		return genericVnf;
+	}
+
+	protected void mapAllLicensesIntoGenericVnf(org.onap.aai.domain.yang.GenericVnf aaiGenericVnf,
+			GenericVnf genericVnf) {
+		if (aaiGenericVnf.getLicenses() != null) {
+			for (org.onap.aai.domain.yang.License aaiLicense : aaiGenericVnf.getLicenses().getLicense()) {
+				genericVnf.setLicense(mapAAILicense(aaiLicense));
+			}
+		}
+	}
+
+	protected void mapAllEntitlementsIntoGenericVnf(org.onap.aai.domain.yang.GenericVnf aaiGenericVnf,
+			GenericVnf genericVnf) {
+		if (aaiGenericVnf.getEntitlements() != null) {
+			for (org.onap.aai.domain.yang.Entitlement aaiEntitlement : aaiGenericVnf.getEntitlements()
+					.getEntitlement()) {
+				genericVnf.getEntitlements().add(mapAAIEntitlement(aaiEntitlement));
+			}
+		}
+	}
+
+	protected void mapAllLagInterfacesIntoGenericVnf(org.onap.aai.domain.yang.GenericVnf aaiGenericVnf,
+			GenericVnf genericVnf) {
+		if (aaiGenericVnf.getLagInterfaces() != null) {
+			for (org.onap.aai.domain.yang.LagInterface aaiLagInterface : aaiGenericVnf.getLagInterfaces()
+					.getLagInterface()) {
+				genericVnf.getLagInterfaces().add(mapAAILagInterface(aaiLagInterface));
+			}
+		}
+	}
+
+	protected void mapAllVfModulesIntoGenericVnf(org.onap.aai.domain.yang.GenericVnf aaiGenericVnf,
+			GenericVnf genericVnf) {
+		if (aaiGenericVnf.getVfModules() != null) {
+			for (org.onap.aai.domain.yang.VfModule aaiVfModule : aaiGenericVnf.getVfModules().getVfModule()) {
+				VfModule vfModule = mapAAIVfModule(aaiVfModule);
+				genericVnf.getVfModules().add(vfModule);
+			}
+		}
+	}
+
+	public OrchestrationStatus mapOrchestrationStatusFromAAI(String orchestrationStatus) {
+
+		Optional<OrchestrationStatus> result = Arrays.asList(OrchestrationStatus.values()).stream()
+		.filter(item -> item.fuzzyMap(orchestrationStatus))
+		.findFirst();
+
+		return result.orElse(null);
+
+	}
+
+	public RequestContext mapRequestContext(RequestDetails requestDetails) {
+		RequestContext context = new RequestContext();
+		modelMapper.map(requestDetails.getRequestInfo(), context);
+		org.onap.so.serviceinstancebeans.RequestParameters requestParameters = requestDetails.getRequestParameters();
+		if (null != requestParameters) {
+			context.setSubscriptionServiceType(requestParameters.getSubscriptionServiceType());
+			context.setRequestParameters(this.mapRequestParameters(requestDetails.getRequestParameters()));
+		}
+		return context;
+	}
+
+	protected RequestParameters mapRequestParameters(org.onap.so.serviceinstancebeans.RequestParameters requestParameters) {
+		RequestParameters requestParams = new RequestParameters();
+		requestParams.setaLaCarte(requestParameters.getALaCarte());
+		requestParams.setSubscriptionServiceType(requestParameters.getSubscriptionServiceType());
+		requestParams.setUserParams(requestParameters.getUserParams());
+		return requestParams;
+	}
+
+	protected OrchestrationContext mapOrchestrationContext(RequestDetails requestDetails) {
+		OrchestrationContext context = new OrchestrationContext();
+		context.setIsRollbackEnabled((requestDetails.getRequestInfo().getSuppressRollback()));
+		return context;
+	}
+
+	protected CloudRegion mapCloudRegion(CloudConfiguration cloudConfiguration, org.onap.aai.domain.yang.CloudRegion aaiCloudRegion, String cloudOwner) {
+		CloudRegion cloudRegion = new CloudRegion();
+		if(cloudConfiguration != null)
+			cloudRegion = modelMapper.map(cloudConfiguration, CloudRegion.class);
+		if(aaiCloudRegion != null)
+			modelMapper.map(aaiCloudRegion, cloudRegion);
+		if(cloudOwner != null)
+			cloudRegion.setCloudOwner(cloudOwner);
+		return cloudRegion;
+	}
+
+	protected Collection mapAAICollectionIntoCollection(org.onap.aai.domain.yang.Collection aaiCollection) {
+		Collection collection = new Collection();
+		collection.setId(aaiCollection.getCollectionId());
+		collection.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiCollection.getOrchestrationStatus()));
+		return collection;
+	}
+
+	protected org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup mapAAIInstanceGroupIntoInstanceGroup(
+			org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup) {
+		return modelMapper.map(aaiInstanceGroup,
+				org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup.class);
+	}
+
+	public RouteTableReference mapAAIRouteTableReferenceIntoRouteTableReference(
+			org.onap.aai.domain.yang.RouteTableReference aaiRouteTableReference) {
+		return modelMapper.map(aaiRouteTableReference, RouteTableReference.class);
+	}
+
+	protected ModelInfoNetwork mapCatalogNetworkToNetwork(NetworkResourceCustomization networkResourceCustomization) {
+		modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+		ModelInfoNetwork modelInfoNetwork = modelMapper.map(networkResourceCustomization, ModelInfoNetwork.class);
+		modelMapper.map(networkResourceCustomization.getNetworkResource(), modelInfoNetwork);
+		modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STANDARD);
+		return modelInfoNetwork;
+	}
+
+	protected ModelInfoGenericVnf mapCatalogVnfToVnf(VnfResourceCustomization vnfResourceCustomization) {
+		ModelInfoGenericVnf modelInfoVnf = modelMapper.map(vnfResourceCustomization, ModelInfoGenericVnf.class);
+		modelMapper.map(vnfResourceCustomization.getVnfResources(), modelInfoVnf);
+		return modelInfoVnf;
+	}
+
+	protected ModelInfoVfModule mapCatalogVfModuleToVfModule(VfModuleCustomization vfResourceCustomization) {
+		ModelInfoVfModule modelInfoVfModule = modelMapper.map(vfResourceCustomization, ModelInfoVfModule.class);
+		modelMapper.map(vfResourceCustomization.getVfModule(), modelInfoVfModule);
+		return modelInfoVfModule;
+	}
+
+	protected Platform mapRequestPlatform(org.onap.so.serviceinstancebeans.Platform platform) {
+		return modelMapper.map(platform, Platform.class);
+	}
+
+	protected LineOfBusiness mapRequestLineOfBusiness(
+			org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness) {
+		return modelMapper.map(lineOfBusiness, LineOfBusiness.class);
+	}
+
+	public Configuration mapAAIConfiguration(org.onap.aai.domain.yang.Configuration configurationAAI) {
+		modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+		Configuration configuration = modelMapper.map(configurationAAI, Configuration.class);
+		modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STANDARD);
+		configuration.getForwarderEvcs().addAll(mapAllForwarderEvcs(configurationAAI));
+		configuration.getEvcs().addAll(mapAllEvcs(configurationAAI));
+		configuration.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(configurationAAI.getOrchestrationStatus()));
+		return configuration;
+	}
+
+	protected List<Evc> mapAllEvcs(org.onap.aai.domain.yang.Configuration configurationAAI) {
+		List<Evc> listOfEvcs = new ArrayList<>();
+		if (configurationAAI.getEvcs() != null) {
+			for (org.onap.aai.domain.yang.Evc aaiEvc : configurationAAI.getEvcs().getEvc()) {
+				listOfEvcs.add(mapEvc(aaiEvc));
+			}
+		}
+		return listOfEvcs;
+	}
+
+	protected Evc mapEvc(org.onap.aai.domain.yang.Evc aaiEvc) {
+		return modelMapper.map(aaiEvc, Evc.class);
+	}
+
+	protected List<ForwarderEvc> mapAllForwarderEvcs(org.onap.aai.domain.yang.Configuration configurationAAI) {
+		List<ForwarderEvc> listOfForwarderEvcs = new ArrayList<>();
+		if (configurationAAI.getForwarderEvcs() != null) {
+			for (org.onap.aai.domain.yang.ForwarderEvc aaiForwarderEvc : configurationAAI.getForwarderEvcs().getForwarderEvc()) {
+				listOfForwarderEvcs.add(mapForwarderEvc(aaiForwarderEvc));
+			}
+		}
+		return listOfForwarderEvcs;
+	}
+
+	protected ForwarderEvc mapForwarderEvc(org.onap.aai.domain.yang.ForwarderEvc aaiForwarderEvc) {
+		return modelMapper.map(aaiForwarderEvc, ForwarderEvc.class);
+	}
+
+	protected OwningEntity mapRequestOwningEntity(org.onap.so.serviceinstancebeans.OwningEntity owningEntity) {
+		return modelMapper.map(owningEntity, OwningEntity.class);
+	}
+
+	protected Project mapRequestProject(org.onap.so.serviceinstancebeans.Project project) {
+		return modelMapper.map(project, Project.class);
+	}
+
+	protected ModelInfoConfiguration mapCatalogConfigurationToConfiguration(
+			ConfigurationResourceCustomization configurationResourceCustomization) {
+		ModelInfoConfiguration modelInfoConfiguration = new ModelInfoConfiguration();
+		modelInfoConfiguration.setModelVersionId(configurationResourceCustomization.getConfigurationResource().getModelUUID());
+		modelInfoConfiguration.setModelCustomizationId(configurationResourceCustomization.getModelCustomizationUUID());
+		modelInfoConfiguration.setModelInvariantId(configurationResourceCustomization.getConfigurationResource().getModelInvariantUUID());
+		return modelInfoConfiguration;
+	}
+
+	public NetworkResourceCustomization mapCollectionNetworkResourceCustToNetworkResourceCust(
+			CollectionNetworkResourceCustomization collectionNetworkResourceCust) {
+		return modelMapper.map(collectionNetworkResourceCust, NetworkResourceCustomization.class);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java
new file mode 100644
index 0000000000..14c162935a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java
@@ -0,0 +1,409 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.onap.aai.domain.yang.CloudRegion;
+import org.onap.aai.domain.yang.Configuration;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.GenericVnfs;
+import org.onap.aai.domain.yang.InstanceGroup;
+import org.onap.aai.domain.yang.L3Network;
+import org.onap.aai.domain.yang.L3Networks;
+import org.onap.aai.domain.yang.ServiceInstance;
+import org.onap.aai.domain.yang.ServiceInstances;
+import org.onap.aai.domain.yang.ServiceSubscription;
+import org.onap.aai.domain.yang.VfModule;
+import org.onap.aai.domain.yang.VolumeGroup;
+import org.onap.aai.domain.yang.VolumeGroups;
+import org.onap.so.bpmn.common.InjectionHelper;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.client.aai.AAIObjectPlurals;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
+import org.onap.so.client.db.request.RequestsDbClient;
+import org.onap.so.client.graphinventory.entities.uri.Depth;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VnfcInstanceGroupCustomization;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+@Component("BBInputSetupUtils")
+public class BBInputSetupUtils {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, BBInputSetupUtils.class);
+	private ObjectMapper objectMapper = new ObjectMapper();
+	private static final String REQUEST_ERROR = "Could not find request.";
+
+	@Autowired
+	protected CatalogDbClient catalogDbClient;
+
+	@Autowired
+	protected RequestsDbClient requestsDbClient;
+
+	@Autowired
+	protected InjectionHelper injectionHelper;
+
+	public void updateInfraActiveRequestVnfId(InfraActiveRequests request, String vnfId) {
+		if(request != null) {
+			request.setVnfId(vnfId);
+			this.requestsDbClient.updateInfraActiveRequests(request);
+		} else {
+			msoLogger.debug(REQUEST_ERROR);
+		}
+	}
+
+	public void updateInfraActiveRequestVfModuleId(InfraActiveRequests request, String vfModuleId) {
+		if(request != null) {
+			request.setVfModuleId(vfModuleId);
+			this.requestsDbClient.updateInfraActiveRequests(request);
+		} else {
+			msoLogger.debug(REQUEST_ERROR);
+		}
+	}
+
+	public void updateInfraActiveRequestVolumeGroupId(InfraActiveRequests request, String volumeGroupId) {
+		if(request != null) {
+			request.setVolumeGroupId(volumeGroupId);
+			this.requestsDbClient.updateInfraActiveRequests(request);
+		} else {
+			msoLogger.debug(REQUEST_ERROR);
+		}
+	}
+
+	public void updateInfraActiveRequestNetworkId(InfraActiveRequests request, String networkId) {
+		if(request != null) {
+			request.setNetworkId(networkId);
+			this.requestsDbClient.updateInfraActiveRequests(request);
+		} else {
+			msoLogger.debug(REQUEST_ERROR);
+		}
+	}
+	
+	public Service getCatalogServiceByModelUUID(String modelUUID) {
+		return catalogDbClient.getServiceByID(modelUUID);
+	}
+	
+	public Service getCatalogServiceByModelVersionAndModelInvariantUUID(String modelVersion, String modelInvariantUUID) {
+		return catalogDbClient.getServiceByModelVersionAndModelInvariantUUID(modelVersion, modelInvariantUUID);
+	}
+
+	public CollectionNetworkResourceCustomization getCatalogCollectionNetworkResourceCustByID(String key) {
+		return catalogDbClient.getCollectionNetworkResourceCustomizationByID(key);
+	}
+
+	public List<VnfcInstanceGroupCustomization> getVnfcInstanceGroups(String modelCustomizationUUID) {
+		return catalogDbClient.getVnfcInstanceGroupsByVnfResourceCust(modelCustomizationUUID);
+	}
+
+	public Map<String, String> getURIKeysFromServiceInstance(String serviceInstanceId) {
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId);
+		return uri.getURIKeys();
+	}
+
+	protected RequestDetails getRequestDetails(String requestId) throws IOException {
+		if (requestId != null && !requestId.isEmpty()) {
+			InfraActiveRequests activeRequest = this.getInfraActiveRequest(requestId);
+			String requestBody = activeRequest.getRequestBody().replaceAll("\\\\", "");
+			objectMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
+			objectMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+			return objectMapper.readValue(requestBody, RequestDetails.class);
+		} else {
+			return null;
+		}
+	}
+
+	protected InfraActiveRequests getInfraActiveRequest(String requestId) {
+		if (requestId != null && !requestId.isEmpty()) {
+			return requestsDbClient.getInfraActiveRequestbyRequestId(requestId);
+		} else {
+			return null;
+		}
+	}
+
+	protected CloudRegion getCloudRegion(CloudConfiguration cloudConfiguration, String cloudOwner) {
+		if (cloudConfiguration != null) {
+			String cloudRegionId = cloudConfiguration.getLcpCloudRegionId();
+			if (cloudRegionId != null && !cloudRegionId.isEmpty()) {
+				return injectionHelper.getAaiClient().get(CloudRegion.class,
+						AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, cloudOwner,
+								cloudConfiguration.getLcpCloudRegionId())).orElse(null);
+			
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	protected InstanceGroup getAAIInstanceGroup(String instanceGroupId) {
+		return injectionHelper.getAaiClient().get(InstanceGroup.class,
+			AAIUriFactory.createResourceUri(AAIObjectType.INSTANCE_GROUP, instanceGroupId))
+			.orElse(null);
+	}
+
+	public org.onap.aai.domain.yang.Customer getAAICustomer(String globalSubscriberId) {
+		return injectionHelper.getAaiClient().get(org.onap.aai.domain.yang.Customer.class,
+			AAIUriFactory.createResourceUri(AAIObjectType.CUSTOMER, globalSubscriberId))
+			.orElse(null);
+	}
+
+	public ServiceSubscription getAAIServiceSubscription(String globalSubscriberId, String subscriptionServiceType) {
+	
+		if(globalSubscriberId == null || globalSubscriberId.equals("") || subscriptionServiceType == null || subscriptionServiceType.equals("")) {
+			return null;
+		} else {
+			return injectionHelper.getAaiClient().get(ServiceSubscription.class, AAIUriFactory.createResourceUri(
+					AAIObjectType.SERVICE_SUBSCRIPTION, globalSubscriberId, subscriptionServiceType))
+					.orElse(null);
+		}
+		
+	}
+
+	public ServiceInstance getAAIServiceInstanceById(String serviceInstanceId) {
+		return injectionHelper.getAaiClient().get(ServiceInstance.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId).depth(Depth.TWO))
+				.orElse(null);
+	}
+
+	protected ServiceInstance getAAIServiceInstanceByIdAndCustomer(String globalCustomerId, String serviceType,
+			String serviceInstanceId) {
+		return injectionHelper.getAaiClient().get(ServiceInstance.class, AAIUriFactory.createResourceUri(
+				AAIObjectType.SERVICE_INSTANCE, globalCustomerId, serviceType, serviceInstanceId).depth(Depth.TWO))
+				.orElse(null);
+	}
+
+	protected org.onap.aai.domain.yang.ServiceInstances getAAIServiceInstancesByName(String serviceInstanceName,
+			Customer customer) {
+		
+		return injectionHelper.getAaiClient().get(org.onap.aai.domain.yang.ServiceInstances.class,
+				AAIUriFactory
+						.createResourceUri(AAIObjectPlurals.SERVICE_INSTANCE, customer.getGlobalCustomerId(),
+								customer.getServiceSubscription().getServiceType())
+						.queryParam("service-instance-name", serviceInstanceName).depth(Depth.TWO))
+				.orElseGet(() -> {
+					msoLogger.debug("No Service Instance matched by name");
+					return null;
+				});
+	}
+
+	public org.onap.aai.domain.yang.ServiceInstance getAAIServiceInstanceByName(String serviceInstanceName,
+			Customer customer) throws Exception {
+		org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance = null;
+		org.onap.aai.domain.yang.ServiceInstances aaiServiceInstances = null;
+		aaiServiceInstances = getAAIServiceInstancesByName(serviceInstanceName, customer);
+
+		if (aaiServiceInstances == null) {
+			return null;
+		} else if (aaiServiceInstances.getServiceInstance().size() > 1) {
+			throw new Exception("Multiple Service Instances Returned");
+		} else {
+			aaiServiceInstance = aaiServiceInstances.getServiceInstance().get(0);
+		}
+		return aaiServiceInstance;
+	}
+
+	protected ServiceInstances getAAIServiceInstancesByName(String globalCustomerId, String serviceType,
+			String serviceInstanceName) {
+		
+		return injectionHelper.getAaiClient().get(ServiceInstances.class,
+				AAIUriFactory.createResourceUri(AAIObjectPlurals.SERVICE_INSTANCE, globalCustomerId, serviceType)
+						.queryParam("service-instance-name", serviceInstanceName).depth(Depth.TWO))
+				.orElseGet(() -> {
+					msoLogger.debug("No Service Instance matched by name");
+					return null;
+				});
+	}
+
+	public Optional<ServiceInstance> getAAIServiceInstanceByName(String globalCustomerId, String serviceType,
+			String serviceInstanceName) throws Exception {
+		ServiceInstance aaiServiceInstance = null;
+		ServiceInstances aaiServiceInstances = null;
+		aaiServiceInstances = getAAIServiceInstancesByName(globalCustomerId, serviceType, serviceInstanceName);
+
+		if (aaiServiceInstances == null) {
+			return Optional.empty();
+		} else if (aaiServiceInstances.getServiceInstance().size() > 1) {
+			throw new Exception("Multiple Service Instances Returned");
+		} else {
+			aaiServiceInstance = aaiServiceInstances.getServiceInstance().get(0);
+		}
+		return Optional.of(aaiServiceInstance);
+	}
+
+	public org.onap.so.db.catalog.beans.InstanceGroup getCatalogInstanceGroup(String modelUUID) {
+		return this.catalogDbClient.getInstanceGroupByModelUUID(modelUUID);
+	}
+
+	public List<CollectionResourceInstanceGroupCustomization> getCollectionResourceInstanceGroupCustomization(
+			String modelCustomizationUUID) {
+		return this.catalogDbClient
+				.getCollectionResourceInstanceGroupCustomizationByModelCustUUID(modelCustomizationUUID);
+	}
+
+	public AAIResultWrapper getAAIResourceDepthOne(AAIResourceUri aaiResourceUri) {
+		AAIResourceUri clonedUri = aaiResourceUri.clone();
+		return this.injectionHelper.getAaiClient().get(clonedUri.depth(Depth.ONE));
+	}
+	
+	public AAIResultWrapper getAAIResourceDepthTwo(AAIResourceUri aaiResourceUri) {
+		AAIResourceUri clonedUri = aaiResourceUri.clone();
+		return this.injectionHelper.getAaiClient().get(clonedUri.depth(Depth.TWO));
+	}
+
+	public Configuration getAAIConfiguration(String configurationId) {
+		return this.injectionHelper.getAaiClient().get(Configuration.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, configurationId).depth(Depth.ONE))
+				.orElseGet(() -> {
+					msoLogger.debug("No Configuration matched by id");
+					return null;
+				});
+	}
+	
+	public GenericVnf getAAIGenericVnf(String vnfId) {
+		
+		return this.injectionHelper.getAaiClient().get(GenericVnf.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId).depth(Depth.ONE))
+				.orElseGet(() -> {
+					msoLogger.debug("No Generic Vnf matched by id");
+					return null;
+				});
+	}
+	
+	public VolumeGroup getAAIVolumeGroup(String cloudOwnerId, String cloudRegionId, String volumeGroupId) {
+		return this.injectionHelper.getAaiClient().get(VolumeGroup.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.VOLUME_GROUP, cloudOwnerId, cloudRegionId, volumeGroupId).depth(Depth.ONE))
+				.orElseGet(() -> {
+					msoLogger.debug("No Generic Vnf matched by id");
+					return null;
+				});
+	}
+
+	public VfModule getAAIVfModule(String vnfId, String vfModuleId) {
+		return this.injectionHelper.getAaiClient().get(VfModule.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE, vnfId, vfModuleId).depth(Depth.ONE))
+				.orElseGet(() -> {
+					msoLogger.debug("No Generic Vnf matched by id");
+					return null;
+				});
+	}
+	
+	public L3Network getAAIL3Network(String networkId) {
+
+		return this.injectionHelper.getAaiClient().get(L3Network.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE))
+				.orElseGet(() -> {
+					msoLogger.debug("No Generic Vnf matched by id");
+					return null;
+				});
+		
+	}
+	
+	public Optional<L3Network> getRelatedNetworkByNameFromServiceInstance(String serviceInstanceId, String networkName) throws Exception{
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId);
+		uri.relatedTo(AAIObjectPlurals.L3_NETWORK).queryParam("network-name", networkName);
+		Optional<L3Networks> networks = injectionHelper.getAaiClient().get(L3Networks.class, uri);
+		L3Network network = null;
+		if (!networks.isPresent()) {
+			msoLogger.debug("No Networks matched by name");
+			return Optional.empty();
+		} else {
+			if (networks.get().getL3Network().size() > 1) {
+				throw new Exception("Multiple Networks Returned");
+			} else {
+				network = networks.get().getL3Network().get(0);
+			}
+			return Optional.of(network);
+		}
+	}
+
+	public Optional<GenericVnf> getRelatedVnfByNameFromServiceInstance(String serviceInstanceId, String vnfName) throws Exception {
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId);
+		uri.relatedTo(AAIObjectPlurals.GENERIC_VNF).queryParam("vnf-name", vnfName);
+		Optional<GenericVnfs> vnfs = injectionHelper.getAaiClient().get(GenericVnfs.class, uri);
+		GenericVnf vnf = null;
+		if (!vnfs.isPresent()) {
+			msoLogger.debug("No Vnfs matched by name");
+			return Optional.empty();
+		} else {
+			 if (vnfs.get().getGenericVnf().size() > 1) {
+				throw new Exception("Multiple Vnfs Returned");
+			} else {
+				vnf = vnfs.get().getGenericVnf().get(0);
+			}
+			return Optional.of(vnf);
+		}
+	}
+
+	public Optional<VolumeGroup> getRelatedVolumeGroupByNameFromVnf(String vnfId, String volumeGroupName) throws Exception{
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+		uri.relatedTo(AAIObjectPlurals.VOLUME_GROUP).queryParam("volume-group-name", volumeGroupName);
+		Optional<VolumeGroups> volumeGroups = injectionHelper.getAaiClient().get(VolumeGroups.class, uri);
+		VolumeGroup volumeGroup = null;
+		if (!volumeGroups.isPresent()) {
+			msoLogger.debug("No VolumeGroups matched by name");
+			return Optional.empty();
+		} else {
+			if (volumeGroups.get().getVolumeGroup().size() > 1) {
+				throw new Exception("Multiple VolumeGroups Returned");
+			} else {
+				volumeGroup = volumeGroups.get().getVolumeGroup().get(0);
+			}
+			return Optional.of(volumeGroup);
+		}
+	}
+
+	public Optional<VolumeGroup> getRelatedVolumeGroupByNameFromVfModule(String vfModuleId, String volumeGroupName) throws Exception {
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE, vfModuleId);
+		uri.relatedTo(AAIObjectPlurals.VOLUME_GROUP).queryParam("volume-group-name", volumeGroupName);
+		Optional<VolumeGroups> volumeGroups = injectionHelper.getAaiClient().get(VolumeGroups.class, uri);
+		VolumeGroup volumeGroup = null;
+		if (!volumeGroups.isPresent()) {
+			msoLogger.debug("No VolumeGroups matched by name");
+			return Optional.empty();
+		} else {
+			if (volumeGroups.get().getVolumeGroup().size() > 1) {
+				throw new Exception("Multiple VolumeGroups Returned");
+			} else {
+				volumeGroup = volumeGroups.get().getVolumeGroup().get(0);
+			}
+			return Optional.of(volumeGroup);
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java
new file mode 100644
index 0000000000..7a56ab88ab
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import java.util.Map;
+
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.bpmn.core.WorkflowException;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.db.catalog.beans.macro.RainyDayHandlerStatus;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExecuteBuildingBlockRainyDay {
+	
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ExecuteBuildingBlockRainyDay.class);
+	
+	@Autowired
+	private CatalogDbClient catalogDbClient;
+	private static final String ASTERISK = "ASTERISK";
+
+	public void setRetryTimer(DelegateExecution execution) {
+		try {
+			int retryCount = (int) execution.getVariable("retryCount");
+			int retryTimeToWait = (int) Math.pow(5, retryCount);
+			String RetryDuration = "PT" + retryTimeToWait + "M";
+			execution.setVariable("RetryDuration", RetryDuration);
+		} catch (Exception e) {
+			msoLogger.error(e);
+			throw new BpmnError("Unknown error incrementing retry counter");
+		}
+	}
+	
+	public void queryRainyDayTable(DelegateExecution execution) {
+		try {
+			ExecuteBuildingBlock ebb = (ExecuteBuildingBlock) execution.getVariable("buildingBlock");
+			String bbName = ebb.getBuildingBlock().getBpmnFlowName();
+			GeneralBuildingBlock gBBInput = (GeneralBuildingBlock) execution.getVariable("gBBInput");
+			Map<ResourceKey, String> lookupKeyMap = (Map<ResourceKey, String>) execution.getVariable("lookupKeyMap");
+			String serviceType = ASTERISK;
+			try {
+				serviceType = gBBInput.getCustomer().getServiceSubscription().getServiceInstances().get(0).getModelInfoServiceInstance().getServiceType();
+			} catch (Exception ex) {
+				// keep default serviceType value
+			}
+			String vnfType = ASTERISK;
+			try {
+				for(GenericVnf vnf : gBBInput.getCustomer().getServiceSubscription().getServiceInstances().get(0).getVnfs()) {
+					if(vnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+						vnfType = vnf.getVnfType();
+					}
+				}
+			} catch (Exception ex) {
+				// keep default vnfType value
+			}
+			WorkflowException workflowException = (WorkflowException) execution.getVariable("WorkflowException");
+			String errorCode = ASTERISK;
+			try {
+				errorCode = "" + workflowException.getErrorCode();
+			} catch (Exception ex) {
+				// keep default errorCode value
+			}
+			String workStep = ASTERISK;
+			try {
+				workStep = workflowException.getWorkStep();
+			} catch (Exception ex) {
+				// keep default workStep value
+			}
+			//Extract error data to be returned to WorkflowAction
+			execution.setVariable("WorkflowExceptionErrorMessage", workflowException.getErrorMessage());
+			RainyDayHandlerStatus rainyDayHandlerStatus;
+			String handlingCode = "";
+			rainyDayHandlerStatus = catalogDbClient.getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep(bbName,serviceType,vnfType,errorCode,workStep);
+			if(rainyDayHandlerStatus==null){
+				rainyDayHandlerStatus = catalogDbClient.getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep(bbName,ASTERISK,ASTERISK,ASTERISK,ASTERISK);
+				if(rainyDayHandlerStatus==null){
+					handlingCode = "Abort";
+				}else{
+					handlingCode = rainyDayHandlerStatus.getPolicy();
+				}
+			}else{
+				handlingCode = rainyDayHandlerStatus.getPolicy();
+			}
+			msoLogger.debug("RainyDayHandler Status Code is: " + handlingCode);
+			execution.setVariable("handlingCode", handlingCode);
+		} catch (Exception e) {
+			msoLogger.debug("RainyDayHandler Status Code is: Abort");
+			execution.setVariable("handlingCode", "Abort");
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java
new file mode 100644
index 0000000000..a212668fec
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExtractPojosForBB.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Optional;
+
+import javax.persistence.Id;
+
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.client.exception.BBObjectNotFoundException;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.stereotype.Component;
+
+import com.google.common.base.CaseFormat;
+
+@Component
+public class ExtractPojosForBB {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ExtractPojosForBB.class);
+	
+	public <T> T extractByKey(BuildingBlockExecution execution, ResourceKey key, String value)
+			throws BBObjectNotFoundException {
+
+		Optional<T> result = Optional.empty();
+		GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
+		try {
+			ServiceInstance serviceInstance;
+			GenericVnf vnf;
+			switch (key) {
+				case SERVICE_INSTANCE_ID:
+					result = lookupObjectInList(gBBInput.getCustomer().getServiceSubscription().getServiceInstances(), value);
+					break;
+				case GENERIC_VNF_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+					result = lookupObjectInList(serviceInstance.getVnfs(), value);
+					break;
+				case NETWORK_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+					result = lookupObjectInList(serviceInstance.getNetworks(), value);
+					break;
+				case VOLUME_GROUP_ID:
+					vnf = extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+					result = lookupObjectInList(vnf.getVolumeGroups(), value);
+					break;
+				case VF_MODULE_ID:
+					vnf = extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+					result = lookupObjectInList(vnf.getVfModules(), value);
+					break;
+				case ALLOTTED_RESOURCE_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+					result = lookupObjectInList(serviceInstance.getAllottedResources(), value);
+					break;
+				case CONFIGURATION_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+					result =  lookupObjectInList(serviceInstance.getConfigurations(), value);
+					break;
+				case VPN_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+					result = lookupObjectInList(gBBInput.getCustomer().getVpnBindings(), value);
+					break;
+				case VPN_BONDING_LINK_ID:
+					serviceInstance = extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+                    result = lookupObjectInList(serviceInstance.getVpnBondingLinks(),value);
+					break;
+				default:
+					throw new BBObjectNotFoundException(key, value);
+			}
+		} catch (BBObjectNotFoundException e) { // re-throw parent object not found
+			throw e;
+		} catch (Exception e) { // convert all other exceptions to object not found
+			msoLogger.warnSimple("BBObjectNotFoundException in ExtractPojosForBB", "BBObject " + key + " was not found in gBBInput using reference value: " + value);
+			throw new BBObjectNotFoundException(key, value);
+		}
+		
+		if (result.isPresent()) {
+			return result.get();
+		} else {
+			throw new BBObjectNotFoundException(key, value);
+		}
+	}
+	
+	protected <T> Optional<T> lookupObject(Object obj, String value) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+		return findValue(obj, value);
+	}
+
+	protected <T> Optional<T> lookupObjectInList(List<?> list, String value) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+		Optional<T> result = Optional.empty();
+		for (Object obj : list) {
+			result = findValue(obj, value);
+			if (result.isPresent()) {
+				break;
+			}
+		}
+		return result;
+		
+	}
+	
+	protected <T> Optional<T> findValue(Object obj, String value) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+		for (Field field : obj.getClass().getDeclaredFields()) {
+			if (field.isAnnotationPresent(Id.class)) {
+				String fieldName = field.getName();
+				fieldName = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, fieldName);
+				String fieldValue = (String) obj.getClass().getMethod("get" + fieldName).invoke(obj);
+				if (fieldValue.equals(value)) {
+					return Optional.of((T)obj);
+				}
+			}
+		}
+		
+		return Optional.empty();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerAction.java
index 3c00627bff..9feee14640 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerAction.java
@@ -18,25 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import java.util.HashMap;
 import java.util.List;
-
-import org.openecomp.mso.client.appc.ApplicationControllerSupport.StatusCategory;
-import org.openecomp.mso.bpmn.appc.payload.PayloadClient;
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
-import org.openecomp.mso.client.appc.ApplicationControllerOrchestrator;
 import java.util.Optional;
+
 import org.onap.appc.client.lcm.model.Action;
 import org.onap.appc.client.lcm.model.Status;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.att.eelf.configuration.EELFLogger.Level;
-import java.lang.NoSuchMethodError;
+import org.onap.so.bpmn.appc.payload.PayloadClient;
+import org.onap.so.bpmn.core.json.JsonUtils;
+import org.onap.so.client.appc.ApplicationControllerSupport.StatusCategory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 
@@ -44,14 +41,16 @@ public class ApplicationControllerAction {
 	protected ApplicationControllerOrchestrator client = new ApplicationControllerOrchestrator();
 	private String errorCode = "1002";
 	private String errorMessage = "Unable to reach App C Servers";
-	protected final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+	private static Logger logger = LoggerFactory.getLogger(ApplicationControllerAction.class);
 	
-	public void runAppCCommand(Action action, String msoRequestId, String vnfId, Optional<String> payload, HashMap<String, String> payloadInfo, String controllerType){		Status appCStatus = null;
+	public void runAppCCommand(Action action, String msoRequestId, String vnfId, Optional<String> payload, HashMap<String, String> payloadInfo, String controllerType){		
+		Status appCStatus = null;
 		try{
 			String vnfName = payloadInfo.getOrDefault("vnfName", "");
 			String aicIdentity = payloadInfo.getOrDefault("vnfName","");
 			String vnfHostIpAddress = payloadInfo.getOrDefault("vnfHostIpAddress","");
 			String vmIdList = payloadInfo.getOrDefault("vmIdList", "");
+			String vserverIdList = payloadInfo.getOrDefault("vserverIdList", "");
 			String identityUrl = payloadInfo.getOrDefault("identityUrl", "");
 			switch(action){
 				case ResumeTraffic:
@@ -63,7 +62,7 @@ public class ApplicationControllerAction {
 			    	break;
 				case Unlock:
 				case Lock:
-					appCStatus = client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), controllerType);
+					appCStatus = client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), Optional.empty(), controllerType);
 					break;
 				case QuiesceTraffic:
 					appCStatus = quiesceTrafficAction(msoRequestId, vnfId, payload, vnfName, controllerType);
@@ -73,13 +72,18 @@ public class ApplicationControllerAction {
 					break;
 				case Snapshot:
 					String vmIds = JsonUtils.getJsonValue(vmIdList, "vmIds");
+					String vserverIds = JsonUtils.getJsonValue(vserverIdList, "vserverIds");
 					String vmId = "";
+					String vserverId = "";
 					ObjectMapper mapper = new ObjectMapper();
 					List<String> vmIdJsonList = mapper.readValue(vmIds, new TypeReference<List<String>>(){});
+					List<String> vserverIdJsonList = mapper.readValue(vserverIds, new TypeReference<List<String>>(){});
 					int i = 0;
 					while(i < vmIdJsonList.size()){
 						vmId = vmIdJsonList.get(i);
-						appCStatus = snapshotAction(msoRequestId, vnfId, vmId, identityUrl, controllerType);
+						vserverId = vserverIdJsonList.get(i);
+						Optional<String> vserverIdString = Optional.of(vserverId);
+						appCStatus = snapshotAction(msoRequestId, vnfId, vmId, vserverIdString, identityUrl, controllerType);
 						i++;
 					}
 					break;
@@ -107,20 +111,20 @@ public class ApplicationControllerAction {
 			}
 		}
 		catch(JsonProcessingException e){
-			auditLogger.log(Level.ERROR, "Incorrect Payload format for action request" + action.toString(),e, e.getMessage());
+			logger.error("Incorrect Payload format for action request: {}", action.toString(),e);
 			errorMessage = e.getMessage();
 		}
 		catch(ApplicationControllerOrchestratorException e){
-			auditLogger.log(Level.ERROR, "Error building Appc request: ", e, e.getMessage());
+			logger.error("Error building Appc request: {}",e.getMessage(), e);
 			errorCode = "1002";
 			errorMessage = e.getMessage();
 		}
 		catch (NoSuchMethodError e) {
-			auditLogger.log(Level.ERROR, "Error building Appc request: ", e, e.getMessage());
+			logger.error( "Error building Appc request: {}",  e.getMessage(), e);
 			errorMessage = e.getMessage();
 		} 
 		catch(Exception e){
-			auditLogger.log(Level.ERROR, "Error building Appc request: ", e, e.getMessage());
+			logger.error("Error building Appc request: {}", e.getMessage(), e);
 			errorMessage = e.getMessage();
 		}
 	}
@@ -129,7 +133,7 @@ public class ApplicationControllerAction {
 		if(!(payload.isPresent())){
 			throw new IllegalArgumentException("Payload is not present for " + action.toString());
 		}
-		return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
 	private Status quiesceTrafficAction(String msoRequestId, String vnfId, Optional<String> payload, String vnfName, String controllerType) throws JsonProcessingException, IllegalArgumentException,ApplicationControllerOrchestratorException{
@@ -137,7 +141,7 @@ public class ApplicationControllerAction {
 			throw new IllegalArgumentException("Payload is not present for " + Action.QuiesceTraffic.toString());
 		}
 		payload = PayloadClient.quiesceTrafficFormat(payload, vnfName);
-		return client.vnfCommand(Action.QuiesceTraffic, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(Action.QuiesceTraffic, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
 	private Status upgradeAction(Action action, String msoRequestId, String vnfId, Optional<String> payload, String vnfName, String controllerType) throws JsonProcessingException, IllegalArgumentException,ApplicationControllerOrchestratorException{
@@ -145,27 +149,27 @@ public class ApplicationControllerAction {
 			throw new IllegalArgumentException("Payload is not present for " + action.toString());
 		}
 		payload = PayloadClient.upgradeFormat(payload, vnfName);
-		return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
 	private Status resumeTrafficAction(String msoRequestId, String vnfId, String vnfName, String controllerType)throws JsonProcessingException, ApplicationControllerOrchestratorException{
 		Optional<String> payload = PayloadClient.resumeTrafficFormat(vnfName);
-		return client.vnfCommand(Action.ResumeTraffic, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(Action.ResumeTraffic, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
 	private Status startStopAction(Action action, String msoRequestId, String vnfId, String aicIdentity, String controllerType)throws JsonProcessingException, ApplicationControllerOrchestratorException{
 		Optional<String> payload = PayloadClient.startStopFormat(aicIdentity);
-		return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
 	private Status healthCheckAction(String msoRequestId, String vnfId, String vnfName, String vnfHostIpAddress, String controllerType)throws JsonProcessingException, ApplicationControllerOrchestratorException{
 		Optional<String> payload = PayloadClient.healthCheckFormat(vnfName, vnfHostIpAddress);
-		return client.vnfCommand(Action.HealthCheck, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(Action.HealthCheck, msoRequestId, vnfId, Optional.empty(), payload, controllerType);
 	}
 	
-	private Status snapshotAction(String msoRequestId, String vnfId, String vmId, String identityUrl, String controllerType) throws JsonProcessingException, ApplicationControllerOrchestratorException{
+	private Status snapshotAction(String msoRequestId, String vnfId, String vmId, Optional<String> vserverId, String identityUrl, String controllerType) throws JsonProcessingException, ApplicationControllerOrchestratorException{
 		Optional<String> payload = PayloadClient.snapshotFormat(vmId, identityUrl);
-		return client.vnfCommand(Action.Snapshot, msoRequestId, vnfId, payload, controllerType);
+		return client.vnfCommand(Action.Snapshot, msoRequestId, vnfId, vserverId, payload, controllerType);
 	}
 	
 	public String getErrorMessage(){
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerCallback.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerCallback.java
index 1bb4dc7eed..cb3f144cd1 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerCallback.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerCallback.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import org.onap.appc.client.lcm.api.ResponseHandler;
 import org.onap.appc.client.lcm.exceptions.AppcClientException;
@@ -27,13 +27,13 @@ public class ApplicationControllerCallback<T> implements ResponseHandler<T>  {
 
 	@Override
 	public void onResponse(T response) {
-		System.out.println("ON RESPONSE");
+		
 		
 	}
 
 	@Override
 	public void onException(AppcClientException exception) {
-		System.out.println("ON EXCEPTION");
+	
 		
 	}
 
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClient.java
index c9e2e880e7..f87ec91440 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClient.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,16 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.Instant;
-import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
 import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
 import org.onap.appc.client.lcm.api.ApplicationContext;
@@ -42,26 +44,19 @@ import org.onap.appc.client.lcm.model.Flags.Mode;
 import org.onap.appc.client.lcm.model.Payload;
 import org.onap.appc.client.lcm.model.Status;
 import org.onap.appc.client.lcm.model.ZULU;
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFLogger.Level;
-import com.att.eelf.configuration.EELFManager;
 
 public class ApplicationControllerClient {
-	
-	public static final String DEFAULT_CONTROLLER_TYPE = "SDNC";
+
+	public static final String DEFAULT_CONTROLLER_TYPE = "APPC";
 
 	private static final String CLIENT_NAME = "MSO";
 
 	private static final String API_VER = "2.00";
 	private static final String ORIGINATOR_ID = "MSO";
 	private static final int FLAGS_TTL = 65000;
-	protected final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+	private static Logger logger = LoggerFactory.getLogger(ApplicationControllerClient.class);
 
-	@Autowired
-	public ApplicationControllerSupport appCSupport;
+	private ApplicationControllerSupport appCSupport;
 
 	// APPC gave us an API where the controllerType is configured in the
 	// client object, which is not what we asked for. We asked for an API
@@ -92,7 +87,7 @@ public class ApplicationControllerClient {
 		this.controllerType = controllerType.toUpperCase();
 		appCSupport = new ApplicationControllerSupport();
 	}
-	
+
 	/**
 	 * Gets the controller type.
 	 * @return the controllertype
@@ -119,7 +114,7 @@ public class ApplicationControllerClient {
 			return AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class)
 					.createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType));
 		} catch (AppcClientException e) {
-			auditLogger.log(Level.ERROR, "Error in getting LifeCycleManagerStateful: ", e, e.getMessage());
+			logger.error("Error in getting LifeCycleManagerStateful: {}",e.getMessage(), e);
 			// This null value will cause NullPointerException when used later.
 			// Error handling could certainly be improved here.
 			return null;
@@ -129,7 +124,8 @@ public class ApplicationControllerClient {
 	public Status runCommand(Action action, org.onap.appc.client.lcm.model.ActionIdentifiers actionIdentifiers,
 			org.onap.appc.client.lcm.model.Payload payload, String requestID)
 			throws ApplicationControllerOrchestratorException {
-		Object requestObject = createRequest(action, actionIdentifiers, payload, requestID);
+		Object requestObject;
+		requestObject = createRequest(action, actionIdentifiers, payload, requestID);
 		appCSupport.logLCMMessage(requestObject);
 		LifeCycleManagerStateful client = getAppCClient();
 		Method lcmMethod = appCSupport.getAPIMethod(action.name(), client, false);
@@ -147,21 +143,19 @@ public class ApplicationControllerClient {
 	
 	protected Properties getLCMProperties(String controllerType) {
 		Properties properties = new Properties();
-		Map<String, String> globalProperties = PropertyConfiguration.getInstance()
-				.getProperties("mso.bpmn.urn.properties");
-		
-		properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
-		properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
-		properties.put("SDNC-topic.read", globalProperties.get("appc.client.topic.sdnc.read"));
-		properties.put("SDNC-topic.write", globalProperties.get("appc.client.topic.sdnc.write"));
-		properties.put("topic.read.timeout", globalProperties.get("appc.client.topic.read.timeout"));
-		properties.put("client.response.timeout", globalProperties.get("appc.client.response.timeout"));
-		properties.put("poolMembers", globalProperties.get("appc.client.poolMembers"));
+
+		properties.put("topic.read", UrnPropertiesReader.getVariable("appc.client.topic.read.name"));
+		properties.put("topic.write", UrnPropertiesReader.getVariable("appc.client.topic.write"));
+		properties.put("SDNC-topic.read", UrnPropertiesReader.getVariable("appc.client.topic.sdnc.read"));
+		properties.put("SDNC-topic.write", UrnPropertiesReader.getVariable("appc.client.topic.sdnc.write"));
+		properties.put("topic.read.timeout", UrnPropertiesReader.getVariable("appc.client.topic.read.timeout"));
+		properties.put("client.response.timeout", UrnPropertiesReader.getVariable("appc.client.response.timeout"));
+		properties.put("poolMembers", UrnPropertiesReader.getVariable("appc.client.poolMembers"));
 		properties.put("controllerType", controllerType);
-		properties.put("client.key", globalProperties.get("appc.client.key"));
-		properties.put("client.secret", globalProperties.get("appc.client.secret"));
+		properties.put("client.key", UrnPropertiesReader.getVariable("appc.client.key"));
+		properties.put("client.secret", UrnPropertiesReader.getVariable("appc.client.secret"));
 		properties.put("client.name", CLIENT_NAME);
-		properties.put("service", globalProperties.get("appc.client.service"));
+		properties.put("service", UrnPropertiesReader.getVariable("appc.client.service"));
 		return properties;
 	}
 
@@ -178,7 +172,7 @@ public class ApplicationControllerClient {
 				requestObject.getClass().getDeclaredMethod("setPayload", Payload.class).invoke(requestObject, payload);
 			}
 		} catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-			auditLogger.log(Level.ERROR, "Error building Appc request: ", e, e.getMessage());
+			logger.error("Error building Appc request", e);
 		}
 		return requestObject;
 	}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java
new file mode 100644
index 0000000000..d4599a5248
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java
@@ -0,0 +1,154 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.appc;
+
+import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
+import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
+import org.onap.appc.client.lcm.api.ApplicationContext;
+import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
+import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.client.lcm.model.*;
+import org.onap.appc.client.lcm.model.Flags.Force;
+import org.onap.appc.client.lcm.model.Flags.Mode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.time.Instant;
+import java.util.Properties;
+import java.util.UUID;
+
+@Component
+@Deprecated
+public class ApplicationControllerClientV2 {
+
+	private static final String CLIENT_NAME = "MSO";
+	private static final String API_VER = "2.00";
+	private static final String ORIGINATOR_ID = "MSO";
+	private static final int FLAGS_TTL = 65000;
+	private static Logger logger = LoggerFactory.getLogger(ApplicationControllerClientV2.class);
+
+	//@Autowired
+	ApplicationControllerConfiguration applicationControllerConfiguration;
+
+	//@Autowired
+	private ApplicationControllerSupport appCSupport;
+
+	private static LifeCycleManagerStateful client;
+
+	//@PostConstruct
+	public void buildClient() {
+		client = this.getAppCClient("");
+	}
+	
+	//@PostConstruct
+	public void buildClient(String controllerType) {
+		client = this.getAppCClient(controllerType);
+	}
+
+	public Status runCommand(Action action, ActionIdentifiers actionIdentifiers, Payload payload, String requestID)
+			throws ApplicationControllerOrchestratorException {
+		Object requestObject;
+		requestObject = createRequest(action, actionIdentifiers, payload, requestID);
+		appCSupport.logLCMMessage(requestObject);
+		Method lcmMethod = appCSupport.getAPIMethod(action.name(), client, false);
+		try {
+			Object response = lcmMethod.invoke(client, requestObject);
+			return appCSupport.getStatusFromGenericResponse(response);
+		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			throw new RuntimeException(String.format("%s : %s", "Unable to invoke action", action.toString()), e);
+		}
+	}
+
+	public LifeCycleManagerStateful getAppCClient(String controllerType) {
+		if (client == null)
+			try {
+				client = AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class)
+						.createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType));
+			} catch (AppcClientException e) {
+				logger.error("Error in getting LifeCycleManagerStateful Client", e);
+			}
+		return client;
+	}
+
+	protected Properties getLCMProperties(String controllerType) {
+		Properties properties = new Properties();
+		properties.put("topic.read", applicationControllerConfiguration.getReadTopic());
+		properties.put("topic.read.timeout", applicationControllerConfiguration.getReadTimeout());
+		properties.put("client.response.timeout",  applicationControllerConfiguration.getResponseTimeout());
+		properties.put("topic.write",  applicationControllerConfiguration.getWrite());
+		properties.put("poolMembers", applicationControllerConfiguration.getPoolMembers());
+		properties.put("client.key", applicationControllerConfiguration.getClientKey());
+		properties.put("client.secret", applicationControllerConfiguration.getClientSecret());
+		properties.put("client.name", CLIENT_NAME);
+		properties.put("service", applicationControllerConfiguration.getService());
+		return properties;
+	}
+
+	public Object createRequest(Action action, ActionIdentifiers identifier, Payload payload, String requestId) {
+		Object requestObject = appCSupport.getInput(action.name());
+		try {
+			CommonHeader commonHeader = buildCommonHeader(requestId);
+			requestObject.getClass().getDeclaredMethod("setCommonHeader", CommonHeader.class).invoke(requestObject,
+					commonHeader);
+			requestObject.getClass().getDeclaredMethod("setAction", Action.class).invoke(requestObject, action);
+			requestObject.getClass().getDeclaredMethod("setActionIdentifiers", ActionIdentifiers.class)
+					.invoke(requestObject, identifier);
+			if (payload != null) {
+				requestObject.getClass().getDeclaredMethod("setPayload", Payload.class).invoke(requestObject, payload);
+			}
+		} catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+			logger.error("Error building Appc request", e);
+		}
+		return requestObject;
+	}
+
+	private CommonHeader buildCommonHeader(String requestId) {
+		CommonHeader commonHeader = new CommonHeader();
+		commonHeader.setApiVer(API_VER);
+		commonHeader.setOriginatorId(ORIGINATOR_ID);
+		commonHeader.setRequestId(requestId == null ? UUID.randomUUID().toString() : requestId);
+		commonHeader.setSubRequestId(requestId);
+		Flags flags = new Flags();
+		String flagsMode = "NORMAL";
+		Mode mode = Mode.valueOf(flagsMode);
+		flags.setMode(mode);
+		String flagsForce = "FALSE";
+		Force force = Force.valueOf(flagsForce);
+		flags.setForce(force);
+		flags.setTtl(FLAGS_TTL);
+		commonHeader.setFlags(flags);
+		Instant timestamp = Instant.now();
+		ZULU zulu = new ZULU(timestamp.toString());
+		commonHeader.setTimestamp(zulu);
+		return commonHeader;
+	}
+
+	public Flags createRequestFlags() {
+		Flags flags = new Flags();
+		flags.setTtl(6000);
+		return flags;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java
new file mode 100644
index 0000000000..430767f24a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.appc;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Service;
+
+@Configuration
+public class ApplicationControllerConfiguration {
+	@Value("${appc.client.topic.read.name}")
+	private String readTopic;
+
+	@Value("${appc.client.topic.read.timeout}")
+	private String readTimeout;
+
+	@Value("${appc.client.response.timeout}")
+	private String responseTimeout;
+
+	@Value("${appc.client.topic.write}")
+	private String write;
+
+	@Value("${appc.client.poolMembers}")
+	private String poolMembers;
+
+	@Value("${appc.client.key}")
+	private String clientKey;
+
+	@Value("${appc.client.secret}")
+	private String clientSecret;
+
+	@Value("${appc.client.service}")
+	private String service;
+
+	public String getClientKey() {
+		return clientKey;
+	}
+
+	public String getClientSecret() {
+		return clientSecret;
+	}
+
+	public String getPoolMembers() {
+		return poolMembers;
+	}
+	
+	public String getReadTimeout() {
+		return readTimeout;
+	}
+
+	public String getResponseTimeout() {
+		return responseTimeout;
+	}
+
+	public String getReadTopic() {
+		return readTopic;
+	}
+
+	public String getService() {
+		return service;
+	}
+
+	public String getWrite() {
+		return write;
+	}
+}
+
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerOrchestrator.java
index 744be5f28f..84e0f93294 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerOrchestrator.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import java.util.Optional;
 
-import org.openecomp.mso.client.appc.ApplicationControllerSupport.StatusCategory;
+import org.onap.so.client.appc.ApplicationControllerSupport.StatusCategory;
 
 import org.onap.appc.client.lcm.model.Action;
 import org.onap.appc.client.lcm.model.ActionIdentifiers;
@@ -31,11 +31,14 @@ import org.onap.appc.client.lcm.model.Status;
 
 public class ApplicationControllerOrchestrator {
 
-	public Status vnfCommand(Action action, String requestId, String vnfId, Optional<String> request, String controllerType) throws ApplicationControllerOrchestratorException {
+	public Status vnfCommand(Action action, String requestId, String vnfId, Optional<String> vserverId, Optional<String> request, String controllerType) throws ApplicationControllerOrchestratorException {
 		ApplicationControllerClient client = new ApplicationControllerClient(controllerType);
 		Status status;
 		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
 		actionIdentifiers.setVnfId(vnfId);
+		if (vserverId.isPresent()) {			
+			actionIdentifiers.setVserverId(vserverId.get());
+		}
 		Payload payload = null;
 		if (request.isPresent()) {
 			payload = new Payload(request.get());
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorException.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerOrchestratorException.java
index 4692f1dcc2..2532e485ed 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorException.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerOrchestratorException.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;

-

-public class ApplicationControllerOrchestratorException extends Exception {

-

-	private final int appcCode;

-	

-	public ApplicationControllerOrchestratorException(String message, int code) {

-		super(message);

-		appcCode = code;

-	}

-	

-	public int getAppcCode()

-	{

-		return appcCode;

-	}

-}

+package org.onap.so.client.appc;
+
+public class ApplicationControllerOrchestratorException extends Exception {
+
+	private final int appcCode;
+	
+	public ApplicationControllerOrchestratorException(String message, int code) {
+		super(message);
+		appcCode = code;
+	}
+	
+	public int getAppcCode()
+	{
+		return appcCode;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerSupport.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerSupport.java
index e3ed432dfc..ef8749ece9 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerSupport.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerSupport.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -32,15 +32,15 @@ import org.springframework.stereotype.Component;
 import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
 import org.onap.appc.client.lcm.api.ResponseHandler;
 import org.onap.appc.client.lcm.model.Status;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.att.eelf.configuration.EELFLogger.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import org.springframework.stereotype.Service;
 
-@Component
 public class ApplicationControllerSupport {
 
 	private static final int ACCEPT_SERIES = 100;
@@ -52,7 +52,7 @@ public class ApplicationControllerSupport {
 	private static final int PARTIAL_SUCCESS_STATUS = PARTIAL_SERIES;
 	private static final int PARTIAL_FAILURE_STATUS = PARTIAL_SERIES + 1;
 
-	protected final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+	private static Logger logger = LoggerFactory.getLogger(ApplicationControllerSupport.class);
 	private String lcmModelPackage = "org.onap.appc.client.lcm.model";
 
 	/**
@@ -105,7 +105,7 @@ public class ApplicationControllerSupport {
 			try {
 				return (Status) statusReader.invoke(response);
 			} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-				auditLogger.log(Level.ERROR, "Unable to obtain status from LCM Kit response", e, e.getMessage());
+				logger.error("Unable to obtain status from LCM Kit response", e);
 			}
 		}
 		return new Status();
@@ -207,9 +207,9 @@ public class ApplicationControllerSupport {
 		String inputAsJSON;
 		try {
 			inputAsJSON = writer.writeValueAsString(message);
-			auditLogger.log(Level.INFO, "\nLCM Kit input message follows: \n" + inputAsJSON, null);
+			logger.info("LCM Kit input message follows: {}" , inputAsJSON);
 		} catch (JsonProcessingException e) {
-			auditLogger.log(Level.ERROR, "Error in logging LCM Message: ", e, e.getMessage());
+			logger.error("Error in logging LCM Message", e);
 		}
 	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBean.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBean.java
new file mode 100644
index 0000000000..fff818f09b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBean.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.avpn.dmaap.beans;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AVPNDmaapBean {
+	
+	@JsonProperty("asyncRequestStatus")
+	private AsyncRequestStatus asyncRequestStatus;
+
+	public AsyncRequestStatus getAsyncRequestStatus() {
+		return asyncRequestStatus;
+	}
+
+	public void setAsyncRequestStatus(AsyncRequestStatus asyncRequestStatus) {
+		this.asyncRequestStatus = asyncRequestStatus;
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AsyncRequestStatus.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AsyncRequestStatus.java
new file mode 100644
index 0000000000..13206e8c92
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/AsyncRequestStatus.java
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.avpn.dmaap.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "asyncRequestStatus")
+public class AsyncRequestStatus {
+	
+	@JsonProperty("requestId")
+	private String requestId;
+	@JsonProperty("clientSource")
+	private String clientSource;
+	@JsonProperty("correlator")
+	private String correlator;
+	@JsonProperty("instanceReferences")
+	private InstanceReferences instanceReferences;
+	@JsonProperty("startTime")
+	private String startTime;
+	@JsonProperty("finishTime")
+	private String finishTime;
+	@JsonProperty("requestScope")
+	private String requestScope;
+	@JsonProperty("requestType")
+	private String requestType;
+	@JsonProperty("requestStatus")
+	private RequestStatus requestStatus;
+	
+	public String getRequestId() {
+		return requestId;
+	}
+	
+	public void setRequestId(String requestId) {
+		this.requestId = requestId;
+	}
+	
+	public String getClientSource() {
+		return clientSource;
+	}
+	
+	public void setClientSource(String clientSource) {
+		this.clientSource = clientSource;
+	}
+	
+	public String getCorrelator() {
+		return correlator;
+	}
+	
+	public void setCorrelator(String correlator) {
+		this.correlator = correlator;
+	}
+	
+	public InstanceReferences getInstanceReferences() {
+		return instanceReferences;
+	}
+	
+	public void setInstanceReferences(InstanceReferences instanceReferences) {
+		this.instanceReferences = instanceReferences;
+	}
+	
+	public String getStartTime() {
+		return startTime;
+	}
+	
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	
+	public String getFinishTime() {
+		return finishTime;
+	}
+	
+	public void setFinishTime(String finishTime) {
+		this.finishTime = finishTime;
+	}
+	
+	public String getRequestScope() {
+		return requestScope;
+	}
+	
+	public void setRequestScope(String requestScope) {
+		this.requestScope = requestScope;
+	}
+	
+	public String getRequestType() {
+		return requestType;
+	}
+	
+	public void setRequestType(String requestType) {
+		this.requestType = requestType;
+	}
+	
+	public RequestStatus getRequestStatus() {
+		return requestStatus;
+	}
+	
+	public void setRequestStatus(RequestStatus requestStatus) {
+		this.requestStatus = requestStatus;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/InstanceReferences.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/InstanceReferences.java
new file mode 100644
index 0000000000..322f41bf75
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/InstanceReferences.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.avpn.dmaap.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "instanceReferences")
+public class InstanceReferences {
+
+	@JsonProperty("serviceInstanceId")
+	private String serviceInstanceId;
+
+	public String getServiceInstanceId() {
+		return serviceInstanceId;
+	}
+
+	public void setServiceInstanceId(String serviceInstanceId) {
+		this.serviceInstanceId = serviceInstanceId;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/RequestStatus.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/RequestStatus.java
new file mode 100644
index 0000000000..edc8be7bfe
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/avpn/dmaap/beans/RequestStatus.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.avpn.dmaap.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "requestStatus")
+public class RequestStatus {
+
+	@JsonProperty("timestamp")
+	private String timestamp;
+	@JsonProperty("requestState")
+	private String requestState;
+	@JsonProperty("statusMessage")
+	private String statusMessage;
+	@JsonProperty("percentProgress")
+	private String percentProgress;
+	@JsonProperty("wasRolledBack")
+	private Boolean wasRolledBack;
+	
+	public String getTimestamp() {
+		return timestamp;
+	}
+	
+	public void setTimestamp(String timestamp) {
+		this.timestamp = timestamp;
+	}
+	
+	public String getRequestState() {
+		return requestState;
+	}
+	
+	public void setRequestState(String requestState) {
+		this.requestState = requestState;
+	}
+	
+	public String getStatusMessage() {
+		return statusMessage;
+	}
+	
+	public void setStatusMessage(String statusMessage) {
+		this.statusMessage = statusMessage;
+	}
+	
+	public String getPercentProgress() {
+		return percentProgress;
+	}
+	
+	public void setPercentProgress(String percentProgress) {
+		this.percentProgress = percentProgress;
+	}
+
+	public Boolean isWasRolledBack() {
+		return wasRolledBack;
+	}
+
+	public void setWasRolledBack(Boolean wasRolledBack) {
+		this.wasRolledBack = wasRolledBack;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/db/request/RequestsDbClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/db/request/RequestsDbClient.java
new file mode 100644
index 0000000000..61869ca322
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/db/request/RequestsDbClient.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.db.request;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import uk.co.blackpepper.bowman.Client;
+import uk.co.blackpepper.bowman.ClientFactory;
+import uk.co.blackpepper.bowman.Configuration;
+import uk.co.blackpepper.bowman.RestTemplateConfigurer;
+
+@Component("RequestDbClient")
+public class RequestsDbClient {
+
+	private Client<InfraActiveRequests> infraActiveRequestClient;
+
+	@Value("${mso.adapters.db.spring.endpoint}")
+	private String endpoint;
+	
+	@Value("${mso.db.auth}")
+	private String msoAdaptersAuth;
+
+	public RequestsDbClient() {
+		ClientFactory clientFactory = Configuration.builder().setRestTemplateConfigurer(new RestTemplateConfigurer() {
+
+			public void configure(RestTemplate restTemplate) {
+
+				restTemplate.getInterceptors().add(new ClientHttpRequestInterceptor() {
+
+					public ClientHttpResponse intercept(HttpRequest request, byte[] body,
+							ClientHttpRequestExecution execution) throws IOException {
+
+						request.getHeaders().add("Authorization", msoAdaptersAuth);
+						return execution.execute(request, body);
+					}
+				});
+			}
+		}).build().buildClientFactory();
+		infraActiveRequestClient = clientFactory.create(InfraActiveRequests.class);
+       
+	}
+
+	public InfraActiveRequests getInfraActiveRequestbyRequestId(String requestId) {
+		return this.getSingleInfraActiveRequests(this.getUri(endpoint + "/infraActiveRequests/" + requestId));
+	}
+
+	protected InfraActiveRequests getSingleInfraActiveRequests(URI uri) {
+		return infraActiveRequestClient.get(uri);
+	}
+
+	public void updateInfraActiveRequests(InfraActiveRequests request) {		
+		infraActiveRequestClient.put(request);
+	}
+
+	protected URI getUri(String uri) {
+		return URI.create(uri);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaaproperties/DefaultDmaapPropertiesImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DefaultDmaapPropertiesImpl.java
index c3bf53cfde..c5f08d4809 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaaproperties/DefaultDmaapPropertiesImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DefaultDmaapPropertiesImpl.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,22 +18,23 @@
  * ============LICENSE_END=========================================================
  */
  
-package org.openecomp.mso.client.dmaaproperties;
+package org.onap.so.client.dmaapproperties;
 
-import java.util.Map;
+import org.onap.so.client.dmaap.DmaapProperties;
 
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.client.dmaap.DmaapProperties;
+import java.util.Map;
 
 public class DefaultDmaapPropertiesImpl implements DmaapProperties {
 
 	private final Map<String, String> properties;
+
 	public DefaultDmaapPropertiesImpl() {
-		this.properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+		this.properties = new DmaapPropertiesMap();
 	}
+
 	@Override
 	public Map<String, String> getProperties() {
-		return this.properties;
+		return properties;
 	} 
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClient.java
new file mode 100644
index 0000000000..af7c608fee
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClient.java
@@ -0,0 +1,115 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.dmaapproperties;
+
+import javax.inject.Provider;
+
+import org.onap.so.client.avpn.dmaap.beans.AVPNDmaapBean;
+import org.onap.so.client.avpn.dmaap.beans.AsyncRequestStatus;
+import org.onap.so.client.avpn.dmaap.beans.InstanceReferences;
+import org.onap.so.client.avpn.dmaap.beans.RequestStatus;
+import org.onap.so.client.exception.MapperException;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Component
+public class DmaapPropertiesClient {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, DmaapPropertiesClient.class);
+
+	@Autowired
+	private Provider<GlobalDmaapPublisher> dmaapPublisher;
+
+	protected AVPNDmaapBean buildRequestJson(String requestId, String clientSource, String correlator, String serviceInstanceId, String startTime, String finishTime,
+											 String requestScope, String requestType, String timestamp, String requestState, String statusMessage, String percentProgress, Boolean wasRolledBack) {
+
+		RequestStatus requestStatus = buildRequestStatus(timestamp, requestState, statusMessage, percentProgress, wasRolledBack);
+
+		InstanceReferences instanceReferences = buildInstanceReferences(serviceInstanceId);
+
+		AsyncRequestStatus asyncRequestStatus = buildAsyncRequestStatus(requestId, clientSource, correlator, startTime, finishTime,
+				requestScope, requestType, requestStatus, instanceReferences);
+
+		AVPNDmaapBean dmaapBean = new AVPNDmaapBean();
+		dmaapBean.setAsyncRequestStatus(asyncRequestStatus);
+
+		return dmaapBean;
+	}
+
+	private String jsonToString(AVPNDmaapBean dmaapBean) throws JsonProcessingException, MapperException {
+		try {
+			return new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(dmaapBean);
+		} catch (JsonProcessingException e) {
+			msoLogger.error(e);
+			throw new MapperException(e.getMessage());
+		}
+	}
+
+	private AsyncRequestStatus buildAsyncRequestStatus(String requestId, String clientSource, String correlator, String startTime,
+													   String finishTime, String requestScope, String requestType,
+													   RequestStatus requestStatus, InstanceReferences instanceReferences) {
+
+		AsyncRequestStatus asyncRequestStatus = new AsyncRequestStatus();
+		asyncRequestStatus.setRequestId(requestId);
+		asyncRequestStatus.setClientSource(clientSource);
+		asyncRequestStatus.setCorrelator(correlator);
+		asyncRequestStatus.setStartTime(startTime);
+		asyncRequestStatus.setFinishTime(finishTime);
+		asyncRequestStatus.setRequestScope(requestScope);
+		asyncRequestStatus.setRequestType(requestType);
+		asyncRequestStatus.setInstanceReferences(instanceReferences);
+		asyncRequestStatus.setRequestStatus(requestStatus);
+
+		return asyncRequestStatus;
+	}
+
+	private InstanceReferences buildInstanceReferences(String serviceInstanceId) {
+		InstanceReferences instanceReferences = new InstanceReferences();
+		instanceReferences.setServiceInstanceId(serviceInstanceId);
+		return instanceReferences;
+	}
+
+	private RequestStatus buildRequestStatus(String timestamp, String requestState, String statusMessage,
+											 String percentProgress, Boolean wasRolledBack) {
+		RequestStatus requestStatus = new RequestStatus();
+		requestStatus.setTimestamp(timestamp);
+		requestStatus.setRequestState(requestState);
+		requestStatus.setStatusMessage(statusMessage);
+		requestStatus.setPercentProgress(percentProgress);
+		requestStatus.setWasRolledBack(wasRolledBack);
+		return requestStatus;
+	}
+
+	public void dmaapPublishRequest(String requestId, String clientSource, String correlator, String serviceInstanceId, String startTime,
+									String finishTime, String requestScope, String requestType, String timestamp, String requestState,
+									String statusMessage, String percentProgress, Boolean wasRolledBack) throws MapperException, JsonProcessingException {
+
+		AVPNDmaapBean bean = this.buildRequestJson(requestId, clientSource, correlator, serviceInstanceId, startTime, finishTime,
+				requestScope, requestType, timestamp, requestState, statusMessage, percentProgress, wasRolledBack);
+
+		String request = jsonToString(bean);
+		dmaapPublisher.get().send(request);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesMap.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesMap.java
new file mode 100644
index 0000000000..796ccf18b7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/DmaapPropertiesMap.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.dmaapproperties;
+
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+
+import java.util.HashMap;
+
+/**
+ * This class is used when Dmaap Properties are to be accessed from
+ * application.yaml and it delegates get calls to UrnPropertyReader class
+ * for reading the value from active configuration
+ * @param <K> Key for Map Entry
+ * @param <V> Value for Map Entry
+ */
+public class DmaapPropertiesMap<K,V> extends HashMap<K,V> {
+
+    @Override
+    public V get(Object key) {
+        return (V)UrnPropertiesReader.getVariable((String)key);
+    }
+
+    @Override
+    public V getOrDefault(Object key, V defaultValue) {
+        String str = UrnPropertiesReader.getVariable((String)key);
+        return str ==null ? defaultValue : (V)str;
+    }
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisher.java
index 62d78d423c..382852886e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterRestProperties.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisher.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,40 +17,48 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+package org.onap.so.client.dmaapproperties;
 
-package org.openecomp.mso.client.adapter.network;
+import java.io.IOException;
+import java.util.Optional;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.client.dmaap.DmaapPublisher;
 
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.client.adapter.vnf.AdapterRestProperties;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
-public class NetworkAdapterRestProperties implements AdapterRestProperties {
+@Component
+@Scope("prototype")
+public class GlobalDmaapPublisher extends DmaapPublisher {
 
-	private final Map<String, String> props;
 	
-	public NetworkAdapterRestProperties() {
-		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+	public GlobalDmaapPublisher() throws IOException {
+		super();
 	}
 	
 	@Override
-	public String getAuth() {
-		return props.get("mso.adapters.po.auth");
+	public String getUserName() {
+
+		return UrnPropertiesReader.getVariable("mso.global.dmaap.username");
 	}
+
+
+
 	@Override
-	public String getKey() {
-		return props.get("mso.msoKey");
+	public String getPassword() {
+
+		return UrnPropertiesReader.getVariable("mso.global.dmaap.password");
 	}
+
 	@Override
-	public URL getEndpoint() throws MalformedURLException {
-		return new URL(props.get("mso.adapters.network.rest.endpoint"));
+	public String getTopic() {
+		
+		return UrnPropertiesReader.getVariable("mso.global.dmaap.publisher.topic");
 	}
 
 	@Override
-	public String getSystemName() {
-		return "MSO";
+	public Optional<String> getHost() {
+		return Optional.ofNullable(UrnPropertiesReader.getVariable("mso.global.dmaap.host"));
 	}
-
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/BBObjectNotFoundException.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/BBObjectNotFoundException.java
new file mode 100644
index 0000000000..26c8d80075
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/BBObjectNotFoundException.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.exception;
+
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+
+public class BBObjectNotFoundException extends Exception{
+	private ResourceKey resourceKey;
+	private String resourceValue;
+	
+    public BBObjectNotFoundException() {}
+
+    public BBObjectNotFoundException(ResourceKey resourceKey, String resourceValue)
+    {
+    	super("BBObject" + resourceKey + " was not found in gBBInput using reference value: " + resourceValue);
+    	this.resourceKey = resourceKey;
+    	this.resourceValue = resourceValue;
+    }
+
+    public ResourceKey getResourceKey() {
+    	return resourceKey;
+    }
+    
+    public String getResourceValue() {
+    	return resourceValue;
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/ResponseStatus.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/BadResponseException.java
index cc00fd1ff2..ac8ff9efe4 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/ResponseStatus.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/BadResponseException.java
@@ -18,16 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.adapter.requests.db.entities;
+package org.onap.so.client.exception;
 
+public class BadResponseException extends Exception{
 
+	public BadResponseException() {}
+
+    public BadResponseException(String message)
+    {
+       super(message);
+    }
 
-/*
- * Enum for Status values returned by API Handler to Tail-F
-*/
-public enum ResponseStatus {
-	SENDING_FINAL_NOTIFY,
-	SUCCESS,
-	FAILED,
-	TIMEOUT	
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java
new file mode 100644
index 0000000000..c74e81506c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.exception;
+
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.DelegateExecutionImpl;
+import org.onap.so.bpmn.core.WorkflowException;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExceptionBuilder {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, ExceptionBuilder.class);
+
+	public void buildAndThrowWorkflowException(BuildingBlockExecution execution, int errorCode, Exception exception) {
+		String msg = "Exception in %s.%s ";
+		try{
+			msoLogger.error(exception);
+			
+			String errorVariable = "Error%s%s";
+	
+			StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+			for (StackTraceElement traceElement : trace) {
+				if (!traceElement.getClassName().equals(this.getClass().getName()) && !traceElement.getClassName().equals(Thread.class.getName())) {
+					msg = String.format(msg, traceElement.getClassName(), traceElement.getMethodName());
+					String shortClassName = traceElement.getClassName().substring(traceElement.getClassName().lastIndexOf(".") + 1);
+					errorVariable = String.format(errorVariable,  shortClassName, traceElement.getMethodName());
+					break;
+				}
+			}
+			
+			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, msg.toString());
+			execution.setVariable(errorVariable, exception.getMessage());
+		} catch (Exception ex){
+			//log trace, allow process to complete gracefully
+			msoLogger.error(ex);
+		}
+
+		if (exception.getMessage() != null)
+			msg = msg.concat(exception.getMessage());
+		buildAndThrowWorkflowException(execution, errorCode, msg);
+	}
+
+	public void buildAndThrowWorkflowException(BuildingBlockExecution execution, int errorCode, String errorMessage) {
+		if (execution instanceof DelegateExecutionImpl) {
+			buildAndThrowWorkflowException(((DelegateExecutionImpl) execution).getDelegateExecution(), errorCode, errorMessage);
+		}
+	}
+
+	public void buildAndThrowWorkflowException(DelegateExecution execution, int errorCode, String errorMessage) {
+		String processKey = getProcessKey(execution);
+		msoLogger.info("Building a WorkflowException for Subflow");
+
+		WorkflowException exception = new WorkflowException(processKey, errorCode, errorMessage);
+		execution.setVariable("WorkflowException", exception);
+		msoLogger.info("Outgoing WorkflowException is " + exception);
+		msoLogger.info("Throwing MSOWorkflowException");
+		throw new BpmnError("MSOWorkflowException");
+	}
+
+	public String getProcessKey(DelegateExecution execution) {
+		String testKey = (String) execution.getVariable("testProcessKey");
+		if (testKey != null) {
+			return testKey;
+		}
+		return execution.getProcessEngineServices().getRepositoryService()
+				.getProcessDefinition(execution.getProcessDefinitionId()).getKey();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/package-info.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/MapperException.java
index c6ee6ca015..3f3beadb92 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/package-info.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/MapperException.java
@@ -18,5 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://org.openecomp.mso/vnfNotify")
-package org.openecomp.mso.bpmn.common.adapter.vnf;
+package org.onap.so.client.exception;
+
+public class MapperException extends Exception{
+	
+    public MapperException() {}
+
+    public MapperException(String message)
+    {
+       super(message);
+    }
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/OrchestrationStatusValidationException.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/OrchestrationStatusValidationException.java
new file mode 100644
index 0000000000..fe7b079568
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/OrchestrationStatusValidationException.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.exception;
+
+public class OrchestrationStatusValidationException extends Exception{
+	public OrchestrationStatusValidationException() {}
+
+    public OrchestrationStatusValidationException(String message) {
+       super(message);
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/restproperties/AAIPropertiesImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/AAIPropertiesImpl.java
index a1ef35a49d..b7164e327e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/restproperties/AAIPropertiesImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/AAIPropertiesImpl.java
@@ -18,28 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.restproperties;
+package org.onap.so.client.restproperties;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map;
 
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.client.aai.AAIProperties;
-import org.openecomp.mso.client.aai.AAIVersion;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.client.aai.AAIProperties;
+import org.onap.so.client.aai.AAIVersion;
+import org.springframework.stereotype.Component;
 
+@Component
 public class AAIPropertiesImpl implements AAIProperties {
 
-	final Map<String, String> props;
-
-	public AAIPropertiesImpl() {
-		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
-
-	}
+	public static final String MSO_MSO_KEY = "mso.msoKey";
+	public static final String AAI_AUTH = "aai.auth";
+	public static final String AAI_ENDPOINT = "aai.endpoint";
+	private UrnPropertiesReader reader;
 
 	@Override
 	public URL getEndpoint() throws MalformedURLException {
-		return new URL(props.get("aai.endpoint"));
+		return new URL(reader.getVariable(AAI_ENDPOINT));
 	}
 
 	@Override
@@ -54,11 +53,11 @@ public class AAIPropertiesImpl implements AAIProperties {
 
 	@Override
 	public String getAuth() {
-		return props.get("aai.auth");
+		return reader.getVariable(AAI_AUTH);
 	}
 
 	@Override
 	public String getKey() {
-		return props.get("mso.msoKey");
+		return reader.getVariable(MSO_MSO_KEY);
 	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/AaiPropertiesConfiguration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/AaiPropertiesConfiguration.java
new file mode 100644
index 0000000000..b7582922b1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/AaiPropertiesConfiguration.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.restproperties;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AaiPropertiesConfiguration {
+
+	@Value("${aai.endpoint}")
+	private String endpoint;
+
+	@Value("${aai.auth}")
+	private String auth;
+
+	public String getEndpoint() {
+		return endpoint;
+	}
+
+	public String getAuth() {
+		return auth;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/restproperties/PolicyRestPropertiesImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/PolicyRestPropertiesImpl.java
index eccf87c09d..1e43adceba 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/restproperties/PolicyRestPropertiesImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/PolicyRestPropertiesImpl.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,27 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.restproperties;
+package org.onap.so.client.restproperties;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map;
 
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.client.policy.PolicyRestProperties;
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+import org.onap.so.client.policy.PolicyRestProperties;
 
 public class PolicyRestPropertiesImpl implements PolicyRestProperties {
 
-	
-	final Map<String, String> props;
-	public PolicyRestPropertiesImpl() {
-		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+	public static final String POLICY_ENDPOINT = "policy.endpoint";
+	public static final String POLICY_ENVIRONMENT = "policy.environment";
+	public static final String POLICY_AUTH = "policy.auth";
+	public static final String POLICY_CLIENT_AUTH = "policy.client.auth";
 
+	public PolicyRestPropertiesImpl() {
 	}
+	
 	@Override
 	public URL getEndpoint() {
 		try {
-			return new URL(props.getOrDefault("policy.endpoint", ""));
+			return new URL(UrnPropertiesReader.getVariable(POLICY_ENDPOINT));
 		} catch (MalformedURLException e) {
 			return null;
 		}
@@ -50,15 +51,15 @@ public class PolicyRestPropertiesImpl implements PolicyRestProperties {
 	}
 	
 	public String getClientAuth() {
-		return props.get("policy.client.auth");
+		return UrnPropertiesReader.getVariable(POLICY_CLIENT_AUTH);
 	}
 	
 	public String getAuth() {
-		return props.get("policy.auth");
+		return UrnPropertiesReader.getVariable(POLICY_AUTH);
 	}
 	
 	public String getEnvironment() {
-		return props.get("policy.environment");
+		return UrnPropertiesReader.getVariable(POLICY_ENVIRONMENT);
 	}
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/package-info.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/UrnPropertiesReaderWrapper.java
index 42f4ce374f..030eff92e2 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/package-info.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/restproperties/UrnPropertiesReaderWrapper.java
@@ -18,5 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.openecomp.mso.bpmn.common.adapter.sdnc;
+package org.onap.so.client.restproperties;
+
+import org.onap.so.bpmn.core.UrnPropertiesReader;
+
+public class UrnPropertiesReaderWrapper {
+
+	public String getVariable(String key) {
+		return UrnPropertiesReader.getVariable(key);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/CallbackHeader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/CallbackHeader.java
deleted file mode 100644
index 67109d5578..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/CallbackHeader.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.sdnc;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="RequestId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="ResponseCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="ResponseMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestId",
-    "responseCode",
-    "responseMessage"
-}, namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-@XmlRootElement(name = "CallbackHeader")
-public class CallbackHeader {
-
-    @XmlElement(name = "RequestId", required = true, namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-    protected String requestId;
-    @XmlElement(name = "ResponseCode", required = true,namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-    protected String responseCode;
-    @XmlElement(name = "ResponseMessage", required = true,namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-    protected String responseMessage;
-
-    /**
-     * Gets the value of the requestId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Sets the value of the requestId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequestId(String value) {
-        this.requestId = value;
-    }
-
-    /**
-     * Gets the value of the responseCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    /**
-     * Sets the value of the responseCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResponseCode(String value) {
-        this.responseCode = value;
-    }
-
-    /**
-     * Gets the value of the responseMessage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResponseMessage() {
-        return responseMessage;
-    }
-
-    /**
-     * Sets the value of the responseMessage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResponseMessage(String value) {
-        this.responseMessage = value;
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/ObjectFactory.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/ObjectFactory.java
deleted file mode 100644
index 1835fbe41c..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/ObjectFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.sdnc;

-

-import javax.xml.bind.annotation.XmlRegistry;

-

-

-/**

- * This object contains factory methods for each

- * Java content interface and Java element interface

- * generated in the org.openecomp.domain2.workflow.sdnc.adapter.schema.v1 package.

- * <p>An ObjectFactory allows you to programatically

- * construct new instances of the Java representation

- * for XML content. The Java representation of XML

- * content can consist of schema derived interfaces

- * and classes representing the binding of schema

- * type definitions, element declarations and model

- * groups.  Factory methods for each of these are

- * provided in this class.

- *

- */

-@XmlRegistry

-public class ObjectFactory {

-

-

-    /**

-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.domain2.workflow.sdnc.adapter.schema.v1

-     *

-     */

-    public ObjectFactory() {

-    }

-

-    /**

-     * Create an instance of {@link RequestHeader }

-     *

-     */

-    public RequestHeader createRequestHeader() {

-        return new RequestHeader();

-    }

-

-    /**

-     * Create an instance of {@link SDNCAdapterResponse }

-     *

-     */

-    public SDNCAdapterResponse createSDNCAdapterResponse() {

-        return new SDNCAdapterResponse();

-    }

-

-    /**

-     * Create an instance of {@link SDNCAdapterCallbackRequest }

-     *

-     */

-    public SDNCAdapterCallbackRequest createSDNCAdapterCallbackRequest() {

-        return new SDNCAdapterCallbackRequest();

-    }

-

-    /**

-     * Create an instance of {@link CallbackHeader }

-     *

-     */

-    public CallbackHeader createCallbackHeader() {

-        return new CallbackHeader();

-    }

-

-    /**

-     * Create an instance of {@link SDNCAdapterRequest }

-     *

-     */

-    public SDNCAdapterRequest createSDNCAdapterRequest() {

-        return new SDNCAdapterRequest();

-    }

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/RequestHeader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/RequestHeader.java
deleted file mode 100644
index 12f2fef668..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/RequestHeader.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.sdnc;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlRootElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for anonymous complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType>

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="RequestId" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="SvcInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="SvcAction" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="SvcOperation" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="CallbackUrl" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="MsoAction" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "", propOrder = {

-    "requestId",

-    "svcInstanceId",

-    "svcAction",

-    "svcOperation",

-    "callbackUrl",

-    "msoAction"

-})

-@XmlRootElement(name = "RequestHeader")

-public class RequestHeader {

-

-    @XmlElement(name = "RequestId", required = true)

-    protected String requestId;

-    @XmlElement(name = "SvcInstanceId")

-    protected String svcInstanceId;

-    @XmlElement(name = "SvcAction", required = true)

-    protected String svcAction;

-    @XmlElement(name = "SvcOperation", required = true)

-    protected String svcOperation;

-    @XmlElement(name = "CallbackUrl", required = true)

-    protected String callbackUrl;

-    @XmlElement(name = "MsoAction")

-    protected String msoAction;

-

-    /**

-     * Gets the value of the requestId property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getRequestId() {

-        return requestId;

-    }

-

-    /**

-     * Sets the value of the requestId property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setRequestId(String value) {

-        this.requestId = value;

-    }

-

-    /**

-     * Gets the value of the svcInstanceId property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getSvcInstanceId() {

-        return svcInstanceId;

-    }

-

-    /**

-     * Sets the value of the svcInstanceId property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setSvcInstanceId(String value) {

-        this.svcInstanceId = value;

-    }

-

-    /**

-     * Gets the value of the svcAction property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getSvcAction() {

-        return svcAction;

-    }

-

-    /**

-     * Sets the value of the svcAction property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setSvcAction(String value) {

-        this.svcAction = value;

-    }

-

-    /**

-     * Gets the value of the svcOperation property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getSvcOperation() {

-        return svcOperation;

-    }

-

-    /**

-     * Sets the value of the svcOperation property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setSvcOperation(String value) {

-        this.svcOperation = value;

-    }

-

-    /**

-     * Gets the value of the callbackUrl property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getCallbackUrl() {

-        return callbackUrl;

-    }

-

-    /**

-     * Sets the value of the callbackUrl property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setCallbackUrl(String value) {

-        this.callbackUrl = value;

-    }

-

-    /**

-     * Gets the value of the msoAction property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getMsoAction() {

-        return msoAction;

-    }

-

-    /**

-     * Sets the value of the msoAction property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setMsoAction(String value) {

-        this.msoAction = value;

-    }

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterCallbackRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterCallbackRequest.java
deleted file mode 100644
index 8c9d4e2a50..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterCallbackRequest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.sdnc;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://org.openecomp/workflow/sdnc/adapter/schema/v1}CallbackHeader"/>
- *         &lt;element name="RequestData" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1", propOrder = {
-    "callbackHeader",
-    "requestData"
-})
-@XmlRootElement(name = "SDNCAdapterCallbackRequest", namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-public class SDNCAdapterCallbackRequest {
-
-    @XmlElement(name = "CallbackHeader", required = true, namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-    protected CallbackHeader callbackHeader;
-    @XmlElement(name = "RequestData", required=false, namespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-    protected Object requestData;
-
-    /**
-     * Gets the value of the callbackHeader property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CallbackHeader }
-     *     
-     */
-    public CallbackHeader getCallbackHeader() {
-        return callbackHeader;
-    }
-
-    /**
-     * Sets the value of the callbackHeader property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CallbackHeader }
-     *     
-     */
-    public void setCallbackHeader(CallbackHeader value) {
-        this.callbackHeader = value;
-    }
-
-    /**
-     * Gets the value of the requestData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getRequestData() {
-        return requestData;
-    }
-
-    /**
-     * Sets the value of the requestData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setRequestData(Object value) {
-        this.requestData = value;
-    }
-
-    @Override
-	public String toString() {
-		StringWriter writer = new StringWriter();
-		try {
-			JAXBContext context = JAXBContext
-					.newInstance(SDNCAdapterCallbackRequest.class);
-			Marshaller m = context.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-			m.marshal(this, writer);
-			return writer.getBuffer().toString();
-		} catch (JAXBException e) {
-			return "";
-		}
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterRequest.java
deleted file mode 100644
index 1043b48944..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterRequest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.sdnc;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://org.openecomp/workflow/sdnc/adapter/schema/v1}RequestHeader"/>
- *         &lt;element name="RequestData" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestHeader",
-    "requestData"
-})
-@XmlRootElement(name = "SDNCAdapterRequest")
-public class SDNCAdapterRequest {
-
-    @XmlElement(name = "RequestHeader", required = true)
-    protected RequestHeader requestHeader;
-    @XmlElement(name = "RequestData", required = true)
-    protected Object requestData;
-
-    /**
-     * Gets the value of the requestHeader property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RequestHeader }
-     *     
-     */
-    public RequestHeader getRequestHeader() {
-        return requestHeader;
-    }
-
-    /**
-     * Sets the value of the requestHeader property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RequestHeader }
-     *     
-     */
-    public void setRequestHeader(RequestHeader value) {
-        this.requestHeader = value;
-    }
-
-    /**
-     * Gets the value of the requestData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getRequestData() {
-        return requestData;
-    }
-
-    /**
-     * Sets the value of the requestData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setRequestData(Object value) {
-        this.requestData = value;
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterResponse.java
deleted file mode 100644
index 34e68d68ef..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCAdapterResponse.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.sdnc;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlRootElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for anonymous complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType>

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "")

-@XmlRootElement(name = "SDNCAdapterResponse")

-public class SDNCAdapterResponse {

-

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCCallbackAdapterPortType.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCCallbackAdapterPortType.java
deleted file mode 100644
index c2f68ff6a4..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/sdnc/SDNCCallbackAdapterPortType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.sdnc;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
- *
- */
-@WebService(name = "SDNCCallbackAdapterPortType", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/callback/wsdl/v1")
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface SDNCCallbackAdapterPortType {
-
-
-    /**
-     *
-     * @param sdncAdapterCallbackRequest
-     * @return
-     *     returns org.openecomp.domain2.workflow.sdnc.adapter.schema.v1.SDNCAdapterResponse
-     */
-    @WebMethod(operationName = "SDNCAdapterCallback")
-    @WebResult(name = "SDNCAdapterResponse", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackResponse")
-    public SDNCAdapterResponse sdncAdapterCallback(
-        @WebParam(name = "SDNCAdapterCallbackRequest", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackRequest")
-        SDNCAdapterCallbackRequest sdncAdapterCallbackRequest);
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotification.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotification.java
deleted file mode 100644
index 1b5c080045..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotification.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for createVnfNotification complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="createVnfNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.openecomp.mso/vnfNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="vnfId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="outputs" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="rollback" type="{http://org.openecomp.mso/vnfNotify}vnfRollback" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "createVnfNotification1", propOrder = {
-    "messageId",
-    "completed",
-    "exception",
-    "errorMessage",
-    "vnfId",
-    "outputs",
-    "rollback"
-})
-public class CreateVnfNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected String vnfId;
-    protected CreateVnfNotification.Outputs outputs;
-    protected VnfRollback rollback;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MsoExceptionCategory }
-     *     
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MsoExceptionCategory }
-     *     
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the vnfId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    /**
-     * Sets the value of the vnfId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVnfId(String value) {
-        this.vnfId = value;
-    }
-
-    /**
-     * Gets the value of the outputs property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CreateVnfNotification.Outputs }
-     *     
-     */
-    public CreateVnfNotification.Outputs getOutputs() {
-        return outputs;
-    }
-
-    /**
-     * Sets the value of the outputs property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CreateVnfNotification.Outputs }
-     *     
-     */
-    public void setOutputs(CreateVnfNotification.Outputs value) {
-        this.outputs = value;
-    }
-
-    /**
-     * Gets the value of the rollback property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VnfRollback }
-     *     
-     */
-    public VnfRollback getRollback() {
-        return rollback;
-    }
-
-    /**
-     * Sets the value of the rollback property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VnfRollback }
-     *     
-     */
-    public void setRollback(VnfRollback value) {
-        this.rollback = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "entry"
-    })
-    public static class Outputs {
-
-        protected List<CreateVnfNotification.Outputs.Entry> entry;
-        
-        /**
-         * Gets the value of the entry property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the entry property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getEntry().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link CreateVnfNotification.Outputs.Entry }
-         * 
-         * 
-         */
-        public List<CreateVnfNotification.Outputs.Entry> getEntry() {
-            if (entry == null) {
-                entry = new ArrayList<>();
-            }
-            return this.entry;
-        }
-
-        // Not a generated method
-	@Override
-        public String toString() {
-        	StringBuilder out = new StringBuilder();
-        	out.append("<outputs>\n");
-        	if (entry != null) {
-        		for (Entry e : entry) {
-        			out.append(e.toString());
-        			out.append('\n');
-        		}
-        	}
-        	out.append("</outputs>");
-        	return out.toString();
-        }
-
-        /**
-         * <p>Java class for anonymous complex type.
-         * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "key",
-            "value"
-        })
-        public static class Entry {
-
-            protected String key;
-            protected String value;
-
-            /**
-             * Gets the value of the key property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getKey() {
-                return key;
-            }
-
-            /**
-             * Sets the value of the key property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setKey(String value) {
-                this.key = value;
-            }
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-                
-            }
-            
-            // Not a generated method
-            @Override
-            public String toString() {
-            	String entrystr;
-            		entrystr =
-               "<entry>"+ '\n' +
-    	       "   <key>"+key+"</key>" + '\n' +
-    	       "   <value>"+value+"</value>" + '\n' +
-    	       "</entry>";
-            	return entrystr; 
-            }
-
-        }
-
-    }
-
-	// Not a generated method
-	@Override
-	public String toString() {
-    	String createVnfNotification;
-    	if (exception==null) {
-    		createVnfNotification = "<ns2:createVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-    				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-    				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-    				       "   <completed>"+completed+"</completed>" + '\n' +
-    				       "   <vnfId>"+vnfId+"</vnfId>" + '\n' +
-    				       (outputs == null ? "" : outputs.toString() + '\n') +
-    				       "   <rollback>"+rollback+"</rollback>" + '\n' +
-    				       "</ns2:createVnfNotification>";
-    	} else {
-    		createVnfNotification = "<ns2:createVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-				       "   <completed>"+completed+"</completed>" + '\n' +
-    				       (outputs == null ? "" : outputs.toString() + '\n') +
-    				   "   <exception>"+exception+"</exception>" + '\n' +
-    				   "   <errorMessage>"+errorMessage+"</errorMessage>" + '\n' +
-				       "</ns2:createVnfNotification>";
-    	}
-    	return createVnfNotification;
-   	}    
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotification.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotification.java
deleted file mode 100644
index 651fd1aca7..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotification.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.vnf;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for deleteVnfNotification complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="deleteVnfNotification">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>

- *         &lt;element name="exception" type="{http://org.openecomp.mso/vnfNotify}msoExceptionCategory" minOccurs="0"/>

- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "deleteVnfNotification1", propOrder = {

-    "messageId",

-    "completed",

-    "exception",

-    "errorMessage"

-})

-public class DeleteVnfNotification {

-

-    @XmlElement(required = true)

-    protected String messageId;

-    protected boolean completed;

-    protected MsoExceptionCategory exception;

-    protected String errorMessage;

-

-    /**

-     * Gets the value of the messageId property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getMessageId() {

-        return messageId;

-    }

-

-    /**

-     * Sets the value of the messageId property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setMessageId(String value) {

-        this.messageId = value;

-    }

-

-    /**

-     * Gets the value of the completed property.

-     * 

-     */

-    public boolean isCompleted() {

-        return completed;

-    }

-

-    /**

-     * Sets the value of the completed property.

-     * 

-     */

-    public void setCompleted(boolean value) {

-        this.completed = value;

-    }

-

-    /**

-     * Gets the value of the exception property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link MsoExceptionCategory }

-     *     

-     */

-    public MsoExceptionCategory getException() {

-        return exception;

-    }

-

-    /**

-     * Sets the value of the exception property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link MsoExceptionCategory }

-     *     

-     */

-    public void setException(MsoExceptionCategory value) {

-        this.exception = value;

-    }

-

-    /**

-     * Gets the value of the errorMessage property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getErrorMessage() {

-        return errorMessage;

-    }

-

-    /**

-     * Sets the value of the errorMessage property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setErrorMessage(String value) {

-        this.errorMessage = value;

-    }

-

-    /**

-     * Overrides toString() method 

-     * @return String type (deleteVnfNotification)

-     */

- 

-    @Override

-	public String toString() {

-    	String deleteVnfNotification;

-    	if (exception == null) {

-    		deleteVnfNotification = "<ns2:deleteVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +

-    				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +

-    				       "   <messageId>"+messageId+"</messageId>" + '\n' +

-    				       "   <completed>"+completed+"</completed>" + '\n' +

-    				       "</ns2:deleteVnfNotification>";

-    	} else {

-    		deleteVnfNotification = "<ns2:deleteVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +

-				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +

-				       "   <messageId>"+messageId+"</messageId>" + '\n' +

-				       "   <completed>"+completed+"</completed>" + '\n' +

-    				   "   <exception>"+exception+"</exception>" + '\n' +

-    				   "   <errorMessage>"+errorMessage+"</errorMessage>" + '\n' +

-				       "</ns2:deleteVnfNotification>";

-    	}

-    	return deleteVnfNotification;

-   	}    

-

-/*	

-	public String toString() {

-		StringWriter writer = new StringWriter();

-		try {

-			JAXBContext context = JAXBContext

-					.newInstance(DeleteVnfNotification.class);

-			Marshaller m = context.createMarshaller();

-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);

-			m.marshal(this, writer);

-			//System.out.println("toString() - " + writer.getBuffer().toString());			

-			return writer.getBuffer().toString();

-		} catch (JAXBException e) {

-			//System.out.println("JAXBException - " + e.getStackTrace());			

-			return "";

-		}

-	}    

-*/	

-	

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
deleted file mode 100644
index eabd465934..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for msoRequest complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="msoRequest">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="requestId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="serviceInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "msoRequest", propOrder = {
-    "requestId",
-    "serviceInstanceId"
-})
-public class MsoRequest {
-
-    protected String requestId;
-    protected String serviceInstanceId;
-
-    /**
-     * Gets the value of the requestId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Sets the value of the requestId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequestId(String value) {
-        this.requestId = value;
-    }
-
-    /**
-     * Gets the value of the serviceInstanceId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    /**
-     * Sets the value of the serviceInstanceId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setServiceInstanceId(String value) {
-        this.serviceInstanceId = value;
-    }
-
-    @Override
-    public String toString() {
-        return "<requestId>" + requestId + "</requestId>" + '\n' + "<serviceInstanceId>" + serviceInstanceId
-            + "</serviceInstanceId>";
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactory.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactory.java
deleted file mode 100644
index c22fd286cf..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactory.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.openecomp.mso.adapters.vnf.async.client package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _RollbackVnfNotification_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "rollbackVnfNotification");
-    private final static QName _DeleteVnfNotification_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "deleteVnfNotification");
-    private final static QName _CreateVnfNotification_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "createVnfNotification");
-    private final static QName _UpdateVnfNotification_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "updateVnfNotification");
-    private final static QName _QueryVnfNotification_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "queryVnfNotification");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.mso.adapters.vnf.async.client
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link UpdateVnfNotification }
-     * 
-     */
-    public UpdateVnfNotification createUpdateVnfNotification() {
-        return new UpdateVnfNotification();
-    }
-
-    /**
-     * Create an instance of {@link UpdateVnfNotification.Outputs }
-     * 
-     */
-    public UpdateVnfNotification.Outputs createUpdateVnfNotificationOutputs() {
-        return new UpdateVnfNotification.Outputs();
-    }
-
-    /**
-     * Create an instance of {@link QueryVnfNotification }
-     * 
-     */
-    public QueryVnfNotification createQueryVnfNotification() {
-        return new QueryVnfNotification();
-    }
-
-    /**
-     * Create an instance of {@link QueryVnfNotification.Outputs }
-     * 
-     */
-    public QueryVnfNotification.Outputs createQueryVnfNotificationOutputs() {
-        return new QueryVnfNotification.Outputs();
-    }
-
-    /**
-     * Create an instance of {@link CreateVnfNotification }
-     * 
-     */
-    public CreateVnfNotification createCreateVnfNotification() {
-        return new CreateVnfNotification();
-    }
-
-    /**
-     * Create an instance of {@link CreateVnfNotification.Outputs }
-     * 
-     */
-    public CreateVnfNotification.Outputs createCreateVnfNotificationOutputs() {
-        return new CreateVnfNotification.Outputs();
-    }
-
-    /**
-     * Create an instance of {@link DeleteVnfNotification }
-     * 
-     */
-    public DeleteVnfNotification createDeleteVnfNotification() {
-        return new DeleteVnfNotification();
-    }
-
-    /**
-     * Create an instance of {@link RollbackVnfNotification }
-     * 
-     */
-    public RollbackVnfNotification createRollbackVnfNotification() {
-        return new RollbackVnfNotification();
-    }
-
-    /**
-     * Create an instance of {@link MsoRequest }
-     * 
-     */
-    public MsoRequest createMsoRequest() {
-        return new MsoRequest();
-    }
-
-    /**
-     * Create an instance of {@link VnfRollback }
-     * 
-     */
-    public VnfRollback createVnfRollback() {
-        return new VnfRollback();
-    }
-
-    /**
-     * Create an instance of {@link UpdateVnfNotification.Outputs.Entry }
-     * 
-     */
-    public UpdateVnfNotification.Outputs.Entry createUpdateVnfNotificationOutputsEntry() {
-        return new UpdateVnfNotification.Outputs.Entry();
-    }
-
-    /**
-     * Create an instance of {@link QueryVnfNotification.Outputs.Entry }
-     * 
-     */
-    public QueryVnfNotification.Outputs.Entry createQueryVnfNotificationOutputsEntry() {
-        return new QueryVnfNotification.Outputs.Entry();
-    }
-
-    /**
-     * Create an instance of {@link CreateVnfNotification.Outputs.Entry }
-     * 
-     */
-    public CreateVnfNotification.Outputs.Entry createCreateVnfNotificationOutputsEntry() {
-        return new CreateVnfNotification.Outputs.Entry();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RollbackVnfNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "rollbackVnfNotification")
-    public JAXBElement<RollbackVnfNotification> createRollbackVnfNotification(RollbackVnfNotification value) {
-        return new JAXBElement<>(_RollbackVnfNotification_QNAME, RollbackVnfNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteVnfNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "deleteVnfNotification")
-    public JAXBElement<DeleteVnfNotification> createDeleteVnfNotification(DeleteVnfNotification value) {
-        return new JAXBElement<>(_DeleteVnfNotification_QNAME, DeleteVnfNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateVnfNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "createVnfNotification")
-    public JAXBElement<CreateVnfNotification> createCreateVnfNotification(CreateVnfNotification value) {
-        return new JAXBElement<>(_CreateVnfNotification_QNAME, CreateVnfNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UpdateVnfNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "updateVnfNotification")
-    public JAXBElement<UpdateVnfNotification> createUpdateVnfNotification(UpdateVnfNotification value) {
-        return new JAXBElement<>(_UpdateVnfNotification_QNAME, UpdateVnfNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QueryVnfNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "queryVnfNotification")
-    public JAXBElement<QueryVnfNotification> createQueryVnfNotification(QueryVnfNotification value) {
-        return new JAXBElement<>(_QueryVnfNotification_QNAME, QueryVnfNotification.class, null, value);
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotification.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotification.java
deleted file mode 100644
index 4e84234c81..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotification.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.vnf;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for queryVnfNotification complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="queryVnfNotification">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>

- *         &lt;element name="exception" type="{http://org.openecomp.mso/vnfNotify}msoExceptionCategory" minOccurs="0"/>

- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="vnfExists" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>

- *         &lt;element name="vnfId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="status" type="{http://org.openecomp.mso/vnfNotify}vnfStatus" minOccurs="0"/>

- *         &lt;element name="outputs" minOccurs="0">

- *           &lt;complexType>

- *             &lt;complexContent>

- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *                 &lt;sequence>

- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">

- *                     &lt;complexType>

- *                       &lt;complexContent>

- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *                           &lt;sequence>

- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *                           &lt;/sequence>

- *                         &lt;/restriction>

- *                       &lt;/complexContent>

- *                     &lt;/complexType>

- *                   &lt;/element>

- *                 &lt;/sequence>

- *               &lt;/restriction>

- *             &lt;/complexContent>

- *           &lt;/complexType>

- *         &lt;/element>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "queryVnfNotification1", propOrder = {

-    "messageId",

-    "completed",

-    "exception",

-    "errorMessage",

-    "vnfExists",

-    "vnfId",

-    "status",

-    "outputs"

-})

-public class QueryVnfNotification {

-

-    @XmlElement(required = true)

-    protected String messageId;

-    protected boolean completed;

-    protected MsoExceptionCategory exception;

-    protected String errorMessage;

-    protected Boolean vnfExists;

-    protected String vnfId;

-    protected VnfStatus status;

-    protected QueryVnfNotification.Outputs outputs;

-

-    /**

-     * Gets the value of the messageId property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getMessageId() {

-        return messageId;

-    }

-

-    /**

-     * Sets the value of the messageId property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setMessageId(String value) {

-        this.messageId = value;

-    }

-

-    /**

-     * Gets the value of the completed property.

-     * 

-     */

-    public boolean isCompleted() {

-        return completed;

-    }

-

-    /**

-     * Sets the value of the completed property.

-     * 

-     */

-    public void setCompleted(boolean value) {

-        this.completed = value;

-    }

-

-    /**

-     * Gets the value of the exception property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link MsoExceptionCategory }

-     *     

-     */

-    public MsoExceptionCategory getException() {

-        return exception;

-    }

-

-    /**

-     * Sets the value of the exception property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link MsoExceptionCategory }

-     *     

-     */

-    public void setException(MsoExceptionCategory value) {

-        this.exception = value;

-    }

-

-    /**

-     * Gets the value of the errorMessage property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getErrorMessage() {

-        return errorMessage;

-    }

-

-    /**

-     * Sets the value of the errorMessage property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setErrorMessage(String value) {

-        this.errorMessage = value;

-    }

-

-    /**

-     * Gets the value of the vnfExists property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link Boolean }

-     *     

-     */

-    public Boolean isVnfExists() {

-        return vnfExists;

-    }

-

-    /**

-     * Sets the value of the vnfExists property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link Boolean }

-     *     

-     */

-    public void setVnfExists(Boolean value) {

-        this.vnfExists = value;

-    }

-

-    /**

-     * Gets the value of the vnfId property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getVnfId() {

-        return vnfId;

-    }

-

-    /**

-     * Sets the value of the vnfId property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setVnfId(String value) {

-        this.vnfId = value;

-    }

-

-    /**

-     * Gets the value of the status property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link VnfStatus }

-     *     

-     */

-    public VnfStatus getStatus() {

-        return status;

-    }

-

-    /**

-     * Sets the value of the status property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link VnfStatus }

-     *     

-     */

-    public void setStatus(VnfStatus value) {

-        this.status = value;

-    }

-

-    /**

-     * Gets the value of the outputs property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link QueryVnfNotification.Outputs }

-     *     

-     */

-    public QueryVnfNotification.Outputs getOutputs() {

-        return outputs;

-    }

-

-    /**

-     * Sets the value of the outputs property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link QueryVnfNotification.Outputs }

-     *     

-     */

-    public void setOutputs(QueryVnfNotification.Outputs value) {

-        this.outputs = value;

-    }

-

-

-    /**

-     * <p>Java class for anonymous complex type.

-     * 

-     * <p>The following schema fragment specifies the expected content contained within this class.

-     * 

-     * <pre>

-     * &lt;complexType>

-     *   &lt;complexContent>

-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

-     *       &lt;sequence>

-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">

-     *           &lt;complexType>

-     *             &lt;complexContent>

-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

-     *                 &lt;sequence>

-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

-     *                 &lt;/sequence>

-     *               &lt;/restriction>

-     *             &lt;/complexContent>

-     *           &lt;/complexType>

-     *         &lt;/element>

-     *       &lt;/sequence>

-     *     &lt;/restriction>

-     *   &lt;/complexContent>

-     * &lt;/complexType>

-     * </pre>

-     * 

-     * 

-     */

-    @XmlAccessorType(XmlAccessType.FIELD)

-    @XmlType(name = "", propOrder = {

-        "entry"

-    })

-    public static class Outputs {

-

-        protected List<QueryVnfNotification.Outputs.Entry> entry;

-

-        /**

-         * Gets the value of the entry property.

-         * 

-         * <p>

-         * This accessor method returns a reference to the live list,

-         * not a snapshot. Therefore any modification you make to the

-         * returned list will be present inside the JAXB object.

-         * This is why there is not a <CODE>set</CODE> method for the entry property.

-         * 

-         * <p>

-         * For example, to add a new item, do as follows:

-         * <pre>

-         *    getEntry().add(newItem);

-         * </pre>

-         * 

-         * 

-         * <p>

-         * Objects of the following type(s) are allowed in the list

-         * {@link QueryVnfNotification.Outputs.Entry }

-         * 

-         * 

-         */

-        public List<QueryVnfNotification.Outputs.Entry> getEntry() {

-            if (entry == null) {

-                entry = new ArrayList<>();

-            }

-            return this.entry;

-        }

-        

-        // Not a generated method

-        public String toString() {

-        	StringBuilder out = new StringBuilder();

-        	out.append("<outputs>\n");

-        	if (entry != null) {

-        		for (Entry e : entry) {

-        			out.append(e.toString());

-        			out.append('\n');

-        		}

-        	}

-        	out.append("</outputs>");

-        	return out.toString();

-        }

-

-

-        /**

-         * <p>Java class for anonymous complex type.

-         * 

-         * <p>The following schema fragment specifies the expected content contained within this class.

-         * 

-         * <pre>

-         * &lt;complexType>

-         *   &lt;complexContent>

-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

-         *       &lt;sequence>

-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

-         *       &lt;/sequence>

-         *     &lt;/restriction>

-         *   &lt;/complexContent>

-         * &lt;/complexType>

-         * </pre>

-         * 

-         * 

-         */

-        @XmlAccessorType(XmlAccessType.FIELD)

-        @XmlType(name = "", propOrder = {

-            "key",

-            "value"

-        })

-        public static class Entry {

-

-            protected String key;

-            protected String value;

-

-            /**

-             * Gets the value of the key property.

-             * 

-             * @return

-             *     possible object is

-             *     {@link String }

-             *     

-             */

-            public String getKey() {

-                return key;

-            }

-

-            /**

-             * Sets the value of the key property.

-             * 

-             * @param value

-             *     allowed object is

-             *     {@link String }

-             *     

-             */

-            public void setKey(String value) {

-                this.key = value;

-            }

-

-            /**

-             * Gets the value of the value property.

-             * 

-             * @return

-             *     possible object is

-             *     {@link String }

-             *     

-             */

-            public String getValue() {

-                return value;

-            }

-

-            /**

-             * Sets the value of the value property.

-             * 

-             * @param value

-             *     allowed object is

-             *     {@link String }

-             *     

-             */

-            public void setValue(String value) {

-                this.value = value;

-            }

-            

-            // Not a generated method

-            public String toString() {

-            	String entry = "";

-            		entry =

-               "<entry>"+ '\n' +

-    	       "   <key>"+key+"</key>" + '\n' +

-    	       "   <value>"+value+"</value>" + '\n' +

-    	       "</entry>";

-            	return entry; 

-            }

-

-        }

-

-    }

-    

- // Not a generated method

- 	public String toString() {

-     	String queryVnfNotification = "";

-     	if (exception==null) {

-     		queryVnfNotification = "<ns2:queryVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +

-     				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +

-     				       "   <messageId>"+messageId+"</messageId>" + '\n' +

-     				       "   <completed>"+completed+"</completed>" + '\n' +

-     				       "   <vnfExists>"+vnfExists+"</vnfExists>" + '\n' +

-     				       "   <vnfId>"+vnfId+"</vnfId>" + '\n' +

-     				       "   <status>"+status+"</status>" + '\n' +

-     				       (outputs == null ? "" : outputs.toString() + '\n') +     				      

-     				       "</ns2:queryVnfNotification>";

-     	} else {

-     		queryVnfNotification = "<ns2:queryVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +

- 				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +

- 				       "   <messageId>"+messageId+"</messageId>" + '\n' +

- 				       "   <completed>"+completed+"</completed>" + '\n' +

-     				       (outputs == null ? "" : outputs.toString() + '\n') +

-     				   "   <exception>"+exception+"</exception>" + '\n' +

-     				   "   <errorMessage>"+errorMessage+"</errorMessage>" + '\n' +

- 				       "</ns2:queryVnfNotification>";

-     	}

-     	return queryVnfNotification;

-    	}    

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/RollbackVnfNotification.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/RollbackVnfNotification.java
deleted file mode 100644
index 0cf088d023..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/RollbackVnfNotification.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for rollbackVnfNotification complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="rollbackVnfNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.openecomp.mso/vnfNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "rollbackVnfNotification1", propOrder = {
-    "messageId",
-    "completed",
-    "exception",
-    "errorMessage"
-})
-public class RollbackVnfNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MsoExceptionCategory }
-     *     
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MsoExceptionCategory }
-     *     
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-    
-    public String toString() {
-    	String rollbackVnfNotification = "";
-    	if (exception==null) {
-    		rollbackVnfNotification = "<ns2:rollbackVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-    				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-    				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-    				       "   <completed>"+completed+"</completed>" + '\n' +
-    				       "</ns2:rollbackVnfNotification>";
-    	} else {
-    		rollbackVnfNotification = "<ns2:rollbackVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-				       "   <completed>"+completed+"</completed>" + '\n' +
-    				   "   <exception>"+exception+"</exception>" + '\n' +
-    				   "   <errorMessage>"+errorMessage+"</errorMessage>" + '\n' +
-				       "</ns2:rollbackVnfNotification>";
-    	}
-    	return rollbackVnfNotification;
-
-    }
-    
- }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotification.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotification.java
deleted file mode 100644
index 79188e77b6..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotification.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for updateVnfNotification complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="updateVnfNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.openecomp.mso/vnfNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="outputs" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="rollback" type="{http://org.openecomp.mso/vnfNotify}vnfRollback" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "updateVnfNotification1", propOrder = {
-    "messageId",
-    "completed",
-    "exception",
-    "errorMessage",
-    "outputs",
-    "rollback"
-})
-public class UpdateVnfNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected UpdateVnfNotification.Outputs outputs;
-    protected VnfRollback rollback;
-
-    /**
-     * Gets the value of the messageId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     *
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     *
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     *
-     * @return
-     *     possible object is
-     *     {@link MsoExceptionCategory }
-     *
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link MsoExceptionCategory }
-     *
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the outputs property.
-     *
-     * @return
-     *     possible object is
-     *     {@link UpdateVnfNotification.Outputs }
-     *
-     */
-    public UpdateVnfNotification.Outputs getOutputs() {
-        return outputs;
-    }
-
-    /**
-     * Sets the value of the outputs property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link UpdateVnfNotification.Outputs }
-     *
-     */
-    public void setOutputs(UpdateVnfNotification.Outputs value) {
-        this.outputs = value;
-    }
-
-    /**
-     * Gets the value of the rollback property.
-     *
-     * @return
-     *     possible object is
-     *     {@link VnfRollback }
-     *
-     */
-    public VnfRollback getRollback() {
-        return rollback;
-    }
-
-    /**
-     * Sets the value of the rollback property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link VnfRollback }
-     *
-     */
-    public void setRollback(VnfRollback value) {
-        this.rollback = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     *
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     *
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     *
-     *
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "entry"
-    })
-    public static class Outputs {
-
-        protected List<UpdateVnfNotification.Outputs.Entry> entry;
-
-        /**
-         * Gets the value of the entry property.
-         *
-         * <p>
-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a <CODE>set</CODE> method for the entry property.
-         *
-         * <p>
-         * For example, to add a new item, do as follows:
-         * <pre>
-         *    getEntry().add(newItem);
-         * </pre>
-         *
-         *
-         * <p>
-         * Objects of the following type(s) are allowed in the list
-         * {@link UpdateVnfNotification.Outputs.Entry }
-         *
-         *
-         */
-        public List<UpdateVnfNotification.Outputs.Entry> getEntry() {
-            if (entry == null) {
-                entry = new ArrayList<>();
-            }
-            return this.entry;
-        }
-
-
-        /**
-         * <p>Java class for anonymous complex type.
-         *
-         * <p>The following schema fragment specifies the expected content contained within this class.
-         *
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         *
-         *
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "key",
-            "value"
-        })
-        public static class Entry {
-
-            protected String key;
-            protected String value;
-
-            /**
-             * Gets the value of the key property.
-             *
-             * @return
-             *     possible object is
-             *     {@link String }
-             *
-             */
-            public String getKey() {
-                return key;
-            }
-
-            /**
-             * Sets the value of the key property.
-             *
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *
-             */
-            public void setKey(String value) {
-                this.key = value;
-            }
-
-            /**
-             * Gets the value of the value property.
-             *
-             * @return
-             *     possible object is
-             *     {@link String }
-             *
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             *
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            public String toString() {
-            	String entry = "";
-            		entry =
-    	       "   <key>"+key+"</key>" + '\n' +
-    	       "   <value>"+value+"</value>";
-            	return entry;
-            }
-        }
-
-    }
-
-    public String toString(){
-    	String updateVnfNotification = "";
-    	if (exception==null) {
-    		updateVnfNotification = "<ns2:updateVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-    				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-    				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-    				       "   <completed>"+completed+"</completed>" + '\n' +
-    				       "   <rollback>"+rollback+"</rollback>" + '\n' +
-    				       "</ns2:updateVnfNotification>";
-    	} else {
-    		updateVnfNotification = "<ns2:updateVnfNotification xmlns:ns2=\"http://org.openecomp.mso/vnfNotify\"" + '\n' +
-				       "  xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + '\n' +
-				       "   <messageId>"+messageId+"</messageId>" + '\n' +
-				       "   <completed>"+completed+"</completed>" + '\n' +
-    				   "   <exception>"+exception+"</exception>" + '\n' +
-    				   "   <errorMessage>"+errorMessage+"</errorMessage>" + '\n' +
-				       "</ns2:updateVnfNotification>";
-    	}
-
-    	return updateVnfNotification;
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify.java
deleted file mode 100644
index d192bb34a9..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.RequestWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebService(name = "vnfAdapterNotify", targetNamespace = "http://org.openecomp.mso/vnfNotify")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface VnfAdapterNotify {
-
-
-    /**
-     * 
-     * @param errorMessage
-     * @param exception
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod
-    @Oneway
-    @RequestWrapper(localName = "rollbackVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.RollbackVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/rollbackVnfNotificationRequest")
-    public void rollbackVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage);
-
-    /**
-     * 
-     * @param errorMessage
-     * @param vnfExists
-     * @param status
-     * @param exception
-     * @param outputs
-     * @param messageId
-     * @param vnfId
-     * @param completed
-     */
-    @WebMethod
-    @Oneway
-    @RequestWrapper(localName = "queryVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.QueryVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/queryVnfNotificationRequest")
-    public void queryVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage,
-        @WebParam(name = "vnfExists", targetNamespace = "")
-        Boolean vnfExists,
-        @WebParam(name = "vnfId", targetNamespace = "")
-        String vnfId,
-        @WebParam(name = "status", targetNamespace = "")
-        VnfStatus status,
-        @WebParam(name = "outputs", targetNamespace = "")
-        org.openecomp.mso.bpmn.common.adapter.vnf.QueryVnfNotification.Outputs outputs);
-
-    /**
-     * 
-     * @param errorMessage
-     * @param exception
-     * @param rollback
-     * @param outputs
-     * @param messageId
-     * @param vnfId
-     * @param completed
-     */
-    @WebMethod
-    @Oneway
-    @RequestWrapper(localName = "createVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.CreateVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/createVnfNotificationRequest")
-    public void createVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage,
-        @WebParam(name = "vnfId", targetNamespace = "")
-        String vnfId,
-        @WebParam(name = "outputs", targetNamespace = "")
-        org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs outputs,
-        @WebParam(name = "rollback", targetNamespace = "")
-        VnfRollback rollback);
-
-    /**
-     * 
-     * @param errorMessage
-     * @param exception
-     * @param rollback
-     * @param outputs
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod
-    @Oneway
-    @RequestWrapper(localName = "updateVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.UpdateVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/updateVnfNotificationRequest")
-    public void updateVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage,
-        @WebParam(name = "outputs", targetNamespace = "")
-        org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs outputs,
-        @WebParam(name = "rollback", targetNamespace = "")
-        VnfRollback rollback);
-
-    /**
-     * 
-     * @param errorMessage
-     * @param exception
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod
-    @Oneway
-    @RequestWrapper(localName = "deleteVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.DeleteVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/deleteVnfNotificationRequest")
-    public void deleteVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage);
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify_Service.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify_Service.java
deleted file mode 100644
index 38385fbe9c..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfAdapterNotify_Service.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebServiceClient(name = "vnfAdapterNotify", targetNamespace = "http://org.openecomp.mso/vnfNotify", wsdlLocation = "/VnfAdapterNotify.wsdl")
-public class VnfAdapterNotify_Service extends Service
-{
-
-    private final static URL VNFADAPTERNOTIFY_WSDL_LOCATION;
-    private final static WebServiceException VNFADAPTERNOTIFY_EXCEPTION;
-    private final static QName VNFADAPTERNOTIFY_QNAME = new QName("http://org.openecomp.mso/vnfNotify", "vnfAdapterNotify");
-
-    static {
-        VNFADAPTERNOTIFY_WSDL_LOCATION = org.openecomp.mso.bpmn.common.adapter.vnf.VnfAdapterNotify_Service.class.getResource("/VnfAdapterNotify.wsdl");
-        WebServiceException e = null;
-        if (VNFADAPTERNOTIFY_WSDL_LOCATION == null) {
-            e = new WebServiceException("Cannot find '/VnfAdapterNotify.wsdl' wsdl. Place the resource correctly in the classpath.");
-        }
-        VNFADAPTERNOTIFY_EXCEPTION = e;
-    }
-
-    public VnfAdapterNotify_Service() {
-        super(__getWsdlLocation(), VNFADAPTERNOTIFY_QNAME);
-    }
-
-    public VnfAdapterNotify_Service(WebServiceFeature... features) {
-        super(__getWsdlLocation(), VNFADAPTERNOTIFY_QNAME, features);
-    }
-
-    public VnfAdapterNotify_Service(URL wsdlLocation) {
-        super(wsdlLocation, VNFADAPTERNOTIFY_QNAME);
-    }
-
-    public VnfAdapterNotify_Service(URL wsdlLocation, WebServiceFeature... features) {
-        super(wsdlLocation, VNFADAPTERNOTIFY_QNAME, features);
-    }
-
-    public VnfAdapterNotify_Service(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public VnfAdapterNotify_Service(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-        super(wsdlLocation, serviceName, features);
-    }
-
-    /**
-     * 
-     * @return
-     *     returns VnfAdapterNotify
-     */
-    @WebEndpoint(name = "MsoVnfAdapterAsyncImplPort")
-    public VnfAdapterNotify getMsoVnfAdapterAsyncImplPort() {
-        return super.getPort(new QName("http://org.openecomp.mso/vnfNotify", "MsoVnfAdapterAsyncImplPort"), VnfAdapterNotify.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns VnfAdapterNotify
-     */
-    @WebEndpoint(name = "MsoVnfAdapterAsyncImplPort")
-    public VnfAdapterNotify getMsoVnfAdapterAsyncImplPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://org.openecomp.mso/vnfNotify", "MsoVnfAdapterAsyncImplPort"), VnfAdapterNotify.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (VNFADAPTERNOTIFY_EXCEPTION!= null) {
-            throw VNFADAPTERNOTIFY_EXCEPTION;
-        }
-        return VNFADAPTERNOTIFY_WSDL_LOCATION;
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java
deleted file mode 100644
index a546b82325..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common.adapter.vnf;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for vnfRollback complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="vnfRollback">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="cloudSiteId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="msoRequest" type="{http://org.openecomp.mso/vnfNotify}msoRequest" minOccurs="0"/>
- *         &lt;element name="tenantCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="tenantId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="vnfCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="vnfId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "vnfRollback", propOrder = {
-    "cloudSiteId",
-    "msoRequest",
-    "tenantCreated",
-    "tenantId",
-    "vnfCreated",
-    "vnfId"
-})
-public class VnfRollback {
-
-    protected String cloudSiteId;
-    protected MsoRequest msoRequest;
-    protected boolean tenantCreated;
-    protected String tenantId;
-    protected boolean vnfCreated;
-    protected String vnfId;
-
-    /**
-     * Gets the value of the cloudSiteId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCloudSiteId() {
-        return cloudSiteId;
-    }
-
-    /**
-     * Sets the value of the cloudSiteId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCloudSiteId(String value) {
-        this.cloudSiteId = value;
-    }
-
-    /**
-     * Gets the value of the msoRequest property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MsoRequest }
-     *     
-     */
-    public MsoRequest getMsoRequest() {
-        return msoRequest;
-    }
-
-    /**
-     * Sets the value of the msoRequest property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MsoRequest }
-     *     
-     */
-    public void setMsoRequest(MsoRequest value) {
-        this.msoRequest = value;
-    }
-
-    /**
-     * Gets the value of the tenantCreated property.
-     * 
-     */
-    public boolean isTenantCreated() {
-        return tenantCreated;
-    }
-
-    /**
-     * Sets the value of the tenantCreated property.
-     * 
-     */
-    public void setTenantCreated(boolean value) {
-        this.tenantCreated = value;
-    }
-
-    /**
-     * Gets the value of the tenantId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    /**
-     * Sets the value of the tenantId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTenantId(String value) {
-        this.tenantId = value;
-    }
-
-    /**
-     * Gets the value of the vnfCreated property.
-     * 
-     */
-    public boolean isVnfCreated() {
-        return vnfCreated;
-    }
-
-    /**
-     * Sets the value of the vnfCreated property.
-     * 
-     */
-    public void setVnfCreated(boolean value) {
-        this.vnfCreated = value;
-    }
-
-    /**
-     * Gets the value of the vnfId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    /**
-     * Sets the value of the vnfId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVnfId(String value) {
-        this.vnfId = value;
-    }
-    
-    public String toString() {
-    	String msoRequestElement = msoRequest == null ? ""
-        		: "<msoRequest>"+msoRequest+"</msoRequest>" + '\n';
-
-        	return
-        		"<cloudSiteId>"+cloudSiteId+"</cloudSiteId>" + '\n' +
-        		msoRequestElement +
-        		"<tenantCreated>"+tenantCreated+"</tenantCreated>" + '\n' +
-        		"<tenantId>"+tenantId+"</tenantId>" + '\n' +
-        		"<vnfCreated>"+vnfCreated+"</vnfCreated>" + '\n' +
-        		"<vnfId>"+vnfId+"</vnfId>";
-    }
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfStatus.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfStatus.java
deleted file mode 100644
index aef85470a7..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfStatus.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.vnf;

-

-import javax.xml.bind.annotation.XmlEnum;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for vnfStatus.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * <p>

- * <pre>

- * &lt;simpleType name="vnfStatus">

- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">

- *     &lt;enumeration value="ACTIVE"/>

- *     &lt;enumeration value="FAILED"/>

- *     &lt;enumeration value="NOTFOUND"/>

- *     &lt;enumeration value="UNKNOWN"/>

- *   &lt;/restriction>

- * &lt;/simpleType>

- * </pre>

- * 

- */

-@XmlType(name = "vnfStatus")

-@XmlEnum

-public enum VnfStatus {

-

-    ACTIVE,

-    FAILED,

-    NOTFOUND,

-    UNKNOWN;

-

-    public String value() {

-        return name();

-    }

-

-    public static VnfStatus fromValue(String v) {

-        return valueOf(v);

-    }

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java
deleted file mode 100644
index 846b87aba8..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.util;

-

-

-import java.security.GeneralSecurityException;

-import java.security.NoSuchAlgorithmException;

-

-import javax.crypto.Cipher;

-import javax.crypto.spec.SecretKeySpec;

-

-//Need to add BPM error handler

-

-/**

- * CryptoUtils adapted from RTTP client.

- *

- */

-public class CryptoUtils {

-

-    public static final String AES = "AES";

-

-    /**

-     * encrypt a value and generate a keyfile

-     * if the keyfile is not found then a new one is created

-     * @throws GeneralSecurityException

-     * */

-    public static String encrypt(String value, String keyString) throws GeneralSecurityException

-    {

-        SecretKeySpec sks = getSecretKeySpec(keyString);

-        Cipher cipher = Cipher.getInstance(CryptoUtils.AES);

-        cipher.init(Cipher.ENCRYPT_MODE, sks, cipher.getParameters());

-        byte[] encrypted = cipher.doFinal(value.getBytes());

-        return byteArrayToHexString(encrypted);

-    }

-

-    /**

-     * decrypt a value

-     * @throws GeneralSecurityException

-     */

-    public static String decrypt(String message, String keyString) throws GeneralSecurityException

-    {

-        SecretKeySpec sks = getSecretKeySpec(keyString);

-        Cipher cipher = Cipher.getInstance(CryptoUtils.AES);

-        cipher.init(Cipher.DECRYPT_MODE, sks);

-        byte[] decrypted = cipher.doFinal(hexStringToByteArray(message));

-        return new String(decrypted);

-    }

-

-    private static SecretKeySpec getSecretKeySpec(String keyString) throws NoSuchAlgorithmException

-    {

-        byte [] key = hexStringToByteArray(keyString);

-        SecretKeySpec sks = new SecretKeySpec(key, CryptoUtils.AES);

-        return sks;

-    }

-

-

-    private static String byteArrayToHexString(byte[] b){

-        StringBuilder sb = new StringBuilder(b.length * 2);

-        for (byte aB : b) {

-            int v = aB & 0xff;

-            if (v < 16) {

-                sb.append('0');

-            }

-            sb.append(Integer.toHexString(v));

-        }

-        return sb.toString().toUpperCase();

-    }

-

-    private static byte[] hexStringToByteArray(String s) {

-        byte[] b = new byte[s.length() / 2];

-        for (int i = 0; i < b.length; i++){

-            int index = i * 2;

-            int v = Integer.parseInt(s.substring(index, index + 2), 16);

-            b[i] = (byte)v;

-        }

-        return b;

-    }

-

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
deleted file mode 100644
index f61c692775..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.camunda.bpm.BpmPlatform;

-import org.camunda.bpm.engine.MismatchingMessageCorrelationException;

-import org.camunda.bpm.engine.OptimisticLockingException;

-import org.camunda.bpm.engine.RuntimeService;

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

-import org.camunda.bpm.engine.runtime.MessageCorrelationResult;

-import org.openecomp.mso.bpmn.core.PropertyConfiguration;

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-

-/**

- * Abstract base class for callback services.

- */

-public abstract class AbstractCallbackService extends ProcessEngineAwareService {

-	public static final long DEFAULT_TIMEOUT_SECONDS = 60;

-	public static final long FAST_POLL_DUR_SECONDS = 5;

-	public static final long FAST_POLL_INT_MS = 100;

-	public static final long SLOW_POLL_INT_MS = 1000;

-	

-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-

-	/**

-	 * Parameterized callback handler.

-	 */

-	protected CallbackResult handleCallback(String method, Object message,

-			String messageEventName, String messageVariable,

-			String correlationVariable, String correlationValue,

-			String logMarker) {

-

-		return handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker, null);

-	}

-

-	/**

-	 * Parameterized callback handler.

-	 */

-	protected CallbackResult handleCallback(String method, Object message,

-			String messageEventName, String messageVariable,

-			String correlationVariable, String correlationValue,

-			String logMarker, Map<String, Object> injectedVariables) {

-

-		long startTime = System.currentTimeMillis();

-

-		LOGGER.debug(logMarker + " " + method + " received message: "

-			+ (message == null ? "" : System.lineSeparator()) + message);

-

-		try {

-			Map<String, Object> variables = new HashMap<>();

-

-			if (injectedVariables != null) {

-				variables.putAll(injectedVariables);

-			}

-

-			variables.put(correlationVariable, correlationValue);

-			variables.put(messageVariable, message == null ? null : message.toString());

-

-			boolean ok = correlate(messageEventName, correlationVariable,

-				correlationValue, variables, logMarker);

-

-			if (!ok) {

-				String msg = "No process is waiting for " + messageEventName

-					+ " with " + correlationVariable + " = '" + correlationValue + "'";

-				logCallbackError(method, startTime, msg);

-				return new CallbackError(msg);

-			}

-

-			logCallbackSuccess(method, startTime);

-			return new CallbackSuccess();

-		} catch (Exception e) {

-			LOGGER.debug("Exception :",e);

-			String msg = "Caught " + e.getClass().getSimpleName()

-				+ " processing " + messageEventName + " with " + correlationVariable

-				+ " = '" + correlationValue + "'";

-			logCallbackError(method, startTime, msg);

-			return new CallbackError(msg);

-		}

-	}

-	

-	/**

-	 * Performs message correlation.  Waits a limited amount of time for

-	 * a process to become ready for correlation.  The return value indicates

-	 * whether or not a process was found to receive the message.  Due to the

-	 * synchronous nature of message injection in Camunda, by the time this

-	 * method returns, one of 3 things will have happened: (1) the process

-	 * received the message and ended, (2) the process received the message

-	 * and reached an activity that suspended, or (3) an exception occurred

-	 * during correlation or while the process was executing.  Correlation

-	 * exceptions are handled differently from process execution exceptions.

-	 * Correlation exceptions are thrown so the client knows something went

-	 * wrong with the delivery of the message.  Process execution exceptions

-	 * are logged but not thrown.

-	 * @param messageEventName the message event name

-	 * @param correlationVariable the process variable used as the correlator

-	 * @param correlationValue the correlation value

-	 * @param variables variables to inject into the process

-	 * @param logMarker a marker for debug logging

-	 * @return true if a process could be found, false if not

-	 * @throws Exception for correlation errors

-	 */

-	protected boolean correlate(String messageEventName, String correlationVariable,

-			String correlationValue, Map<String, Object> variables, String logMarker)

-			throws Exception {

-	try{

-		LOGGER.debug(logMarker + " Attempting to find process waiting"

-			+ " for " + messageEventName + " with " + correlationVariable

-			+ " = '" + correlationValue + "'");

-

-		RuntimeService runtimeService =

-			getProcessEngineServices().getRuntimeService();

-

-		Map<String, String> properties =

-			PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");

-

-		long timeout = DEFAULT_TIMEOUT_SECONDS;

-

-		// The code is here in case we ever need to change the default.

-		String s = properties.get("mso.correlation.timeout");

-		if (s != null) {

-			try {

-				timeout = Long.parseLong(s);

-			} catch (NumberFormatException e) {

-				// Ignore

-			}

-		}

-

-		long now = System.currentTimeMillis();

-		long fastPollEndTime = now + (FAST_POLL_DUR_SECONDS * 1000);

-		long endTime = now + (timeout * 1000);

-		long sleep = FAST_POLL_INT_MS;

-

-		List<Execution> waitingProcesses = null;

-		Exception queryException = null;

-		int queryCount = 0;

-		int queryFailCount = 0;

-

-		while (true) {

-			try {

-				++queryCount;

-				waitingProcesses = runtimeService.createExecutionQuery()

-					.messageEventSubscriptionName(messageEventName)

-					.processVariableValueEquals(correlationVariable, correlationValue)

-					.list();

-			} catch (Exception e) {

-				++queryFailCount;

-				queryException = e;

-			}

-

-			if (waitingProcesses != null && waitingProcesses.size() > 0) {

-				break;

-			}

-

-			if (now > endTime - sleep) {

-				break;

-			}

-

-			Thread.sleep(sleep);

-			now = System.currentTimeMillis();

-

-			if (now > fastPollEndTime) {

-				sleep = SLOW_POLL_INT_MS;

-			}

-		}

-

-		if (waitingProcesses == null) {

-			waitingProcesses = new ArrayList<Execution>(0);

-		}

-

-		int count = waitingProcesses.size();

-

-		List<ExecInfo> execInfoList = new ArrayList<>(count);

-		for (Execution execution : waitingProcesses) {

-			execInfoList.add(new ExecInfo(execution));

-		}

-

-		LOGGER.debug(logMarker + " Found " + count + " process(es) waiting"

-			+ " for " + messageEventName + " with " + correlationVariable

-			+ " = '" + correlationValue + "': " + execInfoList);

-

-		if (count == 0) {

-			if (queryFailCount > 0) {

-				String msg = queryFailCount + "/" + queryCount

-					+ " execution queries failed attempting to correlate "

-					+ messageEventName + " with " + correlationVariable

-					+ " = '" + correlationValue + "'; last exception was:"

-					+ queryException;

-				LOGGER.debug(msg);

-				LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-					MsoLogger.ErrorCode.UnknownError, msg, queryException);

-			}

-

-			return false;

-		}

-

-		if (count > 1) {

-			// Only one process should be waiting. Throw an exception back to the client.

-			throw new MismatchingMessageCorrelationException(messageEventName,

-				"more than 1 process is waiting with " + correlationVariable

-				+ " = '" + correlationValue + "'");

-		}

-		

-		// We prototyped an asynchronous solution, i.e. resuming the process

-		// flow in a separate thread, but this affected too many existing tests,

-		// and we went back to the synchronous solution. The synchronous solution

-		// has some troublesome characteristics though.  For example, the

-		// resumed flow may send request #2 to a remote system before MSO has

-		// acknowledged the notification associated with request #1.  

-

-		try {

-			LOGGER.debug(logMarker + " Running " + execInfoList.get(0) + " to receive "

-				+ messageEventName + " with " + correlationVariable + " = '"

-				+ correlationValue + "'");

-

-			@SuppressWarnings("unused")

-			MessageCorrelationResult result = runtimeService

-				.createMessageCorrelation(messageEventName)

-				.setVariables(variables)

-				.processInstanceVariableEquals(correlationVariable, correlationValue)

-				.correlateWithResult();

-			

-		} catch (MismatchingMessageCorrelationException e) {

-			// A correlation exception occurred even after we identified

-			// one waiting process.  Throw it back to the client.

-			throw e;

-		} catch (OptimisticLockingException ole) {

-			

-			String msg = "Caught " + ole.getClass().getSimpleName() + " after receiving " + messageEventName

-				+ " with " + correlationVariable + " = '" + correlationValue

-				+ "': " + ole;

-			LOGGER.debug(msg);

-			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN CORRELATION ERROR -", MsoLogger.getServiceName(),

-				MsoLogger.ErrorCode.UnknownError, msg, ole);

-			

-			//Retry for OptimisticLocking Exceptions

-			int retryCount = 0;

-			String retryStr = properties.get("mso.bpmn.optimisticlockingexception.retrycount");

-			if (retryStr != null) {

-				try {

-					retryCount = Integer.parseInt(retryStr);

-				} catch (NumberFormatException e) {

-					// Ignore

-				}

-			}

-			

-			LOGGER.debug("Retry correlate for OptimisticLockingException, retryCount:" + retryCount);

-			

-			for (; retryCount >0 ; retryCount--) {

-				

-				try{

-					Thread.sleep(SLOW_POLL_INT_MS);

-					

-					@SuppressWarnings("unused")

-					MessageCorrelationResult result = runtimeService

-						.createMessageCorrelation(messageEventName)

-						.setVariables(variables)

-						.processInstanceVariableEquals(correlationVariable, correlationValue)

-						.correlateWithResult();

-					retryCount = 0;

-					LOGGER.debug("OptimisticLockingException retry was successful, seting retryCount: " + retryCount);

-				} catch (OptimisticLockingException olex) {

-					//oleFlag = ex instanceof org.camunda.bpm.engine.OptimisticLockingException;

-					String strMsg = "Received exception, OptimisticLockingException retry failed, retryCount:" + retryCount + " | exception returned: " + olex;

-					LOGGER.debug(strMsg);

-					LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-						MsoLogger.ErrorCode.UnknownError, strMsg, olex);

-				} catch (Exception excep) {

-					retryCount = 0;

-					//oleFlag = ex instanceof org.camunda.bpm.engine.OptimisticLockingException;

-					String strMsg = "Received exception, OptimisticLockingException retry failed, retryCount:" + retryCount + " | exception returned: " + excep;

-					LOGGER.debug(strMsg);

-					LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-						MsoLogger.ErrorCode.UnknownError, strMsg, excep);

-				}

-		

-			}

-			

-		}catch (Exception e) {

-			// This must be an exception from the flow itself.  Log it, but don't

-			// report it back to the client.

-			String msg = "Caught " + e.getClass().getSimpleName() + " running "

-				+ execInfoList.get(0) + " after receiving " + messageEventName

-				+ " with " + correlationVariable + " = '" + correlationValue

-				+ "': " + e;

-			LOGGER.debug(msg);

-			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-				MsoLogger.ErrorCode.UnknownError, msg, e);

-		}

-	}  catch (Exception e) {

-		// This must be an exception from the flow itself.  Log it, but don't

-		// report it back to the client.

-		String msg = "Caught " + e.getClass().getSimpleName() + " after receiving " + messageEventName

-			+ " with " + correlationVariable + " = '" + correlationValue

-			+ "': " + e;

-		LOGGER.debug(msg);

-		LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN CORRELATION ERROR -", MsoLogger.getServiceName(),

-			MsoLogger.ErrorCode.UnknownError, msg, e);

-	}	

-

-		return true;

-	}

-	

-	/**

-	 * Records audit and metric events in the log for a callback success.

-	 * @param method the method name

-	 * @param startTime the request start time

-	 */

-	protected void logCallbackSuccess(String method, long startTime) {

-		LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE,

-			MsoLogger.ResponseCode.Suc, "Completed " + method);

-

-		LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE,

-			MsoLogger.ResponseCode.Suc, "Completed " + method,

-			"BPMN", MsoLogger.getServiceName(), null);

-	}

-

-	/**

-	 * Records error, audit and metric events in the log for a callback

-	 * internal error.

-	 * @param method the method name

-	 * @param startTime the request start time

-	 * @param msg the error message

-	 */

-	protected void logCallbackError(String method, long startTime, String msg) {

-		logCallbackError(method, startTime, msg, null);

-	}

-

-	/**

-	 * Records error, audit and metric events in the log for a callback

-	 * internal error.

-	 * @param method the method name

-	 * @param startTime the request start time

-	 * @param msg the error message

-	 * @param e the exception

-	 */

-	protected void logCallbackError(String method, long startTime, String msg, Exception e) {

-		if (e == null) {

-			LOGGER.error(MessageEnum.BPMN_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-				MsoLogger.ErrorCode.UnknownError, msg);

-		} else {

-			LOGGER.error(MessageEnum.BPMN_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-				MsoLogger.ErrorCode.UnknownError, msg, e);

-		}

-

-		LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE,

-			MsoLogger.ResponseCode.InternalError, "Completed " + method);

-

-		LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE,

-			MsoLogger.ResponseCode.InternalError, "Completed " + method,

-			"BPMN", MsoLogger.getServiceName(), null);

-	}

-	

-	/**

-	 * Abstract callback result object.

-	 */

-	protected abstract class CallbackResult {

-	}

-

-	/**

-	 * Indicates that callback handling was successful.

-	 */

-	protected class CallbackSuccess extends CallbackResult {

-	}

-

-	/**

-	 * Indicates that callback handling failed.

-	 */

-	protected class CallbackError extends CallbackResult {

-		private final String errorMessage;

-

-		public CallbackError(String errorMessage) {

-			this.errorMessage = errorMessage;

-		}

-

-		/**

-		 * Gets the error message.

-		 */

-		public String getErrorMessage() {

-			return errorMessage;

-		}

-	}

-

-	private static class ExecInfo {

-		private final Execution execution;

-

-		public ExecInfo(Execution execution) {

-			this.execution = execution;

-		}

-	

-		@Override

-		public String toString() {

-			return "Process[" + execution.getProcessInstanceId()

-				+ ":" + execution.getId() + "]";

-		}

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java
deleted file mode 100644
index dbb6674a64..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.common.workflow.service;
-
-import java.util.Optional;
-
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
-
-/**
- * Base class for services that must be process-engine aware. The only
- * process engine currently supported is the "default" process engine.
- */
-public class ProcessEngineAwareService {
-	
-	private final String processEngineName = "default";
-	private volatile Optional<ProcessEngineServices> pes4junit = Optional.empty();
-	
-	/**
-	 * Gets the process engine name.
-	 * @return the process engine name
-	 */
-	public String getProcessEngineName() {
-		return processEngineName;
-	}
-
-	/**
-	 * Gets process engine services.
-	 * @return process engine services
-	 */
-	public ProcessEngineServices getProcessEngineServices() {
-		return pes4junit.orElse(ProcessEngines.getProcessEngine(
-				getProcessEngineName()));
-	}
-
-	/**
-	 * Allows a particular process engine to be specified, overriding the
-	 * usual process engine lookup by name.  Intended primarily for the
-	 * unit test environment.
-	 * @param pes process engine services
-	 */
-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
-		pes4junit = Optional.ofNullable(pes);
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
deleted file mode 100644
index c5f0d02dff..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import javax.jws.WebMethod;

-import javax.jws.WebParam;

-import javax.jws.WebResult;

-import javax.jws.WebService;

-import javax.ws.rs.core.Context;

-import javax.xml.ws.WebServiceContext;

-

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCCallbackAdapterPortType;

-import org.openecomp.mso.logger.MsoLogger;

-

-/**

- * Implementation of SDNCAdapterCallbackService.

- */

-@WebService(serviceName="SDNCAdapterCallbackService", targetNamespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")

-public class SDNCAdapterCallbackServiceImpl extends AbstractCallbackService implements SDNCCallbackAdapterPortType {

-

-	private final String logMarker = "[SDNC-CALLBACK]";

-

-	@Context WebServiceContext wsContext;

-

-	@WebMethod(operationName = "SDNCAdapterCallback")

-    @WebResult(name = "SDNCAdapterResponse", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackResponse")

-    public SDNCAdapterResponse sdncAdapterCallback(

-            @WebParam(name = "SDNCAdapterCallbackRequest", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackRequest")

-            SDNCAdapterCallbackRequest sdncAdapterCallbackRequest) {

-

-		String method = "sdncAdapterCallback";

-		Object message = sdncAdapterCallbackRequest;

-		String messageEventName = "sdncAdapterCallbackRequest";

-		String messageVariable = "sdncAdapterCallbackRequest";

-		String correlationVariable = "SDNCA_requestId";

-		String correlationValue = sdncAdapterCallbackRequest.getCallbackHeader().getRequestId();

-

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlationValue, "N/A");

-

-		CallbackResult result = handleCallback(method, message, messageEventName,

-			messageVariable, correlationVariable, correlationValue, logMarker);

-

-		if (result instanceof CallbackError) {

-			return new SDNCAdapterErrorResponse(((CallbackError)result).getErrorMessage());

-		} else {

-			return new SDNCAdapterResponse();

-		}

-	}

-

-	// This subclass allows unit tests to extract the error

-	public class SDNCAdapterErrorResponse extends SDNCAdapterResponse {

-		private String error;

-

-		public SDNCAdapterErrorResponse(String error) {

-			this.error = error;

-		}

-

-		public String getError() {

-			return error;

-		}

-	}

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java
deleted file mode 100644
index 621e35e57d..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import javax.jws.Oneway;

-import javax.jws.WebMethod;

-import javax.jws.WebParam;

-import javax.jws.WebService;

-import javax.ws.rs.core.Context;

-import javax.xml.ws.Action;

-import javax.xml.ws.RequestWrapper;

-import javax.xml.ws.WebServiceContext;

-

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.DeleteVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.MsoExceptionCategory;

-import org.openecomp.mso.bpmn.common.adapter.vnf.QueryVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.RollbackVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfAdapterNotify;

-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;

-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfStatus;

-import org.openecomp.mso.logger.MsoLogger;

-

-/**

- * Implementation of the VnfAdapterNotify service.

- */

-@WebService(serviceName = "vnfAdapterNotify", targetNamespace = "http://org.openecomp.mso/vnfNotify")

-public class VnfAdapterNotifyServiceImpl extends AbstractCallbackService implements VnfAdapterNotify{

-

-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
-
-	private final String logMarker = "[VNF-NOTIFY]";

-

-	@Context WebServiceContext wsContext;

-

-    @WebMethod(operationName = "rollbackVnfNotification")

-    @Oneway

-    @RequestWrapper(localName = "rollbackVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.RollbackVnfNotification")

-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/rollbackVnfNotificationRequest")
-    public void rollbackVnfNotification(

-        @WebParam(name = "messageId", targetNamespace = "")

-        String messageId,

-        @WebParam(name = "completed", targetNamespace = "")

-        boolean completed,

-        @WebParam(name = "exception", targetNamespace = "")

-        MsoExceptionCategory exception,

-        @WebParam(name = "errorMessage", targetNamespace = "")

-        String errorMessage) {

-

-		RollbackVnfNotification rollbackVnfNotification = new RollbackVnfNotification();

-

-		rollbackVnfNotification.setMessageId(messageId);

-		rollbackVnfNotification.setCompleted(completed);

-		rollbackVnfNotification.setException(exception);

-		rollbackVnfNotification.setErrorMessage(errorMessage);

-

-		String method = "rollbackVnfNotification";

-		Object message = rollbackVnfNotification;

-		String messageEventName = "rollbackVnfNotificationCallback";

-		String messageVariable = "rollbackVnfNotificationCallback";

-		String correlationVariable = "VNFRB_messageId";

-		String correlationValue = messageId;

-

-		handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker);

-    }

-

-    @WebMethod(operationName = "queryVnfNotification")

-    @Oneway

-    @RequestWrapper(localName = "queryVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.QueryVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/queryVnfNotificationRequest")
-    public void queryVnfNotification(

-        @WebParam(name = "messageId", targetNamespace = "")

-        String messageId,

-        @WebParam(name = "completed", targetNamespace = "")

-        boolean completed,

-        @WebParam(name = "exception", targetNamespace = "")

-        MsoExceptionCategory exception,

-        @WebParam(name = "errorMessage", targetNamespace = "")

-        String errorMessage,

-        @WebParam(name = "vnfExists", targetNamespace = "")

-        Boolean vnfExists,

-        @WebParam(name = "vnfId", targetNamespace = "")

-        String vnfId,

-        @WebParam(name = "status", targetNamespace = "")

-        VnfStatus status,

-        @WebParam(name = "outputs", targetNamespace = "")

-        QueryVnfNotification.Outputs outputs){

-

-		String method = "queryVnfNotification";

-		String messageEventName = "queryVnfNotificationCallback";

-		String messageVariable = "queryVnfNotificationCallback";

-		String correlationVariable = "VNFQ_messageId";

-		String correlationValue = messageId;

-

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlationValue, "N/A");

-

-    	QueryVnfNotification message = new QueryVnfNotification();

-

-    	message.setMessageId(messageId);

-    	message.setCompleted(completed);

-    	message.setException(exception);

-    	message.setErrorMessage(errorMessage);

-    	message.setVnfExists(vnfExists);

-    	message.setVnfId(vnfId);

-    	message.setStatus(status);

-    	message.setOutputs(outputs);

-

-		handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker);

-    }

-

-	@WebMethod(operationName = "createVnfNotification")

-    @Oneway

-    @RequestWrapper(localName = "createVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.CreateVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/createVnfNotificationRequest")
-	public void createVnfNotification(

-			@WebParam(name = "messageId", targetNamespace = "")

-	        String messageId,

-	        @WebParam(name = "completed", targetNamespace = "")

-	        boolean completed,

-	        @WebParam(name = "exception", targetNamespace = "")

-	        MsoExceptionCategory exception,

-	        @WebParam(name = "errorMessage", targetNamespace = "")

-	        String errorMessage,

-	        @WebParam(name = "vnfId", targetNamespace = "")

-	        String vnfId,

-	        @WebParam(name = "outputs", targetNamespace = "")

-	        CreateVnfNotification.Outputs outputs,

-	        @WebParam(name = "rollback", targetNamespace = "")

-	        VnfRollback rollback){

-

-		String method = "createVnfNotification";

-		String messageEventName = "createVnfNotificationCallback";

-		String messageVariable = "createVnfNotificationCallback";

-		String correlationVariable = "VNFC_messageId";

-		String correlationValue = messageId;

-

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlationValue, "N/A");

-

-		CreateVnfNotification message = new CreateVnfNotification();

-

-		message.setMessageId(messageId);

-		message.setCompleted(completed);

-		message.setException(exception);

-		message.setErrorMessage(errorMessage);

-		message.setVnfId(vnfId);

-		message.setOutputs(outputs);

-		message.setRollback(rollback);

-

-		handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker);

-	 }

-

-	@WebMethod(operationName = "updateVnfNotification")

-    @Oneway

-    @RequestWrapper(localName = "updateVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.UpdateVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/updateVnfNotificationRequest")
-    public void updateVnfNotification(

-        @WebParam(name = "messageId", targetNamespace = "")

-        String messageId,

-        @WebParam(name = "completed", targetNamespace = "")

-        boolean completed,

-        @WebParam(name = "exception", targetNamespace = "")

-        MsoExceptionCategory exception,

-        @WebParam(name = "errorMessage", targetNamespace = "")

-        String errorMessage,

-        @WebParam(name = "outputs", targetNamespace = "")

-        UpdateVnfNotification.Outputs outputs,

-        @WebParam(name = "rollback", targetNamespace = "")

-        VnfRollback rollback){

-

-		String method = "updateVnfNotification";

-		String messageEventName = "updateVnfNotificationCallback";

-		String messageVariable = "updateVnfNotificationCallback";

-		String correlationVariable = "VNFU_messageId";

-		String correlationValue = messageId;

-

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlationValue, "N/A");

-

-    	UpdateVnfNotification message = new UpdateVnfNotification();

-

-    	message.setMessageId(messageId);

-    	message.setCompleted(completed);

-    	message.setException(exception);

-    	message.setErrorMessage(errorMessage);

-    	message.setOutputs(outputs);

-    	message.setRollback(rollback);

-

-		handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker);

-	 }

-

-    @WebMethod(operationName = "deleteVnfNotification")

-    @Oneway

-    @RequestWrapper(localName = "deleteVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.DeleteVnfNotification")
-    @Action(input = "http://org.openecomp.mso/notify/adapterNotify/deleteVnfNotificationRequest")
-    public void deleteVnfNotification(

-        @WebParam(name = "messageId", targetNamespace = "")

-        String messageId,

-        @WebParam(name = "completed", targetNamespace = "")

-        boolean completed,

-        @WebParam(name = "exception", targetNamespace = "")

-        MsoExceptionCategory exception,

-        @WebParam(name = "errorMessage", targetNamespace = "")

-        String errorMessage) {

-

-		String method = "deleteVnfNotification";

-		String messageEventName = "deleteVnfACallback";

-		String messageVariable = "deleteVnfACallback";

-		String correlationVariable = "VNFDEL_uuid";

-		String correlationValue = messageId;

-

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlationValue, "N/A");

-

-    	DeleteVnfNotification message = new DeleteVnfNotification();

-

-    	message.setMessageId(messageId);

-    	message.setCompleted(completed);

-    	message.setException(exception);

-    	message.setErrorMessage(errorMessage);

-

-		handleCallback(method, message, messageEventName, messageVariable,

-			correlationVariable, correlationValue, logMarker);

-	}

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
deleted file mode 100644
index b4543b1445..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.UUID;

-

-import javax.ws.rs.Consumes;

-import javax.ws.rs.POST;

-import javax.ws.rs.Path;

-import javax.ws.rs.PathParam;

-import javax.ws.rs.Produces;

-import javax.ws.rs.core.Response;

-

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.runtime.ProcessInstance;

-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;

-import org.jboss.resteasy.annotations.Suspend;

-import org.jboss.resteasy.spi.AsynchronousResponse;

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-import org.slf4j.MDC;

-

-/**

- * 

- * @version 1.0

- * Asynchronous Workflow processing using JAX RS RESTeasy implementation

- * Both Synchronous and Asynchronous BPMN process can benefit from this implementation since the workflow gets executed in the background

- * and the server thread is freed up, server scales better to process more incoming requests

- * 

- * Usage: For synchronous process, when you are ready to send the response invoke the callback to write the response

- * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process

- */

-@Path("/async")

-public class WorkflowAsyncResource extends ProcessEngineAwareService {

-

-	private static final WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();

-	protected Optional<ProcessEngineServices> pes4junit = Optional.empty();

-

-	private final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-

-	private static final String logMarker = "[WRKFLOW-RESOURCE]";

-	private static final long DEFAULT_WAIT_TIME = 30000;	//default wait time

-	

-	/**

-	 * Asynchronous JAX-RS method that starts a process instance.

-	 * @param asyncResponse an object that will receive the asynchronous response

-	 * @param processKey the process key

-	 * @param variableMap input variables to the process

-	 */

-	@POST

-	@Path("/services/{processKey}")

-	@Produces("application/json")

-	@Consumes("application/json")

-	public void startProcessInstanceByKey(final @Suspend(180000) AsynchronousResponse asyncResponse,

-			@PathParam("processKey") String processKey, VariableMapImpl variableMap) {

-	

-		long startTime = System.currentTimeMillis();

-		Map<String, Object> inputVariables = null;

-		WorkflowContext workflowContext = null;

-

-		try {

-			inputVariables = getInputVariables(variableMap);	

-			setLogContext(processKey, inputVariables);

-

-			// This variable indicates that the flow was invoked asynchronously

-			inputVariables.put("isAsyncProcess", "true");

-

-			workflowContext = new WorkflowContext(processKey, getRequestId(inputVariables),

-				asyncResponse, getWaitTime(inputVariables));

-

-			msoLogger.debug("Adding the workflow context into holder: "

-					+ workflowContext.getProcessKey() + ":"

-					+ workflowContext.getRequestId() + ":"

-					+ workflowContext.getTimeout());

-

-			contextHolder.put(workflowContext);

-

-			ProcessThread processThread = new ProcessThread(processKey, inputVariables);

-			processThread.start();

-		} catch (Exception e) {

-			setLogContext(processKey, inputVariables);

-

-			if (workflowContext != null) {

-				contextHolder.remove(workflowContext);

-			}

-

-			msoLogger.debug(logMarker + "Exception in startProcessInstance by key");

-	        WorkflowResponse response = new WorkflowResponse();

-			response.setMessage("Fail" );

-			response.setContent("Error occurred while executing the process: " + e);

-			response.setMessageCode(500);

-			recordEvents(processKey, response, startTime);

-			

-			msoLogger.error (MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logMarker 

-					+ response.getMessage() + " for processKey: " 

-					+ processKey + " with content: " + response.getContent());

-			

-			Response errorResponse = Response.serverError().entity(response).build();

-			asyncResponse.setResponse(errorResponse);

-		}

-	}

-	

-	/**

-	 * 

-	 * @version 1.0

-	 *

-	 */

-	class ProcessThread extends Thread {

-		private final String processKey;

-		private final Map<String,Object> inputVariables;

-

-		public ProcessThread(String processKey, Map<String, Object> inputVariables) {

-			this.processKey = processKey;

-			this.inputVariables = inputVariables;

-		}

-		

-		public void run() {

-

-			String processInstanceId = null;

-			long startTime = System.currentTimeMillis();

-			

-			try {

-				setLogContext(processKey, inputVariables);

-

-				// Note: this creates a random businessKey if it wasn't specified.

-				String businessKey = getBusinessKey(inputVariables);

-				

-				msoLogger.debug(logMarker + "***Received MSO startProcessInstanceByKey with processKey: "

-					+ processKey + " and variables: " + inputVariables);

-

-				msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker

-						+ "Call to MSO workflow/services in Camunda. Received MSO startProcessInstanceByKey with processKey:"

-						+ processKey + " and variables: " + inputVariables);

-				

-				RuntimeService runtimeService = getProcessEngineServices().getRuntimeService();

-				ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(

-					processKey, businessKey, inputVariables);

-				processInstanceId = processInstance.getId();

-

-				msoLogger.debug(logMarker + "Process " + processKey + ":" + processInstanceId + " " +

-						(processInstance.isEnded() ? "ENDED" : "RUNNING"));

-			} catch (Exception e) {

-

-				msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.InternalError, 

-						logMarker + "Error in starting the process: "+ e.getMessage());

-				

-				WorkflowCallbackResponse callbackResponse = new WorkflowCallbackResponse();

-				callbackResponse.setStatusCode(500);

-				callbackResponse.setMessage("Fail");

-				callbackResponse.setResponse("Error occurred while executing the process: " + e);

-

-				// TODO: is the processInstanceId used by the API handler?  I don't think so.

-				// It may be null here.

-				WorkflowContextHolder.getInstance().processCallback(

-					processKey, processInstanceId,

-					getRequestId(inputVariables),

-					callbackResponse);

-			}

-		}

-	}

-	

-	

-	/**

-	 * Callback resource which is invoked from BPMN to process to send the workflow response

-	 * 

-	 * @param processKey

-	 * @param processInstanceId

-	 * @param requestId

-	 * @param callbackResponse

-	 * @return

-	 */

-	@POST

-	@Path("/services/callback/{processKey}/{processInstanceId}/{requestId}")

-	@Produces("application/json")

-	@Consumes("application/json")

-	public Response processWorkflowCallback(

-			@PathParam("processKey") String processKey,

-			@PathParam("processInstanceId") String processInstanceId,

-			@PathParam("requestId")String requestId,

-			WorkflowCallbackResponse callbackResponse) {

-

-		msoLogger.debug(logMarker + "Process instance ID:" + processInstanceId + ":" + requestId + ":" + processKey + ":" + isProcessEnded(processInstanceId));

-		msoLogger.debug(logMarker + "About to process the callback request:" + callbackResponse.getResponse() + ":" + callbackResponse.getMessage() + ":" + callbackResponse.getStatusCode());

-		return contextHolder.processCallback(processKey, processInstanceId, requestId, callbackResponse);

-	}

-	

-    private static String getOrCreate(Map<String, Object> inputVariables, String key) {

-        String value = Objects.toString(inputVariables.get(key), null);

-        if (value == null) {

-            value = UUID.randomUUID().toString();

-            inputVariables.put(key, value);

-        }

-        return value;

-    }

-	

-	// Note: the business key is used to identify the process in unit tests

-	private static String getBusinessKey(Map<String, Object> inputVariables) {

-        return getOrCreate(inputVariables, "mso-business-key");

-	}

-

-	private static String getRequestId(Map<String, Object> inputVariables) {

-        return getOrCreate(inputVariables, "mso-request-id");

-	}

-

-	private long getWaitTime(Map<String, Object> inputVariables)

-	{

-	    

-		String timeout = Objects.toString(inputVariables.get("mso-service-request-timeout"), null);

-

-		if (timeout != null) {

-			try {

-				return Long.parseLong(timeout)*1000;

-			} catch (NumberFormatException nex) {

-				msoLogger.debug("Invalid input for mso-service-request-timeout");

-			}

-		}

-

-		return DEFAULT_WAIT_TIME;

-	}

-	

-	private void recordEvents(String processKey, WorkflowResponse response,

-			long startTime) {

-		

-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				logMarker + response.getMessage() + " for processKey: "

-				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

-		

-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				logMarker + response.getMessage() + "for processKey: " + processKey + " with content: " + response.getContent());

-		

-	}

-

-	private static void setLogContext(String processKey,

-			Map<String, Object> inputVariables) {

-		MsoLogger.setServiceName("MSO." + processKey);

-		if (inputVariables != null) {

-			MsoLogger.setLogContext(getKeyValueFromInputVariables(inputVariables,"mso-request-id"), getKeyValueFromInputVariables(inputVariables,"mso-service-instance-id"));

-		}

-	}

-

-	private static String getKeyValueFromInputVariables(Map<String,Object> inputVariables, String key) {

-		if (inputVariables == null) {

-			return "";

-		}

-

-		return Objects.toString(inputVariables.get(key), "N/A");

-	}

-

-	private boolean isProcessEnded(String processInstanceId) {

-		ProcessEngineServices pes = getProcessEngineServices();

-		return pes.getRuntimeService().createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult() == null;

-	}

-	

-	private static Map<String, Object> getInputVariables(VariableMapImpl variableMap) {

-		Map<String, Object> inputVariables = new HashMap<>();

-		@SuppressWarnings("unchecked")

-		Map<String, Object> vMap = (Map<String, Object>) variableMap.get("variables");

-		for (Map.Entry<String, Object> entry : vMap.entrySet()) {

-			String vName = entry.getKey();

-			Object value = entry.getValue();

-			@SuppressWarnings("unchecked")

-			Map<String, Object> valueMap = (Map<String,Object>)value; // value, type

-			inputVariables.put(vName, valueMap.get("value"));

-		}

-		return inputVariables;

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
deleted file mode 100644
index 4ba35907b9..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.workflow.service;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import javax.ws.rs.Consumes;

-import javax.ws.rs.HeaderParam;

-import javax.ws.rs.POST;

-import javax.ws.rs.Path;

-import javax.ws.rs.PathParam;

-import javax.ws.rs.Produces;

-import javax.ws.rs.core.MediaType;

-import javax.ws.rs.core.Response;

-

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-

-/**

- * Generalized REST interface that injects a message event into a waiting BPMN process.

- * Examples:

- * <pre>

- *     /WorkflowMessage/SDNCAResponse/6d10d075-100c-42d0-9d84-a52432681cae-1478486185286

- *     /WorkflowMessage/SDNCAEvent/USOSTCDALTX0101UJZZ01

- * </pre>

- */

-@Path("/")

-public class WorkflowMessageResource extends AbstractCallbackService {

-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-	private static final String LOGMARKER = "[WORKFLOW-MESSAGE]";

-	

-	@POST

-	@Path("/WorkflowMessage/{messageType}/{correlator}")

-	@Consumes("*/*")

-	@Produces(MediaType.TEXT_PLAIN)

-	public Response deliver(

-			@HeaderParam("Content-Type") String contentType,

-			@PathParam("messageType") String messageType,

-			@PathParam("correlator") String correlator,

-			String message) {

-

-		String method = "receiveWorkflowMessage";

-		MsoLogger.setServiceName("MSO." + method);

-		MsoLogger.setLogContext(correlator, "N/A");

-

-		LOGGER.debug(LOGMARKER + " Received workflow message"

-			+ " type='" + messageType + "'"

-			+ " correlator='" + correlator + "'"

-			+ (contentType == null ? "" : " contentType='" + contentType + "'")

-			+ " message=" + System.lineSeparator() + message);

-

-		if (messageType == null || messageType.isEmpty()) {

-			String msg = "Missing message type";

-			LOGGER.debug(LOGMARKER + " " + msg);

-			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-				MsoLogger.ErrorCode.DataError, LOGMARKER + ":" + msg);

-			return Response.status(400).entity(msg).build();

-		}

-

-		if (correlator == null || correlator.isEmpty()) {

-			String msg = "Missing correlator";

-			LOGGER.debug(LOGMARKER + " " + msg);

-			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

-				MsoLogger.ErrorCode.DataError, LOGMARKER + ":" + msg);

-			return Response.status(400).entity(msg).build();

-		}

-

-		String messageEventName = "WorkflowMessage";

-		String messageVariable = messageType + "_MESSAGE";

-		String correlationVariable = messageType + "_CORRELATOR";

-		String correlationValue = correlator;

-		String contentTypeVariable = messageType + "_CONTENT_TYPE";

-

-		Map<String, Object> variables = new HashMap<>();

-

-		if (contentType != null) {

-			variables.put(contentTypeVariable, contentType);

-		}

-

-		CallbackResult result = handleCallback(method, message, messageEventName,

-			messageVariable, correlationVariable, correlationValue, LOGMARKER, variables);

-

-		if (result instanceof CallbackError) {

-			return Response.status(500).entity(((CallbackError)result).getErrorMessage()).build();

-		} else {

-			return Response.status(204).build();

-		}

-	}

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
deleted file mode 100644
index 25c67fed63..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.common.workflow.service;

-

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.UUID;

-import java.util.concurrent.atomic.AtomicLong;

-

-import javax.ws.rs.Consumes;

-import javax.ws.rs.POST;

-import javax.ws.rs.Path;

-import javax.ws.rs.PathParam;

-import javax.ws.rs.Produces;

-import javax.ws.rs.core.Context;

-import javax.ws.rs.core.Response;

-import javax.ws.rs.core.UriInfo;

-

-import org.camunda.bpm.engine.HistoryService;

-import org.camunda.bpm.engine.ProcessEngineException;

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.history.HistoricVariableInstance;

-import org.camunda.bpm.engine.runtime.ProcessInstance;

-import org.camunda.bpm.engine.variable.VariableMap;

-import org.camunda.bpm.engine.variable.Variables;

-import org.camunda.bpm.engine.variable.Variables.SerializationDataFormats;

-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-import org.slf4j.MDC;

-

-@Path("/workflow")

-public class WorkflowResource extends ProcessEngineAwareService {

-	

-	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-	private static final String LOGMARKER = "[WRKFLOW-RESOURCE]";

-

-	private static final int DEFAULT_WAIT_TIME = 30000;

-

-	@Context

-	private UriInfo uriInfo = null;

-

-	/**

-	 * Starts the process instance and responds to client synchronously

-	 * If the request does not contain mso-service-request-timeout then it waits for the value specified in DEFAULT_WAIT_TIME

-	 * Note: value specified in mso-service-request-timeout is in seconds

-	 * During polling time, if there is an exception encountered in the process execution then polling is stopped and the error response is 

-	 * returned to the client

-	 * @param processKey

-	 * @param variableMap

-	 * @return

-	 */

-	@POST

-	@Path("/services/{processKey}")

-	@Produces("application/json")

-	@Consumes("application/json")

-	public Response startProcessInstanceByKey(@PathParam("processKey") String processKey,

-			VariableMapImpl variableMap) {

-

-		Map<String, Object> inputVariables = getInputVariables(variableMap);	

-		setLogContext(processKey, inputVariables);

-

-		WorkflowResponse workflowResponse = new WorkflowResponse();

-		long startTime = System.currentTimeMillis();

-		ProcessInstance processInstance = null;

-

-		try {

-			//Kickoff the process

-			ProcessThread thread = new ProcessThread(inputVariables,processKey,msoLogger);

-			thread.start();

-

-			Map<String, Object> responseMap = null;

-

-			//wait for process to be completed

-			long waitTime = getWaitTime(inputVariables);

-			long now = System.currentTimeMillis();

-			long start = now;

-			long endTime = start + waitTime;

-			long pollingInterval = 500;

-

-			// TEMPORARY LOGIC FOR UNIT TEST REFACTORING

-			// If this is a unit test (method is invoked directly), wait a max

-			// of 5 seconds after process ended for a result.  In production,

-			// wait up to 60 seconds.

-			long timeToWaitAfterProcessEnded = uriInfo == null ? 5000 : 60000;

-			AtomicLong timeProcessEnded = new AtomicLong(0);

-			boolean endedWithNoResponse = false;

-

-			while (now <= endTime) {

-				Thread.sleep(pollingInterval);

-

-				now = System.currentTimeMillis();

-

-				// Increase the polling interval over time

-

-				long elapsed = now - start;

-

-				if (elapsed > 60000) {

-					pollingInterval = 5000;

-				} else if (elapsed > 10000) {

-					pollingInterval = 1000;

-				}

-				Exception exception = thread.getException();

-				if (exception != null) {

-					throw new Exception(exception);

-				}

-

-				processInstance = thread.getProcessInstance();

-

-				if (processInstance == null) {

-					msoLogger.debug(LOGMARKER + processKey + " process has not been created yet");

-					continue;

-				}

-

-				String processInstanceId = processInstance.getId();

-				workflowResponse.setProcessInstanceId(processInstanceId);				

-

-				responseMap = getResponseMap(processInstance, processKey, timeProcessEnded);

-

-				if (responseMap == null) {

-					msoLogger.debug(LOGMARKER + processKey + " has not produced a response yet");

-

-					if (timeProcessEnded.longValue() != 0) {

-						long elapsedSinceEnded = System.currentTimeMillis() - timeProcessEnded.longValue();

-

-						if (elapsedSinceEnded > timeToWaitAfterProcessEnded) {

-							endedWithNoResponse = true;

-							break;

-						}

-					}

-				} else {

-					processResponseMap(workflowResponse, responseMap);

-					recordEvents(processKey, workflowResponse, startTime);

-					return Response.status(workflowResponse.getMessageCode()).entity(workflowResponse).build();

-				}

-			}

-

-			//if we dont get response after waiting then send timeout response

-

-			String state;

-			String processInstanceId;

-

-			if (processInstance == null) {

-				processInstanceId = "N/A";

-				state = "NOT STARTED";

-			} else {

-				processInstanceId = processInstance.getProcessInstanceId();

-				state = isProcessEnded(processInstanceId) ? "ENDED" : "NOT ENDED";

-			}

-

-			workflowResponse.setMessage("Fail");

-			if (endedWithNoResponse) {

-				workflowResponse.setContent("Process ended without producing a response");

-			} else {

-				workflowResponse.setContent("Request timed out, process state: " + state);

-			}

-			workflowResponse.setProcessInstanceId(processInstanceId);

-			recordEvents(processKey, workflowResponse, startTime);

-			workflowResponse.setMessageCode(500);

-			return Response.status(500).entity(workflowResponse).build();

-		} catch (Exception ex) {

-			msoLogger.debug(LOGMARKER + "Exception in startProcessInstance by key",ex);

-			workflowResponse.setMessage("Fail" );

-			workflowResponse.setContent("Error occurred while executing the process: " + ex.getMessage());

-			if (processInstance != null) workflowResponse.setProcessInstanceId(processInstance.getId());

-			

-			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG,  "BPMN", MDC.get(processKey), 

-					MsoLogger.ErrorCode.UnknownError, LOGMARKER + workflowResponse.getMessage()

-					+ " for processKey: " + processKey + " with content: " + workflowResponse.getContent());

-			

-			workflowResponse.setMessageCode(500);

-			recordEvents(processKey, workflowResponse, startTime);

-			return Response.status(500).entity(workflowResponse).build();

-		}

-	}

-

-	/**

-	 * Returns the wait time, this is used by the resource on how long it should wait to send a response

-	 * If none specified DEFAULT_WAIT_TIME is used

-	 * @param inputVariables

-	 * @return

-	 */

-	private int getWaitTime(Map<String, Object> inputVariables)

-	{

-		String timeout = inputVariables.get("mso-service-request-timeout") == null

-			? null : inputVariables.get("mso-service-request-timeout").toString();		

-

-		if (timeout != null) {

-			try {

-				return Integer.parseInt(timeout)*1000;

-			} catch (NumberFormatException nex) {

-				msoLogger.debug("Invalid input for mso-service-request-timeout");

-			}

-		}

-		return DEFAULT_WAIT_TIME;

-	}

-	

-	private void recordEvents(String processKey, WorkflowResponse response, long startTime) {

-		

-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

-		

-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with content: " + response.getContent());

-	}

-

-	private void setLogContext(String processKey, Map<String, Object> inputVariables) {

-		MsoLogger.setServiceName("MSO." + processKey);

-		if (inputVariables != null) {

-			MsoLogger.setLogContext(getValueFromInputVariables(inputVariables, "mso-request-id"),

-				getValueFromInputVariables(inputVariables, "mso-service-instance-id"));

-		}

-	}

-

-	private String getValueFromInputVariables(Map<String,Object> inputVariables, String key) {

-		Object value = inputVariables.get(key);

-		if (value == null) {

-			return "N/A";

-		} else {

-			return value.toString();

-		}

-	}

-	

-	/**

-	 * Checks to see if the specified process is ended.

-	 * @param processInstanceId the process instance ID

-	 * @return true if the process is ended

-	 */

-	private boolean isProcessEnded(String processInstanceId) {

-		ProcessEngineServices pes = getProcessEngineServices();

-		try {

-			return pes.getRuntimeService().createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult() == null ? true : false ;

-		} catch (Exception e) {

-			msoLogger.debug("Exception :",e);

-			return true;

-		}        

-	}

-

-	private void processResponseMap(WorkflowResponse workflowResponse, Map<String, Object> responseMap) {

-		Object object = responseMap.get("Response");

-		String content = object == null ? null : String.valueOf(object);

-		if (content == null){

-			object = responseMap.get("WorkflowResponse");

-			content = object == null ? null : String.valueOf(object);

-		}

-

-		workflowResponse.setContent(content); 

-

-		object = responseMap.get("ResponseCode");

-		String responseCode = object == null ? null : String.valueOf(object);

-

-		try {

-			workflowResponse.setMessageCode(Integer.parseInt(responseCode));

-		} catch(NumberFormatException nex) {

-			msoLogger.debug(LOGMARKER + "Failed to parse ResponseCode: " + responseCode);

-			workflowResponse.setMessageCode(-1);

-		}

-

-		Object status = responseMap.get("Status");

-

-		if ("Success".equalsIgnoreCase(String.valueOf(status))) {

-			workflowResponse.setMessage("Success");

-		} else if ("Fail".equalsIgnoreCase(String.valueOf(status))) {

-			workflowResponse.setMessage("Fail");

-		} else {

-			msoLogger.debug(LOGMARKER + "Unrecognized Status: " + responseCode);

-			workflowResponse.setMessage("Fail");

-		}

-	}

-

-	/**

-	 * @version 1.0

-	 * Triggers the workflow in a separate thread

-	 */

-	private class ProcessThread extends Thread {

-		private final Map<String,Object> inputVariables;

-		private final String processKey;

-		private final MsoLogger msoLogger;

-		private final String businessKey;

-		private ProcessInstance processInstance = null;

-		private Exception exception = null;

-

-		public ProcessThread(Map<String, Object> inputVariables, String processKey, MsoLogger msoLogger) {

-			this.inputVariables = inputVariables;

-			this.processKey = processKey;

-			this.msoLogger = msoLogger;

-			this.businessKey = UUID.randomUUID().toString();

-		}

-

-		/**

-		 * If an exception occurs when starting the process instance, it may

-		 * be obtained by calling this method.  Note that exceptions are only

-		 * recorded while the process is executing in its original thread.

-		 * Once a process is suspended, exception recording stops.

-		 * @return the exception, or null if none has occurred

-		 */

-		public Exception getException() {

-			return exception;

-		}

-

-		

-		public ProcessInstance getProcessInstance() {

-			return this.processInstance;

-		}

-		

-		/**

-		 * Sets the process instance exception.

-		 * @param exception the exception

-		 */

-		private void setException(Exception exception) {

-			this.exception = exception;

-		}

-

-		public void run() {

-			setLogContext(processKey, inputVariables);

-

-			long startTime = System.currentTimeMillis();

-			

-			try {

-				msoLogger.debug(LOGMARKER + "***Received MSO startProcessInstanceByKey with processKey:"

-					+ processKey + " and variables: " + inputVariables);

-				

-				msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, LOGMARKER

-						+ "Call to MSO workflow/services in Camunda. Received MSO startProcessInstanceByKey with"

-						+ " processKey:" + processKey

-						+ " businessKey:" + businessKey

-						+ " variables: " + inputVariables);

-						

-				RuntimeService runtimeService = getProcessEngineServices().getRuntimeService();

-

-				// Note that this method doesn't return until the process suspends

-				// itself or finishes.  We provide a business key so we can identify

-				// the process instance immediately.

-				processInstance = runtimeService.startProcessInstanceByKey(

-					processKey, inputVariables);

-

-			} catch (Exception e) {

-				msoLogger.debug(LOGMARKER + "ProcessThread caught an exception executing "

-					+ processKey + ": " + e);

-				setException(e);

-			}

-		}

-

-	}

-

-	private Map<String, Object> getInputVariables(VariableMapImpl variableMap) {

-		VariableMap inputVariables = Variables.createVariables();

-		@SuppressWarnings("unchecked")

-		Map<String, Object> vMap = (Map<String, Object>) variableMap.get("variables");

-		for (String key : vMap.keySet()) { //variabe name vn

-			@SuppressWarnings("unchecked")

-			Map<String, Object> valueMap = (Map<String,Object>)vMap.get(key); //value, type

-			inputVariables.putValueTyped(key, Variables

-			.objectValue(valueMap.get("value"))

-			.serializationDataFormat(SerializationDataFormats.JAVA) // tells the engine to use java serialization for persisting the value

-			.create());

-		}

-		return inputVariables;

-	}

-

-	/**

-	 * Attempts to get a response map from the specified process instance.

-	 * @return the response map, or null if it is unavailable

-	 */

-	private Map<String, Object> getResponseMap(ProcessInstance processInstance,

-			String processKey, AtomicLong timeProcessEnded) {

-

-		String responseMapVariable = processKey + "ResponseMap";

-		String processInstanceId = processInstance.getId();

-

-		// Query the runtime service to see if a response map is ready.

-

-/*		RuntimeService runtimeService = getProcessEngineServices().getRuntimeService();

-		List<Execution> executions = runtimeService.createExecutionQuery()

-			.processInstanceId(processInstanceId).list();

-

-		for (Execution execution : executions) {

-			@SuppressWarnings("unchecked")

-			Map<String, Object> responseMap = (Map<String, Object>)

-				getVariableFromExecution(runtimeService, execution.getId(),

-					responseMapVariable);

-

-			if (responseMap != null) {

-				msoLogger.debug(LOGMARKER + "Obtained " + responseMapVariable

-					+ " from process " + processInstanceId + " execution "

-					+ execution.getId());

-				return responseMap;

-			}

-		}

-*/

-		//Querying history seem to return consistent results compared to querying the runtime service

-

-		boolean alreadyEnded = timeProcessEnded.longValue() != 0;

-

-		if (alreadyEnded || isProcessEnded(processInstance.getId())) {

-			if (!alreadyEnded) {

-				timeProcessEnded.set(System.currentTimeMillis());

-			}

-

-			// Query the history service to see if a response map exists.

-

-			HistoryService historyService = getProcessEngineServices().getHistoryService();

-			@SuppressWarnings("unchecked")

-			Map<String, Object> responseMap = (Map<String, Object>)

-				getVariableFromHistory(historyService, processInstance.getId(),

-					responseMapVariable);

-

-			if (responseMap != null) {

-				msoLogger.debug(LOGMARKER + "Obtained " + responseMapVariable

-					+ " from process " + processInstanceId + " history");

-				return responseMap;

-			}

-

-			// Query the history service for old-style response variables.

-

-			String prefix = (String) getVariableFromHistory(historyService, processInstanceId, "prefix");

-

-			if (prefix != null) {

-				

-				// Check for 'WorkflowResponse' variable

-				Object workflowResponseObject = getVariableFromHistory(historyService, processInstanceId, "WorkflowResponse");

-				String workflowResponse = workflowResponseObject == null ? null : String.valueOf(workflowResponseObject);

-				msoLogger.debug(LOGMARKER + "WorkflowResponse: " + workflowResponse);

-				

-				if (workflowResponse != null) {

-					Object responseCodeObject = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");

-					String responseCode = responseCodeObject == null ? null : String.valueOf(responseCodeObject);

-					msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);

-					responseMap = new HashMap<>();

-					responseMap.put("WorkflowResponse", workflowResponse);

-					responseMap.put("ResponseCode", responseCode);

-					responseMap.put("Status", "Success");

-					return responseMap;

-				}

-				

-				

-				// Check for 'WorkflowException' variable

-				WorkflowException workflowException = null;

-				String workflowExceptionText = null;

-

-				Object workflowExceptionObject = getVariableFromHistory(historyService, processInstanceId, "WorkflowException");

-				if(workflowExceptionObject != null) {

-					if(workflowExceptionObject instanceof WorkflowException) {

-						workflowException = (WorkflowException) workflowExceptionObject;

-						workflowExceptionText = workflowException.toString();

-						responseMap = new HashMap<>();

-						responseMap.put("WorkflowException", workflowExceptionText);

-						responseMap.put("ResponseCode", workflowException.getErrorCode());

-						responseMap.put("Status", "Fail");

-						return responseMap;

-					}

-					else if (workflowExceptionObject instanceof String) {

-						Object object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");

-						String responseCode = object == null ? null : String.valueOf(object);

-						workflowExceptionText = (String) workflowExceptionObject;

-						responseMap = new HashMap<>();

-						responseMap.put("WorkflowException", workflowExceptionText);

-						responseMap.put("ResponseCode", responseCode);

-						responseMap.put("Status", "Fail");

-						return responseMap;

-					}

-					

-				}

-				msoLogger.debug(LOGMARKER + "WorkflowException: " + workflowExceptionText);

-				

-				// BEGIN LEGACY SUPPORT.  TODO: REMOVE THIS CODE

-				Object object = getVariableFromHistory(historyService, processInstanceId, processKey + "Response");

-				String response = object == null ? null : String.valueOf(object);

-				msoLogger.debug(LOGMARKER + processKey + "Response: " + response);

-

-				if (response != null) {

-					object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");

-					String responseCode = object == null ? null : String.valueOf(object);

-					msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);

-					responseMap = new HashMap<>();

-					responseMap.put("Response", response);

-					responseMap.put("ResponseCode", responseCode);

-					responseMap.put("Status", "Success");

-					return responseMap;

-				}

-	

-				object = getVariableFromHistory(historyService, processInstanceId, prefix + "ErrorResponse");

-				String errorResponse = object == null ? null : String.valueOf(object);

-				msoLogger.debug(LOGMARKER + prefix + "ErrorResponse: " + errorResponse);

-

-				if (errorResponse != null) {

-					object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");

-					String responseCode = object == null ? null : String.valueOf(object);

-					msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);

-					responseMap = new HashMap<>();

-					responseMap.put("Response", errorResponse);

-					responseMap.put("ResponseCode", responseCode);

-					responseMap.put("Status", "Fail");

-					return responseMap;

-				}

-				// END LEGACY SUPPORT.  TODO: REMOVE THIS CODE

-			}

-		}

-		return null;

-	}

-	

-	/**

-	 * Gets a variable value from the specified execution.

-	 * @return the variable value, or null if the variable could not be

-	 * obtained

-	 */

-	private Object getVariableFromExecution(RuntimeService runtimeService,

-			String executionId, String variableName) {

-		try {

-			return runtimeService.getVariable(executionId, variableName);

-		} catch (ProcessEngineException e) {

-			// Most likely cause is that the execution no longer exists.

-			msoLogger.debug("Error retrieving execution " + executionId

-				+ " variable " + variableName + ": " + e);

-			return null;

-		}

-	}

-	/**

-	 * Gets a variable value from specified historical process instance.

-	 * @return the variable value, or null if the variable could not be

-	 * obtained

-	 */

-	private Object getVariableFromHistory(HistoryService historyService,

-			String processInstanceId, String variableName) {

-		try {

-			HistoricVariableInstance v = historyService.createHistoricVariableInstanceQuery()

-				.processInstanceId(processInstanceId).variableName(variableName).singleResult();

-			return v == null ? null : v.getValue();

-		} catch (Exception e) {

-			msoLogger.debug("Error retrieving process " + processInstanceId

-				+ " variable " + variableName + " from history: " + e);

-			return null;

-		}

-	}

-	

-	@POST

-	@Path("/services/{processKey}/{processInstanceId}")

-	@Produces("application/json")

-	@Consumes("application/json")

-	public WorkflowResponse getProcessVariables(@PathParam("processKey") String processKey, @PathParam("processInstanceId") String processInstanceId) {

-		//TODO filter only set of variables

-		WorkflowResponse response = new WorkflowResponse();

-

-		long startTime = System.currentTimeMillis();

-		try {

-			ProcessEngineServices engine = getProcessEngineServices();

-			List<HistoricVariableInstance> variables = engine.getHistoryService().createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).list();

-			Map<String,String> variablesMap = new HashMap<>();

-			for (HistoricVariableInstance variableInstance: variables) {

-				variablesMap.put(variableInstance.getName(), variableInstance.getValue().toString());

-			}

-

-			msoLogger.debug(LOGMARKER + "***Received MSO getProcessVariables with processKey:" + processKey + " and variables: " + variablesMap.toString());

-			

-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, LOGMARKER 

-					+ "Call to MSO workflow/services in Camunda. Received MSO getProcessVariables with processKey:" 

-					+ processKey + " and variables: " 

-					+ variablesMap.toString());

-			

-			

-			response.setVariables(variablesMap);

-			response.setMessage("Success");

-			response.setContent("Successfully retrieved the variables"); 

-			response.setProcessInstanceId(processInstanceId);

-

-			msoLogger.debug(LOGMARKER + response.getMessage() + " for processKey: " + processKey + " with content: " + response.getContent());

-		} catch (Exception ex) {

-			response.setMessage("Fail");

-			response.setContent("Failed to retrieve the variables," + ex.getMessage()); 

-			response.setProcessInstanceId(processInstanceId);

-			

-			msoLogger.error (MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "BPMN", MDC.get(processKey), MsoLogger.ErrorCode.UnknownError, LOGMARKER 

-					+ response.getMessage() 

-					+ " for processKey: " 

-					+ processKey 

-					+ " with content: " 

-					+ response.getContent());

-			msoLogger.debug("Exception :",ex);

-		}

-		

-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

-		

-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with content: " + response.getContent());

-		

-		return response;

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClient.java
deleted file mode 100644
index 5e3aca5613..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.network;

-

-import org.openecomp.mso.adapters.nwrest.CreateNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.CreateNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.DeleteNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.DeleteNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.QueryNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.RollbackNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.RollbackNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.UpdateNetworkResponse;

-

-public interface NetworkAdapterClient {

-	

-	CreateNetworkResponse createNetwork(CreateNetworkRequest req);

-	

-	DeleteNetworkResponse deleteNetwork(String aaiNetworkId, DeleteNetworkRequest req);

-	

-	RollbackNetworkResponse rollbackNetwork(String aaiNetworkId, RollbackNetworkRequest req);

-	

-	QueryNetworkResponse queryNetwork(String aaiNetworkId, String cloudSiteId, String tenantId, String networkStackId, boolean skipAAI, String requestId, String serviceInstanceId);

-	

-	UpdateNetworkResponse updateNetwork(String aaiNetworkId, UpdateNetworkRequest req);

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientImpl.java
deleted file mode 100644
index 6a1c862a66..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.network;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriBuilder;
-
-import org.openecomp.mso.adapters.nwrest.CreateNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.CreateNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.DeleteNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.DeleteNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.QueryNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.RollbackNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.RollbackNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.UpdateNetworkResponse;
-import org.openecomp.mso.client.adapter.vnf.AdapterRestClient;
-
-public class NetworkAdapterClientImpl implements NetworkAdapterClient {
-
-	private final NetworkAdapterRestProperties props;
-	public NetworkAdapterClientImpl() {
-		this.props = new NetworkAdapterRestProperties();
-	}
-	@Override
-	public CreateNetworkResponse createNetwork(CreateNetworkRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("").build()).post(req,
-				CreateNetworkResponse.class);
-	}
-
-	@Override
-	public DeleteNetworkResponse deleteNetwork(String aaiNetworkId, DeleteNetworkRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiNetworkId).build()).delete(req,
-				DeleteNetworkResponse.class);
-	}
-
-	@Override
-	public RollbackNetworkResponse rollbackNetwork(String aaiNetworkId, RollbackNetworkRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiNetworkId).build()).delete(req,
-				RollbackNetworkResponse.class);
-	}
-
-	@Override
-	public QueryNetworkResponse queryNetwork(String aaiNetworkId, String cloudSiteId, String tenantId,
-			String networkStackId, boolean skipAAI, String requestId, String serviceInstanceId) {
-		UriBuilder builder = this.getUri("/" + aaiNetworkId);
-		if (cloudSiteId != null) {
-			builder.queryParam("cloudSiteId", cloudSiteId);
-		}
-		if (tenantId != null) {
-			builder.queryParam("tenantId", tenantId);
-		}
-		if (networkStackId != null) {
-			builder.queryParam("networkStackId", networkStackId);
-		}
-
-		builder.queryParam("skipAAI", skipAAI);
-
-		if (requestId != null) {
-			builder.queryParam("msoRequest.requestId", requestId);
-		}
-		if (serviceInstanceId != null) {
-			builder.queryParam("msoRequest.serviceInstanceId", serviceInstanceId);
-		}
-		return new AdapterRestClient(this.props, builder.build(), MediaType.TEXT_XML, MediaType.TEXT_XML)
-				.get(QueryNetworkResponse.class);
-	}
-
-	@Override
-	public UpdateNetworkResponse updateNetwork(String aaiNetworkId, UpdateNetworkRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiNetworkId).build()).put(req,
-				UpdateNetworkResponse.class);
-	}
-
-	protected UriBuilder getUri(String path) {
-		return UriBuilder.fromPath(path);
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapter.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapter.java
deleted file mode 100644
index c3ba8e16ea..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.requests.db;
-
-import org.openecomp.mso.client.adapter.requests.db.entities.MsoRequestsDbException;
-import org.openecomp.mso.client.adapter.requests.db.entities.UpdateInfraRequest;
-import org.openecomp.mso.requestsdb.InfraActiveRequests;
-
-public interface MsoRequestsDbAdapter {
-
-	public void updateInfraRequest(UpdateInfraRequest request) throws MsoRequestsDbException;
-
-	public InfraActiveRequests getInfraRequest(String requestId) throws MsoRequestsDbException;
-
-	public boolean getSiteStatus(String siteName);
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java
deleted file mode 100644
index 2443169151..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/MsoRequestsDbAdapterClient.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.client.adapter.requests.db;

-

-import java.sql.Timestamp;

-

-import org.hibernate.HibernateException;

-import org.hibernate.Query;

-import org.hibernate.Session;

-import org.openecomp.mso.client.adapter.requests.db.entities.MsoRequestsDbException;

-import org.openecomp.mso.client.adapter.requests.db.entities.RequestStatusType;

-import org.openecomp.mso.client.adapter.requests.db.entities.UpdateInfraRequest;

-import org.openecomp.mso.db.AbstractSessionFactoryManager;

-import org.openecomp.mso.logger.MessageEnum;

-import org.openecomp.mso.logger.MsoLogger;

-import org.openecomp.mso.requestsdb.InfraActiveRequests;

-import org.openecomp.mso.requestsdb.RequestsDbSessionFactoryManager;

-import org.openecomp.mso.requestsdb.SiteStatus;

-import org.openecomp.mso.utils.UUIDChecker;

-

-public class MsoRequestsDbAdapterClient implements MsoRequestsDbAdapter {

-

-	protected AbstractSessionFactoryManager requestsDbSessionFactoryManager = new RequestsDbSessionFactoryManager();

-

-	private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);

-

-	@Override

-	public void updateInfraRequest(UpdateInfraRequest request) throws MsoRequestsDbException {

-		Session session = requestsDbSessionFactoryManager.getSessionFactory().openSession();

-		int result = 0;

-		long startTime = System.currentTimeMillis();

-		if (request.getRequestId() != null && request.getLastModifiedBy() != null) {

-			MsoLogger.setLogContext(request.getRequestId(), null);

-			try {

-				session.beginTransaction();

-				StringBuilder queryString = new StringBuilder("update InfraActiveRequests set ");

-				String statusMessage = null;

-				String responseBody = null;

-				RequestStatusType requestStatus = null;

-				String progress = null;

-				String vnfOutputs = null;

-				String serviceInstanceId = null;

-				String networkId = null;

-				String vnfId = null;

-				String vfModuleId = null;

-				String volumeGroupId = null;

-				String serviceInstanceName = null;

-				String vfModuleName = null;

-				String configurationId = null;

-				String configurationName = null;

-				if (request.getStatusMessage() != null) {

-					queryString.append("statusMessage = :statusMessage, ");

-					statusMessage = request.getStatusMessage();

-				}

-				if (request.getResponseBody() != null) {

-					queryString.append("responseBody = :responseBody, ");

-					responseBody = request.getResponseBody();

-				}

-				if (request.getRequestStatus() != null) {

-					queryString.append("requestStatus = :requestStatus, ");

-					requestStatus = request.getRequestStatus();

-				}

-				if (request.getProgress() != null) {

-					queryString.append("progress = :progress, ");

-					progress = request.getProgress();

-				}

-				if (request.getVnfOutputs() != null) {

-					queryString.append("vnfOutputs = :vnfOutputs, ");

-					vnfOutputs = request.getVnfOutputs();

-				}

-				if (request.getServiceInstanceId() != null) {

-					queryString.append("serviceInstanceId = :serviceInstanceId, ");

-					serviceInstanceId = request.getServiceInstanceId();

-				}

-				if (request.getNetworkId() != null) {

-					queryString.append("networkId = :networkId, ");

-					networkId = request.getNetworkId();

-				}

-				if (request.getVnfId() != null) {

-					queryString.append("vnfId = :vnfId, ");

-					vnfId = request.getVnfId();

-				}

-				if (request.getVfModuleId() != null) {

-					queryString.append("vfModuleId = :vfModuleId, ");

-					vfModuleId = request.getVfModuleId();

-				}

-				if (request.getVolumeGroupId() != null) {

-					queryString.append("volumeGroupId = :volumeGroupId, ");

-					volumeGroupId = request.getVolumeGroupId();

-				}

-				if (request.getServiceInstanceName() != null) {

-					queryString.append("serviceInstanceName = :serviceInstanceName, ");

-					serviceInstanceName = request.getServiceInstanceName();

-				}

-				if (request.getVfModuleName() != null) {

-					queryString.append("vfModuleName = :vfModuleName, ");

-					vfModuleName = request.getVfModuleName();

-				}

-				if (request.getConfigurationId() != null) {

-					queryString.append("configurationId = :configurationId, ");

-					configurationId = request.getConfigurationId();

-				}

-				if (request.getConfigurationName() != null) {

-					queryString.append("configurationName = :configurationName, ");

-					configurationName = request.getConfigurationName();

-				}

-				if (request.getRequestStatus() == RequestStatusType.COMPLETE

-						|| request.getRequestStatus() == RequestStatusType.FAILED) {

-					queryString.append("endTime = :endTime, ");

-				} else {

-					queryString.append("modifyTime = :modifyTime, ");

-				}

-				queryString.append("lastModifiedBy = :lastModifiedBy where requestId = :requestId OR clientRequestId = :requestId");

-

-				LOGGER.debug("Executing update: " + queryString.toString());

-

-				Query query = session.createQuery(queryString.toString());

-				query.setParameter("requestId", request.getRequestId());

-				if (statusMessage != null) {

-					query.setParameter("statusMessage", statusMessage);

-					LOGGER.debug("StatusMessage in updateInfraRequest is set to: " + statusMessage);

-				}

-				if (responseBody != null) {

-					query.setParameter("responseBody", responseBody);

-					LOGGER.debug("ResponseBody in updateInfraRequest is set to: " + responseBody);

-				}

-				if (requestStatus != null) {

-					query.setParameter("requestStatus", requestStatus.toString());

-					LOGGER.debug("RequestStatus in updateInfraRequest is set to: " + requestStatus.toString());

-				}

-

-				if (progress != null) {

-					query.setParameter("progress", Long.parseLong(progress));

-					LOGGER.debug("Progress in updateInfraRequest is set to: " + progress);

-				}

-				if (vnfOutputs != null) {

-					query.setParameter("vnfOutputs", vnfOutputs);

-					LOGGER.debug("VnfOutputs in updateInfraRequest is set to: " + vnfOutputs);

-				}

-				if (serviceInstanceId != null) {

-					query.setParameter("serviceInstanceId", serviceInstanceId);

-					LOGGER.debug("ServiceInstanceId in updateInfraRequest is set to: " + serviceInstanceId);

-				}

-				if (networkId != null) {

-					query.setParameter("networkId", networkId);

-					LOGGER.debug("NetworkId in updateInfraRequest is set to: " + networkId);

-				}

-				if (vnfId != null) {

-					query.setParameter("vnfId", vnfId);

-					LOGGER.debug("VnfId in updateInfraRequest is set to: " + vnfId);

-				}

-				if (vfModuleId != null) {

-					query.setParameter("vfModuleId", vfModuleId);

-					LOGGER.debug("vfModuleId in updateInfraRequest is set to: " + vfModuleId);

-				}

-				if (volumeGroupId != null) {

-					query.setParameter("volumeGroupId", volumeGroupId);

-					LOGGER.debug("VolumeGroupId in updateInfraRequest is set to: " + volumeGroupId);

-				}

-				if (serviceInstanceName != null) {

-					query.setParameter("serviceInstanceName", serviceInstanceName);

-					LOGGER.debug("ServiceInstanceName in updateInfraRequest is set to: " + serviceInstanceName);

-				}

-				if (configurationId != null) {

-					query.setParameter("configurationId", configurationId);

-					LOGGER.debug("configurationId in updateInfraRequest is set to: " + configurationId);

-				}

-				if (configurationName != null) {

-					query.setParameter("configurationName", configurationName);

-					LOGGER.debug("configurationName in updateInfraRequest is set to: " + configurationName);

-				}

-				if (vfModuleName != null) {

-					query.setParameter("vfModuleName", vfModuleName);

-					LOGGER.debug("vfModuleName in updateInfraRequest is set to: " + vfModuleName);

-				}

-				Timestamp nowTimeStamp = new Timestamp(System.currentTimeMillis());

-				if (request.getRequestStatus() == RequestStatusType.COMPLETE

-						|| request.getRequestStatus() == RequestStatusType.FAILED) {

-					query.setParameter("endTime", nowTimeStamp);

-					LOGGER.debug("EndTime in updateInfraRequest is set to: " + nowTimeStamp);

-				} else {

-					query.setParameter("modifyTime", nowTimeStamp);

-					LOGGER.debug("ModifyTime in updateInfraRequest is set to: " + nowTimeStamp);

-				}

-				query.setParameter("lastModifiedBy", request.getLastModifiedBy());

-				LOGGER.debug("LastModifiedBy in updateInfraRequest is set to: " + request.getLastModifiedBy());

-				result = query.executeUpdate();

-				checkIfExists(result, request.getRequestId(), startTime);

-				session.getTransaction().commit();

-			} catch (HibernateException e) {

-				String error = "Unable to update MSO Requests DB: " + e.getMessage();

-				LOGGER.error(MessageEnum.RA_CANT_UPDATE_REQUEST, "infra request parameters", request.getRequestId(), "",

-						"", MsoLogger.ErrorCode.BusinessProcesssError, "HibernateException - " + error, e);

-				LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.DBAccessError,

-						error);

-				throw new MsoRequestsDbException(error, e);

-			} finally {

-				if (session != null && session.isOpen()) {

-					session.close();

-				}

-			}

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");

-		} else {

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.BadRequest,

-					"Required fields: requestId and lastModifiedBy");

-		}

-	}

-

-	private void checkIfExists(int result, String requestId, long startTime) throws MsoRequestsDbException {

-		if (result == 0) {

-			String error = "Request ID does not exist in MSO Requests DB: " + requestId;

-			LOGGER.error(MessageEnum.RA_DB_REQUEST_NOT_EXIST, requestId, "", "", MsoLogger.ErrorCode.DataError, error);

-			throw new MsoRequestsDbException(error);

-		}

-	}

-

-	@Override

-	public InfraActiveRequests getInfraRequest(String requestId) throws MsoRequestsDbException {

-		long startTime = System.currentTimeMillis();

-		MsoLogger.setLogContext(requestId, null);

-		Session session = requestsDbSessionFactoryManager.getSessionFactory().openSession();

-

-		LOGGER.debug("Call to MSO Infra RequestsDb adapter get method with request Id: " + requestId);

-

-		InfraActiveRequests request = null;

-		try {

-			session.beginTransaction();

-			Query query = session.createQuery(

-					"FROM InfraActiveRequests where requestId = :requestId OR clientRequestId = :requestId");

-			query.setParameter("requestId", requestId);

-			request = (InfraActiveRequests) query.uniqueResult();

-		} catch (HibernateException e) {

-			String error = "Unable to retrieve MSO Infra Requests DB for Request ID " + requestId;

-			LOGGER.error(MessageEnum.RA_DB_REQUEST_NOT_EXIST, "Get Infra request", requestId, "", "",

-					MsoLogger.ErrorCode.BusinessProcesssError, "HibernateException - " + error, e);

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.DBAccessError, error);

-			throw new MsoRequestsDbException(error, e);

-		} finally {

-			if (session != null && session.isOpen()) {

-				session.close();

-			}

-		}

-		LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");

-		return request;

-	}

-

-	/**

-	 * Get SiteStatus by SiteName.

-	 *

-	 * @param siteName

-	 *            The unique name of the site

-	 * @return Status of that site

-	 */

-	public boolean getSiteStatus(String siteName) {

-		UUIDChecker.generateUUID(LOGGER);

-		Session session = requestsDbSessionFactoryManager.getSessionFactory().openSession();

-

-		long startTime = System.currentTimeMillis();

-		SiteStatus siteStatus = null;

-		LOGGER.debug("Request database - get Site Status with Site name:" + siteName);

-		try {

-			String hql = "FROM SiteStatus WHERE siteName = :site_name";

-			Query query = session.createQuery(hql);

-			query.setParameter("site_name", siteName);

-

-			siteStatus = (SiteStatus) query.uniqueResult();

-		} finally {

-			if (session != null && session.isOpen()) {

-				session.close();

-			}

-		}

-		if (siteStatus == null) {

-			// if not exist in DB, it means the site is not disabled, thus

-			// return true

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");

-			return true;

-		} else {

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");

-			return siteStatus.getStatus();

-		}

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbException.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbException.java
deleted file mode 100644
index a495d0eac1..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbException.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.requests.db.entities;
-
-
-
-import javax.xml.ws.WebFault;
-
-/**
- * This class simply extends Exception (without addition additional functionality)
- * to provide an identifier for RequestsDB related exceptions on create, delete, query.
- * 
- *
- */
-@WebFault (name="MsoRequestsDbException", faultBean="org.openecomp.mso.adapters.requestsdb.exceptions.MsoRequestsDbExceptionBean", targetNamespace="http://org.openecomp.mso/requestsdb")
-public class MsoRequestsDbException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-	private MsoRequestsDbExceptionBean faultInfo;
-	
-	public MsoRequestsDbException (String msg) {
-		super(msg);
-		faultInfo = new MsoRequestsDbExceptionBean (msg);
-	}
-	
-	public MsoRequestsDbException (Throwable e) {
-		super(e);
-		faultInfo = new MsoRequestsDbExceptionBean (e.getMessage());
-	}
-	
-	public MsoRequestsDbException (String msg, Throwable e) {
-		super (msg, e);
-		faultInfo = new MsoRequestsDbExceptionBean (msg);
-	}
-
-	public MsoRequestsDbExceptionBean getFaultInfo() {
-		return faultInfo;
-	}
-
-	public void setFaultInfo(MsoRequestsDbExceptionBean faultInfo) {
-		this.faultInfo = faultInfo;
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/RequestStatusType.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/RequestStatusType.java
deleted file mode 100644
index 2fa6f2b6a2..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/RequestStatusType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.07.24 at 11:49:17 AM EDT 
-//
-
-
-package org.openecomp.mso.client.adapter.requests.db.entities;
-
-
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for request-status-type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="request-status-type">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="COMPLETE"/>
- *     &lt;enumeration value="FAILED"/>
- *     &lt;enumeration value="IN_PROGRESS"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "request-status-type")
-@XmlEnum
-public enum RequestStatusType {
-
-    COMPLETE,
-    FAILED,
-    IN_PROGRESS;
-
-    public String value() {
-        return name();
-    }
-
-    public static RequestStatusType fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequest.java
deleted file mode 100644
index 15c57253f3..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.requests.db.entities;

-

-public class UpdateInfraRequest {

-	

-	private String requestId;

-	private String lastModifiedBy;

-	private String statusMessage;

-	private String responseBody;

-    private RequestStatusType requestStatus;

-    private String progress;

-    private String vnfOutputs;

-    private String serviceInstanceId;

-    private String networkId;

-    private String vnfId;

-    private String vfModuleId;

-    private String volumeGroupId;

-    private String serviceInstanceName;

-    private String configurationId;

-    private String configurationName;

-    private String vfModuleName;

-    

-    public String getRequestId() {

-		return requestId;

-	}

-	public void setRequestId(String requestId) {

-		this.requestId = requestId;

-	}

-	public String getLastModifiedBy() {

-		return lastModifiedBy;

-	}

-	public void setLastModifiedBy(String lastModifiedBy) {

-		this.lastModifiedBy = lastModifiedBy;

-	}

-	public String getStatusMessage() {

-		return statusMessage;

-	}

-	public void setStatusMessage(String statusMessage) {

-		this.statusMessage = statusMessage;

-	}

-	public String getResponseBody() {

-		return responseBody;

-	}

-	public void setResponseBody(String responseBody) {

-		this.responseBody = responseBody;

-	}

-	public RequestStatusType getRequestStatus() {

-		return requestStatus;

-	}

-	public void setRequestStatus(RequestStatusType requestStatus) {

-		this.requestStatus = requestStatus;

-	}

-	public String getProgress() {

-		return progress;

-	}

-	public void setProgress(String progress) {

-		this.progress = progress;

-	}

-	public String getVnfOutputs() {

-		return vnfOutputs;

-	}

-	public void setVnfOutputs(String vnfOutputs) {

-		this.vnfOutputs = vnfOutputs;

-	}

-	public String getServiceInstanceId() {

-		return serviceInstanceId;

-	}

-	public void setServiceInstanceId(String serviceInstanceId) {

-		this.serviceInstanceId = serviceInstanceId;

-	}

-	public String getNetworkId() {

-		return networkId;

-	}

-	public void setNetworkId(String networkId) {

-		this.networkId = networkId;

-	}

-	public String getVnfId() {

-		return vnfId;

-	}

-	public void setVnfId(String vnfId) {

-		this.vnfId = vnfId;

-	}

-	public String getVfModuleId() {

-		return vfModuleId;

-	}

-	public void setVfModuleId(String vfModuleId) {

-		this.vfModuleId = vfModuleId;

-	}

-	public String getVolumeGroupId() {

-		return volumeGroupId;

-	}

-	public void setVolumeGroupId(String volumeGroupId) {

-		this.volumeGroupId = volumeGroupId;

-	}

-	public String getServiceInstanceName() {

-		return serviceInstanceName;

-	}

-	public void setServiceInstanceName(String serviceInstanceName) {

-		this.serviceInstanceName = serviceInstanceName;

-	}

-	public String getConfigurationId() {

-		return configurationId;

-	}

-	public void setConfigurationId(String configurationId) {

-		this.configurationId = configurationId;

-	}

-	public String getConfigurationName() {

-		return configurationName;

-	}

-	public void setConfigurationName(String configurationName) {

-		this.configurationName = configurationName;

-	}

-	public String getVfModuleName() {

-		return vfModuleName;

-	}

-	public void setVfModuleName(String vfModuleName) {

-		this.vfModuleName = vfModuleName;

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
deleted file mode 100644
index 16fd351b43..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.vnf;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.ext.ContextResolver;
-
-import org.openecomp.mso.client.ResponseExceptionMapperImpl;
-import org.openecomp.mso.client.policy.JettisonStyleMapperProvider;
-import org.openecomp.mso.client.policy.RestClient;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class AdapterRestClient extends RestClient {
-
-	private final AdapterRestProperties props;
-	public AdapterRestClient(AdapterRestProperties props, URI uri) {
-		super(props, UUID.randomUUID(), Optional.of(uri));
-		this.props = props;
-	}
-
-	public AdapterRestClient(AdapterRestProperties props, URI uri, String accept, String contentType) {
-		super(props, UUID.randomUUID(), Optional.of(uri), accept, contentType);
-		this.props = props;
-	}
-
-	@Override
-	protected void initializeHeaderMap(Map<String, String> headerMap) {
-		addBasicAuthHeader(props.getAuth(), props.getKey());
-	}
-
-	@Override
-	protected Optional<ClientResponseFilter> addResponseFilter() {
-		return Optional.of(new ResponseExceptionMapperImpl());
-	}
-
-	@Override
-	public RestClient addRequestId(UUID requestId) {
-		return null;
-	}
-
-	@Override
-	protected ContextResolver<ObjectMapper> getMapper() {
-		return new JettisonStyleMapperProvider();
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java
deleted file mode 100644
index 5ee38fe0fb..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.client.adapter.vnf;

-

-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;

-

-public interface VnfAdapterClient {

-

-	CreateVfModuleResponse createVfModule(String aaiVnfId, CreateVfModuleRequest req);

-

-	RollbackVfModuleResponse rollbackVfModule(String aaiVnfId, String aaiVfModuleId, RollbackVfModuleRequest req);

-

-	DeleteVfModuleResponse deleteVfModule(String aaiVnfId, String aaiVfModuleId, DeleteVfModuleRequest req);

-

-	UpdateVfModuleResponse updateVfModule(String aaiVnfId, String aaiVfModuleId, UpdateVfModuleRequest req);

-

-	QueryVfModuleResponse queryVfModule(String aaiVnfId, String aaiVfModuleId, String cloudSiteId, String tenantId,

-			String vfModuleName, boolean skipAAI, String requestId, String serviceInstanceId);

-

-	String healthCheck();

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java
deleted file mode 100644
index 2b391d302d..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.vnf;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriBuilder;
-
-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;
-
-public class VnfAdapterClientImpl implements VnfAdapterClient {
-
-	private static final String VF_MODULES = "/vf-modules/";
-
-	private final VnfAdapterRestProperties props;
-	public VnfAdapterClientImpl() {
-		this.props = new VnfAdapterRestProperties();
-	}
-	
-	@Override
-	public CreateVfModuleResponse createVfModule(String aaiVnfId, CreateVfModuleRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + "/vf-modules").build()).post(req,
-				CreateVfModuleResponse.class);
-	}
-
-	@Override
-	public RollbackVfModuleResponse rollbackVfModule(String aaiVnfId, String aaiVfModuleId,
-			RollbackVfModuleRequest req) {
-		return new AdapterRestClient(this.props,
-				this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId + "/rollback").build()).delete(req,
-						RollbackVfModuleResponse.class);
-	}
-
-	@Override
-	public DeleteVfModuleResponse deleteVfModule(String aaiVnfId, String aaiVfModuleId, DeleteVfModuleRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId).build())
-				.delete(req, DeleteVfModuleResponse.class);
-	}
-
-	@Override
-	public UpdateVfModuleResponse updateVfModule(String aaiVnfId, String aaiVfModuleId, UpdateVfModuleRequest req) {
-		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId).build())
-				.put(req, UpdateVfModuleResponse.class);
-	}
-
-	@Override
-	public QueryVfModuleResponse queryVfModule(String aaiVnfId, String aaiVfModuleId, String cloudSiteId,
-			String tenantId, String vfModuleName, boolean skipAAI, String requestId, String serviceInstanceId) {
-		UriBuilder builder = this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId);
-		if (cloudSiteId != null) {
-			builder.queryParam("cloudSiteId", cloudSiteId);
-		}
-		if (tenantId != null) {
-			builder.queryParam("tenantId", tenantId);
-		}
-		if (vfModuleName != null) {
-			builder.queryParam("vfModuleName", vfModuleName);
-		}
-
-		builder.queryParam("skipAAI", skipAAI);
-
-		if (requestId != null) {
-			builder.queryParam("msoRequest.requestId", requestId);
-		}
-		if (serviceInstanceId != null) {
-			builder.queryParam("msoRequest.serviceInstanceId", serviceInstanceId);
-		}
-		return new AdapterRestClient(this.props, builder.build(), MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON)
-				.get(QueryVfModuleResponse.class);
-	}
-
-	@Override
-	public String healthCheck() {
-		return new AdapterRestClient(this.props, this.getUri("/healthcheck").build()).get(String.class);
-	}
-
-	public UriBuilder getUri(String path) {
-		return UriBuilder.fromPath(path);
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java
deleted file mode 100644
index e342aeedac..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.vnf;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.client.adapter.vnf.AdapterRestProperties;
-
-public class VnfAdapterRestProperties implements AdapterRestProperties {
-
-	private final Map<String, String> props;
-	
-	public VnfAdapterRestProperties() {
-		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
-	}
-	
-	@Override
-	public String getAuth() {
-		return props.get("mso.adapters.po.auth");
-	}
-	@Override
-	public String getKey() {
-		return props.get("mso.msoKey");
-	}
-	@Override
-	public URL getEndpoint() throws MalformedURLException {
-		return new URL(props.get("mso.adapters.vnf.rest.endpoint"));
-	}
-
-	@Override
-	public String getSystemName() {
-		return "MSO";
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/AAIOrchestrator.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/AAIOrchestrator.java
deleted file mode 100644
index 73bad21c87..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/AAIOrchestrator.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.orchestration;
-
-import java.util.Optional;
-import java.util.logging.Logger;
-
-import org.modelmapper.ModelMapper;
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;
-import org.openecomp.mso.client.aai.AAIResourcesClient;
-import org.openecomp.mso.client.aai.entities.AAIEntityObject;
-import org.openecomp.mso.client.aai.objects.AAIOwningEntity;
-import org.openecomp.mso.client.aai.objects.AAIProject;
-import org.openecomp.mso.client.aai.objects.AAIServiceInstance;
-
-public class AAIOrchestrator {
-	
-	private static Logger LOGGER = Logger.getLogger("AAIOrchestrator");
-	
-	public void createServiceInstance(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject serviceInstance = modelMapper.map(serviceDecomp.getServiceInstance(), AAIServiceInstance.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.createIfNotExists(serviceInstance.getUri(), Optional.of(serviceInstance));
-		}catch(Exception ex) {
-			String msg = "Failed to create service instance in A&AI.";
-			throw new IllegalStateException(msg);
-		}
-	}
-	
-	public void deleteServiceInstance(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject serviceInstance = modelMapper.map(serviceDecomp.getServiceInstance(), AAIServiceInstance.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.delete(serviceInstance.getUri());
-		} catch (Exception ex) {
-			String msg = "Failed to delete service instance in A&AI.";
-			throw new IllegalStateException(msg);
-		}
-	}
-	
-	public void createProject(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject project = modelMapper.map(serviceDecomp.getProject(), AAIProject.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.createIfNotExists(project.getUri(), Optional.of(project));
-		}catch(Exception ex) {
-			String msg = "Failed to create project in A&AI.";
-			throw new IllegalStateException(msg);		}
-	}
-	
-	public void createProjectandConnectServiceInstance(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject project = modelMapper.map(serviceDecomp.getProject(), AAIProject.class);
-			AAIEntityObject serviceInstance = modelMapper.map(serviceDecomp.getServiceInstance(), AAIServiceInstance.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.createIfNotExists(project.getUri(), Optional.of(project)).connect(project.getUri(), serviceInstance.getUri());
-		} catch(Exception ex) {
-			String msg = "Failed to create project and connect service instance in A&AI.";
-			throw new IllegalStateException(msg);
-		}
-	}
-	
-	public void createOwningEntity(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject owningEntity = modelMapper.map(serviceDecomp.getOwningEntity(), AAIOwningEntity.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.createIfNotExists(owningEntity.getUri(), Optional.of(owningEntity));
-		}catch(Exception ex) {
-			String msg = "Failed to create owning entity in A&AI.";
-			throw new IllegalStateException(msg);
-		}
-	}
-	
-	public void createOwningEntityandConnectServiceInstance(ServiceDecomposition serviceDecomp) {
-		try{
-			ModelMapper modelMapper = new ModelMapper();
-			AAIEntityObject owningEntity = modelMapper.map(serviceDecomp.getOwningEntity(), AAIOwningEntity.class);
-			AAIEntityObject serviceInstance = modelMapper.map(serviceDecomp.getServiceInstance(), AAIServiceInstance.class);
-			AAIResourcesClient aaiRC = this.getClient();
-			aaiRC.createIfNotExists(owningEntity.getUri(), Optional.of(owningEntity)).connect(owningEntity.getUri(), serviceInstance.getUri());
-		}catch(Exception ex) {
-			String msg = "Failed to create owning entity and connect service instance in A&AI.";
-			throw new IllegalStateException(msg);		}
-	}
-	
-	protected AAIResourcesClient getClient() {
-		return new AAIResourcesClient();
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/SDNCOrchestrator.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/SDNCOrchestrator.java
deleted file mode 100644
index 4cefad2a3b..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/orchestration/SDNCOrchestrator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.orchestration;

-

-import java.util.Optional;

-import java.util.logging.Logger;

-

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;

-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcAction;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcOperation;

-import org.openecomp.mso.client.sdnc.mapper.ServiceTopologyOperationRequestMapper;

-import org.openecomp.mso.client.sdnc.sync.SDNCSyncRpcClient;

-import org.openecomp.mso.properties.MsoPropertiesFactory;

-

-public class SDNCOrchestrator {

-

-	private static MsoPropertiesFactory msoPF = new MsoPropertiesFactory();

-	

-	public void createServiceInstance (ServiceDecomposition serviceDecomp) {

-	

-		try{

-			msoPF.initializeMsoProperties("MSO_PROP_SDNC_ADAPTER", "mso.sdnc.properties");

-			Optional<String> msoAction = getMSOAction(serviceDecomp);

-			ServiceTopologyOperationRequestMapper sdncRM = new ServiceTopologyOperationRequestMapper(msoAction, SDNCSvcOperation.SERVICE_TOPOLOGY_OPERATION, SDNCSvcAction.ASSIGN, "CreateServiceInstance");

-			SDNCRequest request = sdncRM.reqMapper(serviceDecomp);

-			SDNCSyncRpcClient sdncRC = new SDNCSyncRpcClient (request, msoPF);

-			sdncRC.run();

-		} catch (Exception ex) {

-			throw new IllegalStateException();

-		}

-	}

-	

-	private Optional<String> getMSOAction (ServiceDecomposition serviceDecomp){

-		String serviceType = serviceDecomp.getServiceInstance().getServiceType();

-		if(serviceType == null || serviceType.equals("")){

-			return Optional.empty();

-		}

-		

-		return Optional.of(serviceType);

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCRequest.java
deleted file mode 100644
index cd04fc5ef0..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCRequest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.client.sdnc.beans;

-

-public class SDNCRequest {

-	private String requestId;

-	private String svcInstanceId;

-	private SDNCSvcAction svcAction;

-	private SDNCSvcOperation svcOperation;

-	private String callbackUrl;

-	private String msoAction;

-	private String requestData;

-	

-	public SDNCRequest(String requestId, String svcInstanceId, SDNCSvcAction svcAction, SDNCSvcOperation svcOperation,

-			String callbackUrl, String msoAction, String requestData) {

-		this.requestId = requestId;

-		this.svcInstanceId = svcInstanceId;

-		this.svcAction = svcAction;

-		this.svcOperation = svcOperation;

-		this.callbackUrl = callbackUrl;

-		this.msoAction = msoAction;

-		this.requestData = requestData;

-	}

-	public SDNCRequest(){

-		

-	}

-	

-	public String getRequestId() {

-		return requestId;

-	}

-	public void setRequestId(String requestId) {

-		this.requestId = requestId;

-	}

-	public String getSvcInstanceId() {

-		return svcInstanceId;

-	}

-	public void setSvcInstanceId(String svcInstanceId) {

-		this.svcInstanceId = svcInstanceId;

-	}

-	public SDNCSvcAction getSvcAction() {

-		return svcAction;

-	}

-	public void setSvcAction(SDNCSvcAction svcAction) {

-		this.svcAction = svcAction;

-	}

-	public SDNCSvcOperation getSvcOperation() {

-		return svcOperation;

-	}

-	public void setSvcOperation(SDNCSvcOperation svcOperation) {

-		this.svcOperation = svcOperation;

-	}

-	public String getCallbackUrl() {

-		return callbackUrl;

-	}

-	public void setCallbackUrl(String callbackUrl) {

-		this.callbackUrl = callbackUrl;

-	}

-	public String getMsoAction() {

-		return msoAction;

-	}

-	public void setMsoAction(String msoAction) {

-		this.msoAction = msoAction;

-	}

-	

-	public String getRequestData() {

-		return requestData;

-	}

-	public void setRequestData(String requestData) {

-		this.requestData = requestData;

-	}

-	@Override

-	public String toString() {

-		return "SDNCRequest [requestId=" + requestId + ", svcInstanceId=" + svcInstanceId + ", svcAction=" + svcAction

-				+ ", svcOperation=" + svcOperation + ", callbackUrl=" + callbackUrl + ", msoAction=" + msoAction

-				+ ", requestData=" + requestData + "]";

-	}

-	

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/SDNCRequestMapper.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/SDNCRequestMapper.java
deleted file mode 100644
index 3e714e901d..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/SDNCRequestMapper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.mapper;

-

-import java.util.Optional;

-

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;

-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcAction;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcOperation;

-

-public abstract class SDNCRequestMapper {

-	

-	protected final Optional<String> msoAction;

-	protected final SDNCSvcOperation svcOperation;

-	protected final SDNCSvcAction svcAction;

-	protected final String requestAction;

-	

-	public SDNCRequestMapper (Optional<String> msoAction, SDNCSvcOperation svcOperation,

-			SDNCSvcAction svcAction, String requestAction) {

-		this.msoAction = msoAction;

-		this.svcOperation = svcOperation;

-		this.svcAction = svcAction;

-		this.requestAction = requestAction;

-	}

-	

-	public abstract SDNCRequest reqMapper (ServiceDecomposition serviceDecomp);

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/ServiceTopologyOperationRequestMapper.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/ServiceTopologyOperationRequestMapper.java
deleted file mode 100644
index b87ed00650..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/mapper/ServiceTopologyOperationRequestMapper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.mapper;

-

-import java.io.StringWriter;

-import java.util.Optional;

-

-import javax.xml.bind.JAXBContext;

-import javax.xml.bind.JAXBException;

-import javax.xml.bind.Marshaller;

-

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;

-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcAction;

-import org.openecomp.mso.client.sdnc.beans.SDNCSvcOperation;

-

-import openecomp.org.mso.workflow.schema.v1.EcompModelInformation;

-import openecomp.org.mso.workflow.schema.v1.RequestInformation;

-import openecomp.org.mso.workflow.schema.v1.SDNCServiceInstanceRequestData;

-import openecomp.org.mso.workflow.schema.v1.ServiceInformation;

-import openecomp.org.mso.workflow.schema.v1.ServiceRequestInput;

-

-public class ServiceTopologyOperationRequestMapper extends SDNCRequestMapper{

-	

-	public ServiceTopologyOperationRequestMapper(Optional<String> msoAction, SDNCSvcOperation svcOperation,

-			SDNCSvcAction svcAction, String requestAction) {

-		super(msoAction, svcOperation, svcAction, requestAction);

-	}

-

-	@Override

-	public SDNCRequest reqMapper (ServiceDecomposition serviceDecomp) {

-		SDNCRequest req = new SDNCRequest();

-		req.setCallbackUrl(serviceDecomp.getCallbackURN());

-		if(msoAction.isPresent()){

-			req.setMsoAction(msoAction.get()); 

-		}

-		req.setRequestId(serviceDecomp.getRequest().getSdncRequestId());

-		req.setSvcInstanceId(serviceDecomp.getServiceInstance().getInstanceId());

-		req.setSvcAction(svcAction); 

-		req.setSvcOperation(svcOperation); 

-		String reqData ="";

-		

-		RequestInformation reqInfo = new RequestInformation();

-		reqInfo.setRequestAction(requestAction);

-		reqInfo.setSource("MSO");

-		reqInfo.setRequestId(serviceDecomp.getRequest().getRequestId());

-		ServiceInformation servInfo = new ServiceInformation();

-		EcompModelInformation emi = new EcompModelInformation();

-		emi.setModelInvariantUuid(serviceDecomp.getRequest().getModelInfo().getModelInvariantUuid());

-		emi.setModelName(serviceDecomp.getRequest().getModelInfo().getModelName());

-		emi.setModelVersion(serviceDecomp.getRequest().getModelInfo().getModelVersion() );

-		servInfo.setEcompModelInformation(emi);

-		servInfo.setServiceId(serviceDecomp.getServiceInstance().getServiceId());

-		servInfo.setSubscriptionServiceType(serviceDecomp.getCustomer().getSubscriptionServiceType());

-		servInfo.setServiceInstanceId(serviceDecomp.getServiceInstance().getInstanceName());

-		servInfo.setGlobalCustomerId(serviceDecomp.getCustomer().getGlobalSubscriberId());

-		ServiceRequestInput servReqInput = new ServiceRequestInput();

-		servReqInput.setServiceInstanceName(serviceDecomp.getServiceInstance().getInstanceName());

-		SDNCServiceInstanceRequestData sdncSIRD = new SDNCServiceInstanceRequestData();

-		sdncSIRD.setRequestInformation(reqInfo);

-		sdncSIRD.setServiceInformation(servInfo);

-		sdncSIRD.setServiceRequestInput(servReqInput);

-		

-		try {

-            JAXBContext context = JAXBContext.newInstance(SDNCServiceInstanceRequestData.class);

-

-            Marshaller jaxbMarshaller = context.createMarshaller();

-            jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

-            

-            StringWriter sw = new StringWriter();

-            jaxbMarshaller.marshal(sdncSIRD, sw);

-            reqData = sw.toString();

-            req.setRequestData(reqData);

-        } catch (JAXBException e) {

-            e.printStackTrace();

-        }

-				

-		return req;

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/CallbackHeader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/CallbackHeader.java
deleted file mode 100644
index 2ddafc1c17..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/CallbackHeader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="RequestId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="ResponseCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="ResponseMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-//SDNCAdapter to BPEL Async response header
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestId",
-    "responseCode",
-    "responseMessage"
-})
-@XmlRootElement(name = "CallbackHeader")
-public class CallbackHeader {
-
-    @XmlElement(name = "RequestId", required = true)
-    protected String requestId;
-    @XmlElement(name = "ResponseCode", required = true)
-    protected String responseCode;
-    @XmlElement(name = "ResponseMessage", required = true)
-    protected String responseMessage;
-
-    public CallbackHeader() {
-    }
-
-    public CallbackHeader(String reqId, String respCode, String respMsg) {
-    	this.requestId = reqId;
-    	this.responseCode = respCode;
-    	this.responseMessage  = respMsg;
-    }
-
-    /**
-     * Gets the value of the requestId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Sets the value of the requestId property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setRequestId(String value) {
-        this.requestId = value;
-    }
-
-    /**
-     * Gets the value of the responseCode property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    /**
-     * Sets the value of the responseCode property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setResponseCode(String value) {
-        this.responseCode = value;
-    }
-
-    /**
-     * Gets the value of the responseMessage property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getResponseMessage() {
-        return responseMessage;
-    }
-
-    /**
-     * Sets the value of the responseMessage property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setResponseMessage(String value) {
-        this.responseMessage = value;
-    }
-
-	@Override
-	public String toString() {
-		return "CallbackHeader [requestId=" + requestId + ", responseCode="
-				+ responseCode + ", responseMessage=" + responseMessage + "]";
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Constants.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Constants.java
deleted file mode 100644
index 331fefa677..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Constants.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-public interface Constants {
-
-		public static final String BPEL_REST_URL_PROP = "org.openecomp.mso.adapters.sdnc.rest.bpelurl";
-		public static final String BPEL_URL_PROP = "org.openecomp.mso.adapters.sdnc.bpelurl";
-		public static final String DEFAULT_BPEL_URL = "http://localhost:8080//active-bpel/services/SDNCAdapterCallbackV1";
-
-		public static final String MY_URL_PROP = "org.openecomp.mso.adapters.sdnc.myurl";
-		public static final String DEFAULT_MY_URL = "https://localhost:8443/adapters/rest/SDNCNotify";
-
-		public static final String SDNC_AUTH_PROP = "org.openecomp.mso.adapters.sdnc.sdncauth";
-		public static final String DEFAULT_SDNC_AUTH = "406B2AE613211B6FB52466DE6E1769AC";
-
-		public static final String DEFAULT_BPEL_AUTH = "05FDA034C27D1CA51AAB8FAE512EDE45241E16FC8C137D292AA3A964431C82DB";
-	    public static final String BPEL_AUTH_PROP = "org.openecomp.mso.adapters.sdnc.bpelauth";
-
-
-		public static final String SDNC_SVCCFGRESP_ROOT = "input";
-		public static final String SDNC_REQ_ID = "/svc-request-id";
-		public static final String SDNC_RESP_CODE = "/response-code";
-		public static final String SDNC_RESP_MSG = "/response-message";
-		public static final String SDNC_CONNECTTIME_PROP = "org.openecomp.mso.adapters.sdnc.sdncconnecttime";
-		public static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
-
-		public static final String REQUEST_TUNABLES = "org.openecomp.mso.adapters.sdnc";
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/ObjectFactory.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/ObjectFactory.java
deleted file mode 100644
index 3ddfdb2925..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/ObjectFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.openecomp.mso.adapters.sdnc package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups.  Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.mso.adapters.sdnc
-     *
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link RequestHeader }
-     *
-     */
-    public RequestHeader createRequestHeader() {
-        return new RequestHeader();
-    }
-
-    /**
-     * Create an instance of {@link SDNCAdapterResponse }
-     *
-     */
-    public SDNCAdapterResponse createSDNCAdapterResponse() {
-        return new SDNCAdapterResponse();
-    }
-
-    /**
-     * Create an instance of {@link SDNCAdapterRequest }
-     *
-     */
-    public SDNCAdapterRequest createSDNCAdapterRequest() {
-        return new SDNCAdapterRequest();
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestHeader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestHeader.java
deleted file mode 100644
index dee79898fa..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestHeader.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="RequestId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="SvcInstanceId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="SvcAction" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="SvcOperation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="CallbackUrl" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-//BPEL to SDNCAdapter request header
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestId",
-    "svcInstanceId",
-    "svcAction",
-    "svcOperation",
-    "callbackUrl",
-    "msoAction"
-})
-@XmlRootElement(name = "RequestHeader")
-public class RequestHeader {
-
-    @XmlElement(name = "RequestId", required = true)
-    protected String requestId;
-    @XmlElement(name = "SvcInstanceId")
-    protected String svcInstanceId;
-    @XmlElement(name = "SvcAction", required = true)
-    protected String svcAction;
-    @XmlElement(name = "SvcOperation", required = true)
-    protected String svcOperation;
-    @XmlElement(name = "CallbackUrl", required = true)
-    protected String callbackUrl;
-    @XmlElement(name = "MsoAction")
-    protected String msoAction;
-
-    /**
-     * Gets the value of the requestId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Sets the value of the requestId property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setRequestId(String value) {
-        this.requestId = value;
-    }
-
-    public String getSvcInstanceId() {
-		return svcInstanceId;
-	}
-
-	public void setSvcInstanceId(String svcInstanceId) {
-		this.svcInstanceId = svcInstanceId;
-	}
-
-	/**
-     * Gets the value of the svcAction property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getSvcAction() {
-        return svcAction;
-    }
-
-    /**
-     * Sets the value of the svcAction property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setSvcAction(String value) {
-        this.svcAction = value;
-    }
-
-    /**
-     * Gets the value of the svcOperation property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getSvcOperation() {
-        return svcOperation;
-    }
-
-    /**
-     * Sets the value of the svcOperation property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setSvcOperation(String value) {
-        this.svcOperation = value;
-    }
-
-    /**
-     * Gets the value of the callbackUrl property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getCallbackUrl() {
-        return callbackUrl;
-    }
-
-    /**
-     * Sets the value of the callbackUrl property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setCallbackUrl(String value) {
-        this.callbackUrl = value;
-    }
-
-    /**
-     * Gets the value of the callbackUrl property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getMsoAction() {
-        return msoAction;
-    }
-
-    /**
-     * Sets the value of the callbackUrl property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setMsoAction(String value) {
-        this.msoAction = value;
-    }
-
-
-	@Override
-	public String toString() {
-		return "RequestHeader [requestId=" + requestId +
-				", svcInstanceId=" + svcInstanceId +
-				", svcAction=" + svcAction +
-				", svcOperation=" + svcOperation +
-				", callbackUrl=" + callbackUrl +
-				", msoAction=" + msoAction + "]";
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestTunables.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestTunables.java
deleted file mode 100644
index 55d42df6e1..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/RequestTunables.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.properties.MsoJavaProperties;
-import org.openecomp.mso.properties.MsoPropertiesException;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-
-import org.openecomp.mso.logger.MessageEnum;
-public class RequestTunables {
-
-	private MsoPropertiesFactory msoPropertiesFactory;
-	
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-	private static MsoAlarmLogger alarmLogger = new MsoAlarmLogger();
-	public static final String MSO_PROP_SDNC_ADAPTER="MSO_PROP_SDNC_ADAPTER";
-
-	//criteria
-	private String reqId = "";
-	private String msoAction = "";
-	private String operation = "";
-	private String action = "";
-
-	//tunables
-	private String reqMethod = "POST";
-	private String sdncUrl = null;
-	private String timeout = "60000";
-	private String headerName = "sdnc-request-header";
-	private String namespace = "";
-	private String asyncInd = "N"; //future use
-
-	private String sdncaNotificationUrl = null;
-
-	public RequestTunables(String reqId, String msoAction, String operation, String action, MsoPropertiesFactory msoPropFactory) {
-		super();
-		msoPropertiesFactory = msoPropFactory;
-		if (reqId != null) {
-            this.reqId = reqId;
-        }
-		if (msoAction != null) {
-            this.msoAction = msoAction;
-        }
-		if (operation != null) {
-            this.operation = operation;
-        }
-		if (action != null) {
-            this.action = action;
-        }
-	}
-
-	public String getReqId() {
-		return reqId;
-	}
-	public void setReqId(String reqId) {
-		this.reqId = reqId;
-	}
-	public String getReqMethod() {
-		return reqMethod;
-	}
-	public void setReqMethod(String reqMethod) {
-		this.reqMethod = reqMethod;
-	}
-	public String getMsoAction() {
-		return msoAction;
-	}
-	public void setMsoAction(String msoAction) {
-		this.msoAction = msoAction;
-	}
-	public String getAction() {
-		return action;
-	}
-	public void setAction(String action) {
-		this.action = action;
-	}
-	public String getOperation() {
-		return operation;
-	}
-	public void setOperation(String operation) {
-		this.operation = operation;
-	}
-	public String getSdncUrl() {
-		return sdncUrl;
-	}
-	public void setSdncUrl(String sdncUrl) {
-		this.sdncUrl = sdncUrl;
-	}
-	public String getTimeout() {
-		return timeout;
-	}
-	public void setTimeout(String timeout) {
-		this.timeout = timeout;
-	}
-	public String getAsyncInd() {
-		return asyncInd;
-	}
-	public void setAsyncInd(String asyncInd) {
-		this.asyncInd = asyncInd;
-	}
-	public String getHeaderName() {
-		return headerName;
-	}
-	public void setHeaderName(String headerName) {
-		this.headerName = headerName;
-	}
-
-
-	public String getSdncaNotificationUrl() {
-		return sdncaNotificationUrl;
-	}
-
-	public void setSdncaNotificationUrl(String sdncaNotificationUrl) {
-		this.sdncaNotificationUrl = sdncaNotificationUrl;
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	@Override
-	public String toString() {
-		return "RequestTunables [reqId=" + reqId + ", msoAction=" + msoAction
-				+ ", operation=" + operation + ", action=" + action
-				+ ", reqMethod=" + reqMethod + ", sdncUrl=" + sdncUrl
-				+ ", timeout=" + timeout + ", headerName=" + headerName
-				+ ", sdncaNotificationUrl=" + sdncaNotificationUrl
-				+ ", namespace=" + namespace + "]";
-	}
-
-	public void setTunables()
-	{
-		String error = null;
-		String key = null;
-		if ("query".equals(action)) { //due to variable format for operation eg services/layer3-service-list/8fe4ba4f-35cf-4d9b-a04a-fd3f5d4c5cc9
-			key = Constants.REQUEST_TUNABLES + "." + msoAction + ".." + action;
-			msoLogger.debug("Generated key: " + key);
-		}
-		else if ("put".equals(action)  || "restdelete".equals(action)) { //due to variable format for operation eg services/layer3-service-list/8fe4ba4f-35cf-4d9b-a04a-fd3f5d4c5cc9
-			key = Constants.REQUEST_TUNABLES + "..." + action;
-			msoLogger.debug("Generated key: " + key);
-		} else {
-			key = Constants.REQUEST_TUNABLES + "." + msoAction + "." + operation +"."  + action;
-			msoLogger.debug("Generated key: " + key);
-		}
-
-		String value;
-		try {
-			value = msoPropertiesFactory.getMsoJavaProperties(MSO_PROP_SDNC_ADAPTER).getProperty(key, "");
-		} catch (MsoPropertiesException e) {
-			msoLogger.error (MessageEnum.LOAD_PROPERTIES_FAIL, "Unknown. Mso Properties ID not found in cache: " + MSO_PROP_SDNC_ADAPTER, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception - Mso Properties ID not found in cache", e);
-			value="";
-		}
-
-		if (value != null && value.length() > 0) {
-
-			String[] parts = value.split("\\|"); //escape pipe
-			if (parts.length < 3) {
-				msoLogger.warn(MessageEnum.RA_SDNC_INVALID_CONFIG, key, value, "SDNC", "", MsoLogger.ErrorCode.DataError, "Invalid config");
-			}
-
-			for (int i = 0; i < parts.length; i++) {
-				if (i == 0) {
-					reqMethod = parts[i];
-					msoLogger.debug("Request Method is set to: " + reqMethod);
-				} else if (i == 1) {
-					timeout = parts[i];
-					msoLogger.debug("Timeout is set to: " + timeout);
-				} else if (i == 2) {
-					sdncUrl = SDNCAdapterPortTypeImpl.getProperty(Constants.REQUEST_TUNABLES + "." + parts[i], "",msoPropertiesFactory);
-					if (operation != null && sdncUrl != null) {
-						sdncUrl = sdncUrl  + operation;
-					}
-					msoLogger.debug("SDNC Url is set to: " + sdncUrl);
-				} else if  (i == 3) {
-					headerName = parts[i];
-					msoLogger.debug("HeaderName is set to: " + headerName);
-				} else if  (i == 4) {
-					namespace = parts[i];
-					msoLogger.debug("NameSpace is set to: " + namespace);
-				} else if  (i == 5) {
-					asyncInd = parts[i];
-					msoLogger.debug("AsyncInd is set to: " + asyncInd);
-				}
-			}
-			if (sdncUrl == null) {
-				error = "Invalid configuration, sdncUrl required for:" + key + " value:" + value;
-			}
-		} else {
-			error = "Missing configuration for:" + key;
-		}
-		if (error != null) {
-			msoLogger.error(MessageEnum.RA_SDNC_MISS_CONFIG_PARAM, key, "SDNC", "", MsoLogger.ErrorCode.DataError, "Missing config param");
-			alarmLogger.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, error);
-		}
-		msoLogger.debug ("RequestTunables Key:" + key + " Value:" + value + " Tunables:" + this.toString());
-		return;
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequest.java
deleted file mode 100644
index 6e9d6757ad..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import java.io.StringWriter;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.logger.MessageEnum;
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://org.openecomp/workflow/sdnc/adapter/schema/v1}CallbackHeader"/>
- *         &lt;element name="RequestData" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-//SDNCAdapter to BPEL Async response
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "callbackHeader",
-    "requestData"
-})
-@XmlRootElement(name = "SDNCAdapterCallbackRequest")
-public class SDNCAdapterCallbackRequest {
-
-    @XmlElement(name = "CallbackHeader", required = true)
-    protected CallbackHeader callbackHeader;
-    @XmlElement(name = "RequestData")
-    protected Object requestData;
-
-    private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-
-    /**
-     * Gets the value of the callbackHeader property.
-     *
-     * @return
-     *     possible object is
-     *     {@link CallbackHeader }
-     *
-     */
-    public CallbackHeader getCallbackHeader() {
-        return callbackHeader;
-    }
-
-    /**
-     * Sets the value of the callbackHeader property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link CallbackHeader }
-     *
-     */
-    public void setCallbackHeader(CallbackHeader value) {
-        this.callbackHeader = value;
-    }
-
-    /**
-     * Gets the value of the requestData property.
-     *
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *
-     */
-    public Object getRequestData() {
-        return requestData;
-    }
-
-    /**
-     * Sets the value of the requestData property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *
-     */
-    public void setRequestData(Object value) {
-        this.requestData = value;
-    }
-
-	@Override
-	public String toString() {
-		try {
-			JAXBContext ctx = JAXBContext.newInstance("org.openecomp.mso.adapters.sdnc.client");
-			Marshaller m = ctx.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-			m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
-			StringWriter w = new StringWriter();
-			m.marshal(this, w);
-			return (w.toString());
-		}
-		catch (Exception e)
-		{
-			msoLogger.error(MessageEnum.RA_MARSHING_ERROR, "", "", MsoLogger.ErrorCode.DataError, "Exception - MARSHING_ERROR", e);
-		}
-		return("");
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortType.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortType.java
deleted file mode 100644
index 8b56932769..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;
-
-
-/**
- * This class was generated by Apache CXF 2.7.11.redhat-3
- * 2015-01-27T18:25:50.914-05:00
- * Generated source version: 2.7.11.redhat-3
- *
- */
-//BPEL SDNCAdapter SOAP WebService - impl class in impl pkg
-@WebService(targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/wsdl/v1", name = "SDNCAdapterPortType")
-@XmlSeeAlso({ObjectFactory.class})
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface SDNCAdapterPortType {
-
-    @WebResult(name = "SDNCAdapterResponse", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterResponse")
-    @WebMethod(operationName = "SDNCAdapter")
-    public SDNCAdapterResponse sdncAdapter(
-        @WebParam(partName = "SDNCAdapterRequest", name = "SDNCAdapterRequest", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-        SDNCAdapterRequest sdncAdapterRequest
-    );
-
-    @WebMethod
-	public void healthCheck();
-
-	SDNCAdapterResponse sdncAdapter(SDNCRequest bpelRequest);
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortTypeImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortTypeImpl.java
deleted file mode 100644
index 3d9aab666a..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterPortTypeImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-import javax.annotation.PostConstruct;
-import javax.jws.WebService;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.properties.MsoPropertiesException;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-
-//BPEL SDNCAdapter SOAP Web Service implementation
-@WebService(serviceName = "SDNCAdapterService", endpointInterface = "org.openecomp.mso.client.sdnc.sync.SDNCAdapterPortType", targetNamespace = "http://org.openecomp/workflow/sdnc/ad")
-public class SDNCAdapterPortTypeImpl implements SDNCAdapterPortType {
-
-	private MsoPropertiesFactory msoPropertiesFactory=new MsoPropertiesFactory();
-
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-	private static MsoAlarmLogger alarmLogger = new MsoAlarmLogger();
-	private static final String LOG_SERVICE_NAME = "MSO-BPMN:MSO-SDNCAdapter.";
-	private static final String LOG_REPLY_NAME = "MSO-SDNCAdapter:MSO-BPMN.";
-	public static final String MSO_PROP_SDNC_ADAPTER="MSO_PROP_SDNC_ADAPTER";
-
-	@PostConstruct
-	public void init () {
-		msoLogger.info(MessageEnum.RA_INIT_SDNC_ADAPTER, "SDNC", "SDNCAdapterPortType");
-	}
-
-	/**
-	 * Health Check web method.  Does nothing but return to show the adapter is deployed.
-	 */
-	@Override
-	public void healthCheck ()
-	{
-		msoLogger.debug("Health check call in SDNC Adapter");
-	}
-
-	public static String getProperty(String key, String defaultValue, MsoPropertiesFactory msoPropertiesFactoryp) {
-		String value;
-		try {
-			value = msoPropertiesFactoryp.getMsoJavaProperties(MSO_PROP_SDNC_ADAPTER).getProperty(key, defaultValue);
-		} catch (MsoPropertiesException e) {
-			msoLogger.error (MessageEnum.NO_PROPERTIES, "Unknown. Mso Properties ID not found in cache: " + MSO_PROP_SDNC_ADAPTER, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception - Mso Properties ID not found in cache", e);
-			return null;
-		}
-		msoLogger.debug("Config read for " + MSO_PROP_SDNC_ADAPTER + " - key:" + key + " value:" + value);
-		return value;
-	}
-
-	@Override
-	public SDNCAdapterResponse sdncAdapter(SDNCRequest bpelRequest) {
-		String bpelReqId = bpelRequest.getRequestId();
-		String callbackUrl = bpelRequest.getCallbackUrl();
-		long startTime = System.currentTimeMillis ();
-		MsoLogger.setLogContext(SDNCRequestIdUtil.getSDNCOriginalRequestId (bpelReqId), bpelRequest.getSvcInstanceId());
-		MsoLogger.setServiceName (bpelRequest.getSvcAction().toString());
-		msoLogger.info(MessageEnum.RA_RECEIVE_BPEL_REQUEST, bpelReqId, callbackUrl, "SDNC", "");
-
-		SDNCSyncRpcClient sdncClient = new SDNCSyncRpcClient(bpelRequest,msoPropertiesFactory);
-		long subStartTime = System.currentTimeMillis ();
-		try {
-			Thread sdncClientThread = new Thread(sdncClient);
-			sdncClientThread.start();
-		}
-		catch (Exception e){
-			String respMsg = "Error sending request to SDNC. Failed to start SDNC Client thread " + e.getMessage();
-			msoLogger.error(MessageEnum.RA_SEND_REQUEST_SDNC_ERR, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception sending request to SDNC. Failed to start SDNC Client thread", e);
-			alarmLogger.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, respMsg);
-			SDNCResponse sdncResp = new SDNCResponse(bpelReqId);
-			sdncResp.setRespCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-			sdncResp.setRespMsg(respMsg);
-		}
-
-		msoLogger.debug("Sending synchronous response to BPEL");
-		SDNCAdapterResponse wsResp = new SDNCAdapterResponse();
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successful");
-		return (wsResp);
-	}
-
-	@Override
-	public org.openecomp.mso.client.sdnc.sync.SDNCAdapterResponse sdncAdapter(
-			org.openecomp.mso.client.sdnc.sync.SDNCAdapterRequest sdncAdapterRequest) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequest.java
deleted file mode 100644
index 5beedb12be..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://org.openecomp/workflow/sdnc/adapter/schema/v1}RequestHeader"/>
- *         &lt;element name="RequestData" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-//BPEL to SDNCAdapter request
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "requestHeader",
-    "requestData"
-})
-@XmlRootElement(name = "SDNCAdapterRequest")
-public class SDNCAdapterRequest {
-
-    @XmlElement(name = "RequestHeader", required = true)
-    protected RequestHeader requestHeader;
-    @XmlElement(name = "RequestData", required = true)
-    protected Object requestData;
-
-    /**
-     * Gets the value of the requestHeader property.
-     *
-     * @return
-     *     possible object is
-     *     {@link RequestHeader }
-     *
-     */
-    public RequestHeader getRequestHeader() {
-        return requestHeader;
-    }
-
-    /**
-     * Sets the value of the requestHeader property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link RequestHeader }
-     *
-     */
-    public void setRequestHeader(RequestHeader value) {
-        this.requestHeader = value;
-    }
-
-    /**
-     * Gets the value of the requestData property.
-     *
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *
-     */
-    public Object getRequestData() {
-        return requestData;
-    }
-
-    /**
-     * Sets the value of the requestData property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *
-     */
-    public void setRequestData(Object value) {
-        this.requestData = value;
-    }
-
-	@Override
-	public String toString() {
-
-		String rd = "";
-		if (requestData != null)
-		{
-			Node node = (Node) requestData;
-			Document doc = node.getOwnerDocument();
-			rd = Utils.domToStr(doc);
-		}
-		return "SDNCAdapterRequest [requestHeader=" + requestHeader.toString()
-				+ ", requestData=" + rd + "]";
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterPortType.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterPortType.java
deleted file mode 100644
index 08d3bdbad7..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterPortType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-
-
-//SDNCAdapter to BPEL Async response WEB Service
-@WebService(targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/callback/wsdl/v1", name = "SDNCCallbackAdapterPortType")
-@XmlSeeAlso({ObjectFactory.class})
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface SDNCCallbackAdapterPortType {
-
-    @WebResult(name = "SDNCAdapterResponse", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackResponse")
-    @WebMethod(operationName = "SDNCAdapterCallback")
-    public SDNCAdapterResponse sdncAdapterCallback(
-        @WebParam(partName = "SDNCAdapterCallbackRequest", name = "SDNCAdapterCallbackRequest", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1")
-        SDNCAdapterCallbackRequest sdncAdapterCallbackRequest
-    );
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterService.java
deleted file mode 100644
index 0e65a3080f..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCCallbackAdapterService.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * This class was generated by Apache CXF 2.7.11.redhat-3
- * 2015-01-28T11:07:02.074-05:00
- * Generated source version: 2.7.11.redhat-3
- *
- */
-//SDNCAdapter to BPEL Async response WEB Service
-@WebServiceClient(name = "SDNCCallbackAdapterService",
-                  wsdlLocation = "main/resources/SDNCCallbackAdapter.wsdl",
-                  targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/callback/wsdl/v1")
-public class SDNCCallbackAdapterService extends Service {
-
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-
-    public final static URL WSDL_LOCATION;
-    public final static QName SERVICE = new QName("http://org.openecomp/workflow/sdnc/adapter/callback/wsdl/v1", "SDNCCallbackAdapterService");
-    public final static QName SDNCCallbackAdapterSoapHttpPort = new QName("http://org.openecomp/workflow/sdnc/adapter/callback/wsdl/v1", "SDNCCallbackAdapterSoapHttpPort");
-    static {
-        URL wsdlUrl = null;
-        try {
-        	wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("main/resources/SDNCCallbackAdapter.wsdl");
-        	//wsdlUrl = SDNCCallbackAdapterService.class.getClassLoader().getResource("SDNCCallbackAdapter.wsdl");
-        } catch (Exception e) {
-            msoLogger.error(MessageEnum.RA_WSDL_NOT_FOUND, "SDNCCallbackAdapter.wsdl", "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception - WSDL not found", e);
-        }
-        if(wsdlUrl == null) {
-        	msoLogger.error(MessageEnum.RA_WSDL_NOT_FOUND, "SDNCCallbackAdapter.wsdl", "SDNC", "", MsoLogger.ErrorCode.DataError, "WSDL not found");
-    	} else {
-    		try {
-    			msoLogger.info(MessageEnum.RA_PRINT_URL, "SDNCCallbackAdapter.wsdl", wsdlUrl.toURI().toString(), "SDNC", "");
-			} catch (Exception e) {
-				msoLogger.error(MessageEnum.RA_WSDL_URL_CONVENTION_EXC, "SDNCCallbackAdapter.wsdl", "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception - URL convention problem", e);
-			}
-    	}
-        WSDL_LOCATION = wsdlUrl;
-    }
-
-    public SDNCCallbackAdapterService(URL wsdlLocation) {
-        super(wsdlLocation, SERVICE);
-    }
-
-    public SDNCCallbackAdapterService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public SDNCCallbackAdapterService() {
-        super(WSDL_LOCATION, SERVICE);
-    }
-
-    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
-    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
-    //compliant code instead.
-    public SDNCCallbackAdapterService(WebServiceFeature ... features) {
-        super(WSDL_LOCATION, SERVICE, features);
-    }
-
-    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
-    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
-    //compliant code instead.
-    public SDNCCallbackAdapterService(URL wsdlLocation, WebServiceFeature ... features) {
-        super(wsdlLocation, SERVICE, features);
-    }
-
-    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
-    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
-    //compliant code instead.
-    public SDNCCallbackAdapterService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
-        super(wsdlLocation, serviceName, features);
-    }
-
-    /**
-     *
-     * @return
-     *     returns SDNCCallbackAdapterPortType
-     */
-    @WebEndpoint(name = "SDNCCallbackAdapterSoapHttpPort")
-    public SDNCCallbackAdapterPortType getSDNCCallbackAdapterSoapHttpPort() {
-        return super.getPort(SDNCCallbackAdapterSoapHttpPort, SDNCCallbackAdapterPortType.class);
-    }
-
-    /**
-     *
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SDNCCallbackAdapterPortType
-     */
-    @WebEndpoint(name = "SDNCCallbackAdapterSoapHttpPort")
-    public SDNCCallbackAdapterPortType getSDNCCallbackAdapterSoapHttpPort(WebServiceFeature... features) {
-        return super.getPort(SDNCCallbackAdapterSoapHttpPort, SDNCCallbackAdapterPortType.class, features);
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCRequestIdUtil.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCRequestIdUtil.java
deleted file mode 100644
index d905748591..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCRequestIdUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-public class SDNCRequestIdUtil {
-	// Add private constructor to prevent instance creation.
-	private SDNCRequestIdUtil () {}
-
-    public static String getSDNCOriginalRequestId (String newRequestId) {
-     	
-    	// Camunda scripts will add postfix, such as -1, -2, on the original requestID, to make sure requestID is unique while sending request to SDNC 
-     	// In order to use the unique requestID in logging, need to remove the postfix added by the Camunda scripts
-     	// Verify whether the requestId is a valid UUID with postfix (-1, -2). If yes, it should contain 5 times char '-', since valid UUID contains 4 times '-'
-    	// If the requestId is not a valid UUID with postfix, we do nothing
-		if (newRequestId.split("-").length == 6) {
-			return newRequestId.substring(0, newRequestId.lastIndexOf('-'));
-		}
-		return newRequestId;
-    }
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCResponse.java
deleted file mode 100644
index 850f5b4734..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCResponse.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import java.io.Serializable;
-
-public class SDNCResponse implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	private String reqId = null;
-	private int respCode = 0;
-	private String respMsg = null;
-	private String sdncResp = null;
-
-	public SDNCResponse(String reqId) {
-		this.reqId = reqId;
-	}
-	public SDNCResponse(String reqId, int respCode, String respMsg) {
-		this.reqId = reqId;
-		this.respCode = respCode;
-		this.respMsg = respMsg;
-	}
-
-	public String getReqId() {
-		return reqId;
-	}
-	public void setReqId(String reqId) {
-		this.reqId = reqId;
-	}
-	public int getRespCode() {
-		return respCode;
-	}
-	public void setRespCode(int respCode) {
-		this.respCode = respCode;
-	}
-	public String getRespMsg() {
-		return respMsg;
-	}
-	public void setRespMsg(String respMsg) {
-		this.respMsg = respMsg;
-	}
-	public String getSdncResp() {
-		return sdncResp;
-	}
-	public void setSdncResp(String sdncResp) {
-		this.sdncResp = sdncResp;
-	}
-
-	@Override
-	public String toString() {
-		return "SDNCResponse [reqId=" + reqId + ", respCode=" + respCode
-				+ ", respMsg=" + respMsg + ", sdncResp=" + sdncResp + "]";
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCSyncRpcClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCSyncRpcClient.java
deleted file mode 100644
index ce9b706760..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/SDNCSyncRpcClient.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.XMLConstants;
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-
-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 org.xml.sax.SAXException;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.openecomp.mso.client.sdnc.beans.SDNCRequest;
-import org.openecomp.mso.client.sdnc.beans.SDNCSvcAction;
-import org.openecomp.mso.client.sdnc.beans.SDNCSvcOperation;
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.properties.MsoJavaProperties;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-
-//SDNCAdapter to SDNC Rest Client
-public class SDNCSyncRpcClient implements Runnable {
-
-	private MsoPropertiesFactory msoPropertiesFactory;
-	
-	private SDNCRequest bpelRequest;
-
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-	private static MsoAlarmLogger alarmLogger = new MsoAlarmLogger();
-	public static final String MSO_PROP_SDNC_ADAPTER="MSO_PROP_SDNC_ADAPTER";
-
-
-	public SDNCSyncRpcClient(SDNCRequest bpelRequest,MsoPropertiesFactory msoPropFactory) {
-		this.bpelRequest = bpelRequest;
-		msoPropertiesFactory = msoPropFactory;
-	}
-
-	@Override
-	public void run()
-	{
-		String action = bpelRequest.getSvcAction().toString();
-		String operation = bpelRequest.getSvcOperation().toString();
-		String bpelReqId = bpelRequest.getRequestId();
-		String msoAction = bpelRequest.getMsoAction();
-		MsoLogger.setLogContext(SDNCRequestIdUtil.getSDNCOriginalRequestId (bpelReqId), bpelRequest.getSvcInstanceId());
-		MsoLogger.setServiceName("SDNCRestClient");
-		String sdncReqBody = "";
-
-		msoLogger.debug("BPEL Request:" + bpelRequest.toString());
-		RequestTunables rt = new RequestTunables(bpelReqId, msoAction, operation, action, msoPropertiesFactory);
-		rt.setTunables();
-		rt.setSdncaNotificationUrl(SDNCAdapterPortTypeImpl.getProperty(Constants.MY_URL_PROP, Constants.DEFAULT_MY_URL,msoPropertiesFactory));
-
-		if ("POST".equals(rt.getReqMethod())) {
-			try {
-				DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-				InputSource is = new InputSource();
-				is.setCharacterStream(new StringReader(bpelRequest.getRequestData()));
-				Document reqDoc = db.parse(is);
-				sdncReqBody = Utils.genSdncReq(reqDoc, rt);
-			}catch(Exception ex) {
-				throw new IllegalStateException();
-			}
-		} else if("PUT".equals(rt.getReqMethod())) {
-			try {
-				DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-				InputSource is = new InputSource();
-				is.setCharacterStream(new StringReader(bpelRequest.getRequestData()));
-				Document reqDoc = db.parse(is);
-				sdncReqBody = Utils.genSdncPutReq(reqDoc, rt);
-			}catch(Exception ex) {
-				throw new IllegalStateException();
-			}
-		}
-		long sdncStartTime = System.currentTimeMillis();
-		SDNCResponse sdncResp = getSdncResp(sdncReqBody, rt, msoPropertiesFactory);
-		msoLogger.recordMetricEvent (sdncStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully received response from SDNC", "SDNC", action + "." + operation, null);
-		msoLogger.debug ("Got the SDNC Code : " + sdncResp.getRespCode());
-		msoLogger.debug ("Got the SDNC Response Message:" + sdncResp.getRespMsg());
-		validateSDNCResponse(sdncResp.getSdncResp());
-		return;
-	}
-
-	public static SDNCResponse getSdncResp(String sdncReqBody, RequestTunables rt, MsoPropertiesFactory msoPropertiesFactoryp) {
-		URL url;
-		HttpURLConnection con = null;
-		DataOutputStream out = null;
-		BufferedReader in = null;
-		SDNCResponse sdncResp = new SDNCResponse(rt.getReqId());
-		StringBuffer response = new StringBuffer();
-
-		msoLogger.info(MessageEnum.RA_SEND_REQUEST_SDNC, rt.toString(), "SDNC", "");
-		msoLogger.debug("SDNC Request Body:\n" + sdncReqBody);
-
-		try {
-			msoLogger.debug("url is: " + rt.getSdncUrl());
-			url = new URL(rt.getSdncUrl());
-			con = (HttpURLConnection) url.openConnection();
-		    con.setConnectTimeout(Integer.parseInt(SDNCAdapterPortTypeImpl.getProperty(Constants.SDNC_CONNECTTIME_PROP, "2000",msoPropertiesFactoryp)));
-		    con.setReadTimeout(Integer.parseInt(rt.getTimeout()));
-			con.setRequestProperty("Accept", "application/json");
-			String userCredentials = msoPropertiesFactoryp.getMsoJavaProperties(MSO_PROP_SDNC_ADAPTER).getEncryptedProperty(Constants.SDNC_AUTH_PROP, Constants.DEFAULT_SDNC_AUTH, Constants.ENCRYPTION_KEY);
-
-			String basicAuth = "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes());
-			con.setRequestProperty ("Authorization", basicAuth);
-		    con.setRequestMethod(rt.getReqMethod());
-
-		    if ("POST".equals(rt.getReqMethod()) || "PUT".equals(rt.getReqMethod())) {
-		    	con.setRequestProperty("Content-type", "application/json");
-		    	con.setRequestProperty("Content-length",String.valueOf(sdncReqBody.length()));
-				con.setDoOutput(true);
-				out = new DataOutputStream(con.getOutputStream());
-				out.writeBytes(sdncReqBody);
-				out.flush();
-				out.close();
-		    }
-
-			//Get response
-			sdncResp.setRespCode(con.getResponseCode());
-			sdncResp.setRespMsg(con.getResponseMessage());
-
-			if (con.getResponseCode()>= 200 && con.getResponseCode()<=299) { 
-				in = new BufferedReader(new InputStreamReader(con.getInputStream()));	
-				String inputLine;
-				//Not parsing the response -it contains a responseHdr section and data section
-				while ((inputLine = in.readLine()) != null) {
-					response.append(inputLine);
-				}
-				in.close();
-			}
-			
-			sdncResp.setSdncResp(response.toString());
-			msoLogger.info(MessageEnum.RA_RESPONSE_FROM_SDNC, sdncResp.toString(), "SDNC", "");
-			return(sdncResp);
-		} catch (Exception e) {
-			msoLogger.error(MessageEnum.RA_EXCEPTION_COMMUNICATE_SDNC, "SDNC", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception processing request to SDNC", e);
-			//default
-			sdncResp.setRespCode(HttpURLConnection.HTTP_INTERNAL_ERROR);
-			String respMsg = "Error processing request to SDNC. ";
-			String sdncErrMsg = null;
-
-			if (e instanceof java.net.SocketTimeoutException ) {
-				sdncResp.setRespCode(HttpURLConnection.HTTP_CLIENT_TIMEOUT);
-				respMsg = "Request to SDNC timed out. ";
-			}
-			if (con != null) {
-				try { //e1
-					if (con.getResponseCode() != HttpURLConnection.HTTP_OK) //seen in SocketException connection reset 
-						sdncResp.setRespCode(con.getResponseCode());
-					respMsg = respMsg + con.getResponseMessage() + ". ";
-					InputStream is = con.getErrorStream();
-					if (is != null) {
-						XPathFactory xpathFactory = XPathFactory.newInstance();
-					    XPath xpath = xpathFactory.newXPath();
-						DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                        dbf.setFeature (XMLConstants.FEATURE_SECURE_PROCESSING, true);
-						DocumentBuilder db;
-						Document doc = null;
-						try { //e2
-							db = dbf.newDocumentBuilder();
-							doc = db.parse(is);
-							NodeList errors = (NodeList)xpath.evaluate("errors/error", doc, XPathConstants.NODESET);
-							for (int i = 0; i < errors.getLength(); i++) {
-								Element error = (Element) errors.item(i);
-								String eType = null;
-								try {
-									eType = xpath.evaluate("error-type", error);
-									sdncErrMsg = ". SDNC Returned-[error-type:" + eType;
-								} catch (Exception e3) {
-								    msoLogger.error (MessageEnum.RA_EVALUATE_XPATH_ERROR, "error-type", error.toString(), "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception while evaluate xpath", e3);
-								}
-
-								String eTag = null;
-								try {
-									eTag = xpath.evaluate( "error-tag", error);
-									sdncErrMsg = sdncErrMsg + ", error-tag:" + eTag;
-								} catch (Exception e3) {
-									msoLogger.error (MessageEnum.RA_EVALUATE_XPATH_ERROR, "error-tag", error.toString(), "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception while evaluate xpath", e3);
-								}
-
-								String eMsg = null;
-								try {
-									eMsg = xpath.evaluate("error-message", error);
-									sdncErrMsg = sdncErrMsg + ", error-message:" + eMsg + "]";
-								} catch (Exception e3) {
-									msoLogger.error (MessageEnum.RA_EVALUATE_XPATH_ERROR, "error-message", error.toString(), "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception while evaluate xpath", e3);
-								}
-							}
-						} catch (Exception e2) {
-						    msoLogger.error (MessageEnum.RA_ANALYZE_ERROR_EXC, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception while analyse error", e2);
-						}
-					} //is != null
-				} catch (Exception e1) {
-					msoLogger.error (MessageEnum.RA_ERROR_GET_RESPONSE_SDNC, "SDNC", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception while get SDNC response", e1);
-				}
-			} //con != null
-
-			if (e.getMessage() != null) {
-                respMsg = respMsg + e.getMessage();
-            }
-			if (sdncErrMsg != null) {
-                respMsg = respMsg + sdncErrMsg;
-            }
-
-			sdncResp.setRespMsg(respMsg);
-
-			msoLogger.error(MessageEnum.RA_EXCEPTION_COMMUNICATE_SDNC, "SDNC", "", MsoLogger.ErrorCode.AvailabilityError, "Exception while communicate with SDNC", e);
-			alarmLogger.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, respMsg);
-			return(sdncResp);
-		}
-		finally {
-			if (con != null) {
-                con.disconnect();
-            }
-		}
-	}
-	public void validateSDNCResponse (String sdncResponse){
-		String msg;
-		msoLogger.debug ("Starting validate sdnc response");
-		String responseMessage = "";
-		String responseCode = "";
-		if (sdncResponse != null || !sdncResponse.equals("")){
-			try{
-				msoLogger.debug ("Got the SDNC Response: " + sdncResponse);
-				JSONObject jsonObj = new JSONObject(sdncResponse);
-				msoLogger.debug ("jsonObj has been created");
-				
-				JSONObject requestData = jsonObj.getJSONObject("v1:RequestData");
-				JSONObject output =  requestData.getJSONObject("output");
-				try{
-					responseMessage = output.getString("response-message");
-					responseCode = output.getString("response-code");	
-				} catch (Exception ex) {
-					msoLogger.debug("Response not in lower hyphen");
-				}
-				if(responseMessage.equals("")&&responseCode.equals("")){
-					try{
-						responseMessage = output.getString("ResponseMessage");
-						responseCode = output.getString("ResponseCode");	
-					} catch (Exception ex) {
-						msoLogger.debug("Response does not exist");
-					}
-				}
-				msoLogger.debug("ResponseMessage is: " + responseMessage);
-				msoLogger.debug("Response Code is: " + responseCode);
-				if(responseMessage.equals("")){
-					msg = "Error from SDNC: Response Message is empty.";
-					msoLogger.debug(msg);
-					throw new IllegalStateException(msg);
-				}
-				
-				if(responseCode.equals("")){
-					responseCode = "0";
-				}
-				
-				int code = Integer.parseInt(responseCode);
-				if(code >=200 && code <=299 || code ==0){
-					msoLogger.debug ("Successful Response from SDNC");
-	
-				} else {
-					msg = "Error from SDNC: Code is not 200-299 or 0.";
-					msoLogger.debug(msg);
-					throw new IllegalStateException(msg);
-				}
-			} catch (Exception ex) {
-				msg = "Validate SDNC Response has failed.";
-				msoLogger.debug(msg);
-				throw new IllegalStateException(msg);
-			}
-		}
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Utils.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Utils.java
deleted file mode 100644
index 7457b59390..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/sync/Utils.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sdnc.sync;
-
-
-import java.io.StringWriter;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.logger.MessageEnum;
-public class Utils {
-
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-
-	public static String genSdncReq(Document reqDoc, RequestTunables rt) {
-		try {
-
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-
-			//NewDoc for output
-			//Root
-			Document newdoc = db.newDocument();
-			Element root = newdoc.createElementNS(rt.getNamespace(), "input");
-			newdoc.appendChild(root);
-
-			//Header
-			Element hdr = newdoc.createElement(rt.getHeaderName());
-			root.appendChild(hdr);
-
-			String elemData = rt.getReqId();
-			Element hdrChild;
-			if (elemData != null && elemData.length() > 0)
-			{
-				hdrChild = newdoc.createElement("svc-request-id");
-				hdrChild.appendChild(newdoc.createTextNode(elemData));
-				hdr.appendChild(hdrChild);
-			}
-
-			elemData = rt.getAction();
-			if (elemData != null && elemData.length() > 0)
-			{
-				hdrChild = newdoc.createElement("svc-action");
-				hdrChild.appendChild(newdoc.createTextNode(elemData));
-				hdr.appendChild(hdrChild);
-			}
-
-			elemData = rt.getSdncaNotificationUrl();
-			if (elemData != null && elemData.length() > 0)
-			{
-				hdrChild = newdoc.createElement("svc-notification-url");
-				hdrChild.appendChild(newdoc.createTextNode(elemData));
-				hdr.appendChild(hdrChild);
-			}
-
-			//RequestData
-			NodeList nodes = reqDoc.getDocumentElement().getChildNodes();
-			for (int i = 0; i < nodes.getLength(); i++) {
-				Node n = nodes.item(i);
-				Node newNode = newdoc.importNode(n, true);
-				root.appendChild(newNode);
-			}
-
-			String s = domToStr(newdoc);
-			msoLogger.debug("Formatted SdncReq:\n" + s);
-			return (s);
-
-		} catch (Exception e) {
-			msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_REQUEST, "SDNC", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in genSdncReq", e);
-		}
-		return(null);
-	}
-	
-	public static String genSdncPutReq(Document reqDoc, RequestTunables rt) {
-		try {
-
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-
-			//NewDoc for output
-			//Root
-			Document newdoc = db.newDocument();
-			
-			//RequestData
-			NodeList nodes = reqDoc.getDocumentElement().getChildNodes();
-			
-			
-			Element root = newdoc.createElement(nodes.item(0).getNodeName());
-			newdoc.appendChild(root);
-
-			NodeList childNodes = nodes.item(0).getChildNodes();
-			for (int i = 0; i < childNodes.getLength(); i++) {				
-					Node n = childNodes.item(i);
-					Node newNode = newdoc.importNode(n, true);
-					root.appendChild(newNode);				
-			}
-
-			String s = domToStr(newdoc);
-			msoLogger.debug("Formatted SdncPutReq:\n" + s);
-			return (s);
-
-		} catch (Exception e) {
-			msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_REQUEST, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception in genSdncPutReq", e);
-		}
-		return(null);
-	}
-
-	public static String genMsoFailResp(SDNCResponse resp) {
-		try {
-
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-
-			//NewDoc for output
-			//Root
-			Document newdoc = db.newDocument();
-			Element root = newdoc.createElement("output");
-			newdoc.appendChild(root);
-
-			Element elem1 = newdoc.createElement("svc-request-id");
-			elem1.appendChild(newdoc.createTextNode(resp.getReqId()));
-			root.appendChild(elem1);
-
-			Element elem2 = newdoc.createElement("response-code");
-			elem2.appendChild(newdoc.createTextNode(String.valueOf(resp.getRespCode())));
-			root.appendChild(elem2);
-
-			Element elem3 = newdoc.createElement("response-message");
-			elem3.appendChild(newdoc.createTextNode(String.valueOf(resp.getRespMsg())));
-			root.appendChild(elem3);
-
-			String s = domToStr(newdoc);
-			msoLogger.debug("Formatted SdncReq:" + s);
-			return (s);
-
-		} catch (Exception e) {
-			msoLogger.error(MessageEnum.RA_ERROR_CREATE_SDNC_RESPONSE, "SDNC", "", MsoLogger.ErrorCode.DataError, "Exception in genMsoFailResp", e);
-		}
-		return(null);
-	}
-
-
-	public static String domToStr(Document doc)
-	{
-		if (doc != null)
-		{
-			try {
-				DOMSource ds = new DOMSource(doc);
-				StringWriter sw = new StringWriter();
-				StreamResult sr = new StreamResult(sw);
-				TransformerFactory tf = TransformerFactory.newInstance();
-				Transformer t = tf.newTransformer();
-				//t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");//<?xml version="1.0" encoding="UTF-8"?>
-				t.transform(ds, sr);
-				String s = sw.toString();
-				
-				// This is an awful fix for now but we don't want that xmlns="" to be generated
-				s = s.replaceAll("xmlns=\"\"", "");
-				return(s);
-			} catch (Exception e) {
-				msoLogger.error(MessageEnum.RA_ERROR_CONVERT_XML2STR, "", "", MsoLogger.ErrorCode.DataError, "Exception - domToStr", e);
-			}
-		}
-		return(null);
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/persistence.xml b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/persistence.xml
index d7166d81a9..fb027b8ed0 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/persistence.xml
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/persistence.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ============LICENSE_START=======================================================

-  ECOMP 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=========================================================

-  -->

-

-<persistence version="2.0"

-  xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="

-        http://java.sun.com/xml/ns/persistence

-        http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">

-

-  <persistence-unit name="common">

-    <jta-data-source>java:jboss/datasources/ProcessEngine</jta-data-source>

-    <properties>

-      <!-- Properties for Hibernate -->

-      <property name="hibernate.hbm2ddl.auto" value="create-drop" />

-      <property name="hibernate.show_sql" value="true" />

-    </properties>

-  </persistence-unit>

-

-</persistence>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ECOMP 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=========================================================
+  -->
+
+<persistence version="2.0"
+  xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+        http://java.sun.com/xml/ns/persistence
+        http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+
+  <persistence-unit name="common">
+    <jta-data-source>java:jboss/datasources/ProcessEngine</jta-data-source>
+    <properties>
+      <!-- Properties for Hibernate -->
+      <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+      <property name="hibernate.show_sql" value="true" />
+    </properties>
+  </persistence-unit>
+
+</persistence>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
index 772867d3f2..33c8cb1ac0 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
@@ -22,7 +22,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <process-archive name="MSOCommonBPMN">
-        <process-engine>default</process-engine>
         <properties>
             <property name="isDeleteUponUndeploy">false</property>
             <property name="isScanForProcessDefinitions">true</property>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.RestProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.RestProperties
new file mode 100644
index 0000000000..bdc72c86a4
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.RestProperties
@@ -0,0 +1,2 @@
+org.onap.so.client.restproperties.AAIPropertiesImpl
+org.onap.so.client.restproperties.PolicyRestPropertiesImpl
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.dmaap.DmaapProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.dmaap.DmaapProperties
new file mode 100644
index 0000000000..878841f563
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.onap.so.client.dmaap.DmaapProperties
@@ -0,0 +1 @@
+org.onap.so.client.dmaapproperties.DefaultDmaapPropertiesImpl
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties
deleted file mode 100644
index 2668367d16..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties
+++ /dev/null
@@ -1,2 +0,0 @@
-org.openecomp.mso.client.restproperties.AAIPropertiesImpl
-org.openecomp.mso.client.restproperties.PolicyRestPropertiesImpl
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties
deleted file mode 100644
index 8010194263..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.mso.client.dmaaproperties.DefaultDmaapPropertiesImpl
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/logback.xml b/bpmn/MSOCommonBPMN/src/main/resources/logback.xml
deleted file mode 100644
index 133fa54003..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/logback.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP 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=========================================================
-  -->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-  <!--<jmxConfigurator /> -->
-  <!-- directory path for all other type logs -->
-  <property name="logDir" value="/var/log/ecomp" />
-
-  <!-- directory path for debugging type logs -->
-  <property name="debugDir" value="/var/log/ecomp" />
-
-  <!--  specify the component name
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
-  <property name="componentName" value="MSO"></property>
-  <property name="subComponentName" value="BPMN"></property>
-  <!--  log file names -->
-  <property name="errorLogName" value="error" />
-  <property name="metricsLogName" value="metrics" />
-  <property name="auditLogName" value="audit" />
-  <property name="debugLogName" value="debug" />
-
-  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
-  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
-  
-  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
-  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
-  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
-  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-
-
-  <!-- ============================================================================ -->
-  <!-- EELF Appenders -->
-  <!-- ============================================================================ -->
-
-  <!-- The EELFAppender is used to record events to the general application
-    log -->
-
-  <!-- EELF Audit Appender. This appender is used to record audit engine
-    related logging events. The audit logger and appender are specializations
-    of the EELF application root logger and appender. This can be used to segregate
-    Policy engine events from other components, or it can be eliminated to record
-    these events as part of the application root log. -->
-
-  <appender name="EELFAudit"
-            class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
-    <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
-      <!--<maxHistory>30</maxHistory>-->
-    </rollingPolicy>
-    <encoder>
-      <pattern>${auditPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFAudit" />
-  </appender>
-
-  <appender name="EELFMetrics"
-            class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
-    <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
-      <!--<maxHistory>30</maxHistory>-->
-    </rollingPolicy>
-    <encoder>
-      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
-        %msg%n"</pattern> -->
-      <pattern>${metricPattern}</pattern>
-    </encoder>
-  </appender>
-
-
-  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFMetrics"/>
-  </appender>
-
-  <appender name="EELFError"
-            class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
-    <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
-      <!--<maxHistory>30</maxHistory>-->
-    </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
-    <encoder>
-      <pattern>${errorPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFError"/>
-  </appender>
-
-  <appender name="EELFDebug"
-            class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
-    <rollingPolicy
-            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
-      <!--<maxHistory>30</maxHistory>-->
-    </rollingPolicy>
-    <encoder>
-      <pattern>${debugPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFDebug" />
-    <includeCallerData>true</includeCallerData>
-  </appender>
-
-
-  <!-- ============================================================================ -->
-  <!--  EELF loggers -->
-  <!-- ============================================================================ -->
-
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="asyncEELFAudit" />
-  </logger>
-
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
-    <appender-ref ref="asyncEELFMetrics" />
-  </logger>
-
-  <logger name="com.att.eelf.error" level="debug" additivity="false">
-    <appender-ref ref="asyncEELFError" />
-  </logger>
-  <root level="INFO">
-    <appender-ref ref="asyncEELFDebug" />
-  </root>
-
-</configuration>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
index fb25363a76..db811b10e7 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
@@ -8,7 +8,7 @@
     <bpmn:scriptTask id="PreProcessRequest" name="PreProcessRequest" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1wz1rfg</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_14vlkf4</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def acc = new AppCClient()
 acc.preProcessRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
@@ -21,7 +21,7 @@ acc.preProcessRequest(execution)]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_14vlkf4</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1j937vi</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.onap.appc.client.lcm.model.Action
-import org.openecomp.mso.bpmn.common.scripts.*
+import org.onap.so.bpmn.common.scripts.*
 def acc = new AppCClient()
 acc.runAppcCommand(execution)]]></bpmn:script>
     </bpmn:scriptTask>
@@ -38,7 +38,7 @@ acc.runAppcCommand(execution)]]></bpmn:script>
       <bpmn:scriptTask id="Task_0a36o0m" name="Process Error" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_1wi3avf</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_1gq753e</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn:script>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
index 841964211e..d5223bca14 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
@@ -1,142 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="DecomposeService" name="DecomposeService" isExecutable="true">

-    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_0tj2l1j</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Java Exception Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_0yljq9y">

-        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_117lkk3">

-        <bpmn2:incoming>SequenceFlow_0g4aus9</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="processJavaError" />

-      <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-ExceptionUtil exceptionUtil = new ExceptionUtil()

-exceptionUtil.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0g4aus9" sourceRef="processJavaError" targetRef="EndEvent_117lkk3" />

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="decomposeService_ScriptTask" name="Decompose Service" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_12vj619</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0tj2l1j</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def dds = new DecomposeService()

-dds.actuallyDecomposeService(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0tj2l1j" sourceRef="decomposeService_ScriptTask" targetRef="EndEvent_3" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def dds = new DecomposeService()

-dds.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0yxffj2" sourceRef="preProcessRequest_ScriptTask" targetRef="queryCatalogDB_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_12vj619" sourceRef="queryCatalogDB_ScriptTask" targetRef="decomposeService_ScriptTask" />

-    <bpmn2:scriptTask id="queryCatalogDB_ScriptTask" name="Query Catalog DB" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def dds = new DecomposeService()

-dds.queryCatalogDb(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DecomposeService">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">

-        <dc:Bounds x="152" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="147" y="120" width="48" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="188" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="301" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="245" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

-        <dc:Bounds x="898" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="916" y="120" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">

-        <dc:Bounds x="142" y="243" width="417" height="161" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">

-        <dc:Bounds x="179" y="310" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="197" y="351" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">

-        <dc:Bounds x="465" y="310" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="483" y="351" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">

-        <di:waypoint xsi:type="dc:Point" x="215" y="328" />

-        <di:waypoint xsi:type="dc:Point" x="290" y="328" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="253" y="313" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0twd3su_di" bpmnElement="decomposeService_ScriptTask">

-        <dc:Bounds x="708" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0tj2l1j_di" bpmnElement="SequenceFlow_0tj2l1j">

-        <di:waypoint xsi:type="dc:Point" x="808" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="898" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="853" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="301" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0yxffj2_di" bpmnElement="SequenceFlow_0yxffj2">

-        <di:waypoint xsi:type="dc:Point" x="401" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="513" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="457" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0b5155c_di" bpmnElement="processJavaError">

-        <dc:Bounds x="290" y="288" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0g4aus9_di" bpmnElement="SequenceFlow_0g4aus9">

-        <di:waypoint xsi:type="dc:Point" x="390" y="328" />

-        <di:waypoint xsi:type="dc:Point" x="465" y="328" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="428" y="313" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_12vj619_di" bpmnElement="SequenceFlow_12vj619">

-        <di:waypoint xsi:type="dc:Point" x="613" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="708" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="661" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_17xngtx_di" bpmnElement="queryCatalogDB_ScriptTask">

-        <dc:Bounds x="513" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DecomposeService" name="DecomposeService" isExecutable="true">
+    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_0tj2l1j</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Java Exception Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_0yljq9y">
+        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_117lkk3">
+        <bpmn2:incoming>SequenceFlow_0g4aus9</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="processJavaError" />
+      <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil exceptionUtil = new ExceptionUtil()
+exceptionUtil.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0g4aus9" sourceRef="processJavaError" targetRef="EndEvent_117lkk3" />
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="decomposeService_ScriptTask" name="Decompose Service" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12vj619</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0tj2l1j</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.actuallyDecomposeService(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0tj2l1j" sourceRef="decomposeService_ScriptTask" targetRef="EndEvent_3" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0yxffj2" sourceRef="preProcessRequest_ScriptTask" targetRef="queryCatalogDB_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_12vj619" sourceRef="queryCatalogDB_ScriptTask" targetRef="decomposeService_ScriptTask" />
+    <bpmn2:scriptTask id="queryCatalogDB_ScriptTask" name="Query Catalog DB" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.queryCatalogDb(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DecomposeService">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
+        <dc:Bounds x="152" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="147" y="120" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="188" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="301" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="245" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="898" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="916" y="120" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
+        <dc:Bounds x="142" y="243" width="417" height="161" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">
+        <dc:Bounds x="179" y="310" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="197" y="351" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">
+        <dc:Bounds x="465" y="310" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="483" y="351" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">
+        <di:waypoint xsi:type="dc:Point" x="215" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="290" y="328" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="253" y="313" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0twd3su_di" bpmnElement="decomposeService_ScriptTask">
+        <dc:Bounds x="708" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tj2l1j_di" bpmnElement="SequenceFlow_0tj2l1j">
+        <di:waypoint xsi:type="dc:Point" x="808" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="898" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="853" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="301" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0yxffj2_di" bpmnElement="SequenceFlow_0yxffj2">
+        <di:waypoint xsi:type="dc:Point" x="401" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="513" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="457" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0b5155c_di" bpmnElement="processJavaError">
+        <dc:Bounds x="290" y="288" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0g4aus9_di" bpmnElement="SequenceFlow_0g4aus9">
+        <di:waypoint xsi:type="dc:Point" x="390" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="465" y="328" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="428" y="313" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_12vj619_di" bpmnElement="SequenceFlow_12vj619">
+        <di:waypoint xsi:type="dc:Point" x="613" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="708" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="661" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_17xngtx_di" bpmnElement="queryCatalogDB_ScriptTask">
+        <dc:Bounds x="513" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
index 91a6546621..fdb54116b8 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_vwRmIBsREeeIQtzUKIjH4g" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_vwRmIBsREeeIQtzUKIjH4g" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="Homing" name="Homing" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1x9usa6</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:scriptTask id="callSniro" name="Call Sniro" scriptFormat="groovy">
-      <bpmn2:incoming>sniroCall</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0gajic6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-SniroHoming homing = new SniroHoming()
-homing.callSniro(execution)]]></bpmn2:script>
+    <bpmn2:scriptTask id="callSniro" name="&#10;Call&#10;Sniro/Oof&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0lc15i7</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+if(execution.getVariable("homingService") == "oof"){
+  OofHoming oofHoming = new OofHoming()
+  oofHoming.callOof(execution)
+}else{
+  SniroHomingV1 sniroHoming = new SniroHomingV1()
+  sniroHoming.callSniro(execution)
+}]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1x9usa6" sourceRef="StartEvent_1" targetRef="homingSolutionCheck" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x9usa6" sourceRef="StartEvent_1" targetRef="callSniro" />
     <bpmn2:subProcess id="bpmnErrorSubprocess" name="Error Handling Subprocess" triggeredByEvent="true">
       <bpmn2:endEvent id="EndEvent_07tjq3v">
         <bpmn2:incoming>SequenceFlow_1rf4vs8</bpmn2:incoming>
@@ -24,7 +29,7 @@ homing.callSniro(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="processMsoWorkflowException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_00nlh7l</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1rf4vs8</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -35,7 +40,7 @@ ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0kamg53</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1o7154s</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -50,37 +55,18 @@ ex.processJavaException(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="SequenceFlow_0kamg53" name="" sourceRef="StartEvent_1fbpeuw" targetRef="processJavaException" />
       <bpmn2:sequenceFlow id="SequenceFlow_1o7154s" name="" sourceRef="processJavaException" targetRef="EndEvent_0jbvnr0" />
     </bpmn2:subProcess>
-    <bpmn2:scriptTask id="processSniroHomingSolution" name="Process &#10;Sniro Homing Solution&#10;" scriptFormat="groovy">
-      <bpmn2:incoming>sniroProcess</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1h9opg9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-SniroHoming homing = new SniroHoming()
-homing.processHomingSolution(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="responseCheck" name="Response Ok?" default="badResponse">
-      <bpmn2:incoming>SequenceFlow_12t0lqb</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0gajic6</bpmn2:incoming>
-      <bpmn2:outgoing>badResponse</bpmn2:outgoing>
-      <bpmn2:outgoing>goodResponse</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="assignError" name="Assign Error" scriptFormat="groovy">
-      <bpmn2:incoming>badResponse</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0clfkld</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[int responseCode = execution.getVariable("syncResponseCode") 
-
-import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
-ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from Sniro/OOF.")]]></bpmn2:script>
+    <bpmn2:scriptTask id="processSniroHomingSolution" name="&#10;Process Solution&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1fipbmk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_01apjvo</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+if(execution.getVariable("homingService") == "oof"){
+  OofHoming oofHoming = new OofHoming()
+  oofHoming.processHomingSolution(execution)
+}else{
+  SniroHomingV1  sniroHoming = new SniroHomingV1 ()
+  sniroHoming.processHomingSolution(execution)
+}]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="badResponse" name="No" sourceRef="responseCheck" targetRef="assignError" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0clfkld" sourceRef="assignError" targetRef="throwMSOWorkflowException2" />
-    <bpmn2:endEvent id="throwMSOWorkflowException2">
-      <bpmn2:incoming>SequenceFlow_0clfkld</bpmn2:incoming>
-      <bpmn2:errorEventDefinition errorRef="Error_10hit0u" />
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="goodResponse" name="Yes" sourceRef="responseCheck" targetRef="receiveAsyncCallback">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("syncResponseCode") == 202}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="receiveAsyncCallback" name="Receive Async Callback" camunda:modelerTemplate="receiveWorkflowMessage" calledElement="ReceiveWorkflowMessage">
       <bpmn2:extensionElements>
         <camunda:in source="true" target="isDebugLogEnabled" />
@@ -90,71 +76,16 @@ ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync
         <camunda:in source="timeout" target="RCVWFMSG_timeout" />
         <camunda:out source="WorkflowResponse" target="asyncCallbackResponse" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>goodResponse</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0lc15i7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1fipbmk</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_1h9opg9" sourceRef="processSniroHomingSolution" targetRef="EndEvent_0n56tas" />
-    <bpmn2:endEvent id="EndEvent_0n56tas">
-      <bpmn2:incoming>SequenceFlow_1h9opg9</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_07u9d7f</bpmn2:incoming>
+    <bpmn2:sequenceFlow id="SequenceFlow_1fipbmk" sourceRef="receiveAsyncCallback" targetRef="processSniroHomingSolution" />
+    <bpmn2:sequenceFlow id="SequenceFlow_01apjvo" sourceRef="processSniroHomingSolution" targetRef="EndEvent_0rrbz2a" />
+    <bpmn2:endEvent id="EndEvent_0rrbz2a">
+      <bpmn2:incoming>SequenceFlow_01apjvo</bpmn2:incoming>
       <bpmn2:terminateEventDefinition />
     </bpmn2:endEvent>
-    <bpmn2:exclusiveGateway id="homingSolutionCheck" name="Which homing Solution?" default="SequenceFlow_02eywxz">
-      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>
-      <bpmn2:outgoing>sniroCall</bpmn2:outgoing>
-      <bpmn2:outgoing>oofCall</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_02eywxz</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="ScriptTask_1pkjo1d" name="Call OOF" scriptFormat="groovy">
-      <bpmn2:incoming>oofCall</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_12t0lqb</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-OofHoming homing = new OofHoming()
-homing.callOof(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="sniroCall" name="Sniro" sourceRef="homingSolutionCheck" targetRef="callSniro">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "sniro"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="oofCall" name="OOF" sourceRef="homingSolutionCheck" targetRef="ScriptTask_1pkjo1d">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "oof"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_12t0lqb" sourceRef="ScriptTask_1pkjo1d" targetRef="responseCheck" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0gajic6" sourceRef="callSniro" targetRef="responseCheck" />
-    <bpmn2:exclusiveGateway id="processHomingCheck" name="Which homing Solution?">
-      <bpmn2:incoming>SequenceFlow_1fipbmk</bpmn2:incoming>
-      <bpmn2:outgoing>sniroProcess</bpmn2:outgoing>
-      <bpmn2:outgoing>oofProcess</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1fipbmk" sourceRef="receiveAsyncCallback" targetRef="processHomingCheck" />
-    <bpmn2:sequenceFlow id="sniroProcess" name="Sniro" sourceRef="processHomingCheck" targetRef="processSniroHomingSolution">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "sniro"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="oofProcess" name="OOF" sourceRef="processHomingCheck" targetRef="processOofHomingSolution">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "oof"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="processOofHomingSolution" name="Process &#10;OOF Homing Solution&#10;" scriptFormat="groovy">
-      <bpmn2:incoming>oofProcess</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_07u9d7f</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-OofHoming homing = new OofHoming()
-homing.processHomingSolution(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_07u9d7f" sourceRef="processOofHomingSolution" targetRef="EndEvent_0n56tas" />
-    <bpmn2:endEvent id="throwMSOWorkflowException1">
-      <bpmn2:incoming>SequenceFlow_1bub8mj</bpmn2:incoming>
-      <bpmn2:errorEventDefinition errorRef="Error_10hit0u" />
-    </bpmn2:endEvent>
-    <bpmn2:scriptTask id="ScriptTask_0t0fs4n" name="Assign Error" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_02eywxz</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1bub8mj</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[int responseCode = execution.getVariable("sniroHomingSolution")
-
-import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
-ex.buildAndThrowWorkflowException(execution, responseCode, "No sniroHomingSolution found for Sniro/OOF.")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1bub8mj" sourceRef="ScriptTask_0t0fs4n" targetRef="throwMSOWorkflowException1" />
-    <bpmn2:sequenceFlow id="SequenceFlow_02eywxz" sourceRef="homingSolutionCheck" targetRef="ScriptTask_0t0fs4n" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0lc15i7" sourceRef="callSniro" targetRef="receiveAsyncCallback" />
   </bpmn2:process>
   <bpmn2:error id="Error_10hit0u" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1lwpypa" name="Java Lang Exception" errorCode="java.lang.Exception" />
@@ -164,239 +95,112 @@ ex.buildAndThrowWorkflowException(execution, responseCode, "No sniroHomingSoluti
         <dc:Bounds x="147" y="275" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0qmfpdr_di" bpmnElement="callSniro">
-        <dc:Bounds x="391" y="137" width="100" height="80" />
+        <dc:Bounds x="313" y="253" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1x9usa6_di" bpmnElement="SequenceFlow_1x9usa6">
         <di:waypoint xsi:type="dc:Point" x="183" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="274" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="313" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="183.5" y="278" width="90" height="0" />
+          <dc:Bounds x="203" y="278" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_16p12qo_di" bpmnElement="bpmnErrorSubprocess" isExpanded="true">
-        <dc:Bounds x="254" y="496" width="409" height="168" />
+        <dc:Bounds x="254" y="449" width="409" height="168" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_12gjiy8_di" bpmnElement="javaExceptionSubProcess" isExpanded="true">
-        <dc:Bounds x="284" y="679" width="350" height="159" />
+        <dc:Bounds x="284" y="632" width="350" height="159" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_07tjq3v_di" bpmnElement="EndEvent_07tjq3v">
-        <dc:Bounds x="579" y="570" width="36" height="36" />
+        <dc:Bounds x="579" y="523" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="597" y="611" width="0" height="0" />
+          <dc:Bounds x="552" y="564" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1qiitb2_di" bpmnElement="StartEvent_1qiitb2">
-        <dc:Bounds x="299" y="570" width="36" height="36" />
+        <dc:Bounds x="299" y="523" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="317" y="611" width="0" height="0" />
+          <dc:Bounds x="272" y="564" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_03hs6s9_di" bpmnElement="processMsoWorkflowException">
-        <dc:Bounds x="406" y="548" width="100" height="80" />
+        <dc:Bounds x="406" y="501" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_19gqykh_di" bpmnElement="processJavaException">
-        <dc:Bounds x="410" y="727" width="100" height="80" />
+        <dc:Bounds x="410" y="680" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1fbpeuw_di" bpmnElement="StartEvent_1fbpeuw">
-        <dc:Bounds x="318" y="749" width="36" height="36" />
+        <dc:Bounds x="318" y="702" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="336" y="790" width="0" height="0" />
+          <dc:Bounds x="291" y="743" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0jbvnr0_di" bpmnElement="EndEvent_0jbvnr0">
-        <dc:Bounds x="567" y="749" width="36" height="36" />
+        <dc:Bounds x="567" y="702" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="585" y="790" width="0" height="0" />
+          <dc:Bounds x="540" y="743" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1rf4vs8_di" bpmnElement="SequenceFlow_1rf4vs8">
-        <di:waypoint xsi:type="dc:Point" x="506" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="579" y="588" />
+        <di:waypoint xsi:type="dc:Point" x="506" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="579" y="541" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="543" y="573" width="0" height="0" />
+          <dc:Bounds x="498" y="526" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_00nlh7l_di" bpmnElement="SequenceFlow_00nlh7l">
-        <di:waypoint xsi:type="dc:Point" x="335" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="363" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="363" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="406" y="588" />
+        <di:waypoint xsi:type="dc:Point" x="335" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="363" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="363" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="406" y="541" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="378" y="588" width="0" height="0" />
+          <dc:Bounds x="333" y="541" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0kamg53_di" bpmnElement="SequenceFlow_0kamg53">
-        <di:waypoint xsi:type="dc:Point" x="354" y="767" />
-        <di:waypoint xsi:type="dc:Point" x="410" y="767" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="720" />
+        <di:waypoint xsi:type="dc:Point" x="410" y="720" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="382" y="752" width="0" height="0" />
+          <dc:Bounds x="337" y="705" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1o7154s_di" bpmnElement="SequenceFlow_1o7154s">
-        <di:waypoint xsi:type="dc:Point" x="510" y="767" />
-        <di:waypoint xsi:type="dc:Point" x="567" y="767" />
+        <di:waypoint xsi:type="dc:Point" x="510" y="720" />
+        <di:waypoint xsi:type="dc:Point" x="567" y="720" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="539" y="752" width="0" height="0" />
+          <dc:Bounds x="494" y="705" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1aapkvq_di" bpmnElement="processSniroHomingSolution">
-        <dc:Bounds x="1293" y="253" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03gt5b8_di" bpmnElement="responseCheck" isMarkerVisible="true">
-        <dc:Bounds x="566" y="268" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="554" y="328" width="74" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0ikcqeo_di" bpmnElement="assignError">
-        <dc:Bounds x="777" y="184" width="100" height="80" />
+        <dc:Bounds x="597" y="253" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1m1c9nu_di" bpmnElement="badResponse">
-        <di:waypoint xsi:type="dc:Point" x="610" y="287" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="239" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="665.309770337371" y="246.39875517690592" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0clfkld_di" bpmnElement="SequenceFlow_0clfkld">
-        <di:waypoint xsi:type="dc:Point" x="877" y="224" />
-        <di:waypoint xsi:type="dc:Point" x="949" y="224" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="868" y="209" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_13ejfwp_di" bpmnElement="throwMSOWorkflowException2">
-        <dc:Bounds x="949" y="206" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="922" y="242" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1o3br3u_di" bpmnElement="goodResponse">
-        <di:waypoint xsi:type="dc:Point" x="610" y="299" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="356" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="667.027112499105" y="300.1275453507" width="19" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_031b5m3_di" bpmnElement="receiveAsyncCallback">
-        <dc:Bounds x="777" y="333" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1h9opg9_di" bpmnElement="SequenceFlow_1h9opg9">
-        <di:waypoint xsi:type="dc:Point" x="1393" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="355" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1406" y="278" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0ougemc_di" bpmnElement="EndEvent_0n56tas">
-        <dc:Bounds x="1491" y="355" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1464" y="391" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03vhlpt_di" bpmnElement="homingSolutionCheck" isMarkerVisible="true">
-        <dc:Bounds x="274" y="268" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="266" y="322" width="69" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1pkjo1d_di" bpmnElement="ScriptTask_1pkjo1d">
-        <dc:Bounds x="391" y="370" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1x12ld7_di" bpmnElement="sniroCall">
-        <di:waypoint xsi:type="dc:Point" x="299" y="268" />
-        <di:waypoint xsi:type="dc:Point" x="299" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="391" y="177" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="329" y="192" width="25" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0iu4ms3_di" bpmnElement="oofCall">
-        <di:waypoint xsi:type="dc:Point" x="299" y="318" />
-        <di:waypoint xsi:type="dc:Point" x="299" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="391" y="410" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="378" width="25" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_12t0lqb_di" bpmnElement="SequenceFlow_12t0lqb">
-        <di:waypoint xsi:type="dc:Point" x="491" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="318" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="496" y="389" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0gajic6_di" bpmnElement="SequenceFlow_0gajic6">
-        <di:waypoint xsi:type="dc:Point" x="491" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="268" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="496" y="156" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0dwcgfe_di" bpmnElement="processHomingCheck" isMarkerVisible="true">
-        <dc:Bounds x="942" y="348" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="934" y="402" width="69" height="24" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="455" y="253" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1fipbmk_di" bpmnElement="SequenceFlow_1fipbmk">
-        <di:waypoint xsi:type="dc:Point" x="877" y="373" />
-        <di:waypoint xsi:type="dc:Point" x="942" y="373" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="909.5" y="352" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_14jzswu_di" bpmnElement="sniroProcess">
-        <di:waypoint xsi:type="dc:Point" x="967" y="348" />
-        <di:waypoint xsi:type="dc:Point" x="967" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1293" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="555" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="597" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1034" y="312" width="25" height="12" />
+          <dc:Bounds x="531" y="272" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_158imry_di" bpmnElement="oofProcess">
-        <di:waypoint xsi:type="dc:Point" x="967" y="398" />
-        <di:waypoint xsi:type="dc:Point" x="967" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1293" y="469" />
+      <bpmndi:BPMNEdge id="SequenceFlow_01apjvo_di" bpmnElement="SequenceFlow_01apjvo">
+        <di:waypoint xsi:type="dc:Point" x="697" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="860" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1039" y="432" width="25" height="12" />
+          <dc:Bounds x="778.5" y="272" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0ihb64o_di" bpmnElement="processOofHomingSolution">
-        <dc:Bounds x="1293" y="429" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_07u9d7f_di" bpmnElement="SequenceFlow_07u9d7f">
-        <di:waypoint xsi:type="dc:Point" x="1393" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="391" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1451" y="448" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1rxyas7_di" bpmnElement="throwMSOWorkflowException1">
-        <dc:Bounds x="507" y="275" width="36" height="36" />
+      <bpmndi:BPMNShape id="EndEvent_07i1a5x_di" bpmnElement="EndEvent_0rrbz2a">
+        <dc:Bounds x="860" y="275" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="480" y="311" width="0" height="12" />
+          <dc:Bounds x="877.17" y="315" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0t0fs4n_di" bpmnElement="ScriptTask_0t0fs4n">
-        <dc:Bounds x="364" y="253" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1bub8mj_di" bpmnElement="SequenceFlow_1bub8mj">
-        <di:waypoint xsi:type="dc:Point" x="464" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="507" y="293" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="485.5" y="272" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_02eywxz_di" bpmnElement="SequenceFlow_02eywxz">
-        <di:waypoint xsi:type="dc:Point" x="324" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="364" y="293" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0lc15i7_di" bpmnElement="SequenceFlow_0lc15i7">
+        <di:waypoint xsi:type="dc:Point" x="413" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="455" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="272" width="0" height="12" />
+          <dc:Bounds x="434" y="272" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn
new file mode 100644
index 0000000000..9481ad892e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+  <bpmn:process id="HomingV2" name="HomingV2" isExecutable="true">
+    <bpmn:startEvent id="start">
+      <bpmn:outgoing>SequenceFlow_0gpuwes</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:subProcess id="subprocessBpmnError" name="Error Handling Subprocess" triggeredByEvent="true">
+      <bpmn:endEvent id="endBpmnError">
+        <bpmn:incoming>SequenceFlow_14dg22y</bpmn:incoming>
+        <bpmn:terminateEventDefinition />
+      </bpmn:endEvent>
+      <bpmn:startEvent id="catchBpmnError">
+        <bpmn:outgoing>SequenceFlow_0g3mn4b</bpmn:outgoing>
+        <bpmn:errorEventDefinition />
+      </bpmn:startEvent>
+      <bpmn:scriptTask id="processBpmnError" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>SequenceFlow_0g3mn4b</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_14dg22y</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil ex = new ExceptionUtil()
+ex.processSubflowsBPMNException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:sequenceFlow id="SequenceFlow_14dg22y" sourceRef="processBpmnError" targetRef="endBpmnError" />
+      <bpmn:sequenceFlow id="SequenceFlow_0g3mn4b" sourceRef="catchBpmnError" targetRef="processBpmnError" />
+    </bpmn:subProcess>
+    <bpmn:subProcess id="subprocessJavaException" triggeredByEvent="true">
+      <bpmn:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>seq</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_1epbfhx</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil ex = new ExceptionUtil()
+ex.processJavaException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:startEvent id="catchJavaException">
+        <bpmn:outgoing>seq</bpmn:outgoing>
+        <bpmn:errorEventDefinition errorRef="Error_0jmwlex" />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="endJavaException">
+        <bpmn:incoming>SequenceFlow_1epbfhx</bpmn:incoming>
+        <bpmn:terminateEventDefinition />
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="seq" name="" sourceRef="catchJavaException" targetRef="processJavaException" />
+      <bpmn:sequenceFlow id="SequenceFlow_1epbfhx" name="" sourceRef="processJavaException" targetRef="endJavaException" />
+    </bpmn:subProcess>
+    <bpmn:callActivity id="callReceiveAsync" name="Receive Async Callback" camunda:modelerTemplate="receiveWorkflowMessage" calledElement="ReceiveWorkflowMessage">
+      <bpmn:extensionElements>
+        <camunda:in source="true" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="asyncResponse" />
+        <camunda:in source="asyncCorrelator" target="RCVWFMSG_correlator" />
+        <camunda:in source="asyncMessageType" target="RCVWFMSG_messageType" />
+        <camunda:in source="asyncTimeout" target="RCVWFMSG_timeout" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>sequence_2</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0m9c6gt</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:endEvent id="end">
+      <bpmn:incoming>updateExecution</bpmn:incoming>
+      <bpmn:terminateEventDefinition />
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0gpuwes" sourceRef="start" targetRef="callSniro" />
+    <bpmn:sequenceFlow id="sequence_2" sourceRef="callSniro" targetRef="callReceiveAsync" />
+    <bpmn:sequenceFlow id="SequenceFlow_0m9c6gt" sourceRef="callReceiveAsync" targetRef="processSolution" />
+    <bpmn:sequenceFlow id="updateExecution" sourceRef="processSolution" targetRef="end" />
+    <bpmn:serviceTask id="callSniro" name="&#10;Call&#10;Sniro&#10;" camunda:expression="${SniroHoming.callSniro(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>SequenceFlow_0gpuwes</bpmn:incoming>
+      <bpmn:outgoing>sequence_2</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="processSolution" name="&#10;Process Solution&#10;" camunda:expression="${SniroHoming.processSolution(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)), asyncResponse)}">
+      <bpmn:incoming>SequenceFlow_0m9c6gt</bpmn:incoming>
+      <bpmn:outgoing>updateExecution</bpmn:outgoing>
+    </bpmn:serviceTask>
+  </bpmn:process>
+  <bpmn:error id="Error_0jmwlex" name="Java Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="HomingV2">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="start">
+        <dc:Bounds x="135" y="225" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="108" y="261" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_1se9fyh_di" bpmnElement="subprocessBpmnError" isExpanded="true">
+        <dc:Bounds x="246" y="399" width="409" height="168" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0rphl19_di" bpmnElement="subprocessJavaException" isExpanded="true">
+        <dc:Bounds x="276" y="582" width="350" height="159" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1o5l6xd_di" bpmnElement="callReceiveAsync">
+        <dc:Bounds x="447" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0jdabkl_di" bpmnElement="end">
+        <dc:Bounds x="852" y="225" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="824" y="265" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0gpuwes_di" bpmnElement="SequenceFlow_0gpuwes">
+        <di:waypoint xsi:type="dc:Point" x="171" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="305" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="238" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ohpzke_di" bpmnElement="sequence_2">
+        <di:waypoint xsi:type="dc:Point" x="405" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="447" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="426" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0m9c6gt_di" bpmnElement="SequenceFlow_0m9c6gt">
+        <di:waypoint xsi:type="dc:Point" x="547" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="589" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="568" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0f9pput_di" bpmnElement="updateExecution">
+        <di:waypoint xsi:type="dc:Point" x="689" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="852" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="770.5" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0q9vsib_di" bpmnElement="endBpmnError">
+        <dc:Bounds x="571" y="473" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="544" y="514" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1p10ecj_di" bpmnElement="catchBpmnError">
+        <dc:Bounds x="291" y="473" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="264" y="514" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_112ioi2_di" bpmnElement="processBpmnError">
+        <dc:Bounds x="398" y="451" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0nil5vh_di" bpmnElement="processJavaException">
+        <dc:Bounds x="402" y="630" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0ekzjqo_di" bpmnElement="catchJavaException">
+        <dc:Bounds x="310" y="652" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="283" y="693" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0mrji6a_di" bpmnElement="endJavaException">
+        <dc:Bounds x="559" y="652" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="532" y="693" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_14dg22y_di" bpmnElement="SequenceFlow_14dg22y">
+        <di:waypoint xsi:type="dc:Point" x="498" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="571" y="491" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="490.5" y="476" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0g3mn4b_di" bpmnElement="SequenceFlow_0g3mn4b">
+        <di:waypoint xsi:type="dc:Point" x="327" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="398" y="491" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="325" y="491" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1bsc30u_di" bpmnElement="seq">
+        <di:waypoint xsi:type="dc:Point" x="346" y="670" />
+        <di:waypoint xsi:type="dc:Point" x="402" y="670" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="329" y="655" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1epbfhx_di" bpmnElement="SequenceFlow_1epbfhx">
+        <di:waypoint xsi:type="dc:Point" x="502" y="670" />
+        <di:waypoint xsi:type="dc:Point" x="559" y="670" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="486.5" y="655" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_1mclgnq_di" bpmnElement="callSniro">
+        <dc:Bounds x="305" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_08lua6t_di" bpmnElement="processSolution">
+        <dc:Bounds x="589" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
index 4d31eee45a..cec3e249ea 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
@@ -19,7 +19,7 @@
       <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil exceptionUtil = new ExceptionUtil()
 exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:userTask id="ManualHandlingUserTask" name="Manual Handling User Task">
       <bpmn2:extensionElements>
         <camunda:taskListener event="complete">
-          <camunda:script scriptFormat="groovy"><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+          <camunda:script scriptFormat="groovy"><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.completeTask(task)]]></camunda:script>
         </camunda:taskListener>
@@ -38,7 +38,7 @@ mh.completeTask(task)]]></camunda:script>
           <camunda:property />
         </camunda:properties>
         <camunda:taskListener event="create">
-          <camunda:script scriptFormat="groovy"><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+          <camunda:script scriptFormat="groovy"><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.setTaskVariables(task)]]></camunda:script>
         </camunda:taskListener>
@@ -54,7 +54,7 @@ mh.setTaskVariables(task)]]></camunda:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -75,14 +75,14 @@ mh.setTaskVariables(task)]]></camunda:script>
     <bpmn2:scriptTask id="Task_137bzdi" name="Prepare Requests DB Status Update to PENDING_MANUAL_TASK" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0zgg47r</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0mbjrvr</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.prepareRequestsDBStatusUpdate(execution, "PENDING_MANUAL_TASK")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_0r60vxk" name="Prepare Requests DB Status Update to IN_PROGRESS" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_192yimz</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0zer29a</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -90,7 +90,7 @@ mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -111,7 +111,7 @@ mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_1qrt7xw" name="PreProcess Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0jav6cu</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0zgg47r</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -120,7 +120,7 @@ mh.preProcessRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="CreateAOTSRubyTicket" name="Create AOTS Ruby Ticket" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0b84ki5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0igra4l</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.createAOTSTicket(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn
new file mode 100644
index 0000000000..c2214aac26
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+  <bpmn:process id="Orchestration" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>SequenceFlow_10gblml</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:endEvent id="EndEvent_0eak8i4">
+      <bpmn:incoming>SequenceFlow_0x1lx7c</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Task_06qhrqm" name="Decompose Request" camunda:class="org.onap.so.bpmn.servicedecomposition.tasks.DecomposeRequest">
+      <bpmn:extensionElements>
+        <camunda:inputOutput>
+          <camunda:inputParameter name="request" />
+          <camunda:inputParameter name="buildingblock" />
+        </camunda:inputOutput>
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_10gblml</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0x1lx7c</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_10gblml" sourceRef="StartEvent_1" targetRef="Task_06qhrqm" />
+    <bpmn:sequenceFlow id="SequenceFlow_0x1lx7c" sourceRef="Task_06qhrqm" targetRef="EndEvent_0eak8i4" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Orchestration">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="631" y="407" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="604" y="443" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0eak8i4_di" bpmnElement="EndEvent_0eak8i4">
+        <dc:Bounds x="928" y="407" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="946" y="447" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_0y0800u_di" bpmnElement="Task_06qhrqm">
+        <dc:Bounds x="746" y="385" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10gblml_di" bpmnElement="SequenceFlow_10gblml">
+        <di:waypoint xsi:type="dc:Point" x="667" y="425" />
+        <di:waypoint xsi:type="dc:Point" x="746" y="425" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="706.5" y="404" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0x1lx7c_di" bpmnElement="SequenceFlow_0x1lx7c">
+        <di:waypoint xsi:type="dc:Point" x="846" y="425" />
+        <di:waypoint xsi:type="dc:Point" x="928" y="425" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="887" y="404" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
index 8183469798..b4a3fc7721 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
@@ -21,7 +21,7 @@
       <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil exceptionUtil = new ExceptionUtil()
 exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def rdh = new RainyDayHandler()
 rdh.preProcessRequest(execution)
 ]]></bpmn2:script>
@@ -40,7 +40,7 @@ rdh.preProcessRequest(execution)
     <bpmn2:scriptTask id="QueryPolicyEngine" name="Query Policy " scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def rdh = new RainyDayHandler()
 rdh.queryPolicy(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
index 9bfd4535ea..31a981729b 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_EsMs0HcuEeW2U_kkOHX1ZQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_EsMs0HcuEeW2U_kkOHX1ZQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CompleteMsoProcess" name="CompleteMsoProcess" isExecutable="true">
     <bpmn2:scriptTask id="preProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def preProcessRequestData = new CompleteMsoProcess()
 preProcessRequestData.preProcessRequest(execution)
 
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest" targetRef="ExclusiveGateway_1r258d4" />
-    <bpmn2:startEvent id="StartEvent_1" name="Start With Message ">
+    <bpmn2:startEvent id="StartEvent_1" name="Start With message">
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
       <bpmn2:messageEventDefinition id="MessageEventDefinition_1" messageRef="Message_2" />
     </bpmn2:startEvent>
@@ -41,7 +41,7 @@ preProcessRequestData.preProcessRequest(execution)
     <bpmn2:scriptTask id="ScriptTask_3" name="Prepare Infra&#10;&#10;Update DB Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_127i45q</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def completeMsoProcess = new CompleteMsoProcess()
 completeMsoProcess.setUpdateDBstatustoSuccessPayload(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -50,7 +50,7 @@ completeMsoProcess.setUpdateDBstatustoSuccessPayload(execution)]]></bpmn2:script
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("CMSO_setUpdateDBstatustoSuccessPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -75,7 +75,7 @@ completeMsoProcess.setUpdateDBstatustoSuccessPayload(execution)]]></bpmn2:script
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
       <bpmn2:script><![CDATA[//println "INSIDE --> Build Error Message @@@@"
 //println "CMSO_updateRequestResponse IS --> " + execution.getVariable("CMSO_updateRequestResponse")
-import org.openecomp.mso.bpmn.common.scripts.*
+import org.onap.so.bpmn.common.scripts.*
 def buildDataErrorMessage = new CompleteMsoProcess()
 buildDataErrorMessage.buildDataError(execution, "Complete MSO  -- Update DB status to SUCCESS -- Failed")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -95,7 +95,7 @@ buildDataErrorMessage.buildDataError(execution, "Complete MSO  -- Update DB stat
       <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_2" />
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_0mipf25" name="Connect Fault" sourceRef="BoundaryEvent_7" targetRef="BuildErrorMessage" />
-    <bpmn2:callActivity id="CallActivity_101qf6x" name="Call Notification Service" calledElement="${URN_mso_workflow_notification_name}">
+    <bpmn2:callActivity id="CallActivity_101qf6x" name="Call Notification Service" calledElement="${UrnPropertiesReader.getVariable(&#34;mso.workflow.notification.name&#34;, execution)}">
       <bpmn2:extensionElements>
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -132,7 +132,7 @@ buildDataErrorMessage.buildDataError(execution, "Complete MSO  -- Update DB stat
     </bpmn2:parallelGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1g8ig3h" sourceRef="ExclusiveGateway_019d74x" targetRef="ScriptTask_0vyk0lo" />
     <bpmn2:sequenceFlow id="SequenceFlow_067veaf" sourceRef="ExclusiveGateway_1r258d4" targetRef="ExclusiveGateway_3" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_08yqzk9" name="Infra Check" default="SequenceFlow_1ffkc0n">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_08yqzk9" name="Infra Check Check" default="SequenceFlow_1ffkc0n">
       <bpmn2:incoming>SequenceFlow_0xe5zck</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_127i45q</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_1ffkc0n</bpmn2:outgoing>
@@ -156,7 +156,7 @@ buildDataErrorMessage.buildDataError(execution, "Complete MSO  -- Update DB stat
       <bpmn2:incoming>SequenceFlow_1g8ig3h</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1pzb94j</bpmn2:outgoing>
       <bpmn2:script><![CDATA[println "INSIDE --> Complete MSO Process Done SUCCESSFULLY"
-import org.openecomp.mso.bpmn.common.scripts.*
+import org.onap.so.bpmn.common.scripts.*
 def postProcessResponseData = new CompleteMsoProcess()
 postProcessResponseData.postProcessResponse(execution)
 println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("CompletionHandlerResponse")]]></bpmn2:script>
@@ -171,7 +171,7 @@ println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("Comple
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_41" bpmnElement="StartEvent_1">
         <dc:Bounds x="67" y="297" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="93" y="338" width="50" height="24" />
+          <dc:Bounds x="94" y="338" width="49" height="25" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_34" bpmnElement="preProcessRequest">
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupName.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupName.bpmn
index b190107d5e..0e99ce9683 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupName.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupName.bpmn
@@ -12,7 +12,7 @@
     <bpmn2:scriptTask id="AAIQueryFailure" name="AAI Query Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvgn= new ConfirmVolumeGroupName()
 cvgn.handleAAIQueryFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -24,7 +24,7 @@ cvgn.handleAAIQueryFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="QueryAAIForVolumeGroupId" name="Query AAI for&#xD;&#xA;Volume Group Id" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvgn= new ConfirmVolumeGroupName()
 cvgn.queryAAIForVolumeGroupId(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -32,7 +32,7 @@ cvgn.queryAAIForVolumeGroupId(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvgn= new ConfirmVolumeGroupName()
 cvgn.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -41,7 +41,7 @@ cvgn.preProcessRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="CheckAAIQueryResult" name="Check AAI Query Result" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvgn= new ConfirmVolumeGroupName()
 cvgn.checkAAIQueryResult(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -49,7 +49,7 @@ cvgn.checkAAIQueryResult(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="VolumeGroupNotInName" name="Volume Group Not In Name" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvgn= new ConfirmVolumeGroupName()
 cvgn.handleVolumeGroupNameNoMatch(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -66,7 +66,7 @@ cvgn.handleVolumeGroupNameNoMatch(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:outputParameter name="WorkflowResponse"><![CDATA[<aetgt:CreateVfModuleResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"                   xmlns:ns="http://org.openecomp/mso/workflow/schema/v1">
+            <camunda:outputParameter name="WorkflowResponse"><![CDATA[<aetgt:CreateVfModuleResponse xmlns:aetgt="http://org.onap/so/workflow/schema/v1"                   xmlns:ns="http://org.onap/so/workflow/schema/v1">
  <ns:response>SUCCESS</ns:response>
    </aetgt:CreateVfModuleResponse>]]></camunda:outputParameter>
           </camunda:inputOutput>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupTenant.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupTenant.bpmn
index df55046a7b..eb83adf2d4 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupTenant.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ConfirmVolumeGroupTenant.bpmn
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_jPy0EB7JEeaR94RQz1cKqQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="ConfirmVolumeGroupTenant" name="ConfirmVolumeGroupTenant" isExecutable="true">

-    <bpmn2:scriptTask id="queryAAIForVolumeGroup" name="Query AAI Volume Group" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_jPy0EB7JEeaR94RQz1cKqQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="ConfirmVolumeGroupTenant" name="ConfirmVolumeGroupTenant" isExecutable="true">
+    <bpmn2:scriptTask id="queryAAIForVolumeGroup" name="Query AAI Volume Group" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ConfirmVolumeGroupTenant volume = new ConfirmVolumeGroupTenant()
-volume.preProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:exclusiveGateway id="tenantIdMatchCheck" name="Tenant Ids&#xD;&#xA;Match?" default="idsMatchNo">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>idsMatchNo</bpmn2:outgoing>

-      <bpmn2:outgoing>idsMatchYes</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="queryAAIForVolumeGroup" targetRef="tenantIdMatchCheck"/>

-    <bpmn2:sequenceFlow id="idsMatchNo" name="No" sourceRef="tenantIdMatchCheck" targetRef="assignError"/>

-    <bpmn2:sequenceFlow id="idsMatchYes" name="Yes" sourceRef="tenantIdMatchCheck" targetRef="tenantNamesMatchCheck">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("tenantIdsMatch")==true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_2"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="assignError" name="Assign Workflow Exception" scriptFormat="groovy">

-      <bpmn2:incoming>idsMatchNo</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+volume.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="tenantIdMatchCheck" name="Tenant Ids&#xD;&#xA;Match?" default="idsMatchNo">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>idsMatchNo</bpmn2:outgoing>
+      <bpmn2:outgoing>idsMatchYes</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="queryAAIForVolumeGroup" targetRef="tenantIdMatchCheck"/>
+    <bpmn2:sequenceFlow id="idsMatchNo" name="No" sourceRef="tenantIdMatchCheck" targetRef="assignError"/>
+    <bpmn2:sequenceFlow id="idsMatchYes" name="Yes" sourceRef="tenantIdMatchCheck" targetRef="tenantNamesMatchCheck">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("tenantIdsMatch")==true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_2"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="assignError" name="Assign Workflow Exception" scriptFormat="groovy">
+      <bpmn2:incoming>idsMatchNo</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ConfirmVolumeGroupTenant volume = new ConfirmVolumeGroupTenant()
-volume.assignWorkflowException(execution, "does not belong to your tenant")]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="assignError" targetRef="EndEvent_3"/>

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_75" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="assignVolumeHeatId" name="Assign Volume Heat Id" scriptFormat="groovy">

-      <bpmn2:incoming>groupNamesMatchYes</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+volume.assignWorkflowException(execution, "does not belong to your tenant")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="assignError" targetRef="EndEvent_3"/>
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_75" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="assignVolumeHeatId" name="Assign Volume Heat Id" scriptFormat="groovy">
+      <bpmn2:incoming>groupNamesMatchYes</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ConfirmVolumeGroupTenant volume = new ConfirmVolumeGroupTenant()
-volume.assignVolumeHeatId(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="assignVolumeHeatId" targetRef="EndEvent_1"/>

-    <bpmn2:scriptTask id="assignErrorNames" name="Assign Workflow Exception" scriptFormat="groovy">

-      <bpmn2:incoming>groupNamesMatchNo</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+volume.assignVolumeHeatId(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="assignVolumeHeatId" targetRef="EndEvent_1"/>
+    <bpmn2:scriptTask id="assignErrorNames" name="Assign Workflow Exception" scriptFormat="groovy">
+      <bpmn2:incoming>groupNamesMatchNo</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ConfirmVolumeGroupTenant volume = new ConfirmVolumeGroupTenant()
-volume.assignWorkflowException(execution, "name does not match")]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="assignErrorNames" targetRef="EndEvent_2"/>

-    <bpmn2:endEvent id="EndEvent_2">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_74" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:exclusiveGateway id="tenantNamesMatchCheck" name="Volume Group&#xD;&#xA;Names Match?" default="groupNamesMatchNo">

-      <bpmn2:incoming>idsMatchYes</bpmn2:incoming>

-      <bpmn2:outgoing>groupNamesMatchNo</bpmn2:outgoing>

-      <bpmn2:outgoing>groupNamesMatchYes</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="groupNamesMatchNo" name="No" sourceRef="tenantNamesMatchCheck" targetRef="assignErrorNames"/>

-    <bpmn2:sequenceFlow id="groupNamesMatchYes" name="Yes" sourceRef="tenantNamesMatchCheck" targetRef="assignVolumeHeatId">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("groupNamesMatch")==true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="queryAAIForVolumeGroup"/>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ConfirmVolumeGroupTenant">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_61" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="129.0" y="324.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="147.0" y="365.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_237" bpmnElement="queryAAIForVolumeGroup">

-        <dc:Bounds height="80.0" width="100.0" x="252.0" y="302.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_61" targetElement="_BPMNShape_ScriptTask_237">

-        <di:waypoint xsi:type="dc:Point" x="165.0" y="342.0"/>

-        <di:waypoint xsi:type="dc:Point" x="252.0" y="342.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="179.0" y="342.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_209" bpmnElement="tenantIdMatchCheck" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="384.0" y="316.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="76.0" x="414.0" y="347.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ExclusiveGateway_209">

-        <di:waypoint xsi:type="dc:Point" x="352.0" y="342.0"/>

-        <di:waypoint xsi:type="dc:Point" x="368.0" y="342.0"/>

-        <di:waypoint xsi:type="dc:Point" x="368.0" y="341.0"/>

-        <di:waypoint xsi:type="dc:Point" x="384.0" y="341.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_210" bpmnElement="tenantNamesMatchCheck" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="460.0" y="216.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="99.0" x="494.0" y="246.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_238" bpmnElement="assignError">

-        <dc:Bounds height="80.0" width="100.0" x="456.0" y="400.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="idsMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_209" targetElement="_BPMNShape_ScriptTask_238">

-        <di:waypoint xsi:type="dc:Point" x="409.0" y="366.0"/>

-        <di:waypoint xsi:type="dc:Point" x="409.0" y="440.0"/>

-        <di:waypoint xsi:type="dc:Point" x="456.0" y="440.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="22.0" x="414.0" y="400.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="idsMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_209" targetElement="_BPMNShape_ExclusiveGateway_210">

-        <di:waypoint xsi:type="dc:Point" x="409.0" y="316.0"/>

-        <di:waypoint xsi:type="dc:Point" x="409.0" y="241.0"/>

-        <di:waypoint xsi:type="dc:Point" x="460.0" y="241.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="29.0" x="411.0" y="266.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_239" bpmnElement="assignErrorNames">

-        <dc:Bounds height="80.0" width="100.0" x="555.0" y="296.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="groupNamesMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_210" targetElement="_BPMNShape_ScriptTask_239">

-        <di:waypoint xsi:type="dc:Point" x="485.0" y="266.0"/>

-        <di:waypoint xsi:type="dc:Point" x="485.0" y="336.0"/>

-        <di:waypoint xsi:type="dc:Point" x="555.0" y="336.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="22.0" x="491.0" y="296.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_240" bpmnElement="assignVolumeHeatId">

-        <dc:Bounds height="80.0" width="100.0" x="555.0" y="120.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="groupNamesMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_210" targetElement="_BPMNShape_ScriptTask_240">

-        <di:waypoint xsi:type="dc:Point" x="485.0" y="216.0"/>

-        <di:waypoint xsi:type="dc:Point" x="485.0" y="160.0"/>

-        <di:waypoint xsi:type="dc:Point" x="555.0" y="160.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="29.0" x="487.0" y="173.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_200" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="738.0" y="142.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="756.0" y="183.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_240" targetElement="_BPMNShape_EndEvent_200">

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="160.0"/>

-        <di:waypoint xsi:type="dc:Point" x="738.0" y="160.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="692.0" y="160.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_210" bpmnElement="EndEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="709.0" y="318.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="727.0" y="359.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_211" bpmnElement="EndEvent_3">

-        <dc:Bounds height="36.0" width="36.0" x="605.0" y="422.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="623.0" y="463.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_238" targetElement="_BPMNShape_EndEvent_211">

-        <di:waypoint xsi:type="dc:Point" x="556.0" y="440.0"/>

-        <di:waypoint xsi:type="dc:Point" x="605.0" y="440.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="591.0" y="440.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_239" targetElement="_BPMNShape_EndEvent_210">

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="336.0"/>

-        <di:waypoint xsi:type="dc:Point" x="709.0" y="336.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="680.0" y="336.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+volume.assignWorkflowException(execution, "name does not match")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="assignErrorNames" targetRef="EndEvent_2"/>
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_74" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:exclusiveGateway id="tenantNamesMatchCheck" name="Volume Group&#xD;&#xA;Names Match?" default="groupNamesMatchNo">
+      <bpmn2:incoming>idsMatchYes</bpmn2:incoming>
+      <bpmn2:outgoing>groupNamesMatchNo</bpmn2:outgoing>
+      <bpmn2:outgoing>groupNamesMatchYes</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="groupNamesMatchNo" name="No" sourceRef="tenantNamesMatchCheck" targetRef="assignErrorNames"/>
+    <bpmn2:sequenceFlow id="groupNamesMatchYes" name="Yes" sourceRef="tenantNamesMatchCheck" targetRef="assignVolumeHeatId">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("groupNamesMatch")==true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="queryAAIForVolumeGroup"/>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ConfirmVolumeGroupTenant">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_61" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="129.0" y="324.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="147.0" y="365.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_237" bpmnElement="queryAAIForVolumeGroup">
+        <dc:Bounds height="80.0" width="100.0" x="252.0" y="302.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_61" targetElement="_BPMNShape_ScriptTask_237">
+        <di:waypoint xsi:type="dc:Point" x="165.0" y="342.0"/>
+        <di:waypoint xsi:type="dc:Point" x="252.0" y="342.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="179.0" y="342.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_209" bpmnElement="tenantIdMatchCheck" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="384.0" y="316.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="76.0" x="414.0" y="347.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ExclusiveGateway_209">
+        <di:waypoint xsi:type="dc:Point" x="352.0" y="342.0"/>
+        <di:waypoint xsi:type="dc:Point" x="368.0" y="342.0"/>
+        <di:waypoint xsi:type="dc:Point" x="368.0" y="341.0"/>
+        <di:waypoint xsi:type="dc:Point" x="384.0" y="341.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_210" bpmnElement="tenantNamesMatchCheck" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="460.0" y="216.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="99.0" x="494.0" y="246.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_238" bpmnElement="assignError">
+        <dc:Bounds height="80.0" width="100.0" x="456.0" y="400.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="idsMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_209" targetElement="_BPMNShape_ScriptTask_238">
+        <di:waypoint xsi:type="dc:Point" x="409.0" y="366.0"/>
+        <di:waypoint xsi:type="dc:Point" x="409.0" y="440.0"/>
+        <di:waypoint xsi:type="dc:Point" x="456.0" y="440.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="22.0" x="414.0" y="400.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="idsMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_209" targetElement="_BPMNShape_ExclusiveGateway_210">
+        <di:waypoint xsi:type="dc:Point" x="409.0" y="316.0"/>
+        <di:waypoint xsi:type="dc:Point" x="409.0" y="241.0"/>
+        <di:waypoint xsi:type="dc:Point" x="460.0" y="241.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="29.0" x="411.0" y="266.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_239" bpmnElement="assignErrorNames">
+        <dc:Bounds height="80.0" width="100.0" x="555.0" y="296.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="groupNamesMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_210" targetElement="_BPMNShape_ScriptTask_239">
+        <di:waypoint xsi:type="dc:Point" x="485.0" y="266.0"/>
+        <di:waypoint xsi:type="dc:Point" x="485.0" y="336.0"/>
+        <di:waypoint xsi:type="dc:Point" x="555.0" y="336.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="22.0" x="491.0" y="296.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_240" bpmnElement="assignVolumeHeatId">
+        <dc:Bounds height="80.0" width="100.0" x="555.0" y="120.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="groupNamesMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_210" targetElement="_BPMNShape_ScriptTask_240">
+        <di:waypoint xsi:type="dc:Point" x="485.0" y="216.0"/>
+        <di:waypoint xsi:type="dc:Point" x="485.0" y="160.0"/>
+        <di:waypoint xsi:type="dc:Point" x="555.0" y="160.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="29.0" x="487.0" y="173.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_200" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="738.0" y="142.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="756.0" y="183.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_240" targetElement="_BPMNShape_EndEvent_200">
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="160.0"/>
+        <di:waypoint xsi:type="dc:Point" x="738.0" y="160.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="692.0" y="160.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_210" bpmnElement="EndEvent_2">
+        <dc:Bounds height="36.0" width="36.0" x="709.0" y="318.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="727.0" y="359.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_211" bpmnElement="EndEvent_3">
+        <dc:Bounds height="36.0" width="36.0" x="605.0" y="422.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="623.0" y="463.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_238" targetElement="_BPMNShape_EndEvent_211">
+        <di:waypoint xsi:type="dc:Point" x="556.0" y="440.0"/>
+        <di:waypoint xsi:type="dc:Point" x="605.0" y="440.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="591.0" y="440.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_239" targetElement="_BPMNShape_EndEvent_210">
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="336.0"/>
+        <di:waypoint xsi:type="dc:Point" x="709.0" y="336.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="680.0" y="336.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModule.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModule.bpmn
index 3ac1fe7781..6f1db9da07 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModule.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModule.bpmn
@@ -1,519 +1,519 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="CreateAAIVfModule" name="CreateAAIVfModule" isExecutable="true">

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" default="SequenceFlow_7">

-      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_newGenericVnf") == true && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404) || execution.getVariable("CAAIVfMod_isBaseVfModule") == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_5" targetRef="ScriptTask_2"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_3" default="SequenceFlow_22">

-      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_3" targetRef="ProcessAAISearch"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ExclusiveGateway_3" targetRef="AAIQueryFailure">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") != 200 && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") != 404}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="AAIQueryFailure" name="AAI Query Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.handleAAIQueryFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="AAIQueryFailure" targetRef="EndEvent_7"/>

-    <bpmn2:endEvent id="EndEvent_7">

-      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_68" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="ProcessAAISearch" name="Process AAI Generic Vnf Query" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.processAAIGenericVnfQuery(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ProcessAAISearch" targetRef="ExclusiveGateway_5"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_5">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_7">

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_28" name="Generic Vnf does not exist&#xD;&#xA; and Vnf Id != null or&#xD;&#xA;Generic Vnf does exist&#xD;&#xA;and Vnf Id == null" sourceRef="ExclusiveGateway_5" targetRef="CreateGenericVnfFailure">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_newGenericVnf") == false && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404) || (execution.getVariable("CAAIVfMod_newGenericVnf") == true && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200)}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="CreateGenericVnfFailure" name="Create Generic Vnf Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.handleCreateVfModuleFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:endEvent id="EndEvent_8">

-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_69" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="CreateGenericVnfFailure" targetRef="EndEvent_8"/>

-    <bpmn2:scriptTask id="ScriptTask_2" name="Parse For Add-on Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.parseForAddOnModule(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_31" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_4"/>

-    <bpmn2:scriptTask id="ScriptTask_8" name="Create Add-on Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.createVfModule(execution, false)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_8" targetRef="ExclusiveGateway_7"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_4" default="SequenceFlow_33">

-      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_33" name="Vnf Module Exists&#xD;&#xA;" sourceRef="ExclusiveGateway_4" targetRef="CreateGenericVnfFailure"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ExclusiveGateway_4" targetRef="ScriptTask_8">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_moduleExists") != true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="QueryAAIForGenericVnf" name="Query AAI for&#xD;&#xA;Generic Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_39" name="" sourceRef="QueryAAIForGenericVnf" targetRef="ExclusiveGateway_3"/>

-    <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.preProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="InitializeVariables" targetRef="QueryAAIForGenericVnf"/>

-    <bpmn2:endEvent id="EndEvent_2">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_50" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="CreateVfModuleFailure" name="Create Vf Module Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.handleCreateVfModuleFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="CreateVfModuleFailure" targetRef="EndEvent_2"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_1" targetRef="CreateVfModuleFailure"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ExclusiveGateway_7" targetRef="ExclusiveGateway_1"/>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_createVfModuleResponseCode") == 200 || execution.getVariable("CAAIVfMod_createVfModuleResponseCode") == 201}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" default="SequenceFlow_26">

-      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_26" name="Create Generic Vnf&#xD;&#xA;Failure" sourceRef="ExclusiveGateway_2" targetRef="CreateGenericVnfFailure"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") == 200 || execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") == 201}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_6" name="Is VID Request?" default="SequenceFlow_9">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="No" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_3"/>

-    <bpmn2:scriptTask id="ScriptTask_3" name="Create Generic Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.createGenericVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_3" targetRef="ExclusiveGateway_2"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="Yes" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("isVidRequest") =="true"}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="ScriptTask_4" name="Create Base Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.createVfModule(execution, true)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_4" targetRef="ExclusiveGateway_7"/>

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-      <bpmn2:messageEventDefinition id="_MessageEventDefinition_6" messageRef="Message_1"/>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables"/>

-    <bpmn2:scriptTask id="ScriptTask_1" name="Parse for Base Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def cvm = new CreateAAIVfModule()

-cvm.parseForBaseModule(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_1" targetRef="ExclusiveGateway_8"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_8" default="SequenceFlow_13">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ExclusiveGateway_8" targetRef="ScriptTask_4">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_baseModuleConflict") != true) && (execution.getVariable("CAAIVfMod_moduleExists") != true)}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="Base Module Conflict" sourceRef="ExclusiveGateway_8" targetRef="ExclusiveGateway_2"/>

-  </bpmn2:process>

-  <bpmn2:message id="Message_1" name="CreateAAIVfModuleRequest"/>

-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateAAIVfModule">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="65.0" y="240.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="83.0" y="281.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">

-        <dc:Bounds height="80.0" width="100.0" x="204.0" y="216.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">

-        <di:waypoint xsi:type="dc:Point" x="101.0" y="258.0"/>

-        <di:waypoint xsi:type="dc:Point" x="160.0" y="258.0"/>

-        <di:waypoint xsi:type="dc:Point" x="160.0" y="256.0"/>

-        <di:waypoint xsi:type="dc:Point" x="204.0" y="256.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="123.0" y="258.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="ProcessAAISearch">

-        <dc:Bounds height="80.0" width="100.0" x="518.0" y="117.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_50" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="630.0" y="230.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="655.0" y="285.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_52" bpmnElement="ExclusiveGateway_7" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1120.0" y="230.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1145.0" y="285.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_47" bpmnElement="ScriptTask_3">

-        <dc:Bounds height="80.0" width="100.0" x="718.0" y="93.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ExclusiveGateway_225">

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="230.0"/>

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="88.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="601.0" y="133.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_48" bpmnElement="ScriptTask_2">

-        <dc:Bounds height="80.0" width="100.0" x="695.0" y="391.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_48">

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="280.0"/>

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="431.0"/>

-        <di:waypoint xsi:type="dc:Point" x="695.0" y="431.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="574.0" y="256.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_54" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1216.0" y="230.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1241.0" y="285.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_120" bpmnElement="EndEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="1224.0" y="454.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1242.0" y="495.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_115" bpmnElement="ScriptTask_4">

-        <dc:Bounds height="80.0" width="100.0" x="996.0" y="24.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_115" targetElement="_BPMNShape_ExclusiveGateway_52">

-        <di:waypoint xsi:type="dc:Point" x="1096.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1145.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1145.0" y="177.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1145.0" y="230.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1282.0" y="51.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_86" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="468.0" y="229.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="493.0" y="284.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_Task_2">

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="229.0"/>

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="158.0"/>

-        <di:waypoint xsi:type="dc:Point" x="518.0" y="158.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="490.0" y="192.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_155" bpmnElement="AAIQueryFailure">

-        <dc:Bounds height="80.0" width="100.0" x="518.0" y="335.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_ScriptTask_155">

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="279.0"/>

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="297.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="297.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="335.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="547.0" y="297.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ExclusiveGateway_50">

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="197.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="630.0" y="255.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="565.0" y="250.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_7">

-        <dc:Bounds height="36.0" width="36.0" x="550.0" y="454.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="568.0" y="495.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_155" targetElement="_BPMNShape_EndEvent_160">

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="415.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="454.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="565.0" y="426.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CreateGenericVnfFailure">

-        <dc:Bounds height="80.0" width="100.0" x="837.0" y="213.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_99" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="861.0" y="107.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="886.0" y="162.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_47" targetElement="_BPMNShape_ExclusiveGateway_99">

-        <di:waypoint xsi:type="dc:Point" x="818.0" y="133.0"/>

-        <di:waypoint xsi:type="dc:Point" x="839.0" y="133.0"/>

-        <di:waypoint xsi:type="dc:Point" x="839.0" y="132.0"/>

-        <di:waypoint xsi:type="dc:Point" x="861.0" y="132.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="839.0" y="132.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_158">

-        <di:waypoint xsi:type="dc:Point" x="886.0" y="157.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="213.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="126.0" x="899.0" y="162.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_115">

-        <di:waypoint xsi:type="dc:Point" x="911.0" y="132.0"/>

-        <di:waypoint xsi:type="dc:Point" x="953.0" y="132.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1045.0" y="132.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1045.0" y="104.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="959.0" y="132.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_158">

-        <di:waypoint xsi:type="dc:Point" x="680.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="758.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="758.0" y="253.0"/>

-        <di:waypoint xsi:type="dc:Point" x="837.0" y="253.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="170.0" x="669.0" y="260.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_8">

-        <dc:Bounds height="36.0" width="36.0" x="987.0" y="235.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_EndEvent_161">

-        <di:waypoint xsi:type="dc:Point" x="937.0" y="253.0"/>

-        <di:waypoint xsi:type="dc:Point" x="987.0" y="253.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_100" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="863.0" y="403.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="888.0" y="458.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_48" targetElement="_BPMNShape_ExclusiveGateway_100">

-        <di:waypoint xsi:type="dc:Point" x="795.0" y="431.0"/>

-        <di:waypoint xsi:type="dc:Point" x="822.0" y="431.0"/>

-        <di:waypoint xsi:type="dc:Point" x="822.0" y="428.0"/>

-        <di:waypoint xsi:type="dc:Point" x="863.0" y="428.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="817.0" y="431.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ExclusiveGateway_100" targetElement="_BPMNShape_ScriptTask_158">

-        <di:waypoint xsi:type="dc:Point" x="888.0" y="403.0"/>

-        <di:waypoint xsi:type="dc:Point" x="888.0" y="348.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="348.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="293.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="122.0" x="889.0" y="344.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_159" bpmnElement="ScriptTask_8">

-        <dc:Bounds height="80.0" width="100.0" x="996.0" y="389.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ExclusiveGateway_100" targetElement="_BPMNShape_ScriptTask_159">

-        <di:waypoint xsi:type="dc:Point" x="913.0" y="428.0"/>

-        <di:waypoint xsi:type="dc:Point" x="954.0" y="428.0"/>

-        <di:waypoint xsi:type="dc:Point" x="954.0" y="429.0"/>

-        <di:waypoint xsi:type="dc:Point" x="996.0" y="429.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="955.0" y="429.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_159" targetElement="_BPMNShape_ExclusiveGateway_52">

-        <di:waypoint xsi:type="dc:Point" x="1096.0" y="429.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1108.0" y="429.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1145.0" y="429.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1145.0" y="280.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1142.0" y="379.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="QueryAAIForGenericVnf">

-        <dc:Bounds height="80.0" width="100.0" x="336.0" y="216.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">

-        <di:waypoint xsi:type="dc:Point" x="304.0" y="256.0"/>

-        <di:waypoint xsi:type="dc:Point" x="336.0" y="256.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="324.0" y="256.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_86">

-        <di:waypoint xsi:type="dc:Point" x="436.0" y="256.0"/>

-        <di:waypoint xsi:type="dc:Point" x="452.0" y="256.0"/>

-        <di:waypoint xsi:type="dc:Point" x="452.0" y="254.0"/>

-        <di:waypoint xsi:type="dc:Point" x="468.0" y="254.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="449.0" y="255.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_161" bpmnElement="CreateVfModuleFailure">

-        <dc:Bounds height="80.0" width="100.0" x="1192.0" y="324.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_161" targetElement="_BPMNShape_EndEvent_120">

-        <di:waypoint xsi:type="dc:Point" x="1242.0" y="404.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1242.0" y="454.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ScriptTask_161">

-        <di:waypoint xsi:type="dc:Point" x="1241.0" y="280.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1241.0" y="302.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1242.0" y="302.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1242.0" y="324.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_52" targetElement="_BPMNShape_ExclusiveGateway_54">

-        <di:waypoint xsi:type="dc:Point" x="1170.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1216.0" y="255.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_164" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="1316.0" y="237.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_EndEvent_164">

-        <di:waypoint xsi:type="dc:Point" x="1266.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1316.0" y="255.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="630.0" y="38.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="100.0" x="617.0" y="18.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_47">

-        <di:waypoint xsi:type="dc:Point" x="680.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="699.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="699.0" y="133.0"/>

-        <di:waypoint xsi:type="dc:Point" x="718.0" y="133.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="22.0" x="669.0" y="93.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_162">

-        <di:waypoint xsi:type="dc:Point" x="680.0" y="63.0"/>

-        <di:waypoint xsi:type="dc:Point" x="702.0" y="63.0"/>

-        <di:waypoint xsi:type="dc:Point" x="702.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="724.0" y="40.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="29.0" x="688.0" y="54.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_8" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="863.0" y="14.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="888.0" y="69.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_162" bpmnElement="ScriptTask_1">

-        <dc:Bounds height="80.0" width="100.0" x="724.0" y="0.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_162" targetElement="_BPMNShape_ExclusiveGateway_226">

-        <di:waypoint xsi:type="dc:Point" x="824.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="843.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="843.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="863.0" y="39.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="840.0" y="39.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_115">

-        <di:waypoint xsi:type="dc:Point" x="913.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="954.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="954.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="996.0" y="64.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="951.0" y="52.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ExclusiveGateway_99">

-        <di:waypoint xsi:type="dc:Point" x="888.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="888.0" y="85.0"/>

-        <di:waypoint xsi:type="dc:Point" x="886.0" y="85.0"/>

-        <di:waypoint xsi:type="dc:Point" x="886.0" y="107.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="884.0" y="85.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="CreateAAIVfModule" name="CreateAAIVfModule" isExecutable="true">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" default="SequenceFlow_7">
+      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_newGenericVnf") == true && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404) || execution.getVariable("CAAIVfMod_isBaseVfModule") == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_5" targetRef="ScriptTask_2"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_3" default="SequenceFlow_22">
+      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_3" targetRef="ProcessAAISearch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ExclusiveGateway_3" targetRef="AAIQueryFailure">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") != 200 && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") != 404}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="AAIQueryFailure" name="AAI Query Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="AAIQueryFailure" targetRef="EndEvent_7"/>
+    <bpmn2:endEvent id="EndEvent_7">
+      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_68" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="ProcessAAISearch" name="Process AAI Generic Vnf Query" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.processAAIGenericVnfQuery(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ProcessAAISearch" targetRef="ExclusiveGateway_5"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_5">
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_7">
+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_28" name="Generic Vnf does not exist&#xD;&#xA; and Vnf Id != null or&#xD;&#xA;Generic Vnf does exist&#xD;&#xA;and Vnf Id == null" sourceRef="ExclusiveGateway_5" targetRef="CreateGenericVnfFailure">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_newGenericVnf") == false && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 404) || (execution.getVariable("CAAIVfMod_newGenericVnf") == true && execution.getVariable("CAAIVfMod_queryGenericVnfResponseCode") == 200)}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="CreateGenericVnfFailure" name="Create Generic Vnf Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.handleCreateVfModuleFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:endEvent id="EndEvent_8">
+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_69" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="CreateGenericVnfFailure" targetRef="EndEvent_8"/>
+    <bpmn2:scriptTask id="ScriptTask_2" name="Parse For Add-on Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.parseForAddOnModule(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_31" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_4"/>
+    <bpmn2:scriptTask id="ScriptTask_8" name="Create Add-on Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.createVfModule(execution, false)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_8" targetRef="ExclusiveGateway_7"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_4" default="SequenceFlow_33">
+      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_33" name="Vnf Module Exists&#xD;&#xA;" sourceRef="ExclusiveGateway_4" targetRef="CreateGenericVnfFailure"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ExclusiveGateway_4" targetRef="ScriptTask_8">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_moduleExists") != true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="QueryAAIForGenericVnf" name="Query AAI for&#xD;&#xA;Generic Vnf" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_39" name="" sourceRef="QueryAAIForGenericVnf" targetRef="ExclusiveGateway_3"/>
+    <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="InitializeVariables" targetRef="QueryAAIForGenericVnf"/>
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_50" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="CreateVfModuleFailure" name="Create Vf Module Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.handleCreateVfModuleFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="CreateVfModuleFailure" targetRef="EndEvent_2"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_1" targetRef="CreateVfModuleFailure"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ExclusiveGateway_7" targetRef="ExclusiveGateway_1"/>
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_createVfModuleResponseCode") == 200 || execution.getVariable("CAAIVfMod_createVfModuleResponseCode") == 201}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" default="SequenceFlow_26">
+      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_26" name="Create Generic Vnf&#xD;&#xA;Failure" sourceRef="ExclusiveGateway_2" targetRef="CreateGenericVnfFailure"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") == 200 || execution.getVariable("CAAIVfMod_createGenericVnfResponseCode") == 201}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_6" name="Is VID Request?" default="SequenceFlow_9">
+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="No" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_3"/>
+    <bpmn2:scriptTask id="ScriptTask_3" name="Create Generic Vnf" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.createGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_3" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="Yes" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("isVidRequest") =="true"}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="ScriptTask_4" name="Create Base Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.createVfModule(execution, true)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_4" targetRef="ExclusiveGateway_7"/>
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+      <bpmn2:messageEventDefinition id="_MessageEventDefinition_6" messageRef="Message_1"/>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables"/>
+    <bpmn2:scriptTask id="ScriptTask_1" name="Parse for Base Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def cvm = new CreateAAIVfModule()
+cvm.parseForBaseModule(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_1" targetRef="ExclusiveGateway_8"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_8" default="SequenceFlow_13">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ExclusiveGateway_8" targetRef="ScriptTask_4">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("CAAIVfMod_baseModuleConflict") != true) && (execution.getVariable("CAAIVfMod_moduleExists") != true)}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="Base Module Conflict" sourceRef="ExclusiveGateway_8" targetRef="ExclusiveGateway_2"/>
+  </bpmn2:process>
+  <bpmn2:message id="Message_1" name="CreateAAIVfModuleRequest"/>
+  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateAAIVfModule">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="65.0" y="240.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="83.0" y="281.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
+        <dc:Bounds height="80.0" width="100.0" x="204.0" y="216.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
+        <di:waypoint xsi:type="dc:Point" x="101.0" y="258.0"/>
+        <di:waypoint xsi:type="dc:Point" x="160.0" y="258.0"/>
+        <di:waypoint xsi:type="dc:Point" x="160.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="204.0" y="256.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="123.0" y="258.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="ProcessAAISearch">
+        <dc:Bounds height="80.0" width="100.0" x="518.0" y="117.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_50" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="630.0" y="230.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="655.0" y="285.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_52" bpmnElement="ExclusiveGateway_7" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1120.0" y="230.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1145.0" y="285.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_47" bpmnElement="ScriptTask_3">
+        <dc:Bounds height="80.0" width="100.0" x="718.0" y="93.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ExclusiveGateway_225">
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="230.0"/>
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="88.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="601.0" y="133.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_48" bpmnElement="ScriptTask_2">
+        <dc:Bounds height="80.0" width="100.0" x="695.0" y="391.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_48">
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="280.0"/>
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="431.0"/>
+        <di:waypoint xsi:type="dc:Point" x="695.0" y="431.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="574.0" y="256.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_54" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1216.0" y="230.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1241.0" y="285.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_120" bpmnElement="EndEvent_2">
+        <dc:Bounds height="36.0" width="36.0" x="1224.0" y="454.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1242.0" y="495.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_115" bpmnElement="ScriptTask_4">
+        <dc:Bounds height="80.0" width="100.0" x="996.0" y="24.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_115" targetElement="_BPMNShape_ExclusiveGateway_52">
+        <di:waypoint xsi:type="dc:Point" x="1096.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1145.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1145.0" y="177.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1145.0" y="230.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1282.0" y="51.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_86" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="468.0" y="229.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="493.0" y="284.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_Task_2">
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="229.0"/>
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="158.0"/>
+        <di:waypoint xsi:type="dc:Point" x="518.0" y="158.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="490.0" y="192.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_155" bpmnElement="AAIQueryFailure">
+        <dc:Bounds height="80.0" width="100.0" x="518.0" y="335.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_ScriptTask_155">
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="279.0"/>
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="297.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="297.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="335.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="547.0" y="297.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ExclusiveGateway_50">
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="197.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="630.0" y="255.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="565.0" y="250.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_7">
+        <dc:Bounds height="36.0" width="36.0" x="550.0" y="454.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="568.0" y="495.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_155" targetElement="_BPMNShape_EndEvent_160">
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="415.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="454.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="565.0" y="426.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CreateGenericVnfFailure">
+        <dc:Bounds height="80.0" width="100.0" x="837.0" y="213.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_99" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="861.0" y="107.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="886.0" y="162.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_47" targetElement="_BPMNShape_ExclusiveGateway_99">
+        <di:waypoint xsi:type="dc:Point" x="818.0" y="133.0"/>
+        <di:waypoint xsi:type="dc:Point" x="839.0" y="133.0"/>
+        <di:waypoint xsi:type="dc:Point" x="839.0" y="132.0"/>
+        <di:waypoint xsi:type="dc:Point" x="861.0" y="132.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="839.0" y="132.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_158">
+        <di:waypoint xsi:type="dc:Point" x="886.0" y="157.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="213.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="126.0" x="899.0" y="162.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_115">
+        <di:waypoint xsi:type="dc:Point" x="911.0" y="132.0"/>
+        <di:waypoint xsi:type="dc:Point" x="953.0" y="132.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1045.0" y="132.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1045.0" y="104.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="959.0" y="132.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_158">
+        <di:waypoint xsi:type="dc:Point" x="680.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="758.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="758.0" y="253.0"/>
+        <di:waypoint xsi:type="dc:Point" x="837.0" y="253.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="170.0" x="669.0" y="260.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_8">
+        <dc:Bounds height="36.0" width="36.0" x="987.0" y="235.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_EndEvent_161">
+        <di:waypoint xsi:type="dc:Point" x="937.0" y="253.0"/>
+        <di:waypoint xsi:type="dc:Point" x="987.0" y="253.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_100" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="863.0" y="403.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="888.0" y="458.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_48" targetElement="_BPMNShape_ExclusiveGateway_100">
+        <di:waypoint xsi:type="dc:Point" x="795.0" y="431.0"/>
+        <di:waypoint xsi:type="dc:Point" x="822.0" y="431.0"/>
+        <di:waypoint xsi:type="dc:Point" x="822.0" y="428.0"/>
+        <di:waypoint xsi:type="dc:Point" x="863.0" y="428.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="817.0" y="431.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ExclusiveGateway_100" targetElement="_BPMNShape_ScriptTask_158">
+        <di:waypoint xsi:type="dc:Point" x="888.0" y="403.0"/>
+        <di:waypoint xsi:type="dc:Point" x="888.0" y="348.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="348.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="293.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="122.0" x="889.0" y="344.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_159" bpmnElement="ScriptTask_8">
+        <dc:Bounds height="80.0" width="100.0" x="996.0" y="389.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ExclusiveGateway_100" targetElement="_BPMNShape_ScriptTask_159">
+        <di:waypoint xsi:type="dc:Point" x="913.0" y="428.0"/>
+        <di:waypoint xsi:type="dc:Point" x="954.0" y="428.0"/>
+        <di:waypoint xsi:type="dc:Point" x="954.0" y="429.0"/>
+        <di:waypoint xsi:type="dc:Point" x="996.0" y="429.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="955.0" y="429.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_159" targetElement="_BPMNShape_ExclusiveGateway_52">
+        <di:waypoint xsi:type="dc:Point" x="1096.0" y="429.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1108.0" y="429.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1145.0" y="429.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1145.0" y="280.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1142.0" y="379.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="QueryAAIForGenericVnf">
+        <dc:Bounds height="80.0" width="100.0" x="336.0" y="216.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">
+        <di:waypoint xsi:type="dc:Point" x="304.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="336.0" y="256.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="324.0" y="256.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_86">
+        <di:waypoint xsi:type="dc:Point" x="436.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="452.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="452.0" y="254.0"/>
+        <di:waypoint xsi:type="dc:Point" x="468.0" y="254.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="449.0" y="255.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_161" bpmnElement="CreateVfModuleFailure">
+        <dc:Bounds height="80.0" width="100.0" x="1192.0" y="324.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_161" targetElement="_BPMNShape_EndEvent_120">
+        <di:waypoint xsi:type="dc:Point" x="1242.0" y="404.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1242.0" y="454.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ScriptTask_161">
+        <di:waypoint xsi:type="dc:Point" x="1241.0" y="280.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1241.0" y="302.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1242.0" y="302.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1242.0" y="324.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_52" targetElement="_BPMNShape_ExclusiveGateway_54">
+        <di:waypoint xsi:type="dc:Point" x="1170.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1216.0" y="255.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_164" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="1316.0" y="237.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_EndEvent_164">
+        <di:waypoint xsi:type="dc:Point" x="1266.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1316.0" y="255.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="630.0" y="38.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="100.0" x="617.0" y="18.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_47">
+        <di:waypoint xsi:type="dc:Point" x="680.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="699.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="699.0" y="133.0"/>
+        <di:waypoint xsi:type="dc:Point" x="718.0" y="133.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="22.0" x="669.0" y="93.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_162">
+        <di:waypoint xsi:type="dc:Point" x="680.0" y="63.0"/>
+        <di:waypoint xsi:type="dc:Point" x="702.0" y="63.0"/>
+        <di:waypoint xsi:type="dc:Point" x="702.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="724.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="29.0" x="688.0" y="54.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_8" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="863.0" y="14.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="888.0" y="69.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_162" bpmnElement="ScriptTask_1">
+        <dc:Bounds height="80.0" width="100.0" x="724.0" y="0.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_162" targetElement="_BPMNShape_ExclusiveGateway_226">
+        <di:waypoint xsi:type="dc:Point" x="824.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="843.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="843.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="863.0" y="39.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="840.0" y="39.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_115">
+        <di:waypoint xsi:type="dc:Point" x="913.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="954.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="954.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="996.0" y="64.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="951.0" y="52.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ExclusiveGateway_99">
+        <di:waypoint xsi:type="dc:Point" x="888.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="888.0" y="85.0"/>
+        <di:waypoint xsi:type="dc:Point" x="886.0" y="85.0"/>
+        <di:waypoint xsi:type="dc:Point" x="886.0" y="107.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="884.0" y="85.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModuleVolumeGroup.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModuleVolumeGroup.bpmn
index dc94c898c2..232ae027cd 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModuleVolumeGroup.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CreateAAIVfModuleVolumeGroup.bpmn
@@ -5,7 +5,7 @@
     <bpmn2:scriptTask id="QueryAAIForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvfvg = new CreateAAIVfModuleVolumeGroup()
 cvfvg.getVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -17,7 +17,7 @@ cvfvg.getVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="AAIQueryFailure" name="Handle AAI Query Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvfvg = new CreateAAIVfModuleVolumeGroup()
 cvfvg.handleAAIQueryFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ cvfvg.handleAAIQueryFailure(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"                   xmlns:ns="http://org.openecomp/mso/workflow/schema/v1">
+            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.onap/so/workflow/schema/v1"                   xmlns:ns="http://org.onap/so/workflow/schema/v1">
  <ns:GlobalCustomerId>${CCV1_subscriberglobalid}</ns:GlobalCustomerId>
    </aetgt:CreateCustomerResponse>]]></camunda:outputParameter>
           </camunda:inputOutput>
@@ -50,7 +50,7 @@ cvfvg.handleAAIQueryFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="HandleUpdateVfModuleFailure" name="Handle Update VF Module Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvfvg = new CreateAAIVfModuleVolumeGroup()
 cvfvg.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -62,7 +62,7 @@ cvfvg.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvfvg = new CreateAAIVfModuleVolumeGroup()
 cvfvg.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -70,7 +70,7 @@ cvfvg.preProcessRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="UpdateVfModule" name="Update VF Module with Volume Group" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def cvfvg = new CreateAAIVfModuleVolumeGroup()
 cvfvg.updateVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
index 37c6605a0e..90722a95f3 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EGetService.bpmn
@@ -4,7 +4,7 @@
     <bpmn2:scriptTask id="intialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 CustomE2EGetService getService = new CustomE2EGetService()
 getService.preProcessRequest(execution)
 ]]></bpmn2:script>
@@ -23,7 +23,7 @@ getService.preProcessRequest(execution)
       <bpmn2:scriptTask id="processBPMNException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
@@ -41,7 +41,7 @@ ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 CustomE2EGetService getService = new CustomE2EGetService()
 getService.setSuccessIndicator(execution, true)
 ]]></bpmn2:script>
@@ -50,7 +50,7 @@ getService.setSuccessIndicator(execution, true)
     <bpmn2:scriptTask id="getServiceInstance" name="GET&#10;Object" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 CustomE2EGetService getService = new CustomE2EGetService()
 getService.getServiceObject(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -64,7 +64,7 @@ getService.getServiceObject(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="obtainServiceUrlById" name="Node Query Using Id&#10;" scriptFormat="groovy">
       <bpmn2:incoming>obtainById</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 CustomE2EGetService getService = new CustomE2EGetService()
 getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -72,7 +72,7 @@ getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="obtainServiceUrlByName" name="Node Query Using Name" scriptFormat="groovy">
       <bpmn2:incoming>obtainByName</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 CustomE2EGetService getService = new CustomE2EGetService()
 getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EPutService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EPutService.bpmn
index 9d989d2aac..f519bc9dbe 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EPutService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CustomE2EPutService.bpmn
@@ -12,7 +12,7 @@
     <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 def serviceInstance= new CustomE2EPutService()
 serviceInstance.setSuccessIndicator(execution, true)
@@ -23,7 +23,7 @@ execution.setVariable("WorkflowResponse", " ")  //for junits]]></bpmn2:script>
     <bpmn2:scriptTask id="putServiceInstance" name="Put Service Instance" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 def serviceInstance= new CustomE2EPutService()
 serviceInstance.putServiceInstance(execution)]]></bpmn2:script>
@@ -32,7 +32,7 @@ serviceInstance.putServiceInstance(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Initialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 def serviceInstance= new CustomE2EPutService()
 serviceInstance.preProcessRequest(execution)
@@ -51,9 +51,9 @@ serviceInstance.preProcessRequest(execution)
       <bpmn2:scriptTask id="processError" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="processError" targetRef="EndEvent_2" />
@@ -67,9 +67,9 @@ ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="processJavaError" name="Process Java Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+ExceptionUtil ex = new ExceptionUtil()
 ex.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:endEvent id="EndEvent_3">
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/DeleteAAIVfModule.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/DeleteAAIVfModule.bpmn
index 297e04c0f7..9c60284e20 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/DeleteAAIVfModule.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/DeleteAAIVfModule.bpmn
@@ -1,482 +1,482 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="DeleteAAIVfModule" name="DeleteAAIVfModule" isExecutable="true">

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" default="SequenceFlow_8">

-      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_5" targetRef="DeleteVfModule">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_moduleExists") == true &&  (execution.getVariable("DAAIVfMod_isBaseModule") == false || (execution.getVariable("DAAIVfMod_isBaseModule") == true && execution.getVariable("DAAIVfMod_isLastModule") == true ))}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_3" default="SequenceFlow_22">

-      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_3" targetRef="ParseForAddonModule"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ExclusiveGateway_3" targetRef="AAIQueryFailure">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") != 200}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="AAIQueryFailure" name="AAI Query Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="DeleteAAIVfModule" name="DeleteAAIVfModule" isExecutable="true">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" default="SequenceFlow_8">
+      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_5" targetRef="DeleteVfModule">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_moduleExists") == true &&  (execution.getVariable("DAAIVfMod_isBaseModule") == false || (execution.getVariable("DAAIVfMod_isBaseModule") == true && execution.getVariable("DAAIVfMod_isLastModule") == true ))}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_3" default="SequenceFlow_22">
+      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_3" targetRef="ParseForAddonModule"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ExclusiveGateway_3" targetRef="AAIQueryFailure">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") != 200}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="AAIQueryFailure" name="AAI Query Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.handleAAIQueryFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="AAIQueryFailure" targetRef="EndEvent_7"/>

-    <bpmn2:endEvent id="EndEvent_7">

-      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_68" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="ParseForAddonModule" name="Parse For Vf Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="AAIQueryFailure" targetRef="EndEvent_7"/>
+    <bpmn2:endEvent id="EndEvent_7">
+      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_68" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="ParseForAddonModule" name="Parse For Vf Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.parseForVfModule(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ParseForAddonModule" targetRef="ExclusiveGateway_5"/>

-    <bpmn2:scriptTask id="DeleteVfModule" name="Delete Vf Module" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.parseForVfModule(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ParseForAddonModule" targetRef="ExclusiveGateway_5"/>
+    <bpmn2:scriptTask id="DeleteVfModule" name="Delete Vf Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.deleteVfModule(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="DeleteVfModule" targetRef="ExclusiveGateway_2"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" default="SequenceFlow_26">

-      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_26" name="Delete Vf Module&#xD;&#xA;Failure" sourceRef="ExclusiveGateway_2" targetRef="DeleteVfModuleFailure"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_6">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="DeleteVfModuleFailure" name="Delete Vf Module Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.deleteVfModule(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="DeleteVfModule" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" default="SequenceFlow_26">
+      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_26" name="Delete Vf Module&#xD;&#xA;Failure" sourceRef="ExclusiveGateway_2" targetRef="DeleteVfModuleFailure"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_6">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="DeleteVfModuleFailure" name="Delete Vf Module Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.handleDeleteVfModuleFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="DeleteVfModuleFailure" targetRef="EndEvent_8"/>

-    <bpmn2:scriptTask id="QueryAAIForGenericVnf" name="Query AAI for&#xD;&#xA;Generic Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.handleDeleteVfModuleFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="DeleteVfModuleFailure" targetRef="EndEvent_8"/>
+    <bpmn2:scriptTask id="QueryAAIForGenericVnf" name="Query AAI for&#xD;&#xA;Generic Vnf" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_39" name="" sourceRef="QueryAAIForGenericVnf" targetRef="ExclusiveGateway_3"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="Vf Module&#xD;&#xA;Does Not Exist or&#xD;&#xA;Base Module is Not&#xD;&#xA;the Last Vf Module" sourceRef="ExclusiveGateway_5" targetRef="DeleteVfModuleFailure"/>

-    <bpmn2:endEvent id="EndEvent_8">

-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_69" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == false} ]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="QueryAAIForGenericVnf1" name="Query AAI for Generif VNF 1" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_39" name="" sourceRef="QueryAAIForGenericVnf" targetRef="ExclusiveGateway_3"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="Vf Module&#xD;&#xA;Does Not Exist or&#xD;&#xA;Base Module is Not&#xD;&#xA;the Last Vf Module" sourceRef="ExclusiveGateway_5" targetRef="DeleteVfModuleFailure"/>
+    <bpmn2:endEvent id="EndEvent_8">
+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_69" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == false} ]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="QueryAAIForGenericVnf1" name="Query AAI for Generif VNF 1" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="QueryAAIForGenericVnf1" targetRef="ExclusiveGateway_4"/>

-    <bpmn2:scriptTask id="DeleteGenericVnfFailure" name="Delete Generic Vnf Failure" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.queryAAIForGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="QueryAAIForGenericVnf1" targetRef="ExclusiveGateway_4"/>
+    <bpmn2:scriptTask id="DeleteGenericVnfFailure" name="Delete Generic Vnf Failure" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.handleDeleteGenericVnfFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="DeleteGenericVnfFailure" targetRef="EndEvent_2"/>

-    <bpmn2:endEvent id="EndEvent_2">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_50" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_5">

-      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_1" targetRef="DeleteGenericVnfFailure"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{((execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == false) || (execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode") == 204)}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="AAIQueryFailure1" name="AAI Query Failure 1" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.handleDeleteGenericVnfFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="DeleteGenericVnfFailure" targetRef="EndEvent_2"/>
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_50" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_5">
+      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_1" targetRef="DeleteGenericVnfFailure"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{((execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteVfModuleResponseCode") == 204) && execution.getVariable("DAAIVfMod_isLastModule") == false) || (execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode") == 200 || execution.getVariable("DAAIVfMod_deleteGenericVnfResponseCode") == 204)}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="AAIQueryFailure1" name="AAI Query Failure 1" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.handleAAIQueryFailure(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="AAIQueryFailure1" targetRef="EndEvent_3"/>

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="DeleteGenericVnf" name="Delete Generic Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="AAIQueryFailure1" targetRef="EndEvent_3"/>
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="DeleteGenericVnf" name="Delete Generic Vnf" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.deleteGenericVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="DeleteGenericVnf" targetRef="ExclusiveGateway_1"/>

-    <bpmn2:scriptTask id="ParseForGenericVNFResourceVersion" name="Parse for Generic VNF Resource Version" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.deleteGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="DeleteGenericVnf" targetRef="ExclusiveGateway_1"/>
+    <bpmn2:scriptTask id="ParseForGenericVNFResourceVersion" name="Parse for Generic VNF Resource Version" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.parseForResourceVersion(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ParseForGenericVNFResourceVersion" targetRef="DeleteGenericVnf"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_4" default="SequenceFlow_13">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ExclusiveGateway_4" targetRef="AAIQueryFailure1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") != 200}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ExclusiveGateway_4" targetRef="ParseForGenericVNFResourceVersion"/>

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-      <bpmn2:messageEventDefinition id="_MessageEventDefinition_6" messageRef="Message_1"/>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables"/>

-    <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+dvm.parseForResourceVersion(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ParseForGenericVNFResourceVersion" targetRef="DeleteGenericVnf"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_4" default="SequenceFlow_13">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ExclusiveGateway_4" targetRef="AAIQueryFailure1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DAAIVfMod_queryGenericVnfResponseCode") != 200}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ExclusiveGateway_4" targetRef="ParseForGenericVNFResourceVersion"/>
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+      <bpmn2:messageEventDefinition id="_MessageEventDefinition_6" messageRef="Message_1"/>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables"/>
+    <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def dvm = new DeleteAAIVfModule()
-dvm.preProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="InitializeVariables" targetRef="QueryAAIForGenericVnf"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_6" name="Is VID Request?" default="SequenceFlow_3">

-      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="no" sourceRef="ExclusiveGateway_6" targetRef="QueryAAIForGenericVnf1"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="yes" sourceRef="ExclusiveGateway_6" targetRef="EndEvent_1">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("isVidRequest") =="true"}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>

-  <bpmn2:message id="Message_1" name="DeleteAAIVfModuleRequest"/>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteAAIVfModule">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="59.0" y="200.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="77.0" y="241.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">

-        <dc:Bounds height="80.0" width="100.0" x="192.0" y="178.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">

-        <di:waypoint xsi:type="dc:Point" x="95.0" y="218.0"/>

-        <di:waypoint xsi:type="dc:Point" x="192.0" y="218.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="117.0" y="218.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="ParseForAddonModule">

-        <dc:Bounds height="80.0" width="100.0" x="518.0" y="79.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_50" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="630.0" y="192.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="655.0" y="247.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_47" bpmnElement="DeleteVfModule">

-        <dc:Bounds height="80.0" width="100.0" x="695.0" y="0.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_47">

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="192.0"/>

-        <di:waypoint xsi:type="dc:Point" x="655.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="695.0" y="40.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="579.0" y="73.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_54" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1681.0" y="297.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1706.0" y="352.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_120" bpmnElement="EndEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="1689.0" y="564.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1707.0" y="605.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_115" bpmnElement="DeleteGenericVnf">

-        <dc:Bounds height="80.0" width="100.0" x="1582.0" y="0.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_86" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="468.0" y="191.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="493.0" y="246.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_Task_2">

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="191.0"/>

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="120.0"/>

-        <di:waypoint xsi:type="dc:Point" x="518.0" y="120.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="490.0" y="154.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_155" bpmnElement="AAIQueryFailure">

-        <dc:Bounds height="80.0" width="100.0" x="518.0" y="297.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_ScriptTask_155">

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="241.0"/>

-        <di:waypoint xsi:type="dc:Point" x="493.0" y="259.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="259.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="297.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="547.0" y="259.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ExclusiveGateway_50">

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="159.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="217.0"/>

-        <di:waypoint xsi:type="dc:Point" x="630.0" y="217.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="565.0" y="212.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_7">

-        <dc:Bounds height="36.0" width="36.0" x="550.0" y="416.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="568.0" y="457.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_155" targetElement="_BPMNShape_EndEvent_160">

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="377.0"/>

-        <di:waypoint xsi:type="dc:Point" x="568.0" y="416.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="565.0" y="388.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="DeleteVfModuleFailure">

-        <dc:Bounds height="80.0" width="100.0" x="837.0" y="175.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_99" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="861.0" y="14.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="886.0" y="69.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_47" targetElement="_BPMNShape_ExclusiveGateway_99">

-        <di:waypoint xsi:type="dc:Point" x="795.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="861.0" y="39.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="817.0" y="40.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_158">

-        <di:waypoint xsi:type="dc:Point" x="886.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="886.0" y="98.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="98.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="175.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="126.0" x="887.0" y="100.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ExclusiveGateway_226">

-        <di:waypoint xsi:type="dc:Point" x="911.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1068.0" y="39.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="959.0" y="39.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_8">

-        <dc:Bounds height="36.0" width="36.0" x="869.0" y="299.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="887.0" y="340.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_EndEvent_161">

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="255.0"/>

-        <di:waypoint xsi:type="dc:Point" x="887.0" y="299.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="884.0" y="280.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="QueryAAIForGenericVnf">

-        <dc:Bounds height="80.0" width="100.0" x="336.0" y="178.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">

-        <di:waypoint xsi:type="dc:Point" x="292.0" y="218.0"/>

-        <di:waypoint xsi:type="dc:Point" x="336.0" y="218.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="299.0" y="218.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_86">

-        <di:waypoint xsi:type="dc:Point" x="436.0" y="218.0"/>

-        <di:waypoint xsi:type="dc:Point" x="452.0" y="218.0"/>

-        <di:waypoint xsi:type="dc:Point" x="452.0" y="216.0"/>

-        <di:waypoint xsi:type="dc:Point" x="468.0" y="216.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="449.0" y="217.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_161" bpmnElement="DeleteGenericVnfFailure">

-        <dc:Bounds height="80.0" width="100.0" x="1656.0" y="432.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_161" targetElement="_BPMNShape_EndEvent_120">

-        <di:waypoint xsi:type="dc:Point" x="1706.0" y="512.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1707.0" y="564.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1703.0" y="515.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ScriptTask_161">

-        <di:waypoint xsi:type="dc:Point" x="1706.0" y="347.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1706.0" y="432.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1703.0" y="390.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_158">

-        <di:waypoint xsi:type="dc:Point" x="680.0" y="217.0"/>

-        <di:waypoint xsi:type="dc:Point" x="758.0" y="217.0"/>

-        <di:waypoint xsi:type="dc:Point" x="758.0" y="215.0"/>

-        <di:waypoint xsi:type="dc:Point" x="837.0" y="215.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="94.0" x="708.0" y="231.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ExclusiveGateway_54">

-        <di:waypoint xsi:type="dc:Point" x="911.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1008.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1008.0" y="140.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1008.0" y="322.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1681.0" y="322.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1005.0" y="197.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_115" targetElement="_BPMNShape_ExclusiveGateway_54">

-        <di:waypoint xsi:type="dc:Point" x="1632.0" y="80.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1632.0" y="322.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1681.0" y="322.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1629.0" y="187.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="1806.0" y="305.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1824.0" y="346.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_EndEvent_162">

-        <di:waypoint xsi:type="dc:Point" x="1731.0" y="322.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1806.0" y="323.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1753.0" y="322.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_242" bpmnElement="QueryAAIForGenericVnf1">

-        <dc:Bounds height="80.0" width="100.0" x="1166.0" y="0.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_213" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1325.0" y="15.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1350.0" y="70.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_242" targetElement="_BPMNShape_ExclusiveGateway_213">

-        <di:waypoint xsi:type="dc:Point" x="1266.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1325.0" y="40.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1292.0" y="40.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_243" bpmnElement="AAIQueryFailure1">

-        <dc:Bounds height="80.0" width="100.0" x="1300.0" y="117.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_244" bpmnElement="ParseForGenericVNFResourceVersion">

-        <dc:Bounds height="80.0" width="100.0" x="1440.0" y="0.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_3">

-        <dc:Bounds height="36.0" width="36.0" x="1332.0" y="244.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1350.0" y="285.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_243">

-        <di:waypoint xsi:type="dc:Point" x="1350.0" y="65.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1349.0" y="90.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1350.0" y="90.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1350.0" y="117.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1347.0" y="95.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_243" targetElement="_BPMNShape_EndEvent_181">

-        <di:waypoint xsi:type="dc:Point" x="1350.0" y="197.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1350.0" y="244.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1347.0" y="226.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_244">

-        <di:waypoint xsi:type="dc:Point" x="1375.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1440.0" y="40.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1394.0" y="40.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_244" targetElement="_BPMNShape_ScriptTask_115">

-        <di:waypoint xsi:type="dc:Point" x="1540.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1582.0" y="40.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1565.0" y="40.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1068.0" y="14.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="100.0" x="1044.0" y="-6.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_242">

-        <di:waypoint xsi:type="dc:Point" x="1118.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1142.0" y="39.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1142.0" y="40.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1166.0" y="40.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_EndEvent_162">

-        <di:waypoint xsi:type="dc:Point" x="1093.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1093.0" y="289.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1823.0" y="289.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1823.0" y="305.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="27.0" x="1104.0" y="146.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+dvm.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="InitializeVariables" targetRef="QueryAAIForGenericVnf"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_6" name="Is VID Request?" default="SequenceFlow_3">
+      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="no" sourceRef="ExclusiveGateway_6" targetRef="QueryAAIForGenericVnf1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="yes" sourceRef="ExclusiveGateway_6" targetRef="EndEvent_1">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("isVidRequest") =="true"}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmn2:message id="Message_1" name="DeleteAAIVfModuleRequest"/>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteAAIVfModule">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="59.0" y="200.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="77.0" y="241.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
+        <dc:Bounds height="80.0" width="100.0" x="192.0" y="178.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
+        <di:waypoint xsi:type="dc:Point" x="95.0" y="218.0"/>
+        <di:waypoint xsi:type="dc:Point" x="192.0" y="218.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="117.0" y="218.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="ParseForAddonModule">
+        <dc:Bounds height="80.0" width="100.0" x="518.0" y="79.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_50" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="630.0" y="192.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="655.0" y="247.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_47" bpmnElement="DeleteVfModule">
+        <dc:Bounds height="80.0" width="100.0" x="695.0" y="0.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_47">
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="192.0"/>
+        <di:waypoint xsi:type="dc:Point" x="655.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="695.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="579.0" y="73.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_54" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1681.0" y="297.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1706.0" y="352.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_120" bpmnElement="EndEvent_2">
+        <dc:Bounds height="36.0" width="36.0" x="1689.0" y="564.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1707.0" y="605.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_115" bpmnElement="DeleteGenericVnf">
+        <dc:Bounds height="80.0" width="100.0" x="1582.0" y="0.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_86" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="468.0" y="191.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="493.0" y="246.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_Task_2">
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="191.0"/>
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="120.0"/>
+        <di:waypoint xsi:type="dc:Point" x="518.0" y="120.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="490.0" y="154.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_155" bpmnElement="AAIQueryFailure">
+        <dc:Bounds height="80.0" width="100.0" x="518.0" y="297.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_86" targetElement="_BPMNShape_ScriptTask_155">
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="241.0"/>
+        <di:waypoint xsi:type="dc:Point" x="493.0" y="259.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="259.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="297.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="547.0" y="259.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ExclusiveGateway_50">
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="159.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="217.0"/>
+        <di:waypoint xsi:type="dc:Point" x="630.0" y="217.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="565.0" y="212.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_7">
+        <dc:Bounds height="36.0" width="36.0" x="550.0" y="416.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="568.0" y="457.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_155" targetElement="_BPMNShape_EndEvent_160">
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="377.0"/>
+        <di:waypoint xsi:type="dc:Point" x="568.0" y="416.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="565.0" y="388.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="DeleteVfModuleFailure">
+        <dc:Bounds height="80.0" width="100.0" x="837.0" y="175.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_99" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="861.0" y="14.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="886.0" y="69.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_47" targetElement="_BPMNShape_ExclusiveGateway_99">
+        <di:waypoint xsi:type="dc:Point" x="795.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="861.0" y="39.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="817.0" y="40.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ScriptTask_158">
+        <di:waypoint xsi:type="dc:Point" x="886.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="886.0" y="98.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="98.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="175.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="126.0" x="887.0" y="100.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ExclusiveGateway_226">
+        <di:waypoint xsi:type="dc:Point" x="911.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1068.0" y="39.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="959.0" y="39.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_8">
+        <dc:Bounds height="36.0" width="36.0" x="869.0" y="299.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="887.0" y="340.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_EndEvent_161">
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="255.0"/>
+        <di:waypoint xsi:type="dc:Point" x="887.0" y="299.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="884.0" y="280.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="QueryAAIForGenericVnf">
+        <dc:Bounds height="80.0" width="100.0" x="336.0" y="178.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">
+        <di:waypoint xsi:type="dc:Point" x="292.0" y="218.0"/>
+        <di:waypoint xsi:type="dc:Point" x="336.0" y="218.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="299.0" y="218.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_86">
+        <di:waypoint xsi:type="dc:Point" x="436.0" y="218.0"/>
+        <di:waypoint xsi:type="dc:Point" x="452.0" y="218.0"/>
+        <di:waypoint xsi:type="dc:Point" x="452.0" y="216.0"/>
+        <di:waypoint xsi:type="dc:Point" x="468.0" y="216.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="449.0" y="217.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_161" bpmnElement="DeleteGenericVnfFailure">
+        <dc:Bounds height="80.0" width="100.0" x="1656.0" y="432.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_161" targetElement="_BPMNShape_EndEvent_120">
+        <di:waypoint xsi:type="dc:Point" x="1706.0" y="512.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1707.0" y="564.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1703.0" y="515.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ScriptTask_161">
+        <di:waypoint xsi:type="dc:Point" x="1706.0" y="347.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1706.0" y="432.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1703.0" y="390.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_50" targetElement="_BPMNShape_ScriptTask_158">
+        <di:waypoint xsi:type="dc:Point" x="680.0" y="217.0"/>
+        <di:waypoint xsi:type="dc:Point" x="758.0" y="217.0"/>
+        <di:waypoint xsi:type="dc:Point" x="758.0" y="215.0"/>
+        <di:waypoint xsi:type="dc:Point" x="837.0" y="215.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="94.0" x="708.0" y="231.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_99" targetElement="_BPMNShape_ExclusiveGateway_54">
+        <di:waypoint xsi:type="dc:Point" x="911.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1008.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1008.0" y="140.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1008.0" y="322.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1681.0" y="322.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1005.0" y="197.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_115" targetElement="_BPMNShape_ExclusiveGateway_54">
+        <di:waypoint xsi:type="dc:Point" x="1632.0" y="80.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1632.0" y="322.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1681.0" y="322.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1629.0" y="187.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="1806.0" y="305.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1824.0" y="346.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_EndEvent_162">
+        <di:waypoint xsi:type="dc:Point" x="1731.0" y="322.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1806.0" y="323.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1753.0" y="322.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_242" bpmnElement="QueryAAIForGenericVnf1">
+        <dc:Bounds height="80.0" width="100.0" x="1166.0" y="0.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_213" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1325.0" y="15.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1350.0" y="70.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_242" targetElement="_BPMNShape_ExclusiveGateway_213">
+        <di:waypoint xsi:type="dc:Point" x="1266.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1325.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1292.0" y="40.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_243" bpmnElement="AAIQueryFailure1">
+        <dc:Bounds height="80.0" width="100.0" x="1300.0" y="117.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_244" bpmnElement="ParseForGenericVNFResourceVersion">
+        <dc:Bounds height="80.0" width="100.0" x="1440.0" y="0.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_3">
+        <dc:Bounds height="36.0" width="36.0" x="1332.0" y="244.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1350.0" y="285.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_243">
+        <di:waypoint xsi:type="dc:Point" x="1350.0" y="65.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1349.0" y="90.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1350.0" y="90.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1350.0" y="117.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1347.0" y="95.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_243" targetElement="_BPMNShape_EndEvent_181">
+        <di:waypoint xsi:type="dc:Point" x="1350.0" y="197.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1350.0" y="244.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1347.0" y="226.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_244">
+        <di:waypoint xsi:type="dc:Point" x="1375.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1440.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1394.0" y="40.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_244" targetElement="_BPMNShape_ScriptTask_115">
+        <di:waypoint xsi:type="dc:Point" x="1540.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1582.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1565.0" y="40.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1068.0" y="14.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="100.0" x="1044.0" y="-6.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_242">
+        <di:waypoint xsi:type="dc:Point" x="1118.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1142.0" y="39.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1142.0" y="40.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1166.0" y="40.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_EndEvent_162">
+        <di:waypoint xsi:type="dc:Point" x="1093.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1093.0" y="289.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1823.0" y="289.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1823.0" y="305.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="27.0" x="1104.0" y="146.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
index 4f27e0026a..c59564b1e3 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_3SPHsLr9EeWak-hhutJWuQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.8.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_3SPHsLr9EeWak-hhutJWuQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.8.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="FalloutHandler" name="Fallout Handler" isExecutable="true">
     <bpmn2:parallelGateway id="ParallelGateway_1">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
@@ -20,7 +20,7 @@
     <bpmn2:scriptTask id="ScriptTask_8" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def preProcessRequestData = new FalloutHandler()
 preProcessRequestData.preProcessRequest(execution)
 
@@ -40,7 +40,7 @@ preProcessRequestData.preProcessRequest(execution)
     <bpmn2:scriptTask id="ScriptTask_2" name="Post Process Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def falloutHandler = new FalloutHandler()
 falloutHandler.postProcessResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -64,7 +64,7 @@ falloutHandler.postProcessResponse(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.db.att-endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -74,7 +74,7 @@ falloutHandler.postProcessResponse(execution)]]></bpmn2:script>
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">
               <camunda:script scriptFormat="groovy"><![CDATA[//println"INSIDE --> update Request Gamma"
-import org.openecomp.mso.bpmn.common.scripts.*
+import org.onap.so.bpmn.common.scripts.*
 def updateRequestGamma= new FalloutHandler()
 return updateRequestGamma.updateRequestGammaPayload(execution)]]></camunda:script>
             </camunda:inputParameter>
@@ -106,7 +106,7 @@ return updateRequestGamma.updateRequestGammaPayload(execution)]]></camunda:scrip
       <bpmn2:incoming>SequenceFlow_72</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_79</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def falloutHandler = new FalloutHandler()
 falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestGammaResponseCode")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -124,7 +124,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestGammaRespons
       <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_80</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_73</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def falloutHandler = new FalloutHandler()
 falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraResponseCode")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -133,7 +133,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraRespons
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -143,7 +143,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraRespons
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">
               <camunda:script scriptFormat="groovy"><![CDATA[//println"INSIDE --> update Request Infra"
-import org.openecomp.mso.bpmn.common.scripts.*
+import org.onap.so.bpmn.common.scripts.*
 def updateRequestInfra= new FalloutHandler()
 return updateRequestInfra.updateRequestInfraPayload(execution)]]></camunda:script>
             </camunda:inputParameter>
@@ -175,7 +175,7 @@ return updateRequestInfra.updateRequestInfraPayload(execution)]]></camunda:scrip
       <bpmn2:scriptTask id="ScriptTask_4" name="Handle Event" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1ko8ggw</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1pm9r7h</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 execution.setVariable("FH_success", false)
 def falloutHandler = new FalloutHandler()
 
@@ -207,7 +207,7 @@ execution.setVariable("FH_WorkflowException", wfe)]]></bpmn2:script>
       <bpmn2:terminateEventDefinition />
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_0m7gwor" sourceRef="Task_0ixuwt5" targetRef="ParallelGateway_4" />
-    <bpmn2:callActivity id="Task_0ixuwt5" name="Call Notification Service" calledElement="${URN_mso_workflow_notification_name}">
+    <bpmn2:callActivity id="Task_0ixuwt5" name="Call Notification Service" calledElement="${UrnPropertiesReader.getVariable(&#34;mso.workflow.notification.name&#34;, execution)}">
       <bpmn2:extensionElements>
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenerateVfModuleName.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenerateVfModuleName.bpmn
index ab4afdad1c..092001b56a 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenerateVfModuleName.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenerateVfModuleName.bpmn
@@ -7,14 +7,14 @@
     <bpmn:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1opqmjl</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0aqc89s</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def generateVfModuleName = new GenerateVfModuleName()
 generateVfModuleName.preProcessRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="QueryAAIForIndex" name="Query AAI for Index" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0aqc89s</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1afb896</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def generateVfModuleName = new GenerateVfModuleName()
 generateVfModuleName.queryAAI(execution)]]></bpmn:script>
     </bpmn:scriptTask>
@@ -29,7 +29,7 @@ generateVfModuleName.queryAAI(execution)]]></bpmn:script>
     <bpmn:scriptTask id="PostProcessAAIResponse" name="Generate Name Based on Lowest Index" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1afb896</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0o6nle0</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def generateVfModuleName = new GenerateVfModuleName()
 generateVfModuleName.generateName(execution)]]></bpmn:script>
     </bpmn:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteService.bpmn
deleted file mode 100644
index 15929b87eb..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteService.bpmn
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_wAtdAGrUEeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="GenericDeleteService" name="GenericDeleteService" isExecutable="true">

-    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:scriptTask id="processError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-
-ExceptionUtil ex = new ExceptionUtil()
-ex.processSubflowsBPMNException(execution)
-]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="processError" targetRef="EndEvent_3" />

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_2" targetRef="processError" />

-      <bpmn2:endEvent id="EndEvent_3">

-        <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_25" />

-      </bpmn2:endEvent>

-    </bpmn2:subProcess>

-    <bpmn2:subProcess id="javaExceptionSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:scriptTask id="processJavaError" name="Process Error">

-        <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

-ex.processJavaException(execution)

-]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:startEvent id="StartEvent_3">

-        <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="StartEvent_3" targetRef="processJavaError" />

-      <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="processJavaError" targetRef="EndEvent_2" />

-    </bpmn2:subProcess>

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="initialization" />

-    <bpmn2:scriptTask id="initialization" name="Initialization" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteService deleteService  = new GenericDeleteService()

-deleteService.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="initialization" targetRef="resourceVersionCheck" />

-    <bpmn2:exclusiveGateway id="resourceVersionCheck" name="Resource Version Provided?" default="yes">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>no</bpmn2:outgoing>

-      <bpmn2:outgoing>yes</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="no" name="No" sourceRef="resourceVersionCheck" targetRef="queryForResourceVersion">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENDS_resourceVersionProvidedFlag" ) == false}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="yes" name="Yes" sourceRef="resourceVersionCheck" targetRef="ExclusiveGateway_2" />

-    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteService deleteService  = new GenericDeleteService()

-deleteService.setSuccessIndicator(execution, true)

-

-execution.setVariable("WorkflowResponse", " ")  //for junits

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2">

-      <bpmn2:incoming>yes</bpmn2:incoming>

-      <bpmn2:incoming>siExistYes</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_2" targetRef="deleteServiceInstance" />

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_24" />

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="deleteServiceInstance" name="DELETE

-&#10;Service Instance" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteService deleteService  = new GenericDeleteService()

-deleteService.deleteServiceObject(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="deleteServiceInstance" targetRef="toggleSuccess" />

-    <bpmn2:scriptTask id="queryForResourceVersion" name="Query SI Resource Version" scriptFormat="groovy">

-      <bpmn2:incoming>no</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteService deleteService  = new GenericDeleteService()

-deleteService.getServiceResourceVersion(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="queryForResourceVersion" targetRef="siExistCheck" />

-    <bpmn2:exclusiveGateway id="siExistCheck" name="Service Exist?">

-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      <bpmn2:outgoing>siExistYes</bpmn2:outgoing>

-      <bpmn2:outgoing>siExistNo</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="siExistYes" name="Yes" sourceRef="siExistCheck" targetRef="ExclusiveGateway_2">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENDS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="siExistNo" name="No" sourceRef="siExistCheck" targetRef="EndEvent_4" />

-    <bpmn2:endEvent id="EndEvent_4">

-      <bpmn2:incoming>siExistNo</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_38" />

-    </bpmn2:endEvent>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericDeleteService">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_63" bpmnElement="StartEvent_1">

-        <dc:Bounds x="84" y="221" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="102" y="262" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_267" bpmnElement="initialization">

-        <dc:Bounds x="216" y="199" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_224" bpmnElement="resourceVersionCheck" isMarkerVisible="true">

-        <dc:Bounds x="365" y="213" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="401" y="243" width="169" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_268" bpmnElement="queryForResourceVersion">

-        <dc:Bounds x="457" y="100" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds x="600" y="213" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="625" y="268" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="deleteServiceInstance">

-        <dc:Bounds x="684" y="199" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_213" bpmnElement="EndEvent_1">

-        <dc:Bounds x="1006" y="221" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1024" y="262" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_20" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">

-        <dc:Bounds x="155" y="384" width="321" height="169" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_63" targetElement="_BPMNShape_ScriptTask_267">

-        <di:waypoint xsi:type="dc:Point" x="120" y="239" />

-        <di:waypoint xsi:type="dc:Point" x="216" y="239" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="147" y="239" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_267" targetElement="_BPMNShape_ExclusiveGateway_224">

-        <di:waypoint xsi:type="dc:Point" x="316" y="239" />

-        <di:waypoint xsi:type="dc:Point" x="365" y="238" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="217" y="238" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="no" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ScriptTask_268">

-        <di:waypoint xsi:type="dc:Point" x="390" y="213" />

-        <di:waypoint xsi:type="dc:Point" x="390" y="140" />

-        <di:waypoint xsi:type="dc:Point" x="457" y="140" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="392" y="179" width="22" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_268" targetElement="_BPMNShape_ExclusiveGateway_241">

-        <di:waypoint xsi:type="dc:Point" x="557" y="140" />

-        <di:waypoint xsi:type="dc:Point" x="600" y="139" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="492" y="140" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_269">

-        <di:waypoint xsi:type="dc:Point" x="650" y="238" />

-        <di:waypoint xsi:type="dc:Point" x="684" y="239" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="556" y="239" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_ScriptTask_272">

-        <di:waypoint xsi:type="dc:Point" x="784" y="239" />

-        <di:waypoint xsi:type="dc:Point" x="826" y="239" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="778" y="239" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="yes" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_225">

-        <di:waypoint xsi:type="dc:Point" x="390" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="390" y="310" />

-        <di:waypoint xsi:type="dc:Point" x="517" y="310" />

-        <di:waypoint xsi:type="dc:Point" x="625" y="310" />

-        <di:waypoint xsi:type="dc:Point" x="625" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="389" y="278" width="29" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_23" bpmnElement="javaExceptionSubProcess" isExpanded="true">

-        <dc:Bounds x="163" y="576" width="306" height="157" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_65" bpmnElement="StartEvent_2">

-        <dc:Bounds x="180" y="451" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="198" y="492" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_66" bpmnElement="StartEvent_3">

-        <dc:Bounds x="192" y="637" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="210" y="678" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_216" bpmnElement="EndEvent_2">

-        <dc:Bounds x="408" y="637" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="426" y="678" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_217" bpmnElement="EndEvent_3">

-        <dc:Bounds x="420" y="451" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="438" y="492" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="processError">

-        <dc:Bounds x="266" y="429" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_271" bpmnElement="processJavaError">

-        <dc:Bounds x="267" y="615" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_65" targetElement="_BPMNShape_ScriptTask_270">

-        <di:waypoint xsi:type="dc:Point" x="216" y="469" />

-        <di:waypoint xsi:type="dc:Point" x="266" y="469" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="232" y="469" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_217">

-        <di:waypoint xsi:type="dc:Point" x="366" y="469" />

-        <di:waypoint xsi:type="dc:Point" x="420" y="469" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="384" y="469" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ScriptTask_271">

-        <di:waypoint xsi:type="dc:Point" x="228" y="655" />

-        <di:waypoint xsi:type="dc:Point" x="267" y="655" />

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_271" targetElement="_BPMNShape_EndEvent_216">

-        <di:waypoint xsi:type="dc:Point" x="367" y="655" />

-        <di:waypoint xsi:type="dc:Point" x="408" y="655" />

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_272" bpmnElement="toggleSuccess">

-        <dc:Bounds x="826" y="199" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_272" targetElement="_BPMNShape_EndEvent_213">

-        <di:waypoint xsi:type="dc:Point" x="926" y="239" />

-        <di:waypoint xsi:type="dc:Point" x="1006" y="239" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="828" y="239" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_241" bpmnElement="siExistCheck" isMarkerVisible="true">

-        <dc:Bounds x="600" y="114" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="596" y="94" width="59" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="siExistYes" sourceElement="_BPMNShape_ExclusiveGateway_241" targetElement="_BPMNShape_ExclusiveGateway_225">

-        <di:waypoint xsi:type="dc:Point" x="625" y="164" />

-        <di:waypoint xsi:type="dc:Point" x="625" y="213" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="624" y="168" width="29" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="siExistNo" sourceElement="_BPMNShape_ExclusiveGateway_241" targetElement="_BPMNShape_EndEvent_241">

-        <di:waypoint xsi:type="dc:Point" x="650" y="139" />

-        <di:waypoint xsi:type="dc:Point" x="733" y="140" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="664" y="140" width="22" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_241" bpmnElement="EndEvent_4">

-        <dc:Bounds x="733" y="122" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="751" y="163" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteVnf.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteVnf.bpmn
deleted file mode 100644
index f46f86613f..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericDeleteVnf.bpmn
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_oBLSkHqWEea26OhQB97uCQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="GenericDeleteVnf" name="GenericDeleteVnf" isExecutable="true">

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:scriptTask id="initialization" name="Initialization" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteVnf deleteVnf= new GenericDeleteVnf()

-deleteVnf.preProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="initialization" />

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="initialization" targetRef="resourceVersionCheck" />

-    <bpmn2:exclusiveGateway id="resourceVersionCheck" name="Resource Version Provided?" default="resourceVersionProvided">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:outgoing>resourceVariableNotProvided</bpmn2:outgoing>

-      <bpmn2:outgoing>resourceVersionProvided</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="resourceVariableNotProvided" name="No" sourceRef="resourceVersionCheck" targetRef="queryForResourceVersion">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENDV_resourceVersionProvided") == false}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="resourceVersionProvided" name="Yes" sourceRef="resourceVersionCheck" targetRef="ExclusiveGateway_2" />

-    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:scriptTask id="processBPMNError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

-ex.processSubflowsBPMNException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="processBPMNError" targetRef="EndEvent_2" />

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="StartEvent_2" targetRef="processBPMNError" />

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_40" />

-      </bpmn2:endEvent>

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="queryForResourceVersion" name="Query SI Resource Version" scriptFormat="groovy">

-      <bpmn2:incoming>resourceVariableNotProvided</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteVnf deleteVnf= new GenericDeleteVnf()

-deleteVnf.getVnfResourceVersion(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="queryForResourceVersion" targetRef="vnfFoundCheck" />

-    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteVnf deleteVnf= new GenericDeleteVnf()

-deleteVnf.setSuccessIndicator(execution, true)

-

-execution.setVariable("WorkflowResponse", " ")  //for junits]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />

-    <bpmn2:scriptTask id="deleteVnf" name="DELETE

-&#10;Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-GenericDeleteVnf deleteVnf= new GenericDeleteVnf()

-deleteVnf.deleteVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="deleteVnf" targetRef="toggleSuccess" />

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>vnfFoundNo</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_41" />

-    </bpmn2:endEvent>

-    <bpmn2:exclusiveGateway id="vnfFoundCheck" name="Vnf Found?" default="vnfFoundNo">

-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      <bpmn2:outgoing>vnfFoundYes</bpmn2:outgoing>

-      <bpmn2:outgoing>vnfFoundNo</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="vnfFoundYes" name="Yes" sourceRef="vnfFoundCheck" targetRef="ExclusiveGateway_2">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENDV_FoundIndicator") == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="vnfFoundNo" name="No" sourceRef="vnfFoundCheck" targetRef="EndEvent_3" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2">

-      <bpmn2:incoming>resourceVersionProvided</bpmn2:incoming>

-      <bpmn2:incoming>vnfFoundYes</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_2" targetRef="deleteVnf" />

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_39" />

-    </bpmn2:endEvent>

-  </bpmn2:process>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericDeleteVnf">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_78" bpmnElement="StartEvent_1">

-        <dc:Bounds x="74" y="216" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="92" y="257" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_310" bpmnElement="initialization">

-        <dc:Bounds x="192" y="194" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_78" targetElement="_BPMNShape_ScriptTask_310">

-        <di:waypoint xsi:type="dc:Point" x="110" y="234" />

-        <di:waypoint xsi:type="dc:Point" x="192" y="234" />

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_239" bpmnElement="resourceVersionCheck" isMarkerVisible="true">

-        <dc:Bounds x="326" y="208" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="360" y="238" width="169" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_310" targetElement="_BPMNShape_ExclusiveGateway_239">

-        <di:waypoint xsi:type="dc:Point" x="236" y="476" />

-        <di:waypoint xsi:type="dc:Point" x="288" y="476" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="262" y="476" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_320" bpmnElement="queryForResourceVersion">

-        <dc:Bounds x="408" y="96" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_321" bpmnElement="deleteVnf">

-        <dc:Bounds x="658" y="194" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_240" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds x="562" y="208" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="587" y="263" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_322" bpmnElement="toggleSuccess">

-        <dc:Bounds x="802" y="194" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_240" bpmnElement="EndEvent_1">

-        <dc:Bounds x="1001" y="216" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1019" y="257" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="resourceVariableNotProvided" sourceElement="_BPMNShape_ExclusiveGateway_239" targetElement="_BPMNShape_ScriptTask_320">

-        <di:waypoint xsi:type="dc:Point" x="351" y="208" />

-        <di:waypoint xsi:type="dc:Point" x="351" y="136" />

-        <di:waypoint xsi:type="dc:Point" x="408" y="136" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="354" y="165" width="22" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="resourceVersionProvided" sourceElement="_BPMNShape_ExclusiveGateway_239" targetElement="_BPMNShape_ExclusiveGateway_240">

-        <di:waypoint xsi:type="dc:Point" x="351" y="258" />

-        <di:waypoint xsi:type="dc:Point" x="351" y="312" />

-        <di:waypoint xsi:type="dc:Point" x="459" y="312" />

-        <di:waypoint xsi:type="dc:Point" x="587" y="312" />

-        <di:waypoint xsi:type="dc:Point" x="587" y="258" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="351" y="276" width="29" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_320" targetElement="_BPMNShape_ExclusiveGateway_242">

-        <di:waypoint xsi:type="dc:Point" x="508" y="136" />

-        <di:waypoint xsi:type="dc:Point" x="562" y="135" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="558" y="135" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_240" targetElement="_BPMNShape_ScriptTask_321">

-        <di:waypoint xsi:type="dc:Point" x="612" y="233" />

-        <di:waypoint xsi:type="dc:Point" x="658" y="234" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="633" y="234" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_321" targetElement="_BPMNShape_ScriptTask_322">

-        <di:waypoint xsi:type="dc:Point" x="758" y="234" />

-        <di:waypoint xsi:type="dc:Point" x="802" y="234" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="777" y="234" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_322" targetElement="_BPMNShape_EndEvent_240">

-        <di:waypoint xsi:type="dc:Point" x="902" y="234" />

-        <di:waypoint xsi:type="dc:Point" x="1001" y="234" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="949" y="234" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_310" targetElement="_BPMNShape_ExclusiveGateway_239">

-        <di:waypoint xsi:type="dc:Point" x="292" y="234" />

-        <di:waypoint xsi:type="dc:Point" x="326" y="233" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="311" y="233" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_36" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">

-        <dc:Bounds x="185" y="397" width="304" height="157" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_82" bpmnElement="StartEvent_2">

-        <dc:Bounds x="200" y="458" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="218" y="499" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_242" bpmnElement="EndEvent_2">

-        <dc:Bounds x="440" y="458" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="458" y="499" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_323" bpmnElement="processBPMNError">

-        <dc:Bounds x="288" y="436" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_323" targetElement="_BPMNShape_EndEvent_242">

-        <di:waypoint xsi:type="dc:Point" x="388" y="476" />

-        <di:waypoint xsi:type="dc:Point" x="440" y="476" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="414" y="476" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_242" bpmnElement="vnfFoundCheck" isMarkerVisible="true">

-        <dc:Bounds x="562" y="110" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="552" y="90" width="72" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_243" bpmnElement="EndEvent_3">

-        <dc:Bounds x="708" y="118" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="726" y="159" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="vnfFoundYes" sourceElement="_BPMNShape_ExclusiveGateway_242" targetElement="_BPMNShape_ExclusiveGateway_240">

-        <di:waypoint xsi:type="dc:Point" x="587" y="160" />

-        <di:waypoint xsi:type="dc:Point" x="587" y="208" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="587" y="165" width="29" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="vnfFoundNo" sourceElement="_BPMNShape_ExclusiveGateway_242" targetElement="_BPMNShape_EndEvent_243">

-        <di:waypoint xsi:type="dc:Point" x="612" y="135" />

-        <di:waypoint xsi:type="dc:Point" x="708" y="136" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="637" y="135" width="22" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
index 6f012bcb88..2015526874 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
@@ -4,7 +4,7 @@
     <bpmn2:scriptTask id="intialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.preProcessRequest(execution)
 ]]></bpmn2:script>
@@ -23,7 +23,7 @@ getService.preProcessRequest(execution)
       <bpmn2:scriptTask id="processBPMNException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
@@ -41,7 +41,7 @@ ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.setSuccessIndicator(execution, true)
 ]]></bpmn2:script>
@@ -50,7 +50,7 @@ getService.setSuccessIndicator(execution, true)
     <bpmn2:scriptTask id="getServiceInstance" name="GET&#10;Object" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.getServiceObject(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -64,7 +64,7 @@ getService.getServiceObject(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="obtainServiceUrlById" name="Node Query Using Id&#10;" scriptFormat="groovy">
       <bpmn2:incoming>obtainById</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -72,7 +72,7 @@ getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="obtainServiceUrlByName" name="Node Query Using Name" scriptFormat="groovy">
       <bpmn2:incoming>obtainByName</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetVnf.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetVnf.bpmn
index 3300d86084..5784c10d3e 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetVnf.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetVnf.bpmn
@@ -1,212 +1,212 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_eb5eEHR6EeaJwpcpVN5gXw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="GenericGetVnf" name="GenericGetVnf" isExecutable="true">

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:scriptTask id="intialization" name="Intialization" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_eb5eEHR6EeaJwpcpVN5gXw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="GenericGetVnf" name="GenericGetVnf" isExecutable="true">
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:scriptTask id="intialization" name="Intialization" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetVnf genericGetVnf = new GenericGetVnf ()
 genericGetVnf.preProcessRequest(execution)
-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="vnfIdProvided"/>

-    <bpmn2:exclusiveGateway id="vnfIdProvided" name="Vnf Id Provided?" default="noVnfId">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>noVnfId</bpmn2:outgoing>

-      <bpmn2:outgoing>haveVnfId</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="noVnfId" name="No" sourceRef="vnfIdProvided" targetRef="getVnfByName"/>

-    <bpmn2:sequenceFlow id="haveVnfId" name="Yes" sourceRef="vnfIdProvided" targetRef="getGenericVnf">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGV_getVnfByName") == false}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="getVnfByName" name="GET Vnf By Name" scriptFormat="groovy">

-      <bpmn2:incoming>noVnfId</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="vnfIdProvided"/>
+    <bpmn2:exclusiveGateway id="vnfIdProvided" name="Vnf Id Provided?" default="noVnfId">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>noVnfId</bpmn2:outgoing>
+      <bpmn2:outgoing>haveVnfId</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="noVnfId" name="No" sourceRef="vnfIdProvided" targetRef="getVnfByName"/>
+    <bpmn2:sequenceFlow id="haveVnfId" name="Yes" sourceRef="vnfIdProvided" targetRef="getGenericVnf">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGV_getVnfByName") == false}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="getVnfByName" name="GET Vnf By Name" scriptFormat="groovy">
+      <bpmn2:incoming>noVnfId</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetVnf genericGetVnf = new GenericGetVnf()
-genericGetVnf.getVnfByName(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="getVnfByName" targetRef="ExclusiveGateway_2"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_2" targetRef="toggleSuccess"/>

-    <bpmn2:scriptTask id="getGenericVnf" name="GET Vnf By&#xD;&#xA;Id" scriptFormat="groovy">

-      <bpmn2:incoming>haveVnfId</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+genericGetVnf.getVnfByName(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="getVnfByName" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ExclusiveGateway_2" targetRef="toggleSuccess"/>
+    <bpmn2:scriptTask id="getGenericVnf" name="GET Vnf By&#xD;&#xA;Id" scriptFormat="groovy">
+      <bpmn2:incoming>haveVnfId</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetVnf genericGetVnf = new GenericGetVnf()
-genericGetVnf.getVnfById(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="getGenericVnf" targetRef="ExclusiveGateway_2"/>

-    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:endEvent id="EndEvent_3">

-        <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_31"/>

-      </bpmn2:endEvent>

-      <bpmn2:scriptTask id="proccessBPMNError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+genericGetVnf.getVnfById(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="getGenericVnf" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:endEvent id="EndEvent_3">
+        <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
+        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_31"/>
+      </bpmn2:endEvent>
+      <bpmn2:scriptTask id="proccessBPMNError" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 ExceptionUtil ex = new ExceptionUtil()
-ex.processSubflowsBPMNException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="proccessBPMNError" targetRef="EndEvent_3"/>

-      <bpmn2:startEvent id="catchMSOWorkflowException">

-        <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1"/>

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="catchMSOWorkflowException" targetRef="proccessBPMNError"/>

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="proccessBPMNError" targetRef="EndEvent_3"/>
+      <bpmn2:startEvent id="catchMSOWorkflowException">
+        <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1"/>
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="catchMSOWorkflowException" targetRef="proccessBPMNError"/>
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 GenericGetVnf genericGetVnf = new GenericGetVnf()
 genericGetVnf.setSuccessIndicator(execution, true)
-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1"/>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_28"/>

-    </bpmn2:endEvent>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericGetVnf">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="110.0" y="271.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="128.0" y="312.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_295" bpmnElement="intialization">

-        <dc:Bounds height="80.0" width="100.0" x="228.0" y="249.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_230" bpmnElement="vnfIdProvided" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="372.0" y="263.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="99.0" x="419.0" y="292.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_295">

-        <di:waypoint xsi:type="dc:Point" x="146.0" y="289.0"/>

-        <di:waypoint xsi:type="dc:Point" x="228.0" y="289.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_295" targetElement="_BPMNShape_ExclusiveGateway_230">

-        <di:waypoint xsi:type="dc:Point" x="328.0" y="289.0"/>

-        <di:waypoint xsi:type="dc:Point" x="372.0" y="288.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="347.0" y="288.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_296" bpmnElement="getVnfByName">

-        <dc:Bounds height="80.0" width="100.0" x="456.0" y="156.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_231" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="600.0" y="263.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="625.0" y="318.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="noVnfId" sourceElement="_BPMNShape_ExclusiveGateway_230" targetElement="_BPMNShape_ScriptTask_296">

-        <di:waypoint xsi:type="dc:Point" x="397.0" y="263.0"/>

-        <di:waypoint xsi:type="dc:Point" x="397.0" y="196.0"/>

-        <di:waypoint xsi:type="dc:Point" x="456.0" y="196.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="22.0" x="399.0" y="219.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="haveVnfId" sourceElement="_BPMNShape_ExclusiveGateway_230" targetElement="_BPMNShape_ScriptTask_297">

-        <di:waypoint xsi:type="dc:Point" x="397.0" y="313.0"/>

-        <di:waypoint xsi:type="dc:Point" x="397.0" y="368.0"/>

-        <di:waypoint xsi:type="dc:Point" x="456.0" y="368.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="29.0" x="396.0" y="328.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_297" bpmnElement="getGenericVnf">

-        <dc:Bounds height="80.0" width="100.0" x="456.0" y="328.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_298" bpmnElement="toggleSuccess">

-        <dc:Bounds height="80.0" width="100.0" x="696.0" y="249.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_226" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="888.0" y="271.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="906.0" y="312.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_231" targetElement="_BPMNShape_ScriptTask_298">

-        <di:waypoint xsi:type="dc:Point" x="650.0" y="288.0"/>

-        <di:waypoint xsi:type="dc:Point" x="696.0" y="289.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="673.0" y="289.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_298" targetElement="_BPMNShape_EndEvent_226">

-        <di:waypoint xsi:type="dc:Point" x="796.0" y="289.0"/>

-        <di:waypoint xsi:type="dc:Point" x="888.0" y="289.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="829.0" y="289.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_296" targetElement="_BPMNShape_ExclusiveGateway_231">

-        <di:waypoint xsi:type="dc:Point" x="556.0" y="196.0"/>

-        <di:waypoint xsi:type="dc:Point" x="625.0" y="196.0"/>

-        <di:waypoint xsi:type="dc:Point" x="625.0" y="263.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="622.0" y="205.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_297" targetElement="_BPMNShape_ExclusiveGateway_231">

-        <di:waypoint xsi:type="dc:Point" x="556.0" y="368.0"/>

-        <di:waypoint xsi:type="dc:Point" x="625.0" y="368.0"/>

-        <di:waypoint xsi:type="dc:Point" x="625.0" y="313.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="621.0" y="368.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_30" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">

-        <dc:Bounds height="169.0" width="313.0" x="168.0" y="468.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_74" bpmnElement="catchMSOWorkflowException">

-        <dc:Bounds height="36.0" width="36.0" x="180.0" y="535.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="198.0" y="576.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_302" bpmnElement="proccessBPMNError">

-        <dc:Bounds height="80.0" width="100.0" x="275.0" y="513.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_231" bpmnElement="EndEvent_3">

-        <dc:Bounds height="36.0" width="36.0" x="432.0" y="535.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="450.0" y="576.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_StartEvent_74" targetElement="_BPMNShape_ScriptTask_302">

-        <di:waypoint xsi:type="dc:Point" x="216.0" y="553.0"/>

-        <di:waypoint xsi:type="dc:Point" x="275.0" y="553.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="238.0" y="553.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_302" targetElement="_BPMNShape_EndEvent_231">

-        <di:waypoint xsi:type="dc:Point" x="375.0" y="553.0"/>

-        <di:waypoint xsi:type="dc:Point" x="432.0" y="553.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="402.0" y="553.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1"/>
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_28"/>
+    </bpmn2:endEvent>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericGetVnf">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="110.0" y="271.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="128.0" y="312.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_295" bpmnElement="intialization">
+        <dc:Bounds height="80.0" width="100.0" x="228.0" y="249.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_230" bpmnElement="vnfIdProvided" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="372.0" y="263.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="99.0" x="419.0" y="292.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_295">
+        <di:waypoint xsi:type="dc:Point" x="146.0" y="289.0"/>
+        <di:waypoint xsi:type="dc:Point" x="228.0" y="289.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_295" targetElement="_BPMNShape_ExclusiveGateway_230">
+        <di:waypoint xsi:type="dc:Point" x="328.0" y="289.0"/>
+        <di:waypoint xsi:type="dc:Point" x="372.0" y="288.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="347.0" y="288.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_296" bpmnElement="getVnfByName">
+        <dc:Bounds height="80.0" width="100.0" x="456.0" y="156.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_231" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="600.0" y="263.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="625.0" y="318.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="noVnfId" sourceElement="_BPMNShape_ExclusiveGateway_230" targetElement="_BPMNShape_ScriptTask_296">
+        <di:waypoint xsi:type="dc:Point" x="397.0" y="263.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397.0" y="196.0"/>
+        <di:waypoint xsi:type="dc:Point" x="456.0" y="196.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="22.0" x="399.0" y="219.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="haveVnfId" sourceElement="_BPMNShape_ExclusiveGateway_230" targetElement="_BPMNShape_ScriptTask_297">
+        <di:waypoint xsi:type="dc:Point" x="397.0" y="313.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397.0" y="368.0"/>
+        <di:waypoint xsi:type="dc:Point" x="456.0" y="368.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="29.0" x="396.0" y="328.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_297" bpmnElement="getGenericVnf">
+        <dc:Bounds height="80.0" width="100.0" x="456.0" y="328.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_298" bpmnElement="toggleSuccess">
+        <dc:Bounds height="80.0" width="100.0" x="696.0" y="249.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_226" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="888.0" y="271.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="906.0" y="312.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ExclusiveGateway_231" targetElement="_BPMNShape_ScriptTask_298">
+        <di:waypoint xsi:type="dc:Point" x="650.0" y="288.0"/>
+        <di:waypoint xsi:type="dc:Point" x="696.0" y="289.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="673.0" y="289.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_298" targetElement="_BPMNShape_EndEvent_226">
+        <di:waypoint xsi:type="dc:Point" x="796.0" y="289.0"/>
+        <di:waypoint xsi:type="dc:Point" x="888.0" y="289.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="829.0" y="289.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_296" targetElement="_BPMNShape_ExclusiveGateway_231">
+        <di:waypoint xsi:type="dc:Point" x="556.0" y="196.0"/>
+        <di:waypoint xsi:type="dc:Point" x="625.0" y="196.0"/>
+        <di:waypoint xsi:type="dc:Point" x="625.0" y="263.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="622.0" y="205.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_297" targetElement="_BPMNShape_ExclusiveGateway_231">
+        <di:waypoint xsi:type="dc:Point" x="556.0" y="368.0"/>
+        <di:waypoint xsi:type="dc:Point" x="625.0" y="368.0"/>
+        <di:waypoint xsi:type="dc:Point" x="625.0" y="313.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="621.0" y="368.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_30" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">
+        <dc:Bounds height="169.0" width="313.0" x="168.0" y="468.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_74" bpmnElement="catchMSOWorkflowException">
+        <dc:Bounds height="36.0" width="36.0" x="180.0" y="535.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="198.0" y="576.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_302" bpmnElement="proccessBPMNError">
+        <dc:Bounds height="80.0" width="100.0" x="275.0" y="513.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_231" bpmnElement="EndEvent_3">
+        <dc:Bounds height="36.0" width="36.0" x="432.0" y="535.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="450.0" y="576.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_StartEvent_74" targetElement="_BPMNShape_ScriptTask_302">
+        <di:waypoint xsi:type="dc:Point" x="216.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="275.0" y="553.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="238.0" y="553.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_302" targetElement="_BPMNShape_EndEvent_231">
+        <di:waypoint xsi:type="dc:Point" x="375.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="432.0" y="553.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="402.0" y="553.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutService.bpmn
index ca03a9560c..2d18f38c16 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutService.bpmn
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_FatVcHn0EeaH6vX1RRdc_w" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="GenericPutService" name="GenericPutService" isExecutable="true">

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="Initialization" />

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="TerminateEventDefinition_1" />

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-def serviceInstance= new GenericPutService()

-serviceInstance.setSuccessIndicator(execution, true)

-

-execution.setVariable("WorkflowResponse", " ")  //for junits]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />

-    <bpmn2:scriptTask id="putServiceInstance" name="Put Service Instance" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-def serviceInstance= new GenericPutService()

-serviceInstance.putServiceInstance(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="putServiceInstance" targetRef="toggleSuccess" />

-    <bpmn2:scriptTask id="Initialization" name="Initialization" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-def serviceInstance= new GenericPutService()

-serviceInstance.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="Initialization" targetRef="putServiceInstance" />

-    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_2" targetRef="processError" />

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:scriptTask id="processError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

-ex.processSubflowsBPMNException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="processError" targetRef="EndEvent_2" />

-    </bpmn2:subProcess>

-    <bpmn2:subProcess id="javaExceptionSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:startEvent id="catchJavaExcep">

-        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_2" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="catchJavaExcep" targetRef="processJavaError" />

-      <bpmn2:scriptTask id="processJavaError" name="Process Java Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

-ex.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:endEvent id="EndEvent_3">

-        <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition id="TerminateEventDefinition_2" />

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="processJavaError" targetRef="EndEvent_3" />

-    </bpmn2:subProcess>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericPutService">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">

-        <dc:Bounds x="182" y="180" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="200" y="221" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_302" bpmnElement="Initialization">

-        <dc:Bounds x="324" y="158" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_302">

-        <di:waypoint xsi:type="dc:Point" x="218" y="198" />

-        <di:waypoint xsi:type="dc:Point" x="324" y="198" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="250" y="198" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_304" bpmnElement="putServiceInstance">

-        <dc:Bounds x="528" y="158" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_302" targetElement="_BPMNShape_ScriptTask_304">

-        <di:waypoint xsi:type="dc:Point" x="424" y="198" />

-        <di:waypoint xsi:type="dc:Point" x="528" y="198" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="446" y="198" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_305" bpmnElement="toggleSuccess">

-        <dc:Bounds x="732" y="158" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_304" targetElement="_BPMNShape_ScriptTask_305">

-        <di:waypoint xsi:type="dc:Point" x="628" y="198" />

-        <di:waypoint xsi:type="dc:Point" x="732" y="198" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="650" y="198" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_230" bpmnElement="EndEvent_1">

-        <dc:Bounds x="908" y="180" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="926" y="221" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_305" targetElement="_BPMNShape_EndEvent_230">

-        <di:waypoint xsi:type="dc:Point" x="832" y="198" />

-        <di:waypoint xsi:type="dc:Point" x="908" y="198" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="854" y="198" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">

-        <dc:Bounds x="324" y="312" width="418" height="150" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_72" bpmnElement="StartEvent_2">

-        <dc:Bounds x="357" y="370" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="375" y="411" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_306" bpmnElement="processError">

-        <dc:Bounds x="466" y="348" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_StartEvent_72" targetElement="_BPMNShape_ScriptTask_306">

-        <di:waypoint xsi:type="dc:Point" x="393" y="388" />

-        <di:waypoint xsi:type="dc:Point" x="466" y="388" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="415" y="388" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_231" bpmnElement="EndEvent_2">

-        <dc:Bounds x="615" y="370" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="633" y="411" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_306" targetElement="_BPMNShape_EndEvent_231">

-        <di:waypoint xsi:type="dc:Point" x="566" y="388" />

-        <di:waypoint xsi:type="dc:Point" x="615" y="388" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="588" y="388" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="javaExceptionSubProcess" isExpanded="true">

-        <dc:Bounds x="323" y="486" width="419" height="150" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_73" bpmnElement="catchJavaExcep">

-        <dc:Bounds x="357" y="538" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="375" y="579" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_308" bpmnElement="processJavaError">

-        <dc:Bounds x="465" y="516" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_73" targetElement="_BPMNShape_ScriptTask_308">

-        <di:waypoint xsi:type="dc:Point" x="393" y="556" />

-        <di:waypoint xsi:type="dc:Point" x="465" y="556" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="415" y="556" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_232" bpmnElement="EndEvent_3">

-        <dc:Bounds x="615" y="538" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="633" y="579" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_308" targetElement="_BPMNShape_EndEvent_232">

-        <di:waypoint xsi:type="dc:Point" x="565" y="556" />

-        <di:waypoint xsi:type="dc:Point" x="615" y="556" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="587" y="556" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_FatVcHn0EeaH6vX1RRdc_w" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="GenericPutService" name="GenericPutService" isExecutable="true">
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="Initialization" />
+    <bpmn2:endEvent id="EndEvent_1">
+      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="TerminateEventDefinition_1" />
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+def serviceInstance= new GenericPutService()
+serviceInstance.setSuccessIndicator(execution, true)
+
+execution.setVariable("WorkflowResponse", " ")  //for junits]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />
+    <bpmn2:scriptTask id="putServiceInstance" name="Put Service Instance" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+def serviceInstance= new GenericPutService()
+serviceInstance.putServiceInstance(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="putServiceInstance" targetRef="toggleSuccess" />
+    <bpmn2:scriptTask id="Initialization" name="Initialization" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+def serviceInstance= new GenericPutService()
+serviceInstance.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="Initialization" targetRef="putServiceInstance" />
+    <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_2">
+        <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_2" targetRef="processError" />
+      <bpmn2:endEvent id="EndEvent_2">
+        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:scriptTask id="processError" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+ExceptionUtil ex = new ExceptionUtil()
+ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="processError" targetRef="EndEvent_2" />
+    </bpmn2:subProcess>
+    <bpmn2:subProcess id="javaExceptionSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:startEvent id="catchJavaExcep">
+        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_2" />
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="catchJavaExcep" targetRef="processJavaError" />
+      <bpmn2:scriptTask id="processJavaError" name="Process Java Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+ExceptionUtil ex = new ExceptionUtil()
+ex.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:endEvent id="EndEvent_3">
+        <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+        <bpmn2:terminateEventDefinition id="TerminateEventDefinition_2" />
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="processJavaError" targetRef="EndEvent_3" />
+    </bpmn2:subProcess>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericPutService">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
+        <dc:Bounds x="182" y="180" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="200" y="221" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_302" bpmnElement="Initialization">
+        <dc:Bounds x="324" y="158" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_302">
+        <di:waypoint xsi:type="dc:Point" x="218" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="324" y="198" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="250" y="198" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_304" bpmnElement="putServiceInstance">
+        <dc:Bounds x="528" y="158" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_302" targetElement="_BPMNShape_ScriptTask_304">
+        <di:waypoint xsi:type="dc:Point" x="424" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="528" y="198" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="446" y="198" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_305" bpmnElement="toggleSuccess">
+        <dc:Bounds x="732" y="158" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_304" targetElement="_BPMNShape_ScriptTask_305">
+        <di:waypoint xsi:type="dc:Point" x="628" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="732" y="198" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="650" y="198" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_230" bpmnElement="EndEvent_1">
+        <dc:Bounds x="908" y="180" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="926" y="221" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_305" targetElement="_BPMNShape_EndEvent_230">
+        <di:waypoint xsi:type="dc:Point" x="832" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="908" y="198" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="854" y="198" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">
+        <dc:Bounds x="324" y="312" width="418" height="150" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_72" bpmnElement="StartEvent_2">
+        <dc:Bounds x="357" y="370" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="375" y="411" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_306" bpmnElement="processError">
+        <dc:Bounds x="466" y="348" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_StartEvent_72" targetElement="_BPMNShape_ScriptTask_306">
+        <di:waypoint xsi:type="dc:Point" x="393" y="388" />
+        <di:waypoint xsi:type="dc:Point" x="466" y="388" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="415" y="388" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_231" bpmnElement="EndEvent_2">
+        <dc:Bounds x="615" y="370" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="633" y="411" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_306" targetElement="_BPMNShape_EndEvent_231">
+        <di:waypoint xsi:type="dc:Point" x="566" y="388" />
+        <di:waypoint xsi:type="dc:Point" x="615" y="388" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="588" y="388" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="javaExceptionSubProcess" isExpanded="true">
+        <dc:Bounds x="323" y="486" width="419" height="150" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_73" bpmnElement="catchJavaExcep">
+        <dc:Bounds x="357" y="538" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="375" y="579" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_308" bpmnElement="processJavaError">
+        <dc:Bounds x="465" y="516" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_73" targetElement="_BPMNShape_ScriptTask_308">
+        <di:waypoint xsi:type="dc:Point" x="393" y="556" />
+        <di:waypoint xsi:type="dc:Point" x="465" y="556" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="415" y="556" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_232" bpmnElement="EndEvent_3">
+        <dc:Bounds x="615" y="538" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="633" y="579" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_308" targetElement="_BPMNShape_EndEvent_232">
+        <di:waypoint xsi:type="dc:Point" x="565" y="556" />
+        <di:waypoint xsi:type="dc:Point" x="615" y="556" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="587" y="556" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutVnf.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutVnf.bpmn
deleted file mode 100644
index f155783e3a..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericPutVnf.bpmn
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_ZkRI4HntEea26OhQB97uCQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="GenericPutVnf" name="GenericPutVnf" isExecutable="true">

-    <bpmn2:startEvent id="StartEvent_1">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:scriptTask id="intialization" name="Intialization" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-GenericPutVnf genericPutVnf = new GenericPutVnf()
-genericPutVnf.preProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="putVnf"/>

-    <bpmn2:subProcess id="processBPMNExceptionSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_43"/>

-      </bpmn2:endEvent>

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_96"/>

-      </bpmn2:startEvent>

-      <bpmn2:scriptTask id="processBPMNException" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-ExceptionUtil ex = new ExceptionUtil()

-ex.processSubflowsBPMNException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="StartEvent_2" targetRef="processBPMNException"/>

-      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="processBPMNException" targetRef="EndEvent_2"/>

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="putVnf" name="PUT Vnf" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-GenericPutVnf genericPutVnf = new GenericPutVnf()
-genericPutVnf.putVnf(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="putVnf" targetRef="toggleSuccess"/>

-    <bpmn2:scriptTask id="toggleSuccess" name="Toggle Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-GenericPutVnf genericPutVnf = new GenericPutVnf()
-genericPutVnf.setSuccessIndicator(execution, true)
-
-execution.setVariable("WorkflowResponse", " ")  //for junits]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1"/>

-    <bpmn2:endEvent id="EndEvent_1">

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_42"/>

-    </bpmn2:endEvent>

-  </bpmn2:process>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericPutVnf">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_75" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="116.0" y="233.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="134.0" y="274.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_305" bpmnElement="intialization">

-        <dc:Bounds height="80.0" width="100.0" x="240.0" y="211.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_306" bpmnElement="putVnf">

-        <dc:Bounds height="80.0" width="100.0" x="384.0" y="211.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_307" bpmnElement="toggleSuccess">

-        <dc:Bounds height="80.0" width="100.0" x="528.0" y="211.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_233" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="732.0" y="233.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="750.0" y="274.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_75" targetElement="_BPMNShape_ScriptTask_305">

-        <di:waypoint xsi:type="dc:Point" x="152.0" y="251.0"/>

-        <di:waypoint xsi:type="dc:Point" x="240.0" y="251.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_305" targetElement="_BPMNShape_ScriptTask_306">

-        <di:waypoint xsi:type="dc:Point" x="340.0" y="251.0"/>

-        <di:waypoint xsi:type="dc:Point" x="384.0" y="251.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="365.0" y="251.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_306" targetElement="_BPMNShape_ScriptTask_307">

-        <di:waypoint xsi:type="dc:Point" x="484.0" y="251.0"/>

-        <di:waypoint xsi:type="dc:Point" x="528.0" y="251.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="513.0" y="251.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_307" targetElement="_BPMNShape_EndEvent_233">

-        <di:waypoint xsi:type="dc:Point" x="628.0" y="251.0"/>

-        <di:waypoint xsi:type="dc:Point" x="732.0" y="251.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="678.0" y="251.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_31" bpmnElement="processBPMNExceptionSubProcess" isExpanded="true">

-        <dc:Bounds height="169.0" width="322.0" x="174.0" y="396.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_83" bpmnElement="StartEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="204.0" y="463.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="222.0" y="504.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_244" bpmnElement="EndEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="432.0" y="463.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="450.0" y="504.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_324" bpmnElement="processBPMNException">

-        <dc:Bounds height="80.0" width="100.0" x="286.0" y="441.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_StartEvent_83" targetElement="_BPMNShape_ScriptTask_324">

-        <di:waypoint xsi:type="dc:Point" x="240.0" y="481.0"/>

-        <di:waypoint xsi:type="dc:Point" x="286.0" y="481.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_324" targetElement="_BPMNShape_EndEvent_244">

-        <di:waypoint xsi:type="dc:Point" x="386.0" y="481.0"/>

-        <di:waypoint xsi:type="dc:Point" x="432.0" y="481.0"/>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/PrepareUpdateAAIVfModule.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/PrepareUpdateAAIVfModule.bpmn
index 956192c5af..de9adc59c7 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/PrepareUpdateAAIVfModule.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/PrepareUpdateAAIVfModule.bpmn
@@ -6,7 +6,7 @@ and the updated VF Module (type=VfModule) is placed in the variable 'PUAAIVfMod_
     <bpmn2:scriptTask id="QueryAAIForGenericVnf" name="Query AAI for Generic Vnf" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm = new PrepareUpdateAAIVfModule()
 puvm.getGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -23,14 +23,14 @@ puvm.getGenericVnf(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_1" name="Validate VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.validateVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="VnfNotFound" name="Handle Generic Vnf Not found" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.handleVnfNotFound(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -48,7 +48,7 @@ puvm.handleVnfNotFound(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_2" name="Handle VF Module Validation Error" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.handleVfModuleValidationError(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -75,7 +75,7 @@ puvm.handleVfModuleValidationError(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"                   xmlns:ns="http://org.openecomp/mso/workflow/schema/v1">
+            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.onap/so/workflow/schema/v1"                   xmlns:ns="http://org.onap/so/workflow/schema/v1">
  <ns:GlobalCustomerId>${CCV1_subscriberglobalid}</ns:GlobalCustomerId>
    </aetgt:CreateCustomerResponse>]]></camunda:outputParameter>
           </camunda:inputOutput>
@@ -86,7 +86,7 @@ puvm.handleVfModuleValidationError(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="HandleUpdateVfModuleFailure" name="Handle Update VF Module Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -94,7 +94,7 @@ puvm.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="UpdateVfModule" name="Update VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.updateVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -109,7 +109,7 @@ puvm.updateVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def puvm= new PrepareUpdateAAIVfModule()
 puvm.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn
index abae950134..f19e3fc10f 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn
@@ -4,7 +4,7 @@
     <bpmn2:scriptTask id="ScriptTask_1" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1ps0nzi</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def receiveWorkflowMessage = new ReceiveWorkflowMessage()
 receiveWorkflowMessage .preProcessRequest(execution)
 ]]></bpmn2:script>
@@ -16,7 +16,7 @@ receiveWorkflowMessage .preProcessRequest(execution)
     <bpmn2:scriptTask id="ScriptTask_5" name="Workflow Exception (timeout)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def exceptionUtil = new ExceptionUtil()
 exceptionUtil.buildWorkflowException(execution, 7010, "Receive Workflow Message Timeout Error")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -28,7 +28,7 @@ exceptionUtil.buildWorkflowException(execution, 7010, "Receive Workflow Message
     <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Process Message and Set WorkflowResult" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_44</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def receiveWorkflowMessage = new ReceiveWorkflowMessage()
 receiveWorkflowMessage.processReceivedMessage(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV1.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV1.bpmn
index c52612bb95..7a9a7f8308 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV1.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV1.bpmn
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.13.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="SDNCAdapterRestV1" name="SDNCAdapterRestV1" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_2" name="Log Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
 def statusCode = execution.getVariable('SDNCREST_sdncAdapterStatusCode')
 String response = String.valueOf(execution.getVariable('SDNCREST_sdncAdapterResponse'))
 def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 def processKey = sdncAdapterRestV1.getProcessKey(execution)
 sdncAdapterRestV1.logDebug(processKey + " received response from SDNCAdapter: statusCode=" + statusCode +
-	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)]]></bpmn2:script>
+	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 5300, "Failed to communicate with SDNCAdapter")]]></bpmn2:script>
+exceptionUtil.buildWorkflowException(execution, 5300, "Failed to communicate with SDNCAdapter")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_4" name="Workflow Exception (bad response)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 
 String res = execution.getVariable('SDNCREST_sdncAdapterResponse')
 
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
-sdncAdapterRestV1.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:script>
+sdncAdapterRestV1.sdncAdapterBuildWorkflowException(execution, res)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_1" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_23">
@@ -38,11 +38,11 @@ sdncAdapterRestV1.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:sc
       <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_17" name="404" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_3">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '404'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '404'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_23" name="other" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_4" />
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="2xx" sourceRef="ExclusiveGateway_1" targetRef="SubProcess_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '200' || execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '202'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '200' || execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '202'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_9" />
     <bpmn2:endEvent id="EndEvent_9">
@@ -57,18 +57,18 @@ sdncAdapterRestV1.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:sc
     <bpmn2:scriptTask id="ScriptTask_7" name="Send Request to SDNC Adapter" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
-sdncAdapterRestV1.sendRequestToSDNCAdapter(execution)]]></bpmn2:script>
+sdncAdapterRestV1.sendRequestToSDNCAdapter(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_2" />
     <bpmn2:scriptTask id="ScriptTask_1" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
 sdncAdapterRestV1.preProcessRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_1" targetRef="ScriptTask_7" />
     <bpmn2:startEvent id="StartEvent_1" name="Start">
@@ -78,9 +78,9 @@ sdncAdapterRestV1.preProcessRequest(execution)
     <bpmn2:scriptTask id="ScriptTask_5" name="Workflow Exception (timeout)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Timeout Error")]]></bpmn2:script>
+exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Timeout Error")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ScriptTask_5" targetRef="EndEvent_8" />
     <bpmn2:endEvent id="EndEvent_8">
@@ -90,10 +90,10 @@ exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Time
     <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator and WorkflowResponse" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_44</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
 sdncAdapterRestV1.setSuccessIndicator(execution, true)
-execution.setVariable('WorkflowResponse', sdncAdapterRestV1.getLastCallback(execution))]]></bpmn2:script>
+execution.setVariable('WorkflowResponse', sdncAdapterRestV1.getLastCallback(execution))</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_6" />
     <bpmn2:endEvent id="EndEvent_6" name="End">
@@ -106,15 +106,15 @@ execution.setVariable('WorkflowResponse', sdncAdapterRestV1.getLastCallback(exec
       </bpmn2:timerEventDefinition>
     </bpmn2:boundaryEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="BoundaryEvent_1" targetRef="ScriptTask_5" />
-    <bpmn2:subProcess id="SubProcess_2" name="Wait for Callbacks">
+    <bpmn2:subProcess id="SubProcess_2" name="Wait for Callbacks" camunda:asyncAfter="true">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_44</bpmn2:outgoing>
       <bpmn2:scriptTask id="ScriptTask_6" name="Process Callback" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_41</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_42</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV1 = new SDNCAdapterRestV1()
-sdncAdapterRestV1.processCallback(execution)]]></bpmn2:script>
+sdncAdapterRestV1.processCallback(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_42" name="" sourceRef="ScriptTask_6" targetRef="ExclusiveGateway_3" />
       <bpmn2:startEvent id="StartEvent_3">
@@ -127,7 +127,7 @@ sdncAdapterRestV1.processCallback(execution)]]></bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_39" name="Y" sourceRef="ExclusiveGateway_7" targetRef="EndEvent_12">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable('SDNCREST_ackFinalIndicator')=="Y"}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable('SDNCREST_ackFinalIndicator')=="Y"}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_43" name="N" sourceRef="ExclusiveGateway_7" targetRef="IntermediateCatchEvent_1" />
       <bpmn2:exclusiveGateway id="ExclusiveGateway_3" name="Callback
&#10;Exception?" default="SequenceFlow_30">
@@ -136,7 +136,7 @@ sdncAdapterRestV1.processCallback(execution)]]></bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_8" name="yes" sourceRef="ExclusiveGateway_3" targetRef="EndEvent_3">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("WorkflowException") != null}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_7" />
       <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="Catch Event">
@@ -164,10 +164,10 @@ sdncAdapterRestV1.processCallback(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_8" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exUtil = new ExceptionUtil()
 exUtil.processSubflowsBPMNException(execution)
-]]></bpmn2:script>
+</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_8" targetRef="EndEvent_2" />
       <bpmn2:endEvent id="EndEvent_2">
@@ -219,8 +219,8 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="744" y="24" width="97" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_54" targetElement="_BPMNShape_ScriptTask_56">
-        <di:waypoint xsi:type="dc:Point" x="166" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="204" y="188" />
+        <di:waypoint x="166" y="188" />
+        <di:waypoint x="204" y="188" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="176" y="188" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -232,33 +232,33 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_ExclusiveGateway_105">
-        <di:waypoint xsi:type="dc:Point" x="592" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="187" />
+        <di:waypoint x="592" y="188" />
+        <di:waypoint x="624" y="187" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="611" y="187" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_168">
-        <di:waypoint xsi:type="dc:Point" x="649" y="162" />
-        <di:waypoint xsi:type="dc:Point" x="649" y="64" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="64" />
+        <di:waypoint x="649" y="162" />
+        <di:waypoint x="649" y="64" />
+        <di:waypoint x="744" y="64" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="688" y="64" width="27" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_78">
-        <di:waypoint xsi:type="dc:Point" x="674" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="709" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="709" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="188" />
+        <di:waypoint x="674" y="187" />
+        <di:waypoint x="709" y="187" />
+        <di:waypoint x="709" y="188" />
+        <di:waypoint x="744" y="188" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="684" y="188" width="35" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_SubProcess_14">
-        <di:waypoint xsi:type="dc:Point" x="649" y="212" />
-        <di:waypoint xsi:type="dc:Point" x="649" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="443" />
+        <di:waypoint x="649" y="212" />
+        <di:waypoint x="649" y="443" />
+        <di:waypoint x="744" y="443" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="689" y="443" width="18" height="12" />
         </bpmndi:BPMNLabel>
@@ -270,16 +270,16 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_IntermediateCatchEvent_20">
-        <di:waypoint xsi:type="dc:Point" x="812" y="444" />
-        <di:waypoint xsi:type="dc:Point" x="871" y="444" />
+        <di:waypoint x="812" y="444" />
+        <di:waypoint x="871" y="444" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1074" y="442" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_BoundaryEvent_24" targetElement="_BPMNShape_ScriptTask_59">
-        <di:waypoint xsi:type="dc:Point" x="1318" y="601" />
-        <di:waypoint xsi:type="dc:Point" x="1318" y="664" />
-        <di:waypoint xsi:type="dc:Point" x="1418" y="664" />
+        <di:waypoint x="1318" y="601" />
+        <di:waypoint x="1318" y="664" />
+        <di:waypoint x="1418" y="664" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1153" y="655" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -297,8 +297,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_59" targetElement="_BPMNShape_EndEvent_160">
-        <di:waypoint xsi:type="dc:Point" x="1518" y="664" />
-        <di:waypoint xsi:type="dc:Point" x="1562" y="664" />
+        <di:waypoint x="1518" y="664" />
+        <di:waypoint x="1562" y="664" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1542" y="664" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -310,8 +310,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_EndEvent_161">
-        <di:waypoint xsi:type="dc:Point" x="840" y="64" />
-        <di:waypoint xsi:type="dc:Point" x="891" y="64" />
+        <di:waypoint x="840" y="64" />
+        <di:waypoint x="891" y="64" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="865" y="64" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -323,15 +323,15 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ScriptTask_78" targetElement="_BPMNShape_EndEvent_162">
-        <di:waypoint xsi:type="dc:Point" x="840" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="188" />
+        <di:waypoint x="840" y="188" />
+        <di:waypoint x="892" y="188" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_236" bpmnElement="ScriptTask_setSuccess">
         <dc:Bounds x="1419" y="401" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_158">
-        <di:waypoint xsi:type="dc:Point" x="1515" y="442" />
-        <di:waypoint xsi:type="dc:Point" x="1562" y="443" />
+        <di:waypoint x="1515" y="442" />
+        <di:waypoint x="1562" y="443" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1548" y="443" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -340,19 +340,19 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="360" y="146" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_56" targetElement="_BPMNShape_ScriptTask_237">
-        <di:waypoint xsi:type="dc:Point" x="304" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="344" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="344" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="360" y="187" />
+        <di:waypoint x="304" y="188" />
+        <di:waypoint x="344" y="188" />
+        <di:waypoint x="344" y="187" />
+        <di:waypoint x="360" y="187" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="317" y="188" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ScriptTask_79">
-        <di:waypoint xsi:type="dc:Point" x="456" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="474" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="474" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="492" y="188" />
+        <di:waypoint x="456" y="187" />
+        <di:waypoint x="474" y="187" />
+        <di:waypoint x="474" y="188" />
+        <di:waypoint x="492" y="188" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_24" bpmnElement="SubProcess_1" isExpanded="true">
         <dc:Bounds x="156" y="516" width="382" height="181" />
@@ -367,8 +367,8 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="302" y="565" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ScriptTask_266">
-        <di:waypoint xsi:type="dc:Point" x="240" y="607" />
-        <di:waypoint xsi:type="dc:Point" x="302" y="606" />
+        <di:waypoint x="240" y="607" />
+        <di:waypoint x="302" y="606" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="280" y="630" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -386,8 +386,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_107" targetElement="_BPMNShape_EndEvent_215">
-        <di:waypoint xsi:type="dc:Point" x="1117" y="468" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="516" />
+        <di:waypoint x="1117" y="468" />
+        <di:waypoint x="1118" y="516" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1122" y="468" width="18" height="12" />
         </bpmndi:BPMNLabel>
@@ -399,22 +399,22 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_107" targetElement="_BPMNShape_ExclusiveGateway_111">
-        <di:waypoint xsi:type="dc:Point" x="1142" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="1204" y="443" />
+        <di:waypoint x="1142" y="443" />
+        <di:waypoint x="1204" y="443" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1156" y="443" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_111" targetElement="_BPMNShape_EndEvent_219">
-        <di:waypoint xsi:type="dc:Point" x="1254" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="1308" y="444" />
+        <di:waypoint x="1254" y="443" />
+        <di:waypoint x="1308" y="444" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1276" y="418" width="7" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_41" bpmnElement="SequenceFlow_41" sourceElement="_BPMNShape_IntermediateCatchEvent_20" targetElement="_BPMNShape_ScriptTask_58">
-        <di:waypoint xsi:type="dc:Point" x="907" y="444" />
-        <di:waypoint xsi:type="dc:Point" x="948" y="444" />
+        <di:waypoint x="907" y="444" />
+        <di:waypoint x="948" y="444" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="763" y="475" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -426,28 +426,28 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_58" targetElement="_BPMNShape_ExclusiveGateway_107">
-        <di:waypoint xsi:type="dc:Point" x="1048" y="444" />
-        <di:waypoint xsi:type="dc:Point" x="1070" y="444" />
-        <di:waypoint xsi:type="dc:Point" x="1070" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="1092" y="443" />
+        <di:waypoint x="1048" y="444" />
+        <di:waypoint x="1070" y="444" />
+        <di:waypoint x="1070" y="443" />
+        <di:waypoint x="1092" y="443" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="905" y="462" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ExclusiveGateway_111" targetElement="_BPMNShape_IntermediateCatchEvent_20">
-        <di:waypoint xsi:type="dc:Point" x="1229" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="1229" y="351" />
-        <di:waypoint xsi:type="dc:Point" x="889" y="351" />
-        <di:waypoint xsi:type="dc:Point" x="889" y="426" />
+        <di:waypoint x="1229" y="418" />
+        <di:waypoint x="1229" y="351" />
+        <di:waypoint x="889" y="351" />
+        <di:waypoint x="889" y="426" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1240" y="360" width="8" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_44" bpmnElement="SequenceFlow_44" sourceElement="_BPMNShape_SubProcess_14" targetElement="_BPMNShape_ScriptTask_236">
-        <di:waypoint xsi:type="dc:Point" x="1372" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="443" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="442" />
-        <di:waypoint xsi:type="dc:Point" x="1419" y="442" />
+        <di:waypoint x="1372" y="443" />
+        <di:waypoint x="1395" y="443" />
+        <di:waypoint x="1395" y="442" />
+        <di:waypoint x="1419" y="442" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1404" y="462" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -459,8 +459,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_266" targetElement="_BPMNShape_EndEvent_220">
-        <di:waypoint xsi:type="dc:Point" x="398" y="606" />
-        <di:waypoint xsi:type="dc:Point" x="444" y="607" />
+        <di:waypoint x="398" y="606" />
+        <di:waypoint x="444" y="607" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="412" y="606" width="6" height="6" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn
index 68afc9ae5a..cee6e43f93 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.13.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="SDNCAdapterRestV2" name="SDNCAdapterRestV2" isExecutable="true">
     <bpmn2:documentation>This version of SDNCAdapterRest allows for interim notifications to be sent for any non-final response received from SDNC.</bpmn2:documentation>
     <bpmn2:scriptTask id="ScriptTask_2" name="Log Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
 def statusCode = execution.getVariable('SDNCREST_sdncAdapterStatusCode')
 String response = String.valueOf(execution.getVariable('SDNCREST_sdncAdapterResponse'))
 def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
 def processKey = sdncAdapterRestV2.getProcessKey(execution)
 sdncAdapterRestV2.logDebug(processKey + " received response from SDNCAdapter: statusCode=" + statusCode +
-	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)]]></bpmn2:script>
+	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 5300, "Failed to communicate with SDNCAdapter")]]></bpmn2:script>
+exceptionUtil.buildWorkflowException(execution, 5300, "Failed to communicate with SDNCAdapter")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_4" name="Workflow Exception (bad response)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 
 String res = execution.getVariable('SDNCREST_sdncAdapterResponse')
 
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
-sdncAdapterRestV2.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:script>
+sdncAdapterRestV2.sdncAdapterBuildWorkflowException(execution, res)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_1" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_23">
@@ -39,11 +39,11 @@ sdncAdapterRestV2.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:sc
       <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_17" name="404" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_3">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '404'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '404'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_23" name="other" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_4" />
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="2xx" sourceRef="ExclusiveGateway_1" targetRef="SubProcess_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '200' || execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '202'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '200' || execution.getVariable("SDNCREST_sdncAdapterStatusCode") == '202'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_9" />
     <bpmn2:endEvent id="EndEvent_9">
@@ -58,18 +58,18 @@ sdncAdapterRestV2.sdncAdapterBuildWorkflowException(execution, res)]]></bpmn2:sc
     <bpmn2:scriptTask id="ScriptTask_7" name="Send Request to SDNC Adapter" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
-sdncAdapterRestV2.sendRequestToSDNCAdapter(execution)]]></bpmn2:script>
+sdncAdapterRestV2.sendRequestToSDNCAdapter(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_2" />
     <bpmn2:scriptTask id="ScriptTask_1" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
 sdncAdapterRestV2.preProcessRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_1" targetRef="ScriptTask_7" />
     <bpmn2:startEvent id="StartEvent_1" name="Start">
@@ -79,9 +79,9 @@ sdncAdapterRestV2.preProcessRequest(execution)
     <bpmn2:scriptTask id="ScriptTask_5" name="Workflow Exception (timeout)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Timeout Error")]]></bpmn2:script>
+exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Timeout Error")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ScriptTask_5" targetRef="EndEvent_8" />
     <bpmn2:endEvent id="EndEvent_8">
@@ -91,10 +91,10 @@ exceptionUtil.buildWorkflowException(execution, 5320, "SDNCAdapter Callback Time
     <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator and WorkflowResponse" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_44</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
 sdncAdapterRestV2.setSuccessIndicator(execution, true)
-execution.setVariable('WorkflowResponse', sdncAdapterRestV2.getLastCallback(execution))]]></bpmn2:script>
+execution.setVariable('WorkflowResponse', sdncAdapterRestV2.getLastCallback(execution))</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_6" />
     <bpmn2:endEvent id="EndEvent_6" name="End">
@@ -107,15 +107,15 @@ execution.setVariable('WorkflowResponse', sdncAdapterRestV2.getLastCallback(exec
       </bpmn2:timerEventDefinition>
     </bpmn2:boundaryEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="BoundaryEvent_1" targetRef="ScriptTask_5" />
-    <bpmn2:subProcess id="SubProcess_2" name="Wait for Callbacks">
+    <bpmn2:subProcess id="SubProcess_2" name="Wait for Callbacks" camunda:asyncAfter="true">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_44</bpmn2:outgoing>
       <bpmn2:scriptTask id="ScriptTask_6" name="Process Callback" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_41</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_42</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
-sdncAdapterRestV2.processCallback(execution)]]></bpmn2:script>
+sdncAdapterRestV2.processCallback(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_42" name="" sourceRef="ScriptTask_6" targetRef="ExclusiveGateway_3" />
       <bpmn2:startEvent id="StartEvent_3">
@@ -128,7 +128,7 @@ sdncAdapterRestV2.processCallback(execution)]]></bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_39" name="Y" sourceRef="ExclusiveGateway_7" targetRef="EndEvent_12">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable('SDNCREST_ackFinalIndicator')=="Y"}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable('SDNCREST_ackFinalIndicator')=="Y"}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_43" name="N" sourceRef="ExclusiveGateway_7" targetRef="ExclusiveGateway_1611bnb" />
       <bpmn2:exclusiveGateway id="ExclusiveGateway_3" name="Callback&#10;&#10;Exception?" default="SequenceFlow_30">
@@ -137,7 +137,7 @@ sdncAdapterRestV2.processCallback(execution)]]></bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_8" name="yes" sourceRef="ExclusiveGateway_3" targetRef="EndEvent_3">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("WorkflowException") != null}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_7" />
       <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="Catch Event">
@@ -163,17 +163,17 @@ sdncAdapterRestV2.processCallback(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="Task_0pe8nq9" name="Prepare Interim Notification" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1g8pswz</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0my3p6y</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdncAdapterRestV2 = new SDNCAdapterRestV2()
-sdncAdapterRestV2.prepareInterimNotification(execution)]]></bpmn2:script>
+sdncAdapterRestV2.prepareInterimNotification(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_0u48ihb" name="N" sourceRef="ExclusiveGateway_1611bnb" targetRef="IntermediateCatchEvent_1" />
       <bpmn2:sequenceFlow id="SequenceFlow_1g8pswz" name="Y" sourceRef="ExclusiveGateway_1611bnb" targetRef="Task_0pe8nq9">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCREST_doInterimNotification") != null && execution.getVariable("SDNCREST_doInterimNotification") == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCREST_doInterimNotification") != null &amp;&amp; execution.getVariable("SDNCREST_doInterimNotification") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_0my3p6y" sourceRef="Task_0pe8nq9" targetRef="Task_1ashvem" />
       <bpmn2:sequenceFlow id="SequenceFlow_0vluoaq" sourceRef="Task_1ashvem" targetRef="IntermediateCatchEvent_1" />
-      <bpmn2:callActivity id="Task_1ashvem" name="Call Notification Service" calledElement="${URN_mso_workflow_notification_name}">
+      <bpmn2:callActivity id="Task_1ashvem" name="Call Notification Service" calledElement="${UrnPropertiesReader.getVariable(&#34;mso.workflow.notification.name&#34;, execution)}">
         <bpmn2:extensionElements>
           <camunda:in target="all" variables="all" />
           <camunda:out variables="all" />
@@ -192,10 +192,10 @@ sdncAdapterRestV2.prepareInterimNotification(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_8" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def exUtil = new ExceptionUtil()
 exUtil.processSubflowsBPMNException(execution)
-]]></bpmn2:script>
+</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_8" targetRef="EndEvent_2" />
       <bpmn2:endEvent id="EndEvent_2">
@@ -247,8 +247,8 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="744" y="24" width="97" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_54" targetElement="_BPMNShape_ScriptTask_56">
-        <di:waypoint xsi:type="dc:Point" x="166" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="204" y="188" />
+        <di:waypoint x="166" y="188" />
+        <di:waypoint x="204" y="188" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="176" y="188" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -260,33 +260,33 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_ExclusiveGateway_105">
-        <di:waypoint xsi:type="dc:Point" x="592" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="187" />
+        <di:waypoint x="592" y="188" />
+        <di:waypoint x="624" y="187" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="611" y="187" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_168">
-        <di:waypoint xsi:type="dc:Point" x="649" y="162" />
-        <di:waypoint xsi:type="dc:Point" x="649" y="64" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="64" />
+        <di:waypoint x="649" y="162" />
+        <di:waypoint x="649" y="64" />
+        <di:waypoint x="744" y="64" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="688" y="64" width="27" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_78">
-        <di:waypoint xsi:type="dc:Point" x="674" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="709" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="709" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="188" />
+        <di:waypoint x="674" y="187" />
+        <di:waypoint x="709" y="187" />
+        <di:waypoint x="709" y="188" />
+        <di:waypoint x="744" y="188" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="684" y="188" width="35" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_SubProcess_14">
-        <di:waypoint xsi:type="dc:Point" x="649" y="212" />
-        <di:waypoint xsi:type="dc:Point" x="649" y="457" />
-        <di:waypoint xsi:type="dc:Point" x="745" y="457" />
+        <di:waypoint x="649" y="212" />
+        <di:waypoint x="649" y="457" />
+        <di:waypoint x="745" y="457" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="691" y="457" width="18" height="12" />
         </bpmndi:BPMNLabel>
@@ -298,18 +298,18 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_IntermediateCatchEvent_20">
-        <di:waypoint xsi:type="dc:Point" x="813" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="842" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="842" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="874" y="534" />
+        <di:waypoint x="813" y="534" />
+        <di:waypoint x="842" y="534" />
+        <di:waypoint x="842" y="534" />
+        <di:waypoint x="874" y="534" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="857" y="534" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_BoundaryEvent_24" targetElement="_BPMNShape_ScriptTask_59">
-        <di:waypoint xsi:type="dc:Point" x="1323" y="694" />
-        <di:waypoint xsi:type="dc:Point" x="1323" y="766" />
-        <di:waypoint xsi:type="dc:Point" x="1418" y="766" />
+        <di:waypoint x="1323" y="694" />
+        <di:waypoint x="1323" y="766" />
+        <di:waypoint x="1418" y="766" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1338" y="730" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -327,10 +327,10 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_59" targetElement="_BPMNShape_EndEvent_160">
-        <di:waypoint xsi:type="dc:Point" x="1518" y="766" />
-        <di:waypoint xsi:type="dc:Point" x="1540" y="766" />
-        <di:waypoint xsi:type="dc:Point" x="1540" y="766" />
-        <di:waypoint xsi:type="dc:Point" x="1573" y="766" />
+        <di:waypoint x="1518" y="766" />
+        <di:waypoint x="1540" y="766" />
+        <di:waypoint x="1540" y="766" />
+        <di:waypoint x="1573" y="766" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1555" y="766" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -342,8 +342,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_EndEvent_161">
-        <di:waypoint xsi:type="dc:Point" x="840" y="64" />
-        <di:waypoint xsi:type="dc:Point" x="891" y="64" />
+        <di:waypoint x="840" y="64" />
+        <di:waypoint x="891" y="64" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="865" y="64" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -355,15 +355,15 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ScriptTask_78" targetElement="_BPMNShape_EndEvent_162">
-        <di:waypoint xsi:type="dc:Point" x="840" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="188" />
+        <di:waypoint x="840" y="188" />
+        <di:waypoint x="892" y="188" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_236" bpmnElement="ScriptTask_setSuccess">
         <dc:Bounds x="1455" y="416" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_158">
-        <di:waypoint xsi:type="dc:Point" x="1552" y="457" />
-        <di:waypoint xsi:type="dc:Point" x="1603" y="458" />
+        <di:waypoint x="1552" y="457" />
+        <di:waypoint x="1603" y="458" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1578" y="442.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -372,19 +372,19 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="360" y="146" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_56" targetElement="_BPMNShape_ScriptTask_237">
-        <di:waypoint xsi:type="dc:Point" x="304" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="344" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="344" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="360" y="187" />
+        <di:waypoint x="304" y="188" />
+        <di:waypoint x="344" y="188" />
+        <di:waypoint x="344" y="187" />
+        <di:waypoint x="360" y="187" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="317" y="188" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ScriptTask_79">
-        <di:waypoint xsi:type="dc:Point" x="456" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="474" y="187" />
-        <di:waypoint xsi:type="dc:Point" x="474" y="188" />
-        <di:waypoint xsi:type="dc:Point" x="492" y="188" />
+        <di:waypoint x="456" y="187" />
+        <di:waypoint x="474" y="187" />
+        <di:waypoint x="474" y="188" />
+        <di:waypoint x="492" y="188" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_24" bpmnElement="SubProcess_1" isExpanded="true">
         <dc:Bounds x="156" y="516" width="382" height="181" />
@@ -399,8 +399,8 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="302" y="565" width="97" height="83" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ScriptTask_266">
-        <di:waypoint xsi:type="dc:Point" x="240" y="607" />
-        <di:waypoint xsi:type="dc:Point" x="302" y="606" />
+        <di:waypoint x="240" y="607" />
+        <di:waypoint x="302" y="606" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="280" y="630" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -418,8 +418,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_107" targetElement="_BPMNShape_EndEvent_215">
-        <di:waypoint xsi:type="dc:Point" x="1129" y="558" />
-        <di:waypoint xsi:type="dc:Point" x="1130" y="619" />
+        <di:waypoint x="1129" y="558" />
+        <di:waypoint x="1130" y="619" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1135" y="575.0654163104991" width="18" height="12" />
         </bpmndi:BPMNLabel>
@@ -431,22 +431,22 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_107" targetElement="_BPMNShape_ExclusiveGateway_111">
-        <di:waypoint xsi:type="dc:Point" x="1155" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="1205" y="533" />
+        <di:waypoint x="1155" y="534" />
+        <di:waypoint x="1205" y="533" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1166" y="533.6762115651724" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_111" targetElement="_BPMNShape_EndEvent_219">
-        <di:waypoint xsi:type="dc:Point" x="1255" y="533" />
-        <di:waypoint xsi:type="dc:Point" x="1309" y="534" />
+        <di:waypoint x="1255" y="533" />
+        <di:waypoint x="1309" y="534" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1277" y="508" width="7" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_41" bpmnElement="SequenceFlow_41" sourceElement="_BPMNShape_IntermediateCatchEvent_20" targetElement="_BPMNShape_ScriptTask_58">
-        <di:waypoint xsi:type="dc:Point" x="910" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="949" y="534" />
+        <di:waypoint x="910" y="534" />
+        <di:waypoint x="949" y="534" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="930" y="519" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -458,22 +458,22 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_58" targetElement="_BPMNShape_ExclusiveGateway_107">
-        <di:waypoint xsi:type="dc:Point" x="1049" y="534" />
-        <di:waypoint xsi:type="dc:Point" x="1105" y="534" />
+        <di:waypoint x="1049" y="534" />
+        <di:waypoint x="1105" y="534" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1077" y="519" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ExclusiveGateway_111" targetElement="_BPMNShape_IntermediateCatchEvent_20">
-        <di:waypoint xsi:type="dc:Point" x="1230" y="508" />
-        <di:waypoint xsi:type="dc:Point" x="1230" y="444" />
+        <di:waypoint x="1230" y="508" />
+        <di:waypoint x="1230" y="444" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1236" y="478.9261883440748" width="8" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_44" bpmnElement="SequenceFlow_44" sourceElement="_BPMNShape_SubProcess_14" targetElement="_BPMNShape_ScriptTask_236">
-        <di:waypoint xsi:type="dc:Point" x="1378" y="457" />
-        <di:waypoint xsi:type="dc:Point" x="1455" y="457" />
+        <di:waypoint x="1378" y="457" />
+        <di:waypoint x="1455" y="457" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1417" y="442" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -485,8 +485,8 @@ exUtil.processSubflowsBPMNException(execution)
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_266" targetElement="_BPMNShape_EndEvent_220">
-        <di:waypoint xsi:type="dc:Point" x="398" y="606" />
-        <di:waypoint xsi:type="dc:Point" x="444" y="607" />
+        <di:waypoint x="398" y="606" />
+        <di:waypoint x="444" y="607" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="412" y="606" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -501,32 +501,32 @@ exUtil.processSubflowsBPMNException(execution)
         <dc:Bounds x="1092" y="293" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0u48ihb_di" bpmnElement="SequenceFlow_0u48ihb">
-        <di:waypoint xsi:type="dc:Point" x="1205" y="419" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="419" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="516" />
+        <di:waypoint x="1205" y="419" />
+        <di:waypoint x="892" y="419" />
+        <di:waypoint x="892" y="516" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1174" y="402" width="8" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1g8pswz_di" bpmnElement="SequenceFlow_1g8pswz">
-        <di:waypoint xsi:type="dc:Point" x="1230" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="1230" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="1192" y="333" />
+        <di:waypoint x="1230" y="394" />
+        <di:waypoint x="1230" y="333" />
+        <di:waypoint x="1192" y="333" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1239" y="364.76190476190476" width="7" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0my3p6y_di" bpmnElement="SequenceFlow_0my3p6y">
-        <di:waypoint xsi:type="dc:Point" x="1092" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="1039" y="333" />
+        <di:waypoint x="1092" y="333" />
+        <di:waypoint x="1039" y="333" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1066" y="318" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0vluoaq_di" bpmnElement="SequenceFlow_0vluoaq">
-        <di:waypoint xsi:type="dc:Point" x="939" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="892" y="516" />
+        <di:waypoint x="939" y="333" />
+        <di:waypoint x="892" y="333" />
+        <di:waypoint x="892" y="516" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="916" y="318" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn
index 6a4223d2ad..2ae2ff7f8b 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_l2hJ8CccEeW3d--PaFJMbg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_l2hJ8CccEeW3d--PaFJMbg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.13.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="sdncAdapter" name="SDNC Adapter" isExecutable="true">
     <bpmn2:exclusiveGateway id="isResponseOK" name="is Response Ok?" default="badSynchronousResponse">
       <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
@@ -8,23 +8,23 @@
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="badSynchronousResponse" name="Bad synchronous response" sourceRef="isResponseOK" targetRef="setBadResponse" />
     <bpmn2:sequenceFlow id="goodSynchronousResponse" name="Good synchronous response" sourceRef="isResponseOK" targetRef="resetCallbackRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCA_ResponseCode")=='200'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("SDNCA_ResponseCode")=='200'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="setBadResponse" name="Set Bad Response&#10;&#10;Exception" scriptFormat="groovy">
       <bpmn2:incoming>badSynchronousResponse</bpmn2:incoming>
       <bpmn2:outgoing>Exception</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 
 int responseCode = execution.getVariable("SDNCA_ResponseCode")
 ExceptionUtil exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 7000, "Could not communicate with the SDNC Adapter" )]]></bpmn2:script>
+exceptionUtil.buildWorkflowException(execution, 7000, "Could not communicate with the SDNC Adapter" )</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="Exception" name="Exception" sourceRef="setBadResponse" targetRef="badResponseEndFlow" />
     <bpmn2:serviceTask id="invokeSDNCAdapter" name="Invoke SDNC Adapter" camunda:asyncAfter="true" camunda:class="">
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_sdnc_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${execution.getVariable("mso.adapters.sdnc.endpoint")}</camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -65,20 +65,20 @@ exceptionUtil.buildWorkflowException(execution, 7000, "Could not communicate wit
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
 sdnc.preProcessRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_8" sourceRef="processMessage" targetRef="invokeSDNCAdapter" />
     <bpmn2:scriptTask id="returnWorkflowResult" name="Return workflow result" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_11ah5pw</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
 sdnc.postProcessResponse(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" sourceRef="returnWorkflowResult" targetRef="timeoutError" />
     <bpmn2:exclusiveGateway id="timeoutError" name="Did Timeout occur?" default="noTimeoutError">
@@ -88,9 +88,9 @@ sdnc.postProcessResponse(execution)
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="noTimeoutError" name="No Timeout" sourceRef="timeoutError" targetRef="ExclusiveGateway_1" />
     <bpmn2:sequenceFlow id="SequenceFlow_19" name="Timeout" sourceRef="timeoutError" targetRef="endEventException">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("asynchronousResponseTimeout")==true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("asynchronousResponseTimeout")==true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:subProcess id="SubProcess" name="Wait for asynchronous message">
+    <bpmn2:subProcess id="SubProcess" name="Wait for asynchronous message" camunda:asyncAfter="true">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
       <bpmn2:startEvent id="StartEvent" name="Start Event">
@@ -111,17 +111,17 @@ sdnc.postProcessResponse(execution)
     <bpmn2:scriptTask id="setTimeoutEx" name="Set Timeout&#10;and Stop Listening for Callback" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0mzs1ze</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11ah5pw</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
-sdnc.setTimeout(execution)]]></bpmn2:script>
+sdnc.setTimeout(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="resetCallbackRequest" name="Reset callback request and set timer value" scriptFormat="groovy">
       <bpmn2:incoming>goodSynchronousResponse</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
-sdnc.resetCallbackRequest(execution)]]></bpmn2:script>
+sdnc.resetCallbackRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="resetCallbackRequest" targetRef="SubProcess" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Check final indicator" default="Done">
@@ -131,14 +131,14 @@ sdnc.resetCallbackRequest(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="Done" name="Done" sourceRef="ExclusiveGateway_1" targetRef="ResetInterimNotificationFlag" />
     <bpmn2:sequenceFlow id="SequenceFlow_30" name="Not Done" sourceRef="ExclusiveGateway_1" targetRef="ParallelGateway_3">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("continueListening")==true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("continueListening")==true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="toggleSuccessIndicator" name="Toggle Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1w1za5m</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
-sdnc.toggleSuccessIndicator(execution)]]></bpmn2:script>
+sdnc.toggleSuccessIndicator(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="toggleSuccessIndicator" targetRef="endEventFlow" />
     <bpmn2:endEvent id="endEventFlow" name="End Event Flow">
@@ -168,9 +168,9 @@ sdnc.toggleSuccessIndicator(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="assignError" name="Assign Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 def sdnc= new SDNCAdapter()
-sdnc.assignError(execution)]]></bpmn2:script>
+sdnc.assignError(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="assignError" targetRef="EndEvent_5" />
       <bpmn2:endEvent id="EndEvent_5">
@@ -183,7 +183,7 @@ sdnc.assignError(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="Yes" sourceRef="ExclusiveGateway_2" targetRef="SetInterimNotificationFlag">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("serviceConfigActivate")==true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("serviceConfigActivate")==true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_23" name="No" sourceRef="ExclusiveGateway_2" targetRef="EndEvent_1" />
     <bpmn2:endEvent id="EndEvent_1">
@@ -202,7 +202,7 @@ sdnc.assignError(execution)]]></bpmn2:script>
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_0mzs1ze" sourceRef="BoundaryEvent_1" targetRef="setTimeoutEx" />
     <bpmn2:sequenceFlow id="SequenceFlow_11ah5pw" sourceRef="setTimeoutEx" targetRef="returnWorkflowResult" />
-    <bpmn2:callActivity id="CallActivity_11xgv33" name="Call Notification Service" calledElement="${URN_mso_workflow_notification_name}">
+    <bpmn2:callActivity id="CallActivity_11xgv33" name="Call Notification Service" calledElement="${UrnPropertiesReader.getVariable(&#34;mso.workflow.notification.name&#34;, execution)}">
       <bpmn2:extensionElements>
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -215,7 +215,7 @@ sdnc.assignError(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="SetInterimNotificationFlag" name="Set Interim Notification Flag" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_193cb6p</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[execution.setVariable("SDNCA_InterimNotify", true)]]></bpmn2:script>
+      <bpmn2:script>execution.setVariable("SDNCA_InterimNotify", true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_193cb6p" sourceRef="SetInterimNotificationFlag" targetRef="CallActivity_11xgv33" />
     <bpmn2:endEvent id="EndEvent_18rq0b6">
@@ -225,7 +225,7 @@ sdnc.assignError(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ResetInterimNotificationFlag" name="Reset Interim Notification Flag" scriptFormat="groovy">
       <bpmn2:incoming>Done</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1w1za5m</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[execution.setVariable("SDNCA_InterimNotify", false)]]></bpmn2:script>
+      <bpmn2:script>execution.setVariable("SDNCA_InterimNotify", false)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1w1za5m" sourceRef="ResetInterimNotificationFlag" targetRef="toggleSuccessIndicator" />
   </bpmn2:process>
@@ -264,23 +264,23 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="badSynchronousResponse" sourceElement="_BPMNShape_ExclusiveGateway_29" targetElement="_BPMNShape_ScriptTask_24">
-        <di:waypoint xsi:type="dc:Point" x="544" y="153" />
-        <di:waypoint xsi:type="dc:Point" x="544" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="600" y="122" />
+        <di:waypoint x="544" y="153" />
+        <di:waypoint x="544" y="122" />
+        <di:waypoint x="600" y="122" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="441" y="99" width="164" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_33" targetElement="_BPMNShape_ScriptTask_3">
-        <di:waypoint xsi:type="dc:Point" x="147" y="179" />
-        <di:waypoint xsi:type="dc:Point" x="194" y="179" />
+        <di:waypoint x="147" y="179" />
+        <di:waypoint x="194" y="179" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="171" y="179" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="goodSynchronousResponse" sourceElement="_BPMNShape_ExclusiveGateway_29" targetElement="_BPMNShape_ScriptTask_27">
-        <di:waypoint xsi:type="dc:Point" x="544" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="544" y="246" />
+        <di:waypoint x="544" y="203" />
+        <di:waypoint x="544" y="246" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="459" y="208" width="172" height="22" />
         </bpmndi:BPMNLabel>
@@ -292,24 +292,24 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="194" y="139" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_3" targetElement="_BPMNShape_ServiceTask_62">
-        <di:waypoint xsi:type="dc:Point" x="294" y="179" />
-        <di:waypoint xsi:type="dc:Point" x="342" y="179" />
+        <di:waypoint x="294" y="179" />
+        <di:waypoint x="342" y="179" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="300" y="153" width="30" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ServiceTask_68" targetElement="_BPMNShape_ExclusiveGateway_53">
-        <di:waypoint xsi:type="dc:Point" x="1204" y="277" />
-        <di:waypoint xsi:type="dc:Point" x="1248" y="276" />
+        <di:waypoint x="1204" y="277" />
+        <di:waypoint x="1248" y="276" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1211" y="251" width="37" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ServiceTask_62" targetElement="_BPMNShape_ExclusiveGateway_29">
-        <di:waypoint xsi:type="dc:Point" x="442" y="179" />
-        <di:waypoint xsi:type="dc:Point" x="480" y="179" />
-        <di:waypoint xsi:type="dc:Point" x="480" y="178" />
-        <di:waypoint xsi:type="dc:Point" x="519" y="178" />
+        <di:waypoint x="442" y="179" />
+        <di:waypoint x="480" y="179" />
+        <di:waypoint x="480" y="178" />
+        <di:waypoint x="519" y="178" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="468" y="153" width="37" height="22" />
         </bpmndi:BPMNLabel>
@@ -330,8 +330,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_SubProcess_11">
-        <di:waypoint xsi:type="dc:Point" x="998" y="278" />
-        <di:waypoint xsi:type="dc:Point" x="1104" y="277" />
+        <di:waypoint x="998" y="278" />
+        <di:waypoint x="1104" y="277" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1051" y="262.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -340,8 +340,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="600" y="82" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="Exception" sourceElement="_BPMNShape_ScriptTask_24" targetElement="_BPMNShape_EndEvent_65">
-        <di:waypoint xsi:type="dc:Point" x="700" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="762" y="122" />
+        <di:waypoint x="700" y="122" />
+        <di:waypoint x="762" y="122" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="699" y="99" width="64" height="22" />
         </bpmndi:BPMNLabel>
@@ -350,8 +350,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="941" y="372" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_IntermediateCatchEvent_16">
-        <di:waypoint xsi:type="dc:Point" x="817" y="275" />
-        <di:waypoint xsi:type="dc:Point" x="926" y="275" />
+        <di:waypoint x="817" y="275" />
+        <di:waypoint x="926" y="275" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="872" y="260" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -363,16 +363,16 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="noTimeoutError" sourceElement="_BPMNShape_ExclusiveGateway_53" targetElement="_BPMNShape_ExclusiveGateway_54">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="301" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="359" />
+        <di:waypoint x="1273" y="301" />
+        <di:waypoint x="1273" y="359" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1280" y="324" width="72" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_53" targetElement="_BPMNShape_ScriptTask_25">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="251" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="1560" y="95" />
+        <di:waypoint x="1273" y="251" />
+        <di:waypoint x="1273" y="95" />
+        <di:waypoint x="1560" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1301" y="169.45283018867923" width="39" height="12" />
         </bpmndi:BPMNLabel>
@@ -384,8 +384,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="Done" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ScriptTask_247">
-        <di:waypoint xsi:type="dc:Point" x="1298" y="384" />
-        <di:waypoint xsi:type="dc:Point" x="1386" y="385" />
+        <di:waypoint x="1298" y="384" />
+        <di:waypoint x="1386" y="385" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1322" y="384.219838851959" width="27" height="13" />
         </bpmndi:BPMNLabel>
@@ -394,17 +394,17 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="494" y="246" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_27" targetElement="_BPMNShape_SubProcess_11">
-        <di:waypoint xsi:type="dc:Point" x="594" y="286" />
-        <di:waypoint xsi:type="dc:Point" x="607" y="286" />
-        <di:waypoint xsi:type="dc:Point" x="607" y="275" />
-        <di:waypoint xsi:type="dc:Point" x="619" y="275" />
+        <di:waypoint x="594" y="286" />
+        <di:waypoint x="607" y="286" />
+        <di:waypoint x="607" y="275" />
+        <di:waypoint x="619" y="275" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="622" y="280.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_54" targetElement="_BPMNShape_ParallelGateway_14">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="409" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="467" />
+        <di:waypoint x="1273" y="409" />
+        <di:waypoint x="1273" y="467" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1273" y="423" width="60" height="22" />
         </bpmndi:BPMNLabel>
@@ -416,8 +416,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ExclusiveGateway_55" targetElement="CallActivity_11xgv33_di">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="602" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="664" />
+        <di:waypoint x="1273" y="602" />
+        <di:waypoint x="1273" y="664" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1237" y="635.9906427957554" width="18" height="13" />
         </bpmndi:BPMNLabel>
@@ -428,9 +428,9 @@ sdnc.assignError(execution)]]></bpmn2:script>
           <dc:Bounds x="1273" y="522" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ParallelGateway_14" targetElement="_BPMNShape_ScriptTask_255">
-        <di:waypoint xsi:type="dc:Point" x="1272" y="516" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="552" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ParallelGateway_14">
+        <di:waypoint x="1272" y="516" />
+        <di:waypoint x="1273" y="552" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1273" y="519" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -442,17 +442,17 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_55" targetElement="_BPMNShape_EndEvent_96">
-        <di:waypoint xsi:type="dc:Point" x="1298" y="577" />
-        <di:waypoint xsi:type="dc:Point" x="1330" y="577" />
-        <di:waypoint xsi:type="dc:Point" x="1440" y="577" />
+        <di:waypoint x="1298" y="577" />
+        <di:waypoint x="1330" y="577" />
+        <di:waypoint x="1440" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1309" y="590.5" width="14" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ParallelGateway_14" targetElement="_BPMNShape_ScriptTask_27">
-        <di:waypoint xsi:type="dc:Point" x="1248" y="492" />
-        <di:waypoint xsi:type="dc:Point" x="544" y="492" />
-        <di:waypoint xsi:type="dc:Point" x="544" y="326" />
+        <di:waypoint x="1248" y="492" />
+        <di:waypoint x="544" y="492" />
+        <di:waypoint x="544" y="326" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="782" y="467" width="73" height="48" />
         </bpmndi:BPMNLabel>
@@ -461,47 +461,47 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="1540" y="344" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_247" targetElement="_BPMNShape_EndEvent_64">
-        <di:waypoint xsi:type="dc:Point" x="1640" y="384" />
-        <di:waypoint xsi:type="dc:Point" x="1699" y="384" />
+        <di:waypoint x="1640" y="384" />
+        <di:waypoint x="1699" y="384" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1670" y="369" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_19" bpmnElement="errorHandlingSubProcess" isExpanded="true">
-        <dc:Bounds x="378" y="797" width="353" height="193" />
+        <dc:Bounds x="207" y="692" width="353" height="193" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_63" bpmnElement="catchErrors">
-        <dc:Bounds x="413" y="876" width="36" height="36" />
+        <dc:Bounds x="242" y="771" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="416" y="917" width="29" height="12" />
+          <dc:Bounds x="245" y="812" width="29" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_213" bpmnElement="EndEvent_5">
-        <dc:Bounds x="653" y="876" width="36" height="36" />
+        <dc:Bounds x="482" y="771" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="671" y="917" width="0" height="0" />
+          <dc:Bounds x="455" y="812" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_249" bpmnElement="assignError">
-        <dc:Bounds x="497" y="854" width="100" height="80" />
+        <dc:Bounds x="326" y="749" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_StartEvent_63" targetElement="_BPMNShape_ScriptTask_249">
-        <di:waypoint xsi:type="dc:Point" x="449" y="894" />
-        <di:waypoint xsi:type="dc:Point" x="497" y="894" />
+        <di:waypoint x="278" y="789" />
+        <di:waypoint x="326" y="789" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="479" y="894" width="0" height="0" />
+          <dc:Bounds x="263" y="789" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_249" targetElement="_BPMNShape_EndEvent_213">
-        <di:waypoint xsi:type="dc:Point" x="597" y="894" />
-        <di:waypoint xsi:type="dc:Point" x="653" y="894" />
+        <di:waypoint x="426" y="789" />
+        <di:waypoint x="482" y="789" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="625" y="894" width="0" height="0" />
+          <dc:Bounds x="409" y="789" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eciucn_di" bpmnElement="SequenceFlow_1eciucn">
-        <di:waypoint xsi:type="dc:Point" x="691" y="275" />
-        <di:waypoint xsi:type="dc:Point" x="781" y="275" />
+        <di:waypoint x="691" y="275" />
+        <di:waypoint x="781" y="275" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="736" y="260" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -519,17 +519,17 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0mzs1ze_di" bpmnElement="SequenceFlow_0mzs1ze">
-        <di:waypoint xsi:type="dc:Point" x="800" y="364" />
-        <di:waypoint xsi:type="dc:Point" x="800" y="412" />
-        <di:waypoint xsi:type="dc:Point" x="941" y="412" />
+        <di:waypoint x="800" y="364" />
+        <di:waypoint x="800" y="412" />
+        <di:waypoint x="941" y="412" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="815" y="388" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_11ah5pw_di" bpmnElement="SequenceFlow_11ah5pw">
-        <di:waypoint xsi:type="dc:Point" x="1041" y="412" />
-        <di:waypoint xsi:type="dc:Point" x="1154" y="412" />
-        <di:waypoint xsi:type="dc:Point" x="1154" y="317" />
+        <di:waypoint x="1041" y="412" />
+        <di:waypoint x="1154" y="412" />
+        <di:waypoint x="1154" y="317" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1098" y="397" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -547,8 +547,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="1223" y="666" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_193cb6p_di" bpmnElement="SequenceFlow_193cb6p">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="746" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="795" />
+        <di:waypoint x="1273" y="746" />
+        <di:waypoint x="1273" y="795" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1288" y="770.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -560,8 +560,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1em7gys_di" bpmnElement="SequenceFlow_1em7gys">
-        <di:waypoint xsi:type="dc:Point" x="1273" y="875" />
-        <di:waypoint xsi:type="dc:Point" x="1273" y="920" />
+        <di:waypoint x="1273" y="875" />
+        <di:waypoint x="1273" y="920" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1288" y="897.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -570,8 +570,8 @@ sdnc.assignError(execution)]]></bpmn2:script>
         <dc:Bounds x="1386" y="345" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1w1za5m_di" bpmnElement="SequenceFlow_1w1za5m">
-        <di:waypoint xsi:type="dc:Point" x="1486" y="385" />
-        <di:waypoint xsi:type="dc:Point" x="1540" y="384" />
+        <di:waypoint x="1486" y="385" />
+        <di:waypoint x="1540" y="384" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1513" y="369.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIGenericVnf.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIGenericVnf.bpmn
index 0932221944..42ffb762e7 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIGenericVnf.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIGenericVnf.bpmn
@@ -5,7 +5,7 @@
     <bpmn2:scriptTask id="QueryAAIForGenericVNF" name="Query AAI for Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def ugv = new UpdateAAIGenericVnf()
 ugv.getGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -26,7 +26,7 @@ ugv.getGenericVnf(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="HandleUpdateGenericVNFFailure" name="Handle Update Generic VNF Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def ugv = new UpdateAAIGenericVnf()
 ugv.handleUpdateGenericVnfFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -35,7 +35,7 @@ ugv.handleUpdateGenericVnfFailure(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"                   xmlns:ns="http://org.openecomp/mso/workflow/schema/v1">
+            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.onap/so/workflow/schema/v1"                   xmlns:ns="http://org.onap/so/workflow/schema/v1">
  <ns:GlobalCustomerId>${CCV1_subscriberglobalid}</ns:GlobalCustomerId>
    </aetgt:CreateCustomerResponse>]]></camunda:outputParameter>
           </camunda:inputOutput>
@@ -46,7 +46,7 @@ ugv.handleUpdateGenericVnfFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="UpdateGenericVNF" name="Update Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def ugv = new UpdateAAIGenericVnf()
 ugv.updateGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -63,7 +63,7 @@ ugv.updateGenericVnf(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="AAIQueryFailure" name="Handle AAI Query Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def ugv = new UpdateAAIGenericVnf()
 ugv.handleAAIQueryFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -79,7 +79,7 @@ ugv.handleAAIQueryFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def ugv = new UpdateAAIGenericVnf()
 ugv.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIVfModule.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIVfModule.bpmn
index 6eacaee530..f0b1d8d027 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIVfModule.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/UpdateAAIVfModule.bpmn
@@ -5,7 +5,7 @@
     <bpmn2:scriptTask id="QueryAAIForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def uvm = new UpdateAAIVfModule()
 uvm.getVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -17,7 +17,7 @@ uvm.getVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="AAIQueryFailure" name="Handle AAI Query Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def uvm= new UpdateAAIVfModule()
 uvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ uvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"                   xmlns:ns="http://org.openecomp/mso/workflow/schema/v1">
+            <camunda:outputParameter name="CreateCustomerV1Response"><![CDATA[<aetgt:CreateCustomerResponse xmlns:aetgt="http://org.onap/so/workflow/schema/v1"                   xmlns:ns="http://org.onap/so/workflow/schema/v1">
  <ns:GlobalCustomerId>${CCV1_subscriberglobalid}</ns:GlobalCustomerId>
    </aetgt:CreateCustomerResponse>]]></camunda:outputParameter>
           </camunda:inputOutput>
@@ -50,7 +50,7 @@ uvm.handleAAIQueryFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="HandleUpdateVfModuleFailure" name="Handle Update VF Module Failure" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def uvm= new UpdateAAIVfModule()
 uvm.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -67,7 +67,7 @@ uvm.handleUpdateVfModuleFailure(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="UpdateVfModule" name="Update VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def uvm= new UpdateAAIVfModule()
 uvm.updateVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -79,7 +79,7 @@ uvm.updateVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def uvm= new UpdateAAIVfModule()
 uvm.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterRestV1.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterRestV1.bpmn
index 82d89b0c64..cdd710d102 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterRestV1.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterRestV1.bpmn
@@ -1,442 +1,442 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_GraPIIyxEeWmdMDkx6Uftw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">

-  <bpmn2:process id="vnfAdapterRestV1" name="vnfAdapterRestV1" isExecutable="true">

-    <bpmn2:scriptTask id="ScriptTask_2" name="Log Response" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-def statusCode = execution.getVariable('VNFREST_vnfAdapterStatusCode')

-String response = String.valueOf(execution.getVariable('VNFREST_vnfAdapterResponse'))

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

-def processKey = vnfAdapterRestV1.getProcessKey(execution)

-vnfAdapterRestV1.logDebug(processKey + " received response from VnfAdapter: statusCode=" + statusCode +

-	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)">

-      <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def exceptionUtil = new ExceptionUtil()

-exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Failed to communicate with VnfAdapter")]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:scriptTask id="ScriptTask_4" name="Workflow Exception (bad response)" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-

-String res = execution.getVariable(VNFREST_vnfAdapterResponse)

-

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-vnfAdapterRestV1.vnfAdapterWorkflowException(execution, res)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_1"/>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_23">

-      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_17" name="404" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_3">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("VNFREST_vnfAdapterStatusCode") == '404'}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_23" name="other" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_4"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="2xx" sourceRef="ExclusiveGateway_1" targetRef="waitForAsyncMessage">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("VNFREST_vnfAdapterStatusCode") == '200' || execution.getVariable("VNFREST_vnfAdapterStatusCode") == '202'}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:boundaryEvent id="BoundaryEvent_1" name="Timeout" attachedToRef="waitForAsyncMessage">

-      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>

-      <bpmn2:timerEventDefinition id="TimerEventDefinition_1">

-        <bpmn2:timeDuration xsi:type="bpmn2:tFormalExpression">${URN_mso_po_timeout}</bpmn2:timeDuration>

-      </bpmn2:timerEventDefinition>

-    </bpmn2:boundaryEvent>

-    <bpmn2:subProcess id="waitForAsyncMessage" name="Wait for Callback">

-      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>

-      <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="Catch Event">

-        <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>

-        <bpmn2:messageEventDefinition id="MessageEventDefinition_1" messageRef="Message_1"/>

-      </bpmn2:intermediateCatchEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="IntermediateCatchEvent_1" targetRef="EndEvent_2"/>

-      <bpmn2:startEvent id="StartEvent_3">

-        <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="StartEvent_3" targetRef="IntermediateCatchEvent_1"/>

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>

-      </bpmn2:endEvent>

-    </bpmn2:subProcess>

-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="BoundaryEvent_1" targetRef="ScriptTask_5"/>

-    <bpmn2:scriptTask id="ScriptTask_5" name="Workflow Exception (timeout)" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def exceptionUtil = new ExceptionUtil()

-exceptionUtil.buildAndThrowWorkflowException(execution, 7010, "VnfAdapter Callback Timeout Error")]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="waitForAsyncMessage" targetRef="ScriptTask_6"/>

-    <bpmn2:scriptTask id="ScriptTask_6" name="Process Callback" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-vnfAdapterRestV1.processCallback(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="ScriptTask_6" targetRef="ExclusiveGateway_2"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ScriptTask_5" targetRef="EndEvent_8"/>

-    <bpmn2:endEvent id="EndEvent_8">

-      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_21" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_9"/>

-    <bpmn2:endEvent id="EndEvent_9">

-      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_22" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:endEvent id="EndEvent_10">

-      <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_23" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="ScriptTask_4" targetRef="EndEvent_10"/>

-    <bpmn2:endEvent id="EndEvent_7">

-      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>

-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_20" errorRef="Error_1"/>

-    </bpmn2:endEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Callback&#xD;&#xA;Exception?" default="SequenceFlow_31">

-      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_31" name="no" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_setSuccess"/>

-    <bpmn2:sequenceFlow id="SequenceFlow_32" name="yes" sourceRef="ExclusiveGateway_2" targetRef="EndEvent_7">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-vnfAdapterRestV1.setSuccessIndicator(execution, true)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_6"/>

-    <bpmn2:endEvent id="EndEvent_6" name="End Flow">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:scriptTask id="ScriptTask_7" name="Send Request to Vnf Adapter" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-vnfAdapterRestV1.sendRequestToVnfAdapter(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_2"/>

-    <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:scriptTask id="ScriptTask_8" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def exUtil = new ExceptionUtil()

-exUtil.processSubflowsBPMNException(execution)

-]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_8" targetRef="EndEvent_1"/>

-      <bpmn2:endEvent id="EndEvent_1">

-        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_89"/>

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_8"/>

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="ScriptTask_1" name="Pre-Process Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-def vnfAdapterRestV1 = new VnfAdapterRestV1()

-vnfAdapterRestV1.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_1" targetRef="ScriptTask_7"/>

-    <bpmn2:startEvent id="StartEvent_1" name="Start">

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1"/>

-  </bpmn2:process>

-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>

-  <bpmn2:message id="Message_1" name="WorkflowMessage"/>

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="vnfAdapterRestV1">

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_56" bpmnElement="ScriptTask_1">

-        <dc:Bounds height="80.0" width="100.0" x="204.0" y="148.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_14" bpmnElement="waitForAsyncMessage" isExpanded="true">

-        <dc:Bounds height="154.0" width="265.0" x="744.0" y="275.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_58" bpmnElement="ScriptTask_6">

-        <dc:Bounds height="80.0" width="100.0" x="1046.0" y="311.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_59" bpmnElement="ScriptTask_5">

-        <dc:Bounds height="80.0" width="100.0" x="827.0" y="492.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_24" bpmnElement="BoundaryEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="859.0" y="411.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="52.0" x="894.0" y="441.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_20" bpmnElement="IntermediateCatchEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="863.0" y="330.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="76.0" x="843.0" y="371.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_78" bpmnElement="ScriptTask_4">

-        <dc:Bounds height="80.0" width="97.0" x="744.0" y="148.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_79" bpmnElement="ScriptTask_2">

-        <dc:Bounds height="80.0" width="100.0" x="492.0" y="148.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_54" bpmnElement="StartEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="84.0" y="170.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="34.0" x="85.0" y="211.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_3">

-        <dc:Bounds height="80.0" width="97.0" x="744.0" y="24.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_54" targetElement="_BPMNShape_ScriptTask_56">

-        <di:waypoint xsi:type="dc:Point" x="120.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="204.0" y="188.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="130.0" y="188.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_105" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="624.0" y="162.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="649.0" y="217.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_ExclusiveGateway_105">

-        <di:waypoint xsi:type="dc:Point" x="592.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="624.0" y="187.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="611.0" y="187.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_168">

-        <di:waypoint xsi:type="dc:Point" x="649.0" y="162.0"/>

-        <di:waypoint xsi:type="dc:Point" x="649.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="744.0" y="64.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="27.0" x="688.0" y="64.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_78">

-        <di:waypoint xsi:type="dc:Point" x="674.0" y="187.0"/>

-        <di:waypoint xsi:type="dc:Point" x="709.0" y="187.0"/>

-        <di:waypoint xsi:type="dc:Point" x="709.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="744.0" y="188.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="35.0" x="684.0" y="188.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_SubProcess_14">

-        <di:waypoint xsi:type="dc:Point" x="649.0" y="212.0"/>

-        <di:waypoint xsi:type="dc:Point" x="649.0" y="353.0"/>

-        <di:waypoint xsi:type="dc:Point" x="708.0" y="353.0"/>

-        <di:waypoint xsi:type="dc:Point" x="744.0" y="353.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="27.0" x="688.0" y="328.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_3">

-        <dc:Bounds height="36.0" width="36.0" x="768.0" y="330.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="786.0" y="371.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_IntermediateCatchEvent_20">

-        <di:waypoint xsi:type="dc:Point" x="804.0" y="348.0"/>

-        <di:waypoint xsi:type="dc:Point" x="863.0" y="348.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="833.0" y="348.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_156" bpmnElement="EndEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="948.0" y="330.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="966.0" y="371.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_IntermediateCatchEvent_20" targetElement="_BPMNShape_EndEvent_156">

-        <di:waypoint xsi:type="dc:Point" x="899.0" y="348.0"/>

-        <di:waypoint xsi:type="dc:Point" x="929.0" y="348.0"/>

-        <di:waypoint xsi:type="dc:Point" x="929.0" y="347.0"/>

-        <di:waypoint xsi:type="dc:Point" x="948.0" y="348.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="926.0" y="348.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_BoundaryEvent_24" targetElement="_BPMNShape_ScriptTask_59">

-        <di:waypoint xsi:type="dc:Point" x="877.0" y="447.0"/>

-        <di:waypoint xsi:type="dc:Point" x="877.0" y="492.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="874.0" y="472.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_SubProcess_14" targetElement="_BPMNShape_ScriptTask_58">

-        <di:waypoint xsi:type="dc:Point" x="1008.0" y="351.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1046.0" y="351.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1023.0" y="351.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_106" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

-        <dc:Bounds height="50.0" width="50.0" x="1188.0" y="325.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="38.0" width="71.0" x="1179.0" y="288.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_158" bpmnElement="EndEvent_6">

-        <dc:Bounds height="36.0" width="36.0" x="1463.0" y="333.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="60.0" x="1451.0" y="374.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ExclusiveGateway_106" targetElement="_BPMNShape_ScriptTask_236">

-        <di:waypoint xsi:type="dc:Point" x="1238.0" y="350.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1308.0" y="350.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="20.0" x="1248.0" y="350.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_159" bpmnElement="EndEvent_7">

-        <dc:Bounds height="36.0" width="36.0" x="1196.0" y="426.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="1214.0" y="467.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ExclusiveGateway_106" targetElement="_BPMNShape_EndEvent_159">

-        <di:waypoint xsi:type="dc:Point" x="1213.0" y="375.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1213.0" y="392.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1214.0" y="392.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1214.0" y="426.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="22.0" width="27.0" x="1223.0" y="390.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_58" targetElement="_BPMNShape_ExclusiveGateway_106">

-        <di:waypoint xsi:type="dc:Point" x="1146.0" y="351.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1173.0" y="351.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1173.0" y="350.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1188.0" y="350.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1170.0" y="350.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_8">

-        <dc:Bounds height="36.0" width="36.0" x="974.0" y="514.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="992.0" y="555.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_59" targetElement="_BPMNShape_EndEvent_160">

-        <di:waypoint xsi:type="dc:Point" x="927.0" y="532.0"/>

-        <di:waypoint xsi:type="dc:Point" x="974.0" y="532.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="951.0" y="532.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_9">

-        <dc:Bounds height="36.0" width="36.0" x="891.0" y="46.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="909.0" y="87.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_EndEvent_161">

-        <di:waypoint xsi:type="dc:Point" x="840.0" y="64.0"/>

-        <di:waypoint xsi:type="dc:Point" x="891.0" y="64.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="865.0" y="64.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_10">

-        <dc:Bounds height="36.0" width="36.0" x="892.0" y="170.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="910.0" y="211.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ScriptTask_78" targetElement="_BPMNShape_EndEvent_162">

-        <di:waypoint xsi:type="dc:Point" x="840.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="892.0" y="188.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_236" bpmnElement="ScriptTask_setSuccess">

-        <dc:Bounds height="83.0" width="97.0" x="1308.0" y="309.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_158">

-        <di:waypoint xsi:type="dc:Point" x="1404.0" y="350.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1422.0" y="350.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1422.0" y="351.0"/>

-        <di:waypoint xsi:type="dc:Point" x="1463.0" y="351.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="1419.0" y="351.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_237" bpmnElement="ScriptTask_7">

-        <dc:Bounds height="83.0" width="97.0" x="360.0" y="146.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_56" targetElement="_BPMNShape_ScriptTask_237">

-        <di:waypoint xsi:type="dc:Point" x="304.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="344.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="344.0" y="187.0"/>

-        <di:waypoint xsi:type="dc:Point" x="360.0" y="187.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="317.0" y="188.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ScriptTask_79">

-        <di:waypoint xsi:type="dc:Point" x="456.0" y="187.0"/>

-        <di:waypoint xsi:type="dc:Point" x="474.0" y="187.0"/>

-        <di:waypoint xsi:type="dc:Point" x="474.0" y="188.0"/>

-        <di:waypoint xsi:type="dc:Point" x="492.0" y="188.0"/>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_24" bpmnElement="SubProcess_1" isExpanded="true">

-        <dc:Bounds height="181.0" width="382.0" x="180.0" y="532.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_66" bpmnElement="StartEvent_2">

-        <dc:Bounds height="36.0" width="36.0" x="225.0" y="605.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="243.0" y="646.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_207" bpmnElement="EndEvent_1">

-        <dc:Bounds height="36.0" width="36.0" x="477.0" y="605.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="0.0" width="0.0" x="495.0" y="646.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_266" bpmnElement="ScriptTask_8">

-        <dc:Bounds height="83.0" width="97.0" x="323.0" y="581.0"/>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ScriptTask_266">

-        <di:waypoint xsi:type="dc:Point" x="261.0" y="623.0"/>

-        <di:waypoint xsi:type="dc:Point" x="323.0" y="622.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="273.0" y="623.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_266" targetElement="_BPMNShape_EndEvent_207">

-        <di:waypoint xsi:type="dc:Point" x="419.0" y="622.0"/>

-        <di:waypoint xsi:type="dc:Point" x="477.0" y="623.0"/>

-        <bpmndi:BPMNLabel>

-          <dc:Bounds height="6.0" width="6.0" x="445.0" y="623.0"/>

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_GraPIIyxEeWmdMDkx6Uftw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+  <bpmn2:process id="vnfAdapterRestV1" name="vnfAdapterRestV1" isExecutable="true">
+    <bpmn2:scriptTask id="ScriptTask_2" name="Log Response" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+def statusCode = execution.getVariable('VNFREST_vnfAdapterStatusCode')
+String response = String.valueOf(execution.getVariable('VNFREST_vnfAdapterResponse'))
+def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+def processKey = vnfAdapterRestV1.getProcessKey(execution)
+vnfAdapterRestV1.logDebug(processKey + " received response from VnfAdapter: statusCode=" + statusCode +
+	" response=" + (response.isEmpty() ? "" : "\n") + response, isDebugLogEnabled)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="ScriptTask_3" name="Workflow Exception (no connection)">
+      <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def exceptionUtil = new ExceptionUtil()
+exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Failed to communicate with VnfAdapter")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="ScriptTask_4" name="Workflow Exception (bad response)" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+
+String res = execution.getVariable(VNFREST_vnfAdapterResponse)
+
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+vnfAdapterRestV1.vnfAdapterWorkflowException(execution, res)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_2" targetRef="ExclusiveGateway_1"/>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1" default="SequenceFlow_23">
+      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_17" name="404" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_3">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("VNFREST_vnfAdapterStatusCode") == '404'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="other" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_4"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="2xx" sourceRef="ExclusiveGateway_1" targetRef="waitForAsyncMessage">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("VNFREST_vnfAdapterStatusCode") == '200' || execution.getVariable("VNFREST_vnfAdapterStatusCode") == '202'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:boundaryEvent id="BoundaryEvent_1" name="Timeout" attachedToRef="waitForAsyncMessage">
+      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
+      <bpmn2:timerEventDefinition id="TimerEventDefinition_1">
+        <bpmn2:timeDuration xsi:type="bpmn2:tFormalExpression"><![CDATA[${UrnPropertiesReader.getVariable("mso.po.timeout", execution)}]]></bpmn2:timeDuration>
+      </bpmn2:timerEventDefinition>
+    </bpmn2:boundaryEvent>
+    <bpmn2:subProcess id="waitForAsyncMessage" name="Wait for Callback">
+      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
+      <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="Catch Event">
+        <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
+        <bpmn2:messageEventDefinition id="MessageEventDefinition_1" messageRef="Message_1"/>
+      </bpmn2:intermediateCatchEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="IntermediateCatchEvent_1" targetRef="EndEvent_2"/>
+      <bpmn2:startEvent id="StartEvent_3">
+        <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="StartEvent_3" targetRef="IntermediateCatchEvent_1"/>
+      <bpmn2:endEvent id="EndEvent_2">
+        <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
+      </bpmn2:endEvent>
+    </bpmn2:subProcess>
+    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="BoundaryEvent_1" targetRef="ScriptTask_5"/>
+    <bpmn2:scriptTask id="ScriptTask_5" name="Workflow Exception (timeout)" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def exceptionUtil = new ExceptionUtil()
+exceptionUtil.buildAndThrowWorkflowException(execution, 7010, "VnfAdapter Callback Timeout Error")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="waitForAsyncMessage" targetRef="ScriptTask_6"/>
+    <bpmn2:scriptTask id="ScriptTask_6" name="Process Callback" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+vnfAdapterRestV1.processCallback(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="ScriptTask_6" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="ScriptTask_5" targetRef="EndEvent_8"/>
+    <bpmn2:endEvent id="EndEvent_8">
+      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_21" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_9"/>
+    <bpmn2:endEvent id="EndEvent_9">
+      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_22" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:endEvent id="EndEvent_10">
+      <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_23" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="ScriptTask_4" targetRef="EndEvent_10"/>
+    <bpmn2:endEvent id="EndEvent_7">
+      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_20" errorRef="Error_1"/>
+    </bpmn2:endEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Callback&#xD;&#xA;Exception?" default="SequenceFlow_31">
+      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_31" name="no" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_setSuccess"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_32" name="yes" sourceRef="ExclusiveGateway_2" targetRef="EndEvent_7">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+vnfAdapterRestV1.setSuccessIndicator(execution, true)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_6"/>
+    <bpmn2:endEvent id="EndEvent_6" name="End Flow">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="ScriptTask_7" name="Send Request to Vnf Adapter" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+vnfAdapterRestV1.sendRequestToVnfAdapter(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_2"/>
+    <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:scriptTask id="ScriptTask_8" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def exUtil = new ExceptionUtil()
+exUtil.processSubflowsBPMNException(execution)
+]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_8" targetRef="EndEvent_1"/>
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:startEvent id="StartEvent_2">
+        <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_89"/>
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_8"/>
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="ScriptTask_1" name="Pre-Process Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def vnfAdapterRestV1 = new VnfAdapterRestV1()
+vnfAdapterRestV1.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_1" targetRef="ScriptTask_7"/>
+    <bpmn2:startEvent id="StartEvent_1" name="Start">
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1"/>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/>
+  <bpmn2:message id="Message_1" name="WorkflowMessage"/>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="vnfAdapterRestV1">
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_56" bpmnElement="ScriptTask_1">
+        <dc:Bounds height="80.0" width="100.0" x="204.0" y="148.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_14" bpmnElement="waitForAsyncMessage" isExpanded="true">
+        <dc:Bounds height="154.0" width="265.0" x="744.0" y="275.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_58" bpmnElement="ScriptTask_6">
+        <dc:Bounds height="80.0" width="100.0" x="1046.0" y="311.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_59" bpmnElement="ScriptTask_5">
+        <dc:Bounds height="80.0" width="100.0" x="827.0" y="492.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_24" bpmnElement="BoundaryEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="859.0" y="411.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="52.0" x="894.0" y="441.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_20" bpmnElement="IntermediateCatchEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="863.0" y="330.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="76.0" x="843.0" y="371.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_78" bpmnElement="ScriptTask_4">
+        <dc:Bounds height="80.0" width="97.0" x="744.0" y="148.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_79" bpmnElement="ScriptTask_2">
+        <dc:Bounds height="80.0" width="100.0" x="492.0" y="148.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_54" bpmnElement="StartEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="84.0" y="170.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="34.0" x="85.0" y="211.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_3">
+        <dc:Bounds height="80.0" width="97.0" x="744.0" y="24.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_54" targetElement="_BPMNShape_ScriptTask_56">
+        <di:waypoint xsi:type="dc:Point" x="120.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="204.0" y="188.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="130.0" y="188.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_105" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="624.0" y="162.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="649.0" y="217.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_ExclusiveGateway_105">
+        <di:waypoint xsi:type="dc:Point" x="592.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="624.0" y="187.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="611.0" y="187.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_168">
+        <di:waypoint xsi:type="dc:Point" x="649.0" y="162.0"/>
+        <di:waypoint xsi:type="dc:Point" x="649.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="744.0" y="64.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="27.0" x="688.0" y="64.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_ScriptTask_78">
+        <di:waypoint xsi:type="dc:Point" x="674.0" y="187.0"/>
+        <di:waypoint xsi:type="dc:Point" x="709.0" y="187.0"/>
+        <di:waypoint xsi:type="dc:Point" x="709.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="744.0" y="188.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="35.0" x="684.0" y="188.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_105" targetElement="_BPMNShape_SubProcess_14">
+        <di:waypoint xsi:type="dc:Point" x="649.0" y="212.0"/>
+        <di:waypoint xsi:type="dc:Point" x="649.0" y="353.0"/>
+        <di:waypoint xsi:type="dc:Point" x="708.0" y="353.0"/>
+        <di:waypoint xsi:type="dc:Point" x="744.0" y="353.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="27.0" x="688.0" y="328.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_3">
+        <dc:Bounds height="36.0" width="36.0" x="768.0" y="330.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="786.0" y="371.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_IntermediateCatchEvent_20">
+        <di:waypoint xsi:type="dc:Point" x="804.0" y="348.0"/>
+        <di:waypoint xsi:type="dc:Point" x="863.0" y="348.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="833.0" y="348.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_156" bpmnElement="EndEvent_2">
+        <dc:Bounds height="36.0" width="36.0" x="948.0" y="330.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="966.0" y="371.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_IntermediateCatchEvent_20" targetElement="_BPMNShape_EndEvent_156">
+        <di:waypoint xsi:type="dc:Point" x="899.0" y="348.0"/>
+        <di:waypoint xsi:type="dc:Point" x="929.0" y="348.0"/>
+        <di:waypoint xsi:type="dc:Point" x="929.0" y="347.0"/>
+        <di:waypoint xsi:type="dc:Point" x="948.0" y="348.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="926.0" y="348.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_BoundaryEvent_24" targetElement="_BPMNShape_ScriptTask_59">
+        <di:waypoint xsi:type="dc:Point" x="877.0" y="447.0"/>
+        <di:waypoint xsi:type="dc:Point" x="877.0" y="492.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="874.0" y="472.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_SubProcess_14" targetElement="_BPMNShape_ScriptTask_58">
+        <di:waypoint xsi:type="dc:Point" x="1008.0" y="351.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1046.0" y="351.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1023.0" y="351.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_106" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
+        <dc:Bounds height="50.0" width="50.0" x="1188.0" y="325.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="38.0" width="71.0" x="1179.0" y="288.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_158" bpmnElement="EndEvent_6">
+        <dc:Bounds height="36.0" width="36.0" x="1463.0" y="333.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="60.0" x="1451.0" y="374.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ExclusiveGateway_106" targetElement="_BPMNShape_ScriptTask_236">
+        <di:waypoint xsi:type="dc:Point" x="1238.0" y="350.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1308.0" y="350.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="20.0" x="1248.0" y="350.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_159" bpmnElement="EndEvent_7">
+        <dc:Bounds height="36.0" width="36.0" x="1196.0" y="426.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="1214.0" y="467.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ExclusiveGateway_106" targetElement="_BPMNShape_EndEvent_159">
+        <di:waypoint xsi:type="dc:Point" x="1213.0" y="375.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1213.0" y="392.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1214.0" y="392.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1214.0" y="426.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="22.0" width="27.0" x="1223.0" y="390.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_58" targetElement="_BPMNShape_ExclusiveGateway_106">
+        <di:waypoint xsi:type="dc:Point" x="1146.0" y="351.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1173.0" y="351.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1173.0" y="350.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1188.0" y="350.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1170.0" y="350.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_160" bpmnElement="EndEvent_8">
+        <dc:Bounds height="36.0" width="36.0" x="974.0" y="514.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="992.0" y="555.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_59" targetElement="_BPMNShape_EndEvent_160">
+        <di:waypoint xsi:type="dc:Point" x="927.0" y="532.0"/>
+        <di:waypoint xsi:type="dc:Point" x="974.0" y="532.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="951.0" y="532.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_161" bpmnElement="EndEvent_9">
+        <dc:Bounds height="36.0" width="36.0" x="891.0" y="46.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="909.0" y="87.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_EndEvent_161">
+        <di:waypoint xsi:type="dc:Point" x="840.0" y="64.0"/>
+        <di:waypoint xsi:type="dc:Point" x="891.0" y="64.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="865.0" y="64.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_10">
+        <dc:Bounds height="36.0" width="36.0" x="892.0" y="170.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="910.0" y="211.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ScriptTask_78" targetElement="_BPMNShape_EndEvent_162">
+        <di:waypoint xsi:type="dc:Point" x="840.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="892.0" y="188.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_236" bpmnElement="ScriptTask_setSuccess">
+        <dc:Bounds height="83.0" width="97.0" x="1308.0" y="309.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_158">
+        <di:waypoint xsi:type="dc:Point" x="1404.0" y="350.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1422.0" y="350.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1422.0" y="351.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1463.0" y="351.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="1419.0" y="351.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_237" bpmnElement="ScriptTask_7">
+        <dc:Bounds height="83.0" width="97.0" x="360.0" y="146.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_56" targetElement="_BPMNShape_ScriptTask_237">
+        <di:waypoint xsi:type="dc:Point" x="304.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="344.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="344.0" y="187.0"/>
+        <di:waypoint xsi:type="dc:Point" x="360.0" y="187.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="317.0" y="188.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_ScriptTask_79">
+        <di:waypoint xsi:type="dc:Point" x="456.0" y="187.0"/>
+        <di:waypoint xsi:type="dc:Point" x="474.0" y="187.0"/>
+        <di:waypoint xsi:type="dc:Point" x="474.0" y="188.0"/>
+        <di:waypoint xsi:type="dc:Point" x="492.0" y="188.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_24" bpmnElement="SubProcess_1" isExpanded="true">
+        <dc:Bounds height="181.0" width="382.0" x="180.0" y="532.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_66" bpmnElement="StartEvent_2">
+        <dc:Bounds height="36.0" width="36.0" x="225.0" y="605.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="243.0" y="646.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_207" bpmnElement="EndEvent_1">
+        <dc:Bounds height="36.0" width="36.0" x="477.0" y="605.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="495.0" y="646.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_266" bpmnElement="ScriptTask_8">
+        <dc:Bounds height="83.0" width="97.0" x="323.0" y="581.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ScriptTask_266">
+        <di:waypoint xsi:type="dc:Point" x="261.0" y="623.0"/>
+        <di:waypoint xsi:type="dc:Point" x="323.0" y="622.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="273.0" y="623.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_266" targetElement="_BPMNShape_EndEvent_207">
+        <di:waypoint xsi:type="dc:Point" x="419.0" y="622.0"/>
+        <di:waypoint xsi:type="dc:Point" x="477.0" y="623.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="6.0" width="6.0" x="445.0" y="623.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties b/bpmn/MSOCommonBPMN/src/main/resources/urn.properties
deleted file mode 100644
index 12253aa9d2..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP 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=========================================================
-###
-
-# URN mappings for this project.
-
-# TODO: Remove all the non-URN stuff that's in here.
-# TODO: Implement a real URN mapping capability.
-
-#AAIEndPoint= http://localhost:28080/SoapUIMocks
-AAIEndPoint= http://localhost:28090/
-SDNCEndPoint=http://localhost:28090/SDNCAdapter/
-msoRollback = true
-mso.AaiEncrypted.Pwd = C1FC4A39E16419DD41DFC1212843F440
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/wsdl/VnfAdapterNotify.wsdl b/bpmn/MSOCommonBPMN/src/main/resources/wsdl/VnfAdapterNotify.wsdl
index a4f194045a..b2c9a34c9b 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/wsdl/VnfAdapterNotify.wsdl
+++ b/bpmn/MSOCommonBPMN/src/main/resources/wsdl/VnfAdapterNotify.wsdl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
              xmlns:wsp="http://www.w3.org/ns/ws-policy"
-             xmlns:tns="http://org.openecomp.mso/vnfNotify"
+             xmlns:tns="http://org.onap.so/vnfNotify"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
              xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy"
              xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
              xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
              xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
              name="vnfAdapterNotify"
-             targetNamespace="http://org.openecomp.mso/vnfNotify">
+             targetNamespace="http://org.onap.so/vnfNotify">
   <types>
       <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                 targetNamespace="http://org.openecomp.mso/vnfNotify"
+                 targetNamespace="http://org.onap.so/vnfNotify"
                  version="1.0">
 
          <xs:element name="createVnfNotification" type="tns:createVnfNotification"/>
@@ -36,7 +36,7 @@
                <xs:element minOccurs="0" name="outputs">
                   <xs:complexType>
                      <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="entry">
+                        <xs:element maxOccurs="255" minOccurs="0" name="entry">
                            <xs:complexType>
                               <xs:sequence>
                                  <xs:element minOccurs="0" name="key" type="xs:string"/>
@@ -78,7 +78,7 @@
                <xs:element minOccurs="0" name="outputs">
                   <xs:complexType>
                      <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="entry">
+                        <xs:element maxOccurs="255" minOccurs="0" name="entry">
                            <xs:complexType>
                               <xs:sequence>
                                  <xs:element minOccurs="0" name="key" type="xs:string"/>
@@ -102,7 +102,7 @@
                <xs:element minOccurs="0" name="outputs">
                   <xs:complexType>
                      <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="entry">
+                        <xs:element maxOccurs="255" minOccurs="0" name="entry">
                            <xs:complexType>
                               <xs:sequence>
                                  <xs:element minOccurs="0" name="key" type="xs:string"/>
@@ -172,23 +172,23 @@
   <portType name="vnfAdapterNotify">
       <operation name="rollbackVnfNotification">
          <input message="tns:rollbackVnfNotification"
-                wsam:Action="http://org.openecomp.mso/notify/adapterNotify/rollbackVnfNotificationRequest"/>
+                wsam:Action="http://org.onap.so/notify/adapterNotify/rollbackVnfNotificationRequest"/>
       </operation>
       <operation name="queryVnfNotification">
          <input message="tns:queryVnfNotification"
-                wsam:Action="http://org.openecomp.mso/notify/adapterNotify/queryVnfNotificationRequest"/>
+                wsam:Action="http://org.onap.so/notify/adapterNotify/queryVnfNotificationRequest"/>
       </operation>
       <operation name="createVnfNotification">
          <input message="tns:createVnfNotification"
-                wsam:Action="http://org.openecomp.mso/notify/adapterNotify/createVnfNotificationRequest"/>
+                wsam:Action="http://org.onap.so/notify/adapterNotify/createVnfNotificationRequest"/>
       </operation>
       <operation name="updateVnfNotification">
          <input message="tns:updateVnfNotification"
-                wsam:Action="http://org.openecomp.mso/notify/adapterNotify/updateVnfNotificationRequest"/>
+                wsam:Action="http://org.onap.so/notify/adapterNotify/updateVnfNotificationRequest"/>
       </operation>
       <operation name="deleteVnfNotification">
          <input message="tns:deleteVnfNotification"
-                wsam:Action="http://org.openecomp.mso/notify/adapterNotify/deleteVnfNotificationRequest"/>
+                wsam:Action="http://org.onap.so/notify/adapterNotify/deleteVnfNotificationRequest"/>
       </operation>
   </portType>
   <binding name="MsoVnfAdapterAsyncImplPortBinding" type="tns:vnfAdapterNotify">
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xjb/AAI.xjb b/bpmn/MSOCommonBPMN/src/main/resources/xjb/AAI.xjb
deleted file mode 100644
index ca8ac4766d..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xjb/AAI.xjb
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<jxb:bindings version="1.0" 
-  xmlns:jxb="http://java.sun.com/xml/ns/jaxb" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-  xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance"
-  jxb:extensionBindingPrefixes="xjc">
-
- <jxb:bindings schemaLocation="../xsd/aai_schema_v10.xsd">
-    <jxb:globalBindings>
-		<xjc:superClass name="org.openecomp.mso.client.aai.entities.AAIEntity" />
-    </jxb:globalBindings>
-</jxb:bindings>
-</jxb:bindings>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
deleted file mode 100644
index 0472e54693..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		================================================================
-		Description: This is the schema for LPP Configuration Component
-
-		================================================================
-		Change Log: Version Author Comments 
-		=========== ======= ====== ========
-		0.10 ss835w 2011-4-13. First draft
-
-
-		================================================================
-	-->
-	
-<schema targetNamespace="http://ecomp.att.com/mso/workflow/schema/v1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://ecomp.att.com/mso/workflow/schema/v1" 
-	xmlns:sdncadapterworkflow="http://ecomp.att.com/mso/workflow/schema/v1"	
-	xmlns:msoservtypes="http://ecomp.att.com/mso/request/types/v1"
-	xmlns:msolayer3="http://ecomp.att.com/mso/request/layer3/schema/v1"	
-	xmlns:sdncadapter="http://domain2.att.com/workflow/sdnc/adapter/schema/v1"
-	xmlns:aai="http://com.att.aai.inventory"
-	elementFormDefault="qualified">
-	
-	<import namespace="http://ecomp.att.com/mso/request/types/v1" schemaLocation="MsoServiceRequestTypesV1.xsd"/>
-
-
-	<!-- ========================= -->
-	<!-- Simple Types  - enum      -->   
-	<!-- ========================= -->	
-	
-	<simpleType name="PortGroupNameType">
-		<restriction base="string">
-			<enumeration value="IPAG-VCE" />
-			<enumeration value="VCE-VPE" />			
-		</restriction>
-	</simpleType>
-	
-	<simpleType name="SDNCActionType">
-		<restriction base="string">
-			<enumeration value="AssignVNFNetworkResources" />
-			<enumeration value="ConfigureService" />
-			<enumeration value="DeprovisionService" />
-			<enumeration value="ReleaseVNFNetworkResources" />
-			<enumeration value="UpdateService" />
-			<enumeration value="TestService" />
-			<enumeration value="ReserveService" />
-			<enumeration value="ActivateService" />
-			<enumeration value="GetServiceDetails" />
-		</restriction>
-	</simpleType>
-
-	<!-- ========================= -->
-	<!-- Complex Types             -->
-	<!-- ========================= -->
-	
-	
-	<!-- ========================= -->
-	<!-- Elements             -->
-	<!-- ========================= -->
-	
-
-	
-	<!-- ========================= -->
-	<!-- Requests/Responses        -->
-	<!-- ========================= -->
-	
-
-	
-	
-	
-	
-	<element name="WorkflowException">
-		<complexType>
-			<sequence>				
-				<element name="ErrorMessage" type="string" minOccurs="1" maxOccurs="1" />				
-				<element name="ErrorCode" type="string" minOccurs="1" maxOccurs="1" />	
-				<element name="SourceSystemErrorCode" type="string" minOccurs="0" maxOccurs="1" />				
-			</sequence>
-		</complexType>
-	</element>
-	
-	
-	<!-- Error handler -->
-	<element name="FalloutHandlerRequest">
-		<complexType>
-			<sequence>
-				<element ref="msoservtypes:request-information" minOccurs="1" maxOccurs="1" />
-				<element ref="sdncadapterworkflow:WorkflowException" minOccurs="1" maxOccurs="1" />
-				<element name="is-srv-inst-req" type="boolean" minOccurs="0" maxOccurs="1" />
-				<element name="resp-content-type" type="string" minOccurs="0" maxOccurs="1" />
-				<element name="service-instance-id" type="string" minOccurs="0" maxOccurs="1"/>
-				<element name="start-time" type="string" minOccurs="0" maxOccurs="1"/>
-			</sequence>
-		</complexType>
-	</element>
-	
-	<element name="FalloutHandlerResponse">
-		<complexType>
-			<sequence>
-				<element name="out" type="string"></element>
-			</sequence>
-		</complexType>
-	</element>	
-
-	<!-- Completion handler -->
-	<element name="MsoCompletionRequest">
-		<complexType>
-			<sequence>
-				<element ref="msoservtypes:request-information" minOccurs="1" maxOccurs="1" />
-				<element name="mso-bpel-name" type="string" minOccurs="1" maxOccurs="1" />
-				<element name="is-srv-inst-req" type="boolean" minOccurs="0" maxOccurs="1" />
-				<element name="resp-content-type" type="string" minOccurs="0" maxOccurs="1" />
-				<element name="service-instance-id" type="string" minOccurs="0" maxOccurs="1"/>
-				<element name="start-time" type="string" minOccurs="0" maxOccurs="1"/>
-			</sequence>
-		</complexType>
-	</element>
-	
-	<element name="MsoCompletionResponse">
-		<complexType>
-			<sequence>
-				<element name="out" type="string"></element>
-			</sequence>
-		</complexType>
-	</element>	
-	
-
-</schema>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/ManualTasks.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/ManualTasks.xsd
deleted file mode 100644
index f1754b6ba7..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/ManualTasks.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xs:schema targetNamespace="http://www.example.org/mso" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.org/mso">

-	<xs:element name="taskList">

-	  <xs:complexType>

-		<xs:sequence>

-			<xs:element type="xs:string" name="taskId"/>

-			<xs:element type="xs:string" name="type"/>

-			<xs:element type="xs:string" name="nfRole"/>

-			<xs:element type="xs:string" name="subscriptionServiceType"/>

-			<xs:element type="xs:string" name="originalRequestId"/>

-			<xs:element type="xs:string" name="originalRequestorId"/>

-			<xs:element type="xs:string" name="errorSource"/>

-			<xs:element type="xs:string" name="errorCode"/>

-			<xs:element type="xs:string" name="errorMessage"/>

-			<xs:element type="xs:string" name="buildingBlockName"/>

-			<xs:element type="xs:string" name="buildingBlockStep"/>

-			<xs:element name="validResponses">

-				<xs:complexType>

-					<xs:sequence>

-						<xs:element minOccurs="0" maxOccurs="unbounded" name="action" type="xs:string"/>       

-					</xs:sequence>

-				</xs:complexType>

-			</xs:element>

-		</xs:sequence>

-	  </xs:complexType>

-	</xs:element>

-	<xs:element name="requestDetails">

-		<xs:complexType>

-			<xs:sequence>

-				<xs:element name="requestInfo">

-					<xs:complexType>

-						<xs:sequence>

-							<xs:element type="xs:string" name="source"/>

-							<xs:element type="xs:string" name="responseValue"/>

-							<xs:element type="xs:string" name="requestorId"/>

-						</xs:sequence>

-					</xs:complexType>

-				</xs:element>

-			</xs:sequence>

-		</xs:complexType>

-	</xs:element>

-	<xs:element name ="taskRequestReference">

-		<xs:complexType>

-			<xs:sequence>

-				<xs:element type="xs:string" name="taskId"/>

-			</xs:sequence>

-		</xs:complexType>

-	</xs:element>

-</xs:schema>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
deleted file mode 100644
index c5fa26c998..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-		================================================================
-		Description: This is the schema for MSO Request data
-
-		================================================================
-		Change Log: Version Author Comments 
-		=========== ======= ====== ========
-		0.10 ss835w 2014-12-22. First draft
-		0.20 dr695h 2014-01-09. Second draft
-
-		================================  ================================
-	-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://ecomp.att.com/mso/request/types/v1" targetNamespace="http://ecomp.att.com/mso/request/types/v1" elementFormDefault="qualified">
-	<complexType name="response-type">
-		<sequence>
-			<element name="request-id" type="string" minOccurs="1" maxOccurs="1"/>
-			<element name="request-action" type="tns:request-action-type" minOccurs="1" maxOccurs="1"/>
-			<element name="source" type="string" minOccurs="1" maxOccurs="1"/>
-			<element name="request-id-in-progress" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="error-code" type="int" minOccurs="0" maxOccurs="1"/>
-			<element name="error-message" type="string" minOccurs="0" maxOccurs="1"/>
-			<element name="ack-final-indicator" type="tns:y-or-n-type" minOccurs="1" maxOccurs="1"/>
-		</sequence>
-	</complexType>
-	<annotation>
-		<documentation xml:lang="en">order-number is required if service-type equals SDN-ETHERNET-INTERNET. order-version is required if service-type equals 
-  		SDN-ETHERNET-INTERNET, source=OMX,  and request-action=Layer3ServiceActivateRequest or ChangeLayer3ServiceProvRequest</documentation>
-	</annotation>
-	<element name="request-information">
-		<complexType>
-			<sequence>
-				<element name="request-id" type="string" minOccurs="1" maxOccurs="1"/>
-				<element name="request-action" type="tns:request-action-type" minOccurs="1" maxOccurs="1"/>
-				<element name="request-sub-action" type="tns:request-sub-action-type" minOccurs="0" maxOccurs="1"/>
-				<element name="source" type="string" minOccurs="1" maxOccurs="1"/>
-				<element name="notification-url" type="string" minOccurs="0" maxOccurs="1"/>
-				<element name="order-number" type="string" minOccurs="0" maxOccurs="1"/>
-				<element name="order-version" type="string" minOccurs="0" maxOccurs="1"/>
-			</sequence>
-		</complexType>
-	</element>
-	<annotation>
-		<documentation xml:lang="en">subscriber-name required if request-action=Layer3ServiceActivateRequest</documentation>
-	</annotation>
-	<element name="service-information">
-		<complexType>
-			<sequence>
-				<element name="service-type" type="tns:service-type" minOccurs="1" maxOccurs="1"/>
-				<element name="service-instance-id" type="string" minOccurs="1" maxOccurs="1"/>
-				<element name="subscriber-name" type="string" minOccurs="0" maxOccurs="1"/>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="feature-information">
-		<complexType>
-			<sequence>
-				<element name="feature-type" type="tns:feature-type"/>
-				<element name="feature-instance-id" type="string"/>
-				<element name="feature-yang-model" type="string"/>
-				<element name="feature-yang-model-version" type="string"/>
-			</sequence>
-		</complexType>
-	</element>
-	<simpleType name="request-action-type">
-		<restriction base="string">
-			<enumeration value="Layer3ServiceActivateRequest"/>
-			<enumeration value="Layer3ServiceTestAndTurnupRequest"/>
-			<enumeration value="ChangeLayer3ServiceActivateRequest"/>
-			<enumeration value="ChangeLayer3ServiceProvRequest"/>
-			<enumeration value="DisconnectLayer3ServiceRequest"/>
-			<enumeration value="GetLayer3ServiceDetailsRequest"/>
-			<enumeration value="ChangeFeatureActivateRequest"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="request-sub-action-type">
-		<restriction base="string">
-			<enumeration value="CANCEL"/>
-			<enumeration value="SUPP"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="service-type">
-		<restriction base="string">
-			<enumeration value="SDN-ETHERNET-INTERNET"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="y-or-n-type">
-		<restriction base="string">
-			<enumeration value="Y"/>
-			<enumeration value="N"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="feature-type">
-		<restriction base="string">
-			<enumeration value="FIREWALL-LITE"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v10.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v10.xsd
deleted file mode 100644
index 0972056432..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v10.xsd
+++ /dev/null
@@ -1,6547 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://com.att.aai.inventory/v10" xmlns:tns="http://com.att.aai.inventory/v10" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" 
-    xmlns:annox="http://annox.dev.java.net" 
-    jaxb:extensionBindingPrefixes="annox">
-
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="street1" type="xs:string"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="helps relate the volume group to the vf-module whose components will require the volume group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-port-mirrored" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this port is mirrored.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Image name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.  It's important to note that      the cloud-region data is not updated once created, so there is a potential for the data to become stale.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., dcp, lcp)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this resource, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Generic description of the type of the resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role that this asset will be playing in its context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,att-uuid,application-vendor,application-version",uniqueProps="att-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="service version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cardinality" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="linkage-points" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="linkage-point" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be att-ip-version)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cos" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="type of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-target">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="stores the global route targets associated with a VPN",indexedProps="global-route-target,route-target-role",searchable="global-route-target",container="route-targets",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target, valid values EXPORT/IMPORT/BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Relationship to other objects")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-targets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network.  NOTE - WILL BE RETIRED IN 1802, see child object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role assigned to this route target.  NOTE - WILL BE RETIRED IN 1802, see child object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:route-targets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rp-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique identifier of service.  Does not map strictly to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-function-code" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="function code")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="type")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="network start address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="cidr mask")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ip version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="network role instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="module-index" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-role,nf-function,nf-naming-code",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v6 management address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC model version uuid for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Generic description of the type of the resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Role that this asset will be playing in its context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing.  Assigned as part of the customization of a resource in a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-naming-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modelled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status that indicates whether the asset is in or out of the service path.  Valid values are null, in-service-path, out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="source of name2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Nf Role is the role performed by this instance in the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Circuit it")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="design-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-context" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Collection of zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vpes" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-        <xs:element ref="tns:zones" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="overloaded-model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filt">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filts">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@com.att.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@com.att.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v11.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v11.xsd
deleted file mode 100644
index 47385168cc..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/aai_schema_v11.xsd
+++ /dev/null
@@ -1,6934 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://org.onap.aai.inventory/v11" xmlns:tns="http://org.onap.aai.inventory/v11" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"

-    jaxb:version="2.1" 

-    xmlns:annox="http://annox.dev.java.net" 

-    jaxb:extensionBindingPrefixes="annox">
-
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="street1" type="xs:string"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-module-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="helps relate the volume group to the vf-module whose components will require the volume group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpn-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-port-mirrored" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the tenant context.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk space")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="group-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="group-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="image-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., dcp, lcp)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pf">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pfs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Physical Functions.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:sriov-pf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="inventory status")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:sriov-pfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates who owns and or manages the device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="host-profile" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The host profile that defines the configuration of the pserver.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resource">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE OBJECT:  do not use",nameProps="name",indexedProps="assignment-group-uuid,att-uuid,name",uniqueProps="att-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="assignment-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-status" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-group-uuid" type="xs:string"/>
-        <xs:element name="assignment-date" type="xs:string" minOccurs="0"/>
-        <xs:element name="name" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-uuid" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key-file-url" type="xs:string" minOccurs="0"/>
-        <xs:element name="supplier-release-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resources">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-management">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-instance-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="environment-context" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="workload-context" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,att-uuid,application-vendor,application-version",uniqueProps="att-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-description" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description of the service")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cardinality" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>

-              <xs:appinfo>

-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>

-              </xs:appinfo>

-            </xs:annotation>

-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="link-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be att-ip-version)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit id")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="cos" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type of probe")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe within a set")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm owner")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-target">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-targets">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN Name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpn-region" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:route-targets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="rp-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  see child relationships")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpe">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service.  Does not map strictly to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use.  See child relationships.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpes">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network start address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr mask")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="subnet-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the subnet, referenced when assigning IPs")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network role instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="module-index" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.",suggestibleOnSearch="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.",suggestibleOnSearch="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 management address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the license assignment group.  OBSOLETE -  See child relationships.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the actual license resource.  OBSOLETE -  See child relationships.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nf-function" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English description of Network function that the specific VNF deployment is providing")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role in the network that this model will be providing")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nf-naming-code" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="string assigned to this model used for naming purposes")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for S-TAG to get to VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network Management profile of this VNF")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source of name2")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id of pnf")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nf Role is the role performed by this instance in the network.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit it")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="instance-group-role" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="description" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zone">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="zone-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="design-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="zone-context" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="status" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zones">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of zones")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vpes" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-        <xs:element ref="tns:zones" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:boolean" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:license-management" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="overloaded-model">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filt">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filts">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>

-        <xs:appinfo>

-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>

-        </xs:appinfo>

-      </xs:annotation>

-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>

-            <xs:appinfo>

-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>

-            </xs:appinfo>

-          </xs:annotation>

-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd
deleted file mode 100644
index 456ae1e9a7..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://org.openecomp/mso/workflow/schema/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-  <xs:element name="request-id" type="xs:string"/>
-  <xs:element name="source" type="xs:string"/>
-  <xs:element name="notification-url" type="xs:string"/>
-  <xs:element name="order-number" type="xs:string"/>
-  <xs:element name="order-version" type="xs:string"/>
-  <xs:element name="request-action" type="xs:string"/>
-  <xs:element name="model-invariant-uuid" type="xs:string"/>
-  <xs:element name="model-uuid" type="xs:string"/>
-  <xs:element name="model-version" type="xs:string"/>
-  <xs:element name="model-name" type="xs:string"/>
-  <xs:element name="service-id" type="xs:string"/>
-  <xs:element name="subscription-service-type" type="xs:string"/>
-  <xs:element name="ecomp-model-information">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="v1:model-invariant-uuid" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:model-uuid" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:model-version" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:model-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance-id" type="xs:string"/>
-  <xs:element name="subscriber-name" type="xs:string"/>
-  <xs:element name="global-customer-id" type="xs:string"/>
-  <xs:element name="service-instance-name" type="xs:string"/>
-  <xs:element name="request-information">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="v1:request-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:source" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:notification-url" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:order-number" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:order-version" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:request-action" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-information">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="v1:service-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:subscription-service-type" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:ecomp-model-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:service-instance-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:subscriber-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:global-customer-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-request-input">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="v1:service-instance-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="SDNCServiceInstanceRequestData">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="v1:request-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:service-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-        <xs:element ref="v1:service-request-input" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AaiUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AaiUtilTest.groovy
new file mode 100644
index 0000000000..79caf5b9ac
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AaiUtilTest.groovy
@@ -0,0 +1,471 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.onap.so.rest.HttpHeader
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.junit.Before
+import org.onap.so.bpmn.common.scripts.AaiUtil;
+import org.junit.Rule;
+import org.junit.Test
+import org.junit.rules.ExpectedException
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.Before;
+import org.junit.Test;
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl
+import org.camunda.bpm.engine.repository.ProcessDefinition
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class AaiUtilTest extends MsoGroovyTest {
+    
+
+	@Rule
+	public WireMockRule wireMockRule = new WireMockRule(8090);
+	
+	@Rule
+	public ExpectedException thrown = ExpectedException.none
+
+
+	def aaiPaylod = "<allotted-resource xmlns=\"http://org.openecomp.aai.inventory/v9\">\n" +
+			"\t\t\t\t<id>allottedResourceId</id>\n" +
+			"\t\t\t\t<description></description>\n" +
+			"\t\t\t\t<type>allottedResourceType</type>\n" +
+			"\t\t\t\t<role>allottedResourceRole</role>\n" +
+			"\t\t\t\t<selflink></selflink>\n" +
+			"\t\t\t\t<model-invariant-id></model-invariant-id>\n" +
+			"\t\t\t\t<model-version-id></model-version-id>\n" +
+			"\t\t\t\t<model-customization-id></model-customization-id>\n" +
+			"\t\t\t\t<orchestration-status>PendingCreate</orchestration-status>\n" +
+			"\t\t\t\t<operation-status></operation-status>\n" +
+			"\t\t\t\t<relationship-list>\n" +
+			"\t\t\t\t\t<relationship>\n" +
+			"               \t\t\t<related-to>service-instance</related-to>\n" +
+			"               \t\t\t<related-link>CSI_resourceLink</related-link>\n" +
+			"\t\t\t\t\t</relationship>\n" +
+			"\t\t\t\t</relationship-list>\n" +
+			"\t\t\t</allotted-resource>";
+
+	@Test
+	public void testGetVersionDefault() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
+		assertEquals('8', version)
+	}
+
+	@Test
+	public void testGetVersionResourceSpecific() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.default.aai.l3-network.version")).thenReturn('7')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
+		assertEquals('7', version)
+	}
+
+	@Test
+	public void testGetVersionFlowSpecific() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.custom.CreateAAIVfModule.aai.version")).thenReturn('6')
+		when(mockExecution.getVariable("mso.workflow.default.aai.l3-network.version")).thenReturn('7')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
+		assertEquals('6', version)
+	}
+
+	@Test
+	public void testGetVersionNotDefined() {
+		thrown.expect(Exception.class)
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn("")
+
+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
+
+	}
+
+	@Test
+	public void testGetUriDefaultVersion() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.l3-network.uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
+	}
+
+	@Test
+	public void testGetUriFlowAndResourceSpecific() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.CreateAAIVfModule.aai.l3-network.uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.l3-network.uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
+		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)
+	}
+
+	@Test
+	public void testGetNetworkGenericVnfEndpoint() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
+
+        when(mockExecution.getVariable('aai.endpoint')).thenReturn('http://localhost:28090')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.generic-vnf.version")).thenReturn('8')
+
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)
+		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)
+	}
+
+	@Test
+	public void testGetNetworkGenericVnfUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.generic-vnf.version")).thenReturn('8')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)
+		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)
+	}
+
+	@Test
+	public void testGetNetworkVpnBindingUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.vpn-binding.uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)
+		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)
+	}
+
+	@Test
+	public void testGetNetworkPolicyUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.network-policy.uri")).thenReturn('/aai/v8/network/network-policies/network-policy')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)
+		assertEquals('/aai/v8/network/network-policies/network-policy', uri)
+	}
+
+	@Test
+	public void testGetNetworkTableReferencesUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.route-table-reference.uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)
+		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)
+	}
+
+	@Test
+	public void testGetNetworkVceUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.vce.uri")).thenReturn('/aai/v8/network/vces/vce')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkVceUri(mockExecution)
+		assertEquals('/aai/v8/network/vces/vce', uri)
+	}
+
+	@Test
+	public void testGetNetworkL3NetworkUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.l3-network.uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)
+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
+	}
+
+	@Test
+	public void testGetBusinessCustomerUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.customer.uri")).thenReturn('/aai/v8/business/customers/customer')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)
+		assertEquals('/aai/v8/business/customers/customer', uri)
+	}
+
+	@Test
+	public void testGetCloudInfrastructureCloudRegionEndpoint() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.cloud-region.uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
+
+        when(mockExecution.getVariable('aai.endpoint')).thenReturn('http://localhost:28090')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)
+		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
+	}
+
+	@Test
+	public void testGetCloudInfrastructureCloudRegionUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.cloud-region.uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)
+		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
+	}
+
+	@Test
+	public void testGetCloudInfrastructureTenantUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.tenant.uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)
+		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)
+	}
+
+	@Test
+	public void testGetSearchNodesQueryUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.nodes-query.uri")).thenReturn('/aai/v8/search/nodes-query')
+
+		when(mockExecution.getVariable('aai.endpoint')).thenReturn('http://localhost:28090')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)
+		assertEquals('/aai/v8/search/nodes-query', uri)
+	}
+
+	@Test
+	public void testGetSearchNodesQueryEndpoint() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.nodes-query.uri")).thenReturn('/aai/v8/search/nodes-query')
+
+        when(mockExecution.getVariable('aai.endpoint')).thenReturn('http://localhost:28090')
+
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)
+		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)
+	}
+
+	@Test
+	public void testGetSearchGenericQueryUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+
+		when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-query.uri")).thenReturn('/aai/v8/search/generic-query')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)
+		assertEquals('/aai/v8/search/generic-query', uri)
+	}
+
+	@Test
+	public void testGetNamespaceFromUri() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('6')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v6.l3-network.uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class
+		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')
+		assertEquals('http://org.openecomp.aai.inventory/v6', ns)
+	}
+
+	@Test
+	public void testExecuteAAIGetCall() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.executeAAIGetCall(mockExecution,"http://localhost:8090/aai/v9/business/customers/customer/CUST/service-subscriptions/service-subscription/SVC/service-instances/service-instance/NST/allotted-resources/allotted-resource/allottedResourceId")
+	}
+
+
+	@Test
+	public void testExecuteAAIPutCall() {
+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.executeAAIPutCall(mockExecution,"http://localhost:8090/aai/v9/business/customers/customer/CUST/service-subscriptions/service-subscription/SVC/service-instances/service-instance/NST/allotted-resources/allotted-resource/allottedResourceId",aaiPaylod)
+	}
+
+	@Test
+	public void testGetNamespaceFromUri2() {
+		ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('10')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v10.l3-network.uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class
+		def ns = aaiUtil.getNamespaceFromUri('/aai/v10/search/generic-query')
+		assertEquals('http://org.openecomp.aai.inventory/v10', ns)
+	}
+
+	@Test
+	public void testGetNamespaceFromUri3() {
+		ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('100')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v100.l3-network.uri")).thenReturn('/aai/v100/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class
+		def ns = aaiUtil.getNamespaceFromUri('/aai/v100/search/generic-query')
+		assertEquals('http://org.openecomp.aai.inventory/v100', ns)
+	}
+
+	@Test
+	public void testGetNamespaceFromUri_twoArguments() {  // (execution, uri)
+		ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('10')
+		when(mockExecution.getVariable("mso.workflow.default.aai.v10.l3-network.uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+		//
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+		CreateAAIVfModule myproc = new CreateAAIVfModule()
+		AaiUtil aaiUtil = new AaiUtil(myproc)
+		def ns = aaiUtil.getNamespaceFromUri(mockExecution, '/aai/v10/search/generic-query')
+		assertEquals('http://org.openecomp.aai.inventory/v10', ns)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessorTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessorTest.groovy
new file mode 100644
index 0000000000..86a175d811
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessorTest.groovy
@@ -0,0 +1,182 @@
+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.junit.Assert
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.onap.so.bpmn.core.WorkflowException;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.onap.so.rest.HttpHeader
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.junit.Before
+import org.onap.so.bpmn.common.scripts.AaiUtil;
+import org.junit.Rule;
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.Before;
+import org.junit.Test;
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl
+import org.camunda.bpm.engine.repository.ProcessDefinition
+
+
+
+class AbstractServiceTaskProcessorImpl extends  AbstractServiceTaskProcessor{
+
+	@Override
+	void preProcessRequest(DelegateExecution execution) {
+
+	}
+}
+
+@RunWith(MockitoJUnitRunner.class)
+public class AbstractServiceTaskProcessorTest extends MsoGroovyTest {
+
+	@Captor
+	ArgumentCaptor<ExecutionEntity> captor=  ArgumentCaptor.forClass(ExecutionEntity.class);
+
+	@Test
+	public void testCreateCallbackURL_Success() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("mso.workflow.message.endpoint")).thenReturn('http://localhost:18080/mso/WorkflowMessage/')
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		def endpoint = serviceTaskProcessor.createCallbackURL(mockExecution, 'testMessageType', 'testCorrelator')
+		assertEquals('http://localhost:18080/mso/WorkflowMessage/testMessageType/testCorrelator', endpoint)
+	}
+
+	@Test
+	public void testCreateCallbackURL_NullEndpoint() {
+
+		ExecutionEntity mockExecution = setupMock()
+		try {
+
+			when(mockExecution.getVariable("mso.workflow.message.endpoint")).thenReturn("")
+			AbstractServiceTaskProcessorImpl serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+			def endpoint = serviceTaskProcessor.createCallbackURL(mockExecution, 'testMessageType', 'testCorrelator')
+		}
+		catch(Exception ex){
+		}
+		Mockito.verify(mockExecution,times(1)).setVariable(captor.capture(),captor.capture())
+		WorkflowException workflowException = captor.getValue()
+		Assert.assertEquals("mso:workflow:message:endpoint URN mapping is not set",workflowException.getErrorMessage())
+		Assert.assertEquals(2000,workflowException.getErrorCode())
+	}
+
+	@Test
+	public void testCreateWorkflowMessageAdapterCallbackURL_Success() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("mso.adapters.workflow.message.endpoint")).thenReturn('http://localhost:18080/workflows/messages/message/')
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		def endpoint = serviceTaskProcessor.createWorkflowMessageAdapterCallbackURL(mockExecution, 'testMessageType', 'testCorrelator')
+		assertEquals('http://localhost:18080/workflows/messages/message/testMessageType/testCorrelator', endpoint)
+	}
+
+	@Test
+	public void testCreateWorkflowMessageAdapterCallbackURL_NullEndpoint() {
+
+		ExecutionEntity mockExecution = setupMock()
+		try {
+
+			when(mockExecution.getVariable("mso.adapters.workflow.message.endpoint")).thenReturn("")
+
+			AbstractServiceTaskProcessorImpl serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+			def endpoint = serviceTaskProcessor.createWorkflowMessageAdapterCallbackURL(mockExecution, 'testMessageType', 'testCorrelator')
+		}
+		catch(Exception ex){
+		}
+		Mockito.verify(mockExecution,times(1)).setVariable(captor.capture(),captor.capture())
+		WorkflowException workflowException = captor.getValue()
+		Assert.assertEquals("mso:adapters:workflow:message:endpoint URN mapping is not set",workflowException.getErrorMessage())
+		Assert.assertEquals(2000,workflowException.getErrorCode())
+	}
+
+	@Test
+	public void testSetRollbackEnabledNullOrEmptyDisableRollback() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("prefix")).thenReturn('TEST_PREFIX')
+		when(mockExecution.getVariable("disableRollback")).thenReturn(null)
+		when(mockExecution.getVariable("mso.rollback")).thenReturn("")
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		serviceTaskProcessor.setRollbackEnabled(mockExecution, "true")
+		assertEquals(null, mockExecution.getVariable('TEST_PREFIXbackoutOnFailure'))
+	}
+
+	@Test
+	public void testSetRollbackEnabledDisableRollback() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("prefix")).thenReturn('TEST_PREFIX')
+		when(mockExecution.getVariable("disableRollback")).thenReturn(true)
+		when(mockExecution.getVariable("mso.rollback")).thenReturn("true")
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		serviceTaskProcessor.setRollbackEnabled(mockExecution, "true")
+		verify(mockExecution).setVariable("TEST_PREFIXbackoutOnFailure",false)
+	}
+
+	@Test
+	public void testSetRollbackEnabledRollback() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("prefix")).thenReturn('TEST_PREFIX')
+		when(mockExecution.getVariable("disableRollback")).thenReturn(false)
+		when(mockExecution.getVariable("mso.rollback")).thenReturn("true")
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		serviceTaskProcessor.setRollbackEnabled(mockExecution, "true")
+		verify(mockExecution).setVariable("TEST_PREFIXbackoutOnFailure",true)
+	}
+
+	@Test
+	public void testSetRollbackEnabledDefaultRollback() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("prefix")).thenReturn('TEST_PREFIX')
+		when(mockExecution.getVariable("disableRollback")).thenReturn("test")
+		when(mockExecution.getVariable("mso.rollback")).thenReturn("true")
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		serviceTaskProcessor.setRollbackEnabled(mockExecution, "true")
+		verify(mockExecution).setVariable("TEST_PREFIXbackoutOnFailure",true)
+	}
+
+	@Test
+	public void testSetBasicDBAuthHeader_Success() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("mso.adapters.db.auth")).thenReturn('9B2278E8B8E95F256A560719055F4DF3')
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn('aa3871669d893c7fb8abbcda31b88b4f')
+
+		AbstractServiceTaskProcessorImpl  serviceTaskProcessor = new AbstractServiceTaskProcessorImpl();
+		serviceTaskProcessor.setBasicDBAuthHeader(mockExecution, "true")
+		verify(mockExecution).setVariable("BasicAuthHeaderValueDB",'Basic dXAyMTE4OnVwMjExOA==')
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtilsTest.groovy
new file mode 100644
index 0000000000..39064caa28
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtilsTest.groovy
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.mock.FileUtil
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import static com.github.tomakehurst.wiremock.client.WireMock.get
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+
+@RunWith(MockitoJUnitRunner.class)
+class CatalogDbUtilsTest {
+
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(8090)
+
+    @Test
+    public void testGetResponseFromCatalogDb() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("mso.catalog.db.endpoint")).thenReturn('http://localhost:8090')
+		when(mockExecution.getVariable("mso.adapters.db.auth")).thenReturn('757A94191D685FD2092AC1490730A4FC')
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn('07a7159d3bf51a0e53be7a8f89699be7')
+
+        stubFor(get(urlMatching(".*/serviceNetworks[?]serviceModelUuid=12345"))
+                .willReturn(aResponse()
+                .withStatus(200)
+                .withBodyFile("catalogDbFiles/DoCreateServiceInstance_request.json")))
+
+        CatalogDbUtils obj = new CatalogDbUtils()
+        String str = obj.getResponseFromCatalogDb(mockExecution, "/serviceNetworks?serviceModelUuid=12345")
+        String expectedValue =
+                FileUtil.readResourceFile("__files/catalogDbFiles/DoCreateServiceInstance_request.json");
+        Assert.assertEquals(expectedValue, str)
+
+    }
+
+    private ExecutionEntity setupMock() {
+
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("GenericGetService")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("GenericGetService")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("GenericGetService")
+        when(mockExecution.getProcessInstanceId()).thenReturn("GenericGetService")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/CompleteMsoProcessTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcessTest.groovy
index 5949c3af53..9aa8425a50 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/CompleteMsoProcessTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcessTest.groovy
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License. 
  * ============LICENSE_END========================================================= 
- */
+ */ 
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
 
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith
 import org.mockito.ArgumentCaptor
 import org.mockito.MockitoAnnotations
 import org.mockito.runners.MockitoJUnitRunner
-import org.openecomp.mso.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.WorkflowException
 
 import static org.assertj.core.api.Assertions.assertThat
 import static org.assertj.core.api.Assertions.assertThatThrownBy
@@ -43,7 +43,7 @@ class CompleteMsoProcessTest {
 	}
 
 	private String completeMsoProcessRequest = """
-				<sdncadapterworkflow:MsoCompletionRequest xmlns:ns="http://org.openecomp/mso/request/types/v1" xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
+				<sdncadapterworkflow:MsoCompletionRequest xmlns:ns="http://org.onap/so/request/types/v1" xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
 						<ns:request-information>
 							<ns:request-id>uCPE1020_STUW105_5002</ns:request-id>
 							<ns:request-action>Layer3ServiceActivateRequest</ns:request-action>				
@@ -62,8 +62,8 @@ class CompleteMsoProcessTest {
 
 		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
 		when(mockExecution.getVariable("CompleteMsoProcessRequest")).thenReturn(completeMsoProcessRequest)
-		when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");
-		when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");
+		when(mockExecution.getVariable("mso.adapters.db.auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");
 
 		CompleteMsoProcess completeMsoProcess = new CompleteMsoProcess()
 		completeMsoProcess.preProcessRequest(mockExecution)
@@ -107,7 +107,7 @@ class CompleteMsoProcessTest {
 	}
 
 	private String setUpdateDBstatustoSuccessPayload = """
-						<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
+						<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
 						   <soapenv:Header/>
 						   <soapenv:Body>
 						      <req:updateInfraRequest>
@@ -127,21 +127,21 @@ class CompleteMsoProcessTest {
 		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
 		when(mockExecution.getVariable("CMSO_request_id")).thenReturn("testReqId")
 		when(mockExecution.getVariable("CMSO_mso-bpel-name")).thenReturn("BPEL")
-		when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");
-		when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");
-
+		when(mockExecution.getVariable("mso.adapters.db.auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");
+		
 		CompleteMsoProcess completeMsoProcess = new CompleteMsoProcess()
 		completeMsoProcess.setUpdateDBstatustoSuccessPayload(mockExecution)
 
 		verify(mockExecution).setVariable("CMSO_setUpdateDBstatustoSuccessPayload",setUpdateDBstatustoSuccessPayload)
 	}
 
-	private String msoCompletionResponse = """onse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
+	private String msoCompletionResponse = """onse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
    <sdncadapterworkflow:out>BPEL BPEL-NAME FAILED</sdncadapterworkflow:out>
 </sdncadapterworkflow:MsoCompletionResponse>"""
 
 /*
-	private String msoCompletionResponse = """<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
+	private String msoCompletionResponse = """<sdncadapterworkflow:MsoCompletionResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
    <sdncadapterworkflow:out>BPEL BPEL-NAME FAILED</sdncadapterworkflow:out>
 </sdncadapterworkflow:MsoCompletionResponse>"""
 */
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupNameTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupNameTest.groovy
new file mode 100644
index 0000000000..9b3b8c2fb0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupNameTest.groovy
@@ -0,0 +1,130 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.onap.so.rest.HttpHeader
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.junit.Before
+import org.onap.so.bpmn.common.scripts.AaiUtil;
+import org.junit.Rule;
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.Before;
+import org.junit.Test;
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.common.scripts.ConfirmVolumeGroupName
+import org.onap.so.bpmn.core.WorkflowException
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class ConfirmVolumeGroupNameTest extends MsoGroovyTest {
+
+	@Captor
+	ArgumentCaptor<ExecutionEntity> captor=  ArgumentCaptor.forClass(ExecutionEntity.class);
+
+	@Rule
+	public WireMockRule wireMockRule = new WireMockRule(8090);
+
+	@Test
+	public void testQueryAAIForVolumeGroupId() {
+		ExecutionEntity mockExecution = setupMock()
+		when(mockExecution.getVariable("aai.endpoint")).thenReturn('http://localhost:8090')
+		when(mockExecution.getVariable("CVGN_volumeGroupGetEndpoint")).thenReturn('/aai/test/volume-groups/volume-group/testVolumeGroup')
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+
+		mockData()
+
+		ConfirmVolumeGroupName confirmVolumeGroupName = new ConfirmVolumeGroupName()
+		confirmVolumeGroupName.queryAAIForVolumeGroupId(mockExecution)
+		verify(mockExecution).setVariable("CVGN_queryVolumeGroupResponseCode",200)
+		verify(mockExecution).setVariable("CVGN_queryVolumeGroupResponse","")
+	}
+
+	@Test
+	public void testQueryAAIForVolumeGroupId_404() {
+
+		ExecutionEntity mockExecution = setupMock()
+		try {
+			when(mockExecution.getVariable("CVGN_volumeGroupGetEndpoint")).thenReturn('/aai/test/volume-groups/volume-group/testVolumeGroup')
+			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+
+			mockData()
+
+			ConfirmVolumeGroupName confirmVolumeGroupName = new ConfirmVolumeGroupName()
+			confirmVolumeGroupName.queryAAIForVolumeGroupId(mockExecution)
+		}
+		catch(Exception ex){
+
+		}
+		Mockito.verify(mockExecution,times(4)).setVariable(captor.capture(),captor.capture())
+		WorkflowException workflowException = captor.getValue()
+		Assert.assertEquals("AAI GET Failed",workflowException.getErrorMessage())
+		Assert.assertEquals(500,workflowException.getErrorCode())
+	}
+	private void  mockData() {
+		stubFor(get(urlMatching("/aai/test/volume-groups/volume-group/testVolumeGroup"))
+				.willReturn(aResponse()
+				.withStatus(200)))
+	}
+
+	private ExecutionEntity setupMock() {
+
+		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+		when(mockProcessDefinition.getKey()).thenReturn("ConfirmVolumeGroupName")
+		RepositoryService mockRepositoryService = mock(RepositoryService.class)
+		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("ConfirmVolumeGroupName")
+		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getId()).thenReturn("100")
+		when(mockExecution.getProcessDefinitionId()).thenReturn("ConfirmVolumeGroupName")
+		when(mockExecution.getProcessInstanceId()).thenReturn("ConfirmVolumeGroupName")
+		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+		when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+		return mockExecution
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy
new file mode 100644
index 0000000000..1b76f5cb3f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ConfirmVolumeGroupTenantTest.groovy
@@ -0,0 +1,125 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.onap.so.rest.HttpHeader
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.junit.Before
+import org.onap.so.bpmn.common.scripts.AaiUtil;
+import org.junit.Rule;
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.Before;
+import org.junit.Test;
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.common.scripts.ConfirmVolumeGroupTenant
+import org.onap.so.bpmn.core.WorkflowException
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class ConfirmVolumeGroupTenantTest extends MsoGroovyTest {
+
+    @Captor
+    ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class);
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(8090);
+
+    @Test
+    public void testpreProcessRequest() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn('http://localhost:8090')
+        when(mockExecution.getVariable("volumeGroupId")).thenReturn('testVolumeGroupId')
+        when(mockExecution.getVariable("volumeGroupName")).thenReturn('testVolumeGroupName')
+        when(mockExecution.getVariable("tenantId")).thenReturn('tenantId')
+        when(mockExecution.getVariable("aicCloudRegion")).thenReturn('aicCloudRegion')
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.cloud-region.uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+
+        mockData()
+
+
+        ConfirmVolumeGroupTenant confirmVolumeGroupTenant = new ConfirmVolumeGroupTenant()
+        confirmVolumeGroupTenant.preProcessRequest(mockExecution)
+      /*  Mockito.verify(mockExecution, times(5)).setVariable(captor.capture(), captor.capture())*/
+        verify(mockExecution).setVariable("prefix", "CVGT_")
+        verify(mockExecution).setVariable("queryVolumeGroupResponseCode", 200)
+        verify(mockExecution).setVariable("queryAAIVolumeGroupResponse", "<volume-group xmlns=\"http://org.openecomp.aai.inventory/v10\"><volume-group-id>17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c</volume-group-id><volume-group-name>MSOTESTVOL103a-vSAMP12_base_module-0_vol</volume-group-name><heat-stack-id>9d1f53e3-3158-44f8-8032-a6bf40bbc9db</heat-stack-id><vnf-type>pcrf-capacity</vnf-type><orchestration-status>Active</orchestration-status><resource-version>0000020</resource-version><relationship-list><relationship><related-to>tenant</related-to><relationship-data><relationship-key>cloud-region.cloud-owner</relationship-key><relationship-value>att-aic</relationship-value></relationship-data><relationship-data><relationship-key>cloud-region.cloud-region-id</relationship-key><relationship-value>RegionOne</relationship-value></relationship-data><relationship-data><relationship-key>tenant.tenant-id</relationship-key><relationship-value>22eb191dd41a4f3c9be370fc638322f4</relationship-value></relationship-data></relationship></relationship-list></volume-group>")
+        verify(mockExecution).setVariable("tenantIdsMatch", false)
+        verify(mockExecution).setVariable("groupNamesMatch", false)
+    }
+
+
+    private void mockData() {
+        stubFor(get(urlMatching("/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/aicCloudRegion/volume-groups/volume-group/testVolumeGroupId"))
+                .willReturn(aResponse()
+                .withStatus(200)
+                .withBody("<volume-group xmlns=\"http://org.openecomp.aai.inventory/v10\"><volume-group-id>17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c</volume-group-id><volume-group-name>MSOTESTVOL103a-vSAMP12_base_module-0_vol</volume-group-name><heat-stack-id>9d1f53e3-3158-44f8-8032-a6bf40bbc9db</heat-stack-id><vnf-type>pcrf-capacity</vnf-type><orchestration-status>Active</orchestration-status><resource-version>0000020</resource-version><relationship-list><relationship><related-to>tenant</related-to><relationship-data><relationship-key>cloud-region.cloud-owner</relationship-key><relationship-value>att-aic</relationship-value></relationship-data><relationship-data><relationship-key>cloud-region.cloud-region-id</relationship-key><relationship-value>RegionOne</relationship-value></relationship-data><relationship-data><relationship-key>tenant.tenant-id</relationship-key><relationship-value>22eb191dd41a4f3c9be370fc638322f4</relationship-value></relationship-data></relationship></relationship-list></volume-group>")))
+    }
+
+    private ExecutionEntity setupMock() {
+
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("ConfirmVolumeGroupTenant")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("ConfirmVolumeGroupTenant")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("ConfirmVolumeGroupTenant")
+        when(mockExecution.getProcessInstanceId()).thenReturn("ConfirmVolumeGroupTenant")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EGetServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EGetServiceTest.groovy
new file mode 100644
index 0000000000..a8c10b1e81
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EGetServiceTest.groovy
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+
+import static org.mockito.Mockito.times
+import static org.mockito.Mockito.when
+import static org.onap.so.bpmn.mock.StubResponseAAI.MockGetServiceInstance
+import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById
+import static org.onap.so.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName
+
+/**
+ * @author sushilma
+ * @since January 10, 2018
+ */
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class CustomE2EGetServiceTest extends MsoGroovyTest  {
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Test
+    public void testObtainServiceInstanceUrlById (){
+        ExecutionEntity mockExecution = setupMockWithPrefix('CustomE2EGetService','GENGS_')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.nodes-query.uri")).thenReturn('/aai/v8/search/nodes-query')
+        when(mockExecution.getVariable("GENGS_type")).thenReturn('service-instance')
+        when(mockExecution.getVariable("GENGS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")
+        MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");
+        CustomE2EGetService customE2EGetService = new CustomE2EGetService();
+        customE2EGetService.obtainServiceInstanceUrlById(mockExecution)
+        Mockito.verify(mockExecution, times(9)).setVariable(captor.capture(), captor.capture())
+        Assert.assertEquals(200, captor.getAllValues().get(5))
+    }
+
+    @Test
+    public void testObtainServiceInstanceUrlByName (){
+        ExecutionEntity mockExecution = setupMockWithPrefix('CustomE2EGetService','GENGS_')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.nodes-query.uri")).thenReturn('/aai/v8/search/nodes-query')
+        when(mockExecution.getVariable("GENGS_type")).thenReturn('service-instance')
+        when(mockExecution.getVariable("GENGS_serviceInstanceName")).thenReturn("1604-MVM-26")
+        MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");
+        CustomE2EGetService customE2EGetService = new CustomE2EGetService();
+        customE2EGetService.obtainServiceInstanceUrlByName(mockExecution)
+        Mockito.verify(mockExecution, times(8)).setVariable(captor.capture(), captor.capture())
+        Assert.assertEquals(200, captor.getAllValues().get(5))
+    }
+
+    @Test
+    public void testServiceObject (){
+        ExecutionEntity mockExecution = setupMockWithPrefix('CustomE2EGetService','GENGS_')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.nodes-query.uri")).thenReturn('/aai/v8/search/nodes-query')
+        when(mockExecution.getVariable("GENGS_type")).thenReturn('service-instance')
+        when(mockExecution.getVariable("GENGS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")
+        when(mockExecution.getVariable("GENGS_resourceLink")).thenReturn("/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/1234453")
+        MockGetServiceInstance("MSO_1610_dev", "MSO-dev-service-type", "1234453", "GenericFlows/getServiceInstance.xml");
+        CustomE2EGetService customE2EGetService = new CustomE2EGetService();
+        customE2EGetService.getServiceObject(mockExecution)
+        Mockito.verify(mockExecution, times(7)).setVariable(captor.capture(), captor.capture())
+        Assert.assertEquals(200, captor.getAllValues().get(5))
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EPutServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EPutServiceTest.groovy
new file mode 100644
index 0000000000..879ef7ab4f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/CustomE2EPutServiceTest.groovy
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+
+import static org.mockito.Mockito.times
+import static org.mockito.Mockito.when
+import static org.onap.so.bpmn.mock.StubResponseAAI.MockPutServiceInstance
+
+/**
+ * @author sushilma
+ * @since January 10, 2018
+ */
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class CustomE2EPutServiceTest extends MsoGroovyTest  {
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Test
+    public void testPutServiceInstance(){
+        ExecutionEntity mockExecution = setupMockWithPrefix('CustomE2EPutService','GENPS_')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.customer.uri")).thenReturn('/aai/v8/business/customers/customer')
+        when(mockExecution.getVariable("GENPS_type")).thenReturn('service-instance')
+        when(mockExecution.getVariable("GENPS_payload")).thenReturn('')
+        when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")
+        when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")
+        when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn( "1234")
+        MockPutServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", "GenericFlows/getServiceInstance.xml");
+
+        CustomE2EPutService customE2EPutService = new CustomE2EPutService()
+        customE2EPutService.putServiceInstance(mockExecution);
+        Mockito.verify(mockExecution, times(6)).setVariable(captor.capture(), captor.capture())
+        Assert.assertEquals(200, captor.getAllValues().get(7))
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DeleteAAIVfModuleTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DeleteAAIVfModuleTest.groovy
new file mode 100644
index 0000000000..025bea5325
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DeleteAAIVfModuleTest.groovy
@@ -0,0 +1,218 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.mock.StubResponseAAI
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class DeleteAAIVfModuleTest {
+
+    def prefix = "DAAIVfMod_"
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Before
+    void init() throws IOException {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void testQueryAAIForGenericVnf() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "genericVnfEndpoint")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf/skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        StubResponseAAI.MockAAIVfModule()
+        DeleteAAIVfModule obj = new DeleteAAIVfModule()
+        obj.queryAAIForGenericVnf(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable(prefix + "queryGenericVnfResponseCode", 200)
+    }
+
+    @Test
+    void testQueryAAIForGenericVnfEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "genericVnfEndpoint")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf/skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            DeleteAAIVfModule obj = new DeleteAAIVfModule()
+            obj.queryAAIForGenericVnf(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(2)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(5000, workflowException.getErrorCode())
+        Assert.assertEquals("Internal Error - Occured during queryAAIForGenericVnf", workflowException.getErrorMessage())
+    }
+
+    @Test
+    void testDeleteGenericVnf() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "genericVnfEndpoint")).thenReturn("/aai/v9/cloud-infrastructure/volume-groups/volume-group/78987")
+        when(mockExecution.getVariable(prefix + "genVnfRsrcVer")).thenReturn("0000020")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987/[?]resource-version=0000020"))
+                .willReturn(aResponse()
+                .withStatus(200)
+                .withHeader("Content-Type", "text/xml")
+                .withBodyFile("")))
+
+        StubResponseAAI.MockAAIVfModule()
+        DeleteAAIVfModule obj = new DeleteAAIVfModule()
+        obj.deleteGenericVnf(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable(prefix + "deleteGenericVnfResponseCode", 200)
+    }
+
+    @Test
+    void testDeleteGenericVnfEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "genericVnfEndpoint")).thenReturn("/aai/v9/cloud-infrastructure/volume-groups/volume-group/78987")
+        when(mockExecution.getVariable(prefix + "genVnfRsrcVer")).thenReturn("0000020")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            DeleteAAIVfModule obj = new DeleteAAIVfModule()
+            obj.deleteGenericVnf(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(5000, workflowException.getErrorCode())
+        Assert.assertEquals("Internal Error - Occured during deleteGenericVnf", workflowException.getErrorMessage())
+    }
+
+    @Test
+    void testDeleteVfModule() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vfModuleEndpoint")).thenReturn("/aai/v9/cloud-infrastructure/volume-groups/volume-group/78987")
+        when(mockExecution.getVariable(prefix + "vfModRsrcVer")).thenReturn("0000020")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987/[?]resource-version=0000020"))
+                .willReturn(aResponse()
+                .withStatus(200)
+                .withHeader("Content-Type", "text/xml")
+                .withBodyFile("")))
+
+        DeleteAAIVfModule obj = new DeleteAAIVfModule()
+        obj.deleteVfModule(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable(prefix + "deleteVfModuleResponseCode", 200)
+    }
+
+    @Test
+    void testDeleteVfModuleEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vfModuleEndpoint")).thenReturn("/aai/v9/cloud-infrastructure/volume-groups/volume-group/78987")
+        when(mockExecution.getVariable(prefix + "vfModRsrcVer")).thenReturn("0000020")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("aai.auth")).thenReturn("9B2278E8B8E95F256A560719055F4DF3")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("aa3871669d893c7fb8abbcda31b88b4f")
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            DeleteAAIVfModule obj = new DeleteAAIVfModule()
+            obj.deleteVfModule(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(5000, workflowException.getErrorCode())
+        Assert.assertEquals("Internal Error - Occured during deleteVfModule", workflowException.getErrorMessage())
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("DeleteAAIVfModule")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("DeleteAAIVfModule")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("DeleteAAIVfModule")
+        when(mockExecution.getProcessInstanceId()).thenReturn("DeleteAAIVfModule")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/ExceptionUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtilTest.groovy
index 95272c22af..c7015cda50 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/ExceptionUtilTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtilTest.groovy
@@ -1,66 +1,98 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts

-

-import org.junit.Assert

-import org.junit.runner.RunWith;

-import org.mockito.runners.MockitoJUnitRunner;

-

-

-import org.junit.Ignore;

-

-import static org.mockito.Mockito.*

-

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.junit.Before

-import org.junit.runner.RunWith

-import org.mockito.MockitoAnnotations

-import org.mockito.internal.debugging.MockitoDebuggerImpl

-import org.mockito.runners.MockitoJUnitRunner

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

-@RunWith(MockitoJUnitRunner.class)

-import org.junit.Test

-

-

-

-class ExceptionUtilTest {

-

-

-	@Before

-	public void init()

-	{

-		MockitoAnnotations.initMocks(this)

-	}

-

-	@Test

-	public void testMapErrorCode5010(){

-		String msg = "Connect to njcdtl20ew2988:8070  failed: Connection refused: connect"

-		ExceptionUtil util = new ExceptionUtil()

-		Assert.assertEquals("5010",util.MapErrorCode(msg))

-	}

-

-	@Test

-	public void testMapErrorCode5020(){

-		String msg = "Connection timed out"

-		ExceptionUtil util = new ExceptionUtil()

-		Assert.assertEquals("5020",util.MapErrorCode(msg))

-	}

-}

+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.junit.Assert
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+
+import org.junit.Ignore;
+
+import static org.mockito.Mockito.*
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.common.scripts.ExceptionUtil;
+import org.onap.so.bpmn.core.WorkflowException
+@RunWith(MockitoJUnitRunner.class)
+import org.junit.Test
+
+
+
+class ExceptionUtilTest {
+
+
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+	}
+
+	@Test
+	public void testMapErrorCode5010(){
+		String msg = "Connect to njcdtl20ew2988:8070  failed: Connection refused: connect"
+		ExceptionUtil util = new ExceptionUtil()
+		Assert.assertEquals("5010",util.MapErrorCode(msg))
+	}
+
+	@Test
+	public void testMapErrorCode5020(){
+		String msg = "Connection timed out"
+		ExceptionUtil util = new ExceptionUtil()
+		Assert.assertEquals("5020",util.MapErrorCode(msg))
+	}
+	
+	@Test
+	public void testGetErrorCode() {
+		ExceptionUtil eUtil = new ExceptionUtil()
+		WorkflowException we = new WorkflowException("CreateVCEV2", 400, "SDNC Test Error")
+		int errCd = eUtil.getErrorCode(we)
+		Assert.assertEquals(400, errCd)
+	}
+	
+	@Test
+	public void testGetErrorCodeWithNullWfe() {
+		ExceptionUtil eUtil = new ExceptionUtil()
+		int errCd = eUtil.getErrorCode(null)
+		Assert.assertEquals(2500, errCd)
+	}
+	
+	@Test
+	public void testGetErrorMessage() {
+		ExceptionUtil eUtil = new ExceptionUtil()
+		WorkflowException we = new WorkflowException("CreateVCEV2", 400, "SDNC Test Error")
+		String errMsg = eUtil.getErrorMessage(we, "CreateVCEV2")
+		Assert.assertEquals("SDNC Test Error", errMsg)
+	}
+	
+	@Test
+	public void testGetErrorMessageWithNullWfe() {
+		ExceptionUtil eUtil = new ExceptionUtil()
+		String errMsg = eUtil.getErrorMessage(null, "CreateVCEV2")
+		Assert.assertEquals("Unexpected error encountered in CreateVCEV2", errMsg)
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandlerTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/FalloutHandlerTest.groovy
index 730b44065d..016d968a12 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/FalloutHandlerTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/FalloutHandlerTest.groovy
@@ -1,312 +1,312 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts

-

-import org.junit.runner.RunWith;

-import static org.mockito.Mockito.*

-import static org.junit.Assert.*;

-

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.junit.Before

-import org.junit.Test

-import org.junit.runner.RunWith

-import org.mockito.ArgumentCaptor;

-import org.mockito.MockitoAnnotations

-import org.mockito.runners.MockitoJUnitRunner

-import org.openecomp.mso.bpmn.common.scripts.MsoUtils;

-import org.openecomp.mso.bpmn.common.scripts.FalloutHandler;

-

-@RunWith(MockitoJUnitRunner.class)

-class FalloutHandlerTest {

-	

-	public MsoUtils utils = new MsoUtils()

-	

-	@Before

-	public void init() {

-		MockitoAnnotations.initMocks(this)

-	}

-

-	private String falloutHandlerRequest = """

-				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1" xmlns:ns7="http://org.openecomp/mso/request/types/v1">

-						<ns7:request-information>

-							<ns7:request-id>uCPE1020_STUW105_5002</ns7:request-id>

-							<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>

-							<ns7:request-sub-action>CANCEL</ns7:request-sub-action>

-							<ns7:source>OMX</ns7:source>

-							<ns7:order-number>10205000</ns7:order-number>

-							<ns7:order-version>1</ns7:order-version>

-						</ns7:request-information>

-						<sdncadapterworkflow:WorkflowException>

-							<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>

-							<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>

-							<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>

-						</sdncadapterworkflow:WorkflowException>

-				</sdncadapterworkflow:FalloutHandlerRequest>

-		"""

-

-	private String falloutHandlerResponse = """<workflow:FalloutHandlerResponse xmlns:workflow="http://org.openecomp/mso/workflow/schema/v1">

-  <workflow:out>Fallout Handler Failed</workflow:out>

-</workflow:FalloutHandlerResponse>"""

-

-	@Test

-	public void testPreProcessRequest() {

-

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-

-		when(mockExecution.getVariable("FalloutHandlerRequest")).thenReturn(falloutHandlerRequest)

-		when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");

-		when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");

-

-		FalloutHandler falloutHandler = new FalloutHandler()

-		falloutHandler.preProcessRequest(mockExecution)

-

-		/* Initialize all the process request variables in this block */

-		verify(mockExecution).setVariable("prefix","FH_")

-		//verify(mockExecution).setVariable("getLayer3ServiceDetailsV1Response","")

-

-		//These variables are form the input Message to the BPMN

-		verify(mockExecution).setVariable("FH_request_id","")

-		verify(mockExecution).setVariable("FH_request_action","")

-		verify(mockExecution).setVariable("FH_notification-url","")

-		verify(mockExecution).setVariable("FH_mso-bpel-name","")

-		verify(mockExecution).setVariable("FH_ErrorCode", "")

-		verify(mockExecution).setVariable("FH_ErrorMessage", "")

-

-		verify(mockExecution).setVariable("FH_notification-url-Ok", false)

-		verify(mockExecution).setVariable("FH_request_id-Ok", false)

-

-		//These variables are for Get Mso Aai Password Adapter

-		verify(mockExecution).setVariable("FH_deliveryStatus", true)

-

-		//update Response Status to pending ...Adapter variables

-		verify(mockExecution).setVariable("FH_updateResponseStatusPayload", null)

-		verify(mockExecution).setVariable("FH_updateResponseStatusResponse", null)

-

-		//update Request Gamma ...Adapter variables

-		verify(mockExecution).setVariable("FH_updateRequestGammaPayload", "")

-		verify(mockExecution).setVariable("FH_updateRequestGammaResponse", null)

-		verify(mockExecution).setVariable("FH_updateRequestGammaResponseCode", null)

-

-		//update Request Infra ...Adapter variables

-		verify(mockExecution).setVariable("FH_updateRequestInfraPayload", "")

-		verify(mockExecution).setVariable("FH_updateRequestInfraResponse", null)

-		verify(mockExecution).setVariable("FH_updateRequestInfraResponseCode", null)

-

-		//assign False to success variable

-		verify(mockExecution).setVariable("FH_success", true)

-

-		//Set notify status to Failed variable

-		verify(mockExecution).setVariable("FH_NOTIFY_STATUS", "SUCCESS")

-

-		//Set DB update variable

-		verify(mockExecution).setVariable("FH_updateRequestPayload", "")

-		verify(mockExecution).setVariable("FH_updateRequestResponse", null)

-		verify(mockExecution).setVariable("FH_updateRequestResponseCode", null)

-

-		//Auth variables

-		verify(mockExecution).setVariable("BasicAuthHeaderValue","")

-

-		//Response variables

-		verify(mockExecution).setVariable("FalloutHandlerResponse","")

-		verify(mockExecution).setVariable("FH_ErrorResponse", null)

-		verify(mockExecution).setVariable("FH_ResponseCode", "")

-

-		verify(mockExecution).setVariable("FH_request_id-Ok",true)

-		verify(mockExecution).setVariable("FH_request_id","uCPE1020_STUW105_5002")

-		verify(mockExecution).setVariable("FH_request_action","Layer3ServiceActivateRequest")

-		verify(mockExecution).setVariable("FH_source","OMX")

-		verify(mockExecution).setVariable("FH_ErrorCode","Some Error Code - Fallout Handler")

-		verify(mockExecution).setVariable("FH_ErrorMessage","Some Error Message - Fallout Handler")

-

-	}

-

-	@Test

-	public void testpostProcessResponse(){

-

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-		when(mockExecution.getVariable("FH_success")).thenReturn(false)

-

-		FalloutHandler falloutHandler = new FalloutHandler()

-		falloutHandler.postProcessResponse(mockExecution)

-

-		// Capture the arguments to setVariable

-		ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-		ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-		

-		verify(mockExecution, times(4)).setVariable(captor1.capture(), captor2.capture())

-		List<String> arg2List = captor2.getAllValues()

-		String payloadResponseActual = arg2List.get(1)

-		

-		assertEquals(falloutHandlerResponse.replaceAll("\\s+", ""), payloadResponseActual.replaceAll("\\s+", ""))

-		

-		verify(mockExecution).setVariable("FH_ResponseCode","500")

-	}

-

-	private String updateRequestPayload = """

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

-			<soapenv:Header/>

-			<soapenv:Body>

-			   <req:updateRequest>

-				  <requestId>testReqId</requestId>

-				  <lastModifiedBy>BPEL</lastModifiedBy>

-				  <finalErrorMessage>ErrorMessage</finalErrorMessage>

-				  <finalErrorCode>ErrorCode</finalErrorCode>

-				  <status>FAILED</status>

-				  <responseStatus>NotifyStatus</responseStatus>

-			   </req:updateRequest>

-			</soapenv:Body>

-		 </soapenv:Envelope>

-		"""

-	

-		@Test

-		public void testupdateRequestPayload(){

-	

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")

-			when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")

-			when(mockExecution.getVariable("FH_ErrorCode")).thenReturn("ErrorCode")

-			when(mockExecution.getVariable("FH_NOTIFY_STATUS")).thenReturn("NotifyStatus")

-	

-			FalloutHandler falloutHandler = new FalloutHandler()

-			falloutHandler.updateRequestPayload(mockExecution)

-			

-			// Capture the arguments to setVariable

-			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-			

-			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())

-			List<String> arg2List = captor2.getAllValues()

-			String payloadRequestActual = arg2List.get(0)

-			

-			assertEquals(updateRequestPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))

-		}

-		

-		private String updateRequestInfraPayload = """

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

-							   <soapenv:Header/>

-							   <soapenv:Body>

-							      <req:updateInfraRequest>

-							         <requestId>testReqId</requestId>

-							         <lastModifiedBy>BPEL</lastModifiedBy>

-									 <statusMessage>ErrorMessage</statusMessage>

-									 <requestStatus>FAILED</requestStatus>

-									 <progress>100</progress>

-							      </req:updateInfraRequest>

-							   </soapenv:Body>

-							</soapenv:Envelope>

-			"""

-		

-			@Test

-			public void testupdateRequestInfraPayload(){

-		

-				ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-				when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")

-				when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")

-		

-				FalloutHandler falloutHandler = new FalloutHandler()

-				falloutHandler.updateRequestInfraPayload(mockExecution)

-				

-				// Capture the arguments to setVariable

-				ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-				ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-				

-				verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())

-				List<String> arg2List = captor2.getAllValues()

-				String payloadRequestActual = arg2List.get(0)

-		

-				assertEquals(updateRequestInfraPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))

-			}

-			

-			private String updateRequestGammaPayload = """

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

-			<soapenv:Header/>

-			<soapenv:Body>

-			   <req:updateRequest>

-				  <requestId>testReqId</requestId>

-				  <lastModifiedBy>BPEL</lastModifiedBy>

-				  <finalErrorMessage>ErrorMessage</finalErrorMessage>

-				  <finalErrorCode>ErrorCode</finalErrorCode>

-				  <status>FAILED</status>

-			   </req:updateRequest>

-			</soapenv:Body>

-		 </soapenv:Envelope>

-		"""

-			

-		@Test

-		public void testupdateRequestGammaPayload(){

-	

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")

-			when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")

-			when(mockExecution.getVariable("FH_ErrorCode")).thenReturn("ErrorCode")

-			when(mockExecution.getVariable("URN_mso_default_adapter_namespace")).thenReturn("http://org.openecomp.mso");

-

-			FalloutHandler falloutHandler = new FalloutHandler()

-			falloutHandler.updateRequestGammaPayload(mockExecution)

-	

-			// Capture the arguments to setVariable

-			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-			

-			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())

-			List<String> arg2List = captor2.getAllValues()

-			String payloadRequestActual = arg2List.get(0)

-			

-			assertEquals(updateRequestGammaPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))

-		}

-	

-		

-		String updateResponseStatusPayload = """

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

-			<soapenv:Header/>

-			<soapenv:Body>

-			   <req:updateResponseStatus>

-				  <requestId>testReqId</requestId>

-				  <lastModifiedBy>BPEL</lastModifiedBy>

-				  <responseStatus>SENDING_FINAL_NOTIFY</responseStatus>

-			   </req:updateResponseStatus>

-			</soapenv:Body>

-		 </soapenv:Envelope>

-		"""

-		

-		@Test

-		public void testupdateResponseStatusPayload(){

-	

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")

-

-			FalloutHandler falloutHandler = new FalloutHandler()

-			falloutHandler.updateResponseStatusPayload(mockExecution)

-			

-			// Capture the arguments to setVariable

-			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-			

-			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())

-			List<String> arg2List = captor2.getAllValues()

-			String payloadResponseActual = arg2List.get(0)

-	

-			assertEquals(updateResponseStatusPayload.replaceAll("\\s+", ""), payloadResponseActual.replaceAll("\\s+", ""))

-		}

-

+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.junit.runner.RunWith;
+import static org.mockito.Mockito.*
+import static org.junit.Assert.*;
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.common.scripts.MsoUtils;
+import org.onap.so.bpmn.common.scripts.FalloutHandler;
+
+@RunWith(MockitoJUnitRunner.class)
+class FalloutHandlerTest {
+	
+	public MsoUtils utils = new MsoUtils()
+	
+	@Before
+	public void init() {
+		MockitoAnnotations.initMocks(this)
+	}
+
+	private String falloutHandlerRequest = """
+				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1" xmlns:ns7="http://org.onap/so/request/types/v1">
+						<ns7:request-information>
+							<ns7:request-id>uCPE1020_STUW105_5002</ns7:request-id>
+							<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>
+							<ns7:request-sub-action>CANCEL</ns7:request-sub-action>
+							<ns7:source>OMX</ns7:source>
+							<ns7:order-number>10205000</ns7:order-number>
+							<ns7:order-version>1</ns7:order-version>
+						</ns7:request-information>
+						<sdncadapterworkflow:WorkflowException>
+							<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>
+							<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>
+							<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>
+						</sdncadapterworkflow:WorkflowException>
+				</sdncadapterworkflow:FalloutHandlerRequest>
+		"""
+
+	private String falloutHandlerResponse = """<workflow:FalloutHandlerResponse xmlns:workflow="http://org.onap/so/workflow/schema/v1">
+  <workflow:out>Fallout Handler Failed</workflow:out>
+</workflow:FalloutHandlerResponse>"""
+
+	@Test
+	public void testPreProcessRequest() {
+
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+
+		when(mockExecution.getVariable("FalloutHandlerRequest")).thenReturn(falloutHandlerRequest)
+		when(mockExecution.getVariable("mso.adapters.db.auth")).thenReturn("757A94191D685FD2092AC1490730A4FC");
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7");
+
+		FalloutHandler falloutHandler = new FalloutHandler()
+		falloutHandler.preProcessRequest(mockExecution)
+
+		/* Initialize all the process request variables in this block */
+		verify(mockExecution).setVariable("prefix","FH_")
+		//verify(mockExecution).setVariable("getLayer3ServiceDetailsV1Response","")
+
+		//These variables are form the input Message to the BPMN
+		verify(mockExecution).setVariable("FH_request_id","")
+		verify(mockExecution).setVariable("FH_request_action","")
+		verify(mockExecution).setVariable("FH_notification-url","")
+		verify(mockExecution).setVariable("FH_mso-bpel-name","")
+		verify(mockExecution).setVariable("FH_ErrorCode", "")
+		verify(mockExecution).setVariable("FH_ErrorMessage", "")
+
+		verify(mockExecution).setVariable("FH_notification-url-Ok", false)
+		verify(mockExecution).setVariable("FH_request_id-Ok", false)
+
+		//These variables are for Get Mso Aai Password Adapter
+		verify(mockExecution).setVariable("FH_deliveryStatus", true)
+
+		//update Response Status to pending ...Adapter variables
+		verify(mockExecution).setVariable("FH_updateResponseStatusPayload", null)
+		verify(mockExecution).setVariable("FH_updateResponseStatusResponse", null)
+
+		//update Request Gamma ...Adapter variables
+		verify(mockExecution).setVariable("FH_updateRequestGammaPayload", "")
+		verify(mockExecution).setVariable("FH_updateRequestGammaResponse", null)
+		verify(mockExecution).setVariable("FH_updateRequestGammaResponseCode", null)
+
+		//update Request Infra ...Adapter variables
+		verify(mockExecution).setVariable("FH_updateRequestInfraPayload", "")
+		verify(mockExecution).setVariable("FH_updateRequestInfraResponse", null)
+		verify(mockExecution).setVariable("FH_updateRequestInfraResponseCode", null)
+
+		//assign False to success variable
+		verify(mockExecution).setVariable("FH_success", true)
+
+		//Set notify status to Failed variable
+		verify(mockExecution).setVariable("FH_NOTIFY_STATUS", "SUCCESS")
+
+		//Set DB update variable
+		verify(mockExecution).setVariable("FH_updateRequestPayload", "")
+		verify(mockExecution).setVariable("FH_updateRequestResponse", null)
+		verify(mockExecution).setVariable("FH_updateRequestResponseCode", null)
+
+		//Auth variables
+		verify(mockExecution).setVariable("BasicAuthHeaderValue","")
+
+		//Response variables
+		verify(mockExecution).setVariable("FalloutHandlerResponse","")
+		verify(mockExecution).setVariable("FH_ErrorResponse", null)
+		verify(mockExecution).setVariable("FH_ResponseCode", "")
+
+		verify(mockExecution).setVariable("FH_request_id-Ok",true)
+		verify(mockExecution).setVariable("FH_request_id","uCPE1020_STUW105_5002")
+		verify(mockExecution).setVariable("FH_request_action","Layer3ServiceActivateRequest")
+		verify(mockExecution).setVariable("FH_source","OMX")
+		verify(mockExecution).setVariable("FH_ErrorCode","Some Error Code - Fallout Handler")
+		verify(mockExecution).setVariable("FH_ErrorMessage","Some Error Message - Fallout Handler")
+
+	}
+
+	@Test
+	public void testpostProcessResponse(){
+
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("FH_success")).thenReturn(false)
+
+		FalloutHandler falloutHandler = new FalloutHandler()
+		falloutHandler.postProcessResponse(mockExecution)
+
+		// Capture the arguments to setVariable
+		ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+		ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+		
+		verify(mockExecution, times(4)).setVariable(captor1.capture(), captor2.capture())
+		List<String> arg2List = captor2.getAllValues()
+		String payloadResponseActual = arg2List.get(1)
+		
+		assertEquals(falloutHandlerResponse.replaceAll("\\s+", ""), payloadResponseActual.replaceAll("\\s+", ""))
+		
+		verify(mockExecution).setVariable("FH_ResponseCode","500")
+	}
+
+	private String updateRequestPayload = """
+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+			<soapenv:Header/>
+			<soapenv:Body>
+			   <req:updateRequest>
+				  <requestId>testReqId</requestId>
+				  <lastModifiedBy>BPEL</lastModifiedBy>
+				  <finalErrorMessage>ErrorMessage</finalErrorMessage>
+				  <finalErrorCode>ErrorCode</finalErrorCode>
+				  <status>FAILED</status>
+				  <responseStatus>NotifyStatus</responseStatus>
+			   </req:updateRequest>
+			</soapenv:Body>
+		 </soapenv:Envelope>
+		"""
+	
+		@Test
+		public void testupdateRequestPayload(){
+	
+			ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")
+			when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")
+			when(mockExecution.getVariable("FH_ErrorCode")).thenReturn("ErrorCode")
+			when(mockExecution.getVariable("FH_NOTIFY_STATUS")).thenReturn("NotifyStatus")
+	
+			FalloutHandler falloutHandler = new FalloutHandler()
+			falloutHandler.updateRequestPayload(mockExecution)
+			
+			// Capture the arguments to setVariable
+			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+			
+			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())
+			List<String> arg2List = captor2.getAllValues()
+			String payloadRequestActual = arg2List.get(0)
+			
+			assertEquals(updateRequestPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))
+		}
+		
+		private String updateRequestInfraPayload = """
+							<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+							   <soapenv:Header/>
+							   <soapenv:Body>
+							      <req:updateInfraRequest>
+							         <requestId>testReqId</requestId>
+							         <lastModifiedBy>BPEL</lastModifiedBy>
+									 <statusMessage>ErrorMessage</statusMessage>
+									 <requestStatus>FAILED</requestStatus>
+									 <progress>100</progress>
+							      </req:updateInfraRequest>
+							   </soapenv:Body>
+							</soapenv:Envelope>
+			"""
+		
+			@Test
+			public void testupdateRequestInfraPayload(){
+		
+				ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+				when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")
+				when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")
+		
+				FalloutHandler falloutHandler = new FalloutHandler()
+				falloutHandler.updateRequestInfraPayload(mockExecution)
+				
+				// Capture the arguments to setVariable
+				ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+				ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+				
+				verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())
+				List<String> arg2List = captor2.getAllValues()
+				String payloadRequestActual = arg2List.get(0)
+		
+				assertEquals(updateRequestInfraPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))
+			}
+			
+			private String updateRequestGammaPayload = """
+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+			<soapenv:Header/>
+			<soapenv:Body>
+			   <req:updateRequest>
+				  <requestId>testReqId</requestId>
+				  <lastModifiedBy>BPEL</lastModifiedBy>
+				  <finalErrorMessage>ErrorMessage</finalErrorMessage>
+				  <finalErrorCode>ErrorCode</finalErrorCode>
+				  <status>FAILED</status>
+			   </req:updateRequest>
+			</soapenv:Body>
+		 </soapenv:Envelope>
+		"""
+			
+		@Test
+		public void testupdateRequestGammaPayload(){
+	
+			ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")
+			when(mockExecution.getVariable("FH_ErrorMessage")).thenReturn("ErrorMessage")
+			when(mockExecution.getVariable("FH_ErrorCode")).thenReturn("ErrorCode")
+			when(mockExecution.getVariable("mso.default.adapter.namespace")).thenReturn("http://org.onap.so");
+
+			FalloutHandler falloutHandler = new FalloutHandler()
+			falloutHandler.updateRequestGammaPayload(mockExecution)
+	
+			// Capture the arguments to setVariable
+			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+			
+			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())
+			List<String> arg2List = captor2.getAllValues()
+			String payloadRequestActual = arg2List.get(0)
+			
+			assertEquals(updateRequestGammaPayload.replaceAll("\\s+", ""), payloadRequestActual.replaceAll("\\s+", ""))
+		}
+	
+		
+		String updateResponseStatusPayload = """
+			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.onap.so/requestsdb">
+			<soapenv:Header/>
+			<soapenv:Body>
+			   <req:updateResponseStatus>
+				  <requestId>testReqId</requestId>
+				  <lastModifiedBy>BPEL</lastModifiedBy>
+				  <responseStatus>SENDING_FINAL_NOTIFY</responseStatus>
+			   </req:updateResponseStatus>
+			</soapenv:Body>
+		 </soapenv:Envelope>
+		"""
+		
+		@Test
+		public void testupdateResponseStatusPayload(){
+	
+			ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+			when(mockExecution.getVariable("FH_request_id")).thenReturn("testReqId")
+
+			FalloutHandler falloutHandler = new FalloutHandler()
+			falloutHandler.updateResponseStatusPayload(mockExecution)
+			
+			// Capture the arguments to setVariable
+			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);
+			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);
+			
+			verify(mockExecution, times(1)).setVariable(captor1.capture(), captor2.capture())
+			List<String> arg2List = captor2.getAllValues()
+			String payloadResponseActual = arg2List.get(0)
+	
+			assertEquals(updateResponseStatusPayload.replaceAll("\\s+", ""), payloadResponseActual.replaceAll("\\s+", ""))
+		}
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenerateVfModuleNameTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenerateVfModuleNameTest.groovy
new file mode 100644
index 0000000000..c5baf8cc6c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenerateVfModuleNameTest.groovy
@@ -0,0 +1,125 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class GenerateVfModuleNameTest {
+
+    @Captor
+    ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class);
+
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(8090);
+
+    @Test
+    public void testQueryAAI() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn('http://localhost:8090')
+        when(mockExecution.getVariable("vnfId")).thenReturn('skask')
+        when(mockExecution.getVariable("personaModelId")).thenReturn('personaModelId_test')
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+        when(mockExecution.getVariable("mso.workflow.default.aai.generic-vnf.version")).thenReturn('8')
+
+        mockData()
+        GenerateVfModuleName obj = new GenerateVfModuleName()
+        obj.queryAAI(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("GVFMN_queryAAIVfModuleResponseCode", 200)
+    }
+
+    @Test
+    public void testQueryAAIEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("vnfId")).thenReturn('skask')
+        when(mockExecution.getVariable("personaModelId")).thenReturn('personaModelId_test')
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+        when(mockExecution.getVariable("mso.workflow.default.aai.generic-vnf.version")).thenReturn('8')
+
+        mockData()
+        try {
+            GenerateVfModuleName obj = new GenerateVfModuleName()
+            obj.queryAAI(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(1)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(1002, workflowException.getErrorCode())
+        Assert.assertEquals("AAI GET Failed:org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+
+    private void mockData() {
+        stubFor(get(urlMatching(".*/aai/v[0-9]+/network/generic-vnfs/generic-vnf.*"))
+                .willReturn(aResponse()
+                .withStatus(200).withHeader("Content-Type", "text/xml")
+                .withBodyFile("GenericFlows/getGenericVnfResponse.xml")))
+    }
+
+    private ExecutionEntity setupMock() {
+
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("GenerateVfModuleName")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("GenerateVfModuleName")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("GenerateVfModuleName")
+        when(mockExecution.getProcessInstanceId()).thenReturn("GenerateVfModuleName")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetServiceTest.groovy
new file mode 100644
index 0000000000..49edd813f7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetServiceTest.groovy
@@ -0,0 +1,124 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class GenericGetServiceTest {
+
+    def prefix = "GENGS_"
+    @Captor
+    ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class);
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(8090);
+
+    @Test
+    public void testGetServiceObject() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn('http://localhost:8090')
+        when(mockExecution.getVariable(prefix + "type")).thenReturn('service-instance')
+        when(mockExecution.getVariable(prefix + "serviceInstanceId")).thenReturn('12345')
+        when(mockExecution.getVariable(prefix + "resourceLink")).thenReturn("/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+        mockData()
+        GenericGetService obj = new GenericGetService()
+        obj.getServiceObject(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("prefix", prefix)
+        Mockito.verify(mockExecution).setVariable(prefix + "getServiceUrl", "http://localhost:8090/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/")
+        Mockito.verify(mockExecution).setVariable(prefix + "getServiceResponseCode", 200)
+    }
+
+    @Test
+    public void testGetServiceObjectEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable(prefix + "type")).thenReturn('service-instance')
+        when(mockExecution.getVariable(prefix + "serviceInstanceId")).thenReturn('12345')
+        when(mockExecution.getVariable(prefix + "resourceLink")).thenReturn("/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn('8')
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+
+        mockData()
+        try {
+            GenericGetService obj = new GenericGetService()
+            obj.getServiceObject(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(3)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(9999, workflowException.getErrorCode())
+        Assert.assertEquals("org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    private void mockData() {
+        stubFor(get(urlMatching(".*/aai/v[0-9]+/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/.*"))
+                .willReturn(aResponse()
+                .withStatus(200).withHeader("Content-Type", "text/xml")
+                .withBodyFile("")))
+    }
+
+    private ExecutionEntity setupMock() {
+
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("GenericGetService")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("GenericGetService")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("GenericGetService")
+        when(mockExecution.getProcessInstanceId()).thenReturn("GenericGetService")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetVnfTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetVnfTest.groovy
new file mode 100644
index 0000000000..1aef78f0d5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericGetVnfTest.groovy
@@ -0,0 +1,180 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.times
+import static org.mockito.Mockito.when
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class GenericGetVnfTest {
+
+    def prefix = "GENGV_"
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+
+    @Before
+    public void init()
+    {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    @Test
+    public void testGetVnfByName() {
+
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable(prefix+"vnfName")).thenReturn("genricVnf_test")
+        when(mockExecution.getVariable(prefix+"type")).thenReturn("generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.DoCreateVfModule.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+        GenericGetVnf obj = new GenericGetVnf()
+        obj.getVnfByName(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("prefix","GENGV_")
+        Mockito.verify(mockExecution).setVariable(prefix+"getVnfPath","http://localhost:28090/aai/v9/network/generic-vnfs/generic-vnf?vnf-name=genricVnf_test&depth=1")
+    }
+
+    @Test
+    public void testGetVnfByNameEndpointNull() {
+
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable(prefix+"vnfName")).thenReturn("genricVnf_test")
+        when(mockExecution.getVariable(prefix+"type")).thenReturn("generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.DoCreateVfModule.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+        try{
+            GenericGetVnf obj = new GenericGetVnf()
+            obj.getVnfByName(mockExecution)
+        }catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(3)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(9999, workflowException.getErrorCode())
+        Assert.assertEquals("org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    @Test
+    public void testGetVnfById() {
+
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable(prefix+"vnfId")).thenReturn("genricVnf_test")
+        when(mockExecution.getVariable(prefix+"type")).thenReturn("generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.DoCreateVfModule.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+        GenericGetVnf obj = new GenericGetVnf()
+        obj.getVnfById(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("prefix","GENGV_")
+        Mockito.verify(mockExecution).setVariable(prefix+"getVnfPath","http://localhost:28090/aai/v9/network/generic-vnfs/generic-vnf/genricVnf_test?depth=1")
+    }
+
+    @Test
+    public void testGetVnfByIdEndpointNull() {
+
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable(prefix+"vnfId")).thenReturn("genricVnf_test")
+        when(mockExecution.getVariable(prefix+"type")).thenReturn("generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.DoCreateVfModule.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+        try{
+            GenericGetVnf obj = new GenericGetVnf()
+            obj.getVnfById(mockExecution)
+        }catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(3)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(9999, workflowException.getErrorCode())
+        Assert.assertEquals("org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("DoCreateVfModule")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("DoCreateVfModule")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("DoCreateVfModule")
+        when(mockExecution.getProcessInstanceId()).thenReturn("DoCreateVfModule")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+
+    private static void mockData() {
+        stubFor(get(urlMatching(".*/aai/v[0-9]+/network/generic-vnfs/generic-vnf.*"))
+                .willReturn(aResponse()
+                .withStatus(200).withHeader("Content-Type", "text/xml")
+                .withBodyFile("GenericFlows/getGenericVnfResponse.xml")))
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericPutServiceTest.groovy
index 1e7342de68..d4ea8ce71f 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutServiceTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/GenericPutServiceTest.groovy
@@ -1,214 +1,235 @@
-package org.openecomp.mso.bpmn.common.scripts

-

-import static org.mockito.Mockito.*

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutServiceInstance;

-

-import org.camunda.bpm.engine.ProcessEngineServices

-import org.camunda.bpm.engine.RepositoryService

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.repository.ProcessDefinition

-import org.junit.Before

-import org.junit.Ignore

-import org.junit.Rule

-import org.junit.Test

-import org.junit.runner.RunWith

-import org.mockito.MockitoAnnotations

-import org.mockito.internal.debugging.MockitoDebuggerImpl

-import org.mockito.runners.MockitoJUnitRunner

-

-import com.github.tomakehurst.wiremock.client.WireMock

-import com.github.tomakehurst.wiremock.junit.WireMockRule

-import org.apache.commons.lang3.*

-

-@RunWith(MockitoJUnitRunner.class)

-class GenericPutServiceTest {

-

-	@Rule

-	public WireMockRule wireMockRule = new WireMockRule(8090);

-

-	@Before

-	public void init()

-	{

-		MockitoAnnotations.initMocks(this)

-

-	}

-

-	@Test

-	public void preProcessRequest() {

-

-

-		println "************ preProcessRequest ************* "

-

-		ExecutionEntity mockExecution = setupMock()

-

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")

-		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")

-		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")

-		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-		when(mockExecution.getVariable("GENPS_type")).thenReturn("service-instance")

-

-		GenericPutService  putServiceInstance= new GenericPutService()

-		putServiceInstance.preProcessRequest(mockExecution)

-

-		// check the sequence of variable invocation

-		//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-		//preDebugger.printInvocations(mockExecution)

-

-		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")

-		verify(mockExecution).setVariable("prefix", "GENPS_")

-

-	//	execution.getVariable("isDebugLogEnabled")

-

-		verify(mockExecution).setVariable("GENPS_SuccessIndicator", false)

-	//	verify(mockExecution).setVariable("globalSubscriberId", "1604-MVM-26")

-	//	verify(mockExecution).setVariable("serviceInstanceId", "MIS%2F1604%2F0026%2FSW_INTERNET")

-	//	verify(mockExecution).setVariable("serviceType", "SDN-ETHERNET-INTERNET")

-	//	verify(mockExecution).setVariable("ServiceInstanceData", "f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-

-

-	}

-

-

-	@Test

-	@Ignore

-	public void putServiceInstance() {

-		println "************ putServiceInstance ************* "

-

-		WireMock.reset();

-

-		MockPutServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml");

-		ExecutionEntity mockExecution = setupMock()

-

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")

-		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")

-		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")

-		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-		when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:8090")

-		when(mockExecution.getVariable("URN_mso_workflow_PutServiceInstance_aai_business_customer_uri")).thenReturn("/aai/v7/business/customers/customer")

-		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-		when(mockExecution.getVariable("GENPS_type")).thenReturn("service-instance")

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("7")

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v7_customer_uri")).thenReturn("/aai/v7/business/customers/customer")

-		when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-		when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-

-		GenericPutService  serviceInstance= new GenericPutService()

-		serviceInstance.putServiceInstance(mockExecution)

-

-		// check the sequence of variable invocation

-		MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-		preDebugger.printInvocations(mockExecution)

-

-		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")

-		verify(mockExecution).setVariable("prefix", "GENPS_")

-

-	//	execution.getVariable("isDebugLogEnabled")

-	//	verify(mockExecution).setVariable("GENPSI_serviceInstanceData","f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-

-		String servicePayload = """<service-instance xmlns="http://org.openecomp.aai.inventory/v7">f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance>""" as String

-		verify(mockExecution).setVariable("GENPS_serviceInstancePayload",servicePayload)

-

-		String serviceAaiPath = "http://localhost:28090/aai/v7/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceAaiPath", serviceAaiPath)

-

-		int responseCode = 200

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponseCode", responseCode)

-

-		String aaiResponse = """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-      <rest:header name="Content-Length" value="0"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-</rest:RESTResponse>"""

-

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponse", aaiResponse)

-

-		verify(mockExecution).setVariable("GENPS_SuccessIndicator", true)

-	}

-

-	@Test

-	@Ignore

-	public void putServiceInstance_404() {

-

-

-		println "************ putServiceInstance ************* "

-

-		WireMock.reset();

-

-		ExecutionEntity mockExecution = setupMock()

-

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")

-		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")

-		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")

-		when(mockExecution.getVariable("GENPS_ServiceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-		when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:8090")

-		when(mockExecution.getVariable("URN_mso_workflow_PutServiceInstance_aai_business_customer_uri")).thenReturn("/aai/v7/business/customers/customer")

-		when(mockExecution.getVariable("GENPS_ServiceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-

-		GenericPutService  serviceInstance= new GenericPutService()

-		serviceInstance.putServiceInstance(mockExecution)

-

-		// check the sequence of variable invocation

-		MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-		preDebugger.printInvocations(mockExecution)

-

-		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")

-		verify(mockExecution).setVariable("prefix", "GENPS_")

-

-	//	execution.getVariable("isDebugLogEnabled")

-

-

-		verify(mockExecution).setVariable("GENPS_serviceInstanceData","f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-

-		String serviceInstancepayload = """<service-instance xmlns="http://org.openecomp.mso.aai.inventory/v7">f70e927b-6087-4974-9ef8-c5e4d5847ca4

-			</service-instance>""" as String

-		verify(mockExecution).setVariable("GENPS_serviceInstancePayload",serviceInstancepayload)

-

-		String serviceInstanceAaiPath = "http://localhost:8090/aai/v7/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceAaiPath", serviceInstanceAaiPath)

-

-		int responseCode = 404

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponseCode", responseCode)

-

-		String aaiResponse = ""

-		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponse", aaiResponse)

-

-		verify(mockExecution).setVariable("GENPS_SuccessIndicator", false)

-

-

-	}

-

-

-	private ExecutionEntity setupMock() {

-

-		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)

-		when(mockProcessDefinition.getKey()).thenReturn("PutServiceInstance")

-		RepositoryService mockRepositoryService = mock(RepositoryService.class)

-		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)

-		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("PutServiceInstance")

-		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")

-		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)

-		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)

-

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		// Initialize prerequisite variables

-

-		when(mockExecution.getId()).thenReturn("100")

-		when(mockExecution.getProcessDefinitionId()).thenReturn("PutServiceInstance")

-		when(mockExecution.getProcessInstanceId()).thenReturn("PutServiceInstance")

-		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)

-		when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)

-

-		return mockExecution

-	}

-

-}
\ No newline at end of file
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import static org.mockito.Mockito.*
+import static org.onap.so.bpmn.mock.StubResponseAAI.MockPutServiceInstance;
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+
+import com.github.tomakehurst.wiremock.client.WireMock
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.apache.commons.lang3.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class GenericPutServiceTest {
+
+	@Rule
+	public WireMockRule wireMockRule = new WireMockRule(8090);
+
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+
+	}
+
+	@Test
+	public void preProcessRequest() {
+
+
+		println "************ preProcessRequest ************* "
+
+		ExecutionEntity mockExecution = setupMock()
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")
+		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")
+		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")
+		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+		when(mockExecution.getVariable("GENPS_type")).thenReturn("service-instance")
+
+		GenericPutService  putServiceInstance= new GenericPutService()
+		putServiceInstance.preProcessRequest(mockExecution)
+
+		// check the sequence of variable invocation
+		//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()
+		//preDebugger.printInvocations(mockExecution)
+
+		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")
+		verify(mockExecution).setVariable("prefix", "GENPS_")
+
+	//	execution.getVariable("isDebugLogEnabled")
+
+		verify(mockExecution).setVariable("GENPS_SuccessIndicator", false)
+	//	verify(mockExecution).setVariable("globalSubscriberId", "1604-MVM-26")
+	//	verify(mockExecution).setVariable("serviceInstanceId", "MIS%2F1604%2F0026%2FSW_INTERNET")
+	//	verify(mockExecution).setVariable("serviceType", "SDN-ETHERNET-INTERNET")
+	//	verify(mockExecution).setVariable("ServiceInstanceData", "f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+
+
+	}
+
+
+	@Test
+	@Ignore
+	public void putServiceInstance() {
+		println "************ putServiceInstance ************* "
+
+		WireMock.reset();
+
+		MockPutServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml");
+		ExecutionEntity mockExecution = setupMock()
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")
+		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")
+		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")
+		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+		when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:8090")
+		when(mockExecution.getVariable("mso.workflow.PutServiceInstance.aai.business.customer.uri")).thenReturn("/aai/v7/business/customers/customer")
+		when(mockExecution.getVariable("GENPS_serviceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+		when(mockExecution.getVariable("GENPS_type")).thenReturn("service-instance")
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn('http://org.openecomp.aai.inventory/')
+		when(mockExecution.getVariable("mso.workflow.global.default.aai.version")).thenReturn("7")
+		when(mockExecution.getVariable("mso.workflow.default.aai.v7.customer.uri")).thenReturn("/aai/v7/business/customers/customer")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+		when(mockExecution.getVariable("aai.auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")
+
+		GenericPutService  serviceInstance= new GenericPutService()
+		serviceInstance.putServiceInstance(mockExecution)
+
+		// check the sequence of variable invocation
+		MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()
+		preDebugger.printInvocations(mockExecution)
+
+		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")
+		verify(mockExecution).setVariable("prefix", "GENPS_")
+
+	//	execution.getVariable("isDebugLogEnabled")
+	//	verify(mockExecution).setVariable("GENPSI_serviceInstanceData","f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+
+		String servicePayload = """<service-instance xmlns="http://org.openecomp.aai.inventory/v7">f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance>""" as String
+		verify(mockExecution).setVariable("GENPS_serviceInstancePayload",servicePayload)
+
+		String serviceAaiPath = "http://localhost:28090/aai/v7/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceAaiPath", serviceAaiPath)
+
+		int responseCode = 200
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponseCode", responseCode)
+
+		String aaiResponse = """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+                   statusCode="200">
+   <rest:headers>
+      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>
+      <rest:header name="Content-Length" value="0"/>
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
+      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>
+      <rest:header name="Cache-Control" value="private"/>
+   </rest:headers>
+</rest:RESTResponse>"""
+
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponse", aaiResponse)
+
+		verify(mockExecution).setVariable("GENPS_SuccessIndicator", true)
+	}
+
+	@Test
+	@Ignore
+	public void putServiceInstance_404() {
+
+
+		println "************ putServiceInstance ************* "
+
+		WireMock.reset();
+
+		ExecutionEntity mockExecution = setupMock()
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("GENPS_globalSubscriberId")).thenReturn("1604-MVM-26")
+		when(mockExecution.getVariable("GENPS_serviceInstanceId")).thenReturn("MIS%2F1604%2F0026%2FSW_INTERNET")
+		when(mockExecution.getVariable("GENPS_serviceType")).thenReturn("SDN-ETHERNET-INTERNET")
+		when(mockExecution.getVariable("GENPS_ServiceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+		when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:8090")
+		when(mockExecution.getVariable("mso.workflow.PutServiceInstance.aai.business.customer_uri")).thenReturn("/aai/v7/business/customers/customer")
+		when(mockExecution.getVariable("GENPS_ServiceInstanceData")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+
+		GenericPutService  serviceInstance= new GenericPutService()
+		serviceInstance.putServiceInstance(mockExecution)
+
+		// check the sequence of variable invocation
+		MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()
+		preDebugger.printInvocations(mockExecution)
+
+		verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")
+		verify(mockExecution).setVariable("prefix", "GENPS_")
+
+	//	execution.getVariable("isDebugLogEnabled")
+
+
+		verify(mockExecution).setVariable("GENPS_serviceInstanceData","f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+
+		String serviceInstancepayload = """<service-instance xmlns="http://org.onap.so.aai.inventory/v7">f70e927b-6087-4974-9ef8-c5e4d5847ca4
+			</service-instance>""" as String
+		verify(mockExecution).setVariable("GENPS_serviceInstancePayload",serviceInstancepayload)
+
+		String serviceInstanceAaiPath = "http://localhost:8090/aai/v7/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceAaiPath", serviceInstanceAaiPath)
+
+		int responseCode = 404
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponseCode", responseCode)
+
+		String aaiResponse = ""
+		verify(mockExecution).setVariable("GENPS_putServiceInstanceResponse", aaiResponse)
+
+		verify(mockExecution).setVariable("GENPS_SuccessIndicator", false)
+
+
+	}
+
+
+	private ExecutionEntity setupMock() {
+
+		ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+		when(mockProcessDefinition.getKey()).thenReturn("PutServiceInstance")
+		RepositoryService mockRepositoryService = mock(RepositoryService.class)
+		when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+		when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("PutServiceInstance")
+		when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+		ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+		when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		// Initialize prerequisite variables
+
+		when(mockExecution.getId()).thenReturn("100")
+		when(mockExecution.getProcessDefinitionId()).thenReturn("PutServiceInstance")
+		when(mockExecution.getProcessInstanceId()).thenReturn("PutServiceInstance")
+		when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+		when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+		return mockExecution
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/MsoGroovyTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy
index 57055401f3..cd95a3a733 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/MsoGroovyTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoGroovyTest.groovy
@@ -18,7 +18,7 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
 
 import static org.mockito.Mockito.*
 
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoUtilsTest.groovy
index 12e7855808..dfcf69a931 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/MsoUtilsTest.groovy
@@ -18,7 +18,7 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
 
 // JUnit 4
 import org.junit.Test
@@ -27,10 +27,14 @@ import org.junit.Ignore;
 import org.junit.Rule;
 
 import static groovy.test.GroovyAssert.shouldFail
+
+import groovy.util.slurpersupport.NodeChild
+
 import static groovy.test.GroovyAssert.assertTrue
 import static groovy.test.GroovyAssert.assertEquals
+import static groovy.test.GroovyAssert.assertNotNull;
 
-import org.openecomp.mso.bpmn.common.scripts.MsoUtils;
+import org.onap.so.bpmn.common.scripts.MsoUtils;
 import org.apache.commons.lang3.*
 
 
@@ -44,7 +48,9 @@ class MsoUtilsTest {
 	    def expected_rebuildFirewallLite = "<tns2:firewall-lite><tns2:stateful-firewall-lite-v4-enabled>Y</tns2:stateful-firewall-lite-v4-enabled><tns2:stateful-firewall-lite-v6-enabled>N</tns2:stateful-firewall-lite-v6-enabled><tns2:v4-firewall-packet-filters><tns2:v4-firewall-prefix>0.0.0.1</tns2:v4-firewall-prefix><tns2:v4-firewall-prefix-length>1</tns2:v4-firewall-prefix-length><tns2:allow-icmp-ping>Y</tns2:allow-icmp-ping><tns2:udp-ports><tns2:port-number>1</tns2:port-number></tns2:udp-ports><tns2:tcp-ports><tns2:port-number>1</tns2:port-number></tns2:tcp-ports></tns2:v4-firewall-packet-filters><tns2:v4-firewall-packet-filters><tns2:v4-firewall-prefix>0.0.0.2</tns2:v4-firewall-prefix><tns2:v4-firewall-prefix-length>2</tns2:v4-firewall-prefix-length><tns2:allow-icmp-ping>Y</tns2:allow-icmp-ping><tns2:udp-ports><tns2:port-number>2</tns2:port-number></tns2:udp-ports><tns2:tcp-ports><tns2:port-number>2</tns2:port-number></tns2:tcp-ports></tns2:v4-firewall-packet-filters><tns2:v6-firewall-packet-filters><tns2:v6-firewall-prefix>:</tns2:v6-firewall-prefix><tns2:v6-firewall-prefix-length>0</tns2:v6-firewall-prefix-length><tns2:allow-icmp-ping>Y</tns2:allow-icmp-ping><tns2:udp-ports><tns2:port-number>3</tns2:port-number></tns2:udp-ports><tns2:tcp-ports><tns2:port-number>3</tns2:port-number></tns2:tcp-ports></tns2:v6-firewall-packet-filters><tns2:v6-firewall-packet-filters><tns2:v6-firewall-prefix>:</tns2:v6-firewall-prefix><tns2:v6-firewall-prefix-length>1</tns2:v6-firewall-prefix-length><tns2:allow-icmp-ping>Y</tns2:allow-icmp-ping><tns2:udp-ports><tns2:port-number>4</tns2:port-number></tns2:udp-ports><tns2:tcp-ports><tns2:port-number>4</tns2:port-number></tns2:tcp-ports></tns2:v6-firewall-packet-filters></tns2:firewall-lite>" 
 	    def expected_rebuildInternetEvcAccess = "<tns2:internet-evc-access-information><tns2:internet-evc-speed-value>8</tns2:internet-evc-speed-value><tns2:internet-evc-speed-units>Mbps</tns2:internet-evc-speed-units><tns2:ip-version>ds</tns2:ip-version></tns2:internet-evc-access-information>"
 	    def expected_rebuildInternetServiceChangeDetails = "<tns:internet-service-change-details><tns2:internet-evc-speed-value>10</tns2:internet-evc-speed-value><tns2:internet-evc-speed-units>Kbps</tns2:internet-evc-speed-units><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.15</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>2</tns2:request-index><tns2:v4-next-hop-address>192.168.1.16</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.16</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes></tns:internet-service-change-details>"
+	    def expected_rebuildInternetServiceChangeDetailsWithVrLanParams = "<tns:internet-service-change-details><tns2:internet-evc-speed-value>10</tns2:internet-evc-speed-value><tns2:internet-evc-speed-units>Kbps</tns2:internet-evc-speed-units><tns2:v4-vr-lan-address>10.10.7.14</tns2:v4-vr-lan-address><tns2:v4-vr-lan-prefix-length>10</tns2:v4-vr-lan-prefix-length><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.15</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>2</tns2:request-index><tns2:v4-next-hop-address>192.168.1.16</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.16</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes></tns:internet-service-change-details>"
 	    def expected_rebuildL2Home = "<tns2:l2-homing-information><tns2:evc-name>AS/VLXM/003717//SW</tns2:evc-name><tns2:topology>MultiPoint</tns2:topology><tns2:preferred-aic-clli>MTSNJA4LCP1</tns2:preferred-aic-clli></tns2:l2-homing-information>"
+	    def expected_rebuildL2HomeFor_aic_clli = "<tns2:l2-homing-information><tns2:evc-name>AS/VLXM/003717//SW</tns2:evc-name><tns2:topology>MultiPoint</tns2:topology><tns2:preferred-aic-clli>MTSNJA4LCP1</tns2:preferred-aic-clli><tns2:aic-version>2.5</tns2:aic-version></tns2:l2-homing-information>"
 	    def expected_rebuildNat = "<tns2:nat><tns2:v4-nat-enabled>Y</tns2:v4-nat-enabled><tns2:v4-nat-mapping-entries><tns2:v4-nat-internal>0.0.0.0</tns2:v4-nat-internal><tns2:v4-nat-next-hop-address>0.0.0.0</tns2:v4-nat-next-hop-address><tns2:v4-nat-external>0.0.0.0</tns2:v4-nat-external></tns2:v4-nat-mapping-entries><tns2:v4-nat-mapping-entries><tns2:v4-nat-internal>0.0.0.1</tns2:v4-nat-internal><tns2:v4-nat-next-hop-address>0.0.0.1</tns2:v4-nat-next-hop-address><tns2:v4-nat-external>0.0.0.1</tns2:v4-nat-external></tns2:v4-nat-mapping-entries></tns2:nat>"
 	    def expected_rebuildPat = "<tns2:pat><tns2:v4-pat-enabled>N</tns2:v4-pat-enabled><tns2:use-v4-default-pool>Y</tns2:use-v4-default-pool><tns2:v4-pat-pools><tns2:v4-pat-pool-prefix>192.168.1.44</tns2:v4-pat-pool-prefix><tns2:v4-pat-pool-prefix-length>0</tns2:v4-pat-pool-prefix-length><tns2:v4-pat-pool-next-hop-address>192.168.1.5</tns2:v4-pat-pool-next-hop-address></tns2:v4-pat-pools><tns2:v4-pat-pools><tns2:v4-pat-pool-prefix>192.168.1.45</tns2:v4-pat-pool-prefix><tns2:v4-pat-pool-prefix-length>28</tns2:v4-pat-pool-prefix-length><tns2:v4-pat-pool-next-hop-address>192.168.1.6</tns2:v4-pat-pool-next-hop-address></tns2:v4-pat-pools></tns2:pat>"
 	    def expected_rebuildStaticRoutes = "<tns2:static-routes><tns2:v4-static-routes><tns2:v4-static-route-prefix>255.255.252.1</tns2:v4-static-route-prefix><tns2:v4-static-route-prefix-length>28</tns2:v4-static-route-prefix-length><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address></tns2:v4-static-routes><tns2:v4-static-routes><tns2:v4-static-route-prefix>255.255.252.2</tns2:v4-static-route-prefix><tns2:v4-static-route-prefix-length>28</tns2:v4-static-route-prefix-length><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address></tns2:v4-static-routes><tns2:v4-static-routes><tns2:v4-static-route-prefix>255.255.252.3</tns2:v4-static-route-prefix><tns2:v4-static-route-prefix-length>28</tns2:v4-static-route-prefix-length><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address></tns2:v4-static-routes><tns2:v6-static-routes><tns2:v6-static-route-prefix>2001:1890:12e3:2da::</tns2:v6-static-route-prefix><tns2:v6-static-route-prefix-length>28</tns2:v6-static-route-prefix-length><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address></tns2:v6-static-routes><tns2:v6-static-routes><tns2:v6-static-route-prefix>2001:1890:12e3:2da::</tns2:v6-static-route-prefix><tns2:v6-static-route-prefix-length>28</tns2:v6-static-route-prefix-length><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address></tns2:v6-static-routes></tns2:static-routes>"
@@ -53,12 +59,10 @@ class MsoUtilsTest {
 	    def expected_rebuildVrLanInterfacePartial = "<tns2:vr-designation>primary</tns2:vr-designation><tns2:v4-vr-lan-prefix>10.192.27.254</tns2:v4-vr-lan-prefix><tns2:v4-vr-lan-prefix-length>24</tns2:v4-vr-lan-prefix-length><tns2:v6-vr-lan-prefix>2620:0:10d0:f:ffff:ffff:ffff:fffe</tns2:v6-vr-lan-prefix><tns2:v6-vr-lan-prefix-length>64</tns2:v6-vr-lan-prefix-length><tns2:v4-vce-loopback-address>162.200.3.144</tns2:v4-vce-loopback-address><tns2:v6-vce-wan-address>2001:1890:12e3:2da::</tns2:v6-vce-wan-address><tns2:v4-public-lan-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.2</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.1</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.72</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.71</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.68</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.67</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v4-next-hop-address>192.168.1.15</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.15</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes><tns2:t-provided-v4-lan-public-prefixes><tns2:request-index>2</tns2:request-index><tns2:v4-next-hop-address>192.168.1.16</tns2:v4-next-hop-address><tns2:v4-lan-public-prefix>192.168.1.16</tns2:v4-lan-public-prefix><tns2:v4-lan-public-prefix-length>28</tns2:v4-lan-public-prefix-length></tns2:t-provided-v4-lan-public-prefixes></tns2:v4-public-lan-prefixes><tns2:v6-public-lan-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:3da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:4da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes><tns2:t-provided-v6-lan-public-prefixes><tns2:request-index>1</tns2:request-index><tns2:v6-next-hop-address>2001:1890:12e3:2da::</tns2:v6-next-hop-address><tns2:v6-lan-public-prefix>2001:1890:12e3:2da::</tns2:v6-lan-public-prefix><tns2:v6-lan-public-prefix-length>28</tns2:v6-lan-public-prefix-length></tns2:t-provided-v6-lan-public-prefixes></tns2:v6-public-lan-prefixes>"
 		
 	    @Before
-		public void setUp() {
+		public void setUp() { 
 			def responseAsString = getFile("sdncadaptercallbackrequest.xml")
 			def varrequestData=utils.getNodeText(responseAsString,"RequestData")
-			//def varResponseListData = StringEscapeUtils.unescapeXml(varrequestData)
-			def varResponseListData = varrequestData.replace("&", "&amp;")
-			origXmlResponse = utils.getNodeXml(varResponseListData, "layer3-service-list").drop(38).trim()
+			origXmlResponse = utils.getNodeXml(varrequestData, "layer3-service-list").drop(38).trim()
 
 		}
 	
@@ -88,6 +92,18 @@ class MsoUtilsTest {
 			println "  expected  - " + expected_rebuildInternetServiceChangeDetails
 			assertEquals("rebuildInternetServiceChangeDetails - expected vs actual", expected_rebuildInternetServiceChangeDetails, rebuildInternetServiceChangeDetails)
 		}
+
+        @Test
+        public void testBuildInternetServiceChangeDetailsWithVrLanParams() {
+            def responseAsString = getFile("sdncadaptercallbackrequest_with_aic_version.xml")
+            def varrequestData=utils.getNodeText(responseAsString,"RequestData")
+            def xmlResponse = utils.getNodeXml(varrequestData, "layer3-service-list").drop(38).trim()
+            def rebuildInternetServiceChangeDetails = utils.buildInternetServiceChangeDetails(xmlResponse)
+            println " rebuildInternetServiceChangeDetails: "
+            println "  actual    - " + rebuildInternetServiceChangeDetails
+            println "  expected  - " + expected_rebuildInternetServiceChangeDetails
+            assertEquals("rebuildInternetServiceChangeDetails - expected vs actual",  expected_rebuildInternetServiceChangeDetailsWithVrLanParams, rebuildInternetServiceChangeDetails)
+        }
 		
 		// Coming v100
 		@Test
@@ -213,7 +229,49 @@ class MsoUtilsTest {
 				println "vlanid: " + myBGF.'vlan-id' +"\n"
 			}
 		}
+
+        @Test
+        public void testBuildL2HomingInformation_with_aic_clli() {
+
+            def responseAsString = getFile("sdncadaptercallbackrequest_with_aic_version.xml")
+            def varrequestData=utils.getNodeText(responseAsString,"RequestData")
+            def xmlResponse = utils.getNodeXml(varrequestData, "layer3-service-list").drop(38).trim()
+            def rebuildL2Home = utils.buildL2HomingInformation(xmlResponse)
+            println " rebuildL2Home: "
+            println "  actual    - " + rebuildL2Home
+            println "  expected  - " + expected_rebuildL2Home
+            assertEquals("rebuildL2Home - expected vs actual", expected_rebuildL2HomeFor_aic_clli, rebuildL2Home)
+        }
+		
+		@Test
+		public void testUnescapeNodeContents() {
+			String output = "<a><b>AT&amp;T</b></a>"
+			String noChangeInput = "<a><b>AT&amp;T</b></a>"
+			String decodeWithNamespacesNodeInput = '<top xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema"><a xsi:type="xs:string">&lt;b&gt;AT&amp;amp;T&lt;/b&gt;</a></top>'
+			String decodeWithNamespacesInput = '<a xsi:type="xs:string">&lt;b&gt;AT&amp;amp;T&lt;/b&gt;</a>'
+			String decodeWithNamespacesOutput = '<a xsi:type="xs:string"><b>AT&amp;T</b></a>'
+			String decodeWithoutNamespacesInput = '<a type="string">&lt;b&gt;AT&amp;amp;T&lt;/b&gt;</a>'
+			String decodeWithoutNamespacesOutput = '<a type="string"><b>AT&amp;T</b></a>'
+			String normalString = "<a>AT&amp;T</a>"
+			NodeChild noChangeInputNode = new XmlSlurper().parseText(noChangeInput).'**'.find {it.name() == 'a'}
+			NodeChild decodeWithNamespacesInputNode = new XmlSlurper().parseText(decodeWithNamespacesNodeInput).'**'.find {it.name() == 'a'}
+			NodeChild decodeWithoutNamespacesInputNode = new XmlSlurper().parseText(decodeWithoutNamespacesInput).'**'.find {it.name() == 'a'}
+			NodeChild normalStringNode = new XmlSlurper().parseText(normalString).'**'.find {it.name() == 'a'}
+			
+			assertEquals("no change", output, utils.unescapeNodeContents(noChangeInputNode, noChangeInput))
+			assertEquals("single unescape", decodeWithNamespacesOutput, utils.unescapeNodeContents(decodeWithNamespacesInputNode, decodeWithNamespacesInput))
+			assertEquals("single unescape", decodeWithoutNamespacesOutput, utils.unescapeNodeContents(decodeWithoutNamespacesInputNode, decodeWithoutNamespacesInput))
+			assertEquals("unescape normal string", "AT&T", utils.unescapeNodeContents(normalStringNode, "AT&amp;T"))
+		}
 		
+		@Test
+		public void testXmlEncode() {
+			
+			String expected = "&amp;amp;";
+			
+			assertEquals("is double encoded", expected, MsoUtils.xmlEscape("&amp;"))
+			
+		}
 		public String getFile(String fileName) {
 			def SLASH = File.separator
 			def pathBase = ' '
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/NetworkUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy
index 63d88f5c3a..510dcf665c 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/NetworkUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/NetworkUtilsTest.groovy
@@ -18,7 +18,10 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.common.scripts
+package org.onap.so.bpmn.common.scripts
+
+import org.junit.Before
+import org.mockito.MockitoAnnotations
 
 import static org.mockito.Mockito.*
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
@@ -49,13 +52,14 @@ class NetworkUtilsTest {
       <param name="vnf_name2">US1117MTSNJVBR0246</param>
     </volume-params>
 </volume-request>"""
-	
+
+
 	@Test
 	public void testIsRollbackEnabled() {
 		
 		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
 		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_rollback")).thenReturn(true)
+		when(mockExecution.getVariable("mso.rollback")).thenReturn(true)
 
 		NetworkUtils networkUtils = new NetworkUtils()
 		def rollbackEnabled = networkUtils.isRollbackEnabled(mockExecution, volumeRequestXml)
@@ -69,7 +73,7 @@ class NetworkUtilsTest {
 		
 		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
 		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_rollback")).thenReturn(false)
+		when(mockExecution.getVariable("mso.rollback")).thenReturn(false)
 
 		NetworkUtils networkUtils = new NetworkUtils()
 		def rollbackEnabled = networkUtils.isRollbackEnabled(mockExecution, volumeRequestXml)
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/PrepareUpdateAAIVfModuleTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/PrepareUpdateAAIVfModuleTest.groovy
new file mode 100644
index 0000000000..c5b8fab9eb
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/PrepareUpdateAAIVfModuleTest.groovy
@@ -0,0 +1,171 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.mock.StubResponseAAI
+
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class PrepareUpdateAAIVfModuleTest {
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Before
+    void init() throws IOException {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void testGetGenericVnf() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("PUAAIVfMod_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.PrepareUpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+
+        PrepareUpdateAAIVfModule obj = new PrepareUpdateAAIVfModule()
+        obj.getGenericVnf(mockExecution)
+
+        verify(mockExecution).setVariable("PUAAIVfMod_getVnfResponseCode", 200)
+    }
+
+    @Test
+    void testGetGenericVnfEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("PUAAIVfMod_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.PrepareUpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            PrepareUpdateAAIVfModule obj = new PrepareUpdateAAIVfModule()
+            obj.getGenericVnf(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        verify(mockExecution).setVariable("PUAAIVfMod_getVnfResponseCode", 500)
+        verify(mockExecution).setVariable("PUAAIVfMod_getVnfResponse", "AAI GET Failed:org.apache.http.client.ClientProtocolException")
+    }
+
+    @Test
+    void testUpdateVfModule() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("PUAAIVfMod_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("PUAAIVfMod_vfModuleId")).thenReturn("supercool")
+
+        def node = new Node(null, 'vfModule')
+        new Node(node, 'vf-module-name', "abc")
+        VfModule vfModule = new VfModule(node, true)
+
+        when(mockExecution.getVariable("PUAAIVfMod_vfModule")).thenReturn(vfModule)
+        when(mockExecution.getVariable("PUAAIVfMod_orchestrationStatus")).thenReturn("created")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.PrepareUpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        PrepareUpdateAAIVfModule obj = new PrepareUpdateAAIVfModule()
+        obj.updateVfModule(mockExecution)
+
+        verify(mockExecution).setVariable("PUAAIVfMod_updateVfModuleResponseCode", 200)
+        verify(mockExecution).setVariable("PUAAIVfMod_updateVfModuleResponse", "")
+    }
+
+    @Test
+    void testUpdateVfModuleEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("PUAAIVfMod_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("PUAAIVfMod_vfModuleId")).thenReturn("supercool")
+
+        def node = new Node(null, 'vfModule')
+        new Node(node, 'vf-module-name', "abc")
+        VfModule vfModule = new VfModule(node, true)
+
+        when(mockExecution.getVariable("PUAAIVfMod_vfModule")).thenReturn(vfModule)
+        when(mockExecution.getVariable("PUAAIVfMod_orchestrationStatus")).thenReturn("created")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.PrepareUpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            PrepareUpdateAAIVfModule obj = new PrepareUpdateAAIVfModule()
+            obj.updateVfModule(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        verify(mockExecution).setVariable("PUAAIVfMod_updateVfModuleResponseCode", 500)
+        verify(mockExecution).setVariable("PUAAIVfMod_updateVfModuleResponse", "AAI PATCH Failed:org.apache.http.client.ClientProtocolException")
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("PrepareUpdateAAIVfModule")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("PrepareUpdateAAIVfModule")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("PrepareUpdateAAIVfModule")
+        when(mockExecution.getProcessInstanceId()).thenReturn("PrepareUpdateAAIVfModule")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1Test.groovy
new file mode 100644
index 0000000000..1079bb48b3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1Test.groovy
@@ -0,0 +1,151 @@
+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.mock.FileUtil
+import org.onap.so.bpmn.core.json.JsonUtils
+
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+public class SDNCAdapterRestV1Test {
+	
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+	}
+
+	@Test
+	public void testPreProcessRequest() {
+		// bpTimeout is empty and "mso.adapters.sdnc.timeout" is defined
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.timeout")).thenReturn("PT5M")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV1 sdncAdapterRestV1 = new SDNCAdapterRestV1()
+		sdncAdapterRestV1.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT5M")
+	}
+	
+	@Test
+	public void testPreProcessRequestGoodTimeout() {
+		// bpTimeout is valid and "mso.adapters.sdnc.timeout" is undefined
+		
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		sdncAdapterWorkflowRequest = JsonUtils.addJsonValue(sdncAdapterWorkflowRequest, "SDNCServiceRequest.bpTimeout", "PT20S")
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV1 sdncAdapterRestV1 = new SDNCAdapterRestV1()
+		sdncAdapterRestV1.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT20S")
+	}
+
+	@Test
+	@Ignore
+	public void testPreProcessRequestBadTimeout() {
+		// bpTimeout is invalid and "mso.adapters.sdnc.timeout" is undefined
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		sdncAdapterWorkflowRequest = JsonUtils.addJsonValue(sdncAdapterWorkflowRequest, "SDNCServiceRequest.bpTimeout", "badTimeout")
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV1 sdncAdapterRestV1 = new SDNCAdapterRestV1()
+		sdncAdapterRestV1.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT10S")
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV2Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV2Test.groovy
new file mode 100644
index 0000000000..d7fe0ee208
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV2Test.groovy
@@ -0,0 +1,151 @@
+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.mock.FileUtil
+import org.onap.so.bpmn.core.json.JsonUtils
+
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+public class SDNCAdapterRestV2Test {
+	
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+	}
+
+	@Test
+	public void testPreProcessRequest() {
+		// bpTimeout is empty and "mso.adapters.sdnc.timeout" is defined
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.timeout")).thenReturn("PT5M")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV2 sdncAdapterRestV2 = new SDNCAdapterRestV2()
+		sdncAdapterRestV2.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT5M")
+	}
+	
+	@Test
+	public void testPreProcessRequestGoodTimeout() {
+		// bpTimeout is valid and "mso.adapters.sdnc.timeout" is undefined
+		
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		sdncAdapterWorkflowRequest = JsonUtils.addJsonValue(sdncAdapterWorkflowRequest, "SDNCServiceRequest.bpTimeout", "PT20S")
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV2 sdncAdapterRestV2 = new SDNCAdapterRestV2()
+		sdncAdapterRestV2.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT20S")
+	}
+
+	@Ignore
+	@Test
+	public void testPreProcessRequestBadTimeout() {
+		// bpTimeout is invalid and "mso.adapters.sdnc.timeout" is undefined
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json");
+		sdncAdapterWorkflowRequest = JsonUtils.addJsonValue(sdncAdapterWorkflowRequest, "SDNCServiceRequest.bpTimeout", "badTimeout")
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("SDNCREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("SDNCREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.rest.endpoint")).thenReturn("http://localhost:18080/adapters/rest/v1/sdnc/")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+
+
+		SDNCAdapterRestV2 sdncAdapterRestV2 = new SDNCAdapterRestV2()
+		sdncAdapterRestV2.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","SDNCREST_")
+
+		verify(mockExecution).setVariable("SDNCREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("SDNCREST_requestType","SDNCServiceRequest")
+		verify(mockExecution).setVariable("SDNCAResponse_CORRELATOR","0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479")
+		verify(mockExecution).setVariable("SDNCREST_sdncAdapterMethod","POST")
+		verify(mockExecution).setVariable("SDNCREST_timeout","PT10S")
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
index 2ecb108b4e..18d65d00d8 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
@@ -1,948 +1,951 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts;

-

-import static org.mockito.Mockito.*

-

-import org.camunda.bpm.engine.ProcessEngineServices

-import org.camunda.bpm.engine.RepositoryService

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.repository.ProcessDefinition

-import org.junit.Before

-import org.junit.Test

-import org.junit.runner.RunWith

-import org.mockito.MockitoAnnotations

-import org.mockito.runners.MockitoJUnitRunner

-import org.mockito.internal.debugging.MockitoDebuggerImpl

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapter;

-

-import org.openecomp.mso.bpmn.mock.FileUtil

-

-@RunWith(MockitoJUnitRunner.class)

-public class SDNCAdapterTest {

-	

-	@Before

-	public void init()

-	{

-		MockitoAnnotations.initMocks(this)

-		System.setProperty("jboss.qualified.host.name","myhost.com")

-	}

-

-	

-	def workflowResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-   <sdncadapterworkflow:response-data>

-      <tag0:CallbackHeader>

-         <tag0:RequestId>testRequestId</tag0:RequestId>

-         <tag0:ResponseCode>200</tag0:ResponseCode>

-         <tag0:ResponseMessage>OK</tag0:ResponseMessage>

-      </tag0:CallbackHeader>

-      <tag0:RequestData xsi:type="xs:string">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;

-					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-					&lt;service-status&gt;

-						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;

-						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;

-						&lt;request-status&gt;synccomplete&lt;/request-status&gt;

-						&lt;final-indicator&gt;N&lt;/final-indicator&gt;

-						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;

-						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;

-						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;

-					&lt;/service-status&gt;

-					&lt;service-data&gt;

-						&lt;internet-evc-access-information&gt;

-							&lt;ip-version&gt;ds&lt;/ip-version&gt;

-							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;

-						&lt;/internet-evc-access-information&gt;

-						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;

-							&lt;vr-lan-interface&gt;

-								&lt;static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-								&lt;/static-routes&gt;

-								&lt;dhcp&gt;

-									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;

-									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;

-									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;									

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;									

-								&lt;/dhcp&gt;

-								&lt;firewall-lite&gt;

-									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;

-									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-								&lt;/firewall-lite&gt;

-								&lt;pat&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-								&lt;/pat&gt;

-								&lt;nat&gt;

-								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								&lt;/nat&gt;

-								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;

-								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;

-								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;

-								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;

-								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;

-								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;

-								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;

-								&lt;v4-public-lan-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-								&lt;/v4-public-lan-prefixes&gt;

-								&lt;v6-public-lan-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-								&lt;/v6-public-lan-prefixes&gt;

-							&lt;/vr-lan-interface&gt;

-							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;

-						&lt;/vr-lan&gt;

-&lt;ucpe-vms-service-information&gt;				

- &lt;transport-service-information&gt;

-    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;	

- &lt;/transport-service-information&gt;

- &lt;ucpe-information&gt;

-    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;

-    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;

-    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;

-  &lt;/ucpe-information&gt;

-  &lt;vnf-list&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;1&lt;/vnf-id&gt;

-		&lt;prov-status&gt;1&lt;/prov-status&gt;

-		&lt;operational-state&gt;1&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;1&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;2&lt;/vnf-id&gt;

-		&lt;prov-status&gt;2&lt;/prov-status&gt;

-		&lt;operational-state&gt;2&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;2&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;					

-  &lt;/vnf-list&gt;

- &lt;/ucpe-vms-service-information&gt;										

-						&lt;request-information&gt;

-							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;

-							&lt;order-number&gt;4281555&lt;/order-number&gt;

-							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;

-							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;

-							&lt;source&gt;OMX&lt;/source&gt;

-							&lt;order-version&gt;1&lt;/order-version&gt;

-						&lt;/request-information&gt;

-						&lt;sdnc-request-header&gt;

-							&lt;svc-action&gt;activate&lt;/svc-action&gt;

-							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;

-							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;

-						&lt;/sdnc-request-header&gt;

-						&lt;l2-homing-information&gt;

-							&lt;topology&gt;MultiPoint&lt;/topology&gt;

-							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;

-							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;

-						&lt;/l2-homing-information&gt;

-						&lt;service-information&gt;

-							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-							&lt;subscriber-name&gt;ST E2E Test42855_1300004281555&lt;/subscriber-name&gt;

-							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;

-						&lt;/service-information&gt;

-						&lt;internet-service-change-details&gt;

-							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;2&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-						&lt;/internet-service-change-details&gt;

-					&lt;/service-data&gt;

-				&lt;/layer3-service-list&gt;

-</tag0:RequestData>

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-

-	String sdncAdapterRequest = """

-			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">

-			<SOAP-ENV:Body>

-			<aetgt:SDNCAdapterRequest xmlns:aetgt="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:sdncadaptersc="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-			<sdncadapter:RequestHeader xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-			<sdncadapter:RequestId>745b1b50-e39e-4685-9cc8-c71f0bde8bf0</sdncadapter:RequestId>

-			<sdncadapter:SvcAction>query</sdncadapter:SvcAction>

-			<sdncadapter:SvcOperation>services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET</sdncadapter:SvcOperation>

-			<sdncadapter:CallbackUrl>http://myhost.com:28080/mso/sdncAdapterCallbackServiceImpl</sdncadapter:CallbackUrl>

-			</sdncadapter:RequestHeader>

-			<sdncadaptersc:RequestData><rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-              contentType="text/xml">

-   <service-request xmlns="http://org.openecomp/mso/request/details/schema/v1">

-      <request-information>

-         <request-id>12570a36-7388-4c0a-bec4-189ce3kg9956</request-id>

-         <request-action>GetLayer3ServiceDetailsRequest</request-action>

-         <source>OMX</source>

-      </request-information>

-      <service-information>

-         <service-type>SDN-ETHERNET-INTERNET</service-type>

-         <service-instance-id>PD/VLXM/003717//SW_INTERNET</service-instance-id>

-      </service-information>

-   </service-request>

-</rest:payload></sdncadaptersc:RequestData></aetgt:SDNCAdapterRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>"""

-	

-def sdncAdapterResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-<sdncadapterworkflow:response-data>

-<tag0:CallbackHeader xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-   <tag0:RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</tag0:RequestId>

-   <tag0:ResponseCode>404</tag0:ResponseCode>

-   <tag0:ResponseMessage>Error processing request to SDNC. Not Found.

-			https://sdncodl.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist.]</tag0:ResponseMessage>

-</tag0:CallbackHeader>

-</sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>

-"""

-

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

-								<aetgt:ErrorMessage>Received error from SDN-C: Error processing request to SDNC. Not Found.

-			https://sdncodl.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist.]</aetgt:ErrorMessage>

-								<aetgt:ErrorCode>5300</aetgt:ErrorCode>

-								<aetgt:SourceSystemErrorCode>404</aetgt:SourceSystemErrorCode>

-								</aetgt:WorkflowException>"""

-

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

-					<aetgt:ErrorMessage>Invalid Callback Response from SDNC Adapter</aetgt:ErrorMessage>

-					<aetgt:ErrorCode>5300</aetgt:ErrorCode>

-				  </aetgt:WorkflowException>"""

-			

-def     enhancedCallbackRequestData =

-    """<tag0:RequestData xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-                  xsi:type="xs:string">				<layer3-service-list xmlns="com:att:sdnctl:l3api">

-					<service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>

-					<service-status>

-						<rpc-name>service-configuration-operation</rpc-name>

-						<rpc-action>activate</rpc-action>

-						<request-status>synccomplete</request-status>

-						<final-indicator>N</final-indicator>

-						<l3sdn-action>Layer3ServiceActivateRequest</l3sdn-action>

-						<l3sdn-subaction>SUPP</l3sdn-subaction>

-						<response-timestamp>2015-04-28T21:32:11.386Z</response-timestamp>

-					</service-status>

-					<service-data>

-						<internet-evc-access-information>

-							<ip-version>ds</ip-version>

-							<internet-evc-speed-value>8</internet-evc-speed-value>

-							<internet-evc-speed-units>Mbps</internet-evc-speed-units>

-						</internet-evc-access-information>

-						<vr-lan xmlns="com:att:sdnctl:l3api">

-							<vr-lan-interface>

-								<static-routes>

-									<v6-static-routes>

-										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-										<v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>

-										<v6-static-route-prefix-length>28</v6-static-route-prefix-length>

-									</v6-static-routes>

-									<v4-static-routes>

-										<v4-static-route-prefix>255.255.252.1</v4-static-route-prefix>

-										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>

-										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>

-									</v4-static-routes>

-									<v6-static-routes>

-										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-										<v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>

-										<v6-static-route-prefix-length>28</v6-static-route-prefix-length>

-									</v6-static-routes>

-									<v4-static-routes>

-										<v4-static-route-prefix>255.255.252.2</v4-static-route-prefix>

-										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>

-										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>

-									</v4-static-routes>

-									<v4-static-routes>

-										<v4-static-route-prefix>255.255.252.3</v4-static-route-prefix>

-										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>

-										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>

-									</v4-static-routes>

-								</static-routes>

-								<dhcp>

-									<v6-dhcp-server-enabled>N</v6-dhcp-server-enabled>

-									<v4-dhcp-server-enabled>Y</v4-dhcp-server-enabled>

-									<use-v6-default-pool>N</use-v6-default-pool>

-									<excluded-v4-dhcp-addresses-from-default-pool>

-									  <excluded-v4-address>192.168.1.7</excluded-v4-address>

-									</excluded-v4-dhcp-addresses-from-default-pool>

-									<excluded-v4-dhcp-addresses-from-default-pool>

-									  <excluded-v4-address>192.168.1.8</excluded-v4-address>

-									</excluded-v4-dhcp-addresses-from-default-pool>

-									<v4-dhcp-pools>

-										<v4-dhcp-relay-next-hop-address>1.1.1.1</v4-dhcp-relay-next-hop-address>

-										<v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>

-										<excluded-v4-addresses>

-											<excluded-v4-address>192.168.1.5</excluded-v4-address>

-										</excluded-v4-addresses>

-										<v4-dhcp-relay-gateway-address>2.2.2.1</v4-dhcp-relay-gateway-address>

-										<excluded-v4-addresses>

-											<excluded-v4-address>192.168.1.6</excluded-v4-address>

-										</excluded-v4-addresses>

-										<v4-dhcp-pool-prefix>192.155.2.3</v4-dhcp-pool-prefix>

-									</v4-dhcp-pools>

-									<v4-dhcp-pools>

-										<v4-dhcp-relay-next-hop-address>1.1.1.2</v4-dhcp-relay-next-hop-address>

-										<v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>

-										<excluded-v4-addresses>

-											<excluded-v4-address>192.168.1.6</excluded-v4-address>

-										</excluded-v4-addresses>

-										<v4-dhcp-relay-gateway-address>2.2.2.2</v4-dhcp-relay-gateway-address>

-										<excluded-v4-addresses>

-											<excluded-v4-address>192.168.1.7</excluded-v4-address>

-										</excluded-v4-addresses>

-										<v4-dhcp-pool-prefix>192.155.2.4</v4-dhcp-pool-prefix>

-									</v4-dhcp-pools>									

-									<use-v4-default-pool>Y</use-v4-default-pool>

-									<excluded-v6-dhcp-addresses-from-default-pool>

-									  <excluded-v6-address>1:5</excluded-v6-address>

-									</excluded-v6-dhcp-addresses-from-default-pool>

-									<excluded-v6-dhcp-addresses-from-default-pool>

-									  <excluded-v6-address>1:6</excluded-v6-address>

-									</excluded-v6-dhcp-addresses-from-default-pool>

-									<v6-dhcp-pools>

-										<v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>

-										<v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>

-										<excluded-v6-addresses>

-											<excluded-v6-address>1:1</excluded-v6-address>

-										</excluded-v6-addresses>

-										<v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>

-										<excluded-v6-addresses>

-											<excluded-v6-address>2:2</excluded-v6-address>

-										</excluded-v6-addresses>

-										<v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>

-									</v6-dhcp-pools>

-									<v6-dhcp-pools>

-										<v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>

-										<v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>

-										<excluded-v6-addresses>

-											<excluded-v6-address>1:1</excluded-v6-address>

-										</excluded-v6-addresses>

-										<v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>

-										<excluded-v6-addresses>

-											<excluded-v6-address>2:2</excluded-v6-address>

-										</excluded-v6-addresses>

-										<v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>

-									</v6-dhcp-pools>									

-								</dhcp>

-								<firewall-lite>

-									<stateful-firewall-lite-v6-enabled>N</stateful-firewall-lite-v6-enabled>

-									<stateful-firewall-lite-v4-enabled>Y</stateful-firewall-lite-v4-enabled>

-									<v4-firewall-packet-filters>

-									  <v4-firewall-prefix>0.0.0.1</v4-firewall-prefix>

-									  <v4-firewall-prefix-length>1</v4-firewall-prefix-length>

-									  <allow-icmp-ping>Y</allow-icmp-ping>

-									  <udp-ports>

-									    <port-number>1</port-number>

-									  </udp-ports>

-									  <tcp-ports>

-									    <port-number>1</port-number>

-									  </tcp-ports>

-									</v4-firewall-packet-filters>

-									<v4-firewall-packet-filters>

-									  <v4-firewall-prefix>0.0.0.2</v4-firewall-prefix>

-									  <v4-firewall-prefix-length>2</v4-firewall-prefix-length>

-									  <allow-icmp-ping>Y</allow-icmp-ping>

-									  <udp-ports>

-									    <port-number>2</port-number>

-									  </udp-ports>

-									  <tcp-ports>

-									    <port-number>2</port-number>

-									  </tcp-ports>

-									</v4-firewall-packet-filters>

-									<v6-firewall-packet-filters>

-									  <v6-firewall-prefix>:</v6-firewall-prefix>

-									  <v6-firewall-prefix-length>0</v6-firewall-prefix-length>

-									  <allow-icmp-ping>Y</allow-icmp-ping>

-									  <udp-ports>

-									    <port-number>3</port-number>

-									  </udp-ports>

-									  <tcp-ports>

-									    <port-number>3</port-number>

-									  </tcp-ports>

-									</v6-firewall-packet-filters>

-									<v6-firewall-packet-filters>

-									  <v6-firewall-prefix>:</v6-firewall-prefix>

-									  <v6-firewall-prefix-length>1</v6-firewall-prefix-length>

-									  <allow-icmp-ping>Y</allow-icmp-ping>

-									  <udp-ports>

-									    <port-number>4</port-number>

-									  </udp-ports>

-									  <tcp-ports>

-									    <port-number>4</port-number>

-									  </tcp-ports>

-									</v6-firewall-packet-filters>

-								</firewall-lite>

-								<pat>

-									<v4-pat-pools>

-										<v4-pat-pool-prefix>192.168.1.44</v4-pat-pool-prefix>

-										<v4-pat-pool-next-hop-address>192.168.1.5</v4-pat-pool-next-hop-address>

-										<v4-pat-pool-prefix-length>0</v4-pat-pool-prefix-length>

-									</v4-pat-pools>

-									<use-v4-default-pool>Y</use-v4-default-pool>

-									<v4-pat-enabled>N</v4-pat-enabled>

-									<v4-pat-pools>

-										<v4-pat-pool-prefix>192.168.1.45</v4-pat-pool-prefix>

-										<v4-pat-pool-next-hop-address>192.168.1.6</v4-pat-pool-next-hop-address>

-										<v4-pat-pool-prefix-length>28</v4-pat-pool-prefix-length>

-									</v4-pat-pools>

-								</pat>

-								<nat>

-								  <v4-nat-enabled>Y</v4-nat-enabled>

-								  <v4-nat-mapping-entries>

-								    <v4-nat-internal>0.0.0.0</v4-nat-internal>

-								    <v4-nat-next-hop-address>0.0.0.0</v4-nat-next-hop-address>

-								    <v4-nat-external>0.0.0.0</v4-nat-external>

-								  </v4-nat-mapping-entries>

-								  <v4-nat-mapping-entries>

-								    <v4-nat-internal>0.0.0.1</v4-nat-internal>

-								    <v4-nat-next-hop-address>0.0.0.1</v4-nat-next-hop-address>

-								    <v4-nat-external>0.0.0.1</v4-nat-external>

-								  </v4-nat-mapping-entries>

-								</nat>

-								<vr-designation>primary</vr-designation>

-								<v4-vce-loopback-address>162.200.3.144</v4-vce-loopback-address>

-								<v6-vr-lan-prefix-length>64</v6-vr-lan-prefix-length>

-								<v6-vce-wan-address>2001:1890:12e3:2da::</v6-vce-wan-address>

-								<v6-vr-lan-prefix>2620:0:10d0:f:ffff:ffff:ffff:fffe</v6-vr-lan-prefix>

-								<v4-vr-lan-prefix-length>24</v4-vr-lan-prefix-length>

-								<v4-vr-lan-prefix>10.192.27.254</v4-vr-lan-prefix>

-								<v4-public-lan-prefixes>

-									<t-provided-v4-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v4-next-hop-address>192.168.1.2</v4-next-hop-address>

-										<v4-lan-public-prefix>192.168.1.1</v4-lan-public-prefix>

-										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>

-									</t-provided-v4-lan-public-prefixes>

-									<t-provided-v4-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v4-next-hop-address>192.168.1.72</v4-next-hop-address>

-										<v4-lan-public-prefix>192.168.1.71</v4-lan-public-prefix>

-										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>

-									</t-provided-v4-lan-public-prefixes>

-									<t-provided-v4-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v4-next-hop-address>192.168.1.68</v4-next-hop-address>

-										<v4-lan-public-prefix>192.168.1.67</v4-lan-public-prefix>

-										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>

-									</t-provided-v4-lan-public-prefixes>

-								</v4-public-lan-prefixes>

-								<v6-public-lan-prefixes>

-									<t-provided-v6-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-										<v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>

-										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>

-									</t-provided-v6-lan-public-prefixes>

-									<t-provided-v6-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-										<v6-lan-public-prefix>2001:1890:12e3:3da::</v6-lan-public-prefix>

-										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>

-									</t-provided-v6-lan-public-prefixes>

-									<t-provided-v6-lan-public-prefixes>

-										<request-index>1</request-index>

-										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-										<v6-lan-public-prefix>2001:1890:12e3:4da::</v6-lan-public-prefix>

-										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>

-									</t-provided-v6-lan-public-prefixes>

-								</v6-public-lan-prefixes>

-							</vr-lan-interface>

-							<routing-protocol>none</routing-protocol>

-						</vr-lan>

-<ucpe-vms-service-information>				

- <transport-service-information>

-    <transport-service-type>AVPN</transport-service-type>

-	<access-circuit-info>

-	   <access-circuit-id>1</access-circuit-id>

-	   <dual-mode>Active</dual-mode>

-	</access-circuit-info>

-	<access-circuit-info>

-	   <access-circuit-id>2</access-circuit-id>

-	   <dual-mode>Standby</dual-mode>

-	</access-circuit-info>	

- </transport-service-information>

- <ucpe-information>

-    <ucpe-host-name>hostname</ucpe-host-name>

-    <ucpe-activation-code>activecode</ucpe-activation-code>

-    <out-of-band-management-modem>OOB</out-of-band-management-modem>

-  </ucpe-information>

-  <vnf-list>

-	<vnf-information> 

-		<vnf-instance-id>1</vnf-instance-id> 

-		<vnf-sequence-number>1</vnf-sequence-number>

-		<vnf-type>ZZ</vnf-type>

-		<vnf-vendor>JUNIPER</vnf-vendor>

-		<vnf-model>MODEL1</vnf-model>

-		<vnf-id>1</vnf-id>

-		<prov-status>1</prov-status>

-		<operational-state>1</operational-state>

-		<orchestration-status>1</orchestration-status>

-		<equipment-role>1</equipment-role>

-    </vnf-information>

-	<vnf-information> 

-		<vnf-instance-id>2</vnf-instance-id> 

-		<vnf-sequence-number>2</vnf-sequence-number>

-		<vnf-type>HY</vnf-type>

-		<vnf-vendor>JUNIPER</vnf-vendor>

-		<vnf-model>MODEL2</vnf-model>

-		<vnf-id>2</vnf-id>

-		<prov-status>2</prov-status>

-		<operational-state>2</operational-state>

-		<orchestration-status>2</orchestration-status>

-		<equipment-role>2</equipment-role>

-    </vnf-information>					

-  </vnf-list>

- </ucpe-vms-service-information>										

-						<request-information>

-							<request-action>Layer3ServiceActivateRequest</request-action>

-							<order-number>4281555</order-number>

-							<request-id>155415ab-b4a7-4382-b4c6-d17d9sm42855</request-id>

-							<notification-url>https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</notification-url>

-							<source>OMX</source>

-							<order-version>1</order-version>

-						</request-information>

-						<sdnc-request-header>

-							<svc-action>activate</svc-action>

-							<svc-notification-url>https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify</svc-notification-url>

-							<svc-request-id>5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760</svc-request-id>

-						</sdnc-request-header>

-						<l2-homing-information>

-							<topology>MultiPoint</topology>

-							<preferred-aic-clli>MTSNJA4LCP1</preferred-aic-clli>

-							<evc-name>AS/VLXM/003717//SW</evc-name>

-						</l2-homing-information>

-						<service-information>

-							<service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>

-							<subscriber-name>ST E2E Test42855_1300004281555</subscriber-name>

-							<service-type>SDN-ETHERNET-INTERNET</service-type>

-						</service-information>

-						<internet-service-change-details>

-							<internet-evc-speed-value>10</internet-evc-speed-value>

-							<internet-evc-speed-units>Kbps</internet-evc-speed-units>

-							<t-provided-v4-lan-public-prefixes>

-							   <request-index>1</request-index>

-							   <v4-next-hop-address>192.168.1.15</v4-next-hop-address>

-							   <v4-lan-public-prefix>192.168.1.15</v4-lan-public-prefix>

-							   <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>

-							</t-provided-v4-lan-public-prefixes>

-							<t-provided-v4-lan-public-prefixes>

-							   <request-index>2</request-index>

-							   <v4-next-hop-address>192.168.1.16</v4-next-hop-address>

-							   <v4-lan-public-prefix>192.168.1.16</v4-lan-public-prefix>

-							   <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>

-							</t-provided-v4-lan-public-prefixes>

-							<t-provided-v6-lan-public-prefixes>

-							   <request-index>1</request-index>

-							   <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-							   <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>

-							   <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>

-							</t-provided-v6-lan-public-prefixes>

-							<t-provided-v6-lan-public-prefixes>

-							   <request-index>1</request-index>

-							   <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>

-							   <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>

-							   <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>

-							</t-provided-v6-lan-public-prefixes>

-						</internet-service-change-details>

-					</service-data>

-				</layer3-service-list>

-</tag0:RequestData>

-"""

-

-def sdncAdapterResponseEmpty =

-"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-   <sdncadapterworkflow:response-data/>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-

-def sdncAdapterResponseError =

-"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-   <sdncadapterworkflow:response-data>

-      <tag0:CallbackHeader>

-         <tag0:RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</tag0:RequestId>

-         <tag0:ResponseCode>404</tag0:ResponseCode>

-         <tag0:ResponseMessage>Error processing request to SDNC. Not Found.

-			https://sdncodl.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist.]</tag0:ResponseMessage>

-      </tag0:CallbackHeader>

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-

-				  								

-	@Test

-	public void testPreProcessRequest() {

-

-		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml");

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("URN_mso_adapters_po_auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")

-		when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-		when(mockExecution.getVariable("sdncAdapterWorkflowRequest")).thenReturn(sdncAdapterWorkflowRequest)

-		when(mockExecution.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("http://someurl.someting.com:28080/mso/sdncAdapterCallbackServiceImpl")

-		when(mockExecution.getVariable("URN_mso_use_qualified_host")).thenReturn("true")

-		when(mockExecution.getProcessInstanceId()).thenReturn("745b1b50-e39e-4685-9cc8-c71f0bde8bf0")

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-	

-

-		SDNCAdapter sdncAdapter = new SDNCAdapter()

-		sdncAdapter.preProcessRequest(mockExecution)

-		

-		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-		debugger.printInvocations(mockExecution)

-		

-

-		verify(mockExecution).setVariable("prefix","SDNCA_")

-		verify(mockExecution).setVariable("sdncAdapterResponse","")

-		verify(mockExecution).setVariable("asynchronousResponseTimeout",false)

-		verify(mockExecution).setVariable("continueListening",false)

-		verify(mockExecution).setVariable("BasicAuthHeaderValue","Basic cGFzc3dvcmQ=")

-		verify(mockExecution).setVariable("serviceConfigActivate",false)

-		verify(mockExecution).setVariable("SDNCA_requestId", "745b1b50-e39e-4685-9cc8-c71f0bde8bf0")

-		verify(mockExecution).setVariable("SDNCA_SuccessIndicator",false)

-		verify(mockExecution).setVariable("source","")

-		verify(mockExecution).setVariable("sdncAdapterRequest", sdncAdapterRequest)	

-	}

-	

-	@Test

-	public void testProcessResponse()

-	{

-		String sdncAdapterCallbackResponse = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml");

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(sdncAdapterCallbackResponse)

-		SDNCAdapter sdncAdapter = new SDNCAdapter()

-		sdncAdapter.postProcessResponse(mockExecution)

-		

-//		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-//		debugger.printInvocations(mockExecution)

-		

-		verify(mockExecution).getVariable("isDebugLogEnabled")

-		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")

-		verify(mockExecution).setVariable("sdncAdapterResponse",workflowResponse)

-		verify(mockExecution).setVariable("enhancedCallbackRequestData",enhancedCallbackRequestData)

-		verify(mockExecution).setVariable("continueListening",false)

-

-	}	

-	

-	@Test

-	public void testProcessResponse_ErrorCase_404()

-	{

-		String sdncAdapterCallbackErrorResponse = FileUtil.readResourceFile("sdncadaptercallbackrequest_404CallBack.xml");

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(sdncAdapterCallbackErrorResponse)

-		SDNCAdapter sdncAdapter = new SDNCAdapter()

-		sdncAdapter.postProcessResponse(mockExecution)

-		

-		verify(mockExecution, times(1)).getVariable("isDebugLogEnabled")

-		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")

-		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponseError)

-		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")

-		verify(mockExecution).setVariable("continueListening",false)

-		

-	}

-	

-	@Test

-	public void testProcessResponse_ErrorCase_InvalidCallback()

-	{

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn("<h1>Service Unavailable</h1>")

-		SDNCAdapter sdncAdapter = new SDNCAdapter()

-		sdncAdapter.postProcessResponse(mockExecution)

-		

-		verify(mockExecution).getVariable("isDebugLogEnabled")

-		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")

-		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponseEmpty)

-		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")

-		verify(mockExecution).setVariable("continueListening",false)

-

-	}

-	

-	@Test

-	public void postProcessResponse()

-	{

-		

-		String SDNCAdapterCallbackRequest = 

-		"""<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<SDNCAdapterCallbackRequest

-	xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-	<CallbackHeader>

-		<RequestId>3bb02798-b344-4d28-9bca-1f029954d1c9</RequestId>

-		<ResponseCode>404</ResponseCode>

-		<ResponseMessage>Error processing request to SDNC. Not Found.

-			https://sdncodl.us.infra.aic.net:8443/restconf/config/L3SDN-API:services/layer3-service-list/85%2FCSIP%2F141203%2FPT_CSI9999998693.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist ]</ResponseMessage>

-	</CallbackHeader>

-</SDNCAdapterCallbackRequest>"""

-		

-		String sdncAdapterResponse =

-		"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-   <sdncadapterworkflow:response-data>

-      <tag0:CallbackHeader>

-         <tag0:RequestId>3bb02798-b344-4d28-9bca-1f029954d1c9</tag0:RequestId>

-         <tag0:ResponseCode>404</tag0:ResponseCode>

-         <tag0:ResponseMessage>Error processing request to SDNC. Not Found.

-			https://sdncodl.us.infra.aic.net:8443/restconf/config/L3SDN-API:services/layer3-service-list/85%2FCSIP%2F141203%2FPT_CSI9999998693.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist ]</tag0:ResponseMessage>

-      </tag0:CallbackHeader>

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(SDNCAdapterCallbackRequest)

-		SDNCAdapter sdncAdapter = new SDNCAdapter()

-		sdncAdapter.postProcessResponse(mockExecution)

-		

-		verify(mockExecution).getVariable("isDebugLogEnabled")

-		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")

-		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponse)

-		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")

-		verify(mockExecution).setVariable("continueListening",false)

-

-	}

-

+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+
+import static org.mockito.Mockito.*
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.onap.so.bpmn.common.scripts.SDNCAdapter;
+
+import org.onap.so.bpmn.mock.FileUtil
+
+@RunWith(MockitoJUnitRunner.class)
+public class SDNCAdapterTest {
+	
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+		System.setProperty("jboss.qualified.host.name","myhost.com")
+	}
+
+	
+	String workflowResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+                                                 xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1"
+                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                                 xmlns="com:att:sdnctl:l3api">
+   <sdncadapterworkflow:response-data>
+      <tag0:CallbackHeader>
+         <tag0:RequestId>testRequestId</tag0:RequestId>
+         <tag0:ResponseCode>200</tag0:ResponseCode>
+         <tag0:ResponseMessage>OK</tag0:ResponseMessage>
+      </tag0:CallbackHeader>
+      <tag0:RequestData xsi:type="xs:string">
+         <layer3-service-list>
+            <service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>
+            <service-status>
+               <rpc-name>service-configuration-operation</rpc-name>
+               <rpc-action>activate</rpc-action>
+               <request-status>synccomplete</request-status>
+               <final-indicator>N</final-indicator>
+               <l3sdn-action>Layer3ServiceActivateRequest</l3sdn-action>
+               <l3sdn-subaction>SUPP</l3sdn-subaction>
+               <response-timestamp>2015-04-28T21:32:11.386Z</response-timestamp>
+            </service-status>
+            <service-data>
+               <internet-evc-access-information>
+                  <ip-version>ds</ip-version>
+                  <internet-evc-speed-value>8</internet-evc-speed-value>
+                  <internet-evc-speed-units>Mbps</internet-evc-speed-units>
+               </internet-evc-access-information>
+               <vr-lan>
+                  <vr-lan-interface>
+                     <static-routes>
+                        <v6-static-routes>
+                           <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                           <v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>
+                           <v6-static-route-prefix-length>28</v6-static-route-prefix-length>
+                        </v6-static-routes>
+                        <v4-static-routes>
+                           <v4-static-route-prefix>255.255.252.1</v4-static-route-prefix>
+                           <v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+                           <v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+                        </v4-static-routes>
+                        <v6-static-routes>
+                           <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                           <v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>
+                           <v6-static-route-prefix-length>28</v6-static-route-prefix-length>
+                        </v6-static-routes>
+                        <v4-static-routes>
+                           <v4-static-route-prefix>255.255.252.2</v4-static-route-prefix>
+                           <v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+                           <v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+                        </v4-static-routes>
+                        <v4-static-routes>
+                           <v4-static-route-prefix>255.255.252.3</v4-static-route-prefix>
+                           <v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+                           <v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+                        </v4-static-routes>
+                     </static-routes>
+                     <dhcp>
+                        <v6-dhcp-server-enabled>N</v6-dhcp-server-enabled>
+                        <v4-dhcp-server-enabled>Y</v4-dhcp-server-enabled>
+                        <use-v6-default-pool>N</use-v6-default-pool>
+                        <excluded-v4-dhcp-addresses-from-default-pool>
+                           <excluded-v4-address>192.168.1.7</excluded-v4-address>
+                        </excluded-v4-dhcp-addresses-from-default-pool>
+                        <excluded-v4-dhcp-addresses-from-default-pool>
+                           <excluded-v4-address>192.168.1.8</excluded-v4-address>
+                        </excluded-v4-dhcp-addresses-from-default-pool>
+                        <v4-dhcp-pools>
+                           <v4-dhcp-relay-next-hop-address>1.1.1.1</v4-dhcp-relay-next-hop-address>
+                           <v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>
+                           <excluded-v4-addresses>
+                              <excluded-v4-address>192.168.1.5</excluded-v4-address>
+                           </excluded-v4-addresses>
+                           <v4-dhcp-relay-gateway-address>2.2.2.1</v4-dhcp-relay-gateway-address>
+                           <excluded-v4-addresses>
+                              <excluded-v4-address>192.168.1.6</excluded-v4-address>
+                           </excluded-v4-addresses>
+                           <v4-dhcp-pool-prefix>192.155.2.3</v4-dhcp-pool-prefix>
+                        </v4-dhcp-pools>
+                        <v4-dhcp-pools>
+                           <v4-dhcp-relay-next-hop-address>1.1.1.2</v4-dhcp-relay-next-hop-address>
+                           <v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>
+                           <excluded-v4-addresses>
+                              <excluded-v4-address>192.168.1.6</excluded-v4-address>
+                           </excluded-v4-addresses>
+                           <v4-dhcp-relay-gateway-address>2.2.2.2</v4-dhcp-relay-gateway-address>
+                           <excluded-v4-addresses>
+                              <excluded-v4-address>192.168.1.7</excluded-v4-address>
+                           </excluded-v4-addresses>
+                           <v4-dhcp-pool-prefix>192.155.2.4</v4-dhcp-pool-prefix>
+                        </v4-dhcp-pools>
+                        <use-v4-default-pool>Y</use-v4-default-pool>
+                        <excluded-v6-dhcp-addresses-from-default-pool>
+                           <excluded-v6-address>1:5</excluded-v6-address>
+                        </excluded-v6-dhcp-addresses-from-default-pool>
+                        <excluded-v6-dhcp-addresses-from-default-pool>
+                           <excluded-v6-address>1:6</excluded-v6-address>
+                        </excluded-v6-dhcp-addresses-from-default-pool>
+                        <v6-dhcp-pools>
+                           <v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>
+                           <v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>
+                           <excluded-v6-addresses>
+                              <excluded-v6-address>1:1</excluded-v6-address>
+                           </excluded-v6-addresses>
+                           <v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>
+                           <excluded-v6-addresses>
+                              <excluded-v6-address>2:2</excluded-v6-address>
+                           </excluded-v6-addresses>
+                           <v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>
+                        </v6-dhcp-pools>
+                        <v6-dhcp-pools>
+                           <v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>
+                           <v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>
+                           <excluded-v6-addresses>
+                              <excluded-v6-address>1:1</excluded-v6-address>
+                           </excluded-v6-addresses>
+                           <v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>
+                           <excluded-v6-addresses>
+                              <excluded-v6-address>2:2</excluded-v6-address>
+                           </excluded-v6-addresses>
+                           <v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>
+                        </v6-dhcp-pools>
+                     </dhcp>
+                     <firewall-lite>
+                        <stateful-firewall-lite-v6-enabled>N</stateful-firewall-lite-v6-enabled>
+                        <stateful-firewall-lite-v4-enabled>Y</stateful-firewall-lite-v4-enabled>
+                        <v4-firewall-packet-filters>
+                           <v4-firewall-prefix>0.0.0.1</v4-firewall-prefix>
+                           <v4-firewall-prefix-length>1</v4-firewall-prefix-length>
+                           <allow-icmp-ping>Y</allow-icmp-ping>
+                           <udp-ports>
+                              <port-number>1</port-number>
+                           </udp-ports>
+                           <tcp-ports>
+                              <port-number>1</port-number>
+                           </tcp-ports>
+                        </v4-firewall-packet-filters>
+                        <v4-firewall-packet-filters>
+                           <v4-firewall-prefix>0.0.0.2</v4-firewall-prefix>
+                           <v4-firewall-prefix-length>2</v4-firewall-prefix-length>
+                           <allow-icmp-ping>Y</allow-icmp-ping>
+                           <udp-ports>
+                              <port-number>2</port-number>
+                           </udp-ports>
+                           <tcp-ports>
+                              <port-number>2</port-number>
+                           </tcp-ports>
+                        </v4-firewall-packet-filters>
+                        <v6-firewall-packet-filters>
+                           <v6-firewall-prefix>:</v6-firewall-prefix>
+                           <v6-firewall-prefix-length>0</v6-firewall-prefix-length>
+                           <allow-icmp-ping>Y</allow-icmp-ping>
+                           <udp-ports>
+                              <port-number>3</port-number>
+                           </udp-ports>
+                           <tcp-ports>
+                              <port-number>3</port-number>
+                           </tcp-ports>
+                        </v6-firewall-packet-filters>
+                        <v6-firewall-packet-filters>
+                           <v6-firewall-prefix>:</v6-firewall-prefix>
+                           <v6-firewall-prefix-length>1</v6-firewall-prefix-length>
+                           <allow-icmp-ping>Y</allow-icmp-ping>
+                           <udp-ports>
+                              <port-number>4</port-number>
+                           </udp-ports>
+                           <tcp-ports>
+                              <port-number>4</port-number>
+                           </tcp-ports>
+                        </v6-firewall-packet-filters>
+                     </firewall-lite>
+                     <pat>
+                        <v4-pat-pools>
+                           <v4-pat-pool-prefix>192.168.1.44</v4-pat-pool-prefix>
+                           <v4-pat-pool-next-hop-address>192.168.1.5</v4-pat-pool-next-hop-address>
+                           <v4-pat-pool-prefix-length>0</v4-pat-pool-prefix-length>
+                        </v4-pat-pools>
+                        <use-v4-default-pool>Y</use-v4-default-pool>
+                        <v4-pat-enabled>N</v4-pat-enabled>
+                        <v4-pat-pools>
+                           <v4-pat-pool-prefix>192.168.1.45</v4-pat-pool-prefix>
+                           <v4-pat-pool-next-hop-address>192.168.1.6</v4-pat-pool-next-hop-address>
+                           <v4-pat-pool-prefix-length>28</v4-pat-pool-prefix-length>
+                        </v4-pat-pools>
+                     </pat>
+                     <nat>
+                        <v4-nat-enabled>Y</v4-nat-enabled>
+                        <v4-nat-mapping-entries>
+                           <v4-nat-internal>0.0.0.0</v4-nat-internal>
+                           <v4-nat-next-hop-address>0.0.0.0</v4-nat-next-hop-address>
+                           <v4-nat-external>0.0.0.0</v4-nat-external>
+                        </v4-nat-mapping-entries>
+                        <v4-nat-mapping-entries>
+                           <v4-nat-internal>0.0.0.1</v4-nat-internal>
+                           <v4-nat-next-hop-address>0.0.0.1</v4-nat-next-hop-address>
+                           <v4-nat-external>0.0.0.1</v4-nat-external>
+                        </v4-nat-mapping-entries>
+                     </nat>
+                     <vr-designation>primary</vr-designation>
+                     <v4-vce-loopback-address>162.200.3.144</v4-vce-loopback-address>
+                     <v6-vr-lan-prefix-length>64</v6-vr-lan-prefix-length>
+                     <v6-vce-wan-address>2001:1890:12e3:2da::</v6-vce-wan-address>
+                     <v6-vr-lan-prefix>2620:0:10d0:f:ffff:ffff:ffff:fffe</v6-vr-lan-prefix>
+                     <v4-vr-lan-prefix-length>24</v4-vr-lan-prefix-length>
+                     <v4-vr-lan-prefix>10.192.27.254</v4-vr-lan-prefix>
+                     <v4-public-lan-prefixes>
+                        <t-provided-v4-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v4-next-hop-address>192.168.1.2</v4-next-hop-address>
+                           <v4-lan-public-prefix>192.168.1.1</v4-lan-public-prefix>
+                           <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+                        </t-provided-v4-lan-public-prefixes>
+                        <t-provided-v4-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v4-next-hop-address>192.168.1.72</v4-next-hop-address>
+                           <v4-lan-public-prefix>192.168.1.71</v4-lan-public-prefix>
+                           <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+                        </t-provided-v4-lan-public-prefixes>
+                        <t-provided-v4-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v4-next-hop-address>192.168.1.68</v4-next-hop-address>
+                           <v4-lan-public-prefix>192.168.1.67</v4-lan-public-prefix>
+                           <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+                        </t-provided-v4-lan-public-prefixes>
+                     </v4-public-lan-prefixes>
+                     <v6-public-lan-prefixes>
+                        <t-provided-v6-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                           <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+                           <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+                        </t-provided-v6-lan-public-prefixes>
+                        <t-provided-v6-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                           <v6-lan-public-prefix>2001:1890:12e3:3da::</v6-lan-public-prefix>
+                           <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+                        </t-provided-v6-lan-public-prefixes>
+                        <t-provided-v6-lan-public-prefixes>
+                           <request-index>1</request-index>
+                           <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                           <v6-lan-public-prefix>2001:1890:12e3:4da::</v6-lan-public-prefix>
+                           <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+                        </t-provided-v6-lan-public-prefixes>
+                     </v6-public-lan-prefixes>
+                  </vr-lan-interface>
+                  <routing-protocol>none</routing-protocol>
+               </vr-lan>
+               <ucpe-vms-service-information>
+                  <transport-service-information>
+                     <transport-service-type>AVPN</transport-service-type>
+                     <access-circuit-info>
+                        <access-circuit-id>1</access-circuit-id>
+                        <dual-mode>Active</dual-mode>
+                     </access-circuit-info>
+                     <access-circuit-info>
+                        <access-circuit-id>2</access-circuit-id>
+                        <dual-mode>Standby</dual-mode>
+                     </access-circuit-info>
+                  </transport-service-information>
+                  <ucpe-information>
+                     <ucpe-host-name>hostname</ucpe-host-name>
+                     <ucpe-activation-code>activecode</ucpe-activation-code>
+                     <out-of-band-management-modem>OOB</out-of-band-management-modem>
+                  </ucpe-information>
+                  <vnf-list>
+                     <vnf-information>
+                        <vnf-instance-id>1</vnf-instance-id>
+                        <vnf-sequence-number>1</vnf-sequence-number>
+                        <vnf-type>ZZ</vnf-type>
+                        <vnf-vendor>JUNIPER</vnf-vendor>
+                        <vnf-model>MODEL1</vnf-model>
+                        <vnf-id>1</vnf-id>
+                        <prov-status>1</prov-status>
+                        <operational-state>1</operational-state>
+                        <orchestration-status>1</orchestration-status>
+                        <equipment-role>1</equipment-role>
+                     </vnf-information>
+                     <vnf-information>
+                        <vnf-instance-id>2</vnf-instance-id>
+                        <vnf-sequence-number>2</vnf-sequence-number>
+                        <vnf-type>HY</vnf-type>
+                        <vnf-vendor>JUNIPER</vnf-vendor>
+                        <vnf-model>MODEL2</vnf-model>
+                        <vnf-id>2</vnf-id>
+                        <prov-status>2</prov-status>
+                        <operational-state>2</operational-state>
+                        <orchestration-status>2</orchestration-status>
+                        <equipment-role>2</equipment-role>
+                     </vnf-information>
+                  </vnf-list>
+               </ucpe-vms-service-information>
+               <request-information>
+                  <request-action>Layer3ServiceActivateRequest</request-action>
+                  <order-number>4281555</order-number>
+                  <request-id>155415ab-b4a7-4382-b4c6-d17d9sm42855</request-id>
+                  <notification-url>https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</notification-url>
+                  <source>OMX</source>
+                  <order-version>1</order-version>
+               </request-information>
+               <sdnc-request-header>
+                  <svc-action>activate</svc-action>
+                  <svc-notification-url>https://localhost:8443/adapters/rest/SDNCNotify</svc-notification-url>
+                  <svc-request-id>5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760</svc-request-id>
+               </sdnc-request-header>
+               <l2-homing-information>
+                  <topology>MultiPoint</topology>
+                  <preferred-aic-clli>MTSNJA4LCP1</preferred-aic-clli>
+                  <evc-name>AS/VLXM/003717//SW</evc-name>
+               </l2-homing-information>
+               <service-information>
+                  <service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>
+                  <subscriber-name>ST E2E Test42855_1300004281555</subscriber-name>
+                  <service-type>SDN-ETHERNET-INTERNET</service-type>
+               </service-information>
+               <internet-service-change-details>
+                  <internet-evc-speed-value>10</internet-evc-speed-value>
+                  <internet-evc-speed-units>Kbps</internet-evc-speed-units>
+                  <t-provided-v4-lan-public-prefixes>
+                     <request-index>1</request-index>
+                     <v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+                     <v4-lan-public-prefix>192.168.1.15</v4-lan-public-prefix>
+                     <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+                  </t-provided-v4-lan-public-prefixes>
+                  <t-provided-v4-lan-public-prefixes>
+                     <request-index>2</request-index>
+                     <v4-next-hop-address>192.168.1.16</v4-next-hop-address>
+                     <v4-lan-public-prefix>192.168.1.16</v4-lan-public-prefix>
+                     <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+                  </t-provided-v4-lan-public-prefixes>
+                  <t-provided-v6-lan-public-prefixes>
+                     <request-index>1</request-index>
+                     <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                     <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+                     <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+                  </t-provided-v6-lan-public-prefixes>
+                  <t-provided-v6-lan-public-prefixes>
+                     <request-index>1</request-index>
+                     <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+                     <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+                     <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+                  </t-provided-v6-lan-public-prefixes>
+               </internet-service-change-details>
+            </service-data>
+         </layer3-service-list>
+      </tag0:RequestData>
+   </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""
+
+	String sdncAdapterRequest = """
+			<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+			<SOAP-ENV:Body>
+			<aetgt:SDNCAdapterRequest xmlns:aetgt="http://org.onap/workflow/sdnc/adapter/schema/v1" xmlns:sdncadaptersc="http://org.onap/workflow/sdnc/adapter/schema/v1">
+			<sdncadapter:RequestHeader xmlns:sdncadapter="http://org.onap/workflow/sdnc/adapter/schema/v1">
+			<sdncadapter:RequestId>745b1b50-e39e-4685-9cc8-c71f0bde8bf0</sdncadapter:RequestId>
+			<sdncadapter:SvcAction>query</sdncadapter:SvcAction>
+			<sdncadapter:SvcOperation>services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET</sdncadapter:SvcOperation>
+			<sdncadapter:CallbackUrl>http://myhost.com:28080/mso/sdncAdapterCallbackServiceImpl</sdncadapter:CallbackUrl>
+			</sdncadapter:RequestHeader>
+			<sdncadaptersc:RequestData>
+				<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+              contentType="text/xml">
+   <service-request xmlns="http://org.onap/so/request/details/schema/v1">
+      <request-information>
+         <request-id>12570a36-7388-4c0a-bec4-189ce3kg9956</request-id>
+         <request-action>GetLayer3ServiceDetailsRequest</request-action>
+         <source>OMX</source>
+      </request-information>
+      <service-information>
+         <service-type>SDN-ETHERNET-INTERNET</service-type>
+         <service-instance-id>PD/VLXM/003717//SW_INTERNET</service-instance-id>
+      </service-information>
+   </service-request>
+</rest:payload>
+			</sdncadaptersc:RequestData></aetgt:SDNCAdapterRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>"""
+	
+def sdncAdapterResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+<sdncadapterworkflow:response-data>
+<tag0:CallbackHeader xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1">
+   <tag0:RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</tag0:RequestId>
+   <tag0:ResponseCode>404</tag0:ResponseCode>
+   <tag0:ResponseMessage>Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist.]</tag0:ResponseMessage>
+</tag0:CallbackHeader>
+</sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
+"""
+
+def workflowErrorResponse = """<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
+								<aetgt:ErrorMessage>Received error from SDN-C: Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist.]</aetgt:ErrorMessage>
+								<aetgt:ErrorCode>5300</aetgt:ErrorCode>
+								<aetgt:SourceSystemErrorCode>404</aetgt:SourceSystemErrorCode>
+								</aetgt:WorkflowException>"""
+
+String workflowErrorResponse1 = """<aetgt:WorkflowException xmlns:aetgt="http://org.onap/so/workflow/schema/v1">
+					<aetgt:ErrorMessage>Invalid Callback Response from SDNC Adapter</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>5300</aetgt:ErrorCode>
+				  </aetgt:WorkflowException>"""
+			
+String     enhancedCallbackRequestData =
+    """<tag0:RequestData xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:type="xs:string">				<layer3-service-list xmlns="com:att:sdnctl:l3api">
+					<service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>
+					<service-status>
+						<rpc-name>service-configuration-operation</rpc-name>
+						<rpc-action>activate</rpc-action>
+						<request-status>synccomplete</request-status>
+						<final-indicator>N</final-indicator>
+						<l3sdn-action>Layer3ServiceActivateRequest</l3sdn-action>
+						<l3sdn-subaction>SUPP</l3sdn-subaction>
+						<response-timestamp>2015-04-28T21:32:11.386Z</response-timestamp>
+					</service-status>
+					<service-data>
+						<internet-evc-access-information>
+							<ip-version>ds</ip-version>
+							<internet-evc-speed-value>8</internet-evc-speed-value>
+							<internet-evc-speed-units>Mbps</internet-evc-speed-units>
+						</internet-evc-access-information>
+						<vr-lan xmlns="com:att:sdnctl:l3api">
+							<vr-lan-interface>
+								<static-routes>
+									<v6-static-routes>
+										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+										<v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>
+										<v6-static-route-prefix-length>28</v6-static-route-prefix-length>
+									</v6-static-routes>
+									<v4-static-routes>
+										<v4-static-route-prefix>255.255.252.1</v4-static-route-prefix>
+										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+									</v4-static-routes>
+									<v6-static-routes>
+										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+										<v6-static-route-prefix>2001:1890:12e3:2da::</v6-static-route-prefix>
+										<v6-static-route-prefix-length>28</v6-static-route-prefix-length>
+									</v6-static-routes>
+									<v4-static-routes>
+										<v4-static-route-prefix>255.255.252.2</v4-static-route-prefix>
+										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+									</v4-static-routes>
+									<v4-static-routes>
+										<v4-static-route-prefix>255.255.252.3</v4-static-route-prefix>
+										<v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+										<v4-static-route-prefix-length>28</v4-static-route-prefix-length>
+									</v4-static-routes>
+								</static-routes>
+								<dhcp>
+									<v6-dhcp-server-enabled>N</v6-dhcp-server-enabled>
+									<v4-dhcp-server-enabled>Y</v4-dhcp-server-enabled>
+									<use-v6-default-pool>N</use-v6-default-pool>
+									<excluded-v4-dhcp-addresses-from-default-pool>
+									  <excluded-v4-address>192.168.1.7</excluded-v4-address>
+									</excluded-v4-dhcp-addresses-from-default-pool>
+									<excluded-v4-dhcp-addresses-from-default-pool>
+									  <excluded-v4-address>192.168.1.8</excluded-v4-address>
+									</excluded-v4-dhcp-addresses-from-default-pool>
+									<v4-dhcp-pools>
+										<v4-dhcp-relay-next-hop-address>1.1.1.1</v4-dhcp-relay-next-hop-address>
+										<v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>
+										<excluded-v4-addresses>
+											<excluded-v4-address>192.168.1.5</excluded-v4-address>
+										</excluded-v4-addresses>
+										<v4-dhcp-relay-gateway-address>2.2.2.1</v4-dhcp-relay-gateway-address>
+										<excluded-v4-addresses>
+											<excluded-v4-address>192.168.1.6</excluded-v4-address>
+										</excluded-v4-addresses>
+										<v4-dhcp-pool-prefix>192.155.2.3</v4-dhcp-pool-prefix>
+									</v4-dhcp-pools>
+									<v4-dhcp-pools>
+										<v4-dhcp-relay-next-hop-address>1.1.1.2</v4-dhcp-relay-next-hop-address>
+										<v4-dhcp-pool-prefix-length>28</v4-dhcp-pool-prefix-length>
+										<excluded-v4-addresses>
+											<excluded-v4-address>192.168.1.6</excluded-v4-address>
+										</excluded-v4-addresses>
+										<v4-dhcp-relay-gateway-address>2.2.2.2</v4-dhcp-relay-gateway-address>
+										<excluded-v4-addresses>
+											<excluded-v4-address>192.168.1.7</excluded-v4-address>
+										</excluded-v4-addresses>
+										<v4-dhcp-pool-prefix>192.155.2.4</v4-dhcp-pool-prefix>
+									</v4-dhcp-pools>									
+									<use-v4-default-pool>Y</use-v4-default-pool>
+									<excluded-v6-dhcp-addresses-from-default-pool>
+									  <excluded-v6-address>1:5</excluded-v6-address>
+									</excluded-v6-dhcp-addresses-from-default-pool>
+									<excluded-v6-dhcp-addresses-from-default-pool>
+									  <excluded-v6-address>1:6</excluded-v6-address>
+									</excluded-v6-dhcp-addresses-from-default-pool>
+									<v6-dhcp-pools>
+										<v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>
+										<v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>
+										<excluded-v6-addresses>
+											<excluded-v6-address>1:1</excluded-v6-address>
+										</excluded-v6-addresses>
+										<v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>
+										<excluded-v6-addresses>
+											<excluded-v6-address>2:2</excluded-v6-address>
+										</excluded-v6-addresses>
+										<v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>
+									</v6-dhcp-pools>
+									<v6-dhcp-pools>
+										<v6-dhcp-relay-next-hop-address>4:4</v6-dhcp-relay-next-hop-address>
+										<v6-dhcp-pool-prefix-length>28</v6-dhcp-pool-prefix-length>
+										<excluded-v6-addresses>
+											<excluded-v6-address>1:1</excluded-v6-address>
+										</excluded-v6-addresses>
+										<v6-dhcp-relay-gateway-address>3:3</v6-dhcp-relay-gateway-address>
+										<excluded-v6-addresses>
+											<excluded-v6-address>2:2</excluded-v6-address>
+										</excluded-v6-addresses>
+										<v6-dhcp-pool-prefix>0:0</v6-dhcp-pool-prefix>
+									</v6-dhcp-pools>									
+								</dhcp>
+								<firewall-lite>
+									<stateful-firewall-lite-v6-enabled>N</stateful-firewall-lite-v6-enabled>
+									<stateful-firewall-lite-v4-enabled>Y</stateful-firewall-lite-v4-enabled>
+									<v4-firewall-packet-filters>
+									  <v4-firewall-prefix>0.0.0.1</v4-firewall-prefix>
+									  <v4-firewall-prefix-length>1</v4-firewall-prefix-length>
+									  <allow-icmp-ping>Y</allow-icmp-ping>
+									  <udp-ports>
+									    <port-number>1</port-number>
+									  </udp-ports>
+									  <tcp-ports>
+									    <port-number>1</port-number>
+									  </tcp-ports>
+									</v4-firewall-packet-filters>
+									<v4-firewall-packet-filters>
+									  <v4-firewall-prefix>0.0.0.2</v4-firewall-prefix>
+									  <v4-firewall-prefix-length>2</v4-firewall-prefix-length>
+									  <allow-icmp-ping>Y</allow-icmp-ping>
+									  <udp-ports>
+									    <port-number>2</port-number>
+									  </udp-ports>
+									  <tcp-ports>
+									    <port-number>2</port-number>
+									  </tcp-ports>
+									</v4-firewall-packet-filters>
+									<v6-firewall-packet-filters>
+									  <v6-firewall-prefix>:</v6-firewall-prefix>
+									  <v6-firewall-prefix-length>0</v6-firewall-prefix-length>
+									  <allow-icmp-ping>Y</allow-icmp-ping>
+									  <udp-ports>
+									    <port-number>3</port-number>
+									  </udp-ports>
+									  <tcp-ports>
+									    <port-number>3</port-number>
+									  </tcp-ports>
+									</v6-firewall-packet-filters>
+									<v6-firewall-packet-filters>
+									  <v6-firewall-prefix>:</v6-firewall-prefix>
+									  <v6-firewall-prefix-length>1</v6-firewall-prefix-length>
+									  <allow-icmp-ping>Y</allow-icmp-ping>
+									  <udp-ports>
+									    <port-number>4</port-number>
+									  </udp-ports>
+									  <tcp-ports>
+									    <port-number>4</port-number>
+									  </tcp-ports>
+									</v6-firewall-packet-filters>
+								</firewall-lite>
+								<pat>
+									<v4-pat-pools>
+										<v4-pat-pool-prefix>192.168.1.44</v4-pat-pool-prefix>
+										<v4-pat-pool-next-hop-address>192.168.1.5</v4-pat-pool-next-hop-address>
+										<v4-pat-pool-prefix-length>0</v4-pat-pool-prefix-length>
+									</v4-pat-pools>
+									<use-v4-default-pool>Y</use-v4-default-pool>
+									<v4-pat-enabled>N</v4-pat-enabled>
+									<v4-pat-pools>
+										<v4-pat-pool-prefix>192.168.1.45</v4-pat-pool-prefix>
+										<v4-pat-pool-next-hop-address>192.168.1.6</v4-pat-pool-next-hop-address>
+										<v4-pat-pool-prefix-length>28</v4-pat-pool-prefix-length>
+									</v4-pat-pools>
+								</pat>
+								<nat>
+								  <v4-nat-enabled>Y</v4-nat-enabled>
+								  <v4-nat-mapping-entries>
+								    <v4-nat-internal>0.0.0.0</v4-nat-internal>
+								    <v4-nat-next-hop-address>0.0.0.0</v4-nat-next-hop-address>
+								    <v4-nat-external>0.0.0.0</v4-nat-external>
+								  </v4-nat-mapping-entries>
+								  <v4-nat-mapping-entries>
+								    <v4-nat-internal>0.0.0.1</v4-nat-internal>
+								    <v4-nat-next-hop-address>0.0.0.1</v4-nat-next-hop-address>
+								    <v4-nat-external>0.0.0.1</v4-nat-external>
+								  </v4-nat-mapping-entries>
+								</nat>
+								<vr-designation>primary</vr-designation>
+								<v4-vce-loopback-address>162.200.3.144</v4-vce-loopback-address>
+								<v6-vr-lan-prefix-length>64</v6-vr-lan-prefix-length>
+								<v6-vce-wan-address>2001:1890:12e3:2da::</v6-vce-wan-address>
+								<v6-vr-lan-prefix>2620:0:10d0:f:ffff:ffff:ffff:fffe</v6-vr-lan-prefix>
+								<v4-vr-lan-prefix-length>24</v4-vr-lan-prefix-length>
+								<v4-vr-lan-prefix>10.192.27.254</v4-vr-lan-prefix>
+								<v4-public-lan-prefixes>
+									<t-provided-v4-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v4-next-hop-address>192.168.1.2</v4-next-hop-address>
+										<v4-lan-public-prefix>192.168.1.1</v4-lan-public-prefix>
+										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+									</t-provided-v4-lan-public-prefixes>
+									<t-provided-v4-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v4-next-hop-address>192.168.1.72</v4-next-hop-address>
+										<v4-lan-public-prefix>192.168.1.71</v4-lan-public-prefix>
+										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+									</t-provided-v4-lan-public-prefixes>
+									<t-provided-v4-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v4-next-hop-address>192.168.1.68</v4-next-hop-address>
+										<v4-lan-public-prefix>192.168.1.67</v4-lan-public-prefix>
+										<v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+									</t-provided-v4-lan-public-prefixes>
+								</v4-public-lan-prefixes>
+								<v6-public-lan-prefixes>
+									<t-provided-v6-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+										<v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+									</t-provided-v6-lan-public-prefixes>
+									<t-provided-v6-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+										<v6-lan-public-prefix>2001:1890:12e3:3da::</v6-lan-public-prefix>
+										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+									</t-provided-v6-lan-public-prefixes>
+									<t-provided-v6-lan-public-prefixes>
+										<request-index>1</request-index>
+										<v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+										<v6-lan-public-prefix>2001:1890:12e3:4da::</v6-lan-public-prefix>
+										<v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+									</t-provided-v6-lan-public-prefixes>
+								</v6-public-lan-prefixes>
+							</vr-lan-interface>
+							<routing-protocol>none</routing-protocol>
+						</vr-lan>
+<ucpe-vms-service-information>				
+ <transport-service-information>
+    <transport-service-type>AVPN</transport-service-type>
+	<access-circuit-info>
+	   <access-circuit-id>1</access-circuit-id>
+	   <dual-mode>Active</dual-mode>
+	</access-circuit-info>
+	<access-circuit-info>
+	   <access-circuit-id>2</access-circuit-id>
+	   <dual-mode>Standby</dual-mode>
+	</access-circuit-info>	
+ </transport-service-information>
+ <ucpe-information>
+    <ucpe-host-name>hostname</ucpe-host-name>
+    <ucpe-activation-code>activecode</ucpe-activation-code>
+    <out-of-band-management-modem>OOB</out-of-band-management-modem>
+  </ucpe-information>
+  <vnf-list>
+	<vnf-information> 
+		<vnf-instance-id>1</vnf-instance-id> 
+		<vnf-sequence-number>1</vnf-sequence-number>
+		<vnf-type>ZZ</vnf-type>
+		<vnf-vendor>JUNIPER</vnf-vendor>
+		<vnf-model>MODEL1</vnf-model>
+		<vnf-id>1</vnf-id>
+		<prov-status>1</prov-status>
+		<operational-state>1</operational-state>
+		<orchestration-status>1</orchestration-status>
+		<equipment-role>1</equipment-role>
+    </vnf-information>
+	<vnf-information> 
+		<vnf-instance-id>2</vnf-instance-id> 
+		<vnf-sequence-number>2</vnf-sequence-number>
+		<vnf-type>HY</vnf-type>
+		<vnf-vendor>JUNIPER</vnf-vendor>
+		<vnf-model>MODEL2</vnf-model>
+		<vnf-id>2</vnf-id>
+		<prov-status>2</prov-status>
+		<operational-state>2</operational-state>
+		<orchestration-status>2</orchestration-status>
+		<equipment-role>2</equipment-role>
+    </vnf-information>					
+  </vnf-list>
+ </ucpe-vms-service-information>										
+						<request-information>
+							<request-action>Layer3ServiceActivateRequest</request-action>
+							<order-number>4281555</order-number>
+							<request-id>155415ab-b4a7-4382-b4c6-d17d9sm42855</request-id>
+							<notification-url>https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws</notification-url>
+							<source>OMX</source>
+							<order-version>1</order-version>
+						</request-information>
+						<sdnc-request-header>
+							<svc-action>activate</svc-action>
+							<svc-notification-url>https://localhost:8443/adapters/rest/SDNCNotify</svc-notification-url>
+							<svc-request-id>5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760</svc-request-id>
+						</sdnc-request-header>
+						<l2-homing-information>
+							<topology>MultiPoint</topology>
+							<preferred-aic-clli>MTSNJA4LCP1</preferred-aic-clli>
+							<evc-name>AS/VLXM/003717//SW</evc-name>
+						</l2-homing-information>
+						<service-information>
+							<service-instance-id>FK/VLXM/003717//SW_INTERNET</service-instance-id>
+							<subscriber-name>ST E2E Test42855_1300004281555</subscriber-name>
+							<service-type>SDN-ETHERNET-INTERNET</service-type>
+						</service-information>
+						<internet-service-change-details>
+							<internet-evc-speed-value>10</internet-evc-speed-value>
+							<internet-evc-speed-units>Kbps</internet-evc-speed-units>
+							<t-provided-v4-lan-public-prefixes>
+							   <request-index>1</request-index>
+							   <v4-next-hop-address>192.168.1.15</v4-next-hop-address>
+							   <v4-lan-public-prefix>192.168.1.15</v4-lan-public-prefix>
+							   <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+							</t-provided-v4-lan-public-prefixes>
+							<t-provided-v4-lan-public-prefixes>
+							   <request-index>2</request-index>
+							   <v4-next-hop-address>192.168.1.16</v4-next-hop-address>
+							   <v4-lan-public-prefix>192.168.1.16</v4-lan-public-prefix>
+							   <v4-lan-public-prefix-length>28</v4-lan-public-prefix-length>
+							</t-provided-v4-lan-public-prefixes>
+							<t-provided-v6-lan-public-prefixes>
+							   <request-index>1</request-index>
+							   <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+							   <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+							   <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+							</t-provided-v6-lan-public-prefixes>
+							<t-provided-v6-lan-public-prefixes>
+							   <request-index>1</request-index>
+							   <v6-next-hop-address>2001:1890:12e3:2da::</v6-next-hop-address>
+							   <v6-lan-public-prefix>2001:1890:12e3:2da::</v6-lan-public-prefix>
+							   <v6-lan-public-prefix-length>28</v6-lan-public-prefix-length>
+							</t-provided-v6-lan-public-prefixes>
+						</internet-service-change-details>
+					</service-data>
+				</layer3-service-list>
+</tag0:RequestData>
+"""
+
+def sdncAdapterResponseEmpty =
+"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+   <sdncadapterworkflow:response-data/>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""
+
+def sdncAdapterResponseError =
+"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+                                                 xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1">
+   <sdncadapterworkflow:response-data>
+      <tag0:CallbackHeader>
+         <tag0:RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</tag0:RequestId>
+         <tag0:ResponseCode>404</tag0:ResponseCode>
+         <tag0:ResponseMessage>Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist.]</tag0:ResponseMessage>
+      </tag0:CallbackHeader>
+   </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""
+
+				  								
+	@Test
+	public void testPreProcessRequest() {
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+		when(mockExecution.getVariable("sdncAdapterWorkflowRequest")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.workflow.sdncadapter.callback")).thenReturn("http://someurl.someting.com:28080/mso/sdncAdapterCallbackServiceImpl")
+		when(mockExecution.getVariable("mso.use.qualified.host")).thenReturn("true")
+
+		when(mockExecution.getProcessInstanceId()).thenReturn("745b1b50-e39e-4685-9cc8-c71f0bde8bf0")
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+	
+
+		SDNCAdapter sdncAdapter = new SDNCAdapter()
+		sdncAdapter.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		debugger.printInvocations(mockExecution)
+		
+
+		verify(mockExecution).setVariable("prefix","SDNCA_")
+		verify(mockExecution).setVariable("sdncAdapterResponse","")
+		verify(mockExecution).setVariable("asynchronousResponseTimeout",false)
+		verify(mockExecution).setVariable("continueListening",false)
+		verify(mockExecution).setVariable("BasicAuthHeaderValue","Basic cGFzc3dvcmQ=")
+		verify(mockExecution).setVariable("serviceConfigActivate",false)
+		verify(mockExecution).setVariable("SDNCA_requestId", "745b1b50-e39e-4685-9cc8-c71f0bde8bf0")
+		verify(mockExecution).setVariable("SDNCA_SuccessIndicator",false)
+		verify(mockExecution).setVariable("source","")
+		verify(mockExecution).setVariable("SDNCA_InterimNotify",false)
+		verify(mockExecution).setVariable("sdncAdapterRequest", sdncAdapterRequest)
+	}
+	
+	@Test
+	public void testProcessResponse()
+	{
+		String sdncAdapterCallbackResponse = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(sdncAdapterCallbackResponse)
+		SDNCAdapter sdncAdapter = new SDNCAdapter()
+		sdncAdapter.postProcessResponse(mockExecution)
+		
+//		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+//		debugger.printInvocations(mockExecution)
+		
+		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")
+		verify(mockExecution).setVariable("enhancedCallbackRequestData",enhancedCallbackRequestData)
+		verify(mockExecution).setVariable("sdncAdapterResponse",workflowResponse)
+		verify(mockExecution).setVariable("continueListening",false)
+
+	}	
+	
+	@Test
+	public void testProcessResponse_ErrorCase_404()
+	{
+		String sdncAdapterCallbackErrorResponse = FileUtil.readResourceFile("sdncadaptercallbackrequest_404CallBack.xml");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(sdncAdapterCallbackErrorResponse)
+		SDNCAdapter sdncAdapter = new SDNCAdapter()
+		sdncAdapter.postProcessResponse(mockExecution)
+		
+		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")
+		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponseError)
+		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")
+		verify(mockExecution).setVariable("continueListening",false)
+		
+	}
+	
+	@Test
+	public void testProcessResponse_ErrorCase_InvalidCallback()
+	{
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn("<h1>Service Unavailable</h1>")
+		SDNCAdapter sdncAdapter = new SDNCAdapter()
+		sdncAdapter.postProcessResponse(mockExecution)
+		
+		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")
+		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponseEmpty)
+		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")
+		verify(mockExecution).setVariable("continueListening",false)
+
+	}
+	
+	@Test
+	public void postProcessResponse()
+	{
+		
+		String SDNCAdapterCallbackRequest = 
+		"""<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<SDNCAdapterCallbackRequest
+	xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
+	<CallbackHeader>
+		<RequestId>3bb02798-b344-4d28-9bca-1f029954d1c9</RequestId>
+		<ResponseCode>404</ResponseCode>
+		<ResponseMessage>Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/85%2FCSIP%2F141203%2FPT_CSI9999998693.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist ]</ResponseMessage>
+	</CallbackHeader>
+</SDNCAdapterCallbackRequest>"""
+		
+		String sdncAdapterResponse =
+		"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+                                                 xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1">
+   <sdncadapterworkflow:response-data>
+      <tag0:CallbackHeader>
+         <tag0:RequestId>3bb02798-b344-4d28-9bca-1f029954d1c9</tag0:RequestId>
+         <tag0:ResponseCode>404</tag0:ResponseCode>
+         <tag0:ResponseMessage>Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/85%2FCSIP%2F141203%2FPT_CSI9999998693.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist ]</tag0:ResponseMessage>
+      </tag0:CallbackHeader>
+   </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""
+
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("sdncAdapterCallbackRequest")).thenReturn(SDNCAdapterCallbackRequest)
+		SDNCAdapter sdncAdapter = new SDNCAdapter()
+		sdncAdapter.postProcessResponse(mockExecution)
+		
+		verify(mockExecution,times(2)).getVariable("sdncAdapterCallbackRequest")
+		verify(mockExecution).setVariable("sdncAdapterResponse", sdncAdapterResponse)
+		verify(mockExecution).setVariable("enhancedCallbackRequestData", "")
+		verify(mockExecution).setVariable("continueListening",false)
+
+	}
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
index 161b71cb9c..803e2b03a3 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
@@ -1,213 +1,191 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts;

-

-import static org.junit.Assert.*;

-import static org.mockito.Mockito.*

-

-import org.junit.Before

-import org.junit.Ignore

-import org.junit.Test

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

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.delegate.DelegateExecution

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

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-

-import org.openecomp.mso.bpmn.mock.FileUtil

-

-public class SDNCAdapterUtilsTest {

-	

-	private def map

-	private ExecutionEntity svcex

-	private WorkflowException wfex

-	private AbstractServiceTaskProcessor tp

-	private String resp

-	private SDNCAdapterUtils utils

-	

-	@Before

-	public void init()

-	{

-		map = new HashMap<String,Object>()

-		svcex = mock(ExecutionEntity.class)

-		wfex = null

-		tp = new AbstractServiceTaskProcessor() {

-			@Override

-			public void preProcessRequest(DelegateExecution execution) {

-			}

-		};

-		utils = new SDNCAdapterUtils(tp)

-		

-		// svcex gets its variables from "map"

-		when(svcex.getVariable(any())).thenAnswer(

-			{ invocation ->

-				return map.get(invocation.getArgumentAt(0, String.class)) })

-		

-		// svcex puts its variables into "map"

-		when(svcex.setVariable(any(), any())).thenAnswer(

-			{ invocation ->

-				return map.put(

-							invocation.getArgumentAt(0, String.class),

-							invocation.getArgumentAt(1, String.class)) })

-		

-		map.put("isDebugLogEnabled", "true")

-		map.put("prefix", "mypfx-")

-		map.put("testProcessKey", "mykey")

-	}

-				  								

-	@Test

-	public void testValidateSDNCResponse_Success_NoCode() {

-		resp = """<no-response/>"""

-		

-		utils.validateSDNCResponse(svcex, resp, wfex, true)

-		

-		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))

-		assertEquals("0", map.get("mypfx-sdncRequestDataResponseCode"))

-		assertFalse(map.containsKey("WorkflowException"))

-	}

-				  								

-	@Test

-	public void testValidateSDNCResponse_200() {

-		utils.validateSDNCResponse(svcex, makeResp("200", "OK", ""), wfex, true)

-		

-		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))

-		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))

-		assertFalse(map.containsKey("WorkflowException"))

-	}

-				  								

-	@Test

-	public void testValidateSDNCResponse_408() {

-		try {

-			utils.validateSDNCResponse(svcex, makeResp("408", "failed", ""), wfex, true)

-			

-			// this has been commented out as, currently, the code doesn't

-			// throw an exception in this case

-//			fail("missing exception")

-			

-		} catch(BpmnError ex) {

-			ex.printStackTrace()

-		}

-		

-		assertEquals(false, map.get("mypfx-sdncResponseSuccess"))

-		assertEquals("408", map.get("mypfx-sdncRequestDataResponseCode"))

-		

-		wfex = map.get("WorkflowException")

-		assertNotNull(wfex)

-		

-		assertEquals(5320, wfex.getErrorCode())

-		assertEquals("Received error from SDN-C: failed", wfex.getErrorMessage())

-	}

-				  								

-	@Test

-	public void testValidateSDNCResponse_408_200() {

-		

-		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "ok")), wfex, true)

-		

-		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))

-		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		

-		assertFalse(map.containsKey("WorkflowException"))

-	}

-

-	@Ignore // 1802 merge				  								

-	@Test

-	public void testValidateSDNCResponse_408_200_WithEmbeddedLt() {

-		

-		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "<success> message")), wfex, true)

-		

-		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))

-		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		

-		assertFalse(map.containsKey("WorkflowException"))

-	}

-	

-	@Test

-	public void testUpdateHomingInfo() {

-		String actual = utils.updateHomingInfo(null, "AIC3.0")

-		println actual

-		assertEquals("<l2-homing-information><aic-version>AIC3.0</aic-version></l2-homing-information>", actual)

-	}

-	

-	@Test

-	public void testUpdateHomingInfo2() {

-		String homingInfo = "<l2-homing-information><preferred-aic-clli>TESTCLLI</preferred-aic-clli></l2-homing-information>" 

-		String actual = utils.updateHomingInfo(homingInfo, "AIC3.0")

-		println actual

-		assertEquals("<l2-homing-information><preferred-aic-clli>TESTCLLI</preferred-aic-clli><aic-version>AIC3.0</aic-version></l2-homing-information>", actual)

-	}

-	

-	@Ignore // 1802 merge - testing method that doesn't exist

-	@Test

-	public void testUpdateServiceInfo() {

-		String actual = utils.updateServiceInfo(null, "96688f6f-ab06-4ef6-ae55-9d3af28ae909")

-		println actual

-		assertEquals("<service-information><infra-service-instance-id>96688f6f-ab06-4ef6-ae55-9d3af28ae909</infra-service-instance-id></service-information>", actual)

-	}

-	

-	@Ignore // 1802 merge - testing method that doesn't exist

-	@Test

-	public void testUpdateServiceInfo2() {

-		String serviceInfo = "<service-information><service-type>SDN-ETHERNET-INTERNET</service-type><service-instance-id>MIS/1602/00029/SB_INTERNET</service-instance-id></service-information>"

-		String actual = utils.updateServiceInfo(serviceInfo, "96688f6f-ab06-4ef6-ae55-9d3af28ae909")

-		println actual

-		assertEquals("<service-information><service-type>SDN-ETHERNET-INTERNET</service-type><service-instance-id>MIS/1602/00029/SB_INTERNET</service-instance-id><infra-service-instance-id>96688f6f-ab06-4ef6-ae55-9d3af28ae909</infra-service-instance-id></service-information>", actual)

-	}

-	

-	private String makeResp(String respcode, String respmsg, String reqdata) {

-		def rc = encodeXml(respcode)

-		def rm = encodeXml(respmsg)

-		

-		return """

-<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-   <sdncadapterworkflow:response-data>

-      <tag0:CallbackHeader>

-         <tag0:RequestId>myreq</tag0:RequestId>

-         <tag0:ResponseCode>${rc}</tag0:ResponseCode>

-         <tag0:ResponseMessage>${rm}</tag0:ResponseMessage>

-      </tag0:CallbackHeader>

-	  ${reqdata}

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>

-"""

-	

-	}

-	

-	private String makeReq(String respcode, String respmsg) {

-		def rc = encodeXml(respcode)

-		def rm = encodeXml(respmsg)

-		

-		def output = """

-<output xmlns="org:onap:sdnc:northbound:generic-resource">

-		<svc-request-id>8b46e36e-b44f-4085-9404-427be1bc8a3</svc-request-id>

-		<response-code>${rc}</response-code>

-		<response-message>${rm}</response-message>

-		<ack-final-indicator>Y</ack-final-indicator>

-</output>

-"""

-		output = encodeXml(output)

-		

-		return """<tag0:RequestData xsi:type="xs:string">${output}</tag0:RequestData>"""

-	}

-	

-	private String encodeXml(String txt) {

-		return txt.replace("&", "&amp;").replace("<", "&lt;")

-	}

-}

+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
+
+import org.onap.so.bpmn.mock.FileUtil
+
+public class SDNCAdapterUtilsTest {
+	
+	private def map
+	private ExecutionEntity svcex
+	private WorkflowException wfex
+	private AbstractServiceTaskProcessor tp
+	private String resp
+	private SDNCAdapterUtils utils
+	
+	@Before
+	public void init()
+	{
+		map = new HashMap<String,Object>()
+		svcex = mock(ExecutionEntity.class)
+		wfex = null
+		tp = new AbstractServiceTaskProcessor() {
+			@Override
+			public void preProcessRequest(DelegateExecution execution) {
+			}
+		};
+		utils = new SDNCAdapterUtils(tp)
+		
+		// svcex gets its variables from "map"
+		when(svcex.getVariable(any())).thenAnswer(
+			{ invocation ->
+				return map.get(invocation.getArgumentAt(0, String.class)) })
+		
+		// svcex puts its variables into "map"
+		when(svcex.setVariable(any(), any())).thenAnswer(
+			{ invocation ->
+				return map.put(
+							invocation.getArgumentAt(0, String.class),
+							invocation.getArgumentAt(1, String.class)) })
+		
+		map.put("isDebugLogEnabled", "true")
+		map.put("prefix", "mypfx-")
+		map.put("testProcessKey", "mykey")
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_Success_NoCode() {
+		resp = """<no-response/>"""
+		
+		utils.validateSDNCResponse(svcex, resp, wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("0", map.get("mypfx-sdncRequestDataResponseCode"))
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_200() {
+		utils.validateSDNCResponse(svcex, makeResp("200", "OK", ""), wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408() {
+		try {
+			utils.validateSDNCResponse(svcex, makeResp("408", "failed", ""), wfex, true)
+			
+			// this has been commented out as, currently, the code doesn't
+			// throw an exception in this case
+//			fail("missing exception")
+			
+		} catch(BpmnError ex) {
+			ex.printStackTrace()
+		}
+		
+		assertEquals(false, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("408", map.get("mypfx-sdncRequestDataResponseCode"))
+		
+		wfex = map.get("WorkflowException")
+		assertNotNull(wfex)
+		
+		assertEquals(5320, wfex.getErrorCode())
+		assertEquals("Received error from SDN-C: failed", wfex.getErrorMessage())
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408_200() {
+		
+		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "ok")), wfex, true)
+		
+		assertEquals(true	, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408_200_WithEmbeddedLt() {
+		
+		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "<success> message")), wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+	
+	@Test
+	public void testUpdateHomingInfo() {
+		String actual = utils.updateHomingInfo(null, "AIC3.0")
+		println actual
+		assertEquals("<l2-homing-information><aic-version>AIC3.0</aic-version></l2-homing-information>", actual)
+	}
+	
+	@Test
+	public void testUpdateHomingInfo2() {
+		String homingInfo = "<l2-homing-information><preferred-aic-clli>TESTCLLI</preferred-aic-clli></l2-homing-information>" 
+		String actual = utils.updateHomingInfo(homingInfo, "AIC3.0")
+		println actual
+		assertEquals("<l2-homing-information><preferred-aic-clli>TESTCLLI</preferred-aic-clli><aic-version>AIC3.0</aic-version></l2-homing-information>", actual)
+	}
+	
+	private String makeResp(String respcode, String respmsg, String reqdata) {
+		def rc = respcode
+		def rm = respmsg
+		
+		return """
+<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+                                                 xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1"
+                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <sdncadapterworkflow:response-data>
+      <tag0:CallbackHeader>
+         <tag0:RequestId>myreq</tag0:RequestId>
+         <tag0:ResponseCode>${MsoUtils.xmlEscape(rc)}</tag0:ResponseCode>
+         <tag0:ResponseMessage>${MsoUtils.xmlEscape(rm)}</tag0:ResponseMessage>
+      </tag0:CallbackHeader>
+	  ${reqdata}
+   </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
+"""
+	
+	}
+	
+	private String makeReq(String respcode, String respmsg) {
+		def rc = respcode
+		def rm = respmsg
+		
+		def output = """
+<output xmlns="org:onap:sdnc:northbound:generic-resource">
+		<svc-request-id>8b46e36e-b44f-4085-9404-427be1bc8a3</svc-request-id>
+		<response-code>${MsoUtils.xmlEscape(rc)}</response-code>
+		<response-message>${MsoUtils.xmlEscape(rm)}</response-message>
+		<ack-final-indicator>Y</ack-final-indicator>
+</output>
+"""
+		output = output
+		
+		return """<tag0:RequestData xsi:type="xs:string">${MsoUtils.xmlEscape(output)}</tag0:RequestData>"""
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1Test.groovy
new file mode 100644
index 0000000000..b093aaa491
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1Test.groovy
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.core.domain.AllottedResource
+import org.onap.so.bpmn.core.domain.ModelInfo
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.domain.VnfResource
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class SniroHomingV1Test {
+    String subsInfo = "{\"globalSubscriberId\": \"SUB12_0322_DS_1201\",\"subscriberCommonSiteId\": \"DALTX0101\",\"subscriberName\": \"SUB_12_0322_DS_1201\"}"
+    ServiceDecomposition serviceDecomp
+
+    {
+        serviceDecomp = new ServiceDecomposition("{\"serviceResources\":{}}", "123")
+        ModelInfo modelInfo = new ModelInfo()
+        serviceDecomp.modelInfo = modelInfo
+
+        AllottedResource allottedResource = new AllottedResource()
+        allottedResource.setModelInfo(modelInfo)
+        List allottedResourceList = new ArrayList()
+        allottedResourceList.add(allottedResource)
+
+        VnfResource vnfResource = new VnfResource()
+        vnfResource.setModelInfo(modelInfo)
+        List vnfResourceList = new ArrayList()
+        vnfResourceList.add(vnfResource)
+
+        serviceDecomp.serviceAllottedResources = allottedResourceList
+        serviceDecomp.setVnfResources(vnfResourceList)
+    }
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    @Test
+    public void testCallSniro() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("msoRequestId")).thenReturn("12345")
+        when(mockExecution.getVariable("serviceInstanceId")).thenReturn("12345")
+        when(mockExecution.getVariable("subscriberInfo")).thenReturn(subsInfo)
+        when(mockExecution.getVariable("serviceDecomposition")).thenReturn(serviceDecomp)
+        when(mockExecution.getVariable("mso.sniro.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+        when(mockExecution.getVariable("mso.adapters.workflow.message.endpoint")).thenReturn('http://localhost:18080/workflows/messages/message/')
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.endpoint")).thenReturn("/sniro")
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.host")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.GenericPutVnf.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+
+        SniroHomingV1 obj = new SniroHomingV1()
+        obj.callSniro(mockExecution)
+
+        Mockito.verify(mockExecution, times(10)).setVariable(captor.capture(), captor.capture())
+        Assert.assertEquals(200, captor.getAllValues().get(17))
+
+    }
+
+    @Test
+    public void testCallSniroMissingAuth() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("msoRequestId")).thenReturn("12345")
+        when(mockExecution.getVariable("serviceInstanceId")).thenReturn("12345")
+        when(mockExecution.getVariable("subscriberInfo")).thenReturn(subsInfo)
+        when(mockExecution.getVariable("serviceDecomposition")).thenReturn(serviceDecomp)
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+        when(mockExecution.getVariable("mso.adapters.workflow.message.endpoint")).thenReturn('http://localhost:18080/workflows/messages/message/')
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.endpoint")).thenReturn("/sniro")
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.host")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.GenericPutVnf.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+
+        try {
+            SniroHomingV1 obj = new SniroHomingV1()
+            obj.callSniro(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+        Mockito.verify(mockExecution, times(4)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(401, workflowException.getErrorCode())
+        Assert.assertEquals("Internal Error - BasicAuth value null", workflowException.getErrorMessage())
+    }
+
+    @Test
+    public void testCallSniroHostNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("msoRequestId")).thenReturn("12345")
+        when(mockExecution.getVariable("serviceInstanceId")).thenReturn("12345")
+        when(mockExecution.getVariable("subscriberInfo")).thenReturn(subsInfo)
+        when(mockExecution.getVariable("serviceDecomposition")).thenReturn(serviceDecomp)
+        when(mockExecution.getVariable("mso.sniro.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+        when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+        when(mockExecution.getVariable("mso.adapters.workflow.message.endpoint")).thenReturn('http://localhost:18080/workflows/messages/message/')
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.endpoint")).thenReturn("/sniro")
+        when(mockExecution.getVariable("mso.service.agnostic.sniro.host")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.GenericPutVnf.aai.generic-vnf.uri")).thenReturn("/aai/v9/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+
+        mockData()
+        try {
+            SniroHomingV1 obj = new SniroHomingV1()
+            obj.callSniro(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+        Mockito.verify(mockExecution, times(9)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getValue()
+        Assert.assertEquals(2500, workflowException.getErrorCode())
+        Assert.assertEquals("Internal Error - Occured in Homing CallSniro: org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("Homing")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("Homing")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("Homing")
+        when(mockExecution.getProcessInstanceId()).thenReturn("Homing")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+
+    private static void mockData() {
+        stubFor(post(urlMatching(".*/sniro"))
+                .willReturn(aResponse()
+                .withStatus(200)
+                .withBody("")))
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/TrinityExceptionUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
index 203f11a42e..52f59a3fad 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/TrinityExceptionUtilTest.groovy
@@ -1,201 +1,201 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts

-

-import org.junit.Assert

-import org.junit.Ignore

-import org.junit.runner.RunWith;

-import org.mockito.runners.MockitoJUnitRunner;

-

-

-

-import static org.mockito.Mockito.*

-

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.junit.Before

-import org.junit.runner.RunWith

-import org.mockito.MockitoAnnotations

-import org.mockito.internal.debugging.MockitoDebuggerImpl

-import org.mockito.runners.MockitoJUnitRunner

-import org.openecomp.mso.bpmn.common.scripts.TrinityExceptionUtil;

-@RunWith(MockitoJUnitRunner.class)

-import org.junit.Test

-

-class TrinityExceptionUtilTest {

-	

-	def aotsFault ="""<n1:Fault xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:n1="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd" xmlns:cer="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/ErrorResponse.xsd" xsi:schemaLocation="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd SoapFault-CDM.xsd">

-	<n1:faultcode>xml:space</n1:faultcode>

-	<n1:faultstring>String</n1:faultstring>

-	<n1:faultactor>http://test.com</n1:faultactor>

-	<n1:detail>

-		<n1:CSIApplicationException>

-			<cer:Response>

-				<cer:code>400</cer:code>

-				<cer:description>bad stuff</cer:description>

-			</cer:Response>

-			<cer:ServiceProviderEntity>

-				<cer:reportingServiceEntity>String</cer:reportingServiceEntity>

-				<cer:faultDate>*** ERROR ***</cer:faultDate>

-				<cer:faultSequenceNumber>String</cer:faultSequenceNumber>

-				<cer:faultLevel>String</cer:faultLevel>

-				<cer:faultCode>String</cer:faultCode>

-				<cer:faultDescription>String</cer:faultDescription>

-				<cer:ServiceProviderRawError>

-					<cer:code>String</cer:code>

-					<cer:description>String</cer:description>

-					<cer:BISError>

-						<cer:code>String</cer:code>

-						<cer:description>String</cer:description>

-						<cer:origination>String</cer:origination>

-						<cer:severity>String</cer:severity>

-					</cer:BISError>

-				</cer:ServiceProviderRawError>

-			</cer:ServiceProviderEntity>

-		</n1:CSIApplicationException>

-		<n1:CSIInternalException>

-			<cer:reportingServiceEntity>String</cer:reportingServiceEntity>

-			<cer:faultDate>*** ERROR ***</cer:faultDate>

-			<cer:faultSequenceNumber>String</cer:faultSequenceNumber>

-			<cer:faultLevel>String</cer:faultLevel>

-			<cer:faultCode>String</cer:faultCode>

-			<cer:faultDescription>String</cer:faultDescription>

-			<cer:cingularErrorCode>String</cer:cingularErrorCode>

-			<cer:cingularErrorDescription>String</cer:cingularErrorDescription>

-			<cer:cingularErrorCategory>String</cer:cingularErrorCategory>

-		</n1:CSIInternalException>

-	</n1:detail>

-</n1:Fault>"""

-

-	

-	@Before

-	public void init()

-	{

-		MockitoAnnotations.initMocks(this)

-	}

-	

-	@Test

-	@Ignore

-	public void testMapAAIExceptionTCommonException() {

-		

-		

-		

-		String restFault = """

-				<Fault>

-<requestError>

-<serviceException>

-<messageId>SVC3002</messageId>

-<text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text>

-<variables>

-<variable>PUTcustomer</variable>

-<variable>SubName01</variable>

-<variable>Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id]</variable>

-<variable>ERR.5.4.5105</variable>

-</variables>

-</serviceException>

-</requestError>

-</Fault>

-			"""	

-		def errorString = """<requestError>

-<serviceException>

-<messageId>SVC3002</messageId>

-<text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text>

-<variables>

-<variable>PUTcustomer</variable>

-<variable>SubName01</variable>

-<variable>Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id]</variable>

-<variable>ERR.5.4.5105</variable>

-</variables>

-</serviceException>

-</requestError>""" as String

-

-

-			

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-

-		TrinityExceptionUtil util = new TrinityExceptionUtil()

-		Assert.assertEquals(errorString, util.mapAAIExceptionTCommonException(restFault, mockExecution))

-	}

-	

-	

-	

-	

-	@Test

-	public void testBuildException() {				

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("prefix")).thenReturn("test_")

-		when(mockExecution.getVariable("test_ResponseCode")).thenReturn("400")

-		ArrayList msgVars = new ArrayList()

-		msgVars.add("var1")

-		msgVars.add("var2")

-		when(mockExecution.getVariable("test_errVariables")).thenReturn(msgVars)

-

-		

-		TrinityExceptionUtil util = new TrinityExceptionUtil()

-		String msg = "Bad request"

-		String errorString = """<tns:requestError xmlns:tns="http://org.openecomp/mso/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.openecomp/mso/request/types/v1 MsoServiceInstanceTypesV1.xsd">

-	<tns:serviceException>

-		<tns:messageId>SVC2000</tns:messageId>

-		<tns:text>The following service error occurred: %1. Error code is %2.</tns:text>

-			<tns:variables>var1</tns:variables>

-			<tns:variables>var2</tns:variables>

-	</tns:serviceException>

-</tns:requestError>"""

-		Assert.assertEquals(errorString, util.buildException(msg, mockExecution))

-	}

-	

-	@Test

-	public void testMapAOTSExecptionToCommonException() {

-		ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-		when(mockExecution.getVariable("prefix")).thenReturn("test_")

-		when(mockExecution.getVariable("test_ResponseCode")).thenReturn("400")

-		

-		TrinityExceptionUtil util = new TrinityExceptionUtil()

-		String errorString = """<tns:requestError xmlns:tns="http://org.openecomp/mso/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.openecomp/mso/request/types/v1 MsoServiceInstanceTypesV1.xsd">

-	<tns:serviceException>

-		<tns:messageId>SVC2000</tns:messageId>

-		<tns:text>The following service error occurred: %1. Error code is %2.</tns:text>

-			<tns:variables>Received error from AOTS: bad stuff</tns:variables>

-			<tns:variables>400</tns:variables>

-	</tns:serviceException>

-</tns:requestError>"""

-		Assert.assertEquals(errorString, util.mapAOTSExecptionToCommonException(aotsFault, mockExecution))

-	}

-	

-	

-	@Test

-	public void testParseError() {

-	ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-	String errorString = "The following service error occurred: %1. Error code is %2."

-	ArrayList msgVars = new ArrayList()

-	msgVars.add("var1")

-	msgVars.add("var2")

-	when(mockExecution.getVariable("prefix")).thenReturn("test_")

-	when(mockExecution.getVariable("test_errTxt")).thenReturn(errorString)

-	when(mockExecution.getVariable("test_errVariables")).thenReturn(msgVars)

-		

-	TrinityExceptionUtil util = new TrinityExceptionUtil()

-

-	Assert.assertEquals("The following service error occurred: var1. Error code is var2.", util.parseError(mockExecution))

-}

-

-	

-	

-}

+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common.scripts
+
+import org.junit.Assert
+import org.junit.Ignore
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+
+
+import static org.mockito.Mockito.*
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.common.scripts.TrinityExceptionUtil;
+@RunWith(MockitoJUnitRunner.class)
+import org.junit.Test
+
+class TrinityExceptionUtilTest {
+	
+	def aotsFault ="""<n1:Fault xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:n1="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd" xmlns:cer="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/ErrorResponse.xsd" xsi:schemaLocation="http://csi.cingular.com/CSI/Namespaces/OneTicketingSystem/InfrastructureCommon/Types/Public/SoapFault.xsd SoapFault-CDM.xsd">
+	<n1:faultcode>xml:space</n1:faultcode>
+	<n1:faultstring>String</n1:faultstring>
+	<n1:faultactor>http://test.com</n1:faultactor>
+	<n1:detail>
+		<n1:CSIApplicationException>
+			<cer:Response>
+				<cer:code>400</cer:code>
+				<cer:description>bad stuff</cer:description>
+			</cer:Response>
+			<cer:ServiceProviderEntity>
+				<cer:reportingServiceEntity>String</cer:reportingServiceEntity>
+				<cer:faultDate>*** ERROR ***</cer:faultDate>
+				<cer:faultSequenceNumber>String</cer:faultSequenceNumber>
+				<cer:faultLevel>String</cer:faultLevel>
+				<cer:faultCode>String</cer:faultCode>
+				<cer:faultDescription>String</cer:faultDescription>
+				<cer:ServiceProviderRawError>
+					<cer:code>String</cer:code>
+					<cer:description>String</cer:description>
+					<cer:BISError>
+						<cer:code>String</cer:code>
+						<cer:description>String</cer:description>
+						<cer:origination>String</cer:origination>
+						<cer:severity>String</cer:severity>
+					</cer:BISError>
+				</cer:ServiceProviderRawError>
+			</cer:ServiceProviderEntity>
+		</n1:CSIApplicationException>
+		<n1:CSIInternalException>
+			<cer:reportingServiceEntity>String</cer:reportingServiceEntity>
+			<cer:faultDate>*** ERROR ***</cer:faultDate>
+			<cer:faultSequenceNumber>String</cer:faultSequenceNumber>
+			<cer:faultLevel>String</cer:faultLevel>
+			<cer:faultCode>String</cer:faultCode>
+			<cer:faultDescription>String</cer:faultDescription>
+			<cer:cingularErrorCode>String</cer:cingularErrorCode>
+			<cer:cingularErrorDescription>String</cer:cingularErrorDescription>
+			<cer:cingularErrorCategory>String</cer:cingularErrorCategory>
+		</n1:CSIInternalException>
+	</n1:detail>
+</n1:Fault>"""
+
+	
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+	}
+	
+	@Test
+	@Ignore
+	public void testMapAAIExceptionTCommonException() {
+		
+		
+		
+		String restFault = """
+				<Fault>
+<requestError>
+<serviceException>
+<messageId>SVC3002</messageId>
+<text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text>
+<variables>
+<variable>PUTcustomer</variable>
+<variable>SubName01</variable>
+<variable>Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id]</variable>
+<variable>ERR.5.4.5105</variable>
+</variables>
+</serviceException>
+</requestError>
+</Fault>
+			"""	
+		def errorString = """<requestError>
+<serviceException>
+<messageId>SVC3002</messageId>
+<text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text>
+<variables>
+<variable>PUTcustomer</variable>
+<variable>SubName01</variable>
+<variable>Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id]</variable>
+<variable>ERR.5.4.5105</variable>
+</variables>
+</serviceException>
+</requestError>""" as String
+
+
+			
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+
+		TrinityExceptionUtil util = new TrinityExceptionUtil()
+		Assert.assertEquals(errorString, util.mapAAIExceptionTCommonException(restFault, mockExecution))
+	}
+	
+	
+	
+	
+	@Test
+	public void testBuildException() {				
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("test_")
+		when(mockExecution.getVariable("test_ResponseCode")).thenReturn("400")
+		ArrayList msgVars = new ArrayList()
+		msgVars.add("var1")
+		msgVars.add("var2")
+		when(mockExecution.getVariable("test_errVariables")).thenReturn(msgVars)
+
+		
+		TrinityExceptionUtil util = new TrinityExceptionUtil()
+		String msg = "Bad request"
+		String errorString = """<tns:requestError xmlns:tns="http://org.onap/so/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.onap/so/request/types/v1 MsoServiceInstanceTypesV1.xsd">
+	<tns:serviceException>
+		<tns:messageId>SVC2000</tns:messageId>
+		<tns:text>The following service error occurred: %1. Error code is %2.</tns:text>
+			<tns:variables>var1</tns:variables>
+			<tns:variables>var2</tns:variables>
+	</tns:serviceException>
+</tns:requestError>"""
+		Assert.assertEquals(errorString, util.buildException(msg, mockExecution))
+	}
+	
+	@Test
+	public void testMapAOTSExecptionToCommonException() {
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("test_")
+		when(mockExecution.getVariable("test_ResponseCode")).thenReturn("400")
+		
+		TrinityExceptionUtil util = new TrinityExceptionUtil()
+		String errorString = """<tns:requestError xmlns:tns="http://org.onap/so/request/types/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.onap/so/request/types/v1 MsoServiceInstanceTypesV1.xsd">
+	<tns:serviceException>
+		<tns:messageId>SVC2000</tns:messageId>
+		<tns:text>The following service error occurred: %1. Error code is %2.</tns:text>
+			<tns:variables>Received error from AOTS: bad stuff</tns:variables>
+			<tns:variables>400</tns:variables>
+	</tns:serviceException>
+</tns:requestError>"""
+		Assert.assertEquals(errorString, util.mapAOTSExecptionToCommonException(aotsFault, mockExecution))
+	}
+	
+	
+	@Test
+	public void testParseError() {
+	ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+	String errorString = "The following service error occurred: %1. Error code is %2."
+	ArrayList msgVars = new ArrayList()
+	msgVars.add("var1")
+	msgVars.add("var2")
+	when(mockExecution.getVariable("prefix")).thenReturn("test_")
+	when(mockExecution.getVariable("test_errTxt")).thenReturn(errorString)
+	when(mockExecution.getVariable("test_errVariables")).thenReturn(msgVars)
+		
+	TrinityExceptionUtil util = new TrinityExceptionUtil()
+
+	Assert.assertEquals("The following service error occurred: var1. Error code is var2.", util.parseError(mockExecution))
+}
+
+	
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnfTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnfTest.groovy
new file mode 100644
index 0000000000..e0166f3602
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnfTest.groovy
@@ -0,0 +1,172 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.mock.FileUtil
+import org.onap.so.bpmn.mock.StubResponseAAI
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static org.mockito.Matchers.any
+import static org.mockito.Matchers.refEq
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class UpdateAAIGenericVnfTest {
+
+    String getVfModuleResponse = FileUtil.readResourceFile("__files/VfModularity/GenericVnf.xml")
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Before
+    void init() throws IOException {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void testGetGenericVnf() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("UAAIGenVnf_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIGenericVnf.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        UpdateAAIGenericVnf obj = new UpdateAAIGenericVnf()
+        obj.getGenericVnf(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_getGenericVnfResponseCode", 200)
+    }
+
+    @Test
+    void testGetGenericVnfEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("UAAIGenVnf_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIGenericVnf.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            UpdateAAIGenericVnf obj = new UpdateAAIGenericVnf()
+            obj.getGenericVnf(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        WorkflowException exception = new WorkflowException("UpdateAAIGenericVnf", 9999, "org.apache.http.client.ClientProtocolException")
+        Mockito.verify(mockExecution).setVariable("WorkflowException", refEq(exception, any(WorkflowException.class)))
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_getGenericVnfResponseCode", 500)
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_getGenericVnfResponse", "AAI GET Failed:null")
+    }
+
+    @Test
+    void testUpdateGenericVnf() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("UAAIGenVnf_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("UAAIGenVnf_getGenericVnfResponse")).thenReturn(getVfModuleResponse)
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIGenericVnf.aai.version")).thenReturn('8')
+
+        stubFor(patch(urlMatching(".*/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+                .willReturn(aResponse()
+                .withStatus(200)))
+        UpdateAAIGenericVnf obj = new UpdateAAIGenericVnf()
+        obj.updateGenericVnf(mockExecution)
+
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_updateGenericVnfResponseCode", 200)
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_updateGenericVnfResponse", "")
+    }
+
+    @Test
+    void testUpdateGenericVnfEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable("UAAIGenVnf_vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable("UAAIGenVnf_getGenericVnfResponse")).thenReturn(getVfModuleResponse)
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIGenericVnf.aai.version")).thenReturn('8')
+
+        stubFor(patch(urlMatching(".*/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))
+                .willReturn(aResponse()
+                .withStatus(200)))
+
+        try {
+            UpdateAAIGenericVnf obj = new UpdateAAIGenericVnf()
+            obj.updateGenericVnf(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+        WorkflowException exception = new WorkflowException("UpdateAAIGenericVnf", 9999, "org.apache.http.client.ClientProtocolException")
+        Mockito.verify(mockExecution).setVariable("WorkflowException", refEq(exception, any(WorkflowException.class)))
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_updateGenericVnfResponseCode", 500)
+        Mockito.verify(mockExecution).setVariable("UAAIGenVnf_updateGenericVnfResponse", "AAI PATCH Failed:null")
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("UpdateAAIGenericVnf")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("UpdateAAIGenericVnf")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("UpdateAAIGenericVnf")
+        when(mockExecution.getProcessInstanceId()).thenReturn("UpdateAAIGenericVnf")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIVfModuleTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIVfModuleTest.groovy
new file mode 100644
index 0000000000..d2f9095e2d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIVfModuleTest.groovy
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Captor
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.core.WorkflowException
+import org.onap.so.bpmn.mock.FileUtil
+import org.onap.so.bpmn.mock.StubResponseAAI
+
+import static org.mockito.Mockito.*
+
+@RunWith(MockitoJUnitRunner.class)
+@Ignore
+class UpdateAAIVfModuleTest {
+    def prefix = "UAAIVfMod_"
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(28090)
+
+    @Captor
+    static ArgumentCaptor<ExecutionEntity> captor = ArgumentCaptor.forClass(ExecutionEntity.class)
+
+    @Before
+    void init() throws IOException {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    void testGetVfModule() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        UpdateAAIVfModule obj = new UpdateAAIVfModule()
+        obj.getVfModule(mockExecution)
+
+        verify(mockExecution).setVariable(prefix + "getVfModuleResponseCode", 200)
+    }
+
+    @Test
+    void testGetVfModuleEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            UpdateAAIVfModule obj = new UpdateAAIVfModule()
+            obj.getVfModule(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(3)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getAllValues().get(1)
+        Assert.assertEquals(9999, workflowException.getErrorCode())
+        Assert.assertEquals("org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    @Test
+    void testUpdateVfModule() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn("http://localhost:28090")
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        String getVfModuleResponse = FileUtil.readResourceFile("__files/VfModularity/GenericVnf.xml")
+        when(mockExecution.getVariable(prefix + "getVfModuleResponse")).thenReturn(getVfModuleResponse)
+        StubResponseAAI.MockAAIVfModule()
+        UpdateAAIVfModule obj = new UpdateAAIVfModule()
+        obj.updateVfModule(mockExecution)
+
+        verify(mockExecution).setVariable(prefix + "updateVfModuleResponseCode", 200)
+    }
+
+    @Test
+    void testUpdateVfModuleEndpointNull() {
+        ExecutionEntity mockExecution = setupMock()
+        when(mockExecution.getVariable("prefix")).thenReturn(prefix)
+        when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+        when(mockExecution.getVariable(prefix + "vnfId")).thenReturn("skask")
+        when(mockExecution.getVariable(prefix + "vfModuleId")).thenReturn("supercool")
+        when(mockExecution.getVariable("mso.workflow.default.aai.v8.generic-vnf.uri")).thenReturn("/aai/v8/network/generic-vnfs/generic-vnf")
+        when(mockExecution.getVariable("aai.endpoint")).thenReturn(null)
+        when(mockExecution.getVariable("mso.workflow.global.default.aai.namespace")).thenReturn("http://org.openecomp.aai.inventory/")
+        when(mockExecution.getVariable("mso.workflow.custom.UpdateAAIVfModule.aai.version")).thenReturn('8')
+
+        String getVfModuleResponse = FileUtil.readResourceFile("__files/VfModularity/GenericVnf.xml")
+        when(mockExecution.getVariable(prefix + "getVfModuleResponse")).thenReturn(getVfModuleResponse)
+        StubResponseAAI.MockAAIVfModule()
+        try {
+            UpdateAAIVfModule obj = new UpdateAAIVfModule()
+            obj.updateVfModule(mockExecution)
+        } catch (Exception ex) {
+            println " Test End - Handle catch-throw BpmnError()! "
+        }
+
+        Mockito.verify(mockExecution, times(3)).setVariable(captor.capture(), captor.capture())
+        WorkflowException workflowException = captor.getAllValues().get(1)
+        Assert.assertEquals(9999, workflowException.getErrorCode())
+        Assert.assertEquals("org.apache.http.client.ClientProtocolException", workflowException.getErrorMessage())
+    }
+
+    private static ExecutionEntity setupMock() {
+        ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+        when(mockProcessDefinition.getKey()).thenReturn("UpdateAAIVfModule")
+        RepositoryService mockRepositoryService = mock(RepositoryService.class)
+        when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+        when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("UpdateAAIVfModule")
+        when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")
+        ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)
+        when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)
+
+        ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+        // Initialize prerequisite variables
+        when(mockExecution.getId()).thenReturn("100")
+        when(mockExecution.getProcessDefinitionId()).thenReturn("UpdateAAIVfModule")
+        when(mockExecution.getProcessInstanceId()).thenReturn("UpdateAAIVfModule")
+        when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+        when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+
+        return mockExecution
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy
index ffdaf0653d..1ab049571a 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtilsTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VidUtilsTest.groovy
@@ -18,12 +18,12 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.common.scripts;
+package org.onap.so.bpmn.common.scripts;
 
 import static org.mockito.Mockito.*
 
-import org.openecomp.mso.bpmn.common.scripts.VidUtils;
-import org.openecomp.mso.bpmn.core.WorkflowException
+import org.onap.so.bpmn.common.scripts.VidUtils;
+import org.onap.so.bpmn.core.WorkflowException
 
 import groovy.json.JsonSlurper
 
@@ -743,7 +743,6 @@ def vidUtilVfModuleRespBackoutOnFailureFalse = """<vnf-request>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
       <source>VID</source>
-      <!-- new 1610 field -->
       <service-instance-id>test-service-instance-id-123</service-instance-id>
    </request-info>
    <vnf-inputs><!-- not in use in 1610 -->
@@ -773,7 +772,6 @@ def vidUtilVfModuleRespBackoutOnFailureTrue = """<vnf-request>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
       <source>VID</source>
-      <!-- new 1610 field -->
       <service-instance-id>test-service-instance-id-123</service-instance-id>
    </request-info>
    <vnf-inputs><!-- not in use in 1610 -->
@@ -803,7 +801,6 @@ def vidUtilVfModuleRespBackoutOnFailureEmpty = """<vnf-request>
       <request-id>test-request-id-123</request-id>
       <action>CREATE_VF_MODULE</action>
       <source>VID</source>
-      <!-- new 1610 field -->
       <service-instance-id>test-service-instance-id-123</service-instance-id>
    </request-info>
    <vnf-inputs><!-- not in use in 1610 -->
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
new file mode 100644
index 0000000000..22c8e297ca
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
@@ -0,0 +1,118 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts
+
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.mockito.internal.debugging.MockitoDebuggerImpl
+import org.mockito.runners.MockitoJUnitRunner
+import org.onap.so.bpmn.mock.FileUtil
+
+import static org.mockito.Mockito.*
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class VnfAdapterRestV1Test {
+	
+	@Before
+	public void init()
+	{
+		MockitoAnnotations.initMocks(this)
+	}
+
+				  								
+	@Test
+	public void testPreProcessRequest() {
+
+		String sdncAdapterWorkflowRequest = FileUtil.readResourceFile("__files/vnfAdapterMocks/vnfadapter_request.xml");
+		ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+		when(mockExecution.getVariable("prefix")).thenReturn("VNFREST_")
+		when(mockExecution.getVariable("mso-request-id")).thenReturn("testMsoRequestId")
+		when(mockExecution.getVariable("VNFREST_Request")).thenReturn(sdncAdapterWorkflowRequest)
+		when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
+		when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
+
+		when(mockExecution.getVariable("mso.adapters.vnf.rest.endpoint")).thenReturn("http://localhost:18080/vnfs/rest/v1/vnfs")
+
+		when(mockExecution.getVariable("mso.adapters.sdnc.timeout")).thenReturn("PT5M")
+
+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+		when(mockExecution.getVariable("testProcessKey")).thenReturn("testProcessKey")
+	
+
+		VnfAdapterRestV1 vnfAdapterRestV1 = new VnfAdapterRestV1()
+		vnfAdapterRestV1.preProcessRequest(mockExecution)
+		
+		MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()
+		//debugger.printInvocations(mockExecution)
+
+
+		verify(mockExecution).setVariable("prefix","VNFREST_")
+
+		verify(mockExecution).setVariable("VNFREST_SuccessIndicator",false)
+		verify(mockExecution).setVariable("VNFREST_requestType","createVfModuleRequest")
+		verify(mockExecution).setVariable("VNFAResponse_CORRELATOR","8892cffa-3514-45d4-b2b0-0fde9a96e323-1511813289000")
+		verify(mockExecution).setVariable("VNFREST_vnfAdapterMethod","POST")
+		verify(mockExecution).setVariable("VNFREST_notificationUrl","http://localhost:18080/mso/WorkflowMessage/VNFAResponse/8892cffa-3514-45d4-b2b0-0fde9a96e323-1511813289000")
+		verify(mockExecution).setVariable("VNFREST_vnfAdapterUrl","http://localhost:18080/vnfs/rest/v1/vnfs/6d2e2469-8708-47c3-a0d4-73fa28a8a50b/vf-modules")
+
+	}
+	
+	def rollbackReq = """
+<rollbackVolumeGroupRequest>
+   <volumeGroupRollback>
+      <volumeGroupId>8a07b246-155e-4b08-b56e-76e98a3c2d66</volumeGroupId>
+      <volumeGroupStackId>phmaz401me6-vpevre-VOLUMEGROUP/dbd560b6-b03f-4a17-92e7-8942459a60c1</volumeGroupStackId>
+      <cloudSiteId>mtrnj1b</cloudSiteId>
+      <tenantId>cfb5e0a790374c9a98a1c0d2044206a7</tenantId>
+      <volumeGroupCreated>true</volumeGroupCreated>
+      <msoRequest>
+         <requestId>1e1a72ca-7300-4ac4-b718-30351f3b6845</requestId>
+         <serviceInstanceId>15eb2c68-f771-4030-b185-cff179fdad44</serviceInstanceId>
+      </msoRequest>
+      <messageId>683ca1ac-2145-4a00-9484-20d48bd701aa</messageId>
+   </volumeGroupRollback>
+   <skipAAI>true</skipAAI>
+   <notificationUrl>http://localhost:8080/mso/WorkflowMessage/VNFAResponse/683ca1ac-2145-4a00-9484-20d48bd701aa</notificationUrl>
+</rollbackVolumeGroupRequest>
+"""
+		
+	@Test
+	public void testGetVolumeGroupId() {
+		Node root = new XmlParser().parseText(rollbackReq)
+		VnfAdapterRestV1 vnfAdapterRestV1 = new VnfAdapterRestV1()
+		def volGrpId = vnfAdapterRestV1.getVolumeGroupIdFromRollbackRequest(root)
+		assertEquals('8a07b246-155e-4b08-b56e-76e98a3c2d66', volGrpId)
+	}
+
+	
+	@Test
+	public void testGetMessageId() {
+		Node root = new XmlParser().parseText(rollbackReq)
+		
+		VnfAdapterRestV1 p = new VnfAdapterRestV1()
+		def messageId = p.getMessageIdForVolumeGroupRollback(root)
+		assertEquals('683ca1ac-2145-4a00-9484-20d48bd701aa', messageId)
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoExceptionCategory.java b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/utils/IgnoreNamedElementsDifferenceListener.groovy
index 02dc1edcb7..9c38634885 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoExceptionCategory.java
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/utils/IgnoreNamedElementsDifferenceListener.groovy
@@ -1,61 +1,51 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.vnf;

-

-import javax.xml.bind.annotation.XmlEnum;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for msoExceptionCategory.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * <p>

- * <pre>

- * &lt;simpleType name="msoExceptionCategory">

- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">

- *     &lt;enumeration value="OPENSTACK"/>

- *     &lt;enumeration value="IO"/>

- *     &lt;enumeration value="INTERNAL"/>

- *     &lt;enumeration value="USERDATA"/>

- *   &lt;/restriction>

- * &lt;/simpleType>

- * </pre>

- * 

- */

-@XmlType(name = "msoExceptionCategory")

-@XmlEnum

-public enum MsoExceptionCategory {

-

-    OPENSTACK,

-    IO,

-    INTERNAL,

-    USERDATA;

-

-    public String value() {

-        return name();

-    }

-

-    public static MsoExceptionCategory fromValue(String v) {

-        return valueOf(v);

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts.utils
+
+import org.custommonkey.xmlunit.Difference
+import org.custommonkey.xmlunit.DifferenceConstants
+import org.custommonkey.xmlunit.DifferenceListener
+import org.w3c.dom.Node
+
+class IgnoreNamedElementsDifferenceListener implements DifferenceListener {
+    private Set<String> blackList = new HashSet<String>();
+
+    public IgnoreNamedElementsDifferenceListener(String ... ignoreTags) {
+        for (String name : ignoreTags) {
+            blackList.add(name);
+        }
+    }
+
+    public int differenceFound(Difference difference) {
+        if (difference.getId() == DifferenceConstants.TEXT_VALUE_ID) {
+            if (blackList.contains(difference.getControlNodeDetail().getNode().getParentNode().getNodeName())) {
+                return DifferenceListener.RETURN_IGNORE_DIFFERENCE_NODES_IDENTICAL;
+            }
+        }
+
+        return DifferenceListener.RETURN_ACCEPT_DIFFERENCE;
+    }
+
+
+    public void skippedComparison(Node node, Node node1) {
+
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/utils/XmlComparator.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/utils/XmlComparator.groovy
new file mode 100644
index 0000000000..e1c86edd90
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/utils/XmlComparator.groovy
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common.scripts.utils
+
+import org.custommonkey.xmlunit.DetailedDiff
+import org.custommonkey.xmlunit.XMLUnit
+import org.junit.Assert
+
+
+class XmlComparator {
+
+    public static void assertXMLEquals(String expectedXML, String actualXML, String ... ignoreTags ) throws Exception {
+        XMLUnit.setIgnoreWhitespace(true);
+        XMLUnit.setIgnoreAttributeOrder(true);
+
+        DetailedDiff diff = new DetailedDiff(XMLUnit.compareXML(expectedXML, actualXML));
+
+        diff.overrideDifferenceListener(new IgnoreNamedElementsDifferenceListener(ignoreTags));
+
+        List<?> allDifferences = diff.getAllDifferences();
+        Assert.assertEquals("Differences found: "+ diff.toString(), 0, allDifferences.size());
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
deleted file mode 100644
index b4b2b951b2..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
+++ /dev/null
@@ -1,385 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common.scripts;

-

-import static org.junit.Assert.*;

-import static org.mockito.Mockito.*

-

-import org.openecomp.mso.rest.HttpHeader

-import org.mockito.MockitoAnnotations

-import org.mockito.runners.MockitoJUnitRunner

-import org.mockito.internal.debugging.MockitoDebuggerImpl

-import org.junit.Before

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

-import org.junit.Rule;

-import org.junit.Test

-import org.junit.Ignore

-import org.junit.runner.RunWith

-import org.junit.Before;

-import org.junit.Test;

-import org.camunda.bpm.engine.ProcessEngineServices

-import org.camunda.bpm.engine.RepositoryService

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl

-import org.camunda.bpm.engine.repository.ProcessDefinition

-

-@RunWith(MockitoJUnitRunner.class)

-class AaiUtilTest extends MsoGroovyTest {

-	

-	@Test

-	public void testGetVersionDefault() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

-		assertEquals('8', version)

-	}

-	

-	@Test

-	public void testGetVersionResourceSpecific() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

-		assertEquals('7', version)

-	}

-

-	@Test

-	public void testGetVersionFlowSpecific() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_custom_CreateAAIVfModule_aai_version")).thenReturn('6')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

-		assertEquals('6', version)

-	}

-

-	@Test(expected=java.lang.Exception.class)

-	public void testGetVersionNotDefined() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

-	}

-	

-	@Test

-	public void testGetUriDefaultVersion() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

-	}

-	

-	@Test

-	public void testGetUriFlowAndResourceSpecific() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_CreateAAIVfModule_aai_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

-		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)

-	}

-	

-	@Test

-	public void testGetNetworkGenericVnfEndpoint() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)

-		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)

-	}

-	

-	@Test

-	public void testGetNetworkGenericVnfUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)

-		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)

-	}

-	

-	@Test

-	public void testGetNetworkVpnBindingUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)

-		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)

-	}

-

-	@Test

-	public void testGetNetworkPolicyUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn('/aai/v8/network/network-policies/network-policy')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)

-		assertEquals('/aai/v8/network/network-policies/network-policy', uri)

-	}

-	

-	@Test

-	public void testGetNetworkTableReferencesUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)

-		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)

-	}

-	

-	@Test

-	public void testGetNetworkVceUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vce_uri")).thenReturn('/aai/v8/network/vces/vce')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkVceUri(mockExecution)

-		assertEquals('/aai/v8/network/vces/vce', uri)

-	}

-	

-	@Test

-	public void testGetNetworkL3NetworkUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)

-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

-	}

-	

-	@Test

-	public void testGetBusinessCustomerUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_customer_uri")).thenReturn('/aai/v8/business/customers/customer')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)

-		assertEquals('/aai/v8/business/customers/customer', uri)

-	}

-	

-	@Test

-	public void testGetCloudInfrastructureCloudRegionEndpoint() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)

-		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

-	}

-	

-	@Test

-	public void testGetCloudInfrastructureCloudRegionUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)

-		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

-	}

-	

-	@Test

-	public void testGetCloudInfrastructureTenantUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_tenant_uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)

-		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)

-	}

-	

-	@Test

-	public void testGetSearchNodesQueryUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)

-		assertEquals('/aai/v8/search/nodes-query', uri)

-	}

-	

-	@Test

-	public void testGetSearchNodesQueryEndpoint() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)

-		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)

-	}

-	

-	@Test

-	public void testGetSearchGenericQueryUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_query_uri")).thenReturn('/aai/v8/search/generic-query')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)

-		assertEquals('/aai/v8/search/generic-query', uri)

-	}

-	

-	@Test

-	public void testGetNamespaceFromUri() {

-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('6')

-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v6_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		CreateAAIVfModule myproc = new CreateAAIVfModule()

-		AaiUtil aaiUtil = new AaiUtil(myproc)

-		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

-		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')

-		assertEquals('http://org.openecomp.aai.inventory/v6', ns)

-	}

-	

-	@Test

-	public void testGetNamespaceFromUri2() {

-		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

-		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   CreateAAIVfModule myproc = new CreateAAIVfModule()

-		   AaiUtil aaiUtil = new AaiUtil(myproc)

-		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

-		   def ns = aaiUtil.getNamespaceFromUri('/aai/v10/search/generic-query')

-		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

-	}

-	

-	@Test

-	public void testGetNamespaceFromUri3() {

-		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('100')

-		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v100_l3_network_uri")).thenReturn('/aai/v100/network/l3-networks/l3-network')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   CreateAAIVfModule myproc = new CreateAAIVfModule()

-		   AaiUtil aaiUtil = new AaiUtil(myproc)

-		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

-		   def ns = aaiUtil.getNamespaceFromUri('/aai/v100/search/generic-query')

-		   assertEquals('http://org.openecomp.aai.inventory/v100', ns)

-	}

-

-	@Test

-	public void testGetNamespaceFromUri_twoArguments() {  // (execution, uri)

-		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

-		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

-		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

-		   //

-		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

-		   CreateAAIVfModule myproc = new CreateAAIVfModule()

-		   AaiUtil aaiUtil = new AaiUtil(myproc)

-		   def ns = aaiUtil.getNamespaceFromUri(mockExecution,'/aai/v10/search/generic-query')

-		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterRestV1Test.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
deleted file mode 100644
index b37676a044..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterRestV1Test.groovy
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.openecomp.mso.bpmn.common.scripts
-
-import org.junit.Test
-import static org.junit.Assert.*;
-
-class VnfAdapterRestV1Test {
-
-	
-	def rollbackReq = """
-<rollbackVolumeGroupRequest>
-   <volumeGroupRollback>
-      <volumeGroupId>8a07b246-155e-4b08-b56e-76e98a3c2d66</volumeGroupId>
-      <volumeGroupStackId>phmaz401me6-vpevre-VOLUMEGROUP/dbd560b6-b03f-4a17-92e7-8942459a60c1</volumeGroupStackId>
-      <cloudSiteId>mtrnj1b</cloudSiteId>
-      <tenantId>cfb5e0a790374c9a98a1c0d2044206a7</tenantId>
-      <volumeGroupCreated>true</volumeGroupCreated>
-      <msoRequest>
-         <requestId>1e1a72ca-7300-4ac4-b718-30351f3b6845</requestId>
-         <serviceInstanceId>15eb2c68-f771-4030-b185-cff179fdad44</serviceInstanceId>
-      </msoRequest>
-      <messageId>683ca1ac-2145-4a00-9484-20d48bd701aa</messageId>
-   </volumeGroupRollback>
-   <skipAAI>true</skipAAI>
-   <notificationUrl>http://msobpel-app-e2e.ecomp.cci.att.com:8080/mso/WorkflowMessage/VNFAResponse/683ca1ac-2145-4a00-9484-20d48bd701aa</notificationUrl>
-</rollbackVolumeGroupRequest>
-"""
-	
-	@Test
-	public void testGetNodeText() {
-		Node root = new XmlParser().parseText(rollbackReq)
-		def volGrpId = root.'volumeGroupRollback'.'volumeGroupId'.text()
-		assertEquals('8a07b246-155e-4b08-b56e-76e98a3c2d66', volGrpId)
-	}
-	
-	@Test
-	public void testGetMessageId() {
-		Node root = new XmlParser().parseText(rollbackReq)
-		//def messageId = root.'volumeGroupRollback'.'messageId'.text()
-		
-		VnfAdapterRestV1 p = new VnfAdapterRestV1()
-		def messageId = p.getMessageIdForVolumeGroupRollback(root)
-		assertEquals('683ca1ac-2145-4a00-9484-20d48bd701aa', messageId)
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllBaseTaskTestSuite.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllBaseTaskTestSuite.java
new file mode 100644
index 0000000000..cd9bdc9532
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllBaseTaskTestSuite.java
@@ -0,0 +1,33 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+
+import org.junit.runner.RunWith;
+
+import com.googlecode.junittoolbox.SuiteClasses;
+import com.googlecode.junittoolbox.WildcardPatternSuite;
+
+@RunWith(WildcardPatternSuite.class)
+@SuiteClasses({"**/common/aai/tasks/*Test.class", "**/bpmn/sdno/tasks/*Test.class", "**/buildingblock/SniroHomingV2Test.class"})
+public class AllBaseTaskTestSuite {
+	// the class remains empty,
+	// used only as a holder for the above annotations
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllGroovyTestSuites.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllGroovyTestSuites.java
new file mode 100644
index 0000000000..696323c4ad
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllGroovyTestSuites.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+import org.junit.runner.RunWith;
+
+import com.googlecode.junittoolbox.SuiteClasses;
+import com.googlecode.junittoolbox.WildcardPatternSuite;
+
+@RunWith(WildcardPatternSuite.class)
+@SuiteClasses({"**/bpmn/common/scripts/**/*Test.class"})
+public class AllGroovyTestSuites {
+  // the class remains empty,
+  // used only as a holder for the above annotations
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllTestSuites.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllTestSuites.java
new file mode 100644
index 0000000000..fa70ccf23d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/AllTestSuites.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+import org.junit.runner.RunWith;
+
+import com.googlecode.junittoolbox.SuiteClasses;
+import com.googlecode.junittoolbox.WildcardPatternSuite;
+
+@RunWith(WildcardPatternSuite.class)
+@SuiteClasses({"**/*Test.class", "!**/bpmn/common/scripts/**/*Test.class"})
+public class AllTestSuites {
+  // the class remains empty,
+  // used only as a holder for the above annotations
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseTest.java
new file mode 100644
index 0000000000..d2f1186ad0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseTest.java
@@ -0,0 +1,163 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.camunda.bpm.engine.RepositoryService;
+import org.camunda.bpm.engine.RuntimeService;
+import org.camunda.bpm.model.bpmn.Bpmn;
+import org.camunda.bpm.model.bpmn.BpmnModelInstance;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.onap.so.bpmn.common.InjectionHelper;
+import org.onap.so.bpmn.common.MockLoggerDelegate;
+import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetup;
+import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetupMapperLayer;
+import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetupUtils;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+@ContextConfiguration
+@AutoConfigureWireMock(port = 0)
+public abstract class BaseTest extends BuildingBlockTestDataSetup {
+	
+
+	protected Map<String, Object> variables = new HashMap<>();
+
+	protected TestRestTemplate restTemplate = new TestRestTemplate();
+
+	protected HttpHeaders headers = new HttpHeaders();
+
+	
+	@Autowired
+	protected RuntimeService runtimeService;
+
+	@Autowired
+	private RepositoryService repositoryService;
+	/*
+	 * Mocked for injection via autowiring
+	 */
+	
+	@Value("${mso.catalog.db.spring.endpoint}")
+	protected String endpoint;
+	
+	@Value("${wiremock.server.port}")
+	protected String wireMockPort;
+	
+	@MockBean
+	protected CatalogDbClient MOCK_catalogDbClient;
+	
+	@SpyBean
+	protected InjectionHelper MOCK_injectionHelper;
+	
+	@SpyBean
+	protected ExceptionBuilder exceptionUtil;
+	
+	/*
+	 *  Classes that cannot be simply mocked because they are both
+	 *  needed for testing another class, and must be autowired when
+	 *  being tested themselves....or classes with private methods that
+	 *  must be stubbed during testing
+	 */
+	
+	@SpyBean
+	protected BBInputSetupMapperLayer SPY_bbInputSetupMapperLayer;
+	@SpyBean
+	protected BBInputSetupUtils SPY_bbInputSetupUtils;
+	@SpyBean
+	protected BBInputSetup SPY_bbInputSetup;
+	
+	/*
+	 *  Mocked for injection via the IntectionHelper
+	 */
+	
+
+	
+	@Before
+	public void baseTestBefore() {
+		WireMock.reset();
+		variables.put("gBuildingBlockExecution", execution);
+	}
+
+	@LocalServerPort
+	private int port;
+	
+	protected String readFile(String path) throws IOException {
+		return readFile(path, Charset.defaultCharset());
+	}
+	
+	protected String readFile(String path, Charset encoding) throws IOException {
+		byte[] encoded = Files.readAllBytes(Paths.get(path));
+		return new String(encoded, encoding);
+	}
+	
+	protected String readJsonFileAsString(String fileLocation) throws IOException{
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode jsonNode = mapper.readTree(new File(fileLocation));
+		return jsonNode.asText();
+	}
+
+	protected String createURLWithPort(String uri) {
+		return "http://localhost:" + port + uri;
+	}
+	/**
+	 * Create and deploy a process model with one logger delegate as service task.
+	 *
+	 * @param origProcessKey
+	 *            key to call
+	 * @param mockProcessName
+	 *            process name
+	 * @param fileName
+	 *            file name without extension
+	 */
+	protected void mockSubprocess(String origProcessKey, String mockProcessName, String fileName) {
+		BpmnModelInstance modelInstance = Bpmn.createExecutableProcess(origProcessKey).name(mockProcessName)
+				.startEvent().name("Start Point").serviceTask().name("Log Something for Test")
+				.camundaClass(MockLoggerDelegate.class.getName()).endEvent().name("End Point").done();
+		repositoryService.createDeployment().addModelInstance(fileName + ".bpmn", modelInstance).deploy();
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseUnitTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseUnitTest.java
new file mode 100644
index 0000000000..5719ce15e2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BaseUnitTest.java
@@ -0,0 +1,25 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+
+public abstract class BaseUnitTest extends BuildingBlockTestDataSetup{
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BuildingBlockTestDataSetup.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BuildingBlockTestDataSetup.java
new file mode 100644
index 0000000000..a983193ca3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/BuildingBlockTestDataSetup.java
@@ -0,0 +1,668 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.assertj.core.util.Arrays;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.impl.pvm.runtime.ExecutionImpl;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.DelegateExecutionImpl;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Pnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceProxy;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VpnBinding;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VpnBondingLink;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestParameters;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
+import org.onap.so.client.exception.BBObjectNotFoundException;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.AllottedResource;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoAllottedResource;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceProxy;
+
+public class BuildingBlockTestDataSetup{
+	private int collectionCounter;
+	private int configurationCounter;
+	private int customerCounter;
+	private int genericVnfCounter;
+	private int instanceGroupCounter;
+	private int l3NetworkCounter;
+	private int owningEntityCounter;
+	private int pnfCounter;
+	private int projectCounter;
+	private int serviceInstanceCounter;
+	private int serviceProxyCounter;
+	private int serviceSubscriptionCounter;
+	private int vfModuleCounter;
+	private int volumeGroupCounter;
+	private int vpnBindingCounter;
+	private int vpnBondingLinkCounter;
+
+	protected BuildingBlockExecution execution;
+
+	protected GeneralBuildingBlock gBBInput;
+
+	protected HashMap<ResourceKey, String> lookupKeyMap;
+
+	protected ExtractPojosForBB extractPojosForBB = new ExtractPojosForBB();
+
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();
+
+	protected DelegateExecution delegateExecution;
+
+	@Before
+	public void buildingBlockTestDataSetupBefore() {
+		collectionCounter = 0;
+		configurationCounter = 0;
+		customerCounter = 0;
+		genericVnfCounter = 0;
+		instanceGroupCounter = 0;
+		l3NetworkCounter = 0;
+		owningEntityCounter = 0;
+		pnfCounter = 0;
+		projectCounter = 0;
+		serviceInstanceCounter = 0;
+		serviceProxyCounter = 0;
+		serviceSubscriptionCounter = 0;
+		vfModuleCounter = 0;
+		volumeGroupCounter = 0;
+		vpnBindingCounter = 0;
+		vpnBondingLinkCounter = 0;
+
+		execution = new DelegateExecutionImpl(new ExecutionImpl());
+		execution.setVariable("testProcessKey", "testProcessKeyValue");
+
+		gBBInput = new GeneralBuildingBlock();
+		execution.setVariable("gBBInput", gBBInput);
+
+		lookupKeyMap = new HashMap<ResourceKey, String>();
+		execution.setVariable("lookupKeyMap", lookupKeyMap);
+
+	    ExecutionImpl mockExecutionImpl = mock(ExecutionImpl.class);
+    	doReturn("test").when(mockExecutionImpl).getProcessInstanceId();
+
+    	ExecutionImpl executionImpl = new ExecutionImpl();
+    	executionImpl.setProcessInstance(mockExecutionImpl);
+
+    	delegateExecution = (DelegateExecution) executionImpl;
+    	delegateExecution.setVariable("testProcessKey", "testProcessKeyValue");
+	}
+
+	public Map<String, String> buildUserInput() {
+		Map<String, String> userInput = new HashMap<>();
+		userInput.put("testUserInputKey", "testUserInputValue");
+
+		return userInput;
+	}
+
+	public Map<String, String> setUserInput() {
+		Map<String, String> userInput = buildUserInput();
+
+		gBBInput.setUserInput(userInput);
+
+		return userInput;
+	}
+
+	public RequestContext buildRequestContext() {
+		RequestContext requestContext = new RequestContext();
+		requestContext.setMsoRequestId(UUID.randomUUID().toString());
+		requestContext.setProductFamilyId("testProductFamilyId");
+		requestContext.setRequestorId("testRequestorId");
+
+		requestContext.setUserParams(new HashMap<>());
+
+        Map<String,Object> dataMap = new HashMap<>();
+        dataMap.put("vpnId","testVpnId");
+        dataMap.put("vpnRegion","testVpnRegion");
+        dataMap.put("vpnRt","testVpnRt");
+        dataMap.put("vpnName","vpnName");
+        dataMap.put("vpnRegion", Arrays.asList(new String[] {"USA", "EMEA", "APAC"}));
+
+        HashMap<String,Object> userParams = new HashMap<>();
+        userParams.put("vpnData",dataMap);
+
+		List<Map<String,Object>> userParamsList = new ArrayList<>();
+		userParamsList.add(userParams);
+
+		RequestParameters requestParameters = new RequestParameters();
+		requestParameters.setUserParams(userParamsList);
+		requestContext.setRequestParameters(requestParameters);
+
+		return requestContext;
+	}
+
+	public RequestContext setRequestContext() {
+		RequestContext requestContext = buildRequestContext();
+
+		gBBInput.setRequestContext(requestContext);
+
+		return requestContext;
+	}
+
+	public CloudRegion buildCloudRegion() {
+		CloudRegion cloudRegion = new CloudRegion();
+		cloudRegion.setLcpCloudRegionId("testLcpCloudRegionId");
+		cloudRegion.setTenantId("testTenantId");
+		cloudRegion.setCloudOwner("testCloudOwner");
+
+		return cloudRegion;
+	}
+
+	public CloudRegion setCloudRegion() {
+		CloudRegion cloudRegion = buildCloudRegion();
+
+		gBBInput.setCloudRegion(cloudRegion);
+
+		return cloudRegion;
+	}
+
+	public OrchestrationContext buildOrchestrationContext() {
+		OrchestrationContext orchestrationContext = new OrchestrationContext();
+
+		return orchestrationContext;
+	}
+
+	public OrchestrationContext setOrchestrationContext() {
+		OrchestrationContext orchestrationContext = buildOrchestrationContext();
+
+		gBBInput.setOrchContext(orchestrationContext);
+
+		return orchestrationContext;
+	}
+
+	public Collection buildCollection() {
+		collectionCounter++;
+
+		Collection collection = new Collection();
+		collection.setId("testId" + collectionCounter);
+		collection.setInstanceGroup(buildInstanceGroup());
+
+		return collection;
+	}
+
+	public Configuration buildConfiguration() {
+		configurationCounter++;
+
+		Configuration configuration = new Configuration();
+		configuration.setConfigurationId("testConfigurationId" + configurationCounter);
+		configuration.setConfigurationName("testConfigurationName" + configurationCounter);
+
+		ModelInfoConfiguration modelInfoConfiguration = new ModelInfoConfiguration();
+		modelInfoConfiguration.setModelVersionId("testModelVersionId" + configurationCounter);
+		modelInfoConfiguration.setModelInvariantId("testModelInvariantId" + configurationCounter);
+		modelInfoConfiguration.setModelCustomizationId("testModelCustomizationId" + configurationCounter);
+
+		configuration.setModelInfoConfiguration(modelInfoConfiguration);
+
+		return configuration;
+	}
+
+	public OwningEntity buildOwningEntity() {
+		owningEntityCounter++;
+
+		OwningEntity owningEntity = new OwningEntity();
+		owningEntity.setOwningEntityId("testOwningEntityId" + owningEntityCounter);
+		owningEntity.setOwningEntityName("testOwningEntityName" + owningEntityCounter);
+
+		return owningEntity;
+	}
+
+	public Project buildProject() {
+		projectCounter++;
+
+		Project project = new Project();
+		project.setProjectName("testProjectName" + projectCounter);
+
+		return project;
+	}
+
+	public ServiceSubscription buildServiceSubscription() {
+		serviceSubscriptionCounter++;
+
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setTempUbSubAccountId("testTempUbSubAccountId" + serviceSubscriptionCounter);
+		serviceSubscription.setServiceType("testServiceType" + serviceSubscriptionCounter);
+
+		return serviceSubscription;
+	}
+
+	public Customer buildCustomer() {
+		customerCounter++;
+
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("testGlobalCustomerId" + customerCounter);
+		customer.setSubscriberType("testSubscriberType" + customerCounter);
+
+		customer.setServiceSubscription(buildServiceSubscription());
+		
+		return customer;
+	}
+
+	public ServiceInstance buildServiceInstance() {
+		serviceInstanceCounter++;
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("testServiceInstanceId" + serviceInstanceCounter);
+		serviceInstance.setServiceInstanceName("testServiceInstanceName" + serviceInstanceCounter);
+
+		ModelInfoServiceInstance modelInfoServiceInstance = new ModelInfoServiceInstance();
+		modelInfoServiceInstance.setModelInvariantUuid("testModelInvariantUUID" + serviceInstanceCounter);
+		modelInfoServiceInstance.setModelUuid("testModelUUID" + serviceInstanceCounter);
+		modelInfoServiceInstance.setModelVersion("testModelVersion" + serviceInstanceCounter);
+		modelInfoServiceInstance.setModelName("testModelName" + serviceInstanceCounter);
+		modelInfoServiceInstance.setServiceType("testServiceType" + serviceInstanceCounter);
+		serviceInstance.setModelInfoServiceInstance(modelInfoServiceInstance);
+
+		serviceInstance.setProject(buildProject());
+
+		serviceInstance.setOwningEntity(buildOwningEntity());
+
+		serviceInstance.setCollection(buildCollection());
+
+		serviceInstance.getConfigurations().add(buildConfiguration());
+
+		return serviceInstance;
+	}
+
+	public ServiceInstance setServiceInstance() {
+		ServiceInstance serviceInstance = buildServiceInstance();
+
+		if(gBBInput.getCustomer() == null) {
+			gBBInput.setCustomer(buildCustomer());
+		}
+		gBBInput.getCustomer().getServiceSubscription().getServiceInstances().add(serviceInstance);
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstance.getServiceInstanceId());
+
+		return serviceInstance;
+	}
+
+	public Customer setCustomer() {
+		if(gBBInput.getCustomer() != null) return gBBInput.getCustomer();
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("testGlobalCustomerId");
+		customer.setSubscriberType("testSubscriberType");
+
+		customer.setServiceSubscription(buildServiceSubscription());
+
+		gBBInput.setCustomer(customer);
+		
+		return customer;
+	}
+	
+	public Collection setCollection() {
+		Collection collection = new Collection();
+		collection.setId("testId");
+		
+		ServiceInstance serviceInstance = null;
+		
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+		
+		serviceInstance.setCollection(collection);
+		
+		return collection;
+	}
+	
+	public InstanceGroup setInstanceGroup() {
+		InstanceGroup instanceGroup = new InstanceGroup();
+		instanceGroup.setId("testId");
+		instanceGroup.setInstanceGroupFunction("testInstanceGroupFunction");
+		
+		Collection collection = null;
+		
+		try {
+			ServiceInstance serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+			collection = serviceInstance.getCollection();
+			
+			if (collection == null) {
+				collection = setCollection();
+			}
+		} catch(BBObjectNotFoundException e) {
+			collection = setCollection();
+		}
+		
+		collection.setInstanceGroup(instanceGroup);
+		
+		return instanceGroup;
+	}
+	
+	public VpnBinding buildVpnBinding() {
+		vpnBindingCounter++;
+
+		VpnBinding vpnBinding = new VpnBinding();
+		vpnBinding.setVpnId("testVpnId" + vpnBindingCounter);
+		vpnBinding.setVpnName("testVpnName" + vpnBindingCounter);
+		vpnBinding.setCustomerVpnId("testCustomerVpnId" + vpnBindingCounter);
+
+		return vpnBinding;
+	}
+
+	public VpnBinding setVpnBinding() {
+		VpnBinding vpnBinding = buildVpnBinding();
+
+		Customer customer = gBBInput.getCustomer();
+
+		if(customer == null){
+			customer = buildCustomer();
+		}
+
+		customer.getVpnBindings().add(vpnBinding);
+		lookupKeyMap.put(ResourceKey.VPN_ID, vpnBinding.getVpnId());
+
+		return vpnBinding;
+	}
+
+	public InstanceGroup buildInstanceGroup() {
+		instanceGroupCounter++;
+
+		InstanceGroup instanceGroup = new InstanceGroup();
+		instanceGroup.setId("testId" + instanceGroupCounter);
+		instanceGroup.setInstanceGroupFunction("testInstanceGroupFunction" + instanceGroupCounter);
+
+		return instanceGroup;
+	}
+
+	public L3Network buildL3Network() {
+		l3NetworkCounter++;
+
+		L3Network network = new L3Network();
+		network.setNetworkId("testNetworkId" + l3NetworkCounter);
+		network.setNetworkName("testNetworkName" + l3NetworkCounter);
+		network.setNetworkType("testNetworkType" + l3NetworkCounter);
+
+		ModelInfoNetwork modelInfoNetwork = new ModelInfoNetwork();
+		modelInfoNetwork.setModelInvariantUUID("testModelInvariantUUID" + l3NetworkCounter);
+		modelInfoNetwork.setModelName("testModelName" + l3NetworkCounter);
+		modelInfoNetwork.setModelVersion("testModelVersion" + l3NetworkCounter);
+		modelInfoNetwork.setModelUUID("testModelUUID" + l3NetworkCounter);
+		network.setModelInfoNetwork(modelInfoNetwork);
+
+		return network;
+	}
+
+	public L3Network setL3Network() {
+		L3Network network = buildL3Network();
+
+		ServiceInstance serviceInstance = null;
+
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+
+		serviceInstance.getNetworks().add(network);
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, network.getNetworkId());
+
+		return network;
+	}
+
+	public GenericVnf buildGenericVnf() {
+		genericVnfCounter++;
+
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setVnfId("testVnfId" + genericVnfCounter);
+		genericVnf.setVnfName("testVnfName" + genericVnfCounter);
+		genericVnf.setVnfType("testVnfType" + genericVnfCounter);
+
+		Platform platform = new Platform();
+		platform.setPlatformName("testPlatformName");
+		genericVnf.setPlatform(platform);
+
+		LineOfBusiness lob = new LineOfBusiness();
+		lob.setLineOfBusinessName("testLineOfBusinessName");
+		genericVnf.setLineOfBusiness(lob);
+
+		ModelInfoGenericVnf modelInfoGenericVnf = new ModelInfoGenericVnf();
+		modelInfoGenericVnf.setModelName("testModelName" + genericVnfCounter);
+		modelInfoGenericVnf.setModelCustomizationUuid("testModelCustomizationUUID" + genericVnfCounter);
+		modelInfoGenericVnf.setModelInvariantUuid("testModelInvariantUUID" + genericVnfCounter);
+		modelInfoGenericVnf.setModelVersion("testModelVersion" + genericVnfCounter);
+		modelInfoGenericVnf.setModelUuid("testModelUUID" + genericVnfCounter);
+		modelInfoGenericVnf.setModelInstanceName("testModelInstanceName" + genericVnfCounter);
+		genericVnf.setModelInfoGenericVnf(modelInfoGenericVnf);
+
+		return genericVnf;
+	}
+
+	public GenericVnf setGenericVnf() {
+		GenericVnf genericVnf = buildGenericVnf();
+
+		ServiceInstance serviceInstance = null;
+
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+
+		serviceInstance.getVnfs().add(genericVnf);
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, genericVnf.getVnfId());
+
+		return genericVnf;
+	}
+
+	public VfModule buildVfModule() {
+		vfModuleCounter++;
+
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("testVfModuleId" + vfModuleCounter);
+		vfModule.setVfModuleName("testVfModuleName" + vfModuleCounter);
+
+		ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
+		modelInfoVfModule.setModelInvariantUUID("testModelInvariantUUID" + vfModuleCounter);
+		modelInfoVfModule.setModelVersion("testModelVersion" + vfModuleCounter);
+		modelInfoVfModule.setModelUUID("testModelUUID" + vfModuleCounter);
+		modelInfoVfModule.setModelName("testModelName" + vfModuleCounter);
+		modelInfoVfModule.setModelCustomizationUUID("testModelCustomizationUUID" + vfModuleCounter);
+		vfModule.setModelInfoVfModule(modelInfoVfModule);
+
+		return vfModule;
+	}
+
+	public VfModule setVfModule() {
+		VfModule vfModule = buildVfModule();
+
+		GenericVnf genericVnf = null;
+
+		try {
+			genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+		} catch(BBObjectNotFoundException e) {
+			genericVnf = setGenericVnf();
+		}
+
+		genericVnf.getVfModules().add(vfModule);
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, vfModule.getVfModuleId());
+
+		return vfModule;
+	}
+
+	public VolumeGroup buildVolumeGroup() {
+		volumeGroupCounter++;
+
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("testVolumeGroupId" + volumeGroupCounter);
+		volumeGroup.setVolumeGroupName("testVolumeGroupName" + volumeGroupCounter);
+		volumeGroup.setHeatStackId("testHeatStackId" + volumeGroupCounter);
+
+		return volumeGroup;
+	}
+
+	public VolumeGroup setVolumeGroup() {
+		VolumeGroup volumeGroup = buildVolumeGroup();
+
+		GenericVnf genericVnf = null;
+
+		try {
+			genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+		} catch(BBObjectNotFoundException e) {
+			genericVnf = setGenericVnf();
+		}
+
+		genericVnf.getVolumeGroups().add(volumeGroup);
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
+
+		return volumeGroup;
+	}
+
+	public Pnf buildPnf() {
+		pnfCounter++;
+
+		Pnf pnf = new Pnf();
+		pnf.setPnfId("testPnfId" + pnfCounter);
+		pnf.setPnfName("testPnfName" + pnfCounter);
+
+		return pnf;
+	}
+
+	public ServiceProxy buildServiceProxy() {
+		serviceProxyCounter++;
+
+        ServiceProxy serviceProxy = new ServiceProxy();
+        serviceProxy.setServiceInstance(buildServiceInstance());
+        serviceProxy.getServiceInstance().getVnfs().add(buildGenericVnf());
+
+        Pnf primaryPnf = buildPnf();
+        primaryPnf.setRole("Primary");
+        serviceProxy.getServiceInstance().getPnfs().add(primaryPnf);
+
+        Pnf secondaryPnf = buildPnf();
+        secondaryPnf.setRole("Secondary");
+        serviceProxy.getServiceInstance().getPnfs().add(secondaryPnf);
+
+        return serviceProxy;
+	}
+
+	public VpnBondingLink buildVpnBondingLink() {
+		vpnBondingLinkCounter++;
+
+		VpnBondingLink vpnBondingLink = new VpnBondingLink();
+		vpnBondingLink.setVpnBondingLinkId("testVpnBondingLinkId" + vpnBondingLinkCounter);
+
+		Configuration vnrConfiguration = buildConfiguration();
+		vnrConfiguration.setNetwork(buildL3Network());
+		vpnBondingLink.setVnrConfiguration(vnrConfiguration);
+
+		vpnBondingLink.setVrfConfiguration(buildConfiguration());
+
+        vpnBondingLink.setInfrastructureServiceProxy(buildServiceProxy());
+
+        vpnBondingLink.setTransportServiceProxy(buildServiceProxy());
+
+		return vpnBondingLink;
+	}
+
+	public VpnBondingLink setVpnBondingLink() {
+		VpnBondingLink vpnBondingLink = buildVpnBondingLink();
+
+		ServiceInstance serviceInstance = null;
+
+		try {
+			serviceInstance = extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, execution.getLookupMap().get(ResourceKey.SERVICE_INSTANCE_ID));
+		} catch(BBObjectNotFoundException e) {
+			serviceInstance = setServiceInstance();
+		}
+
+		serviceInstance.getVpnBondingLinks().add(vpnBondingLink);
+		lookupKeyMap.put(ResourceKey.VPN_BONDING_LINK_ID, vpnBondingLink.getVpnBondingLinkId());
+
+
+		return vpnBondingLink;
+	}
+
+	public Customer setAvpnCustomer() {
+		Customer customer = buildCustomer();
+
+		gBBInput.setCustomer(customer);
+
+		return customer;
+	}
+
+	public ServiceProxy setServiceProxy(String uniqueIdentifier, String type) {
+		ServiceProxy serviceProxy = new ServiceProxy();
+		serviceProxy.setId("testProxyId" + uniqueIdentifier);
+		serviceProxy.setType(type);
+
+		ModelInfoServiceProxy modelInfo = new ModelInfoServiceProxy();
+		modelInfo.setModelInvariantUuid("testProxyModelInvariantUuid" + uniqueIdentifier);
+		modelInfo.setModelName("testProxyModelName" + uniqueIdentifier);
+		modelInfo.setModelUuid("testProxyModelUuid" + uniqueIdentifier);
+		modelInfo.setModelVersion("testProxyModelVersion" + uniqueIdentifier);
+		modelInfo.setModelInstanceName("testProxyInstanceName" + uniqueIdentifier);
+
+		serviceProxy.setModelInfoServiceProxy(modelInfo);
+
+		return serviceProxy;
+	}
+
+	public AllottedResource setAllottedResource(String uniqueIdentifier) {
+		AllottedResource ar = new AllottedResource();
+		ar.setId("testAllottedResourceId" + uniqueIdentifier);
+
+		ModelInfoAllottedResource modelInfo = new ModelInfoAllottedResource();
+		modelInfo.setModelInvariantUuid("testAllottedModelInvariantUuid" + uniqueIdentifier);
+		modelInfo.setModelName("testAllottedModelName" + uniqueIdentifier);
+		modelInfo.setModelUuid("testAllottedModelUuid" + uniqueIdentifier);
+		modelInfo.setModelVersion("testAllottedModelVersion" + uniqueIdentifier);
+		modelInfo.setModelInstanceName("testAllottedInstanceName" + uniqueIdentifier);
+		
+		ar.setModelInfoAllottedResource(modelInfo);
+		
+		return ar;
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/EmbeddedMariaDbConfig.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/EmbeddedMariaDbConfig.java
new file mode 100644
index 0000000000..a29df9cbcf
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/EmbeddedMariaDbConfig.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+import ch.vorburger.exec.ManagedProcessException;
+import ch.vorburger.mariadb4j.DBConfigurationBuilder;
+import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import javax.sql.DataSource;
+
+@Configuration
+@Profile({"test"})
+public class EmbeddedMariaDbConfig {
+
+    @Bean
+    MariaDB4jSpringService mariaDB4jSpringService() {
+    	MariaDB4jSpringService service = new MariaDB4jSpringService();
+    	
+    	
+    	service.getConfiguration().addArg("--lower_case_table_names=1");
+        return service;
+    }
+
+    @Bean
+    DataSource dataSource(MariaDB4jSpringService mariaDB4jSpringService,
+                          @Value("${mariaDB4j.databaseName}") String databaseName,
+                          @Value("${spring.datasource.username}") String datasourceUsername,
+                          @Value("${spring.datasource.password}") String datasourcePassword,
+                          @Value("${spring.datasource.driver-class-name}") String datasourceDriver) throws ManagedProcessException {
+        //Create our database with default root user and no password
+        mariaDB4jSpringService.getDB().createDB(databaseName);
+
+        DBConfigurationBuilder config = mariaDB4jSpringService.getConfiguration();
+
+        return DataSourceBuilder
+                .create()
+                .username(datasourceUsername)
+                .password(datasourcePassword)
+                .url(config.getURL(databaseName))
+                .driverClassName(datasourceDriver)
+                .build();
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/SerializableChecker.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/SerializableChecker.java
new file mode 100644
index 0000000000..97c17d5238
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/SerializableChecker.java
@@ -0,0 +1,181 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public final class SerializableChecker
+{
+    public static class SerializationFailure
+    {
+        private final String mContainingClass;
+        private final String mMemberName;
+
+        public SerializationFailure(String inNonSerializableClass, String inMemberName)
+        {
+            mContainingClass = inNonSerializableClass;
+            mMemberName = inMemberName;
+        }
+
+        public String getContainingClass()
+        {
+            return mContainingClass;
+        }
+
+        public String getMemberName()
+        {
+            return mMemberName;
+        }
+
+        public String getBadMemberString()
+        {
+            if (mMemberName == null)
+                return mContainingClass;
+            return mContainingClass + "." + mMemberName;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "SerializationFailure [mNonSerializableClass=" + mContainingClass + ", mMemberName=" + mMemberName + "]";
+        }
+    }
+
+    private static class SerializationCheckerData
+    {
+        private Set<Class<?>> mSerializableClasses;
+
+        SerializationCheckerData()
+        {
+            mSerializableClasses = new HashSet<Class<?>>();
+        }
+
+        boolean isAlreadyChecked(Class<?> inClass)
+        {
+            return mSerializableClasses.contains(inClass);
+        }
+
+        void addSerializableClass(Class<?> inClass)
+        {
+            mSerializableClasses.add(inClass);
+        }
+    }
+
+    private SerializableChecker()
+    { }
+
+    public static SerializationFailure isFullySerializable(Class<?> inClass)
+    {
+        if (!isSerializable(inClass))
+            return new SerializationFailure(inClass.getName(), null);
+
+        return isFullySerializable(inClass, new SerializationCheckerData());
+    }
+
+    private static SerializationFailure isFullySerializable(Class<?> inClass, SerializationCheckerData inSerializationCheckerData)
+    {
+        for (Field field : declaredFields(inClass))
+        {
+            Class<?> fieldDeclaringClass = field.getType();
+
+            if (field.getType() == Object.class)
+                continue;
+
+            if (Modifier.isStatic(field.getModifiers()))
+                continue;
+
+            if (field.isSynthetic())
+                continue;
+
+            if (fieldDeclaringClass.isInterface() || fieldDeclaringClass.isPrimitive())
+                continue;
+
+            if (Modifier.isAbstract(field.getType().getModifiers()))
+                continue;
+
+            if (inSerializationCheckerData.isAlreadyChecked(fieldDeclaringClass))
+                continue;
+
+            if (isSerializable(fieldDeclaringClass))
+            {
+                inSerializationCheckerData.addSerializableClass(inClass);
+
+                SerializationFailure failure = isFullySerializable(field.getType(), inSerializationCheckerData);
+                if (failure != null)
+                    return failure;
+                else
+                    continue;
+            }
+
+            if (Modifier.isTransient(field.getModifiers()))
+                continue;
+
+            return new SerializationFailure(field.getDeclaringClass().getName(), field.getName());
+        }
+        return null;
+    }
+
+    private static boolean isSerializable(Class<?> inClass)
+    {
+        Set<Class<?>> interfaces = getInterfaces(inClass);
+        if (interfaces == null)
+            return false;
+        boolean isSerializable = interfaces.contains(Serializable.class);
+        if (isSerializable)
+            return true;
+
+        for (Class<?> classInterface : interfaces)
+        {
+            if (isSerializable(classInterface))
+                return true;
+        }
+
+        if (inClass.getSuperclass() != null && isSerializable(inClass.getSuperclass()))
+            return true;
+
+        return false;
+    }
+
+    private static Set<Class<?>> getInterfaces(Class<?> inFieldDeclaringClass)
+    {
+        return new HashSet<Class<?>>(Arrays.asList(inFieldDeclaringClass.getInterfaces()));
+    }
+
+    private static List<Field> declaredFields(Class<?> inClass)
+    {
+        List<Field> fields = new ArrayList<Field>(Arrays.asList(inClass.getDeclaredFields()));
+
+        Class<?> parentClasses = inClass.getSuperclass();
+
+        if (parentClasses == null)
+            return fields;
+        fields.addAll(declaredFields(parentClasses));
+
+        return fields;
+        }
+    }
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplication.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplication.java
new file mode 100644
index 0000000000..ba8caee058
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplication.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so;
+
+import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication;
+import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl;
+import org.onap.so.requestsdb.RequestsDBHelper;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Profile;
+
+@SpringBootApplication
+@Profile("test")
+@EnableProcessApplication("MSO CommonBPMN Test Application")
+@ComponentScan(basePackages = {"org.onap.so"}, nameGenerator = DefaultToShortClassNameBeanNameGenerator.class, excludeFilters = {
+		@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class),
+		@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = RequestsDBHelper.class),
+		@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = InfraActiveRequestsRepositoryImpl.class) })
+public class TestApplication {
+	public static void main(String... args) {
+		SpringApplication.run(TestApplication.class, args);
+		System.getProperties().setProperty("mso.db", "MARIADB");
+		System.getProperties().setProperty("server.name", "Springboot");
+		
+		
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplicationConfig.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplicationConfig.java
new file mode 100644
index 0000000000..c483f13887
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/TestApplicationConfig.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.so.bpmn.common.WorkflowTestTransformer;
+import org.springframework.cloud.contract.wiremock.WireMockConfigurationCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+
+@Configuration
+@Profile({"test"})
+public class TestApplicationConfig {
+	
+	@Bean
+	protected ResponseTransformer[] transformerArray() {
+		// Process WorkflowTestTransformer annotations
+		List<ResponseTransformer> transformerList = new ArrayList<ResponseTransformer>();
+
+		for (Field field : getClass().getFields()) {
+			WorkflowTestTransformer annotation = field.getAnnotation(WorkflowTestTransformer.class);
+
+			if (annotation == null) {
+				continue;
+			}
+
+			if (!Modifier.isStatic(field.getModifiers())) {
+				throw new RuntimeException(field.getDeclaringClass().getName()
+					+ "#" + field.getName() + " has a @WorkflowTestTransformer "
+					+ " annotation but it is not declared static");
+			}
+
+			ResponseTransformer transformer;
+
+			try {
+				transformer = (ResponseTransformer) field.get(null);
+			} catch (IllegalAccessException e) {
+				throw new RuntimeException(field.getDeclaringClass().getName()
+					+ "#" + field.getName() + " is not accessible", e);
+			} catch (ClassCastException e) {
+				throw new RuntimeException(field.getDeclaringClass().getName()
+					+ "#" + field.getName() + " is not a ResponseTransformer", e);
+			}
+
+			if (transformer == null) {
+				continue;
+			}
+
+			transformerList.add(transformer);
+		}
+
+		ResponseTransformer[] transformerArray =
+			transformerList.toArray(new ResponseTransformer[transformerList.size()]);
+
+		optionsCustomizer(transformerArray);
+		
+		return transformerArray;
+	}
+	
+	@Bean
+	WireMockConfigurationCustomizer optionsCustomizer(ResponseTransformer[] transformerArray) {
+		return new WireMockConfigurationCustomizer() {
+			@Override
+			public void customize(WireMockConfiguration options) {
+				options.extensions(transformerArray);
+			}
+		};
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/appc/payload/PayloadClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/appc/payload/PayloadClientTest.java
index 95af260ac6..8d681d721c 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/appc/payload/PayloadClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/appc/payload/PayloadClientTest.java
@@ -1,81 +1,81 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2018 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.appc.payload;

-

-import static org.junit.Assert.assertEquals;

-

-import java.util.Optional;

-

-import org.json.JSONObject;

-import org.junit.Test;

-

-public class PayloadClientTest {

-

-	@Test

-	public void upgradeFormatTest()  throws Exception {

-		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\",\"existing-software-version\":\"existingVersion\",\"new-software-version\":\"newVersion\"}}";

-		JSONObject jsonObject = new JSONObject();

-		jsonObject.put("existing-software-version", "existingVersion");

-		jsonObject.put("new-software-version", "newVersion");

-		Optional<String> payload = Optional.of(jsonObject.toString());

-		Optional<String> payloadClient = PayloadClient.upgradeFormat(payload, "vnfName1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}

-

-	@Test

-	public void resumeTrafficFormatTest()  throws Exception {

-		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\"}}";

-		Optional<String> payloadClient = PayloadClient.resumeTrafficFormat("vnfName1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}	

-	

-	@Test

-	public void quiesceTrafficFormatTest()  throws Exception {

-		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\",\"operations_timeout\":\"operationTimeout\"}}";

-		JSONObject jsonObject = new JSONObject();

-		jsonObject.put("operations-timeout", "operationTimeout");

-		Optional<String> payload = Optional.of(jsonObject.toString());

-		Optional<String> payloadClient = PayloadClient.quiesceTrafficFormat(payload, "vnfName1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}	

-	

-	@Test

-	public void startStopFormatTest()  throws Exception {

-		String payloadResult = "{\" AICIdentity \":\"aicIdentity1\"}";

-		Optional<String> payloadClient = PayloadClient.startStopFormat("aicIdentity1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}	

-	

-	@Test

-	public void healthCheckFormatTest()  throws Exception {

-		String payloadResult = "{\"request-parameters\":{\"vnf-name\":\"vnfName1\"},\"configuration-parameters\":{\"vnf_name\":\"vnfName1\"}}";

-		Optional<String> payloadClient = PayloadClient.healthCheckFormat("vnfName1", "vnfHostIpAddress1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}	

-	

-	@Test

-	public void snapshotFormatTest()  throws Exception {

-		String payloadResult = "{\"vm-id\":\"vmId1\",\"identity-url\":\"identityUrl1\"}";

-		Optional<String> payloadClient = PayloadClient.snapshotFormat("vmId1", "identityUrl1"); 

-		assertEquals(payloadResult, payloadClient.get());

-	}	

-	

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.appc.payload;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Optional;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+public class PayloadClientTest {
+
+	@Test
+	public void upgradeFormatTest()  throws Exception {
+		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\",\"existing-software-version\":\"existingVersion\",\"new-software-version\":\"newVersion\"}}";
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("existing-software-version", "existingVersion");
+		jsonObject.put("new-software-version", "newVersion");
+		Optional<String> payload = Optional.of(jsonObject.toString());
+		Optional<String> payloadClient = PayloadClient.upgradeFormat(payload, "vnfName1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}
+
+	@Test
+	public void resumeTrafficFormatTest()  throws Exception {
+		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\"}}";
+		Optional<String> payloadClient = PayloadClient.resumeTrafficFormat("vnfName1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}	
+	
+	@Test
+	public void quiesceTrafficFormatTest()  throws Exception {
+		String payloadResult = "{\"configuration-parameters\":{\"vnf_name\":\"vnfName1\",\"operations_timeout\":\"operationTimeout\"}}";
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("operations-timeout", "operationTimeout");
+		Optional<String> payload = Optional.of(jsonObject.toString());
+		Optional<String> payloadClient = PayloadClient.quiesceTrafficFormat(payload, "vnfName1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}	
+	
+	@Test
+	public void startStopFormatTest()  throws Exception {
+		String payloadResult = "{\" AICIdentity \":\"aicIdentity1\"}";
+		Optional<String> payloadClient = PayloadClient.startStopFormat("aicIdentity1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}	
+	
+	@Test
+	public void healthCheckFormatTest()  throws Exception {
+		String payloadResult = "{\"request-parameters\":{\"vnf-name\":\"vnfName1\"},\"configuration-parameters\":{\"vnf_name\":\"vnfName1\"}}";
+		Optional<String> payloadClient = PayloadClient.healthCheckFormat("vnfName1", "vnfHostIpAddress1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}	
+	
+	@Test
+	public void snapshotFormatTest()  throws Exception {
+		String payloadResult = "{\"vm-id\":\"vmId1\",\"identity-url\":\"identityUrl1\"}";
+		Optional<String> payloadClient = PayloadClient.snapshotFormat("vmId1", "identityUrl1"); 
+		assertEquals(payloadResult, payloadClient.get());
+	}	
+	
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BeansTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/BeansTest.java
index 358ebfa13c..7949fd26e6 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BeansTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/BeansTest.java
@@ -18,23 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common;
+package org.onap.so.bpmn.common;
 
 import org.junit.Test;
+import org.onap.so.openpojo.rules.ToStringTester;
 
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
 import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.rule.impl.GetterMustExistRule;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-import com.openpojo.reflection.PojoClass;
-import com.openpojo.reflection.PojoClassFilter;
-import com.openpojo.reflection.filters.FilterEnum;
-import com.openpojo.reflection.filters.FilterNonConcrete;
-import com.openpojo.reflection.filters.FilterPackageInfo;
-import org.openecomp.mso.openpojo.rules.HasToStringRule;
-import org.openecomp.mso.openpojo.rules.ToStringTester;
 
 public class BeansTest {
 
@@ -46,8 +45,7 @@ public class BeansTest {
 
 	@Test
 	public void pojoStructure() {	
-		test("org.openecomp.mso.bpmn.appc.payload.beans");		
-		test("org.openecomp.mso.client.sdnc.beans");	
+		test("org.onap.so.bpmn.appc.payload.beans");		
 	}
 
 	private void test(String pojoPackage) {
@@ -68,6 +66,7 @@ public class BeansTest {
 		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses,enumFilter,new FilterNonConcrete());
 	}
 	private static class FilterTestClasses implements PojoClassFilter {
+		@Override
 		public boolean include(PojoClass pojoClass) {
 			return !pojoClass.getSourcePath().contains("/test-classes/");
 		}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DefaultToShortClassNameBeanNameGeneratorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DefaultToShortClassNameBeanNameGeneratorTest.java
new file mode 100644
index 0000000000..8a2c8fbfdd
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DefaultToShortClassNameBeanNameGeneratorTest.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.core.type.AnnotationMetadata;
+
+public class DefaultToShortClassNameBeanNameGeneratorTest {
+
+
+	@Mock
+	private BeanDefinitionRegistry beanDefinitionRegistry;
+	
+	private DefaultToShortClassNameBeanNameGenerator customBeanNameGenerator = new DefaultToShortClassNameBeanNameGenerator();
+	
+	@Before
+	public void before() {
+		MockitoAnnotations.initMocks(this);
+	}
+	
+	@Test
+	public void test_generateBeanName_notAnnotatedBeanDefinition() {
+		String expectedBeanName = "BeanName";
+		
+		AnnotatedBeanDefinition annotatedBeanDefinition = mock(AnnotatedBeanDefinition.class);
+		AnnotationMetadata metadata = mock(AnnotationMetadata.class);
+		when(metadata.getAnnotationTypes()).thenReturn(new HashSet<String>());
+		when(annotatedBeanDefinition.getBeanClassName()).thenReturn("org.onap.so.BeanName");
+		when(annotatedBeanDefinition.getMetadata()).thenReturn(metadata);
+		String actualBeanName = customBeanNameGenerator.generateBeanName(annotatedBeanDefinition, beanDefinitionRegistry);
+		
+		assertEquals(expectedBeanName, actualBeanName);
+	}
+	
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DelegateExecutionImplTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DelegateExecutionImplTest.java
new file mode 100644
index 0000000000..cf74356fa2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/DelegateExecutionImplTest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.contains;
+import static org.mockito.Mockito.mock;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.camunda.bpm.extension.mockito.delegate.DelegateExecutionFake;
+import org.hamcrest.collection.IsIterableContainingInOrder;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.bpmn.common.exceptions.MalformedBuildingBlockInputException;
+import org.onap.so.bpmn.common.exceptions.MissingBuildingBlockInputException;
+import org.onap.so.bpmn.common.exceptions.RequiredExecutionVariableExeception;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+
+public class DelegateExecutionImplTest {
+
+	@Rule
+	public ExpectedException thrown= ExpectedException.none();
+
+	
+	@Test
+	public void getVariable() throws RequiredExecutionVariableExeception {
+		Map<String, Serializable> map = new HashMap<>();
+		map.put("var1", "value1");
+		map.put("var2", "value2");
+		map.put("list1", (Serializable)Arrays.asList("value1", "value2"));
+		DelegateExecutionImpl impl = create(map);
+		
+		assertEquals("value1", impl.getVariable("var1"));
+		assertEquals("value2", impl.getRequiredVariable("var2"));
+		assertThat(impl.getVariable("list1"), IsIterableContainingInOrder.contains("value1", "value2"));
+
+	}
+	
+	
+	@Test
+	public void getRequiredVariableNotFound() throws RequiredExecutionVariableExeception {
+		DelegateExecutionImpl impl = create();
+		
+		thrown.expect(RequiredExecutionVariableExeception.class);
+		impl.getRequiredVariable("var1");
+	}
+	
+	
+	@Test
+	public void setVariable() {
+		DelegateExecutionImpl impl = create();
+		impl.setVariable("var1", "value1");
+		
+		assertEquals("value1", impl.get("var1"));
+	}
+	
+	@Test
+	public void getGeneralBuildingBlock() {
+		GeneralBuildingBlock gBB = mock(GeneralBuildingBlock.class);
+		Map<String, Serializable> map = new HashMap<>();
+		map.put("gBBInput", gBB);
+		DelegateExecutionImpl impl = create(map);
+		
+		assertEquals(gBB, impl.getGeneralBuildingBlock());
+	}
+	
+	@Test
+	public void getGeneralBuildingBlockNotFound() {
+
+		DelegateExecutionImpl impl = create();
+		
+		thrown.expect(MissingBuildingBlockInputException.class);
+		impl.getGeneralBuildingBlock();
+	}
+	
+	@Test
+	public void getGeneralBuildingBlockCastException() {
+		Map<String, Serializable> map = new HashMap<>();
+		map.put("gBBInput", new DelegateExecutionFake());
+		DelegateExecutionImpl impl = create(map);
+		
+		thrown.expect(MalformedBuildingBlockInputException.class);
+		impl.getGeneralBuildingBlock();
+	}
+	
+	@Test
+	public void getDelegateExecution() {
+		DelegateExecutionImpl impl = create();
+
+		assertNotNull(impl.getDelegateExecution());
+	}
+	
+	@Test
+	public void getLookupMap() {
+		Map<String, Serializable> lookup = new HashMap<>();
+		Map<String, Serializable> map = new HashMap<>();
+		map.put("lookupKeyMap", (Serializable) lookup);
+		DelegateExecutionImpl impl = create(map);
+		
+		assertEquals(lookup, impl.getLookupMap());
+	}
+	
+	private DelegateExecutionImpl create() {
+		return create(new HashMap<String, Serializable>());
+	}
+	
+	private DelegateExecutionImpl create(Map<String, Serializable> map) {
+		DelegateExecutionFake fake = new DelegateExecutionFake();
+		
+		for (Entry<String, Serializable> entry : map.entrySet()) {
+			fake.setVariable(entry.getKey(), entry.getValue());
+		}
+		return new DelegateExecutionImpl(fake);
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MSOCommonApplication.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MSOCommonApplication.java
new file mode 100644
index 0000000000..514d93bdf8
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MSOCommonApplication.java
@@ -0,0 +1,115 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+import org.camunda.bpm.application.PostDeploy;
+import org.camunda.bpm.application.PreUndeploy;
+import org.camunda.bpm.application.ProcessApplicationInfo;
+import org.camunda.bpm.engine.ProcessEngine;
+import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication;
+import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator;
+import org.onap.so.db.request.data.repository.InfraActiveRequestsRepositoryImpl;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.requestsdb.RequestsDBHelper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+/**
+ * @since Version 1.0
+ *
+ */
+
+@SpringBootApplication
+@EnableProcessApplication("MSO Common Application")
+@EnableAsync
+@ComponentScan(basePackages = { "org.onap" }, nameGenerator = DefaultToShortClassNameBeanNameGenerator.class, excludeFilters = {
+				@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class),
+				@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = RequestsDBHelper.class),
+				@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = InfraActiveRequestsRepositoryImpl.class) })
+public class MSOCommonApplication {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL,
+			MSOCommonApplication.class);
+
+	@Value("${mso.async.core-pool-size}")
+	private int corePoolSize;
+
+	@Value("${mso.async.max-pool-size}")
+	private int maxPoolSize;
+
+	@Value("${mso.async.queue-capacity}")
+	private int queueCapacity;
+
+	private static final String LOGS_DIR = "logs_dir";
+
+
+	private static void setLogsDir() {
+		if (System.getProperty(LOGS_DIR) == null) {
+			System.getProperties().setProperty(LOGS_DIR, "./logs/bpmn/");
+		}
+	}
+
+	public static void main(String... args) {
+		SpringApplication.run(MSOCommonApplication.class, args);
+		System.getProperties().setProperty("mso.config.path", ".");
+		setLogsDir();
+	}
+
+	@PostDeploy
+	public void postDeploy(ProcessEngine processEngineInstance) {
+		long startTime = System.currentTimeMillis();
+
+		msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
+				"Post deployment complete...");
+	}
+
+	@PreUndeploy
+	public void cleanup(ProcessEngine processEngine, ProcessApplicationInfo processApplicationInfo,
+			List<ProcessEngine> processEngines) {
+		long startTime = System.currentTimeMillis();
+
+		msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
+				"Pre Undeploy complete...");
+
+	}
+
+	@Bean
+	public Executor asyncExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+		executor.setCorePoolSize(corePoolSize);
+		executor.setMaxPoolSize(maxPoolSize);
+		executor.setQueueCapacity(queueCapacity);
+		executor.setThreadNamePrefix("Camunda-");
+		executor.initialize();
+		return executor;
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteGenericVnf.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteGenericVnf.java
new file mode 100644
index 0000000000..819962f16c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteGenericVnf.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+public class MockAAIDeleteGenericVnf {
+	public MockAAIDeleteGenericVnf(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))
+				.willReturn(aResponse()
+						.withStatus(200)));
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("aaiFault.xml")));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteVfModule.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteVfModule.java
new file mode 100644
index 0000000000..9cb10a0494
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIDeleteVfModule.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+public class MockAAIDeleteVfModule {
+	
+	public MockAAIDeleteVfModule()
+	{
+		stubFor(delete(urlMatching(
+				"/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73/[?]resource-version=0000073"))
+						.willReturn(aResponse().withStatus(200)));
+		stubFor(delete(urlMatching(
+				"/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a75/[?]resource-version=0000075"))
+						.willReturn(aResponse().withStatus(200)));
+		stubFor(delete(urlMatching(
+				"/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a78/[?]resource-version=0000078"))
+						.willReturn(aResponse().withStatus(200)));
+		stubFor(delete(urlMatching(
+				"/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a77/[?]resource-version=0000077"))
+						.willReturn(aResponse().withStatus(500).withHeader("Content-Type", "text/xml")
+								.withBodyFile("aaiFault.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))
+				.willReturn(aResponse().withStatus(200).withHeader("Content-Type", "text/xml")
+						.withBodyFile("VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml")));
+
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
+				.willReturn(aResponse().withStatus(200)));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIGenericVnfSearch.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIGenericVnfSearch.java
new file mode 100644
index 0000000000..b46d528cc5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockAAIGenericVnfSearch.java
@@ -0,0 +1,340 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.common;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+public class MockAAIGenericVnfSearch {
+	
+	private static final String EOL = "\n";
+
+	public MockAAIGenericVnfSearch(){
+		String body;
+		
+		// The following stubs are for CreateAAIVfModule and UpdateAAIVfModule
+	
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("aaiFault.xml")));
+	
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))
+				.willReturn(aResponse()
+						.withStatus(404)
+						.withHeader("Content-Type", "text/xml")
+						.withBody("Generic VNF Not Found")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(404)
+						.withHeader("Content-Type", "text/xml")
+						.withBody("Generic VNF Not Found")));
+	
+		body =
+			"<generic-vnf xmlns=\"http://com.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>1508691</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>1508692</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		body =
+			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>1508691</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC20-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>1508692</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>1508692</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		// The following stubs are for DeleteAAIVfModule
+	
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("aaiFault.xml")));
+	
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(404)
+						.withHeader("Content-Type", "text/xml")
+						.withBody("Generic VNF Not Found")));
+	
+		body =
+				"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+				"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +
+				"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +
+				"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+				"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+				"  <equipment-role>vMMSC</equipment-role>" + EOL +
+				"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+				"  <in-maint>false</in-maint>" + EOL +
+				"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+				"  <resource-version>0000021</resource-version>" + EOL +
+				"  <vf-modules>" + EOL +
+				"    <vf-module>" + EOL +
+				"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +
+				"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +
+				"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +
+				"      <persona-model-version>1.0</persona-model-version>" + EOL +
+				"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+				"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+				"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+				"      <resource-version>0000073</resource-version>" + EOL +
+				"    </vf-module>" + EOL +
+				"  </vf-modules>" + EOL +
+				"  <relationship-list/>" + EOL +
+				"  <l-interfaces/>" + EOL +
+				"  <lag-interfaces/>" + EOL +
+				"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		body =
+			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>0000020</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC20-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000074</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a75</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a75</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000075</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		body =
+			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c719</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC19</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>0000019</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC19-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000076</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a77</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC19-MMSC::module-1-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a77</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000077</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		body =
+			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c718</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC18</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>0000018</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a78</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC18-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a78</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000078</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+		body =
+			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +
+			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +
+			"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +
+			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +
+			"  <service-id>SDN-MOBILITY</service-id>" + EOL +
+			"  <equipment-role>vMMSC</equipment-role>" + EOL +
+			"  <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"  <in-maint>false</in-maint>" + EOL +
+			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +
+			"  <resource-version>0000021</resource-version>" + EOL +
+			"  <vf-modules>" + EOL +
+			"    <vf-module>" + EOL +
+			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +
+			"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +
+			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +
+			"      <persona-model-version>1.0</persona-model-version>" + EOL +
+			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +
+			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +
+			"      <orchestration-status>pending-create</orchestration-status>" + EOL +
+			"      <resource-version>0000073</resource-version>" + EOL +
+			"    </vf-module>" + EOL +
+			"  </vf-modules>" + EOL +
+			"  <relationship-list/>" + EOL +
+			"  <l-interfaces/>" + EOL +
+			"  <lag-interfaces/>" + EOL +
+			"</generic-vnf>" + EOL;
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBody(body)));
+	
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCSvcOperation.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockLoggerDelegate.java
index 8cf1052064..6a9ff2a4a8 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdnc/beans/SDNCSvcOperation.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/MockLoggerDelegate.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 - 2018 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.
@@ -18,26 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdnc.beans;

-

-public enum SDNCSvcOperation {

-

-	VF_MODULE_TOPOLOGY_OPERATION("vf-module-topology-operation"),

-	NETWORK_TOPOLOGY_OPERATION("network-topology-operation"),

-	VNF_TOPOLOGY_OPERATION("vnf-topology-operation"),

-	CONTRAIL_ROUTE_TOPOLOGY_OPERATION("contrail-route-topology-operation"),

-	SECURITY_ZONE_TOPOLOGY_OPERATION("security-zone-topology-operation"),

-	PORT_MIRROR_TOPOLOGY_OPERATION("port-mirror-topology-operation"),

-	SERVICE_TOPOLOGY_OPERATION("service-topology-operation");

-	

-	private final String name;

-	

-	private SDNCSvcOperation(String name) {

-		this.name = name;

-	}

-	

-	@Override

-	public String toString() {

-		return name;

-	}

-}

+package org.onap.so.bpmn.common;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.delegate.JavaDelegate;
+
+public class MockLoggerDelegate implements JavaDelegate {
+	@Override
+	public void execute(DelegateExecution execution) throws Exception {
+		System.out.println("\n\n ..." + MockLoggerDelegate.class.getName() + " invoked by " + "processDefinitionId="
+				+ execution.getProcessDefinitionId() + ", activtyId=" + execution.getCurrentActivityId()
+				+ ", activtyName='" + execution.getCurrentActivityName() + "'" + ", processInstanceId="
+				+ execution.getProcessInstanceId() + ", businessKey=" + execution.getProcessBusinessKey()
+				+ ", executionId=" + execution.getId() + " \n\n");
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SPIPropertiesTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/SPIPropertiesTest.java
index e9a5492b6f..9239889f28 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SPIPropertiesTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/SPIPropertiesTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.bpmn.common;
+package org.onap.so.bpmn.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -28,11 +28,11 @@ import java.io.IOException;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.mso.client.RestPropertiesLoader;
-import org.openecomp.mso.client.aai.AAIProperties;
-import org.openecomp.mso.client.dmaap.DmaapProperties;
-import org.openecomp.mso.client.dmaap.DmaapPropertiesLoader;
-import org.openecomp.mso.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
+import org.onap.so.client.RestPropertiesLoader;
+import org.onap.so.client.aai.AAIProperties;
+import org.onap.so.client.dmaap.DmaapProperties;
+import org.onap.so.client.dmaap.DmaapPropertiesLoader;
+import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
 
 public class SPIPropertiesTest {
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/WorkflowContextHolderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/WorkflowContextHolderTest.java
new file mode 100644
index 0000000000..4a51d34c3e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/WorkflowContextHolderTest.java
@@ -0,0 +1,68 @@
+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * 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.onap.so.bpmn.common;
+
+
+
+import java.util.UUID;
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.so.bpmn.common.workflow.context.WorkflowCallbackResponse;
+import org.onap.so.bpmn.common.workflow.context.WorkflowContext;
+import org.onap.so.bpmn.common.workflow.context.WorkflowContextHolder;
+import org.onap.so.bpmn.common.workflow.context.WorkflowResponse;
+
+
+public class WorkflowContextHolderTest {
+
+
+	@Test
+	public void testProcessCallback() throws Exception {
+		String requestId = UUID.randomUUID().toString();		
+		String message = "TEST MESSATGE";
+		String responseMessage = "Successfully processed request";
+		int testCode = 200;		
+		
+		
+		WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
+		 
+		WorkflowCallbackResponse callbackResponse = new WorkflowCallbackResponse();
+		callbackResponse.setMessage(message);
+		callbackResponse.setResponse(responseMessage);
+		callbackResponse.setStatusCode(testCode);
+		
+		contextHolder.processCallback("testAsyncProcess","process-instance-id",requestId,callbackResponse);
+		
+		//same object returned
+		WorkflowContext contextFound = contextHolder.getWorkflowContext(requestId);
+		if(contextFound == null)
+			throw new Exception("Expected to find Context Object");
+		
+		WorkflowResponse testResponse = contextFound.getWorkflowResponse();
+		Assert.assertEquals(200,testResponse.getMessageCode());
+		Assert.assertEquals(message, testResponse.getMessage());
+		Assert.assertEquals(responseMessage, testResponse.getResponse());
+		
+		
+
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTestTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/WorkflowTestTransformer.java
index ea338c21bf..dbad35a6a4 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTestTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/WorkflowTestTransformer.java
@@ -1,41 +1,41 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common;

-

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-

-/**

- * Allows a subclass of WorkflowTest to specify one or more WireMock

- * response transformers.  A transformer must be declared as a public

- * static field in the subclass.  For example:

- * <pre>

- *     @WorkflowTestTransformer

- *     public static final ResponseTransformer sdncAdapterMockTransformer =

- *         new SDNCAdapterMockTransformer();

- * </pre>

- */

-@Retention(RetentionPolicy.RUNTIME)

-@Target(ElementType.FIELD)

-public @interface WorkflowTestTransformer {

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Allows a subclass of WorkflowTest to specify one or more WireMock
+ * response transformers.  A transformer must be declared as a public
+ * static field in the subclass.  For example:
+ * <pre>
+ *     @WorkflowTestTransformer
+ *     public static final ResponseTransformer sdncAdapterMockTransformer =
+ *         new SDNCAdapterMockTransformer();
+ * </pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface WorkflowTestTransformer {
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/BpmnParamTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/BpmnParamTest.java
new file mode 100644
index 0000000000..5510e21b31
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/BpmnParamTest.java
@@ -0,0 +1,41 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.common.recipe;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BpmnParamTest {
+
+	BpmnParam bp=new BpmnParam();
+	
+	@Test
+	public void test() {
+		bp.setValue("testdata");
+	    assertEquals(bp.getValue(),"testdata");
+	}
+	@Test
+	public void testToString(){
+		assert(bp.toString()!=null);
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/ResourceInputTest.java
index 466f4a1f3f..70191311b2 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/ResourceInputTest.java
@@ -1,30 +1,31 @@
 /*
 * ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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=========================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.common.recipe;
+package org.onap.so.bpmn.common.recipe;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.openecomp.mso.bpmn.core.domain.ModelInfo;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.core.domain.ModelInfo;
 
-public class ResourceInputTest {
+public class ResourceInputTest extends BaseTest{
    
 	ResourceInput ri=new ResourceInput();
 	@Test
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/ResourceRecipeRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/ResourceRecipeRequestTest.java
new file mode 100644
index 0000000000..f0f6fa79e0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/recipe/ResourceRecipeRequestTest.java
@@ -0,0 +1,52 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.onap.so.bpmn.common.recipe;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.onap.so.BaseTest;
+
+public class ResourceRecipeRequestTest extends BaseTest{
+
+	ResourceRecipeRequest rr=new ResourceRecipeRequest();
+	BpmnParam bp=new BpmnParam();
+	@Test
+	public void test() {
+		rr.setResourceInput(bp);
+		rr.setHost(bp);
+		rr.setRequestId(bp);
+		rr.setRequestAction(bp);
+		rr.setServiceInstanceId(bp);
+		rr.setServiceType(bp);
+		rr.setRecipeParams(bp);
+		assertEquals(rr.getResourceInput(),bp);
+		assertEquals(rr.getHost(),bp);
+		assertEquals(rr.getRequestId(),bp);
+		assertEquals(rr.getRequestAction(),bp);
+		assertEquals(rr.getServiceInstanceId(),bp);
+		assertEquals(rr.getServiceType(),bp);
+		assertEquals(rr.getRecipeParams(),bp);
+	}
+	@Test
+	public void testToString(){
+		assert(rr.toString()!=null);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
index 5170e9d5d9..5598e3d2e4 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilderTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.common.resource;
+package org.onap.so.bpmn.common.resource;
 
 import org.junit.Test;
 
@@ -28,7 +28,7 @@ public class ResourceRequestBuilderTest {
     @Test
     public void buildResouceRequestTest() throws Exception {
 
-        ResourceRequestBuilder.buildResouceRequest("aa4535",
+        ResourceRequestBuilder.buildResouceRequest("xxxxxx",
                 "a1074969-944f-4ddc-b687-9550b0c8cd57", new HashMap<>());
     }
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/util/CryptoHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/util/CryptoHandlerTest.java
index 724d3edf4d..cbde63e933 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/util/CryptoHandlerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/util/CryptoHandlerTest.java
@@ -1,42 +1,55 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2018 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.common.util;

-

-import static org.junit.Assert.assertEquals;

-

-import org.junit.Test;

-

-public class CryptoHandlerTest {

-

-	@Test

-	public void test()  throws Exception {

-		String plainPswd = "mso0206";

-		String encryptPwd = "C1FC4A39E16419DD41DFC1212843F440";

-		CryptoHandler cryptoHandler = new CryptoHandler();

-		String aaiPassword = cryptoHandler.getMsoAaiPassword();

-		assertEquals(plainPswd, aaiPassword);

-		String encryptPassword = cryptoHandler.encryptMsoPassword(plainPswd);

-		assertEquals(encryptPwd, encryptPassword);

-		String decryptPassword = cryptoHandler.decryptMsoPassword(encryptPwd);

-		assertEquals(plainPswd, decryptPassword);

-	}

-

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 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.onap.so.bpmn.common.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.onap.so.BaseTest;
+
+public class CryptoHandlerTest {
+	private static final String plainPswd = "mso0206";
+	private static final String encryptPwd = "C1FC4A39E16419DD41DFC1212843F440";
+	private CryptoHandler cryptoHandler;
+	
+	@Before
+	public void setup() {
+		cryptoHandler = new CryptoHandler();
+	}
+	
+	@Test
+	@Ignore // ignored until we can mock the properties file.
+	public void getMsoAaiPasswordTest() {
+		assertEquals(plainPswd, cryptoHandler.getMsoAaiPassword());
+	}
+	
+	@Test
+	public void encryptMsoPasswordTest() {
+		assertEquals(encryptPwd, cryptoHandler.encryptMsoPassword(plainPswd));
+	}
+	
+	@Test
+	public void decryptMsoPasswordTest() {
+		assertEquals(plainPswd, cryptoHandler.decryptMsoPassword(encryptPwd));
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/FileUtil.java
index 38d0584d0d..b6acdf7adb 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/FileUtil.java
@@ -1,26 +1,28 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import java.io.IOException;
 import java.io.InputStream;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.logger.MsoLogger;
 
 /**
  * 
@@ -33,7 +35,7 @@ import org.openecomp.mso.logger.MsoLogger;
  */
 public class FileUtil {
 
-    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, FileUtil.class);
     
 	/**
 	 * Read the specified resource file and return the contents as a String.
@@ -48,9 +50,13 @@ public class FileUtil {
 			stream = getResourceAsStream(fileName);
 			byte[] bytes;
 			bytes = new byte[stream.available()];
-			stream.read(bytes);
-			stream.close();
-			return new String(bytes);
+			if(stream.read(bytes) > 0) {
+				stream.close();
+				return new String(bytes);
+			} else {
+				stream.close();
+				return "";
+			}
 		} catch (IOException e) {
 		    LOGGER.debug("Exception:", e);
 			return "";
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/MockResource.java
index 9ead882b07..b9a413fc96 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/MockResource.java
@@ -1,22 +1,24 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 
@@ -52,16 +54,16 @@ public class MockResource {
 	}
 
 	private synchronized void initMockServer(int portNumber) {
-		String path = FileUtil.class.getClassLoader().getResource("__files/sdncSimResponse.xml").getFile();
+		String path = "src/test/resources/" + "__files/sdncSimResponse.xml";
 		path = path.substring(0,path.indexOf("__files/"));
 
-		wireMockServer = new WireMockServer(wireMockConfig().port(portNumber).extensions("org.openecomp.mso.bpmn.mock.SDNCAdapterMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.SDNCAdapterNetworkTopologyMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterCreateMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterDeleteMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterUpdateMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterRollbackMockTransformer")
-																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterQueryMockTransformer"));
+		wireMockServer = new WireMockServer(wireMockConfig().port(portNumber).extensions("org.onap.so.bpmn.mock.SDNCAdapterMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.SDNCAdapterNetworkTopologyMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.VnfAdapterCreateMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.VnfAdapterDeleteMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.VnfAdapterUpdateMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.VnfAdapterRollbackMockTransformer")
+																			.extensions("org.onap.so.bpmn.mock.VnfAdapterQueryMockTransformer"));
 																			//.withRootDirectory(path));
 		//Mocks were failing - commenting out for now, both mock and transformers seem to work fine
 		WireMock.configureFor("localhost", portNumber);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/MockResourceApplication.java
index ba48bffca0..6c62920781 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/MockResourceApplication.java
@@ -1,22 +1,24 @@
-/* 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -24,11 +26,14 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
+import org.junit.Ignore;
+
 /**
  * 
  * JAX RS Application wiring for Mock Resource
  */
 @ApplicationPath("/console")
+@Ignore
 public class MockResourceApplication extends Application {
 
 	private Set<Object> singletons = new HashSet<>();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterAsyncTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterAsyncTransformer.java
index 93cf0bddef..9b5bb33bf8 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterAsyncTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterAsyncTransformer.java
@@ -18,15 +18,18 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.mock;
+package org.onap.so.bpmn.mock;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
+import javax.ws.rs.core.UriBuilder;
+
+import org.onap.so.client.HttpClient;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.BinaryFile;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
@@ -35,7 +38,7 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;
  * Simulates SDNC Adapter Callback response
  *
  */
-public class SDNCAdapterAsyncTransformer extends ResponseTransformer {
+public class SDNCAdapterAsyncTransformer extends ResponseDefinitionTransformer {
 
 	private String syncResponse;
 	private String callbackResponseWrapper;
@@ -44,8 +47,9 @@ public class SDNCAdapterAsyncTransformer extends ResponseTransformer {
 		syncResponse = FileUtil.readResourceFile("__files/StandardSDNCSynchResponse.xml");
 		callbackResponseWrapper = FileUtil.readResourceFile("__files/sdncCallbackSoapWrapper.xml");
 	}
-
-	public String name() {
+	
+	@Override
+	public String getName() {
 		return "sdnc-adapter-vf-module-assign";
 	}
 
@@ -58,7 +62,7 @@ public class SDNCAdapterAsyncTransformer extends ResponseTransformer {
 	 */
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 		
 		String requestBody = request.getBodyAsString();
 		
@@ -84,10 +88,6 @@ public class SDNCAdapterAsyncTransformer extends ResponseTransformer {
 			}
 		}
 		
-		// Transform the SDNC response to escape < and >
-		sdncResponse = sdncResponse.replaceAll ("<", "&lt;");
-		sdncResponse = sdncResponse.replaceAll (">", "&gt;");
-		
 		// Next substitute the SDNC response into the callbackResponse (SOAP wrapper).
 		// Also, replace the request ID wherever it appears
 		String callbackResponse = callbackResponseWrapper.replace("SDNC_RESPONSE_DATA", sdncResponse).replaceAll("SDNC_REQUEST_ID", requestId);
@@ -140,13 +140,9 @@ public class SDNCAdapterAsyncTransformer extends ResponseTransformer {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			System.out.println("Sending callback response:" + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			System.err.println(payLoad);
 			try {
-				ClientResponse result = request.post();
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.SDNC_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterMockTransformer.java
index 9c4e7936b1..8c34b65c00 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterMockTransformer.java
@@ -1,42 +1,46 @@
-/* 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.onap.so.bpmn.mock;
 
-package org.openecomp.mso.bpmn.mock;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
 /**
  * 
  * Simulates SDNC Adapter Callback response
  *
  */
-public class SDNCAdapterMockTransformer extends ResponseTransformer {
+public class SDNCAdapterMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapterMockTransformer.class);
 	private String callbackResponse;
 	private String requestId;
 	
@@ -48,7 +52,8 @@ public class SDNCAdapterMockTransformer extends ResponseTransformer {
 		this.requestId = requestId;
 	}
 	
-	public String name() {
+	@Override
+	public String getName() {
 		return "sdnc-adapter-transformer";
 	}
 
@@ -61,7 +66,7 @@ public class SDNCAdapterMockTransformer extends ResponseTransformer {
 	 */
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 		String requestBody = request.getBodyAsString();
 		
 		String callbackUrl = requestBody.substring(requestBody.indexOf("<sdncadapter:CallbackUrl>")+25, requestBody.indexOf("</sdncadapter:CallbackUrl>"));
@@ -125,12 +130,9 @@ public class SDNCAdapterMockTransformer extends ResponseTransformer {
 				LOGGER.debug("Exception :",e1);
 			}
 			LOGGER.debug("Sending callback response:" + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			System.err.println(payLoad);
 			try {
-				ClientResponse result = request.post();
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.SDNC_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				LOGGER.debug("Exception :",e);
 			}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
index e59e3b67d2..f53fd6f424 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
@@ -1,37 +1,42 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
-
-public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransformer {
+public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCAdapterNetworkTopologyMockTransformer.class);
 	
 	private String callbackResponse;
 	private String requestId;
@@ -44,12 +49,13 @@ public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransform
 		this.requestId = requestId;
 	}
 	
-	public String name() {
+	@Override
+	public String getName() {
 		return "network-topology-operation-transformer";
 	}
 
 	@Override
-	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource fileSource) {
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource fileSource, Parameters parameters) {
 		String requestBody = request.getBodyAsString();
 		
 		String callbackUrl = requestBody.substring(requestBody.indexOf("<sdncadapter:CallbackUrl>")+25, requestBody.indexOf("</sdncadapter:CallbackUrl>"));
@@ -115,12 +121,10 @@ public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransform
 				LOGGER.debug("Exception :",e1);
 			}
 			LOGGER.debug("Sending callback response to url: " + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.err.println(payLoad);
 			try {
-				ClientResponse result = request.post();
-				LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.SDNC_ADAPTER);
+				Response response = client.post(payLoad);
+				LOGGER.debug("Successfully posted callback? Status: " + response.getStatus());
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 			    LOGGER.debug("catch error in - request.post() ");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseAAI.java
index 6efd992566..c7d1a7c81f 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseAAI.java
@@ -1,24 +1,26 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -98,6 +100,16 @@ public class StubResponseAAI {
 	/**
 	 * Service Instance Mock StubResponses below
 	 */
+	public static void MockGetServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")));
+	}
+
+	/**
+	 * Service Instance Mock StubResponses below
+	 */
 	public static void MockGetServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
 		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
 				.willReturn(aResponse()
@@ -178,8 +190,8 @@ public class StubResponseAAI {
 				  .withStatus(statusCode)));
 	}
 	
-	public static void MockGetServiceInstance(String customer, String serviceSubscription, String resourceVersion, int statusCode){
-		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "[?]resource-version=" + resourceVersion))
+	public static void MockGetServiceInstance(String customer, String serviceSubscription, int statusCode){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription))
 				  .willReturn(aResponse()
 				  .withStatus(200)
 				  .withHeader("Content-Type", "text/xml")));
@@ -341,7 +353,8 @@ public class StubResponseAAI {
 	}
 
 	public static void MockGetGenericVnfById_500(String vnfId){
-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+		stubFor(get(urlMatching("/aai/v9/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
+				.withQueryParam("depth", equalTo("1"))
 				.willReturn(aResponse()
 						.withStatus(500)));
 	}
@@ -765,9 +778,13 @@ public class StubResponseAAI {
 	 * Volume Group StubResponse below
 	 */
 	public static void MockGetVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile) {
+		MockGetVolumeGroupById(cloudRegionId, volumeGroupId, responseFile, 200);
+	}
+	
+	public static void MockGetVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile, int responseCode) {
 		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
 				.willReturn(aResponse()
-						.withStatus(200)
+						.withStatus(responseCode)
 						.withHeader("Content-Type", "text/xml")
 						.withBodyFile(responseFile)));
 	}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAPPC.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseAPPC.java
index e94f0142d2..58e7dcdaad 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAPPC.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseAPPC.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseDatabase.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseDatabase.java
index ffa6701a89..6227b05d07 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseDatabase.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseDatabase.java
@@ -1,22 +1,24 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -36,7 +38,7 @@ public class StubResponseDatabase {
 	}
 
 	public static void MockUpdateRequestDB(String fileName){
-		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+		stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
 				.willReturn(aResponse()
 				.withStatus(200)
 			    .withHeader("Content-Type", "text/xml")
@@ -44,7 +46,7 @@ public class StubResponseDatabase {
 	}	
 	
 	public static void mockUpdateRequestDB(int statusCode, String reponseFile) {
-		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+		stubFor(post(urlEqualTo("/services/RequestsDbAdapter"))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 			    .withHeader("Content-Type", "text/xml")
@@ -82,7 +84,8 @@ public class StubResponseDatabase {
 	}
 	
 	public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String serviceModelVersion, String responseFile){
-		stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid + 
+		stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" +
+				serviceModelInvariantUuid + 
 				"&serviceModelVersion=" + serviceModelVersion))
 				  .willReturn(aResponse()
 				  .withStatus(200)
@@ -91,7 +94,7 @@ public class StubResponseDatabase {
 	}
 	
 	public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String responseFile){
-		stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid))
+		stubFor(get(urlEqualTo("/ecomp/mso/catalog/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid))
 				  .willReturn(aResponse()
 				  .withStatus(200)
 				  .withHeader("Content-Type", "application/json")
@@ -106,5 +109,10 @@ public class StubResponseDatabase {
                   .withBodyFile(responseFile)));
     }	
 	
-
+	public static void MockPostRequestDB(){
+		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+				.willReturn(aResponse()
+				.withStatus(200)
+			    .withHeader("Content-Type", "text/xml")));
+	}	
 }
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseNetworkAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseNetworkAdapter.java
index 8baeb1b137..d88509cb57 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseNetworkAdapter.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseNetworkAdapter.java
@@ -1,22 +1,24 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseOof.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseOof.java
index b969b382c0..335fd94f5b 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseOof.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseOof.java
@@ -1,13 +1,15 @@
-/*
+/*-
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
+ * Copyright (C) 2017 - 2018 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.
@@ -16,10 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-package org.openecomp.mso.bpmn.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponsePolicy.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponsePolicy.java
index fd13084613..809616dff0 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponsePolicy.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponsePolicy.java
@@ -1,22 +1,24 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSDNCAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseSDNCAdapter.java
index f41d6d7dba..e0c51b794c 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSDNCAdapter.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseSDNCAdapter.java
@@ -1,28 +1,31 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 
 /**
  * Please describe the StubResponseSDNC.java class
@@ -47,7 +50,7 @@ public class StubResponseSDNCAdapter {
 	}		
 	
 	public static void mockSDNCAdapter(int statusCode) {
-		stubFor(post(urlEqualTo("/SDNCAdapter"))
+		stubFor(post(urlMatching(".*/SDNCAdapter"))
 				.willReturn(aResponse()
 						.withStatus(statusCode)));
 	}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSNIRO.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseSNIRO.java
index c16ac43d41..22d3191821 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSNIRO.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseSNIRO.java
@@ -1,13 +1,15 @@
-/*
+/*-
  * ============LICENSE_START=======================================================
  * ONAP - SO
  * ================================================================================
+ * 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.
@@ -16,10 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-package org.openecomp.mso.bpmn.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -29,7 +28,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 /**
  * Please describe the StubResponseSNIRO.java class
  *
- * @author cb645j
  */
 public class StubResponseSNIRO {
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseVNFAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseVNFAdapter.java
index d518ab0b1c..91ecbd23b4 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseVNFAdapter.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/StubResponseVNFAdapter.java
@@ -1,22 +1,24 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
@@ -76,55 +78,55 @@ public class StubResponseVNFAdapter {
 	}
 	
 	public static void mockVNFPost(String vfModuleId, int statusCode, String vnfId) {
-		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
-		stubFor(post(urlEqualTo("/vnfs/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
 	}
 	
 	public static void mockVNFPut(String vfModuleId, int statusCode) {
-		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/vnfId/vf-modules" + vfModuleId))
+		stubFor(put(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
-		stubFor(put(urlEqualTo("/vnfs/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId))
+		stubFor(put(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
 	}
 	
 	public static void mockVNFPut(String vnfId, String vfModuleId, int statusCode) {
-		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(put(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
-		stubFor(put(urlEqualTo("/vnfs/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(put(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
 	}
 	
 	public static void mockVNFDelete(String vnfId, String vfModuleId, int statusCode) {
-		stubFor(delete(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(delete(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
-		stubFor(delete(urlEqualTo("/vnfs/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+		stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
 	}
 	
 	public static void mockVNFRollbackDelete(String vfModuleId, int statusCode) {
-		stubFor(delete(urlEqualTo("/vnfs/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
+		stubFor(delete(urlEqualTo("/services/rest/v1/vnfsvnfId/vf-modules" + vfModuleId + "/rollback"))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
-		stubFor(delete(urlEqualTo("/vnfs/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
+		stubFor(delete(urlEqualTo("/services/rest/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
 				.willReturn(aResponse()
 				.withStatus(statusCode)
 				.withHeader("Content-Type", "application/xml")));
@@ -163,19 +165,19 @@ public class StubResponseVNFAdapter {
 	}
 	
 	public static void mockVNFAdapterRest(String vnfId) {
-		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules"))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
 				.willReturn(aResponse()
 						.withStatus(200)));
-		stubFor(post(urlEqualTo("/vnfs/rest/v1/vnfs/" + vnfId + "/vf-modules"))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
 				.willReturn(aResponse()
 						.withStatus(200)));
 	}
 
 	public static void mockVNFAdapterRest_500(String vnfId) {
-		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules"))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs" + vnfId + "/vf-modules"))
 				.willReturn(aResponse()
 						.withStatus(500)));
-		stubFor(post(urlEqualTo("/vnfs/rest/v1/vnfs/" + vnfId + "/vf-modules"))
+		stubFor(post(urlEqualTo("/services/rest/v1/vnfs/" + vnfId + "/vf-modules"))
 				.willReturn(aResponse()
 						.withStatus(500)));
 	}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterAsyncTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterAsyncTransformer.java
index 2eebe94f2b..63abf4d064 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterAsyncTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterAsyncTransformer.java
@@ -18,15 +18,18 @@
  * ============LICENSE_END========================================================= 
  */ 
 
-package org.openecomp.mso.bpmn.mock;
+package org.onap.so.bpmn.mock;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
+import javax.ws.rs.core.UriBuilder;
+
+import org.onap.so.client.HttpClient;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.BinaryFile;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
@@ -39,12 +42,13 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;
  * By definition, the async API sends a 202 (with no body) in the sync response.
  *
  */
-public class VnfAdapterAsyncTransformer extends ResponseTransformer {
+public class VnfAdapterAsyncTransformer extends ResponseDefinitionTransformer {
 
 	public VnfAdapterAsyncTransformer() {
 	}
-
-	public String name() {
+	
+	@Override
+	public String getName() {
 		return "vnf-adapter-async";
 	}
 
@@ -61,7 +65,7 @@ public class VnfAdapterAsyncTransformer extends ResponseTransformer {
 	 */
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 		
 		String requestBody = request.getBodyAsString();
 		
@@ -146,13 +150,10 @@ public class VnfAdapterAsyncTransformer extends ResponseTransformer {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			System.out.println("Sending callback response:" + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			System.err.println(payLoad);
+			
 			try {
-				ClientResponse result = request.post();
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterCreateMockTransformer.java
index 23921da8d8..de21d64863 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterCreateMockTransformer.java
@@ -1,43 +1,46 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
-import javax.xml.ws.Endpoint;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
 /**
  * Please describe the VnfAdapterCreateMockTransformer.java class
  *
  */
-public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
+public class VnfAdapterCreateMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterCreateMockTransformer.class);
 	
 	private String notifyCallbackResponse;
 	private String ackResponse;
@@ -47,13 +50,13 @@ public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
 	}
 
 	@Override
-	public String name() {
+	public String getName() {
 		return "vnf-adapter-create-transformer";
 	}
 
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 
 		String requestBody = request.getBodyAsString();
 
@@ -127,13 +130,10 @@ public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
 				LOGGER.debug("Exception :",e1);
 			}
 			LOGGER.debug("Sending callback response to url: " + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.out.println("payLoad: " + payLoad);
-
 			try {
-				ClientResponse result = request.post();
-				LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				Response response = client.post(payLoad);
+				LOGGER.debug("Successfully posted callback? Status: " + response.getStatus());
 				//System.err.println("Successfully posted callback:" + result.getStatus());
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterDeleteMockTransformer.java
index ee6972e46e..99ad84dad4 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterDeleteMockTransformer.java
@@ -1,39 +1,45 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.onap.so.bpmn.mock;
 
-package org.openecomp.mso.bpmn.mock;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
 /**
  * Please describe the VnfAdapterCreateMockTransformer.java class
  *
  */
-public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
+public class VnfAdapterDeleteMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterDeleteMockTransformer.class);
 
 	private String notifyCallbackResponse;
 	private String ackResponse;
@@ -43,13 +49,13 @@ public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
 	}
 
 	@Override
-	public String name() {
+	public String getName() {
 		return "vnf-adapter-delete-transformer";
 	}
 
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 
 		// System.err.println("notifyCallbackResponse:" + notifyCallbackResponse);
 
@@ -124,14 +130,10 @@ public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
 				// TODO Auto-generated catch block
 				LOGGER.debug("Exception :",e1);
 			}
-			System.out.println("Sending callback response to url: " + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.err.println(payLoad);
+
 			try {
-				ClientResponse result = request.post();
-				System.out.println("Successfully posted callback? Status: " + result.getStatus());
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				System.out.println("catch error in - request.post() ");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterQueryMockTransformer.java
index 1582071d3a..7ad687a2b3 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterQueryMockTransformer.java
@@ -1,46 +1,48 @@
-/* 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.mock;
+package org.onap.so.bpmn.mock;
 
 
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
 /**
  * Please describe the VnfAdapterQueryMockTransformer.java class
  *
  */
 
 
-public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
+public class VnfAdapterQueryMockTransformer extends ResponseDefinitionTransformer{
 	
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterQueryMockTransformer.class);
 	
 	private String notifyCallbackResponse;
 	private String ackResponse;
@@ -55,13 +57,13 @@ public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
 	}
 
 	@Override
-	public String name() {
+	public String getName() {
 		return "vnf-adapter-query-transformer";
 	}
 	
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 
 		String requestBody = request.getBodyAsString();
 
@@ -144,12 +146,10 @@ public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
 			} catch (InterruptedException e1) {
 				LOGGER.debug("Exception :",e1);
 			}
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.err.println(payLoad);
+
 			try {
-				ClientResponse result = request.post();
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				LOGGER.debug("Exception :",e);
 			}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterRollbackMockTransformer.java
index 186fd35b6f..560915d1f1 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterRollbackMockTransformer.java
@@ -1,40 +1,45 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.onap.so.bpmn.mock;
 
-package org.openecomp.mso.bpmn.mock;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
 /**
  * Please describe the VnfAdapterCreateMockTransformer.java class
  *
  */
-public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
+public class VnfAdapterRollbackMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterRollbackMockTransformer.class);
 
 	private String notifyCallbackResponse;
 	private String ackResponse;
@@ -49,13 +54,13 @@ public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
 	}
 
 	@Override
-	public String name() {
+	public String getName() {
 		return "vnf-adapter-rollback-transformer";
 	}
 
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 
 		String requestBody = request.getBodyAsString();
 
@@ -126,14 +131,10 @@ public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
 			} catch (InterruptedException e1) {
 				LOGGER.debug("Exception :",e1);
 			}
-			System.out.println("Sending callback response to url: " + callbackUrl);
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.err.println(payLoad);
+
 			try {
-				ClientResponse result = request.post();
-				System.out.println("Successfully posted callback? Status: " + result.getStatus());
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				System.out.println("catch error in - request.post() ");				
 				LOGGER.debug("Exception :",e);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterUpdateMockTransformer.java
index 7808b47d24..9e8927102a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/mock/VnfAdapterUpdateMockTransformer.java
@@ -1,44 +1,45 @@
-/*
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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 
+ * ================================================================================
+ * 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 
+ *      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========================================================= 
- */ 
+ * 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.onap.so.bpmn.mock;
 
-package org.openecomp.mso.bpmn.mock;
+import javax.ws.rs.core.UriBuilder;
 
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.client.HttpClient;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.TargetEntity;
 
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import org.openecomp.mso.logger.MsoLogger;
 /**
  * Please describe the VnfAdapterUpdateMockTransformer.java class
  *
  */
-public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
+public class VnfAdapterUpdateMockTransformer extends ResponseDefinitionTransformer {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterUpdateMockTransformer.class);
 	
 	private String notifyCallbackResponse;
 	private String requestId;
@@ -51,15 +52,15 @@ public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
 	public VnfAdapterUpdateMockTransformer(String requestId) {
 		this.requestId = requestId;
 	}
-
-
-	public String name() {
+	
+	@Override
+	public String getName() {
 		return "vnf-adapter-update-transformer";
 	}
 
 	@Override
 	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
-			FileSource fileSource) {
+			FileSource fileSource, Parameters parameters) {
 
 		String requestBody = request.getBodyAsString();
 
@@ -130,14 +131,10 @@ public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
 			} catch (InterruptedException e1) {
 				LOGGER.debug("Exception :", e1);
 			}
-			System.out.println("Sending callback response to url: " + callbackUrl);			
-			ClientRequest request = new ClientRequest(callbackUrl);
-			request.body("text/xml", payLoad);
-			//System.err.println(payLoad);
+
 			try {
-				ClientResponse result = request.post();
-				System.out.println("Successfully posted callback? Status: " + result.getStatus());				
-				//System.err.println("Successfully posted callback:" + result.getStatus());
+				HttpClient client = new HttpClient(UriBuilder.fromUri(callbackUrl).build().toURL(), "text/xml", TargetEntity.VNF_ADAPTER);
+				client.post(payLoad);
 			} catch (Exception e) {
 				System.out.println("catch error in - request.post() ");
 				LOGGER.debug("Exception :",e);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBDecompPojoTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBDecompPojoTest.java
new file mode 100644
index 0000000000..a72db062aa
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBDecompPojoTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import org.junit.Test;
+import org.onap.so.openpojo.rules.EqualsAndHashCodeTester;
+import org.onap.so.openpojo.rules.HasEqualsAndHashCodeRule;
+
+public class BBDecompPojoTest {
+
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Test
+	public void pojoStructure() {
+		test("org.onap.so.bpmn.servicedecomposition.bbobjects");
+	}
+
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new EqualsAndHashCodeTester())
+				.with(new HasEqualsAndHashCodeRule())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
+	}
+
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
new file mode 100644
index 0000000000..801314b2ae
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei 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.onap.so.bpmn.servicedecomposition;
+
+import org.junit.Test;
+import org.onap.so.BaseTest;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SerializableMustHaveSerialVersionUIDRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+
+public class BBPojoTest extends BaseTest{
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Test
+	public void pojoStructure() {
+		test("org.onap.so.bpmn.servicedecomposition.bbobjects");
+		test("org.onap.so.bpmn.servicedecomposition.modelinfo");
+		test("org.onap.so.bpmn.servicedecomposition.entities");
+		test("org.onap.so.bpmn.servicedecomposition.homingobjects");
+		test("org.onap.so.bpmn.servicedecomposition.generalobjects");
+	}
+
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.with(new SerializableMustHaveSerialVersionUIDRule())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
+	}
+
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java
new file mode 100644
index 0000000000..5f90f1e827
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/ExtractPojosForBBTest.java
@@ -0,0 +1,221 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.camunda.bpm.engine.impl.pvm.runtime.ExecutionImpl;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.DelegateExecutionImpl;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.*;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
+import org.onap.so.client.exception.BBObjectNotFoundException;
+
+public class ExtractPojosForBBTest extends BaseTest{
+	ExtractPojosForBB extractPojos = new ExtractPojosForBB();
+	private BuildingBlockExecution execution;
+	private GeneralBuildingBlock gBBInput;
+	private HashMap<ResourceKey, String> lookupKeyMap;
+	
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();
+	
+	@Before
+	public void before() {
+		execution = new DelegateExecutionImpl(new ExecutionImpl());
+		execution.setVariable("testProcessKey", "AAICreateTasksTests");
+		gBBInput = new GeneralBuildingBlock();
+		execution.setVariable("gBBInput", gBBInput);
+		lookupKeyMap = new HashMap<>();
+		execution.setVariable("lookupKeyMap", lookupKeyMap);
+	}
+	
+	@Test
+	public void get() throws BBObjectNotFoundException {
+		ServiceInstance serviceInstancePend = new ServiceInstance();
+		serviceInstancePend.setServiceInstanceId("abc");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstancePend.getServiceInstanceId());
+
+		VpnBondingLink vpnBondingLinkPend = new VpnBondingLink();
+		vpnBondingLinkPend.setVpnBondingLinkId("testVpnBondingLink");
+		serviceInstancePend.getVpnBondingLinks().add(vpnBondingLinkPend);
+		lookupKeyMap.put(ResourceKey.VPN_BONDING_LINK_ID, vpnBondingLinkPend.getVpnBondingLinkId());
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		VpnBinding vpnBinding = new VpnBinding();
+		vpnBinding.setVpnId("abc");
+		customer.getVpnBindings().add(vpnBinding);
+		lookupKeyMap.put(ResourceKey.VPN_ID, vpnBinding.getVpnId());
+
+		List<GenericVnf> vnfsPend = serviceInstancePend.getVnfs();
+		GenericVnf vnfPend = new GenericVnf();
+		vnfPend.setVnfId("abc");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, vnfPend.getVnfId());
+
+		List<VfModule> vfModulesPend = vnfPend.getVfModules();
+		VfModule vfModulePend = new VfModule();
+		vfModulePend.setVfModuleId("abc");
+		vfModulesPend.add(vfModulePend);
+		vnfsPend.add(vnfPend);
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, vfModulePend.getVfModuleId());
+
+		List<L3Network> networksPend = serviceInstancePend.getNetworks();
+		L3Network networkPend = new L3Network();
+		networkPend.setNetworkId("abc");
+		networksPend.add(networkPend);
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, networkPend.getNetworkId());
+
+		List<VolumeGroup> volumeGroupsPend = serviceInstancePend.getVnfs().get(0).getVolumeGroups();
+		VolumeGroup volumeGroupPend = new VolumeGroup();
+		volumeGroupPend.setVolumeGroupId("abc");
+		volumeGroupsPend.add(volumeGroupPend);
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroupPend.getVolumeGroupId());
+
+		List<AllottedResource> allotedResourcesPend = serviceInstancePend.getAllottedResources();
+		AllottedResource allotedResourcePend = new AllottedResource();
+		allotedResourcePend.setId("abc");
+		allotedResourcesPend.add(allotedResourcePend);
+		lookupKeyMap.put(ResourceKey.ALLOTTED_RESOURCE_ID, allotedResourcePend.getId());
+
+		Configuration configurationPend = new Configuration();
+		configurationPend.setConfigurationId("abc");
+		serviceInstancePend.getConfigurations().add(configurationPend);
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, configurationPend.getConfigurationId());
+
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstancePend);
+		gBBInput.setCustomer(customer);
+
+		ServiceInstance extractServPend = extractPojos.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, "abc");
+		assertEquals(extractServPend.getServiceInstanceId(), serviceInstancePend.getServiceInstanceId());
+		GenericVnf extractVnfPend = extractPojos.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, "abc");
+		assertEquals(extractVnfPend.getVnfId(), vnfPend.getVnfId());
+		L3Network extractNetworkPend = extractPojos.extractByKey(execution, ResourceKey.NETWORK_ID, "abc");
+		assertEquals(extractNetworkPend.getNetworkId(), networkPend.getNetworkId());
+		VolumeGroup extractVolumeGroupPend = extractPojos.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID, "abc");
+		assertEquals(extractVolumeGroupPend.getVolumeGroupId(), volumeGroupPend.getVolumeGroupId());
+		AllottedResource extractallotedResourcePend = extractPojos.extractByKey(execution,
+				ResourceKey.ALLOTTED_RESOURCE_ID, "abc");
+		assertEquals(extractallotedResourcePend.getId(), allotedResourcePend.getId());
+		Configuration extractConfigurationPend = extractPojos.extractByKey(execution, ResourceKey.CONFIGURATION_ID,
+				"abc");
+		assertEquals(extractConfigurationPend.getConfigurationId(), configurationPend.getConfigurationId());
+		VpnBinding extractVpnBinding = extractPojos.extractByKey(execution, ResourceKey.VPN_ID, "abc");
+		assertEquals(extractVpnBinding.getVpnId(), vpnBinding.getVpnId());
+		
+		VfModule extractVfModulePend = extractPojos.extractByKey(execution, ResourceKey.VF_MODULE_ID, "abc");
+		assertEquals(extractVfModulePend.getVfModuleId(), vfModulePend.getVfModuleId());
+
+		VpnBondingLink extractVpnBondingLinkPend = extractPojos.extractByKey(execution, ResourceKey.VPN_BONDING_LINK_ID, "testVpnBondingLink");
+		assertEquals(extractVpnBondingLinkPend.getVpnBondingLinkId(), vpnBondingLinkPend.getVpnBondingLinkId());
+	}
+
+	@Test
+	public void siError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+
+		extractPojos.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID, "abc");
+	}
+
+	@Test
+	public void vnfError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, "bbb");
+	}
+
+	@Test
+	public void vfModuleError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.VF_MODULE_ID, "bbb");
+	}
+	
+	@Test
+	public void configurationError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.CONFIGURATION_ID, "bbb");
+	}
+	@Test
+	public void allotedError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.ALLOTTED_RESOURCE_ID, "bbb");
+	}
+	@Test
+	public void vpnBindingError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.VPN_ID, "bbb");
+	}
+
+	@Test
+	public void vpnBondingLinkError() throws BBObjectNotFoundException {
+		expectedException.expect(BBObjectNotFoundException.class);
+		Customer customer = new Customer();
+		customer.setServiceSubscription(new ServiceSubscription());
+		ServiceInstance serviceInstance = new ServiceInstance();
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		gBBInput.setCustomer(customer);
+		extractPojos.extractByKey(execution, ResourceKey.VPN_BONDING_LINK_ID, "bbb");
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/SerializationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/SerializationTest.java
new file mode 100644
index 0000000000..cfafe1622b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/SerializationTest.java
@@ -0,0 +1,130 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.impl.pvm.runtime.ExecutionImpl;
+import org.junit.Test;
+import org.onap.so.SerializableChecker;
+import org.onap.so.SerializableChecker.SerializationFailure;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.common.DelegateExecutionImpl;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class SerializationTest {
+	
+	private static final String RESOURCE_PATH = "src/test/resources/__files/ExecuteBuildingBlock/";
+	private static final String FLOW_VAR_NAME = "flowToBeCalled";
+	private static final String LOOKUP_KEY_MAP_VAR_NAME = "lookupKeyMap";
+	private static final String GBB_INPUT_VAR_NAME = "gBBInput";
+	protected ObjectMapper mapper = new ObjectMapper();
+	
+	@Test
+	public void testSerializationOfAllPojos() throws IOException {
+		GeneralBuildingBlock gbb = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		DelegateExecution execution = new ExecutionImpl();
+		execution.setVariable(FLOW_VAR_NAME, "AssignServiceInstanceBB");
+		execution.setVariable(GBB_INPUT_VAR_NAME, gbb);
+		execution.setVariable(LOOKUP_KEY_MAP_VAR_NAME, lookupKeyMap);
+		System.out.println(execution.getVariables());
+		BuildingBlockExecution gBuildingBlockExecution = new DelegateExecutionImpl(execution);
+		boolean isSerializable = SerializationTest.isSerializable(gBuildingBlockExecution);
+		assertEquals(true, isSerializable);
+	}
+	
+	public static boolean isSerializable(final Object o)
+    {
+        final boolean retVal;
+
+        if(implementsInterface(o))
+        {
+            retVal = attemptToSerialize(o);
+        }
+        else
+        {
+            retVal = false;
+        }
+
+        return (retVal);
+    }
+
+    private static boolean implementsInterface(final Object o)
+    {
+        final boolean retVal;
+
+        retVal = ((o instanceof Serializable) || (o instanceof Externalizable));
+
+        return (retVal);
+    }
+
+    private static boolean attemptToSerialize(final Object o)
+    {
+        final OutputStream sink;
+        ObjectOutputStream stream;
+
+        stream = null;
+
+        try
+        {
+            sink   = new ByteArrayOutputStream();
+            stream = new ObjectOutputStream(sink);
+            stream.writeObject(o);
+            // could also re-serilalize at this point too
+        }
+        catch(final IOException ex)
+        {
+            return (false);
+        }
+        finally
+        {
+            if(stream != null)
+            {
+                try
+                {
+                    stream.close();
+                }
+                catch(final IOException ex)
+                {
+                    // should not be able to happen
+                }
+            }
+        }
+
+        return (true);
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/entities/exceptions/InvalidBuildingBlockInputExceptionTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/entities/exceptions/InvalidBuildingBlockInputExceptionTest.java
new file mode 100644
index 0000000000..9d34a95e79
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/entities/exceptions/InvalidBuildingBlockInputExceptionTest.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.entities.exceptions;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class InvalidBuildingBlockInputExceptionTest {
+	private static final String MESSAGE = "message";
+	private static final Throwable CAUSE = new Throwable();
+	private InvalidBuildingBlockInputException invalidBuildingBlockInputException;
+	
+	@Test
+	public void defaultConstructorTest() {
+		invalidBuildingBlockInputException = new InvalidBuildingBlockInputException();
+		assertEquals(null, invalidBuildingBlockInputException.getMessage());
+		assertEquals(null, invalidBuildingBlockInputException.getCause());
+	}
+	
+	@Test
+	public void messageConstructorTest() {
+		invalidBuildingBlockInputException = new InvalidBuildingBlockInputException(MESSAGE);
+		assertEquals(MESSAGE, invalidBuildingBlockInputException.getMessage());
+		assertEquals(null, invalidBuildingBlockInputException.getCause());
+	}
+	
+	@Test
+	public void causeConstructorTest() {
+		invalidBuildingBlockInputException = new InvalidBuildingBlockInputException(CAUSE);
+		assertEquals(CAUSE.toString(), invalidBuildingBlockInputException.getMessage()); // CAUSE.toString because of the implementation of Exception(Throwable cause)
+		assertEquals(CAUSE, invalidBuildingBlockInputException.getCause());
+	}
+	
+	@Test
+	public void messageAndCauseConstructorTest() {
+		invalidBuildingBlockInputException = new InvalidBuildingBlockInputException(MESSAGE, CAUSE);
+		assertEquals(MESSAGE, invalidBuildingBlockInputException.getMessage());
+		assertEquals(CAUSE, invalidBuildingBlockInputException.getCause());
+	}
+	
+	@Test
+	public void messageAndCauseAndFlagsConstructorTest() {
+		invalidBuildingBlockInputException = new InvalidBuildingBlockInputException(MESSAGE, CAUSE, true, true);
+		assertEquals(MESSAGE, invalidBuildingBlockInputException.getMessage());
+		assertEquals(CAUSE, invalidBuildingBlockInputException.getCause());
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
new file mode 100644
index 0000000000..0abbb2dbe2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -0,0 +1,630 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.RouteTableReference;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoCollection;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoConfiguration;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoInstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResource;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.InstanceGroup;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class BBInputSetupMapperLayerTest {
+	@InjectMocks
+	BBInputSetupMapperLayer bbInputSetupMapperLayer = new BBInputSetupMapperLayer();
+
+	ObjectMapper mapper = new ObjectMapper();
+
+	private static final String RESOURCE_PATH = "src/test/resources/__files/ExecuteBuildingBlock/";
+
+	@Test
+	public void testMapOrchestrationStatusFromAAI() {
+		OrchestrationStatus expected = OrchestrationStatus.INVENTORIED;
+		String orchStatusInput = "Inventoried";
+		OrchestrationStatus actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.ASSIGNED;
+		orchStatusInput = "Assigned";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.ACTIVE;
+		orchStatusInput = "Active";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.CREATED;
+		orchStatusInput = "Created";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.PRECREATED;
+		orchStatusInput = "PreCreated";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.PENDING_CREATE;
+		orchStatusInput = "PendingCreate";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.PENDING_DELETE;
+		orchStatusInput = "PendingDelete";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.PENDING;
+		orchStatusInput = "Pending";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+		
+		expected = OrchestrationStatus.PENDING_ACTIVATION;
+		orchStatusInput = "PendingActivation";
+		actual = bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(orchStatusInput);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testMapOrchestrationFuzzyCases() {
+		List<String> values = Arrays.asList("pending-create", "pending_Create", "pendinggcreate", "PendingCreate");
+		values.forEach(value -> {
+			assertThat(bbInputSetupMapperLayer.mapOrchestrationStatusFromAAI(value), equalTo(OrchestrationStatus.PENDING_CREATE));
+		});
+	}
+	
+	@Test
+	public void testMapAAICustomer() throws IOException {
+		Customer expected = mapper.readValue(
+				new File(RESOURCE_PATH+"Customer.json"),
+				Customer.class);
+
+		org.onap.aai.domain.yang.Customer customerAAI = mapper.readValue(
+				new File(RESOURCE_PATH+"Customer_AAI.json"), org.onap.aai.domain.yang.Customer.class);
+		
+		Customer actual = bbInputSetupMapperLayer.mapAAICustomer(customerAAI);
+		
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIServiceSubscription() throws IOException {
+		ServiceSubscription expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceSubscriptionExpected.json"), ServiceSubscription.class);
+
+		org.onap.aai.domain.yang.ServiceSubscription svcSubscriptionAAI = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceSubscription_AAI.json"), org.onap.aai.domain.yang.ServiceSubscription.class);
+
+		ServiceSubscription actual = bbInputSetupMapperLayer.mapAAIServiceSubscription(svcSubscriptionAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIProject() throws IOException {
+		Project expected = mapper.readValue(new File(RESOURCE_PATH+"Project.json"),Project.class);
+
+		org.onap.aai.domain.yang.Project projectAAI = new org.onap.aai.domain.yang.Project();
+		projectAAI.setProjectName("projectName");
+
+		Project actual = bbInputSetupMapperLayer.mapAAIProject(projectAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapRequestProject() throws IOException {
+		Project expected = mapper.readValue(new File(RESOURCE_PATH+"Project.json"),Project.class);
+
+		org.onap.so.serviceinstancebeans.Project requestProject = new org.onap.so.serviceinstancebeans.Project();
+		requestProject.setProjectName("projectName");
+
+		Project actual = bbInputSetupMapperLayer.mapRequestProject(requestProject);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIOwningEntity() throws IOException {
+		OwningEntity expected = mapper.readValue(new File(RESOURCE_PATH+"OwningEntity.json"),OwningEntity.class);
+
+		org.onap.aai.domain.yang.OwningEntity entityAAI = new org.onap.aai.domain.yang.OwningEntity();
+		entityAAI.setOwningEntityId("owningEntityId");
+		entityAAI.setOwningEntityName("owningEntityName");
+
+		OwningEntity actual = bbInputSetupMapperLayer.mapAAIOwningEntity(entityAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapRequestOwningEntity() throws IOException {
+		OwningEntity expected = mapper.readValue(new File(RESOURCE_PATH+"OwningEntity.json"),OwningEntity.class);
+
+		org.onap.so.serviceinstancebeans.OwningEntity requestOwningEntity = new org.onap.so.serviceinstancebeans.OwningEntity();
+		requestOwningEntity.setOwningEntityId("owningEntityId");
+		requestOwningEntity.setOwningEntityName("owningEntityName");
+
+		OwningEntity actual = bbInputSetupMapperLayer.mapRequestOwningEntity(requestOwningEntity);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIPlatform() throws IOException {
+		Platform expected = mapper.readValue(new File(RESOURCE_PATH+"Platform.json"),Platform.class);
+
+		org.onap.aai.domain.yang.Platform platformAAI = new org.onap.aai.domain.yang.Platform();
+		platformAAI.setPlatformName("platformName");
+
+		Platform actual = bbInputSetupMapperLayer.mapAAIPlatform(platformAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAILineOfBusiness() throws IOException {
+		LineOfBusiness expected = mapper.readValue(new File(RESOURCE_PATH+"LineOfBusiness.json"),LineOfBusiness.class);
+
+		org.onap.aai.domain.yang.LineOfBusiness lobAAI = new org.onap.aai.domain.yang.LineOfBusiness();
+		lobAAI.setLineOfBusinessName("lineOfBusinessName");
+
+		LineOfBusiness actual = bbInputSetupMapperLayer.mapAAILineOfBusiness(lobAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testMapAAINetworkPolicy() throws JsonParseException, JsonMappingException, IOException {
+		NetworkPolicy expectedNetworkPolicy = mapper.readValue(new File(RESOURCE_PATH + "NetworkPolicy.json"), NetworkPolicy.class);
+		
+		org.onap.aai.domain.yang.NetworkPolicy aaiNetworkPolicy = new org.onap.aai.domain.yang.NetworkPolicy();
+		aaiNetworkPolicy.setNetworkPolicyId("networkPolicyId");
+		aaiNetworkPolicy.setNetworkPolicyFqdn("networkPolicyFqdn");
+		aaiNetworkPolicy.setHeatStackId("heatStackId");
+		aaiNetworkPolicy.setResourceVersion("resourceVersion");
+		
+		NetworkPolicy actualNetworkPolicy = bbInputSetupMapperLayer.mapAAINetworkPolicy(aaiNetworkPolicy);
+		
+		assertThat(actualNetworkPolicy, sameBeanAs(expectedNetworkPolicy));
+	}
+	
+	@Test
+	public void testMapAAIVolumeGroup() throws JsonParseException, JsonMappingException, IOException {
+		VolumeGroup expectedVolumeGroup = mapper.readValue(new File(RESOURCE_PATH + "VolumeGroup.json"), VolumeGroup.class);
+		
+		org.onap.aai.domain.yang.VolumeGroup aaiVolumeGroup = mapper.readValue(
+				new File(RESOURCE_PATH + "VolumeGroup_AAI.json"), org.onap.aai.domain.yang.VolumeGroup.class);
+		
+		VolumeGroup actualVolumeGroup = bbInputSetupMapperLayer.mapAAIVolumeGroup(aaiVolumeGroup);
+		
+		assertThat(actualVolumeGroup, sameBeanAs(expectedVolumeGroup));
+	}
+
+	@Test
+	public void testMapCatalogServiceIntoServiceInstance() throws IOException {
+		ModelInfoServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ModelInfoServiceInstance.json"),
+				ModelInfoServiceInstance.class);
+
+		Service catalogService = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogServiceInput.json"), Service.class);
+
+		ModelInfoServiceInstance actual = bbInputSetupMapperLayer.mapCatalogServiceIntoServiceInstance(catalogService);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapCatalogInstanceGroupToInstanceGroup() throws IOException {
+		ModelInfoInstanceGroup expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ModelInfoInstanceGroup.json"),
+				ModelInfoInstanceGroup.class);
+
+		InstanceGroup instanceGroup = mapper.readValue(
+				new File(RESOURCE_PATH + "InstanceGroup.json"), InstanceGroup.class);
+		instanceGroup.setCollectionInstanceGroupCustomizations(new ArrayList<>());
+		CollectionResourceInstanceGroupCustomization collectionInstanceGroupCust = new CollectionResourceInstanceGroupCustomization();
+		collectionInstanceGroupCust.setModelCustomizationUUID("modelCustomizationUUID");
+		collectionInstanceGroupCust.setFunction("function");
+		collectionInstanceGroupCust.setDescription("description");
+		instanceGroup.getCollectionInstanceGroupCustomizations().add(collectionInstanceGroupCust);
+		CollectionResourceCustomization collectionResourceCust = new CollectionResourceCustomization();
+		collectionResourceCust.setModelCustomizationUUID("modelCustomizationUUID");
+		ModelInfoInstanceGroup actual = bbInputSetupMapperLayer.mapCatalogInstanceGroupToInstanceGroup(collectionResourceCust, instanceGroup);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testMapCollectionNetworkResourceCustToNetworkResourceCust() {
+		String modelCustomizationUUID = "modelCustomizationUUID";
+		String modelInstanceName = "modelInstanceName";
+		String networkRole = "networkRole";
+		String networkScope = "networkScope";
+		String networkTechnology = "networkTechnology";
+		String networkType = "networkType";
+		
+		NetworkResourceCustomization expected = new NetworkResourceCustomization();
+		expected.setModelCustomizationUUID(modelCustomizationUUID);
+		expected.setModelInstanceName(modelInstanceName);
+		expected.setNetworkRole(networkRole);
+		expected.setNetworkScope(networkScope);
+		expected.setNetworkTechnology(networkTechnology);
+		expected.setNetworkType(networkType);
+		CollectionNetworkResourceCustomization collectionNetworkResourceCust = new CollectionNetworkResourceCustomization();
+		collectionNetworkResourceCust.setModelCustomizationUUID(modelCustomizationUUID);
+		collectionNetworkResourceCust.setModelInstanceName(modelInstanceName);
+		collectionNetworkResourceCust.setNetworkRole(networkRole);
+		collectionNetworkResourceCust.setNetworkScope(networkScope);
+		collectionNetworkResourceCust.setNetworkTechnology(networkTechnology);
+		collectionNetworkResourceCust.setNetworkType(networkType);
+		NetworkResourceCustomization actual = bbInputSetupMapperLayer.mapCollectionNetworkResourceCustToNetworkResourceCust(collectionNetworkResourceCust);
+		
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapCatalogCollectionToCollection() throws IOException {
+		ModelInfoCollection expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ModelInfoCollection.json"),
+				ModelInfoCollection.class);
+
+		CollectionResourceCustomization collectionCust = mapper.readValue(
+				new File(RESOURCE_PATH + "CollectionResourceCustomization.json"),
+				CollectionResourceCustomization.class);
+
+		CollectionResource collectionResource = mapper.readValue(
+				new File(RESOURCE_PATH + "CollectionResource.json"),
+				CollectionResource.class);
+
+		ModelInfoCollection actual = bbInputSetupMapperLayer.mapCatalogCollectionToCollection(collectionCust, collectionResource);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIServiceInstanceIntoServiceInstance() throws IOException {
+		ServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_aaiServiceInstanceToSI.json"),
+				ServiceInstance.class);
+
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstanceAAIInput.json"),
+				org.onap.aai.domain.yang.ServiceInstance.class);
+
+		ServiceInstance actual = bbInputSetupMapperLayer.mapAAIServiceInstanceIntoServiceInstance(serviceInstanceAAI);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testSetPlatformAndLOB() throws IOException {
+		ServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_aaiPlatformAndLOBToSI.json"),
+				ServiceInstance.class);
+
+		Map<ResourceKey, String> resourcesToBeOrchestrated = new HashMap<>();
+		resourcesToBeOrchestrated.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		Platform platformMSO = new Platform();
+		platformMSO.setPlatformName("platformName");
+		LineOfBusiness lineOfBusinessMSO = new LineOfBusiness();
+		lineOfBusinessMSO.setLineOfBusinessName("lineOfBusinessName");
+
+		ServiceInstance actual = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstanceAAIPlatformAndLOBInput.json"),
+				ServiceInstance.class);
+
+		bbInputSetupMapperLayer.setPlatformAndLOBIntoServiceInstance(platformMSO, lineOfBusinessMSO, actual,
+				resourcesToBeOrchestrated);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIL3NetworkIntoL3Network() throws IOException {
+		L3Network expected = mapper.readValue(
+				new File(RESOURCE_PATH + "l3NetworkExpected.json"), L3Network.class);
+
+		org.onap.aai.domain.yang.L3Network aaiL3Network = mapper.readValue(
+				new File(RESOURCE_PATH + "aaiL3NetworkInput.json"),
+				org.onap.aai.domain.yang.L3Network.class);
+
+		L3Network actual = bbInputSetupMapperLayer.mapAAIL3Network(aaiL3Network);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapAAIGenericVnfIntoGenericVnf() throws IOException {
+		GenericVnf expected = mapper.readValue(new File(RESOURCE_PATH + "GenericVnfExpected.json"), GenericVnf.class);
+		org.onap.aai.domain.yang.GenericVnf aaiGenericVnf = mapper.readValue(
+				new File(RESOURCE_PATH + "aaiGenericVnfInput.json"), org.onap.aai.domain.yang.GenericVnf.class);
+		
+		GenericVnf actual = bbInputSetupMapperLayer.mapAAIGenericVnfIntoGenericVnf(aaiGenericVnf);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testMapAAICollectionIntoCollection() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.aai.domain.yang.Collection aaiCollection = mapper.readValue(
+				new File(RESOURCE_PATH + "CollectionInput.json"), org.onap.aai.domain.yang.Collection.class);
+		
+		Collection expectedCollection = mapper.readValue(new File(RESOURCE_PATH + "CollectionExpected.json"), Collection.class);
+		
+		Collection actualCollection = bbInputSetupMapperLayer.mapAAICollectionIntoCollection(aaiCollection);
+		
+		assertThat(actualCollection, sameBeanAs(expectedCollection));
+	}
+	
+	@Test
+	public void testMapAAIInstanceGroupIntoInstanceGroup() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = mapper.readValue(
+				new File(RESOURCE_PATH + "InstanceGroupInput.json"), org.onap.aai.domain.yang.InstanceGroup.class);
+		
+		org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup expectedInstanceGroup = mapper.readValue(
+				new File(RESOURCE_PATH + "InstanceGroupExpected.json"), org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup.class);
+		
+		org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup actualInstanceGroup = 
+				bbInputSetupMapperLayer.mapAAIInstanceGroupIntoInstanceGroup(aaiInstanceGroup);
+		
+		assertThat(actualInstanceGroup, sameBeanAs(expectedInstanceGroup));
+	}
+	
+	@Test
+	public void testMapAAIRouteTableReferenceIntoRouteTableReference() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.aai.domain.yang.RouteTableReference aaiRouteTableReference = mapper.readValue(
+				new File(RESOURCE_PATH + "RouteTableReferenceInput.json"), org.onap.aai.domain.yang.RouteTableReference.class);
+		
+		RouteTableReference expectedRouteTableReference = mapper.readValue(
+				new File(RESOURCE_PATH + "RouteTableReferenceExpected.json"), RouteTableReference.class);
+		
+		RouteTableReference actualRouteTableReference = bbInputSetupMapperLayer.mapAAIRouteTableReferenceIntoRouteTableReference(aaiRouteTableReference);
+		
+		assertThat(actualRouteTableReference, sameBeanAs(expectedRouteTableReference));
+	}
+	
+	@Test
+	public void testMapCatalogNetworkToNetwork() throws JsonParseException, JsonMappingException, IOException {
+		NetworkResourceCustomization networkResourceCustomization = mapper.readValue(
+				new File(RESOURCE_PATH + "NetworkResourceCustomizationInput.json"), NetworkResourceCustomization.class);
+		
+		ModelInfoNetwork expectedModelInfoNetwork = mapper.readValue(
+				new File(RESOURCE_PATH + "ModelInfoNetworkExpected.json"), ModelInfoNetwork.class);
+		
+		ModelInfoNetwork actualModelInfoNetwork = bbInputSetupMapperLayer.mapCatalogNetworkToNetwork(networkResourceCustomization);
+		
+		assertThat(actualModelInfoNetwork, sameBeanAs(expectedModelInfoNetwork));
+	}
+
+	@Test
+	public void testMapCatalogVnfToVnf() throws IOException {
+		VnfResourceCustomization vnfResourceCustomization = mapper.readValue(
+				new File(RESOURCE_PATH + "VnfResourceCustomizationInput.json"), VnfResourceCustomization.class);
+		
+		ModelInfoGenericVnf expectedModelInfoGenericVnf = mapper.readValue(
+				new File(RESOURCE_PATH + "ModelInfoGenericVnfExpected.json"), ModelInfoGenericVnf.class);
+		
+		ModelInfoGenericVnf actualModelInfoGenericVnf = bbInputSetupMapperLayer.mapCatalogVnfToVnf(vnfResourceCustomization);
+		
+		assertThat(actualModelInfoGenericVnf, sameBeanAs(expectedModelInfoGenericVnf));
+	}
+	
+	@Test
+	public void testMapCatalogVfModuleToVfModule() throws JsonParseException, JsonMappingException, IOException {
+		VfModuleCustomization vfResourceCustomization = mapper.readValue(
+				new File(RESOURCE_PATH + "VfModuleCustomizationInput.json"), VfModuleCustomization.class);
+		
+		ModelInfoVfModule expectedModelInfoVfModule = mapper.readValue(new File(RESOURCE_PATH + "ModelInfoVfModuleExpected.json"), ModelInfoVfModule.class);
+		
+		ModelInfoVfModule actualModelInfoVfModule = bbInputSetupMapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization);
+		
+		assertThat(actualModelInfoVfModule, sameBeanAs(expectedModelInfoVfModule));
+	}
+	
+	@Test
+	public void testMapRequestPlatform() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.so.serviceinstancebeans.Platform platform = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestPlatformInput.json"), org.onap.so.serviceinstancebeans.Platform.class);
+		
+		Platform expectedPlatform = mapper.readValue(new File(RESOURCE_PATH + "PlatformExpected.json"), Platform.class);
+		
+		Platform actualPlatform = bbInputSetupMapperLayer.mapRequestPlatform(platform);
+		
+		assertThat(actualPlatform, sameBeanAs(expectedPlatform));
+	}
+	
+	@Test
+	public void testMapRequestLineOfBusiness() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestLineOfBusinessInput.json"), org.onap.so.serviceinstancebeans.LineOfBusiness.class);
+		
+		LineOfBusiness expectedLineOfBusiness = mapper.readValue(new File(RESOURCE_PATH + "LineOfBusinessExpected.json"), LineOfBusiness.class);
+		
+		LineOfBusiness actualLineOfBusiness = bbInputSetupMapperLayer.mapRequestLineOfBusiness(lineOfBusiness);
+		
+		assertThat(actualLineOfBusiness, sameBeanAs(expectedLineOfBusiness));
+	}
+	
+	@Test
+	public void testMapAAIConfiguration() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.aai.domain.yang.Configuration configurationAAI = mapper.readValue(
+				new File(RESOURCE_PATH + "ConfigurationInput.json"), org.onap.aai.domain.yang.Configuration.class);
+		
+		Configuration expectedConfiguration = mapper.readValue(
+				new File(RESOURCE_PATH + "ConfigurationExpected.json"), Configuration.class);
+		
+		Configuration actualConfiguration = bbInputSetupMapperLayer.mapAAIConfiguration(configurationAAI);
+		
+		assertThat(actualConfiguration, sameBeanAs(expectedConfiguration));
+	}
+
+	@Test
+	public void testMapRequestContext() throws IOException {
+		RequestContext expected = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestContextExpected.json"),
+				RequestContext.class);
+
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"),
+				RequestDetails.class);
+		RequestContext actual = bbInputSetupMapperLayer.mapRequestContext(requestDetails);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapOrchestrationContext() throws IOException {
+		OrchestrationContext expected = new OrchestrationContext();
+		expected.setIsRollbackEnabled(false);
+
+		RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class);
+
+		OrchestrationContext actual = bbInputSetupMapperLayer.mapOrchestrationContext(requestDetails);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapLocationContext() {
+		CloudRegion expected = new CloudRegion();
+		expected.setCloudOwner("att-aic");
+		expected.setLcpCloudRegionId("cloudRegionId");
+		expected.setComplex("complexName");
+		expected.setTenantId("tenantId");
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setTenantId("tenantId");
+		cloudConfig.setLcpCloudRegionId("cloudRegionId");
+		cloudConfig.setAicNodeClli("aicNodeClli");
+		org.onap.aai.domain.yang.CloudRegion cloudRegion = new org.onap.aai.domain.yang.CloudRegion();
+		cloudRegion.setCloudOwner("att-aic");
+		cloudRegion.setCloudRegionId("cloudRegionId");
+		cloudRegion.setComplexName("complexName");
+
+		CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion, "att-aic");
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapCloudRegion() {
+		CloudRegion expected = new CloudRegion();
+		expected.setCloudOwner("att-aic");
+		expected.setLcpCloudRegionId("cloudRegionId");
+		expected.setTenantId("tenantId");
+		expected.setCloudRegionVersion("cloudRegionVersion");
+
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setTenantId("tenantId");
+		cloudConfig.setLcpCloudRegionId("cloudRegionId");
+		cloudConfig.setAicNodeClli("aicNodeClli");
+
+		org.onap.aai.domain.yang.CloudRegion cloudRegion = new org.onap.aai.domain.yang.CloudRegion();
+		cloudRegion.setCloudOwner("att-aic");
+		cloudRegion.setCloudRegionId("cloudRegionId");
+		cloudRegion.setCloudRegionVersion("cloudRegionVersion");
+
+		CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(cloudConfig, cloudRegion, "att-aic");
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testMapCloudRegionWithNullCheck() {
+		CloudRegion expected = new CloudRegion();
+
+		CloudRegion actual = bbInputSetupMapperLayer.mapCloudRegion(null, null, null);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testmapCatalogConfigurationToConfiguration() {
+		String modelCustUUID = "modelCustomizationUUID";
+		String modelInvariantUUID = "modelInvariantUUID";
+		String modelVersionUUID = "modelUUID";
+		ModelInfoConfiguration expected = new ModelInfoConfiguration();
+		expected.setModelCustomizationId(modelCustUUID);
+		expected.setModelInvariantId(modelInvariantUUID);
+		expected.setModelVersionId(modelVersionUUID);
+		ConfigurationResourceCustomization configurationResourceCustomization = new ConfigurationResourceCustomization();
+		configurationResourceCustomization.setModelCustomizationUUID(modelCustUUID);
+		configurationResourceCustomization.setConfigurationResource(new ConfigurationResource());
+		configurationResourceCustomization.getConfigurationResource().setModelInvariantUUID(modelInvariantUUID);
+		configurationResourceCustomization.getConfigurationResource().setModelUUID(modelVersionUUID);
+		
+		ModelInfoConfiguration actual = bbInputSetupMapperLayer.mapCatalogConfigurationToConfiguration(configurationResourceCustomization );
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
new file mode 100644
index 0000000000..355dc15bbf
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -0,0 +1,2433 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Collection;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.RouteTableReference;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
+import org.onap.so.bpmn.servicedecomposition.entities.BuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.entities.WorkflowResourceIds;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext;
+import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoCollection;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoInstanceGroup;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoNetwork;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.client.aai.AAICommonObjectMapperProvider;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.InstanceGroupType;
+import org.onap.so.db.catalog.beans.NetworkCollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.OrchestrationStatus;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.ModelType;
+import org.onap.so.serviceinstancebeans.RelatedInstance;
+import org.onap.so.serviceinstancebeans.RelatedInstanceList;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.onap.so.serviceinstancebeans.RequestInfo;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+import org.onap.so.serviceinstancebeans.Resources;
+import org.onap.so.serviceinstancebeans.SubscriberInfo;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+@RunWith(MockitoJUnitRunner.class)
+public class BBInputSetupTest {
+	private static final String RESOURCE_PATH = "src/test/resources/__files/ExecuteBuildingBlock/";
+
+	protected ObjectMapper mapper = new ObjectMapper();
+	private static final String CLOUD_OWNER = "att-aic";
+
+	@Spy
+	private BBInputSetup SPY_bbInputSetup = new BBInputSetup();
+	
+	@Mock
+	private BBInputSetupUtils SPY_bbInputSetupUtils;
+	
+	@Spy
+	private BBInputSetupMapperLayer bbInputSetupMapperLayer; 
+	
+	@Before
+	public void setup(){
+		SPY_bbInputSetup.setBbInputSetupUtils(SPY_bbInputSetupUtils);
+		SPY_bbInputSetup.setMapperLayer(bbInputSetupMapperLayer);
+	}
+
+	@Test
+	public void testGetAlaCarteServiceInstance() throws Exception {
+		ServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_getServiceInstanceNOAAIExpected.json"),
+				ServiceInstance.class);
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestInfo.setInstanceName("SharansInstanceName");
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		ModelInfoServiceInstance modelInfoServiceInstance = new ModelInfoServiceInstance();
+		modelInfoServiceInstance.setModelUuid("modelUUID");
+		expected.setModelInfoServiceInstance(modelInfoServiceInstance);
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUIDDifferent");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+		Service differentService = new Service();
+		differentService.setModelUUID("modelUUIDDifferent");
+
+		doReturn(expected).when(SPY_bbInputSetup).getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId);
+		doReturn(differentService).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(serviceInstanceAAI.getModelVersionId());
+		doReturn(expected.getModelInfoServiceInstance()).when(bbInputSetupMapperLayer)
+				.mapCatalogServiceIntoServiceInstance(differentService);
+
+		ServiceInstance actual = SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, null,
+				null, lookupKeyMap, serviceInstanceId, aLaCarte, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test(expected = Exception.class)
+	public void testGetAlaCarteServiceInstanceException() throws Exception {
+		ServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_getServiceInstanceNOAAIExpected.json"),
+				ServiceInstance.class);
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestInfo.setInstanceName("SharansInstanceName");
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		ModelInfoServiceInstance modelInfoServiceInstance = new ModelInfoServiceInstance();
+		modelInfoServiceInstance.setModelUuid("modelUUID");
+		expected.setModelInfoServiceInstance(modelInfoServiceInstance);
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUIDDifferent");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+		Service differentService = new Service();
+		differentService.setModelUUID("modelUUIDDifferent");
+
+		doReturn(expected).when(SPY_bbInputSetup).getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId);
+		doReturn(null).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(serviceInstanceAAI.getModelVersionId());
+
+		ServiceInstance actual = SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, null,
+				null, lookupKeyMap, serviceInstanceId, aLaCarte, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetCustomerAndServiceSubscription() throws JsonParseException, JsonMappingException, IOException {
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		SubscriberInfo subscriberInfo = new SubscriberInfo();
+		subscriberInfo.setGlobalSubscriberId("globalSubscriberId");
+		RequestParameters requestParams = new RequestParameters();
+		requestParams.setSubscriptionServiceType("subscriptionServiceType");
+		requestDetails.setRequestParameters(requestParams);
+		requestDetails.setSubscriberInfo(subscriberInfo);
+		String resourceId = "resourceId";
+		Customer expected = new Customer();
+		expected.setGlobalCustomerId("globalCustomerId");
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setServiceType("subscriptionServiceType");
+
+		doReturn(expected).when(this.SPY_bbInputSetup).getCustomerFromRequest(requestDetails);
+		doReturn(serviceSubscription).when(this.SPY_bbInputSetup).getServiceSubscription(requestDetails, expected);
+
+		Customer actual = this.SPY_bbInputSetup.getCustomerAndServiceSubscription(requestDetails, resourceId);
+
+		assertThat(actual, sameBeanAs(expected));
+
+		requestDetails.setSubscriberInfo(null);
+
+		doReturn(null).when(this.SPY_bbInputSetup).getServiceSubscription(requestDetails, expected);
+		doReturn(expected).when(this.SPY_bbInputSetup).getCustomerFromURI(resourceId);
+		doReturn(serviceSubscription).when(this.SPY_bbInputSetup).getServiceSubscriptionFromURI(resourceId, expected);
+
+		assertThat(actual, sameBeanAs(expected));
+
+	}
+
+	@Test
+	public void testSetHomingFlag() throws JsonParseException, JsonMappingException, IOException {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		GenericVnf genericVnfExpected = new GenericVnf();
+		genericVnfExpected.setVnfId("vnfId");
+		genericVnfExpected.setCallHoming(true);
+		expected.getCustomer().getServiceSubscription().getServiceInstances().get(0).getVnfs().add(genericVnfExpected);
+		boolean homing = true;
+		GenericVnf genericVnfActual = new GenericVnf();
+		genericVnfActual.setVnfId("vnfId");
+		genericVnfActual.setCallHoming(false);
+		GeneralBuildingBlock actual = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		actual.getCustomer().getServiceSubscription().getServiceInstances().get(0).getVnfs().add(genericVnfActual);
+
+		SPY_bbInputSetup.setHomingFlag(actual, homing, lookupKeyMap);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetExecuteBBFromExecution() throws IOException {
+		ExecuteBuildingBlock expected = new ExecuteBuildingBlock();
+		BuildingBlock bb = new BuildingBlock();
+		bb.setBpmnFlowName("AssignServiceInstanceBB");
+		expected.setBuildingBlock(bb);
+		expected.setRequestId("00032ab7-3fb3-42e5-965d-8ea592502017");
+		DelegateExecution execution = Mockito.mock(DelegateExecution.class);
+		doReturn(expected).when(execution).getVariable(any(String.class));
+		ExecuteBuildingBlock actual = SPY_bbInputSetup.getExecuteBBFromExecution(execution);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetGBB() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+
+		ExecuteBuildingBlock executeBB = new ExecuteBuildingBlock();
+		executeBB.setRequestId("requestId");
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.service);
+		requestDetails.setModelInfo(modelInfo);
+		RequestParameters requestParams = new RequestParameters();
+		requestParams.setaLaCarte(true);
+		requestDetails.setRequestParameters(requestParams);
+		doReturn(requestDetails).when(SPY_bbInputSetupUtils).getRequestDetails(executeBB.getRequestId());
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String resourceId = "123";
+		String requestAction = "createInstance";
+		doReturn(expected).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doNothing().when(SPY_bbInputSetup).populateLookupKeyMapWithIds(any(WorkflowResourceIds.class), any());
+		boolean aLaCarte = true;
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBB(executeBB, lookupKeyMap, requestAction, aLaCarte,
+				resourceId, null);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetGBBALaCarteNonService() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String requestAction = "createInstance";
+		Service service = Mockito.mock(Service.class);
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance = new org.onap.aai.domain.yang.ServiceInstance();
+		aaiServiceInstance.setModelVersionId("modelVersionId");
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "instanceId");
+		doReturn(service).when(SPY_bbInputSetupUtils).getCatalogServiceByModelUUID(aaiServiceInstance.getModelVersionId());
+		doReturn(aaiServiceInstance).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById("instanceId");
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+
+		doNothing().when(SPY_bbInputSetup).populateObjectsOnAssignAndCreateFlows(requestDetails, service, "bbName",
+				serviceInstance, lookupKeyMap, resourceId, vnfType);
+		doReturn(serviceInstance).when(SPY_bbInputSetup).getExistingServiceInstance(aaiServiceInstance);
+		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
+				executeBB, requestAction, null);
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId, vnfType);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test(expected = Exception.class)
+	public void testGetGBBALaCarteNonServiceWithoutServiceModelInfo() throws Exception {
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String requestAction = "createInstance";
+		org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance = new org.onap.aai.domain.yang.ServiceInstance();
+		aaiServiceInstance.setModelVersionId("modelVersionId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		doReturn(null).when(SPY_bbInputSetupUtils).getCatalogServiceByModelUUID(aaiServiceInstance.getModelVersionId());
+		doReturn(aaiServiceInstance).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById("instanceId");
+
+		SPY_bbInputSetup.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId,
+				vnfType);
+	}
+
+	@Test
+	public void testGetGBBALaCarteNonServiceWithoutRelatedInstances() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withoutRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String requestAction = "createInstance";
+		Service service = Mockito.mock(Service.class);
+		String resourceId = "123";
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		org.onap.aai.domain.yang.ServiceInstance aaiServiceInstance = new org.onap.aai.domain.yang.ServiceInstance();
+		aaiServiceInstance.setModelVersionId("modelVersionId");
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+		String vnfType = "vnfType";
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "instanceId");
+		doReturn(service).when(SPY_bbInputSetupUtils).getCatalogServiceByModelUUID(aaiServiceInstance.getModelVersionId());
+		doReturn(aaiServiceInstance).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById("instanceId");
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+
+		doNothing().when(SPY_bbInputSetup).populateObjectsOnAssignAndCreateFlows(requestDetails, service, "bbName",
+				serviceInstance, lookupKeyMap, resourceId, vnfType);
+
+		doReturn(serviceInstance).when(SPY_bbInputSetup).getExistingServiceInstance(aaiServiceInstance);
+		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
+				executeBB, requestAction,null);
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteNonService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId, vnfType);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetGBBALaCarteService() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+
+		org.onap.so.serviceinstancebeans.Project requestProject = new org.onap.so.serviceinstancebeans.Project();
+		org.onap.so.serviceinstancebeans.OwningEntity requestOwningEntity = new org.onap.so.serviceinstancebeans.OwningEntity();
+		requestDetails.setProject(requestProject);
+		requestDetails.setOwningEntity(requestOwningEntity);
+
+		Service service = Mockito.mock(Service.class);
+		Customer customer = Mockito.mock(Customer.class);
+		ServiceSubscription serviceSubscription = Mockito.mock(ServiceSubscription.class);
+		Project project = Mockito.mock(Project.class);
+		OwningEntity owningEntity = Mockito.mock(OwningEntity.class);
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		String resourceId = "123";
+		String requestAction = "createInstance";
+		executeBB.setaLaCarte(true);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.SERVICE_INSTANCE.toString());
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId());
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+		doReturn(project).when(bbInputSetupMapperLayer).mapRequestProject(requestDetails.getProject());
+		doReturn(owningEntity).when(bbInputSetupMapperLayer)
+				.mapRequestOwningEntity(requestDetails.getOwningEntity());
+
+		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
+		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
+				project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				executeBB.getBuildingBlock().getBpmnFlowName());
+		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
+				executeBB, requestAction, customer);
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetGBBALaCarteServiceFindServiceByModelVersionId() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+
+		org.onap.so.serviceinstancebeans.Project requestProject = new org.onap.so.serviceinstancebeans.Project();
+		org.onap.so.serviceinstancebeans.OwningEntity requestOwningEntity = new org.onap.so.serviceinstancebeans.OwningEntity();
+		requestDetails.setProject(requestProject);
+		requestDetails.setOwningEntity(requestOwningEntity);
+
+		Service service = Mockito.mock(Service.class);
+		Customer customer = Mockito.mock(Customer.class);
+		ServiceSubscription serviceSubscription = Mockito.mock(ServiceSubscription.class);
+		Project project = Mockito.mock(Project.class);
+		OwningEntity owningEntity = Mockito.mock(OwningEntity.class);
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		String resourceId = "123";
+		String requestAction = "createInstance";
+		executeBB.setaLaCarte(true);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.SERVICE_INSTANCE.toString());
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+
+		doReturn(null).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId());
+		doReturn(service).when(SPY_bbInputSetupUtils).getCatalogServiceByModelVersionAndModelInvariantUUID(
+				requestDetails.getModelInfo().getModelVersion(), requestDetails.getModelInfo().getModelInvariantId());
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+		doReturn(project).when(bbInputSetupMapperLayer).mapRequestProject(requestDetails.getProject());
+		doReturn(owningEntity).when(bbInputSetupMapperLayer)
+				.mapRequestOwningEntity(requestDetails.getOwningEntity());
+
+		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
+		doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
+		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
+				project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				executeBB.getBuildingBlock().getBpmnFlowName());
+		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
+				executeBB, requestAction,customer);
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetGBBALaCarteServiceNoProjectNoOE() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+
+		Service service = Mockito.mock(Service.class);
+		Customer customer = Mockito.mock(Customer.class);
+		ServiceSubscription serviceSubscription = Mockito.mock(ServiceSubscription.class);
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		String resourceId = "123";
+		String requestAction = "createInstance";
+		executeBB.setaLaCarte(true);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.SERVICE_INSTANCE.toString());
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+
+		Map<String, String> uriKeys = new HashMap<>();
+		uriKeys.put("global-customer-id", "globalCustomerId");
+		uriKeys.put("service-type", "serviceType");
+		doReturn(uriKeys).when(SPY_bbInputSetupUtils)
+				.getURIKeysFromServiceInstance(resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId());
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+
+		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
+		doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
+		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
+				null, null, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				executeBB.getBuildingBlock().getBpmnFlowName());
+		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
+				executeBB, requestAction,customer);
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceInstanceHelperCreateScenario() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestInfo.setInstanceName("SharansInstanceName");
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		ServiceInstance expected = new ServiceInstance();
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+
+		doReturn(null).when(SPY_bbInputSetupUtils).getAAIServiceInstanceByName(requestInfo.getInstanceName(), customer);
+		doReturn(null).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId);
+
+
+		doReturn(expected).when(SPY_bbInputSetup).createServiceInstance(requestDetails, null, null,
+				lookupKeyMap, serviceInstanceId);
+
+		ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceInstanceHelperCreateScenarioExisting() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestInfo.setInstanceName("SharansInstanceName");
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		ServiceInstance expected = new ServiceInstance();
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUID");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+
+		doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils)
+				.getAAIServiceInstanceByName(requestInfo.getInstanceName(), customer);
+		doReturn(expected).when(SPY_bbInputSetup).getExistingServiceInstance(serviceInstanceAAI);
+
+		ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceInstanceHelperCreateScenarioExistingNoNameButWithId() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestInfo.setInstanceName("SharansInstanceName");
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		ServiceInstance expected = new ServiceInstance();
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUID");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = "ActivateServiceInstanceBB";
+
+		doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId);
+		doReturn(expected).when(SPY_bbInputSetup).getExistingServiceInstance(serviceInstanceAAI);
+
+		ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceInstanceHelperCreateScenarioExistingNoNameButWithIdDifferentModel() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		ServiceInstance expected = new ServiceInstance();
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUIDDifferent");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = "ActivateServiceInstanceBB";
+		Service differentService = new Service();
+		differentService.setModelUUID("modelUUIDDifferent");
+
+		doReturn(serviceInstanceAAI).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(serviceInstanceId);
+		doReturn(differentService).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(serviceInstanceAAI.getModelVersionId());
+		doReturn(expected).when(SPY_bbInputSetup).getExistingServiceInstance(serviceInstanceAAI);
+
+		ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test(expected = Exception.class)
+	public void testGetServiceInstanceHelperCreateScenarioExistingNoNameButWithIdExceptionThrown() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo requestInfo = new RequestInfo();
+		requestDetails.setRequestInfo(requestInfo);
+		Customer customer = new Customer();
+		String serviceInstanceId = "SharansInstanceId";
+		boolean aLaCarte = true;
+		Service service = new Service();
+		service.setModelUUID("modelUUID");
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setModelVersionId("modelUUIDDifferent");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+
+		ServiceInstance actual = SPY_bbInputSetup.getServiceInstanceHelper(requestDetails, customer, null, null,
+				lookupKeyMap, serviceInstanceId, aLaCarte, service, bbName);
+	}
+
+	@Test
+	public void testPopulateObjectsOnAssignAndCreateFlows() throws Exception {
+		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
+		String instanceName = "instanceName";
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
+		RequestDetails requestDetails = Mockito.mock(RequestDetails.class);
+		ModelInfo modelInfo = Mockito.mock(ModelInfo.class);
+		RequestInfo requestInfo = Mockito.mock(RequestInfo.class);
+		RelatedInstanceList[] relatedInstanceList = new RelatedInstanceList[] {};
+		CloudConfiguration cloudConfiguration = new CloudConfiguration();
+		org.onap.so.serviceinstancebeans.Platform platform = Mockito
+				.mock(org.onap.so.serviceinstancebeans.Platform.class);
+		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = Mockito
+				.mock(org.onap.so.serviceinstancebeans.LineOfBusiness.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+
+		doNothing().when(SPY_bbInputSetup).populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, null);
+		doNothing().when(SPY_bbInputSetup).populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness,
+				service, bbName, serviceInstance, lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
+		doNothing().when(SPY_bbInputSetup).populateVolumeGroup(modelInfo, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, relatedInstanceList, instanceName, vnfType, null);
+		doNothing().when(SPY_bbInputSetup).populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, relatedInstanceList, instanceName, null, cloudConfiguration);
+		doReturn(modelInfo).when(requestDetails).getModelInfo();
+		doReturn(requestInfo).when(requestDetails).getRequestInfo();
+		doReturn(instanceName).when(requestInfo).getInstanceName();
+		doReturn(platform).when(requestDetails).getPlatform();
+		doReturn(lineOfBusiness).when(requestDetails).getLineOfBusiness();
+		doReturn(relatedInstanceList).when(requestDetails).getRelatedInstanceList();
+		doReturn(cloudConfiguration).when(requestDetails).getCloudConfiguration();
+
+		doReturn(ModelType.network).when(modelInfo).getModelType();
+
+		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, vnfType);
+
+		verify(SPY_bbInputSetup, times(1)).populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, null);
+
+		doReturn(ModelType.vnf).when(modelInfo).getModelType();
+
+		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, vnfType);
+
+		verify(SPY_bbInputSetup, times(1)).populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness,
+				service, bbName, serviceInstance, lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
+
+		doReturn(ModelType.volumeGroup).when(modelInfo).getModelType();
+
+		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, vnfType);
+
+		verify(SPY_bbInputSetup, times(1)).populateVolumeGroup(modelInfo, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, relatedInstanceList, instanceName, vnfType, null);
+
+		doReturn(ModelType.vfModule).when(modelInfo).getModelType();
+
+		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, vnfType);
+
+		verify(SPY_bbInputSetup, times(1)).populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, relatedInstanceList, instanceName, null, cloudConfiguration);
+	}
+
+	@Test
+	public void testPopulateGBBWithSIAndAdditionalInfo() throws Exception {
+		GeneralBuildingBlock expected = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsInput_withRelatedInstanceList.json"), RequestDetails.class);
+		RequestContext requestContext = mapper.readValue(new File(RESOURCE_PATH + "RequestContextExpected.json"),
+				RequestContext.class);
+		ServiceInstance serviceInstance = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_getServiceInstanceNOAAIExpected.json"),
+				ServiceInstance.class);
+
+		OrchestrationContext orchestrationContext = new OrchestrationContext();
+		orchestrationContext.setIsRollbackEnabled(false);
+
+		CloudRegion cloudRegion = new CloudRegion();
+		cloudRegion.setCloudOwner("att-aic");
+		cloudRegion.setLcpCloudRegionId("lcpCloudRegionId");
+		cloudRegion.setComplex("complexName");
+		cloudRegion.setTenantId("tenantId");
+
+		Map<String, String> uriKeys = new HashMap<>();
+		uriKeys.put("global-customer-id","global-customer-id");
+		uriKeys.put("service-type","service-type");
+
+		Customer customer = new Customer();
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setServiceType("subscriptionServiceType");
+		customer.setGlobalCustomerId("globalCustomerId");
+		customer.setSubscriberName("subscriberName");
+		customer.setSubscriberType("subscriberType");
+		customer.setServiceSubscription(serviceSubscription);
+
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+
+		String requestAction = "createInstance";
+
+		doReturn(uriKeys).when(SPY_bbInputSetupUtils).getURIKeysFromServiceInstance(serviceInstance.getServiceInstanceId());
+		doReturn(customer).when(SPY_bbInputSetup).mapCustomer(uriKeys.get("global-customer-id"),uriKeys.get("service-type"));
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(), "att-aic");
+		doReturn(orchestrationContext).when(bbInputSetupMapperLayer).mapOrchestrationContext(requestDetails);
+		doReturn(requestContext).when(bbInputSetupMapperLayer).mapRequestContext(requestDetails);
+		doReturn(cloudRegion).when(bbInputSetupMapperLayer).mapCloudRegion(requestDetails.getCloudConfiguration(), aaiCloudRegion,
+				"att-aic");
+
+		GeneralBuildingBlock actual = SPY_bbInputSetup.populateGBBWithSIAndAdditionalInfo(requestDetails,
+				serviceInstance, executeBB, requestAction, null);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceInstanceNOAAI() throws Exception {
+		ServiceInstance expected = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_getServiceInstanceNOAAIExpected.json"),
+				ServiceInstance.class);
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		Customer customer = mapper.readValue(new File(RESOURCE_PATH + "Customer.json"), Customer.class);
+		Project project = mapper.readValue(new File(RESOURCE_PATH + "Project.json"), Project.class);
+		OwningEntity owningEntity = mapper.readValue(new File(RESOURCE_PATH + "OwningEntity.json"), OwningEntity.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+
+		ExecuteBuildingBlock executeBB = new ExecuteBuildingBlock();
+		executeBB.setaLaCarte(true);
+		BuildingBlock buildingBlock = new BuildingBlock();
+		buildingBlock.setBpmnFlowName(AssignFlows.SERVICE_INSTANCE.toString());
+		executeBB.setBuildingBlock(buildingBlock);
+		RequestDetails requestDetails = new RequestDetails();
+		RequestInfo reqInfo = new RequestInfo();
+		reqInfo.setInstanceName("serviceInstanceName");
+		requestDetails.setRequestInfo(reqInfo);
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.service);
+		requestDetails.setModelInfo(modelInfo);
+		doReturn(null).when(SPY_bbInputSetupUtils)
+				.getAAIServiceInstanceByName(requestDetails.getRequestInfo().getInstanceName(), customer);
+		doReturn(expected.getModelInfoServiceInstance()).when(bbInputSetupMapperLayer)
+				.mapCatalogServiceIntoServiceInstance(service);
+		doReturn(null).when(SPY_bbInputSetupUtils).getAAIServiceInstanceById(any(String.class));
+		String serviceInstanceId = "3655a595-05d1-433c-93c0-3afd6b572545";
+		boolean aLaCarte = true;
+
+		ServiceInstance actual = SPY_bbInputSetup.getALaCarteServiceInstance(service, requestDetails, customer, project,
+				owningEntity, lookupKeyMap, serviceInstanceId, aLaCarte,
+				executeBB.getBuildingBlock().getBpmnFlowName());
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetServiceSubscription() throws IOException {
+		ServiceSubscription expected = new ServiceSubscription();
+		RequestDetails requestDetails = new RequestDetails();
+		RequestParameters params = new RequestParameters();
+		params.setSubscriptionServiceType("subscriptionServiceType");
+		requestDetails.setRequestParameters(params);
+		org.onap.aai.domain.yang.ServiceSubscription aaiServiceSubscription = new org.onap.aai.domain.yang.ServiceSubscription();
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("globalCustomerId");
+		doReturn(aaiServiceSubscription).when(SPY_bbInputSetupUtils).getAAIServiceSubscription(
+				customer.getGlobalCustomerId(), requestDetails.getRequestParameters().getSubscriptionServiceType());
+		doReturn(expected).when(bbInputSetupMapperLayer).mapAAIServiceSubscription(aaiServiceSubscription);
+
+		ServiceSubscription actual = SPY_bbInputSetup.getServiceSubscription(requestDetails, customer);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetCustomer() throws IOException {
+		Customer expected = new Customer();
+		RequestDetails requestDetails = new RequestDetails();
+		SubscriberInfo subscriberInfo = new SubscriberInfo();
+		subscriberInfo.setGlobalSubscriberId("globalSubscriberId");
+		requestDetails.setSubscriberInfo(subscriberInfo);
+		org.onap.aai.domain.yang.Customer aaiCustomer = new org.onap.aai.domain.yang.Customer();
+		doReturn(aaiCustomer).when(SPY_bbInputSetupUtils)
+				.getAAICustomer(requestDetails.getSubscriberInfo().getGlobalSubscriberId());
+		doReturn(expected).when(bbInputSetupMapperLayer).mapAAICustomer(aaiCustomer);
+
+		Customer actual = SPY_bbInputSetup.getCustomerFromRequest(requestDetails);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetExistingServiceInstance() throws Exception {
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		ServiceInstance expected = new ServiceInstance();
+
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIServiceInstanceIntoServiceInstance(serviceInstanceAAI);
+
+		doNothing().when(SPY_bbInputSetup).addRelationshipsToSI(serviceInstanceAAI, expected);
+
+		ServiceInstance actual = SPY_bbInputSetup.getExistingServiceInstance(serviceInstanceAAI);
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testPopulateNetworkCollectionAndInstanceGroupAssign() throws Exception {
+		Service service = Mockito.mock(Service.class);
+		String key = "collectionCustId";
+		ServiceInstance serviceInstance = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceInstance_getServiceInstanceNOAAIExpected.json"),
+				ServiceInstance.class);
+		String resourceId = "123";
+		Collection collection = SPY_bbInputSetup.createCollection(resourceId);
+		InstanceGroup instanceGroup = SPY_bbInputSetup.createInstanceGroup();
+		assertNull(serviceInstance.getCollection());
+		doReturn(true).when(SPY_bbInputSetup).isVlanTagging(service, key);
+		doReturn(collection).when(SPY_bbInputSetup).createCollection(resourceId);
+		doReturn(instanceGroup).when(SPY_bbInputSetup).createInstanceGroup();
+		doNothing().when(SPY_bbInputSetup).mapCatalogCollection(service, collection, key);
+		doNothing().when(SPY_bbInputSetup).mapCatalogNetworkCollectionInstanceGroup(service,
+				collection.getInstanceGroup(), key);
+		NetworkCollectionResourceCustomization networkCollection = new NetworkCollectionResourceCustomization();
+		networkCollection.setModelCustomizationUUID(key);
+		networkCollection.setCollectionResource(new CollectionResource());
+		networkCollection.getCollectionResource().setInstanceGroup(new org.onap.so.db.catalog.beans.InstanceGroup());
+		networkCollection.getCollectionResource().getInstanceGroup().setToscaNodeType("NetworkCollectionResource");
+		networkCollection.getCollectionResource().getInstanceGroup().setType(InstanceGroupType.L3_NETWORK);
+		networkCollection.getCollectionResource().getInstanceGroup().setCollectionInstanceGroupCustomizations(new ArrayList<>());
+		List<CollectionResourceCustomization> customizations = new ArrayList<>();
+		customizations.add(networkCollection);
+		doReturn(customizations).when(service).getCollectionResourceCustomizations();
+
+		SPY_bbInputSetup.populateNetworkCollectionAndInstanceGroupAssign(service,
+				AssignFlows.NETWORK_COLLECTION.toString(), serviceInstance, resourceId, key);
+
+		assertNotNull(serviceInstance.getCollection());
+		assertNotNull(serviceInstance.getCollection().getInstanceGroup());
+
+		verify(SPY_bbInputSetup, times(1)).mapCatalogCollection(service, serviceInstance.getCollection(), key);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogNetworkCollectionInstanceGroup(service,
+				serviceInstance.getCollection().getInstanceGroup(), key);
+	}
+
+	@Test
+	public void testIsVlanTagging() throws Exception {
+		boolean expected = true;
+		Service service = Mockito.mock(Service.class);
+		String key = "collectionCustId";
+		NetworkCollectionResourceCustomization networkCollection = new NetworkCollectionResourceCustomization();
+		networkCollection.setModelCustomizationUUID(key);
+		networkCollection.setCollectionResource(new CollectionResource());
+		networkCollection.getCollectionResource().setInstanceGroup(new org.onap.so.db.catalog.beans.InstanceGroup());
+		networkCollection.getCollectionResource().getInstanceGroup().setToscaNodeType("org.openecomp.resource.cr.NetworkCollectionResource1806");
+		List<CollectionResourceCustomization> customizations = new ArrayList<>();
+		customizations.add(networkCollection);
+		doReturn(customizations).when(service).getCollectionResourceCustomizations();
+		boolean actual = SPY_bbInputSetup.isVlanTagging(service, key);
+		assertEquals("Is Vlan Tagging check.", expected, actual);
+	}
+
+	@Test
+	public void testPopulateVolumeGroup() throws Exception {
+		RequestDetails requestDetails = new RequestDetails();
+		RelatedInstanceList ril = new RelatedInstanceList();
+		RelatedInstance ri = new RelatedInstance();
+		ModelInfo mi = new ModelInfo();
+		mi.setModelType(ModelType.vnf);
+		mi.setModelCustomizationUuid("vnfModelCustomizationUUID");
+		ri.setModelInfo(mi);
+		ril.setRelatedInstance(ri);
+		requestDetails.setRelatedInstanceList(new RelatedInstanceList[] { ril });
+
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.volumeGroup);
+
+		RequestInfo reqInfo = new RequestInfo();
+		reqInfo.setInstanceName("volumeGroupName");
+		requestDetails.setModelInfo(modelInfo);
+		requestDetails.setRequestInfo(reqInfo);
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("genericVnfId");
+
+		VolumeGroup vg = new VolumeGroup();
+		vg.setVolumeGroupName("volumeGroupName");
+		vg.setVolumeGroupId("volumeGroupId");
+		vnf.getVolumeGroups().add(vg);
+		vnf.getVolumeGroups().add(vg);
+		serviceInstance.getVnfs().add(vnf);
+
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "genericVnfId");
+
+		String bbName = AssignFlows.VOLUME_GROUP.toString();
+		String resourceId = "123";
+		doNothing().when(SPY_bbInputSetup).mapCatalogVolumeGroup(isA(VolumeGroup.class), eq(modelInfo),
+				eq(service), eq("vnfModelCustomizationUUID"));
+		org.onap.aai.domain.yang.GenericVnf aaiGenericVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiGenericVnf.setModelCustomizationId("vnfModelCustomizationUUID");
+		doReturn(aaiGenericVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
+
+		SPY_bbInputSetup.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+				requestDetails.getRelatedInstanceList(), reqInfo.getInstanceName(), null, null);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogVolumeGroup(vg, modelInfo, service, "vnfModelCustomizationUUID");
+		vnf.getVolumeGroups().clear();
+		SPY_bbInputSetup.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+				requestDetails.getRelatedInstanceList(), reqInfo.getInstanceName(), null, null);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVolumeGroup(vnf.getVolumeGroups().get(0), modelInfo, service,
+				"vnfModelCustomizationUUID");
+	}
+
+	@Test
+	public void testMapCatalogVolumeGroup() {
+		VolumeGroup volumeGroup = new VolumeGroup();
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid("modelCustomizationUUID");
+		requestDetails.setModelInfo(modelInfo);
+		Service service = new Service();
+		VnfResourceCustomization resourceCust = new VnfResourceCustomization();
+		resourceCust.setModelCustomizationUUID("vnfModelCustomizationUUID");
+		service.getVnfCustomizations().add(resourceCust);
+		VfModuleCustomization vfResourceCust = new VfModuleCustomization();
+		vfResourceCust.setModelCustomizationUUID("modelCustomizationUUID");
+		ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
+		resourceCust.getVfModuleCustomizations().add(vfResourceCust);
+
+		doReturn(modelInfoVfModule).when(bbInputSetupMapperLayer).mapCatalogVfModuleToVfModule(vfResourceCust);
+
+		SPY_bbInputSetup.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, "vnfModelCustomizationUUID");
+
+		assertEquals(modelInfoVfModule, volumeGroup.getModelInfoVfModule());
+	}
+
+	@Test
+	public void testPopulateL3Network() throws JsonParseException, JsonMappingException, IOException {
+		String instanceName = "networkName";
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.network);
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		L3Network network = new L3Network();
+		network.setNetworkId("networkId");
+		network.setNetworkName("networkName");
+		serviceInstance.getNetworks().add(network);
+		String resourceId = "123";
+		// Mock service
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		String bbName = AssignFlows.NETWORK_A_LA_CARTE.toString();
+
+		doNothing().when(SPY_bbInputSetup).mapCatalogNetwork(network, modelInfo, service);
+
+		SPY_bbInputSetup.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, null);
+
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, null);
+
+		SPY_bbInputSetup.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, null);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogNetwork(network, modelInfo, service);
+
+		instanceName = "networkName2";
+		L3Network network2 = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, resourceId, null);
+		doReturn(network2).when(SPY_bbInputSetup).createNetwork(lookupKeyMap, instanceName, resourceId, null);
+		SPY_bbInputSetup.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, null);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogNetwork(network2, modelInfo, service);
+	}
+
+	@Test
+	public void testMapCatalogNetwork() {
+		ModelInfoNetwork modelInfoNetwork = new ModelInfoNetwork();
+		L3Network network = new L3Network();
+
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid("modelCustomizationUUID");
+		requestDetails.setModelInfo(modelInfo);
+		Service service = new Service();
+		NetworkResourceCustomization resourceCust = new NetworkResourceCustomization();
+		resourceCust.setModelCustomizationUUID("modelCustomizationUUID");
+		service.setNetworkCustomizations(Arrays.asList(new NetworkResourceCustomization[] { resourceCust }));
+
+		doReturn(modelInfoNetwork).when(bbInputSetupMapperLayer).mapCatalogNetworkToNetwork(resourceCust);
+
+		SPY_bbInputSetup.mapCatalogNetwork(network, modelInfo, service);
+
+		assertEquals(modelInfoNetwork, network.getModelInfoNetwork());
+	}
+	
+	@Test
+	public void testPopulateConfiguration() throws JsonParseException, JsonMappingException, IOException {
+		String instanceName = "configurationName";
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		Configuration configuration = new Configuration();
+		configuration.setConfigurationId("configurationId");
+		configuration.setConfigurationName("configurationName");
+		serviceInstance.getConfigurations().add(configuration);
+		String resourceId = "configurationId";
+		// Mock service
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		ConfigurationResourceCustomization configurationCust = new ConfigurationResourceCustomization();
+		configurationCust.setModelCustomizationUUID("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
+		service.getConfigurationCustomizations().add(configurationCust);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
+		String bbName = AssignFlows.FABRIC_CONFIGURATION.toString();
+
+		doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration, modelInfo, service);
+
+		SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+				instanceName);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration, modelInfo, service);
+		
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, null);
+
+		SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+				instanceName);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogConfiguration(configuration, modelInfo, service);
+
+		instanceName = "configurationName2";
+		resourceId = "resourceId2";
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId2");
+		Configuration configuration2 = SPY_bbInputSetup.createConfiguration(lookupKeyMap, instanceName, resourceId);
+		doReturn(configuration2).when(SPY_bbInputSetup).createConfiguration(lookupKeyMap, instanceName, resourceId);
+		doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration2, modelInfo, service);
+		SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
+				instanceName);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration2, modelInfo, service);
+	}
+
+	@Test
+	public void testMapCatalogConfiguration() {
+		ModelInfoNetwork modelInfoNetwork = new ModelInfoNetwork();
+		L3Network network = new L3Network();
+
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid("modelCustomizationUUID");
+		requestDetails.setModelInfo(modelInfo);
+		Service service = new Service();
+		NetworkResourceCustomization resourceCust = new NetworkResourceCustomization();
+		resourceCust.setModelCustomizationUUID("modelCustomizationUUID");
+		service.setNetworkCustomizations(Arrays.asList(new NetworkResourceCustomization[] { resourceCust }));
+
+		doReturn(modelInfoNetwork).when(bbInputSetupMapperLayer).mapCatalogNetworkToNetwork(resourceCust);
+
+		SPY_bbInputSetup.mapCatalogNetwork(network, modelInfo, service);
+
+		assertEquals(modelInfoNetwork, network.getModelInfoNetwork());
+	}
+
+	@Test
+	public void testPopulateGenericVnf() throws JsonParseException, JsonMappingException, IOException {
+		org.onap.so.serviceinstancebeans.Platform platform = new org.onap.so.serviceinstancebeans.Platform();
+		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = new org.onap.so.serviceinstancebeans.LineOfBusiness();
+		String instanceName = "vnfName";
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.vnf);
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("genericVnfId");
+		vnf.setVnfName("vnfName");
+		serviceInstance.getVnfs().add(vnf);
+		String vnfType = "vnfType";
+		RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetails_CreateVnf.json"),
+				RequestDetails.class);
+
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "genericVnfId");
+		String bbName = AssignFlows.VNF.toString();
+
+		Platform expectedPlatform = new Platform();
+		LineOfBusiness expectedLineOfBusiness = new LineOfBusiness();
+		String resourceId = "123";
+		doReturn(expectedPlatform).when(bbInputSetupMapperLayer).mapRequestPlatform(platform);
+		doReturn(expectedLineOfBusiness).when(bbInputSetupMapperLayer).mapRequestLineOfBusiness(lineOfBusiness);
+		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf, modelInfo, service);
+		doReturn(null).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf, modelInfo, service);
+
+		instanceName = "vnfName2";
+		GenericVnf vnf2 = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+				resourceId, vnfType, null);
+		doReturn(vnf2).when(SPY_bbInputSetup).createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+				resourceId, vnfType, null);
+		doNothing().when(SPY_bbInputSetup).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
+		doNothing().when(SPY_bbInputSetup).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(vnf2, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
+		verify(SPY_bbInputSetup, times(1)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+	}
+	
+	@Test
+	public void testPopulateGenericVnfWhereVnfTypeIsNull()
+			throws JsonParseException, JsonMappingException, IOException {
+		org.onap.so.serviceinstancebeans.Platform platform = new org.onap.so.serviceinstancebeans.Platform();
+		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = new org.onap.so.serviceinstancebeans.LineOfBusiness();
+		String instanceName = "vnfName";
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelType(ModelType.vnf);
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("genericVnfId");
+		vnf.setVnfName("vnfName");
+		serviceInstance.getVnfs().add(vnf);
+		String vnfType = null;
+		RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetails_CreateVnf.json"),
+				RequestDetails.class);
+
+		Service service = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogDBService_getServiceInstanceNOAAIInput.json"), Service.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "genericVnfId");
+		String bbName = AssignFlows.VNF.toString();
+
+		Platform expectedPlatform = new Platform();
+		LineOfBusiness expectedLineOfBusiness = new LineOfBusiness();
+		String resourceId = "123";
+		doReturn(expectedPlatform).when(bbInputSetupMapperLayer).mapRequestPlatform(platform);
+		doReturn(expectedLineOfBusiness).when(bbInputSetupMapperLayer).mapRequestLineOfBusiness(lineOfBusiness);
+		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf, modelInfo, service);
+
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf, modelInfo, service);
+
+		instanceName = "vnfName2";
+		GenericVnf vnf2 = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+				resourceId, vnfType, null);
+		doReturn(vnf2).when(SPY_bbInputSetup).createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+				resourceId, vnfType, null);
+		doNothing().when(SPY_bbInputSetup).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
+		doNothing().when(SPY_bbInputSetup).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
+				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(vnf2, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
+		verify(SPY_bbInputSetup, times(1)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+	}
+
+	@Test
+	public void testMapCatalogVnf() {
+		ModelInfoGenericVnf modelInfoGenericVnf = new ModelInfoGenericVnf();
+		GenericVnf genericVnf = new GenericVnf();
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid("modelCustomizationUUID");
+		requestDetails.setModelInfo(modelInfo);
+		Service service = new Service();
+		VnfResourceCustomization resourceCust = new VnfResourceCustomization();
+		resourceCust.setModelCustomizationUUID("vnfModelCustomizationUUID");
+		service.getVnfCustomizations().add(resourceCust);
+		resourceCust.setModelCustomizationUUID("modelCustomizationUUID");
+
+		doReturn(modelInfoGenericVnf).when(bbInputSetupMapperLayer).mapCatalogVnfToVnf(resourceCust);
+
+		SPY_bbInputSetup.mapCatalogVnf(genericVnf, modelInfo, service);
+
+		assertEquals(modelInfoGenericVnf, genericVnf.getModelInfoGenericVnf());
+	}
+
+	@Test
+	public void testMapCatalogCollectionAndInstanceGroup() {
+		ModelInfoCollection modelInfoCollection = new ModelInfoCollection();
+		modelInfoCollection.setCollectionFunction("collectionFunction");
+		modelInfoCollection.setCollectionRole("collectionRole");
+		modelInfoCollection.setCollectionType("collectionType");
+		modelInfoCollection.setDescription("description");
+		modelInfoCollection.setModelInvariantUUID("modelInvariantUUID");
+		modelInfoCollection.setQuantity(0);
+
+		ModelInfoInstanceGroup modelInfoInstanceGroup = new ModelInfoInstanceGroup();
+		modelInfoInstanceGroup.setFunction("function");
+		modelInfoInstanceGroup.setInstanceGroupRole("instanceGroupRole");
+		modelInfoInstanceGroup.setModelInvariantUUID("modelInvariantUUID");
+		modelInfoInstanceGroup.setModelUUID("modelUUID");
+		modelInfoInstanceGroup.setType("VNFC");
+		modelInfoInstanceGroup.setDescription("description");
+
+		InstanceGroup instanceGroup = new InstanceGroup();
+		Collection collection = new Collection();
+		collection.setInstanceGroup(instanceGroup);
+
+		CollectionResource collectionResource = new CollectionResource();
+		org.onap.so.db.catalog.beans.InstanceGroup catalogInstanceGroup = new org.onap.so.db.catalog.beans.InstanceGroup();
+		collectionResource.setToscaNodeType("NetworkCollection");
+		collectionResource.setInstanceGroup(catalogInstanceGroup);
+
+		CollectionResourceCustomization collectionCust = new NetworkCollectionResourceCustomization();
+		collectionCust.setModelCustomizationUUID("modelCustomizationUUID");
+		collectionCust.setCollectionResource(collectionResource);
+
+		Service service = new Service();
+		service.getCollectionResourceCustomizations().add(collectionCust);
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setCollection(collection);
+
+		List<CollectionResourceInstanceGroupCustomization> instanceGroupCustList = new ArrayList<>();
+		CollectionResourceInstanceGroupCustomization instanceGroupCust = new CollectionResourceInstanceGroupCustomization();
+		instanceGroupCust.setFunction("function");
+		instanceGroupCust.setDescription("description");
+
+		doReturn(modelInfoCollection).when(bbInputSetupMapperLayer).mapCatalogCollectionToCollection(collectionCust,
+				collectionResource);
+		doReturn(instanceGroupCustList).when(SPY_bbInputSetupUtils)
+				.getCollectionResourceInstanceGroupCustomization(collectionCust.getModelCustomizationUUID());
+		doReturn(modelInfoInstanceGroup).when(bbInputSetupMapperLayer).mapCatalogInstanceGroupToInstanceGroup(collectionCust, 
+				catalogInstanceGroup);
+
+		SPY_bbInputSetup.mapCatalogCollection(service, serviceInstance.getCollection(), "modelCustomizationUUID");
+		SPY_bbInputSetup.mapCatalogNetworkCollectionInstanceGroup(service, 
+				serviceInstance.getCollection().getInstanceGroup(), collectionCust.getModelCustomizationUUID());
+
+		assertThat(collection.getModelInfoCollection(), sameBeanAs(modelInfoCollection));
+		assertThat(instanceGroup.getModelInfoInstanceGroup(), sameBeanAs(modelInfoInstanceGroup));
+	}
+
+	@Test
+	public void testAddRelationshipsToSI() throws Exception {
+		ServiceInstance serviceInstance = new ServiceInstance();
+		org.onap.aai.domain.yang.ServiceInstance serviceInstanceAAI = new org.onap.aai.domain.yang.ServiceInstance();
+		serviceInstanceAAI.setServiceInstanceId("serviceInstanceId");
+
+		org.onap.aai.domain.yang.RelationshipList relationshipList = new org.onap.aai.domain.yang.RelationshipList();
+		org.onap.aai.domain.yang.Relationship relationship = new org.onap.aai.domain.yang.Relationship();
+		relationshipList.getRelationship().add(relationship);
+		serviceInstanceAAI.setRelationshipList(relationshipList);
+
+		Map<String, String> uriKeys = new HashMap<>();
+		uriKeys.put("global-customer-id", "globalCustomerId");
+		uriKeys.put("service-type", "serviceType");
+
+		doReturn(uriKeys).when(SPY_bbInputSetupUtils)
+				.getURIKeysFromServiceInstance(serviceInstanceAAI.getServiceInstanceId());
+		doNothing().when(SPY_bbInputSetup).mapProject(any(), eq(serviceInstance));
+		doNothing().when(SPY_bbInputSetup).mapOwningEntity(any(), eq(serviceInstance));
+		doNothing().when(SPY_bbInputSetup).mapL3Networks(any(), eq(serviceInstance.getNetworks()));
+		doNothing().when(SPY_bbInputSetup).mapGenericVnfs(any(), eq(serviceInstance.getVnfs()));
+		doNothing().when(SPY_bbInputSetup).mapCollection(any(), eq(serviceInstance));
+
+		SPY_bbInputSetup.addRelationshipsToSI(serviceInstanceAAI, serviceInstance);
+
+		verify(SPY_bbInputSetup, times(1)).mapProject(any(), eq(serviceInstance));
+		verify(SPY_bbInputSetup, times(1)).mapOwningEntity(any(), eq(serviceInstance));
+		verify(SPY_bbInputSetup, times(1)).mapL3Networks(any(), eq(serviceInstance.getNetworks()));
+		verify(SPY_bbInputSetup, times(1)).mapGenericVnfs(any(), eq(serviceInstance.getVnfs()));
+		verify(SPY_bbInputSetup, times(1)).mapCollection(any(), eq(serviceInstance));
+		verify(SPY_bbInputSetup, times(1)).mapConfigurations(any(), eq(serviceInstance.getConfigurations()));
+	}
+	
+	@Test
+	public void testMapConfigurations() throws JsonProcessingException {
+		org.onap.aai.domain.yang.Configuration expectedAAI = new org.onap.aai.domain.yang.Configuration();
+		org.onap.aai.domain.yang.RelationshipList relationshipList = new org.onap.aai.domain.yang.RelationshipList();
+		org.onap.aai.domain.yang.Relationship relationship = new org.onap.aai.domain.yang.Relationship();
+		relationshipList.getRelationship().add(relationship);
+		expectedAAI.setRelationshipList(relationshipList);
+
+		Configuration expected = new Configuration();
+		AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, "configurationId");
+		AAIResultWrapper configurationWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(configurationWrapper).when(SPY_bbInputSetupUtils).getAAIResourceDepthOne(aaiResourceUri);
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIConfiguration(isA(org.onap.aai.domain.yang.Configuration.class));
+
+		List<Configuration> configurations = new ArrayList<>();
+
+		SPY_bbInputSetup.mapConfigurations(Arrays.asList(new AAIResourceUri[] { aaiResourceUri }), configurations);
+
+		assertEquals(expected, configurations.get(0));
+	}
+
+	@Test
+	public void testMapGenericVnfs() throws JsonProcessingException {
+		org.onap.aai.domain.yang.GenericVnf expectedAAI = new org.onap.aai.domain.yang.GenericVnf();
+		org.onap.aai.domain.yang.RelationshipList relationshipList = new org.onap.aai.domain.yang.RelationshipList();
+		org.onap.aai.domain.yang.Relationship relationship = new org.onap.aai.domain.yang.Relationship();
+		relationshipList.getRelationship().add(relationship);
+		expectedAAI.setRelationshipList(relationshipList);
+
+		GenericVnf expected = new GenericVnf();
+		AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "vnfId");
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(vnfWrapper).when(SPY_bbInputSetupUtils).getAAIResourceDepthOne(aaiResourceUri);
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIGenericVnfIntoGenericVnf(isA(org.onap.aai.domain.yang.GenericVnf.class));
+		doNothing().when(SPY_bbInputSetup).mapPlatform(any(), eq(expected));
+		doNothing().when(SPY_bbInputSetup).mapLineOfBusiness(any(), eq(expected));
+		doReturn(new ArrayList<>()).when(SPY_bbInputSetup).mapVolumeGroups(any());
+
+		List<GenericVnf> genericVnfs = new ArrayList<>();
+
+		SPY_bbInputSetup.mapGenericVnfs(Arrays.asList(new AAIResourceUri[] { aaiResourceUri }), genericVnfs);
+
+		assertEquals(expected, genericVnfs.get(0));
+		verify(SPY_bbInputSetup, times(1)).mapPlatform(any(), eq(expected));
+		verify(SPY_bbInputSetup, times(1)).mapLineOfBusiness(any(), eq(expected));
+		verify(SPY_bbInputSetup, times(1)).mapVolumeGroups(any());
+	}
+
+	@Test
+	public void testMapVolumeGroups() throws JsonProcessingException {
+		org.onap.aai.domain.yang.VolumeGroup expectedAAI = new org.onap.aai.domain.yang.VolumeGroup();
+
+		VolumeGroup expected = new VolumeGroup();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIVolumeGroup(isA(org.onap.aai.domain.yang.VolumeGroup.class));
+
+		 List<VolumeGroup> volumeGroupsList = 
+				 SPY_bbInputSetup.mapVolumeGroups(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }));
+
+		assertEquals(expected, volumeGroupsList.get(0));
+	}
+
+	@Test
+	public void testMapLineOfBusiness() throws JsonProcessingException {
+		org.onap.aai.domain.yang.LineOfBusiness expectedAAI = new org.onap.aai.domain.yang.LineOfBusiness();
+
+		LineOfBusiness expected = new LineOfBusiness();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAILineOfBusiness(isA(org.onap.aai.domain.yang.LineOfBusiness.class));
+
+		GenericVnf vnf = new GenericVnf();
+
+		SPY_bbInputSetup.mapLineOfBusiness(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }), vnf);
+
+		assertEquals(expected, vnf.getLineOfBusiness());
+	}
+
+	@Test
+	public void testMapPlatform() throws JsonProcessingException {
+		org.onap.aai.domain.yang.Platform expectedAAI = new org.onap.aai.domain.yang.Platform();
+
+		Platform expected = new Platform();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIPlatform(isA(org.onap.aai.domain.yang.Platform.class));
+
+		GenericVnf vnf = new GenericVnf();
+
+		SPY_bbInputSetup.mapPlatform(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }), vnf);
+
+		assertEquals(expected, vnf.getPlatform());
+	}
+
+	@Test
+	public void testMapCollection() throws JsonProcessingException {
+		List<AAIResultWrapper> collections = new ArrayList<>();
+		ServiceInstance serviceInstance = new ServiceInstance();
+
+		org.onap.aai.domain.yang.Collection aaiCollection = new org.onap.aai.domain.yang.Collection();
+		org.onap.aai.domain.yang.RelationshipList collectionRelationshipList = new org.onap.aai.domain.yang.RelationshipList();
+		org.onap.aai.domain.yang.Relationship collectionInstanceGroupRelationship = new org.onap.aai.domain.yang.Relationship();
+		collectionRelationshipList.getRelationship().add(collectionInstanceGroupRelationship);
+		aaiCollection.setRelationshipList(collectionRelationshipList);
+
+		collections.add(new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(aaiCollection)));
+
+		Collection collection = new Collection();
+		List<InstanceGroup> instanceGroupsList = new ArrayList<>();
+		InstanceGroup instanceGroup = new InstanceGroup();
+		instanceGroupsList.add(instanceGroup);
+
+		doReturn(collection).when(bbInputSetupMapperLayer)
+				.mapAAICollectionIntoCollection(isA(org.onap.aai.domain.yang.Collection.class));
+		doReturn(instanceGroup).when(SPY_bbInputSetup).mapInstanceGroup(isA(AAIResultWrapper.class));
+		doReturn(instanceGroupsList).when(SPY_bbInputSetup).mapInstanceGroups(any());
+		SPY_bbInputSetup.mapCollection(collections, serviceInstance);
+
+		assertEquals(collection, serviceInstance.getCollection());
+		assertEquals(instanceGroup, collection.getInstanceGroup());
+		
+		instanceGroupsList.clear();
+		collection = new Collection();
+		
+		SPY_bbInputSetup.mapCollection(collections, serviceInstance);
+		assertEquals(collection, serviceInstance.getCollection());
+		assertNull(collection.getInstanceGroup());
+	}
+
+	@Test
+	public void testMapL3Networks() throws JsonProcessingException {
+		org.onap.aai.domain.yang.L3Network expectedAAI = new org.onap.aai.domain.yang.L3Network();
+		org.onap.aai.domain.yang.RelationshipList relationshipList = new org.onap.aai.domain.yang.RelationshipList();
+		org.onap.aai.domain.yang.Relationship relationship = new org.onap.aai.domain.yang.Relationship();
+		relationshipList.getRelationship().add(relationship);
+		expectedAAI.setRelationshipList(relationshipList);
+
+		L3Network expected = new L3Network();
+		List<L3Network> l3Networks = new ArrayList<>();
+		AAIResultWrapper l3NetworksWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+		AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, "networkId");
+
+		doReturn(l3NetworksWrapper).when(SPY_bbInputSetupUtils).getAAIResourceDepthTwo(aaiResourceUri);
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIL3Network(isA(org.onap.aai.domain.yang.L3Network.class));
+		doNothing().when(SPY_bbInputSetup).mapNetworkPolicies(any(), eq(expected.getNetworkPolicies()));
+		doNothing().when(SPY_bbInputSetup).mapRouteTableReferences(any(),
+				eq(expected.getContrailNetworkRouteTableReferences()));
+
+		SPY_bbInputSetup.mapL3Networks(Arrays.asList(new AAIResourceUri[] { aaiResourceUri }), l3Networks);
+
+		assertEquals(expected, l3Networks.get(0));
+		verify(SPY_bbInputSetup, times(1)).mapNetworkPolicies(any(), eq(expected.getNetworkPolicies()));
+		verify(SPY_bbInputSetup, times(1)).mapRouteTableReferences(any(),
+				eq(expected.getContrailNetworkRouteTableReferences()));
+	}
+
+	@Test
+	public void testMapRouteTableReferences() throws JsonProcessingException {
+		org.onap.aai.domain.yang.RouteTableReference expectedAAI = new org.onap.aai.domain.yang.RouteTableReference();
+
+		RouteTableReference expected = new RouteTableReference();
+		List<RouteTableReference> contrailNetworkRouteTableReferences = new ArrayList<>();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer).mapAAIRouteTableReferenceIntoRouteTableReference(
+				isA(org.onap.aai.domain.yang.RouteTableReference.class));
+
+		SPY_bbInputSetup.mapRouteTableReferences(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }),
+				contrailNetworkRouteTableReferences);
+
+		assertEquals(expected, contrailNetworkRouteTableReferences.get(0));
+	}
+
+	@Test
+	public void testMapOwningEntity() throws JsonProcessingException {
+		org.onap.aai.domain.yang.OwningEntity expectedAAI = new org.onap.aai.domain.yang.OwningEntity();
+
+		OwningEntity expected = new OwningEntity();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAIOwningEntity(isA(org.onap.aai.domain.yang.OwningEntity.class));
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+
+		SPY_bbInputSetup.mapOwningEntity(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }), serviceInstance);
+
+		assertEquals(expected, serviceInstance.getOwningEntity());
+	}
+
+	@Test
+	public void testMapProject() throws JsonProcessingException {
+		org.onap.aai.domain.yang.Project expectedAAI = new org.onap.aai.domain.yang.Project();
+
+		Project expected = new Project();
+		AAIResultWrapper vnfWrapper = new AAIResultWrapper(
+				new AAICommonObjectMapperProvider().getMapper().writeValueAsString(expectedAAI));
+
+		doReturn(expected).when(bbInputSetupMapperLayer).mapAAIProject(isA(org.onap.aai.domain.yang.Project.class));
+
+		ServiceInstance serviceInstance = new ServiceInstance();
+
+		SPY_bbInputSetup.mapProject(Arrays.asList(new AAIResultWrapper[] { vnfWrapper }), serviceInstance);
+
+		assertEquals(expected, serviceInstance.getProject());
+	}
+
+	@Test
+	public void testMapCustomer() throws Exception {
+		org.onap.aai.domain.yang.Customer customerAAI = new org.onap.aai.domain.yang.Customer();
+		org.onap.aai.domain.yang.ServiceSubscription serviceSubscriptionAAI = new org.onap.aai.domain.yang.ServiceSubscription();
+
+		Customer expected = new Customer();
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+
+		String globalCustomerId = "globalCustomerId";
+		String subscriptionServiceType = "subscriptionServiceType";
+
+		doReturn(customerAAI).when(SPY_bbInputSetupUtils).getAAICustomer(globalCustomerId);
+		doReturn(serviceSubscriptionAAI).when(SPY_bbInputSetupUtils).getAAIServiceSubscription(globalCustomerId,
+				subscriptionServiceType);
+		doReturn(expected).when(bbInputSetupMapperLayer)
+				.mapAAICustomer(isA(org.onap.aai.domain.yang.Customer.class));
+		doReturn(serviceSubscription).when(bbInputSetupMapperLayer)
+				.mapAAIServiceSubscription(isA(org.onap.aai.domain.yang.ServiceSubscription.class));
+
+		Customer actual = SPY_bbInputSetup.mapCustomer(globalCustomerId, subscriptionServiceType);
+
+		assertEquals(expected, actual);
+		assertEquals(serviceSubscription, expected.getServiceSubscription());
+	}
+
+	@Test
+	public void testPopulateLookupKeyMapWithIds() {
+		Map<ResourceKey, String> expected = new HashMap<>();
+		Map<ResourceKey, String> actual = new HashMap<>();
+		String serviceInstanceId = "serviceInstanceId";
+		String networkId = "networkId";
+		String vnfId = "vnfId";
+		String vfModuleId = "vfModuleId";
+		String volumeGroupId = "volumeGroupId";
+		String configurationId = "configurationId";
+
+		expected.put(ResourceKey.SERVICE_INSTANCE_ID, serviceInstanceId);
+		expected.put(ResourceKey.NETWORK_ID, networkId);
+		expected.put(ResourceKey.GENERIC_VNF_ID, vnfId);
+		expected.put(ResourceKey.VF_MODULE_ID, vfModuleId);
+		expected.put(ResourceKey.VOLUME_GROUP_ID, volumeGroupId);
+		expected.put(ResourceKey.CONFIGURATION_ID, configurationId);
+
+		WorkflowResourceIds workflowResourceIds = new WorkflowResourceIds();
+		workflowResourceIds.setServiceInstanceId(serviceInstanceId);
+		workflowResourceIds.setNetworkId(networkId);
+		workflowResourceIds.setVnfId(vnfId);
+		workflowResourceIds.setVfModuleId(vfModuleId);
+		workflowResourceIds.setVolumeGroupId(volumeGroupId);
+		workflowResourceIds.setConfigurationId(configurationId);
+
+		SPY_bbInputSetup.populateLookupKeyMapWithIds(workflowResourceIds, actual);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testgetGBBMacro() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		InfraActiveRequests request = Mockito.mock(InfraActiveRequests.class);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(request).when(SPY_bbInputSetupUtils).getInfraActiveRequest(executeBB.getRequestId());
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		doNothing().when(SPY_bbInputSetupUtils).updateInfraActiveRequestVnfId(request,
+				lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+		doReturn("vnfId").when(SPY_bbInputSetup).getVnfId(executeBB, lookupKeyMap);
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateL3Network(any(String.class), isA(ModelInfo.class),
+				isA(Service.class), any(String.class), isA(ServiceInstance.class), any(), any(String.class), any());
+
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VNF.toString());
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateGenericVnf(isA(ModelInfo.class), any(String.class),
+				isA(org.onap.so.serviceinstancebeans.Platform.class),
+				isA(org.onap.so.serviceinstancebeans.LineOfBusiness.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(), any(String.class), any(String.class), any());
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VF_MODULE.toString());
+		executeBB.getBuildingBlock().setKey("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVfModule(isA(ModelInfo.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class), any(), isA(CloudConfiguration.class));
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VOLUME_GROUP.toString());
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa8");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVolumeGroup(isA(ModelInfo.class), isA(Service.class),
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class),
+				any(String.class), any());
+		
+		Configuration configuration = new Configuration();
+		configuration.setConfigurationId("configurationId");
+		gBB.getServiceInstance().getConfigurations().add(configuration);
+		List<ConfigurationResourceCustomization> configurationCustList = new ArrayList<>();
+		ConfigurationResourceCustomization configurationCust = new ConfigurationResourceCustomization();
+		configurationCust.setModelCustomizationUUID("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
+		doReturn(configurationCustList).when(service).getConfigurationCustomizations();
+		configurationCustList.add(configurationCust);
+		doNothing().when(SPY_bbInputSetup).populateConfiguration(isA(ModelInfo.class), isA(Service.class), 
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class));
+		
+		executeBB.getBuildingBlock().setBpmnFlowName("AssignFabricConfigurationBB");
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateConfiguration(isA(ModelInfo.class), isA(Service.class), 
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class));
+	}
+	
+	@Test
+	public void testgetGBBMacroCloudConfiguration() throws Exception {
+		org.onap.so.serviceinstancebeans.Service serviceMacro = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceMacroVfModules.json"), org.onap.so.serviceinstancebeans.Service.class);
+		CloudConfiguration cloudConfig = null;
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = new org.onap.aai.domain.yang.CloudRegion();
+		Resources resources = serviceMacro.getResources();
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(any(CloudConfiguration.class), eq("att-aic"));
+		CloudRegion expected = new CloudRegion();
+		expected.setLcpCloudRegionId("mdt1");
+		expected.setCloudOwner("att-aic");
+		expected.setTenantId("88a6ca3ee0394ade9403f075db23167e");
+		
+		CloudRegion actual = SPY_bbInputSetup.getCloudRegionFromMacroRequest(cloudConfig, resources);
+		assertThat(actual, sameBeanAs(expected));
+		
+		serviceMacro = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceMacroVnfs.json"), org.onap.so.serviceinstancebeans.Service.class);
+		resources = serviceMacro.getResources();
+		
+		actual = SPY_bbInputSetup.getCloudRegionFromMacroRequest(cloudConfig, resources);
+		assertThat(actual, sameBeanAs(expected));
+		
+		serviceMacro = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceMacroNetworks.json"), org.onap.so.serviceinstancebeans.Service.class);
+		resources = serviceMacro.getResources();
+		
+		actual = SPY_bbInputSetup.getCloudRegionFromMacroRequest(cloudConfig, resources);
+		assertThat(actual, sameBeanAs(expected));
+		
+		serviceMacro = mapper.readValue(
+				new File(RESOURCE_PATH + "ServiceMacroNoCloudConfig.json"), org.onap.so.serviceinstancebeans.Service.class);
+		resources = serviceMacro.getResources();
+		
+		actual = SPY_bbInputSetup.getCloudRegionFromMacroRequest(cloudConfig, resources);
+		assertNull(actual);
+	}
+
+	@Test
+	public void testgetGBBMacroWithEmptyUserParams() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		requestDetails.getRequestParameters().getUserParams().clear();
+		InfraActiveRequests request = Mockito.mock(InfraActiveRequests.class);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		doNothing().when(SPY_bbInputSetupUtils).updateInfraActiveRequestVnfId(request,
+				lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+		doReturn("vnfId").when(SPY_bbInputSetup).getVnfId(executeBB, lookupKeyMap);
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).getGBBMacroNoUserParamsCreate(any(ExecuteBuildingBlock.class), any(),
+				any(String.class), any(String.class), any(GeneralBuildingBlock.class), any(Service.class));
+	}
+	
+	@Test(expected = Exception.class)
+	public void testgetGBBMacroException() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(null).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+
+		executeBB.getBuildingBlock().setBpmnFlowName("Network");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+	}
+	
+	@Test
+	public void testgetGBBMacroWithVnfTypeNull() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		InfraActiveRequests request = Mockito.mock(InfraActiveRequests.class);
+		String resourceId = "123";
+		String vnfType = null;
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(request).when(SPY_bbInputSetupUtils).getInfraActiveRequest(executeBB.getRequestId());
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		doNothing().when(SPY_bbInputSetupUtils).updateInfraActiveRequestVnfId(request,
+				lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+		doReturn("vnfId").when(SPY_bbInputSetup).getVnfId(executeBB, lookupKeyMap);
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateL3Network(any(String.class), isA(ModelInfo.class),
+				isA(Service.class), any(String.class), isA(ServiceInstance.class), any(), any(String.class), any());
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VNF.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateGenericVnf(isA(ModelInfo.class), any(String.class),
+				isA(org.onap.so.serviceinstancebeans.Platform.class),
+				isA(org.onap.so.serviceinstancebeans.LineOfBusiness.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(), any(String.class), any(String.class), any());
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VF_MODULE.toString());
+		executeBB.getBuildingBlock().setKey("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVfModule(isA(ModelInfo.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class), any(), isA(CloudConfiguration.class));
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VOLUME_GROUP.toString());
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa8");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVolumeGroup(isA(ModelInfo.class), isA(Service.class),
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class),
+				any(String.class), any());
+	}
+
+	@Test
+	public void testgetGBBMacroGetServiceWithInvariantId() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		InfraActiveRequests request = Mockito.mock(InfraActiveRequests.class);
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(request).when(SPY_bbInputSetupUtils).getInfraActiveRequest(executeBB.getRequestId());
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		doNothing().when(SPY_bbInputSetupUtils).updateInfraActiveRequestVnfId(request,
+				lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+		doReturn("vnfId").when(SPY_bbInputSetup).getVnfId(executeBB, lookupKeyMap);
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateL3Network(any(String.class), isA(ModelInfo.class),
+				isA(Service.class), any(String.class), isA(ServiceInstance.class), any(), any(String.class), any());
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VNF.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateGenericVnf(isA(ModelInfo.class), any(String.class),
+				isA(org.onap.so.serviceinstancebeans.Platform.class),
+				isA(org.onap.so.serviceinstancebeans.LineOfBusiness.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(), any(String.class), any(String.class), any());
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VF_MODULE.toString());
+		executeBB.getBuildingBlock().setKey("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVfModule(isA(ModelInfo.class), isA(Service.class), any(String.class),
+				isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class), any(), isA(CloudConfiguration.class));
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, null);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.VOLUME_GROUP.toString());
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa8");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).populateVolumeGroup(isA(ModelInfo.class), isA(Service.class),
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(), any(String.class),
+				any(String.class), any());
+	}
+
+	@Test
+	public void testgetGBBMacroNoUserParamsDeactivateInstnace() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		requestDetails.getRequestParameters().setUserParams(null);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "deactivateInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		String generatedId = "12131";
+		doReturn(generatedId).when(SPY_bbInputSetup).generateRandomUUID();
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName("DeactivateServiceInstanceBB");
+		executeBB.getBuildingBlock().setKey("3c40d244-808e-42ca-b09a-256d83d19d0a");
+		GeneralBuildingBlock actual = SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId, vnfType);
+		assertThat(actual, sameBeanAs(gBB));
+	}
+
+	@Test
+	public void testgetGBBMacroNoUserParamsCreateInstance() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		InfraActiveRequests request = Mockito.mock(InfraActiveRequests.class);
+		requestDetails.getRequestParameters().setUserParams(null);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "createInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(null).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId());
+		doReturn(service).when(SPY_bbInputSetupUtils)
+						.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		List<NetworkResourceCustomization> networkCustList = new ArrayList<>();
+		NetworkResourceCustomization networkCust = Mockito.mock(NetworkResourceCustomization.class);
+		doReturn("ab153b6e-c364-44c0-bef6-1f2982117f04").when(networkCust).getModelCustomizationUUID();
+		networkCustList.add(networkCust);
+		doReturn(networkCustList).when(service).getNetworkCustomizations();
+		doNothing().when(SPY_bbInputSetup).populateL3Network(any(), isA(ModelInfo.class), isA(Service.class),
+				any(String.class), isA(ServiceInstance.class), any(), any(String.class), any());
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		executeBB.getBuildingBlock().setIsVirtualLink(false);
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).getGBBMacroNoUserParamsCreate(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), "ab153b6e-c364-44c0-bef6-1f2982117f04", gBB, service);
+		
+		CollectionNetworkResourceCustomization collectionNetworkResourceCust = Mockito.mock(CollectionNetworkResourceCustomization.class);
+		doReturn(collectionNetworkResourceCust).when(SPY_bbInputSetupUtils).getCatalogCollectionNetworkResourceCustByID(any(String.class));
+		NetworkResourceCustomization networkResourceCustomization = Mockito.mock(NetworkResourceCustomization.class);
+		doReturn(networkResourceCustomization).when(bbInputSetupMapperLayer).mapCollectionNetworkResourceCustToNetworkResourceCust(collectionNetworkResourceCust);
+		ModelInfoNetwork modelInfoNetwork = Mockito.mock(ModelInfoNetwork.class);
+		doReturn(modelInfoNetwork ).when(bbInputSetupMapperLayer).mapCatalogNetworkToNetwork(networkResourceCustomization);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.NETWORK_MACRO.toString());
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		executeBB.getBuildingBlock().setIsVirtualLink(true);
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(2)).getGBBMacroNoUserParamsCreate(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), "ab153b6e-c364-44c0-bef6-1f2982117f04", gBB, service);
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.FABRIC_CONFIGURATION.toString());
+		executeBB.getBuildingBlock().setKey("modelCustId");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).getGBBMacroNoUserParamsCreate(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), "modelCustId", gBB, service);
+	}
+	
+	@Test
+	public void testgetGBBMacroNoUserParamsOther() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		requestDetails.getRequestParameters().setUserParams(null);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "deleteInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setLcpCloudRegionId("lcpCloudRegionId");
+		requestDetails.setCloudConfiguration(cloudConfig);
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(),
+				"att-aic");
+		executeBB.getBuildingBlock().setBpmnFlowName("DeleteNetworkBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(1)).getGBBMacroExistingService(isA(ExecuteBuildingBlock.class), any(),
+				any(String.class), any(GeneralBuildingBlock.class), isA(Service.class), isA(String.class),
+				isA(CloudConfiguration.class));
+
+		requestAction = "activateInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		executeBB.getBuildingBlock().setBpmnFlowName("ActivateNetworkBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(2)).getGBBMacroExistingService(isA(ExecuteBuildingBlock.class), any(),
+				any(String.class), any(GeneralBuildingBlock.class), isA(Service.class), isA(String.class),
+				isA(CloudConfiguration.class));
+
+		requestAction = "unassignInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		executeBB.getBuildingBlock().setBpmnFlowName("UnassignNetworkBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(3)).getGBBMacroExistingService(isA(ExecuteBuildingBlock.class), any(),
+				any(String.class), any(GeneralBuildingBlock.class), isA(Service.class), isA(String.class),
+				isA(CloudConfiguration.class));
+		
+		requestAction = "activateFabricConfiguration";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		executeBB.getBuildingBlock().setBpmnFlowName("ActivateFabricConfigurationBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-134534656234");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+		verify(SPY_bbInputSetup, times(4)).getGBBMacroExistingService(isA(ExecuteBuildingBlock.class), any(),
+				any(String.class), any(GeneralBuildingBlock.class), isA(Service.class), isA(String.class),
+				isA(CloudConfiguration.class));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testgetGBBMacroNoUserParamsOtherException() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		requestDetails.getRequestParameters().setUserParams(null);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		String resourceId = "123";
+		String vnfType = "vnfType";
+		Service service = Mockito.mock(Service.class);
+		String requestAction = "assignInstance";
+		doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
+				requestAction, resourceId);
+		doReturn(service).when(SPY_bbInputSetupUtils)
+				.getCatalogServiceByModelUUID(gBB.getServiceInstance().getModelInfoServiceInstance().getModelUuid());
+		String generatedId = "12131";
+		doReturn(generatedId).when(SPY_bbInputSetup).generateRandomUUID();
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.SERVICE_INSTANCE.toString());
+		executeBB.getBuildingBlock().setKey("3c40d244-808e-42ca-b09a-256d83d19d0a");
+		SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
+	}
+	@Test
+	public void testgetGBBMacroNoUserParamsExistingService() throws Exception {
+		GeneralBuildingBlock gBB = mapper.readValue(new File(RESOURCE_PATH + "GeneralBuildingBlockExpected.json"),
+				GeneralBuildingBlock.class);
+		ExecuteBuildingBlock executeBB = mapper.readValue(new File(RESOURCE_PATH + "ExecuteBuildingBlockSimple.json"),
+				ExecuteBuildingBlock.class);
+		RequestDetails requestDetails = mapper
+				.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_serviceMacro.json"), RequestDetails.class);
+		requestDetails.getRequestParameters().setUserParams(null);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.NETWORK_ID, "networkId");
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "vnfId");
+		lookupKeyMap.put(ResourceKey.VF_MODULE_ID, "vfModuleId");
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
+		lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
+		lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
+		Service service = Mockito.mock(Service.class);
+		CloudConfiguration cloudConfiguration = new CloudConfiguration();
+		cloudConfiguration.setLcpCloudRegionId("cloudRegionId");
+		String requestAction = "unassignInstance";
+
+		L3Network network = new L3Network();
+		network.setNetworkId("networkId");
+		gBB.getServiceInstance().getNetworks().add(network);
+		org.onap.aai.domain.yang.L3Network aaiNetwork = new org.onap.aai.domain.yang.L3Network();
+		aaiNetwork.setModelCustomizationId("modelCustId");
+		doReturn(aaiNetwork).when(SPY_bbInputSetupUtils).getAAIL3Network(network.getNetworkId());
+		doNothing().when(SPY_bbInputSetup).mapCatalogNetwork(any(L3Network.class), any(ModelInfo.class),
+				any(Service.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName("DeleteNetworkBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogNetwork(any(L3Network.class), any(ModelInfo.class),
+				any(Service.class));
+
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("vnfId");
+		gBB.getServiceInstance().getVnfs().add(vnf);
+		org.onap.aai.domain.yang.GenericVnf aaiVnf = new org.onap.aai.domain.yang.GenericVnf();
+		aaiVnf.setModelCustomizationId("modelCustId");
+		doReturn(aaiVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
+		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(any(GenericVnf.class), any(ModelInfo.class),
+				any(Service.class));
+
+		executeBB.getBuildingBlock().setBpmnFlowName("ActivateVnfBB");
+		executeBB.getBuildingBlock().setKey("ab153b6e-c364-44c0-bef6-1f2982117f04");
+		SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(any(GenericVnf.class), any(ModelInfo.class),
+				any(Service.class));
+
+		VfModule vfModule = new VfModule();
+		vfModule.setVfModuleId("vfModuleId");
+		gBB.getServiceInstance().getVnfs().get(0).getVfModules().add(vfModule);
+		org.onap.aai.domain.yang.VfModule aaiVfModule = new org.onap.aai.domain.yang.VfModule();
+		aaiVfModule.setModelCustomizationId("modelCustId");
+		doReturn(aaiVfModule).when(SPY_bbInputSetupUtils).getAAIVfModule(vnf.getVnfId(), vfModule.getVfModuleId());
+
+		executeBB.getBuildingBlock().setBpmnFlowName("UnassignVfModuleBB");
+		executeBB.getBuildingBlock().setKey("a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f");
+		SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(any(GenericVnf.class), any(ModelInfo.class),
+				any(Service.class));
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVfModule(any(VfModule.class), any(ModelInfo.class),
+				any(Service.class), any(String.class));
+
+		org.onap.aai.domain.yang.CloudRegion aaiCloudRegion = Mockito.mock(org.onap.aai.domain.yang.CloudRegion.class);
+		doReturn(aaiCloudRegion).when(SPY_bbInputSetupUtils).getCloudRegion(requestDetails.getCloudConfiguration(),
+				"att-aic");
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("volumeGroupId");
+		gBB.getServiceInstance().getVnfs().get(0).getVolumeGroups().add(volumeGroup);
+		org.onap.aai.domain.yang.VolumeGroup aaiVolumeGroup = new org.onap.aai.domain.yang.VolumeGroup();
+		aaiVolumeGroup.setModelCustomizationId("modelCustId");
+		doReturn(aaiVolumeGroup).when(SPY_bbInputSetupUtils).getAAIVolumeGroup("att-aic",
+				cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId());
+
+		executeBB.getBuildingBlock().setBpmnFlowName("UnassignVolumeGroupBB");
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa8");
+		SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
+		verify(SPY_bbInputSetup, times(3)).mapCatalogVnf(any(GenericVnf.class), any(ModelInfo.class),
+				any(Service.class));
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVolumeGroup(isA(VolumeGroup.class), isA(ModelInfo.class),
+				isA(Service.class), isA(String.class));
+		
+		Configuration configuration = new Configuration();
+		configuration.setConfigurationId("configurationId");
+		gBB.getServiceInstance().getConfigurations().add(configuration);
+		org.onap.aai.domain.yang.Configuration aaiConfiguration = new org.onap.aai.domain.yang.Configuration();
+		aaiConfiguration.setModelCustomizationId("modelCustId");
+		doReturn(aaiConfiguration).when(SPY_bbInputSetupUtils).getAAIConfiguration(configuration.getConfigurationId());
+		
+		executeBB.getBuildingBlock().setBpmnFlowName("ActivateFabricConfigurationBB");
+		executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
+		SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
+				executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(any(Configuration.class), any(ModelInfo.class),
+				any(Service.class));
+	}
+
+	@Test
+	public void testGetVnfId() {
+		String expected = "vnfId";
+		ExecuteBuildingBlock executeBB = new ExecuteBuildingBlock();
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		executeBB.setRequestId("requestId");
+		InfraActiveRequests request = new InfraActiveRequests();
+		request.setVnfId(expected);
+		doReturn(request).when(SPY_bbInputSetupUtils).getInfraActiveRequest(executeBB.getRequestId());
+
+		String actual = SPY_bbInputSetup.getVnfId(executeBB, lookupKeyMap);
+
+		assertEquals("VnfId is set correctly", expected, actual);
+	}
+	
+	@Test
+	public void testCreateVfModule() {
+		String vfModuleId = "vfModuleId";
+		String instanceName = "vfModuleName";
+		Map<String, String> cloudParams = new HashMap<>();
+		cloudParams.put("param1", "param1Value");
+		VfModule expected = new VfModule();
+		expected.setVfModuleId(vfModuleId);
+		expected.setVfModuleName(instanceName);
+		expected.setCloudParams(cloudParams);
+		expected.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		List<Map<String, String>> instanceParams = new ArrayList<>();
+		instanceParams.add(cloudParams);
+		
+		VfModule actual = SPY_bbInputSetup.createVfModule(lookupKeyMap, vfModuleId, instanceName, instanceParams);
+		
+		assertThat(actual, sameBeanAs(expected));
+		assertEquals("LookupKeyMap is populated", vfModuleId, lookupKeyMap.get(ResourceKey.VF_MODULE_ID));
+		
+		expected.getCloudParams().clear();
+		actual = SPY_bbInputSetup.createVfModule(lookupKeyMap, vfModuleId, instanceName, null);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testCreateVolumeGroup() {
+		String volumeGroupId = "volumeGroupId";
+		String instanceName = "vfModuleName";
+		String vnfType = "vnfType";
+		Map<String, String> cloudParams = new HashMap<>();
+		cloudParams.put("param1", "param1Value");
+		VolumeGroup expected = new VolumeGroup();
+		expected.setVolumeGroupId(volumeGroupId);
+		expected.setVolumeGroupName(instanceName);
+		expected.setCloudParams(cloudParams);
+		expected.setVnfType(vnfType);
+		expected.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		List<Map<String, String>> instanceParams = new ArrayList<>();
+		instanceParams.add(cloudParams);
+		
+		VolumeGroup actual = SPY_bbInputSetup.createVolumeGroup(lookupKeyMap, volumeGroupId, instanceName, vnfType, instanceParams);
+		
+		assertThat(actual, sameBeanAs(expected));
+		assertEquals("LookupKeyMap is populated", volumeGroupId, lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID));
+		
+		expected.getCloudParams().clear();
+		actual = SPY_bbInputSetup.createVolumeGroup(lookupKeyMap, volumeGroupId, instanceName, vnfType, null);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testCreateNetwork() {
+		String networkId = "networkId";
+		String instanceName = "networkName";
+		Map<String, String> cloudParams = new HashMap<>();
+		cloudParams.put("param1", "param1Value");
+		L3Network expected = new L3Network();
+		expected.setNetworkId(networkId);
+		expected.setNetworkName(instanceName);
+		expected.setCloudParams(cloudParams);
+		expected.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		List<Map<String, String>> instanceParams = new ArrayList<>();
+		instanceParams.add(cloudParams);
+		L3Network actual = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, networkId, instanceParams);
+		
+		assertThat(actual, sameBeanAs(expected));
+		assertEquals("LookupKeyMap is populated", networkId, lookupKeyMap.get(ResourceKey.NETWORK_ID));
+		
+		expected.getCloudParams().clear();
+		actual = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, networkId, null);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testCreateGenericVnf() {
+		String vnfId = "vnfId";
+		String instanceName = "vnfName";
+		String vnfType = "vnfType";
+		String platformName = "platformName";
+		String lineOfBusinessName = "lineOfBusinessName";
+		Platform platform = new Platform();
+		platform.setPlatformName(platformName);
+		LineOfBusiness lineOfBusiness = new LineOfBusiness();
+		lineOfBusiness.setLineOfBusinessName(lineOfBusinessName);
+		Map<String, String> cloudParams = new HashMap<>();
+		cloudParams.put("param1", "param1Value");
+		GenericVnf expected = new GenericVnf();
+		expected.setVnfId(vnfId);
+		expected.setVnfName(instanceName);
+		expected.setVnfType(vnfType);
+		expected.setCloudParams(cloudParams);
+		expected.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
+		expected.setPlatform(platform);
+		expected.setLineOfBusiness(lineOfBusiness);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		List<Map<String, String>> instanceParams = new ArrayList<>();
+		instanceParams.add(cloudParams);
+		org.onap.so.serviceinstancebeans.Platform requestPlatform = new org.onap.so.serviceinstancebeans.Platform();
+		platform.setPlatformName(platformName);
+		org.onap.so.serviceinstancebeans.LineOfBusiness requestLineOfBusiness = new org.onap.so.serviceinstancebeans.LineOfBusiness();
+		lineOfBusiness.setLineOfBusinessName(lineOfBusinessName);
+		
+		doReturn(platform).when(bbInputSetupMapperLayer).mapRequestPlatform(requestPlatform);
+		doReturn(lineOfBusiness).when(bbInputSetupMapperLayer).mapRequestLineOfBusiness(requestLineOfBusiness);
+		
+		GenericVnf actual = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, requestPlatform, requestLineOfBusiness, vnfId, vnfType, instanceParams);
+		
+		assertThat(actual, sameBeanAs(expected));
+		assertEquals("LookupKeyMap is populated", vnfId, lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
+		
+		expected.getCloudParams().clear();
+		actual = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, requestPlatform, requestLineOfBusiness, vnfId, vnfType, null);
+		assertThat(actual, sameBeanAs(expected));
+	}
+	
+	@Test
+	public void testMapCatalogVfModule() {
+		String vnfModelCustomizationUUID = "vnfResourceCustUUID";
+		String vfModuleCustomizationUUID = "vfModelCustomizationUUID";
+		VfModule vfModule = new VfModule();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationUuid(vfModuleCustomizationUUID);
+		Service service = new Service();
+		VnfResourceCustomization vnfResourceCust = new VnfResourceCustomization();
+		vnfResourceCust.setModelCustomizationUUID(vnfModelCustomizationUUID);
+		VfModuleCustomization vfModuleCust = new VfModuleCustomization();
+		vfModuleCust.setModelCustomizationUUID(vfModuleCustomizationUUID);
+		vnfResourceCust.getVfModuleCustomizations().add(vfModuleCust);
+		service.getVnfCustomizations().add(vnfResourceCust);
+		ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
+
+		doReturn(modelInfoVfModule).when(bbInputSetupMapperLayer).mapCatalogVfModuleToVfModule(vfModuleCust);
+		
+		SPY_bbInputSetup.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+		
+		assertThat(vfModule.getModelInfoVfModule(), sameBeanAs(modelInfoVfModule));
+		
+		modelInfo.setModelCustomizationUuid(null);
+		modelInfo.setModelCustomizationId(vfModuleCustomizationUUID);
+		
+		SPY_bbInputSetup.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+		
+		assertThat(vfModule.getModelInfoVfModule(), sameBeanAs(modelInfoVfModule));
+	}
+	
+	@Test
+	public void testPopulateVfModule() throws Exception {
+		String vnfId = "vnfId";
+		String vfModuleId = "vfModuleId";
+		String volumeGroupId = "volumeGroupId";
+		String vfModuleCustomizationId = "vfModuleCustomizationId";
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelCustomizationId(vfModuleCustomizationId);
+		Service service = new Service();
+		String bbName = AssignFlows.VF_MODULE.toString();
+		ServiceInstance serviceInstance = new ServiceInstance();
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId(vnfId);
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId(volumeGroupId);
+		vnf.getVolumeGroups().add(volumeGroup);
+		serviceInstance.getVnfs().add(vnf);
+		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, vnfId);
+		String resourceId = vfModuleId;
+		RelatedInstanceList[] relatedInstanceList = null;
+		String instanceName = "vfModuleName";
+		List<Map<String, String>> instanceParams = null;
+		CloudConfiguration cloudConfiguration = new CloudConfiguration();
+		
+		org.onap.aai.domain.yang.GenericVnf vnfAAI = new org.onap.aai.domain.yang.GenericVnf();
+		vnfAAI.setModelCustomizationId("vnfModelCustId");
+		org.onap.aai.domain.yang.VolumeGroup volumeGroupAAI = new org.onap.aai.domain.yang.VolumeGroup();
+		volumeGroupAAI.setModelCustomizationId(vfModuleCustomizationId);
+		
+		doReturn(vnfAAI).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
+		doReturn(volumeGroupAAI).when(SPY_bbInputSetupUtils).getAAIVolumeGroup(CLOUD_OWNER, 
+				cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId());
+		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(isA(GenericVnf.class), isA(ModelInfo.class), isA(Service.class));
+		doNothing().when(SPY_bbInputSetup).mapCatalogVfModule(isA(VfModule.class), isA(ModelInfo.class), isA(Service.class), isA(String.class));
+		
+		SPY_bbInputSetup.populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap, 
+				resourceId, relatedInstanceList, instanceName, instanceParams, cloudConfiguration);
+		
+		assertEquals("Lookup Key Map populated with VfModule Id", vfModuleId, lookupKeyMap.get(ResourceKey.VF_MODULE_ID));
+		assertEquals("Lookup Key Map populated with VolumeGroup Id", volumeGroupId, lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID));
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java
new file mode 100644
index 0000000000..d576242318
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java
@@ -0,0 +1,774 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.aai.domain.yang.CloudRegion;
+import org.onap.aai.domain.yang.Configuration;
+import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.GenericVnfs;
+import org.onap.aai.domain.yang.L3Network;
+import org.onap.aai.domain.yang.L3Networks;
+import org.onap.aai.domain.yang.ServiceInstance;
+import org.onap.aai.domain.yang.ServiceInstances;
+import org.onap.aai.domain.yang.VolumeGroup;
+import org.onap.aai.domain.yang.VolumeGroups;
+import org.onap.so.bpmn.common.InjectionHelper;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
+import org.onap.so.client.aai.AAIObjectPlurals;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.AAIResourcesClient;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
+import org.onap.so.client.graphinventory.entities.uri.Depth;
+import org.onap.so.client.db.request.RequestsDbClient;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VnfcInstanceGroupCustomization;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BBInputSetupUtilsTest {
+	protected ObjectMapper mapper = new ObjectMapper();
+	private static final String RESOURCE_PATH = "src/test/resources/__files/ExecuteBuildingBlock/";
+	
+	@InjectMocks
+	BBInputSetupUtils bbInputSetupUtils = new BBInputSetupUtils();
+	
+	@Mock
+	protected CatalogDbClient MOCK_catalogDbClient;
+	
+	@Mock
+	protected RequestsDbClient MOCK_requestsDbClient;
+	
+	@Mock
+	protected AAIResourcesClient MOCK_aaiResourcesClient;
+	
+	@Mock
+	protected InjectionHelper MOCK_injectionHelper;
+	
+	@Rule
+	public ExpectedException expectedException = ExpectedException.none();
+
+	@Before
+	public void setup(){
+		doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient();
+	}
+
+	@Test
+	public void testGetCatalogServiceByModelUUID() throws JsonParseException, JsonMappingException, IOException {
+		Service expected = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogServiceExpected.json"), Service.class);
+
+		RequestDetails requestDetails = new RequestDetails();
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelVersionId("modelUUID");
+		requestDetails.setModelInfo(modelInfo);
+		doReturn(expected).when(MOCK_catalogDbClient).getServiceByID("modelUUID");
+		Service actual = bbInputSetupUtils.getCatalogServiceByModelUUID(modelInfo.getModelVersionId());
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testGetCatalogServiceByModelVersionAndModelInvariantUUID() throws JsonParseException, JsonMappingException, IOException {
+		String modelVersion = "modelVersion";
+		String modelInvariantUUID = "modelInvariantUUID";
+		Service expectedService = mapper.readValue(
+				new File(RESOURCE_PATH + "CatalogServiceExpected.json"), Service.class);
+		
+		doReturn(expectedService).when(MOCK_catalogDbClient).getServiceByModelVersionAndModelInvariantUUID(isA(String.class), isA(String.class));
+		
+		Service actualService = bbInputSetupUtils.getCatalogServiceByModelVersionAndModelInvariantUUID(modelVersion, modelInvariantUUID);
+		
+		assertThat(actualService, sameBeanAs(expectedService));
+	}
+	
+	@Test
+	public void testGetVnfcInstanceGroups() throws JsonParseException, JsonMappingException, IOException {
+		VnfcInstanceGroupCustomization vnfc = mapper.readValue(
+				new File(RESOURCE_PATH + "VnfcInstanceGroupCustomization.json"), VnfcInstanceGroupCustomization.class);
+		String modelCustomizationUUID = "modelCustomizationUUID";
+		
+		doReturn(Arrays.asList(vnfc)).when(MOCK_catalogDbClient).getVnfcInstanceGroupsByVnfResourceCust(isA(String.class));
+		
+		List<VnfcInstanceGroupCustomization> actualVnfcList = bbInputSetupUtils.getVnfcInstanceGroups(modelCustomizationUUID);
+		
+		assertThat(actualVnfcList, sameBeanAs(Arrays.asList(vnfc)));
+	}
+
+	@Test
+	public void testGetRequestDetails() throws JsonParseException, JsonMappingException, IOException {
+		InfraActiveRequests infraActiveRequest = mapper.readValue(
+				new File(RESOURCE_PATH + "InfraActiveRequestExpected.json"),
+				InfraActiveRequests.class);
+
+		RequestDetails expected = mapper.readValue(
+				new File(RESOURCE_PATH + "RequestDetailsExpected.json"),
+				RequestDetails.class);
+		String requestId = "requestId";
+		doReturn(infraActiveRequest).when(MOCK_requestsDbClient).getInfraActiveRequestbyRequestId(requestId);
+		RequestDetails actual = bbInputSetupUtils.getRequestDetails(requestId);
+
+		assertThat(actual, sameBeanAs(expected));
+	}
+
+	@Test
+	public void getRequestDetailsNullTest() throws IOException {
+		RequestDetails requestDetails = bbInputSetupUtils.getRequestDetails("");
+		
+		assertNull(requestDetails);
+	}
+
+	@Test
+	public void testGetCloudRegion() {
+		String cloudOwner = "cloudOwnerId";
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setLcpCloudRegionId("lcpCloudRegionId");
+		Optional<org.onap.aai.domain.yang.CloudRegion> expected = Optional.of(new org.onap.aai.domain.yang.CloudRegion());
+		expected.get().setCloudOwner(cloudOwner);
+		expected.get().setCloudRegionId("lcpCloudRegionId");
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.CloudRegion.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, cloudOwner,
+						cloudConfig.getLcpCloudRegionId()));
+
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, cloudOwner,
+				cloudConfig.getLcpCloudRegionId());
+		bbInputSetupUtils.getCloudRegion(cloudConfig, cloudOwner);
+		
+		verify(MOCK_aaiResourcesClient, times(1)).get(CloudRegion.class, expectedUri);
+	}
+	
+	@Test
+	public void testGetCloudRegionExceptionTest() {
+		String cloudOwner = "cloudOwnerId";
+		
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setLcpCloudRegionId("lcpCloudRegionId");
+
+		RequestDetails requestDetails = new RequestDetails();
+		requestDetails.setCloudConfiguration(cloudConfig);
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		CloudRegion cloudRegion = bbInputSetupUtils.getCloudRegion(cloudConfig, cloudOwner);
+		
+		assertNull(cloudRegion);
+	}
+
+	@Test
+	public void testGetCloudRegionEmptyId() {
+		String cloudOwner = "cloudOwnerId";
+		
+		CloudConfiguration cloudConfig = new CloudConfiguration();
+		cloudConfig.setLcpCloudRegionId("");
+		
+		RequestDetails requestDetails = new RequestDetails();
+		requestDetails.setCloudConfiguration(cloudConfig);
+		
+		CloudRegion cloudRegion = bbInputSetupUtils.getCloudRegion(cloudConfig, cloudOwner);
+		
+		assertNull(cloudRegion);
+	}
+
+	@Test
+	public void testGetCloudRegionEmptyConfiguration() {
+		String cloudOwner = "cloudOwnerId";
+
+		RequestDetails requestDetails = new RequestDetails();
+
+		CloudRegion cloudRegion = bbInputSetupUtils.getCloudRegion(requestDetails.getCloudConfiguration(), cloudOwner);
+
+		assertNull(cloudRegion);
+	}
+
+	@Test
+	public void testGetAAIInstanceGroup() {
+		Optional<org.onap.aai.domain.yang.InstanceGroup> expected = Optional.of(new org.onap.aai.domain.yang.InstanceGroup());
+		String instanceGroupId = "instanceGroupId";
+		expected.get().setId(instanceGroupId);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.InstanceGroup.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.INSTANCE_GROUP, instanceGroupId));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.INSTANCE_GROUP, instanceGroupId);
+
+		bbInputSetupUtils.getAAIInstanceGroup(instanceGroupId);
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.InstanceGroup.class, expectedUri);
+	}
+
+	@Test
+	public void testGetAAIInstanceGroupThrowNotFound() {
+		String instanceGroupId = "instanceGroupId";
+		doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient();
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.InstanceGroup.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.INSTANCE_GROUP, instanceGroupId));
+
+		org.onap.aai.domain.yang.InstanceGroup actual = bbInputSetupUtils.getAAIInstanceGroup(instanceGroupId);
+
+		assertNull(actual);
+	}
+
+	@Test
+	public void testGetAAICustomer() {
+		Optional<org.onap.aai.domain.yang.Customer> expected = Optional.of(new org.onap.aai.domain.yang.Customer());
+		String globalSubscriberId = "globalSubscriberId";
+		expected.get().setGlobalCustomerId(globalSubscriberId);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.Customer.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.CUSTOMER, globalSubscriberId));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.CUSTOMER, globalSubscriberId);
+
+		bbInputSetupUtils.getAAICustomer(globalSubscriberId);
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.Customer.class, expectedUri);
+	}
+
+	@Test
+	public void testGetAAICustomerThrowNotFound() {
+		String globalSubscriberId = "globalSubscriberId";
+		doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient();
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.Customer.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.CUSTOMER, globalSubscriberId));
+
+		org.onap.aai.domain.yang.Customer actual = bbInputSetupUtils.getAAICustomer(globalSubscriberId);
+
+		assertNull(actual);
+	}
+
+	@Test
+	public void testGetAAIServiceSubscription() {
+		Optional<org.onap.aai.domain.yang.ServiceSubscription> expected = Optional.of(new org.onap.aai.domain.yang.ServiceSubscription());
+		String globalSubscriberId = "globalSubscriberId";
+		String subscriptionServiceType = "subscriptionServiceType";
+		expected.get().setServiceType(subscriptionServiceType);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(org.onap.aai.domain.yang.ServiceSubscription.class,
+				AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_SUBSCRIPTION, globalSubscriberId,
+						subscriptionServiceType));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_SUBSCRIPTION, globalSubscriberId,
+				subscriptionServiceType);
+
+		bbInputSetupUtils.getAAIServiceSubscription(globalSubscriberId, subscriptionServiceType);
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.ServiceSubscription.class, expectedUri);
+	}
+	
+	@Test
+	public void testGetAAIServiceSubscriptionErrors() {
+		String globalSubId = null;
+		String subServiceType = null;
+		org.onap.aai.domain.yang.ServiceSubscription actual = bbInputSetupUtils.getAAIServiceSubscription(globalSubId, subServiceType);
+		assertNull(actual);
+		
+		String globalSubId2 = "";
+		String subServiceType2 = "";
+		org.onap.aai.domain.yang.ServiceSubscription actual2 = bbInputSetupUtils.getAAIServiceSubscription(globalSubId2, subServiceType2);
+		assertNull(actual2);
+		
+		String globalSubId3 = "";
+		String subServiceType3 = null;
+		org.onap.aai.domain.yang.ServiceSubscription actual3 = bbInputSetupUtils.getAAIServiceSubscription(globalSubId3, subServiceType3);
+		assertNull(actual3);
+		
+		String globalSubId4 = null;
+		String subServiceType4 = "";
+		org.onap.aai.domain.yang.ServiceSubscription actual4 = bbInputSetupUtils.getAAIServiceSubscription(globalSubId4, subServiceType4);
+		assertNull(actual4);
+	}
+
+	@Test
+	public void testGetAAIServiceSubscriptionThrowNotFound() {
+		String globalSubscriberId = "globalSubscriberId";
+		String subscriptionServiceType = "subscriptionServiceType";
+		doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient();
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient)
+				.get(org.onap.aai.domain.yang.ServiceSubscription.class, AAIUriFactory.createResourceUri(
+						AAIObjectType.SERVICE_SUBSCRIPTION, globalSubscriberId, subscriptionServiceType));
+		org.onap.aai.domain.yang.ServiceSubscription actual = bbInputSetupUtils
+				.getAAIServiceSubscription(globalSubscriberId, subscriptionServiceType);
+		assertNull(actual);
+	}
+
+	@Test
+	public void testGetAAIServiceInstanceById() {
+		String serviceInstanceId = "serviceInstanceId";
+		
+		ServiceInstance expectedServiceInstance = new ServiceInstance();
+		
+		doReturn(Optional.of(expectedServiceInstance)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		ServiceInstance actualServiceInstance = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId);
+		
+		assertThat(actualServiceInstance, sameBeanAs(expectedServiceInstance));
+	}
+	
+	@Test
+	public void testGetAAIServiceInstanceByIdThrowNotFound() {
+		String serviceInstanceId = "serviceInstanceId";
+				
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		ServiceInstance actualServiceInstance = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId);
+		
+		assertNull(actualServiceInstance);
+	}
+
+	@Test
+	public void testGetAAIServiceInstanceByIdAndCustomer() {
+		String globalCustomerId = "globalCustomerId";
+		String serviceType = "serviceType";
+		String serviceInstanceId = "serviceInstanceId";
+		ServiceInstance expected = new ServiceInstance();
+		expected.setServiceInstanceId(serviceInstanceId);
+		doReturn(Optional.of(expected)).when(MOCK_aaiResourcesClient).get(isA(Class.class),
+				isA(AAIResourceUri.class));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(
+				AAIObjectType.SERVICE_INSTANCE, globalCustomerId, serviceType, serviceInstanceId).depth(Depth.TWO);
+		this.bbInputSetupUtils.getAAIServiceInstanceByIdAndCustomer(globalCustomerId, serviceType, serviceInstanceId);
+
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.ServiceInstance.class, expectedUri);
+
+	}
+
+	@Test
+	public void testGetAAIServiceInstanceByIdAndCustomerThrowNotFound() {
+		String globalCustomerId = "globalCustomerId";
+		String serviceType = "serviceType";
+		String serviceInstanceId = "serviceInstanceId";
+
+		doReturn(MOCK_aaiResourcesClient).when(MOCK_injectionHelper).getAaiClient();
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class),
+				isA(AAIResourceUri.class));
+		ServiceInstance actual = this.bbInputSetupUtils
+				.getAAIServiceInstanceByIdAndCustomer(globalCustomerId, serviceType, serviceInstanceId);
+
+		assertNull(actual);
+	}
+	
+	@Test
+	public void testGetAAIServiceInstanceByName() throws Exception {
+		String serviceInstanceName = "serviceInstanceName";
+		
+		ServiceInstance expectedServiceInstance = new ServiceInstance();
+		expectedServiceInstance.setServiceInstanceId("serviceInstanceId");
+		
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setServiceType("serviceType");
+		
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("globalCustomerId");
+		customer.setServiceSubscription(serviceSubscription);
+		
+		ServiceInstances serviceInstances = new ServiceInstances();
+		serviceInstances.getServiceInstance().add(expectedServiceInstance);
+		
+		doReturn(Optional.of(serviceInstances)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectPlurals.SERVICE_INSTANCE, customer.getGlobalCustomerId(),
+				customer.getServiceSubscription().getServiceType())
+				.queryParam("service-instance-name", serviceInstanceName).depth(Depth.TWO);
+		bbInputSetupUtils.getAAIServiceInstanceByName(serviceInstanceName, customer);
+
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.ServiceInstances.class, expectedUri);
+	}
+	
+	@Test
+	public void testGetAAIServiceInstanceByNameException() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String serviceInstanceName = "serviceInstanceName";
+		
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setServiceType("serviceType");
+		
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("globalCustomerId");
+		customer.setServiceSubscription(serviceSubscription);
+		
+		ServiceInstances serviceInstances = new ServiceInstances();
+		serviceInstances.getServiceInstance().add(serviceInstance);
+		serviceInstances.getServiceInstance().add(serviceInstance);
+		
+		doReturn(Optional.of(serviceInstances)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getAAIServiceInstanceByName(serviceInstanceName, customer);
+	}
+	
+	@Test
+	public void testGetAAIServiceInstanceByNameNull() throws Exception {
+		String serviceInstanceName = "serviceInstanceName";
+		
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		
+		ServiceSubscription serviceSubscription = new ServiceSubscription();
+		serviceSubscription.setServiceType("serviceType");
+		
+		Customer customer = new Customer();
+		customer.setGlobalCustomerId("globalCustomerId");
+		customer.setServiceSubscription(serviceSubscription);
+
+		ServiceInstances serviceInstances = new ServiceInstances();
+		serviceInstances.getServiceInstance().add(serviceInstance);
+		serviceInstances.getServiceInstance().add(serviceInstance);
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		ServiceInstance actualServiceInstance = bbInputSetupUtils.getAAIServiceInstanceByName(serviceInstanceName, customer);
+		
+		assertNull(actualServiceInstance);
+	}
+	
+	@Test
+	public void testGetOptionalAAIServiceInstanceByNameException() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String globalCustomerId = "globalCustomerId";
+		String serviceType = "serviceType";
+		String serviceInstanceId = "serviceInstanceId";
+		
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setServiceInstanceId("serviceInstanceId");
+		serviceInstance.setServiceType(serviceType);
+		serviceInstance.setServiceInstanceName("serviceInstanceName");
+
+		ServiceInstances serviceInstances = new ServiceInstances();
+		serviceInstances.getServiceInstance().add(serviceInstance);
+		serviceInstances.getServiceInstance().add(serviceInstance);
+
+		doReturn(Optional.of(serviceInstances)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getAAIServiceInstanceByName(globalCustomerId, serviceType, serviceInstanceId);
+	}
+	
+	@Test
+	public void testGetOptionalAAIServiceInstanceByNameNull() throws Exception {
+		String globalCustomerId = "globalCustomerId";
+		String serviceType = "serviceType";
+		String serviceInstanceId = "serviceInstanceId";
+
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		Optional<ServiceInstance> actual = this.bbInputSetupUtils
+				.getAAIServiceInstanceByName(globalCustomerId, serviceType, serviceInstanceId);
+
+		assertThat(actual, sameBeanAs(Optional.empty()));
+	}
+	
+	@Test
+	public void testGetCatalogInstanceGroup() throws JsonParseException, JsonMappingException, IOException {
+		String modelUUID = "modelUUID";
+		
+		org.onap.so.db.catalog.beans.InstanceGroup expectedInstanceGroup = mapper.readValue(
+				new File(RESOURCE_PATH + "InstanceGroup.json"), org.onap.so.db.catalog.beans.InstanceGroup.class);
+		
+		doReturn(expectedInstanceGroup).when(MOCK_catalogDbClient).getInstanceGroupByModelUUID(isA(String.class));
+		
+		org.onap.so.db.catalog.beans.InstanceGroup actualInstanceGroup = bbInputSetupUtils.getCatalogInstanceGroup(modelUUID);
+		
+		assertThat(actualInstanceGroup, sameBeanAs(expectedInstanceGroup));
+	}
+	
+	@Test
+	public void testGetCollectionResourceInstanceGroupCustomization() {
+		String modelCustomizationUUID = "modelCustomizationUUID";
+		
+		CollectionResourceInstanceGroupCustomization expectedCollection = new CollectionResourceInstanceGroupCustomization();
+		
+		doReturn(Arrays.asList(expectedCollection)).when(MOCK_catalogDbClient)
+				.getCollectionResourceInstanceGroupCustomizationByModelCustUUID(modelCustomizationUUID);
+		
+		List<CollectionResourceInstanceGroupCustomization> actualCollection = bbInputSetupUtils
+				.getCollectionResourceInstanceGroupCustomization(modelCustomizationUUID);
+		
+		assertThat(actualCollection, sameBeanAs(Arrays.asList(expectedCollection)));
+	}
+	
+	@Test
+	public void testGetAAIGenericVnf() throws JsonParseException, JsonMappingException, IOException {
+		String vnfId = "vnfId";
+		
+		GenericVnf expectedAaiVnf = mapper.readValue(
+				new File(RESOURCE_PATH + "aaiGenericVnfInput.json"), GenericVnf.class);
+		
+		doReturn(Optional.of(expectedAaiVnf)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId).depth(Depth.ONE);
+		GenericVnf actualAaiVnf = bbInputSetupUtils.getAAIGenericVnf(vnfId);
+		
+		assertThat(actualAaiVnf, sameBeanAs(expectedAaiVnf));
+
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.GenericVnf.class, expectedUri);
+	}
+	
+	@Test
+	public void testGetAAIConfiguration() throws JsonParseException, JsonMappingException, IOException {
+		String configurationId = "configurationId";
+		
+		Configuration expectedAaiConfiguration = mapper.readValue(
+				new File(RESOURCE_PATH + "ConfigurationInput.json"), Configuration.class);
+		
+		doReturn(Optional.of(expectedAaiConfiguration)).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		AAIResourceUri expectedUri = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, configurationId).depth(Depth.ONE);
+		bbInputSetupUtils.getAAIConfiguration(configurationId);
+
+		verify(MOCK_aaiResourcesClient, times(1)).get(org.onap.aai.domain.yang.Configuration.class, expectedUri);
+	}
+	
+	@Test
+	public void testGetAAIGenericVnfThrowNotFound() throws JsonParseException, JsonMappingException, IOException {
+		String vnfId = "vnfId";
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(isA(Class.class), isA(AAIResourceUri.class));
+		
+		GenericVnf actualAaiVnf = bbInputSetupUtils.getAAIGenericVnf(vnfId);
+		
+		assertNull(actualAaiVnf);
+	}
+	
+	@Test
+	public void testGetAAIResourceDepthOne() {
+		String vnfId = "vnfId";
+		AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+		AAIResourceUri expectedUri = aaiResourceUri.clone().depth(Depth.ONE);
+		AAIResourceUri aaiResourceUriClone = aaiResourceUri.clone();
+		bbInputSetupUtils.getAAIResourceDepthOne(aaiResourceUri);
+		
+		verify(MOCK_aaiResourcesClient, times(1)).get(expectedUri);
+		assertEquals("Uri should not have changed", aaiResourceUriClone.build(), aaiResourceUri.build());
+	}
+	
+	@Test
+	public void testGetAAIResourceDepthTwo() {
+		String vnfId = "vnfId";
+		AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+		AAIResourceUri expectedUri = aaiResourceUri.clone().depth(Depth.TWO);
+		AAIResourceUri aaiResourceUriClone = aaiResourceUri.clone();
+		bbInputSetupUtils.getAAIResourceDepthTwo(aaiResourceUri);
+		
+		verify(MOCK_aaiResourcesClient, times(1)).get(expectedUri);
+		assertEquals("Uri should not have changed", aaiResourceUriClone.build(), aaiResourceUri.build());
+	}
+
+	@Test
+	public void getRelatedNetworkByNameFromServiceInstanceTest() throws Exception {
+		Optional<L3Networks> expected = Optional.of(new L3Networks());
+		L3Network network = new L3Network();
+		network.setNetworkId("id123");
+		network.setNetworkName("name123");
+		expected.get().getL3Network().add(network);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(eq(L3Networks.class), any(AAIResourceUri.class));
+		Optional<L3Network> actual = this.bbInputSetupUtils.getRelatedNetworkByNameFromServiceInstance("id123", "name123");
+		assertEquals(actual.get().getNetworkId(), expected.get().getL3Network().get(0).getNetworkId());
+	}
+	
+	@Test
+	public void getRelatedNetworkByNameFromServiceInstanceMultipleNetworksExceptionTest() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String serviceInstanceId = "serviceInstanceId";
+		String networkName = "networkName";
+		
+		L3Network network = new L3Network();
+		network.setNetworkId("id123");
+		network.setNetworkName("name123");
+		
+		L3Networks expected = new L3Networks();
+		expected.getL3Network().add(network);
+		expected.getL3Network().add(network);
+		
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(eq(L3Networks.class), any(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getRelatedNetworkByNameFromServiceInstance(serviceInstanceId, networkName);
+	}
+	
+	@Test
+	public void getRelatedNetworkByNameFromServiceInstanceNotFoundTest() throws Exception {
+		String serviceInstanceId = "serviceInstanceId";
+		String networkName = "networkName";
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(eq(L3Networks.class), any(AAIResourceUri.class));
+		
+		Optional<L3Network> actualNetwork = bbInputSetupUtils.getRelatedNetworkByNameFromServiceInstance(serviceInstanceId, networkName);
+		
+		assertEquals(Optional.empty(), actualNetwork);
+	}
+	
+	@Test
+	public void getRelatedVnfByNameFromServiceInstanceTest() throws Exception {
+		Optional<GenericVnfs> expected = Optional.of(new GenericVnfs());
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("id123");
+		vnf.setVnfName("name123");
+		expected.get().getGenericVnf().add(vnf);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(eq(GenericVnfs.class), any(AAIResourceUri.class));
+		Optional<GenericVnf> actual = this.bbInputSetupUtils.getRelatedVnfByNameFromServiceInstance("id123", "name123");
+		assertEquals(actual.get().getVnfId(), expected.get().getGenericVnf().get(0).getVnfId());
+	}
+	
+	@Test
+	public void getRelatedVnfByNameFromServiceInstanceMultipleVnfsExceptionTest() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String serviceInstanceId = "serviceInstanceId";
+		String vnfName = "vnfName";
+		
+		GenericVnf vnf = new GenericVnf();
+		vnf.setVnfId("id123");
+		vnf.setVnfName("name123");
+		
+		GenericVnfs expectedVnf = new GenericVnfs();
+		expectedVnf.getGenericVnf().add(vnf);
+		expectedVnf.getGenericVnf().add(vnf);
+		
+		doReturn(expectedVnf).when(MOCK_aaiResourcesClient).get(eq(GenericVnfs.class), any(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getRelatedVnfByNameFromServiceInstance(serviceInstanceId, vnfName);
+	}
+	
+	@Test
+	public void getRelatedVnfByNameFromServiceInstanceNotFoundTest() throws Exception {
+		String serviceInstanceId = "serviceInstanceId";
+		String vnfName = "vnfName";
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(eq(GenericVnfs.class), any(AAIResourceUri.class));
+		
+		Optional<GenericVnf> actualVnf = this.bbInputSetupUtils.getRelatedVnfByNameFromServiceInstance(serviceInstanceId, vnfName);
+		
+		assertEquals(actualVnf, Optional.empty());
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVnfTest() throws Exception {
+		Optional<VolumeGroups> expected = Optional.of(new VolumeGroups());
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("id123");
+		volumeGroup.setVolumeGroupName("name123");
+		expected.get().getVolumeGroup().add(volumeGroup);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		Optional<VolumeGroup> actual = this.bbInputSetupUtils.getRelatedVolumeGroupByNameFromVnf("id123", "name123");
+		assertEquals(actual.get().getVolumeGroupId(), expected.get().getVolumeGroup().get(0).getVolumeGroupId());
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVnfMultipleVolumeGroupsExceptionTest() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String vnfId = "vnfId";
+		String volumeGroupName = "volumeGroupName";
+		
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("id123");
+		volumeGroup.setVolumeGroupName("name123");
+		
+		VolumeGroups expectedVolumeGroup = new VolumeGroups();
+		expectedVolumeGroup.getVolumeGroup().add(volumeGroup);
+		expectedVolumeGroup.getVolumeGroup().add(volumeGroup);
+		
+		doReturn(expectedVolumeGroup).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getRelatedVolumeGroupByNameFromVnf(vnfId, volumeGroupName);
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVnfNotFoundTest() throws Exception {
+		String vnfId = "vnfId";
+		String volumeGroupName = "volumeGroupName";
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		
+		Optional<VolumeGroup> actualVolumeGroup = bbInputSetupUtils.getRelatedVolumeGroupByNameFromVnf(vnfId, volumeGroupName);
+		
+		assertEquals(actualVolumeGroup, Optional.empty());
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVfModuleTest() throws Exception {
+		Optional<VolumeGroups> expected = Optional.of(new VolumeGroups());
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("id123");
+		volumeGroup.setVolumeGroupName("name123");
+		expected.get().getVolumeGroup().add(volumeGroup);
+		doReturn(expected).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		Optional<VolumeGroup> actual = this.bbInputSetupUtils.getRelatedVolumeGroupByNameFromVfModule("id123", "name123");
+		assertEquals(actual.get().getVolumeGroupId(), expected.get().getVolumeGroup().get(0).getVolumeGroupId());
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVfModuleMultipleVolumeGroupsExceptionTest() throws Exception {
+		expectedException.expect(Exception.class);
+		
+		String vnfId = "vnfId";
+		String volumeGroupName = "volumeGroupName";
+		
+		VolumeGroup volumeGroup = new VolumeGroup();
+		volumeGroup.setVolumeGroupId("id123");
+		volumeGroup.setVolumeGroupName("name123");
+		
+		VolumeGroups expectedVolumeGroup = new VolumeGroups();
+		expectedVolumeGroup.getVolumeGroup().add(volumeGroup);
+		expectedVolumeGroup.getVolumeGroup().add(volumeGroup);
+		
+		doReturn(expectedVolumeGroup).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		
+		bbInputSetupUtils.getRelatedVolumeGroupByNameFromVfModule(vnfId, volumeGroupName);
+	}
+	
+	@Test
+	public void getRelatedVolumeGroupByNameFromVfModuleNotFoundTest() throws Exception {
+		String vnfId = "vnfId";
+		String volumeGroupName = "volumeGroupName";
+		
+		doReturn(Optional.empty()).when(MOCK_aaiResourcesClient).get(eq(VolumeGroups.class), any(AAIResourceUri.class));
+		
+		Optional<VolumeGroup> actualVolumeGroup = bbInputSetupUtils.getRelatedVolumeGroupByNameFromVfModule(vnfId, volumeGroupName);
+		
+		assertEquals(actualVolumeGroup, Optional.empty());
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildlingBlockRainyDayTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildlingBlockRainyDayTest.java
new file mode 100644
index 0000000000..5e2275015b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildlingBlockRainyDayTest.java
@@ -0,0 +1,147 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.bpmn.servicedecomposition.tasks;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.core.WorkflowException;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.Customer;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.BuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
+import org.onap.so.db.catalog.beans.macro.RainyDayHandlerStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ExecuteBuildlingBlockRainyDayTest extends BaseTest {
+	@Autowired
+	private ExecuteBuildingBlockRainyDay executeBuildingBlockRainyDay;
+	
+	private ServiceInstance serviceInstance;
+	private Customer customer; //will build service sub
+	private GenericVnf vnf;
+	private BuildingBlock buildingBlock;
+	private ExecuteBuildingBlock executeBuildingBlock;
+	
+	@Before
+	public void before() {
+		serviceInstance = setServiceInstance();
+		customer = setCustomer();
+		vnf = setGenericVnf();
+		
+		buildingBlock = new BuildingBlock();
+		buildingBlock.setBpmnFlowName("AssignServiceInstanceBB");
+		
+		executeBuildingBlock = new ExecuteBuildingBlock();
+		executeBuildingBlock.setBuildingBlock(buildingBlock);
+		
+		delegateExecution.setVariable("gBBInput", gBBInput);
+		delegateExecution.setVariable("WorkflowException", new WorkflowException("", 7000, ""));
+		delegateExecution.setVariable("buildingBlock", executeBuildingBlock);
+		delegateExecution.setVariable("lookupKeyMap", lookupKeyMap);
+	}
+	
+	@Test
+	public void setRetryTimerTest() throws Exception{
+		delegateExecution.setVariable("retryCount", 2);
+		executeBuildingBlockRainyDay.setRetryTimer(delegateExecution);
+		assertEquals("PT25M",delegateExecution.getVariable("RetryDuration"));
+	}
+	
+	@Test
+	public void setRetryTimerExceptionTest() {
+		expectedException.expect(BpmnError.class);
+		
+		executeBuildingBlockRainyDay.setRetryTimer(null);
+	}
+	
+	@Test
+	public void queryRainyDayTableExists() throws Exception{
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		serviceInstance.getModelInfoServiceInstance().setServiceType("st1");
+		vnf.setVnfType("vnft1");
+		
+		RainyDayHandlerStatus rainyDayHandlerStatus = new RainyDayHandlerStatus();
+		rainyDayHandlerStatus.setErrorCode("7000");
+		rainyDayHandlerStatus.setFlowName("AssignServiceInstanceBB");
+		rainyDayHandlerStatus.setServiceType("st1");
+		rainyDayHandlerStatus.setVnfType("vnft1");
+		rainyDayHandlerStatus.setPolicy("Rollback");
+		rainyDayHandlerStatus.setWorkStep("ASTERISK");
+		
+		doReturn(rainyDayHandlerStatus).when(MOCK_catalogDbClient).getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep("AssignServiceInstanceBB", "st1", "vnft1", "7000", "*");
+		
+		executeBuildingBlockRainyDay.queryRainyDayTable(delegateExecution);
+		
+		assertEquals("Rollback", delegateExecution.getVariable("handlingCode"));
+	}
+	
+	@Test
+	public void queryRainyDayTableDefault() throws Exception{
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		serviceInstance.getModelInfoServiceInstance().setServiceType("st1");
+		vnf.setVnfType("vnft1");
+
+		RainyDayHandlerStatus rainyDayHandlerStatus = new RainyDayHandlerStatus();
+		rainyDayHandlerStatus.setErrorCode("ASTERISK");
+		rainyDayHandlerStatus.setFlowName("AssignServiceInstanceBB");
+		rainyDayHandlerStatus.setServiceType("ASTERISK");
+		rainyDayHandlerStatus.setVnfType("ASTERISK");
+		rainyDayHandlerStatus.setPolicy("Rollback");
+		rainyDayHandlerStatus.setWorkStep("ASTERISK");
+		
+		doReturn(null).when(MOCK_catalogDbClient).getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep("AssignServiceInstanceBB", "st1", "vnft1", "7000", "ASTERISK");
+		doReturn(rainyDayHandlerStatus).when(MOCK_catalogDbClient).getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep("AssignServiceInstanceBB", "ASTERISK", "ASTERISK", "ASTERISK", "ASTERISK");
+		
+		executeBuildingBlockRainyDay.queryRainyDayTable(delegateExecution);
+		
+		assertEquals("Rollback", delegateExecution.getVariable("handlingCode"));
+	}
+	
+	@Test
+	public void queryRainyDayTableDoesNotExist() throws Exception{
+		customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
+		serviceInstance.getModelInfoServiceInstance().setServiceType("st1");
+		vnf.setVnfType("vnft1");
+
+		doReturn(null).when(MOCK_catalogDbClient).getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep(isA(String.class), isA(String.class), isA(String.class), isA(String.class), isA(String.class));
+
+		executeBuildingBlockRainyDay.queryRainyDayTable(delegateExecution);
+		
+		assertEquals("Abort", delegateExecution.getVariable("handlingCode"));
+	}
+	
+	@Test
+	public void queryRainyDayTableExceptionTest() {
+		doThrow(Exception.class).when(MOCK_catalogDbClient).getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep(isA(String.class), isA(String.class), isA(String.class), isA(String.class), isA(String.class));
+		
+		executeBuildingBlockRainyDay.queryRainyDayTable(delegateExecution);
+		
+		assertEquals("Abort", delegateExecution.getVariable("handlingCode"));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/ResponseExceptionMapperImplTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java
index 8943014ad0..3a4d6a0cc9 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/ResponseExceptionMapperImplTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/ResponseExceptionMapperImplTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,14 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client;
+package org.onap.so.client;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.google.common.base.Charsets;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
 import javax.ws.rs.BadRequestException;
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.InternalServerErrorException;
@@ -35,16 +38,18 @@ import javax.ws.rs.NotAuthorizedException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.NotSupportedException;
 import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.apache.commons.io.IOUtils;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.so.BaseTest;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
 
 @RunWith(JUnitParamsRunner.class)
-public class ResponseExceptionMapperImplTest {
+public class ResponseExceptionMapperImplTest{
 
     private static final ResponseExceptionMapperImpl mapper = new ResponseExceptionMapperImpl();
 
@@ -68,42 +73,42 @@ public class ResponseExceptionMapperImplTest {
     @Parameters(method = "statusesAndCorrespondingExceptions")
     public void shouldThrowExceptionWhenStatusIsNotOk(Status status, Class<Exception> expectedException) {
         // given
-        ClientResponseContext responseContext = createMockResponseContext(status);
+    	Response response = createMockResponse(status);
         // when, then
-        assertThatThrownBy(() -> mapper.filter(null, responseContext)).isInstanceOf(expectedException);
+        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(expectedException);
     }
 
     @Test
     public void shouldNotThrowExceptionWhenStatusIsOk() {
         // given
-        ClientResponseContext responseContext = createMockResponseContext(Status.OK);
+    	Response response = createMockResponse(Status.OK);
         // when, then
-        assertThatCode(() -> mapper.filter(null, responseContext)).doesNotThrowAnyException();
+        assertThatCode(() -> mapper.map(response)).doesNotThrowAnyException();
     }
 
     @Test
-    public void shouldThrowExceptionWithCustomMessageWhenResponseHasEntity() {
+    public void shouldThrowExceptionWithCustomMessageWhenResponseHasEntity() throws UnsupportedEncodingException {
         // given
-        ClientResponseContext responseContext = createMockResponseContext(Status.BAD_REQUEST);
-        when(responseContext.hasEntity()).thenReturn(true);
-        when(responseContext.getEntityStream()).thenReturn(IOUtils.toInputStream("test message", Charsets.UTF_8));
+    	Response response = createMockResponse(Status.BAD_REQUEST);
+        when(response.hasEntity()).thenReturn(true);
+        when(response.getEntity()).thenReturn(new ByteArrayInputStream("test message".getBytes(StandardCharsets.UTF_8)));
         // when, then
-        assertThatThrownBy(() -> mapper.filter(null, responseContext)).isInstanceOf(BadRequestException.class)
+        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(BadRequestException.class)
                 .hasMessage("test message");
     }
 
     @Test
     public void shouldThrowExceptionWithDefaultMessageWhenResponseHasNoEntity() {
         // given
-        ClientResponseContext responseContext = createMockResponseContext(Status.BAD_REQUEST);
-        when(responseContext.hasEntity()).thenReturn(false);
+    	Response response = createMockResponse(Status.BAD_REQUEST);
+        when(response.hasEntity()).thenReturn(false);
         // when, then
-        assertThatThrownBy(() -> mapper.filter(null, responseContext)).isInstanceOf(BadRequestException.class)
+        assertThatThrownBy(() -> mapper.map(response)).isInstanceOf(BadRequestException.class)
                 .hasMessage("empty message");
     }
 
-    private static ClientResponseContext createMockResponseContext(Status status) {
-        ClientResponseContext responseContext = mock(ClientResponseContext.class);
+    private static Response createMockResponse(Status status) {
+    	Response responseContext = mock(Response.class);
         when(responseContext.getStatusInfo()).thenReturn(status);
         when(responseContext.getStatus()).thenReturn(status.getStatusCode());
         return responseContext;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerActionTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerActionTest.java
new file mode 100644
index 0000000000..8d33a08c7a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerActionTest.java
@@ -0,0 +1,463 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.appc;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Optional;
+
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.appc.client.lcm.model.Action;
+import org.onap.appc.client.lcm.model.Status;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.appc.payload.PayloadClient;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+
+public class ApplicationControllerActionTest extends BaseTest{
+	
+	private ApplicationControllerAction appCAction;
+	
+	@Mock
+	private ApplicationControllerOrchestrator client;
+	
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		
+		appCAction = new ApplicationControllerAction();
+		appCAction.client = client;
+	}
+	
+	@Test
+	public void runAppCCommand_ResumeTraffic_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		//Prepare method
+		Action action = Action.ResumeTraffic;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> otherPayload = PayloadClient.resumeTrafficFormat(payloadInfo.get("vnfName"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_Start_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		runAppCCommand_StartStop_Test(Action.Start);
+	}
+	
+	@Test
+	public void runAppCCommand_Stop_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		runAppCCommand_StartStop_Test(Action.Stop);
+	}
+	
+	private void runAppCCommand_StartStop_Test(Action action) throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		//Prepare method
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> otherPayload = PayloadClient.startStopFormat(payloadInfo.get("vnfName"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_Unlock_Test() throws ApplicationControllerOrchestratorException { 
+		runAppCCommand_LockUnlock_Test(Action.Unlock);
+	}
+	
+	@Test
+	public void runAppCCommand_Lock_Test() throws ApplicationControllerOrchestratorException { 
+		runAppCCommand_LockUnlock_Test(Action.Lock);
+	}
+	
+	private void runAppCCommand_LockUnlock_Test(Action action) throws ApplicationControllerOrchestratorException { 
+		//Prepare method
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> otherPayload = Optional.empty();
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_QuiesceTraffic_PayloadPresent_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		//Prepare method
+		Action action = Action.QuiesceTraffic;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.of("testPayload");
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> modifiedPayload = PayloadClient.quiesceTrafficFormat(payload, payloadInfo.get("vnfName"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, modifiedPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, modifiedPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_QuiesceTraffic_NoPayload_Test() throws ApplicationControllerOrchestratorException { 
+		//Prepare method
+		Action action = Action.QuiesceTraffic;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify non call
+		verify(client, times(0)).vnfCommand(any(), any(), any(), any(), any(), any());
+		assertEquals("Payload is not present for " + action.toString(), appCAction.getErrorMessage());
+	}
+	
+	@Test
+	public void runAppCCommand_HealthCheck_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		//Prepare method
+		Action action = Action.HealthCheck;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		payloadInfo.put("vnfHostIpAddress", "testVnfHostIpAddress");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> otherPayload = PayloadClient.healthCheckFormat(payloadInfo.get("vnfName"), payloadInfo.get("vnfHostIpAddress"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_Snapshot_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException { 
+		//Prepare method
+		Action action = Action.Snapshot;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("identityUrl", "testIdentityUrl");
+		ArrayList<String> vmIdList = new ArrayList<String>();
+		String vmId1 = "testlink:testVmId1";
+		vmIdList.add(vmId1);
+		String vmId2 = "testlink:testVmId2";
+		vmIdList.add(vmId2);
+		JSONObject vmIdListJson = new JSONObject();
+		vmIdListJson.put("vmIds", vmIdList);
+		payloadInfo.put("vmIdList", vmIdListJson.toString());
+		ArrayList<String> vserverIdList = new ArrayList<String>();
+		String vserverId1 = "testVserverId1";
+		Optional<String> vserverIdString1 = Optional.of(vserverId1);
+		vserverIdList.add(vserverId1);
+		String vserverId2 = "testVserverId2";
+		Optional<String> vserverIdString2 = Optional.of(vserverId2);
+		vserverIdList.add(vserverId2);
+		
+		JSONObject vserverIdListJson = new JSONObject();
+		vserverIdListJson.put("vserverIds", vserverIdList);
+		payloadInfo.put("vserverIdList", vserverIdListJson.toString());
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> otherPayloadVm1 = PayloadClient.snapshotFormat(vmId1, payloadInfo.get("identityUrl"));
+		Optional<String> otherPayloadVm2 = PayloadClient.snapshotFormat(vmId2, payloadInfo.get("identityUrl"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverIdString1, otherPayloadVm1, controllerType);
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverIdString2, otherPayloadVm2, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverIdString1, otherPayloadVm1, controllerType);
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverIdString2, otherPayloadVm2, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_ConfigModify__PayloadPresent_Test() throws ApplicationControllerOrchestratorException { 
+		//Prepare method
+		Action action = Action.ConfigModify;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.of("testPayload");
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, payload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, payload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_ConfigModify__NoPayload_Test() throws ApplicationControllerOrchestratorException { 
+		//Prepare method
+		Action action = Action.ConfigModify;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify non call
+		verify(client, times(0)).vnfCommand(any(), any(), any(), any(), any(), any());
+		assertEquals("Payload is not present for " + action.toString(), appCAction.getErrorMessage());
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradePreCheck_PayloadPresent_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		runAppCCommand_Upgrade_PayloadPresent_Test(Action.UpgradePreCheck);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradePostCheck_PayloadPresent_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		runAppCCommand_Upgrade_PayloadPresent_Test(Action.UpgradePostCheck);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradeSoftware_PayloadPresent_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		runAppCCommand_Upgrade_PayloadPresent_Test(Action.UpgradeSoftware);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradeBackup_PayloadPresent_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		runAppCCommand_Upgrade_PayloadPresent_Test(Action.UpgradeBackup);
+	}
+	
+	private void runAppCCommand_Upgrade_PayloadPresent_Test(Action action) throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		//Prepare method
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.of("testPayload");
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		Optional<String> modifiedPayload = PayloadClient.upgradeFormat(payload, payloadInfo.get("vnfName"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, modifiedPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		verify(client, times(1)).vnfCommand(action, msoRequestId, vnfId, vserverId, modifiedPayload, controllerType);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradePreCheck_NoPayload_Test() throws ApplicationControllerOrchestratorException {
+		runAppCCommand_Upgrade_NoPayload_Test(Action.UpgradePreCheck);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradePostCheck_NoPayload_Test() throws ApplicationControllerOrchestratorException {
+		runAppCCommand_Upgrade_NoPayload_Test(Action.UpgradePostCheck);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradeSoftware_NoPayload_Test() throws ApplicationControllerOrchestratorException {
+		runAppCCommand_Upgrade_NoPayload_Test(Action.UpgradeSoftware);
+	}
+	
+	@Test
+	public void runAppCCommand_UpgradeBackup_NoPayload_Test() throws ApplicationControllerOrchestratorException {
+		runAppCCommand_Upgrade_NoPayload_Test(Action.UpgradeBackup);
+	}
+	
+	private void runAppCCommand_Upgrade_NoPayload_Test(Action action) throws ApplicationControllerOrchestratorException {
+		//Prepare method
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify non call
+		verify(client, times(0)).vnfCommand(any(), any(), any(), any(), any(), any());
+		assertEquals("Payload is not present for " + action.toString(), appCAction.getErrorMessage());
+	}
+	
+	@Test
+	public void runAppCCommand_InvalidAppCAction_Test() throws ApplicationControllerOrchestratorException {
+		//Prepare method
+		Action action = Action.ActionStatus;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		String controllerType = "testControllerType";
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify non call
+		verify(client, times(0)).vnfCommand(any(), any(), any(), any(), any(), any());
+		//TODO For original author/architect: it appears that whoever coded this wanted the error message to be "Unable to idenify Action request for AppCClient" and this is not the case because of the ApplicationControllerSupport.getCategoryOf(appCStatus) call with a null appCStatus, so this may be something worth looking into
+	}
+	
+	@Test
+	public void runAppCCommand_NormalAppCStatusGetErrorCode_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		//Prepare method
+		Action action = Action.Start;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Status status = new Status();
+		status.setCode(100);
+		Optional<String> otherPayload = PayloadClient.startStopFormat(payloadInfo.get("vnfName"));
+		doReturn(status).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify call
+		String expectedErrorCode = "0";
+		assertEquals(expectedErrorCode, appCAction.getErrorCode());
+	}
+	
+	@Test
+	public void getErrorCode_Test() {
+		String defaultErrorCode = "1002";
+		//Verify default error code
+		assertEquals(defaultErrorCode, appCAction.getErrorCode());
+	}
+	
+	@Test
+	public void getErrorMessage_Test() {
+		String defaultErrorMessage = "Unable to reach App C Servers";
+		//Verify default error message
+		assertEquals(defaultErrorMessage, appCAction.getErrorMessage());
+	}
+	
+	@Test
+	public void applicationControllerOrchestratorExceptionCaught_Test() throws ApplicationControllerOrchestratorException, JsonProcessingException {
+		//Prepare method
+		Action action = Action.Start;
+		String msoRequestId = "testMsoRequestId";
+		String vnfId = "testVnfId";
+		Optional<String> payload = Optional.empty();
+		Optional<String> vserverId = Optional.empty();
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		String controllerType = "testControllerType";
+		
+		//Prepare mocks
+		Optional<String> otherPayload = PayloadClient.startStopFormat(payloadInfo.get("vnfName"));
+		String expectedErrorMessage = "Test appc orchestrator error message";
+		doThrow(new ApplicationControllerOrchestratorException(expectedErrorMessage, 0)).when(client).vnfCommand(action, msoRequestId, vnfId, vserverId, otherPayload, controllerType);
+		
+		//Run method
+		appCAction.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+		
+		//Verify error
+		assertEquals(expectedErrorMessage, appCAction.getErrorMessage());
+		String expectedErrorCode = "1002";
+		assertEquals(expectedErrorCode, appCAction.getErrorCode());
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerClientV2Test.java
index 59be8235fe..7fabb2ac0e 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerClientV2Test.java
@@ -1,113 +1,131 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.client.appc;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-

-import java.util.Properties;

-import java.util.UUID;

-

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.onap.appc.client.lcm.model.Action;

-import org.onap.appc.client.lcm.model.ActionIdentifiers;

-import org.onap.appc.client.lcm.model.CheckLockInput;

-import org.onap.appc.client.lcm.model.Status;

-

-public class ApplicationControllerClientTest {

-

-	@BeforeClass

-	public static void beforeClass() {

-		System.setProperty("mso.config.path", "src/test/resources");

-	}

-

-	@Test

-	public void testClientCreation() {

-		ApplicationControllerClient client = new ApplicationControllerClient("appc");

-		assertEquals(client.getControllerType(), "APPC");

-		assertNotNull(client.getAppCClient());

-	}

-

-	@Test

-	public void createRequest_CheckLock_RequestBuilt() {

-		ApplicationControllerClient client = new ApplicationControllerClient("APPC");

-		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

-		actionIdentifiers.setVnfId("vnfId");

-		CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null,

-				"requestId");

-		assertEquals(checkLockInput.getAction().name(), "CheckLock");

-	}

-

-	@Test

-	@Ignore // 1802 merge

-	public void runCommand_liveAppc() {

-		ApplicationControllerClient client = new ApplicationControllerClient("appc");

-		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

-		//actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");

-		actionIdentifiers.setVnfId("2d2bf10e-81a5-");

-		Status status;

-		try {

-			status = client.runCommand(Action.Lock, actionIdentifiers, null, UUID.randomUUID().toString());

-		} catch (ApplicationControllerOrchestratorException e) {

-			status = new Status();

-			status.setCode(e.getAppcCode());

-			status.setMessage(e.getMessage());

-		}

-		assertEquals("Status of run command is correct", status.getCode(), 306);

-	}

-

-	@Test

-	@Ignore // 1802 merge

-	public void runCommand_CheckLock_RequestBuilt() {

-		ApplicationControllerClient client = new ApplicationControllerClient("appc");

-		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

-		actionIdentifiers.setVnfId("fusion-vpp-vnf-001");

-		Status status;

-		try {

-			status = client.runCommand(Action.Unlock, actionIdentifiers, null, "requestId");

-		} catch (ApplicationControllerOrchestratorException e) {

-			status = new Status();

-			status.setCode(e.getAppcCode());

-			status.setMessage(e.getMessage());

-		}

-		assertEquals("Status of run command is correct", status.getCode(), 309);

-	}

-

-	@Test

-	public void test_getLCMPropertiesHelper() {

-		ApplicationControllerClient client = new ApplicationControllerClient();

-		Properties properties = client.getLCMProperties();

-		assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");

-		assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");

-		assertEquals(properties.get("SDNC-topic.read"), "SDNC-LCM-READ");

-		assertEquals(properties.get("SDNC-topic.write"), "SDNC-LCM-WRITE");

-		assertEquals(properties.get("topic.read.timeout"), "120000");

-		assertEquals(properties.get("client.response.timeout"), "120000");

-		assertEquals(properties.get("poolMembers"),

-				"uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904");

-		assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");

-		assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");

-		assertEquals(properties.get("controllerType"), "appc");

-	}

-

-}
\ No newline at end of file
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.appc;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.appc.client.lcm.model.Action;
+import org.onap.appc.client.lcm.model.ActionIdentifiers;
+import org.onap.appc.client.lcm.model.CheckLockInput;
+import org.onap.appc.client.lcm.model.Status;
+import org.onap.so.BaseTest;
+
+import java.util.Properties;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ApplicationControllerClientV2Test {
+
+	@Mock
+	ApplicationControllerSupport applicationControllerSupport;
+
+	@Mock
+	ApplicationControllerConfiguration applicationControllerConfiguration;
+
+	@InjectMocks
+	ApplicationControllerClientV2 client;
+
+
+	@Before
+	public void setup(){
+		when(applicationControllerConfiguration.getReadTopic()).thenReturn("APPC-TEST-AMDOCS2");
+		when(applicationControllerConfiguration.getReadTimeout()).thenReturn("120000");
+		when(applicationControllerConfiguration.getResponseTimeout()).thenReturn("120000");
+		when(applicationControllerConfiguration.getWrite()).thenReturn("APPC-TEST-AMDOCS1-DEV3");
+		when(applicationControllerConfiguration.getService()).thenReturn("ueb");
+		when(applicationControllerConfiguration.getPoolMembers()).thenReturn("localhost:3904,localhost:3904,localhost:3904");
+		when(applicationControllerConfiguration.getClientKey()).thenReturn("iaEMAfjsVsZnraBP");
+		when(applicationControllerConfiguration.getClientSecret()).thenReturn("wcivUjsjXzmGFBfxMmyJu9dz");
+		//client.buildClient();
+	}
+	@BeforeClass
+	public static void beforeClass() {
+		System.setProperty("mso.config.path", "src/test/resources");
+	}
+	@Ignore
+	@Test
+	public void createRequest_CheckLock_RequestBuilt() {
+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
+		actionIdentifiers.setVnfId("vnfId");
+	//	when(applicationControllerSupport.getInput(eq(Action.CheckLock.name()))).thenReturn(new CheckLockInput());
+		CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null,
+				"requestId");
+		assertEquals(checkLockInput.getAction().name(), "CheckLock");
+	}
+	@Ignore
+	@Test
+	public void runCommand_liveAppc() {
+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
+		//actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");
+		actionIdentifiers.setVnfId("2d2bf10e-81a5-");
+		Status status;
+		//when(applicationControllerSupport.getInput(eq(Action.Lock.name()))).thenReturn(new LockInput());
+		//when(applicationControllerSupport.getAPIMethod(anyString(),any(),anyBoolean())).thenCallRealMethod();
+		try {
+			status = client.runCommand(Action.Lock, actionIdentifiers, null, UUID.randomUUID().toString());
+		} catch (ApplicationControllerOrchestratorException e) {
+			status = new Status();
+			status.setCode(e.getAppcCode());
+			status.setMessage(e.getMessage());
+		}
+		assertEquals("Status of run command is correct", status.getCode(), 306);
+	}
+
+	@Ignore
+	@Test
+	public void runCommand_CheckLock_RequestBuilt() {
+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
+		actionIdentifiers.setVnfId("fusion-vpp-vnf-001");
+		Status status;
+		try {
+			status = client.runCommand(Action.Unlock, actionIdentifiers, null, "requestId");
+		} catch (ApplicationControllerOrchestratorException e) {
+			status = new Status();
+			status.setCode(e.getAppcCode());
+			status.setMessage(e.getMessage());
+		}
+		assertEquals("Status of run command is correct", status.getCode(), 309);
+	}
+
+	@Ignore
+	@Test
+	public void test_getLCMPropertiesHelper() {
+		Properties properties = client.getLCMProperties("");
+		assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");
+		assertEquals(properties.get("topic.read.timeout"), "120000");
+		assertEquals(properties.get("client.response.timeout"), "120000");
+		assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");
+		assertEquals(properties.get("poolMembers"),
+				"localhost:3904,localhost:3904,localhost:3904");
+		assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");
+		assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerSupportTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerSupportTest.java
index d2d4f5002a..5ef26b34ee 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerSupportTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerSupportTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,20 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.appc;
+package org.onap.so.client.appc;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.appc.client.lcm.model.Status;
-import org.openecomp.mso.client.appc.ApplicationControllerSupport.StatusCategory;
+import org.onap.so.BaseTest;
+import org.onap.so.client.appc.ApplicationControllerSupport.StatusCategory;
 
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 
 @RunWith(JUnitParamsRunner.class)
-public class ApplicationControllerSupportTest {
+public class ApplicationControllerSupportTest{
 
 	public static Object[][] statusesAndCategories() {
 		return new Object[][]{
@@ -81,4 +82,4 @@ public class ApplicationControllerSupportTest {
 		status.setCode(code);
 		return status;
 	}
-}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBeansTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBeansTest.java
new file mode 100644
index 0000000000..30ab21b2dd
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/avpn/dmaap/beans/AVPNDmaapBeansTest.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.avpn.dmaap.beans;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.onap.so.openpojo.rules.ToStringTester;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.affirm.Affirm;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class AVPNDmaapBeansTest extends BaseTest{
+
+	private static final int EXPECTED_CLASS_COUNT = 5;
+	private static final String POJO_PACKAGE = "org.onap.so.client.avpn.dmaap.beans";
+
+	@Test
+	public void ensureExpectedPojoCount() {
+		List<PojoClass> pojoClasses = PojoClassFactory.getPojoClasses(	POJO_PACKAGE,
+				new FilterPackageInfo());
+		Affirm.affirmEquals("Classes added / removed?", EXPECTED_CLASS_COUNT, pojoClasses.size());
+	}
+
+	@Test
+	public void testPojoStructureAndBehavior() {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+				.with(new SetterMustExistRule())
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.with(new ToStringTester())
+				.build();
+
+		validator.validate(POJO_PACKAGE, new FilterPackageInfo());
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java
new file mode 100644
index 0000000000..35586cc29e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/DmaapPropertiesClientTest.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.dmaapproperties;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.onap.so.client.avpn.dmaap.beans.AVPNDmaapBean;
+import org.onap.so.client.exception.MapperException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+public class DmaapPropertiesClientTest extends BaseTest{
+	
+	@Autowired
+	private DmaapPropertiesClient dmaapPropertiesClient;
+
+	private final String file = "src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json";
+	private String requestId = "rq1234d1-5a33-55df-13ab-12abad84e331";
+	private String clientSource = "SPP";
+	private String correlator = "myClientId123";
+	private String serviceInstanceId = "bc305d54-75b4-431b-adb2-eb6b9e546014";
+	private String startTime = "2017-11-17T09:30:47Z";
+	private String finishTime = "2017-11-17T09:30:47Z";
+	private String requestScope = "service";
+	private String requestType = "createInstance";
+	private String timestamp = "2017-11-17T09:30:47Z";
+	private String requestState = "COMPLETE";
+	private String statusMessage = "Success";
+	private String percentProgress = "100";
+	
+	@Test
+	public void testBuildRequestJson() throws MapperException, IOException {
+		AVPNDmaapBean actualBean = dmaapPropertiesClient.buildRequestJson(requestId, clientSource, correlator, serviceInstanceId, startTime, finishTime, requestScope,
+																			requestType, timestamp, requestState, statusMessage, percentProgress, true);
+
+		AVPNDmaapBean expected = new ObjectMapper().readValue(new File(file), AVPNDmaapBean.class);
+
+		assertNotNull(actualBean);
+		assertThat(actualBean, sameBeanAs(expected));
+	}
+
+	@Test
+	public void testDmaapPublishRequest() throws JsonProcessingException, MapperException {
+		stubFor(post(urlEqualTo("/events/com.att.mso.asyncStatusUpdate?timeout=20000"))
+				.willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(HttpStatus.SC_ACCEPTED)));
+
+		dmaapPropertiesClient.dmaapPublishRequest(requestId, clientSource, correlator, serviceInstanceId, startTime, finishTime, requestScope,
+													requestType, timestamp, requestState, statusMessage, percentProgress, false);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
new file mode 100644
index 0000000000..0992b59267
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.dmaapproperties;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class GlobalDmaapPublisherTest extends BaseTest{
+
+	@Autowired
+	private GlobalDmaapPublisher globalDmaapPublisher;
+	
+	@Test
+	public void testGetters() {
+		assertEquals("dmaapUsername", globalDmaapPublisher.getUserName());
+		assertEquals("dmaapPassword", globalDmaapPublisher.getPassword());
+		assertEquals("com.att.mso.asyncStatusUpdate", globalDmaapPublisher.getTopic());
+		assertEquals("http://localhost:" + wireMockPort, globalDmaapPublisher.getHost().get());
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/exception/ExceptionBuilderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/exception/ExceptionBuilderTest.java
new file mode 100644
index 0000000000..9ada85fa38
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/exception/ExceptionBuilderTest.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.onap.so.client.exception;
+
+import static org.junit.Assert.assertEquals;
+
+import org.camunda.bpm.engine.delegate.BpmnError;
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.onap.so.bpmn.mock.FileUtil;
+
+public class ExceptionBuilderTest extends BaseTest {
+
+	private static final String RESOURCE_PATH = "__files/";
+	private static final String VALID_ERROR_MESSAGE = "{test error message}";
+
+	@Test
+	public void buildAndThrowWorkflowExceptionTest() {
+		try {
+			ExceptionBuilder exceptionBuilder = new ExceptionBuilder();
+			exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, new NullPointerException(VALID_ERROR_MESSAGE));
+		} catch (BpmnError bpmnException){
+			assertEquals("MSOWorkflowException", bpmnException.getErrorCode());
+		}
+	}
+
+	@Test
+	public void buildAndThrowWorkflowExceptionInvalidMessageTest() {
+		try{
+			ExceptionBuilder exceptionBuilder = new ExceptionBuilder();
+			String invalidErrorMessage = FileUtil.readResourceFile(RESOURCE_PATH + "invalidErrorMessage.txt");
+			exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, new NullPointerException(invalidErrorMessage));
+		} catch (BpmnError bpmnException){
+			assertEquals("MSOWorkflowException", bpmnException.getErrorCode());
+		}
+	}
+	
+	@Test
+	public void buildAndThrowWorkflowExceptionInvalidMessageFlagTest() {
+		try{
+			ExceptionBuilder exceptionBuilder = new ExceptionBuilder();
+			String invalidErrorMessage = FileUtil.readResourceFile(RESOURCE_PATH + "invalidErrorMessageFlag.txt");
+			exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, new NullPointerException(invalidErrorMessage));
+		} catch (BpmnError bpmnException){
+			assertEquals("MSOWorkflowException", bpmnException.getErrorCode());
+		}
+	}
+	
+	@Test
+	public void buildAndThrowWorkflowExceptionNullMessageTest() {
+		try{
+			ExceptionBuilder exceptionBuilder = new ExceptionBuilder();
+			exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, new NullPointerException());
+		} catch (BpmnError bpmnException){
+			assertEquals("MSOWorkflowException", bpmnException.getErrorCode());
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/RollbackVnfNotificationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/AAIPropertiesImplTest.java
index c6602d33f9..2e74d443bd 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/RollbackVnfNotificationTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/AAIPropertiesImplTest.java
@@ -1,43 +1,50 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common.adapter.vnf;

-

-import static org.junit.Assert.assertEquals;

-import org.junit.Test;

-

-public class RollbackVnfNotificationTest {

-	private RollbackVnfNotification rvn = new RollbackVnfNotification();

-	 MsoExceptionCategory mso= MsoExceptionCategory.OPENSTACK;

-	@Test

-	public void testRollbackVnfNotification() {

-		rvn.setMessageId("messageId");

-		rvn.setCompleted(true);

-		rvn.setException(mso);

-		rvn.setErrorMessage("errorMessage");

-		assertEquals(rvn.getMessageId(), "messageId");

-		assertEquals(rvn.isCompleted(), true);

-		assertEquals(rvn.getException(), mso);

-		assertEquals(rvn.getErrorMessage(), "errorMessage");

-	}

-	@Test

-	public void testtoString() {

-		assert(rvn.toString()!=null);

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.restproperties;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.Test;
+import org.onap.so.client.aai.AAIVersion;
+
+public class AAIPropertiesImplTest{
+
+	private AAIPropertiesImpl aaiPropertiesImpl = new AAIPropertiesImpl();
+	
+	@Test
+	public void getEndpointTest() throws MalformedURLException {
+		assertEquals("aai.endpoint", AAIPropertiesImpl.AAI_ENDPOINT);
+	}
+	
+	@Test
+	public void getAuthTest() {
+		String expectedAuth = "aai.auth";
+		assertEquals(expectedAuth, AAIPropertiesImpl.AAI_AUTH);
+	}
+	
+	@Test
+	public void getKeyTest() {
+		assertEquals("mso.msoKey", AAIPropertiesImpl.MSO_MSO_KEY);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/PolicyRestPropertiesImplTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/PolicyRestPropertiesImplTest.java
new file mode 100644
index 0000000000..d1de702a81
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/PolicyRestPropertiesImplTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.restproperties;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.Test;
+
+public class PolicyRestPropertiesImplTest {
+	
+	
+	@Test
+	public void getEndpointTest() throws MalformedURLException {
+		assertEquals("policy.endpoint", PolicyRestPropertiesImpl.POLICY_ENDPOINT);
+	}
+	
+	@Test
+	public void getEnvironmentTest() {
+		assertEquals("policy.environment", PolicyRestPropertiesImpl.POLICY_ENVIRONMENT);
+	}
+	
+	@Test
+	public void getClientAuthTest() {
+		assertEquals("policy.auth", PolicyRestPropertiesImpl.POLICY_AUTH);
+	}
+	
+	@Test
+	public void getAuthTest() {
+		assertEquals("policy.client.auth", PolicyRestPropertiesImpl.POLICY_CLIENT_AUTH);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/RestPropertiesPojoTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/RestPropertiesPojoTest.java
new file mode 100644
index 0000000000..863338548e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/RestPropertiesPojoTest.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.restproperties;
+
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.impl.PojoClassFactory;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.NoPrimitivesRule;
+import com.openpojo.validation.rule.impl.NoPublicFieldsRule;
+import com.openpojo.validation.test.impl.GetterTester;
+
+public class RestPropertiesPojoTest {
+	@Test
+	public void pojoStructure() {
+		test(PojoClassFactory.getPojoClass(AaiPropertiesConfiguration.class));
+	}
+	
+	private void test(PojoClass pojoClass) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new NoPrimitivesRule())
+				.with(new NoPublicFieldsRule())
+				.with(new GetterTester())
+				.build();
+		validator.validate(pojoClass);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/ThreadedReadTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/ThreadedReadTest.java
new file mode 100644
index 0000000000..8231c2f529
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/restproperties/ThreadedReadTest.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 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.onap.so.client.restproperties;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.onap.so.BaseTest;
+import org.onap.so.client.RestPropertiesLoader;
+import org.onap.so.client.aai.AAIProperties;
+
+public class ThreadedReadTest {
+	@Test
+	public void allAtOnce() throws InterruptedException {
+		ExecutorService executorService = Executors.newFixedThreadPool(10);
+		
+		Callable<AAIProperties> callableTask = () -> {
+			return RestPropertiesLoader.getInstance().getNewImpl(AAIProperties.class);
+		};
+		List<Callable<AAIProperties>> callableTasks = new ArrayList<>();
+		
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		
+		List<Future<AAIProperties>> futures = executorService.invokeAll(callableTasks);
+		
+		Set<AAIProperties> results = new HashSet<>();
+		futures.forEach(item -> {
+			try {
+				results.add(item.get());
+			} catch (InterruptedException | ExecutionException e) {
+				throw new RuntimeException(e);
+			}
+		});
+		
+		assertThat("expect all unique results", results.size(), equalTo(callableTasks.size()));
+		
+	}
+	
+	@Test
+	public void executeOverTime() {
+		ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
+		
+		Callable<AAIProperties> callableTask = () -> {
+			TimeUnit.MILLISECONDS.sleep(500);
+			return RestPropertiesLoader.getInstance().getNewImpl(AAIProperties.class);
+		};
+		List<Callable<AAIProperties>> callableTasks = new ArrayList<>();
+		
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		callableTasks.add(callableTask);
+		
+		Set<AAIProperties> results = new HashSet<>();
+		callableTasks.forEach(callable -> {
+			try {
+				TimeUnit.MILLISECONDS.sleep(300);
+				Future<AAIProperties> result = executorService.submit(callable);
+				results.add(result.get());
+			} catch (InterruptedException | ExecutionException e) {
+				throw new RuntimeException(e);
+			}
+		});
+		
+		assertThat("expect all unique results", results.size(), equalTo(callableTasks.size()));
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/AppCClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/AppCClientTest.java
deleted file mode 100644
index 8561b030eb..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/AppCClientTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModule;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDBUpdateVfModule;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfsByVnfId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetPserverByVnfId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockSetInMaintFlagByVnfId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockVNFAdapterRestVfModule;
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.MockGetServiceResourcesCatalogData;
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;
-import static org.openecomp.mso.bpmn.mock.StubResponsePolicy.MockPolicySkip;
-import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFPut;
-
-//import static org.junit.Assert.assertEquals;
-//import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-//import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-//import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import org.openecomp.mso.bpmn.common.WorkflowTest;
-import org.onap.appc.client.lcm.model.Action;
-
-//import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-public class AppCClientTest extends WorkflowTest{
-
-	
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/AppCClient.bpmn"})
-	public void test() throws Exception{
-				
-		logStart();
-		
-		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlByIdVipr.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-		//MockGetGenericVnfById_404("testVnfId");
-		MockGetServiceResourcesCatalogData("995256d2-5a33-55df-13ab-12abad84e7ff", "1.0", "VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json");
-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");
-		MockPutGenericVnf(".*");
-		MockAAIVfModule();
-		MockPatchGenericVnf("skask");
-		MockPatchVfModuleId("skask", ".*");
-		mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");	
-		mockVNFPut("skask", "/supercool", 202);
-		mockVNFPut("skask", "/lukewarm", 202);
-		MockVNFAdapterRestVfModule();
-		MockDBUpdateVfModule();	
-		MockGetPserverByVnfId("skask", "AAI/AAI_pserverByVnfId.json", 200);
-		MockGetGenericVnfsByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);
-		MockSetInMaintFlagByVnfId("skask", 200);
-		MockPolicySkip();
-		mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables = setVariablesInstance();
-		String businessKey = UUID.randomUUID().toString();
-		invokeSubProcess("AppCClient", businessKey, variables);
-		waitForProcessEnd(businessKey, 10000);
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "AppCClient", "WorkflowException");
-		System.out.println("workflowException:\n" + workflowException);
-		assertEquals(null, workflowException);
-		logEnd();
-	}        
-	
-	
-	private Map<String, Object> setVariablesInstance(){
-		Map<String,Object> variables = new HashMap<String, Object>();
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("mso-request-id", "RaaACCTest1");
-		variables.put("msoRequestId", "RaaACCTestRequestId-1");
-		variables.put("requestId", "testRequestId");
-		variables.put("vnfId", "skask");
-		variables.put("action", Action.Stop);
-		variables.put("healthCheckIndex", 0);
-		variables.put("payload", "{\"existing-software-version\":\"3.1\",\"new-software-version\":\"3.2\"}"); 
-		//variables.put("payload", "{\"vm-id\": \"<VM-ID>\", \"identy-url\":\"<IDENTITY-URL>\", \"tenant-id\": \"<TENANT-ID>\"}, \"Hello\":\"Whats up\"" );
-		return variables;
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
deleted file mode 100644
index 0bb5186a17..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-import static org.mockito.Matchers.any;

-import static org.mockito.Mockito.doAnswer;

-import static org.mockito.Mockito.spy;

-

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import javax.ws.rs.core.Response;

-

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.history.HistoricProcessInstance;

-import org.camunda.bpm.engine.history.HistoricVariableInstance;

-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;

-import org.jboss.resteasy.spi.AsynchronousResponse;

-import org.mockito.invocation.InvocationOnMock;

-import org.mockito.stubbing.Answer;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-

-/**

- * Set of utility methods used for Unit testing

- *

- */

-public class BPMNUtil {

-

-	public static String getVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {

-		String pID = getProcessInstanceId(processEngineServices,

-				processDefinitionID);

-		assertProcessInstanceFinished(processEngineServices, pID);

-		HistoricVariableInstance responseData = processEngineServices.getHistoryService()

-			    .createHistoricVariableInstanceQuery().processInstanceId(pID)

-			    .variableName(name)

-			    .singleResult();

-		

-		if (responseData != null) {

-			return (responseData.getValue() != null ? responseData.getValue().toString(): null); 

-		}

-		return null;

-	}

-

-	@SuppressWarnings("unchecked")

-	public static <T> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {

-		String pID = getProcessInstanceId(processEngineServices,

-				processDefinitionID);

-		assertProcessInstanceFinished(processEngineServices, pID);

-		Object responseData = processEngineServices.getHistoryService()

-			    .createHistoricVariableInstanceQuery().processInstanceId(pID)

-			    .variableName(name)

-			    .singleResult()

-			    .getValue();

-		return (T) responseData;

-	}

-

-	

-	public static void assertAnyProcessInstanceFinished(ProcessEngineServices processEngineServices, String processDefinitionID) {

-		String pID = getProcessInstanceId(processEngineServices,

-				processDefinitionID);

-		assertNotNull(pID);

-	    assertTrue(processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pID).finished().count() > 0);

-	}

-	

-	public static void assertNoProcessInstance(ProcessEngineServices processEngineServices, String processDefinitionID) {

-		assertNull(getProcessInstanceId(processEngineServices, processDefinitionID));

-	}

-	

-	public static void assertProcessInstanceFinished(ProcessEngineServices processEngineServices, String pid) {

-	    assertEquals(1, processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count());

-	}

-	

-	public static void assertProcessInstanceNotFinished(ProcessEngineServices processEngineServices, String processDefinitionID) {

-		String pID = getProcessInstanceId(processEngineServices,

-				processDefinitionID);		

-	    assertEquals(0, processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pID).finished().count());

-	}

-

-	private static String getProcessInstanceId(

-			ProcessEngineServices processEngineServices, String processDefinitionID) {

-		List<HistoricProcessInstance> historyList =  processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().list();

-		String pID = null;

-		for (HistoricProcessInstance hInstance: historyList) {

-			if (hInstance.getProcessDefinitionKey().equals(processDefinitionID)) {

-				pID = hInstance.getId();

-				break;

-			}

-		}

-		return pID;

-	}

-

-	public static boolean isProcessInstanceFinished(ProcessEngineServices processEngineServices, String pid) {

-	    return processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count() == 1 ? true: false;

-	}

-

-	

-	private static void buildVariable(String key, String value, Map<String,Object> variableValueType) {

-		Map<String, Object> host = new HashMap<>();

-		host.put("value", value);

-		host.put("type", "String");

-		variableValueType.put(key, host);

-	}

-	

-	public static WorkflowResponse executeWorkFlow(ProcessEngineServices processEngineServices, String processKey, Map<String,String> variables) {

-		WorkflowResource workflowResource = new WorkflowResource();

-		VariableMapImpl variableMap = new VariableMapImpl();

-

-		Map<String, Object> variableValueType = new HashMap<>();

-		for (String key : variables.keySet()) {

-			buildVariable(key, variables.get(key), variableValueType);

-		}

-		buildVariable("mso-service-request-timeout","600", variableValueType);

-		variableMap.put("variables", variableValueType);

-		

-		workflowResource.setProcessEngineServices4junit(processEngineServices);

-		Response response = workflowResource.startProcessInstanceByKey(

-					processKey, variableMap);

-		WorkflowResponse workflowResponse = (WorkflowResponse) response.getEntity();

-		return workflowResponse;

-	}

-

-	//Check the runtime service to see whether the process is completed

-	public static void waitForWorkflowToFinish(ProcessEngineServices processEngineServices, String pid) throws InterruptedException {

-		// Don't wait forever

-		long waitTime = 120000;

-		long endTime = System.currentTimeMillis() + waitTime;

-

-		while (true) {

-			if (processEngineServices.getRuntimeService().createProcessInstanceQuery().processInstanceId(pid).singleResult() == null) {

-				break;

-			}

-

-			if (System.currentTimeMillis() >= endTime) {

-				fail("Process " + pid + " did not finish in " + waitTime + "ms");

-			}

-

-			Thread.sleep(200);

-		}

-	}

-	

-	/**

-	 * Executes the Asynchronous workflow in synchronous fashion and returns the WorkflowResponse object

-	 * @param processEngineServices

-	 * @param processKey

-	 * @param variables

-	 * @return

-	 * @throws InterruptedException

-	 */

-	public static WorkflowResponse executeAsyncWorkflow(ProcessEngineServices processEngineServices, String processKey, Map<String,String> variables) throws InterruptedException {

-		ProcessThread pthread = new ProcessThread(processKey, processEngineServices, variables);

-		pthread.start();

-		BPMNUtil.assertProcessInstanceNotFinished(processEngineServices, processKey);

-		String pid = getProcessInstanceId(processEngineServices, processKey);

-		//Caution: If there is a problem with workflow, this may wait for ever

-		while (true) {

-			pid = getProcessInstanceId(processEngineServices, processKey);

-			if (!isProcessInstanceFinished(processEngineServices,pid)) {

-				Thread.sleep(200);

-			} else{

-				break;

-			}

-		}

-		//need to retrieve for second time ?

-		pid = getProcessInstanceId(processEngineServices, processKey);

-		waitForWorkflowToFinish(processEngineServices, pid);

-		return pthread.workflowResponse;

-	}

-

-	/**

-	 * Execute workflow using async resource

-	 * @param processEngineServices

-	 * @param processKey

-	 * @param asyncResponse

-	 * @param variables

-	 */

-	private static void executeAsyncFlow(ProcessEngineServices processEngineServices, String processKey, AsynchronousResponse asyncResponse, Map<String,String> variables) {

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

-		VariableMapImpl variableMap = new VariableMapImpl();

-

-		Map<String, Object> variableValueType = new HashMap<>();

-		for (String key : variables.keySet()) {

-			buildVariable(key, variables.get(key), variableValueType);

-		}

-		buildVariable("mso-service-request-timeout","600", variableValueType);

-		variableMap.put("variables", variableValueType);

-		

-		workflowResource.setProcessEngineServices4junit(processEngineServices);

-		workflowResource.startProcessInstanceByKey(asyncResponse, processKey, variableMap);

-	}

-	

-	/**

-	 * Helper class which executes workflow in a thread

-	 *

-	 */

-	static class ProcessThread extends Thread {

-		

-		public WorkflowResponse workflowResponse = null;

-		public String processKey;

-		public AsynchronousResponse asyncResponse = spy(AsynchronousResponse.class);

-		public boolean started;

-		public ProcessEngineServices processEngineServices;

-		public Map<String,String> variables;

-		

-		public ProcessThread(String processKey, ProcessEngineServices processEngineServices, Map<String,String> variables) {

-			this.processKey = processKey;

-			this.processEngineServices = processEngineServices;

-			this.variables = variables;

-		}

-		

-		public void run() {

-			started = true;

-			doAnswer(new Answer<Void>() {

-			    public Void answer(InvocationOnMock invocation) {

-			      Response response = (Response) invocation.getArguments()[0];

-			      workflowResponse = (WorkflowResponse) response.getEntity();

-			      return null;

-			    }

-			}).when(asyncResponse).setResponse(any(Response.class));		

-			executeAsyncFlow(processEngineServices, processKey, asyncResponse, variables);

-		}

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
deleted file mode 100644
index bf69223b52..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-

-/**

- * Unit test for CompleteMsoProcess.bpmn.

- */

-public class CompleteMsoProcessTest extends WorkflowTest {

-	

-	private void executeFlow(String inputRequestFile) throws InterruptedException {

-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");

-		

-		//String changeFeatureActivateRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/ChangeFeatureActivateV1/" + inputRequestFile);

-		Map<String, String> variables = new HashMap<>();

-		variables.put("CompleteMsoProcessRequest",inputRequestFile);

-		

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CompleteMsoProcess", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-		logEnd();

-	}	

-	

-	@Test		

-	@Deployment(resources = {"subprocess/CompleteMsoProcess.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoCompletionRequestWithNotificationurl_200() throws Exception {

-		logStart();	

-		

-		//Execute Flow

-		executeFlow(gMsoCompletionRequestWithNotificationurl());

-		

-		//Verify Error

-		String CMSO_ResponseCode = BPMNUtil.getVariable(processEngineRule, "CompleteMsoProcess", "CMSO_ResponseCode");

-		Assert.assertEquals("200", CMSO_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "CompleteMsoProcess", "CMSO_SuccessIndicator"));

-		logEnd();

-	}

-	

-	@Test		

-	@Ignore // BROKEN TEST

-	@Deployment(resources = {"subprocess/CompleteMsoProcess.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoCompletionRequestWithNotificationurl_500() throws Exception {

-		logStart();

-		

-		//Execute Flow

-		executeFlow(gMsoCompletionRequestWithNotificationurl());

-		

-		//Verify Error

-		String CMSO_ResponseCode = BPMNUtil.getVariable(processEngineRule, "CompleteMsoProcess", "CMSO_ResponseCode");

-		Assert.assertEquals("500", CMSO_ResponseCode);

-		Assert.assertFalse((boolean) BPMNUtil.getRawVariable(processEngineRule, "CompleteMsoProcess", "CMSO_SuccessIndicator"));

-		logEnd();

-	}	

-

-	@Test		

-	@Deployment(resources = {"subprocess/CompleteMsoProcess.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoCompletionRequestWithNoNotificationurl() throws Exception {

-		logStart();	

-		

-		//Execute Flow

-		executeFlow(gMsoCompletionRequestWithNoNotificationurl());

-		

-		//Verify Error

-		String CMSO_ResponseCode = BPMNUtil.getVariable(processEngineRule, "CompleteMsoProcess", "CMSO_ResponseCode");

-		Assert.assertEquals("200", CMSO_ResponseCode);	

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "CompleteMsoProcess", "CMSO_SuccessIndicator"));

-		logEnd();

-	}

-

-	@Test		

-	@Deployment(resources = {"subprocess/CompleteMsoProcess.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoCompletionRequestWithNotificationurlNoRequestId() throws Exception {

-		logStart();	

-		

-		//Execute Flow

-		executeFlow(gMsoCompletionRequestWithNotificationurlNoRequestId());

-		

-		//Verify Error

-		String CMSO_ResponseCode = BPMNUtil.getVariable(processEngineRule, "CompleteMsoProcess", "CMSO_ResponseCode");

-		Assert.assertEquals("200", CMSO_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "CompleteMsoProcess", "CMSO_SuccessIndicator"));

-		logEnd();	

-	}

-	

-	@Test		

-	@Deployment(resources = {"subprocess/CompleteMsoProcess.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoCompletionRequestWithNoNotificationurlNoRequestId() throws Exception {

-		logStart();

-		

-		//Execute Flow

-		executeFlow(gMsoCompletionRequestWithNoNotificationurlNoRequestId());

-		

-		//Verify Error

-		String CMSO_ResponseCode = BPMNUtil.getVariable(processEngineRule, "CompleteMsoProcess", "CMSO_ResponseCode");

-		Assert.assertEquals("200", CMSO_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "CompleteMsoProcess", "CMSO_SuccessIndicator"));

-		logEnd();

-	}	

-

-	public String gMsoCompletionRequestWithNotificationurl() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:MsoCompletionRequest xmlns:ns=\"http://openecomp.org/mso/request/types/v1\" xmlns:sdncadapterworkflow=\"http://ecomp.openecomp.org.com/mso/workflow/schema/v1\">"

-				+ "		<ns:request-information>"

-				+ "			<ns:request-id>uCPE1020_STUW105_5002</ns:request-id>"

-				+ "			<ns:request-action>Layer3ServiceActivateRequest</ns:request-action>"				

-				+ "			<ns:request-sub-action>COMPLETE</ns:request-sub-action>"

-				+ "			<ns:source>OMX</ns:source>"

-				+ "			<ns:notification-url>https://t3nap1a1.snt.bst.bls.com:9004/sdncontroller-sdncontroller-inbound-ws-war/sdncontroller-sdncontroller-inbound-ws.wsdl</ns:notification-url>"				

-				+ "			<ns:order-number>10205000</ns:order-number>"				

-				+ "			<ns:order-version>1</ns:order-version>"

-				+ "		</ns:request-information>"				

-				+ "		<sdncadapterworkflow:mso-bpel-name>UCPELayer3ServiceActivateV1</sdncadapterworkflow:mso-bpel-name>"

-				+ "</sdncadapterworkflow:MsoCompletionRequest>";

-		

-		return xml;

-	}

-		

-

-

-	public String gMsoCompletionRequestWithNoNotificationurl() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:MsoCompletionRequest xmlns:ns=\"http://openecomp.org/mso/request/types/v1\" xmlns:sdncadapterworkflow=\"http://openecomp.org/mso/workflow/schema/v1\">"

-				+ "		<ns:request-information>"

-				+ "			<ns:request-id>uCPE1020_STUW105_5002</ns:request-id>"

-				+ "			<ns:request-action>Layer3ServiceActivateRequest</ns:request-action>"				

-				+ "			<ns:request-sub-action>COMPLETE</ns:request-sub-action>"

-				+ "			<ns:source>OMX</ns:source>"

-				+ "			<ns:notification-url></ns:notification-url>"				

-				+ "			<ns:order-number>10205000</ns:order-number>"				

-				+ "			<ns:order-version>1</ns:order-version>"

-				+ "		</ns:request-information>"				

-				+ "		<sdncadapterworkflow:mso-bpel-name>UCPELayer3ServiceActivateV1</sdncadapterworkflow:mso-bpel-name>"

-				+ "</sdncadapterworkflow:MsoCompletionRequest>";

-		

-		return xml;

-	}

-	

-	public String gMsoCompletionRequestWithNoNotificationurlNoRequestId() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:MsoCompletionRequest xmlns:ns=\"http://openecomp.org/mso/request/types/v1\" xmlns:sdncadapterworkflow=\"http://openecomp.org/mso/workflow/schema/v1\">"

-				+ "		<ns:request-information>"

-				+ "			<ns:request-id></ns:request-id>"

-				+ "			<ns:request-action>Layer3ServiceActivateRequest</ns:request-action>"

-				+ "			<ns:request-sub-action>COMPLETE</ns:request-sub-action>"

-				+ "			<ns:source>OMX</ns:source>"

-				+ "			<ns:notification-url></ns:notification-url>"				

-				+ "			<ns:order-number>10205000</ns:order-number>"				

-				+ "			<ns:order-version>1</ns:order-version>"

-				+ "		</ns:request-information>"				

-				+ "		<sdncadapterworkflow:mso-bpel-name>UCPELayer3ServiceActivateV1</sdncadapterworkflow:mso-bpel-name>"

-				+ "</sdncadapterworkflow:MsoCompletionRequest>";

-		

-		return xml;

-	}	

-	

-	public String gMsoCompletionRequestWithNotificationurlNoRequestId() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:MsoCompletionRequest xmlns:ns=\"http://openecomp.org/mso/request/types/v1\" xmlns:sdncadapterworkflow=\"http://openecomp.org/mso/workflow/schema/v1\">"

-				+ "		<ns:request-information>"

-				+ "			<ns:request-id></ns:request-id>"

-				+ "			<ns:request-action>Layer3ServiceActivateRequest</ns:request-action>"				

-				+ "			<ns:request-sub-action>COMPLETE</ns:request-sub-action>"

-				+ "			<ns:source>OMX</ns:source>"

-				+ "			<ns:notification-url>https://t3nap1a1.snt.bst.bls.com:9004/sdncontroller-sdncontroller-inbound-ws-war/sdncontroller-sdncontroller-inbound-ws.wsdl</ns:notification-url>"				

-				+ "			<ns:order-number>10205000</ns:order-number>"				

-				+ "			<ns:order-version>1</ns:order-version>"

-				+ "		</ns:request-information>"				

-				+ "		<sdncadapterworkflow:mso-bpel-name>UCPELayer3ServiceActivateV1</sdncadapterworkflow:mso-bpel-name>"

-				+ "</sdncadapterworkflow:MsoCompletionRequest>";

-		

-		return xml;

-	}	

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupNameTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupNameTest.java
deleted file mode 100644
index 845f06045a..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupNameTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVolumeGroupById;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-
-/**
- * Unit test cases for ConfirmVolumeGroupName.bpmn
- */
-public class ConfirmVolumeGroupNameTest extends WorkflowTest {
-	/**
-	 * Sunny day scenario.
-	 * 
-	 * @throws Exception
-	 */
-	@Test
-	@Deployment(resources = {
-		"subprocess/ConfirmVolumeGroupName.bpmn"
-		})
-	public void sunnyDay() throws Exception {
-				
-		logStart();
-		MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml");
-		
-		System.out.println("Before starting process");
-		
-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("isDebugLogEnabled","true");
-		variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_1");
-		variables.put("ConfirmVolumeGroupName_volumeGroupName", "VOLUME_GROUP_ID_1_NAME");
-		variables.put("ConfirmVolumeGroupName_aicCloudRegion", "MDTWNJ21");
-		System.out.println("after setting variables");
-		runtimeService.startProcessInstanceByKey("ConfirmVolumeGroupName", variables);
-		String response = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponse");
-		String responseCode = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponseCode");
-					
-		assertEquals("200", responseCode);
-		System.out.println(response);
-		logEnd();
-	}
-	
-	/**
-	 * Rainy day scenario - nonexisting volume group id.
-	 * 
-	 * @throws Exception
-	 */
-	@Test
-	@Deployment(resources = {
-		"subprocess/ConfirmVolumeGroupName.bpmn"
-		})
-	public void rainyDayNoVolumeGroupId() throws Exception {
-				
-		logStart();
-		MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml");
-		
-		System.out.println("Before starting process");
-		
-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("isDebugLogEnabled","true");
-		variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_THAT_DOES_NOT_EXIST");
-		variables.put("ConfirmVolumeGroupName_volumeGroupName", "cee6d136-e378-4678-a024-2cd15f0ee0cg");
-		System.out.println("after setting variables");
-		runtimeService.startProcessInstanceByKey("ConfirmVolumeGroupName", variables);
-		String response = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponse");
-		String responseCode = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponseCode");
-					
-		assertEquals("404", responseCode);
-		System.out.println(response);
-		
-		logEnd();
-	}
-	
-	/**
-	 * Rainy day scenario - volume group name does not match the name in AAI
-	 *
-	 * 
-	 * @throws Exception
-	 */
-	@Test
-	@Deployment(resources = {
-		"subprocess/ConfirmVolumeGroupName.bpmn"
-		})
-	public void rainyDayNameDoesNotMatch() throws Exception {
-				
-		logStart();
-		MockGetVolumeGroupById("MDTWNJ21", "VOLUME_GROUP_ID_1", "aai-volume-group-id-info.xml");
-		
-		System.out.println("Before starting process");
-		
-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("isDebugLogEnabled","true");
-		variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_1");
-		variables.put("ConfirmVolumeGroupName_volumeGroupName", "BAD_VOLUME_GROUP_NAME");
-		System.out.println("after setting variables");
-		runtimeService.startProcessInstanceByKey("ConfirmVolumeGroupName", variables);
-		String response = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponse");
-		String responseCode = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupName", "CVGN_queryVolumeGroupResponseCode");
-					
-		assertEquals("404", responseCode);
-		System.out.println(response);
-		
-		logEnd();
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
deleted file mode 100644
index 13c400e71e..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVolumeGroupById;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-/**
- * Please describe the ConfirmVolumeGroupTenantTest.java class
- *
- */
-public class ConfirmVolumeGroupTenantTest extends WorkflowTest {
-
-	@Test
-	@Deployment(resources = {"subprocess/ConfirmVolumeGroupTenant.bpmn"})
-	public void testRemoveLayer3Service_success() throws Exception{
-		MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch");
-		String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch");
-		String actualResponse = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "volumeHeatStackId");
-
-		assertEquals("Response", "true", actualNameMatch);
-		assertEquals("Response", "true", actualIdMatch);
-		assertEquals("Response", "MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845", actualResponse);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/ConfirmVolumeGroupTenant.bpmn"})
-	public void testRemoveLayer3Service_idsNotMatch() throws Exception{
-		MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch");
-		String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch");
-		String actualResponse = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "WorkflowException");
-
-		assertEquals("Response", "true", actualNameMatch);
-		assertEquals("Response", "false", actualIdMatch);
-		assertEquals("Response", "WorkflowException[processKey=ConfirmVolumeGroupTenant,errorCode=1,errorMessage=Volume Group a8399879-31b3-4973-be26-0a0cbe776b58 does not belong to your tenant]", actualResponse);
-
-	}
-
-	private void setVariables(Map<String, String> variables) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("volumeGroupId","a8399879-31b3-4973-be26-0a0cbe776b58");
-		variables.put("tenantId", "7dd5365547234ee8937416c65507d266");
-		variables.put("aicCloudRegion", "MDTWNJ21");
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleTest.java
deleted file mode 100644
index b2b7760327..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.containing;

-import static com.github.tomakehurst.wiremock.client.WireMock.put;

-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;

-import static org.openecomp.mso.bpmn.common.DeleteAAIVfModuleTest.MockAAIGenericVnfSearch;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-

-/**

- * Unit test for CreateAAIVfModule.bpmn.

- */

-public class CreateAAIVfModuleTest extends WorkflowTest {

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateGenericVnfSuccess_200() {

-

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("isVidRequest", "false");

-		variables.put("vnfName", "STMTN5MMSC22");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC22-MMSC::module-0-0");

-		variables.put("vfModuleModelName", "MMSC::module-0");

-		

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		String response = BPMNUtil.getVariable(processEngineRule, "CreateAAIVfModule", "CAAIVfMod_createVfModuleResponseCode");

-		String responseCode = BPMNUtil.getVariable(processEngineRule, "CreateAAIVfModule", "CAAIVfMod_createVfModuleResponseCode");

-		Assert.assertEquals("201", responseCode);

-		System.out.println(response);

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateVfModuleSuccess_200() {

-		// create Add-on VF Module for existing Generic VNF

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("isVidRequest", "false");

-		variables.put("vnfId", "a27ce5a9-29c4-4c22-a017-6615ac73c721");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC21-MMSC::module-1-0");

-		variables.put("vfModuleModelName", "STMTN5MMSC21-MMSC::model-1-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		String response = BPMNUtil.getVariable(processEngineRule, "CreateAAIVfModule", "CAAIVfMod_createVfModuleResponseCode");

-		String responseCode = BPMNUtil.getVariable(processEngineRule, "CreateAAIVfModule", "CAAIVfMod_createVfModuleResponseCode");

-		Assert.assertEquals("201", responseCode);

-		System.out.println(response);

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestQueryGenericVnfFailure_5000() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfName", "STMTN5MMSC23");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC23-MMSC::module-0-0");

-		variables.put("vfModuleModelName", "MMSC::module-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);		

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(500, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("Error occurred attempting to query AAI"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateDupGenericVnfFailure_1002() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfName", "STMTN5MMSC21");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC21-MMSC::module-0-0");

-		variables.put("vfModuleModelName", "MMSC::module-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("Invalid request for new Generic VNF which already exists"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateDupVfModuleFailure_1002() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfId", "2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC20-MMSC::module-1-0");

-		variables.put("vfModuleModelName", "STMTN5MMSC20-MMSC::model-1-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("already exists for Generic VNF"));

-		System.out.println(exception.getErrorMessage());

-	}

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateGenericVnfFailure_5000() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfName", "STMTN5MMSC22");

-		variables.put("serviceId", "99999999-9999-9999-9999-999999999999");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC22-PCRF::module-1-0");

-		variables.put("vfModuleModelName", "PCRF::module-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(5000, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("<messageId>SVC3002</messageId>"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateGenericVnfFailure_1002() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfId", "768073c7-f41f-4822-9323-b75962763d74");

-		variables.put("serviceId", "00000000-0000-0000-0000-000000000000");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC22-PCRF::module-1-0");

-		variables.put("vfModuleModelName", "PCRF::module-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("Generic VNF Not Found"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModule.bpmn"

-		})

-	public void  TestCreateVfModuleFailure_5000() {

-		MockAAIGenericVnfSearch();

-		MockAAICreateGenericVnf();

-		MockAAIVfModulePUT(true);

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("isVidRequest", "false");

-		variables.put("vnfId", "a27ce5a9-29c4-4c22-a017-6615ac73c721");

-		variables.put("serviceId", "99999999-9999-9999-9999-999999999999");

-		variables.put("personaModelId", "973ed047-d251-4fb9-bf1a-65b8949e0a73");

-		variables.put("personaModelVersion", "1.0");

-		variables.put("vfModuleName", "STMTN5MMSC21-PCRF::module-1-0");

-		variables.put("vfModuleModelName", "STMTN5MMSC21-PCRF::model-1-0");

-		runtimeService.startProcessInstanceByKey("CreateAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "CreateAAIVfModule", "WorkflowException");

-		Assert.assertEquals(5000, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("<messageId>SVC3002</messageId>"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	public static void MockAAICreateGenericVnf(){

-		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))

-				.withRequestBody(containing("<service-id>00000000-0000-0000-0000-000000000000</service-id>"))

-				.willReturn(aResponse()

-						.withStatus(201)));

-		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*"))

-				.withRequestBody(containing("<service-id>99999999-9999-9999-9999-999999999999</service-id>"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-	}

-	

-	// start of mocks used locally and by other VF Module unit tests

-	public static void MockAAIVfModulePUT(boolean isCreate){

-		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))

-				.withRequestBody(containing("MMSC"))

-				.willReturn(aResponse()

-						.withStatus(isCreate ? 201 : 200)));

-		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/.*/vf-modules/vf-module/.*"))

-				.withRequestBody(containing("PCRF"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721"))				

-				.willReturn(aResponse()

-					.withStatus(200)));

-	}

-	

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
deleted file mode 100644
index 5cc26459e8..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit tests for CreateAAIVfModuleVolumeGroup.bpmn.

- */

-public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {

-		

-	/**

-	 * Test the happy path through the flow.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

-		})

-	public void happyPath() throws IOException {

-		

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

-		MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);

-		MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(200, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI returns a 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

-		})

-	public void badGet() throws IOException {

-		

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

-		MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

-		})

-	public void badPatch() throws IOException {

-		

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

-		MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);

-

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DecomposeServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DecomposeServiceTest.java
deleted file mode 100644
index 873e87cc49..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DecomposeServiceTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.MockGetServiceResourcesCatalogData;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.WorkflowTest;
-
-/**
- * Unit Test for the DecomposeService Flow
- *
- */
-public class DecomposeServiceTest extends WorkflowTest {
-
-
-	public DecomposeServiceTest() throws IOException {
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/DecomposeService.bpmn"})
-	public void testDecomposeService_success() throws Exception{
-		MockGetServiceResourcesCatalogData("cmw-123-456-789", "1.0", "/getCatalogServiceResourcesDataWithConfig.json");
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesSuccess(variables, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
-		invokeSubProcess("DecomposeService", businessKey, variables);
-
-		waitForProcessEnd(businessKey, 10000);
-
-		Assert.assertTrue(isProcessEnded(businessKey));
-
-	}
-	
-	//@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/DecomposeService.bpmn"})
-	public void testDecomposeService_success_partial() throws Exception{
-		MockGetServiceResourcesCatalogData("cmw-123-456-789", "/getCatalogServiceResourcesDataNoNetwork.json");
-
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariablesSuccess(variables, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
-		invokeSubProcess("DecomposeService", businessKey, variables);
-
-		waitForProcessEnd(businessKey, 10000);
-
-		Assert.assertTrue(isProcessEnded(businessKey));
-
-	}
-
-	private void setVariablesSuccess(Map<String, Object> variables, String requestId, String siId) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("mso-request-id", requestId);
-		variables.put("msoRequestId", requestId);
-		variables.put("serviceInstanceId",siId);
-
-		String serviceModelInfo = "{ "+ "\"modelType\": \"service\"," +
-				"\"modelInvariantUuid\": \"cmw-123-456-789\"," +
-				"\"modelVersionId\": \"ab6478e5-ea33-3346-ac12-ab121484a3fe\"," +
-				"\"modelName\": \"ServicevSAMP12\"," +
-				"\"modelVersion\": \"1.0\"," +
-				"}";
-		variables.put("serviceModelInfo", serviceModelInfo);
-
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DeleteAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DeleteAAIVfModuleTest.java
deleted file mode 100644
index 564927a854..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DeleteAAIVfModuleTest.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.delete;

-import static com.github.tomakehurst.wiremock.client.WireMock.get;

-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-

-/**

- * Unit test for DeleteAAIVfModule.bpmn.

- */

-public class DeleteAAIVfModuleTest extends WorkflowTest {

-	private static final String EOL = "\n";

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteGenericVnfSuccess_200() {

-		// delete the Base Module and Generic Vnf

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c721, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a73

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest","<vnf-request xmlns=\"http://openecomp.org/mso/infra/vnf-request/v1\"> <request-info> <action>DELETE_VF_MODULE</action> <source>PORTAL</source> </request-info> <vnf-inputs> <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id> <vnf-name>STMTN5MMSC21</vnf-name> <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id> <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name> </vnf-inputs> <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/> </vnf-request>");

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		String response = BPMNUtil.getVariable(processEngineRule, "DeleteAAIVfModule", "DAAIVfMod_deleteGenericVnfResponseCode");

-		String responseCode = BPMNUtil.getVariable(processEngineRule, "DeleteAAIVfModule", "DAAIVfMod_deleteGenericVnfResponseCode");

-		Assert.assertEquals("200", responseCode);

-		System.out.println(response);

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteVfModuleSuccess_200() {

-		// delete Add-on Vf Module for existing Generic Vnf

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c720, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a75

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a75</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		String response = BPMNUtil.getVariable(processEngineRule, "DeleteAAIVfModule", "DAAIVfMod_deleteVfModuleResponseCode");

-		String responseCode = BPMNUtil.getVariable(processEngineRule, "DeleteAAIVfModule", "DAAIVfMod_deleteVfModuleResponseCode");

-		Assert.assertEquals("200", responseCode);

-		System.out.println(response);

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestQueryGenericVnfFailure_5000() {

-		// query Generic Vnf failure (non-404) with A&AI

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c723, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a71

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c723</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC23</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a71</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(5000, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("<messageId>SVC3002</messageId>"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestQueryGenericVnfFailure_1002() {

-		// attempt to delete Vf Module for Generic Vnf that does not exist (A&AI returns 404)

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c722, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a72

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c722</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC22</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a72</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC22-MMSC::module-1-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("Generic VNF Not Found"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteGenericVnfFailure_5000() {

-		// A&AI failure (non-200) when attempting to delete a Generic Vnf

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c718, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a78

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c718</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC18</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a78</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC18-MMSC::module-0-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(5000, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("<messageId>SVC3002</messageId>"));

-		System.out.println(exception.getErrorMessage());

-	}

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteVfModuleFailure_5000() {

-		// A&AI failure (non-200) when attempting to delete a Vf Module

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c719, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a77

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c719</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC19</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a77</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC19-MMSC::module-1-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(5000, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("<messageId>SVC3002</messageId>"));

-		System.out.println(exception.getErrorMessage());

-	}

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteVfModuleFailure_1002_1() {

-		// failure attempting to delete Base Module when not the last Vf Module

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c720, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a74

-		String request =

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

-			"  <request-info>" + EOL +

-			"    <action>DELETE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id>" + EOL +

-			"    <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +

-			"    <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</vf-module-id>" + EOL +

-			"    <vf-module-name>STMTN5MMSC20-MMSC::module-0-0</vf-module-name>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest",request);

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("is Base Module, not Last Module"));

-		System.out.println(exception.getErrorMessage());

-	}

-

-	@Test	

-	@Deployment(resources = {

-			"subprocess/DeleteAAIVfModule.bpmn"

-		})

-	public void  TestDeleteVfModuleFailure_1002_2() {

-		// failure attempting to delete a Vf Module that does not exist (A&AI returns 404)

-		// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c720, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a76

-		MockAAIGenericVnfSearch();

-		MockAAIDeleteGenericVnf();

-		MockAAIDeleteVfModule();

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("DeleteAAIVfModuleRequest","<vnf-request xmlns=\"http://openecomp.org/mso/infra/vnf-request/v1\"> <request-info> <action>DELETE_VF_MODULE</action> <source>PORTAL</source> </request-info> <vnf-inputs> <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id> <vnf-name>STMTN5MMSC20</vnf-name> <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</vf-module-id> <vf-module-name>STMTN5MMSC20-MMSC::module-2-0</vf-module-name> </vnf-inputs> <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/> </vnf-request>");

-		runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);

-		WorkflowException exception = BPMNUtil.getRawVariable(processEngineRule, "DeleteAAIVfModule", "WorkflowException");

-		Assert.assertEquals(1002, exception.getErrorCode());

-		Assert.assertEquals(true, exception.getErrorMessage().contains("does not exist for Generic Vnf Id"));

-		System.out.println(exception.getErrorMessage());

-	}

-	

-	// Start of VF Modularization A&AI mocks

-	

-	public static void MockAAIGenericVnfSearch(){

-		String body;

-	

-		// The following stubs are for CreateAAIVfModule and UpdateAAIVfModule

-	

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC23&depth=1"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-	

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC22&depth=1"))

-				.willReturn(aResponse()

-						.withStatus(404)

-						.withHeader("Content-Type", "text/xml")

-						.withBody("Generic VNF Not Found")));

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/768073c7-f41f-4822-9323-b75962763d74[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(404)

-						.withHeader("Content-Type", "text/xml")

-						.withBody("Generic VNF Not Found")));

-	

-		body =

-			"<generic-vnf xmlns=\"http://com.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>1508691</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>1508692</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC21&depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		body =

-			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>1508691</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC20-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>1508692</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>1508692</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/[?]vnf-name=STMTN5MMSC20&depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		// The following stubs are for DeleteAAIVfModule

-	

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c723[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-	

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c722[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(404)

-						.withHeader("Content-Type", "text/xml")

-						.withBody("Generic VNF Not Found")));

-	

-		body =

-				"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-				"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +

-				"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +

-				"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-				"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-				"  <equipment-role>vMMSC</equipment-role>" + EOL +

-				"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-				"  <in-maint>false</in-maint>" + EOL +

-				"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-				"  <resource-version>0000021</resource-version>" + EOL +

-				"  <vf-modules>" + EOL +

-				"    <vf-module>" + EOL +

-				"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +

-				"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +

-				"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +

-				"      <persona-model-version>1.0</persona-model-version>" + EOL +

-				"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-				"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-				"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-				"      <resource-version>0000073</resource-version>" + EOL +

-				"    </vf-module>" + EOL +

-				"  </vf-modules>" + EOL +

-				"  <relationship-list/>" + EOL +

-				"  <l-interfaces/>" + EOL +

-				"  <lag-interfaces/>" + EOL +

-				"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		body =

-			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC20</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>0000020</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC20-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a74</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000074</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a75</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC20-MMSC::module-1-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a75</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000075</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		body =

-			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c719</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC19</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>0000019</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC19-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000076</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a77</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC19-MMSC::module-1-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a77</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>false</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000077</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		body =

-			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c718</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC18</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>0000018</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a78</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC18-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a78</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000078</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718[?]depth=1"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	

-		body =

-			"<generic-vnf xmlns=\"http://org.openecomp.aai.inventory/v7\">" + EOL +

-			"  <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id>" + EOL +

-			"  <vnf-name>STMTN5MMSC21</vnf-name>" + EOL +

-			"  <vnf-type>mmsc-capacity</vnf-type>" + EOL +

-			"  <service-id>SDN-MOBILITY</service-id>" + EOL +

-			"  <equipment-role>vMMSC</equipment-role>" + EOL +

-			"  <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"  <in-maint>false</in-maint>" + EOL +

-			"  <is-closed-loop-disabled>false</is-closed-loop-disabled>" + EOL +

-			"  <resource-version>0000021</resource-version>" + EOL +

-			"  <vf-modules>" + EOL +

-			"    <vf-module>" + EOL +

-			"      <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id>" + EOL +

-			"      <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name>" + EOL +

-			"      <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +

-			"      <persona-model-version>1.0</persona-model-version>" + EOL +

-			"      <is-base-vf-module>true</is-base-vf-module>" + EOL +

-			"      <heat-stack-id>FILLED-IN-BY-MSO</heat-stack-id>" + EOL +

-			"      <orchestration-status>pending-create</orchestration-status>" + EOL +

-			"      <resource-version>0000073</resource-version>" + EOL +

-			"    </vf-module>" + EOL +

-			"  </vf-modules>" + EOL +

-			"  <relationship-list/>" + EOL +

-			"  <l-interfaces/>" + EOL +

-			"  <lag-interfaces/>" + EOL +

-			"</generic-vnf>" + EOL;

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73"))

-				.willReturn(aResponse()

-						.withStatus(200)

-						.withHeader("Content-Type", "text/xml")

-						.withBody(body)));

-	}

-	public static void MockAAIDeleteGenericVnf(){

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/[?]resource-version=0000021"))

-				.willReturn(aResponse()

-						.withStatus(200)));

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/[?]resource-version=0000018"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-	}

-

-	public static void MockAAIDeleteVfModule(){

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c721/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a73/[?]resource-version=0000073"))

-				.willReturn(aResponse()

-						.withStatus(200)));

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c720/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a75/[?]resource-version=0000075"))

-				.willReturn(aResponse()

-						.withStatus(200)));

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c718/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a78/[?]resource-version=0000078"))

-				.willReturn(aResponse()

-						.withStatus(200)));

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/a27ce5a9-29c4-4c22-a017-6615ac73c719/vf-modules/vf-module/973ed047-d251-4fb9-bf1a-65b8949e0a77/[?]resource-version=0000077"))

-				.willReturn(aResponse()

-						.withStatus(500)

-						.withHeader("Content-Type", "text/xml")

-						.withBodyFile("aaiFault.xml")));

-		stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy\\?network-policy-fqdn=.*"))

-				  .willReturn(aResponse()

-				  .withStatus(200)

-				  .withHeader("Content-Type", "text/xml")

-				  .withBodyFile("VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml")));

-

-		stubFor(delete(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))

-				.willReturn(aResponse()

-						.withStatus(200)));

-	}

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
deleted file mode 100644
index c3259a0de5..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.post;

-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-

-/**

- * Unit test for FalloutHandler.bpmn.

- */

-public class FalloutHandlerTest extends WorkflowTest {

-	private void setupMocks() {

-		stubFor(post(urlEqualTo("/dbadapters/MsoRequestsDbAdapter"))

-				.willReturn(aResponse()

-				.withStatus(200)

-				.withHeader("Content-Type", "text/xml")

-				.withBody("<DbTag>Notified</DbTag>")));

-		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))

-				.willReturn(aResponse()

-				.withStatus(200)

-				.withHeader("Content-Type", "text/xml")

-				.withBody("<DbTag>Notified</DbTag>")));

-	}	

-	

-	private void executeFlow(String inputRequestFile) throws InterruptedException {

-		String method = getClass().getSimpleName() + "." + new Object() {

-		}.getClass().getEnclosingMethod().getName();

-		System.out.println("STARTED TEST: " + method);

-        

-		//String changeFeatureActivateRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/ChangeFeatureActivateV1/" + inputRequestFile);

-		Map<String, String> variables = new HashMap<>();

-		variables.put("FalloutHandlerRequest",inputRequestFile);

-		

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "FalloutHandler", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-		System.out.println("ENDED TEST: " + method);

-	}	

-	

-	@Test		

-	@Deployment(resources = {"subprocess/FalloutHandler.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoFalloutHandlerWithNotificationurl_200() throws Exception{

-		String method = getClass().getSimpleName() + "." + new Object() {

-		}.getClass().getEnclosingMethod().getName();

-		System.out.println("STARTED TEST: " + method);

-		

-		//Setup Mocks

-		setupMocks();

-		//Execute Flow

-		executeFlow(gMsoFalloutHandlerWithNotificationurl());

-		//Verify Error

-		String FH_ResponseCode = BPMNUtil.getVariable(processEngineRule, "FalloutHandler", "FH_ResponseCode");

-		Assert.assertEquals("200", FH_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "FalloutHandler", "FH_SuccessIndicator")); 

-	}

-	

-	public String gMsoFalloutHandlerWithNotificationurl() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns7=\"http://org.openecomp/mso/request/types/v1\">"

-				+ "		<ns7:request-information>"

-				+ "			<ns7:request-id>uCPE1020_STUW105_5002</ns7:request-id>"

-				+ "			<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>"

-				+ "			<ns7:request-sub-action>CANCEL</ns7:request-sub-action>"

-				+ "			<ns7:source>OMX</ns7:source>"

-				+ "			<ns7:notification-url>http://localhost:28090/CCD/StatusNotification</ns7:notification-url>"

-				+ "			<ns7:order-number>10205000</ns7:order-number>"

-				+ "			<ns7:order-version>1</ns7:order-version>"

-				+ "		</ns7:request-information>"

-				+ "		<sdncadapterworkflow:WorkflowException>"

-				+ "			<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>"

-				+ "			<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>"

-				+ "			<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>"

-				+ "		</sdncadapterworkflow:WorkflowException>"

-				+ "</sdncadapterworkflow:FalloutHandlerRequest>";

-		

-		return xml;

-

-	}	

-	

-

-

-

-	@Test		

-	@Deployment(resources = {"subprocess/FalloutHandler.bpmn"})

-	public void msoFalloutHandlerWithNoNotificationurl() throws Exception{

-		String method = getClass().getSimpleName() + "." + new Object() {

-		}.getClass().getEnclosingMethod().getName();

-		System.out.println("STARTED TEST: " + method);		

-		//Setup Mocks

-		setupMocks();

-		//Execute Flow

-		executeFlow(gMsoFalloutHandlerWithNoNotificationurl());

-		//Verify Error

-		String FH_ResponseCode = BPMNUtil.getVariable(processEngineRule, "FalloutHandler", "FH_ResponseCode");

-		Assert.assertEquals("200", FH_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "FalloutHandler", "FH_SuccessIndicator")); 

-	}

-	

-	public String gMsoFalloutHandlerWithNoNotificationurl() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns7=\"http://org.openecomp/mso/request/types/v1\">"

-				+ "		<ns7:request-information>"

-				+ "			<ns7:request-id>uCPE1020_STUW105_5002</ns7:request-id>"

-				+ "			<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>"

-				+ "			<ns7:request-sub-action>CANCEL</ns7:request-sub-action>"

-				+ "			<ns7:source>OMX</ns7:source>"

-				+ "			<ns7:notification-url></ns7:notification-url>"

-				+ "			<ns7:order-number>10205000</ns7:order-number>"

-				+ "			<ns7:order-version>1</ns7:order-version>"

-				+ "		</ns7:request-information>"

-				+ "		<sdncadapterworkflow:WorkflowException>"

-				+ "			<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>"

-				+ "			<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>"

-				+ "			<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>"

-				+ "		</sdncadapterworkflow:WorkflowException>"

-				+ "</sdncadapterworkflow:FalloutHandlerRequest>";

-		

-		return xml;

-	}	

-	

-	@Test		

-	@Deployment(resources = {"subprocess/FalloutHandler.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void msoFalloutHandlerWithNotificationurlNoRequestId() throws Exception{

-		String method = getClass().getSimpleName() + "." + new Object() {

-		}.getClass().getEnclosingMethod().getName();

-		System.out.println("STARTED TEST: " + method);		

-		//Setup Mocks

-		setupMocks();

-		//Execute Flow

-		executeFlow(gMsoFalloutHandlerWithNotificationurlNoRequestId());

-		//Verify Error		

-		String FH_ResponseCode = BPMNUtil.getVariable(processEngineRule, "FalloutHandler", "FH_ResponseCode");

-		Assert.assertEquals("200", FH_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "FalloutHandler", "FH_SuccessIndicator")); 

-	}

-

-	public String gMsoFalloutHandlerWithNotificationurlNoRequestId() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns7=\"http://org.openecomp/mso/request/types/v1\">"

-				+ "		<ns7:request-information>"

-				+ "			<ns7:request-id></ns7:request-id>"

-				+ "			<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>"

-				+ "			<ns7:request-sub-action>CANCEL</ns7:request-sub-action>"

-				+ "			<ns7:source>OMX</ns7:source>"

-				+ "			<ns7:notification-url>www.test.com</ns7:notification-url>"

-				+ "			<ns7:order-number>10205000</ns7:order-number>"

-				+ "			<ns7:order-version>1</ns7:order-version>"

-				+ "		</ns7:request-information>"

-				+ "		<sdncadapterworkflow:WorkflowException>"

-				+ "			<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>"

-				+ "			<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>"

-				+ "			<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>"

-				+ "		</sdncadapterworkflow:WorkflowException>"

-				+ "</sdncadapterworkflow:FalloutHandlerRequest>";

-		

-		return xml;

-	}		

-	

-	@Test		

-	@Deployment(resources = {"subprocess/FalloutHandler.bpmn"})

-	public void msoFalloutHandlerWithNoNotificationurlNoRequestId() throws Exception{

-		String method = getClass().getSimpleName() + "." + new Object() {

-		}.getClass().getEnclosingMethod().getName();

-		System.out.println("STARTED TEST: " + method);		

-		//Setup Mocks

-		setupMocks();

-		//Execute Flow

-		executeFlow(gMsoFalloutHandlerWithNoNotificationurlNoRequestId());

-		//Verify Error

-		String FH_ResponseCode = BPMNUtil.getVariable(processEngineRule, "FalloutHandler", "FH_ResponseCode");

-		Assert.assertEquals("200", FH_ResponseCode);

-		Assert.assertTrue((boolean) BPMNUtil.getRawVariable(processEngineRule, "FalloutHandler", "FH_SuccessIndicator")); 

-	}	

-	

-	public String gMsoFalloutHandlerWithNoNotificationurlNoRequestId() {

-		//Generated the below XML from ActiveVOS moduler ... Using the generate sample XML feature in ActiveVOS

-		String xml = ""

-				+ "<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns7=\"http://org.openecomp/mso/request/types/v1\">"

-				+ "		<ns7:request-information>"

-				+ "			<ns7:request-id></ns7:request-id>"

-				+ "			<ns7:request-action>Layer3ServiceActivateRequest</ns7:request-action>"

-				+ "			<ns7:request-sub-action>CANCEL</ns7:request-sub-action>"

-				+ "			<ns7:source>OMX</ns7:source>"

-				+ "			<ns7:notification-url></ns7:notification-url>"

-				+ "			<ns7:order-number>10205000</ns7:order-number>"

-				+ "			<ns7:order-version>1</ns7:order-version>"

-				+ "		</ns7:request-information>"

-				+ "		<sdncadapterworkflow:WorkflowException>"

-				+ "			<sdncadapterworkflow:ErrorMessage>Some Error Message - Fallout Handler</sdncadapterworkflow:ErrorMessage>"

-				+ "			<sdncadapterworkflow:ErrorCode>Some Error Code - Fallout Handler</sdncadapterworkflow:ErrorCode>"

-				+ "			<sdncadapterworkflow:SourceSystemErrorCode>Some Source System Error Code- Fallout Handler</sdncadapterworkflow:SourceSystemErrorCode>"

-				+ "		</sdncadapterworkflow:WorkflowException>"

-				+ "</sdncadapterworkflow:FalloutHandlerRequest>";

-		

-		return xml;

-	}	

-	

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenerateVfModuleNameTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenerateVfModuleNameTest.java
deleted file mode 100644
index 051d935527..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenerateVfModuleNameTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common;

-

-import static org.junit.Assert.assertNotNull;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Test;

-

-/**

- * Unit test for GenerateVfModuleName.bpmn.

- */

-public class GenerateVfModuleNameTest extends WorkflowTest {

-	private static final String EOL = "\n";

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/GenerateVfModuleName.bpmn"

-		})

-	public void  TestGenerateVfModuleNameSuvvess() {

-		// 

-		String request =

-			"<vnf-request xmlns=\"http://ecomp.att.com/mso/infra/vnf-request/v1\">" + EOL +

-			"  <request-info>" + EOL +

-			"    <action>CREATE_VF_MODULE</action>" + EOL +

-			"    <source>PORTAL</source>" + EOL +

-			"  </request-info>" + EOL +

-			"  <vnf-inputs>" + EOL +

-			"    <vnf-name>STMTN5MMSC22</vnf-name>" + EOL +

-			"    <vf-module-name>STMTN5MMSC22-MMSC::module-0-0</vf-module-name>" + EOL +

-			"    <vf-module-model-name>MMSC::module-0</vf-module-model-name>" + EOL +

-			"    <persona-model-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</persona-model-id>" + EOL +

-			"    <persona-model-version>1.0</persona-model-version>" + EOL +

-			"    <service-id>00000000-0000-0000-0000-000000000000</service-id>" + EOL +

-			"    <aic-node-clli>MDTWNJ21</aic-node-clli>" + EOL +

-			"    <tenant-id>fba1bd1e195a404cacb9ce17a9b2b421</tenant-id>" + EOL +

-			"  </vnf-inputs>" + EOL +

-			"  <vnf-params xmlns:tns=\"http://ecomp.att.com/mso/infra/vnf-request/v1\"/>" + EOL +

-			"</vnf-request>" + EOL;

-

-		MockGetGenericVnfById(".*", "GenericFlows/getGenericVnfByNameResponse.xml");

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<String, Object>();		

-		variables.put("isDebugLogEnabled","true");		

-		variables.put("vnfName", "STMTN5MMSC20");

-		variables.put("vfModuleLabel", "ModuleLabel1");

-		variables.put("personaModelId", "extrovert");

-		variables.put("vnfId", "12345678-f41f-4822-9323-b75962763d74");

-		

-		runtimeService.startProcessInstanceByKey("GenerateVfModuleName", variables);

-		String response = BPMNUtil.getVariable(processEngineRule, "GenerateVfModuleName", "vfModuleName");

-		

-		assertNotNull(response);

-	}

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
deleted file mode 100644
index 67ac34c1d0..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteServiceInstance;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteServiceInstance_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-
-
-/**
- * Please describe the GenericDeleteServiceTest.java class
- *
- */
-public class GenericDeleteServiceTest extends WorkflowTest {
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_serviceInstance() throws Exception{
-		MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-		assertEquals("true", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("true", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-	}
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_serviceSubscription() throws Exception{
-
-		MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 204);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("true", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("true", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_instanceNoResourceVersion() throws Exception {
-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceSubscription.xml");
-		MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("true", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("false", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_subscriptionNoResourceVersion() throws Exception{
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");
-		MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 204);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesSubscription(variables, null, "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("true", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("false", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_get404Response() throws Exception{
-
-		MockGetServiceInstance_404("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("false", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("false", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_subscriptionGetEmpty200() throws Exception{
-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 200);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("false", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("false", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_success_delete404Response() throws Exception{
-
-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GENDSI_getServiceInstanceResponse.xml");
-		MockDeleteServiceInstance_404("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		assertEquals("false", foundIndicator);
-		assertEquals("true", successIndicator);
-		assertEquals("true", resourceVersionProvidedFlag);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_error_invalidVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "1234");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		String expectedResponse = "WorkflowException[processKey=GenericDeleteService,errorCode=500,errorMessage=Incoming Required Variable is Missing or Null!]";
-
-		assertEquals("false", foundIndicator);
-		assertEquals("false", successIndicator);
-		assertEquals("true", resourceVersionProvidedFlag);
-		assertEquals(expectedResponse, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
-	public void testGenericDeleteService_error_getBadAAIResponse() throws Exception{
-
-		MockGetServiceInstance_500("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "aaiFault.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
-		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
-		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "WorkflowException");
-
-		String expectedResponse = "WorkflowException[processKey=GenericDeleteService,errorCode=500,errorMessage=<requestError><serviceException><messageId>SVC3002</messageId><text>Error writing output performing %1 on %2 (msg=%3) (ec=%4)</text><variables><variable>PUTcustomer</variable><variable>SubName01</variable><variable>Unexpected error reading/updating database:Adding this property for key [service-instance-id] and value [USSTU2CFCNC0101UJZZ01] violates a uniqueness constraint [service-instance-id]</variable><variable>ERR.5.4.5105</variable></variables></serviceException></requestError>" + "\n" +
-		"]";
-
-		assertEquals("false", foundIndicator);
-		assertEquals("false", successIndicator);
-		assertEquals("false", resourceVersionProvidedFlag);
-		assertEquals(expectedResponse, workflowException);
-	}
-
-
-	private void setVariablesInstance(Map<String, String> variables, String siId, String globalCustId, String serviceType, String reVersion) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENDS_serviceInstanceId", siId);
-		variables.put("GENDS_globalCustomerId",globalCustId);
-		variables.put("GENDS_serviceType", serviceType);
-		variables.put("GENDS_resourceVersion", reVersion);
-		variables.put("GENDS_type", "service-instance");
-	}
-
-	private void setVariablesSubscription(Map<String, String> variables, String siId, String globalCustId, String serviceType, String reVersion) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENDS_serviceInstanceId", siId);
-		variables.put("GENDS_globalCustomerId",globalCustId);
-		variables.put("GENDS_serviceType", serviceType);
-		variables.put("GENDS_resourceVersion", reVersion);
-		variables.put("GENDS_type", "service-subscription");
-	}
-
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
deleted file mode 100644
index a318be5b10..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteGenericVnf;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteGenericVnf_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteVce;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVceById;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-/**
- * Please describe the GenericDeleteVnfTest.java class
- *
- */
-public class GenericDeleteVnfTest extends WorkflowTest {
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_genericVnf() throws Exception{
-		MockDeleteGenericVnf("testVnfId123", "testReVer123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "true", "true", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_vce() throws Exception{
-		MockDeleteVce("testVnfId123", "testReVer123", 204);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "vce", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "true", "true", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_genericVnfNoResourceVersion() throws Exception{
-
-		MockGetGenericVnfById("/testVnfId123", "GenericFlows/getGenericVnfByNameResponse.xml", 200);
-		MockDeleteGenericVnf("testVnfId123", "testReVer123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "true", "false", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_vceNoResourceVersion() throws Exception{
-		MockDeleteVce("testVnfId123", "testReVer123", 204);
-		MockGetVceById("testVnfId123", "GenericFlows/getVceResponse.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "vce", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "true", "false", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_genericVnf404() throws Exception{
-		MockDeleteGenericVnf("testVnfId123", "testReVer123", 404);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "false", "true", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_vce404() throws Exception{
-		MockDeleteVce("testVnfId123", "testReVer123", 404);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "vce", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "false", "true", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_success_genericVnfNoResourceVersion404() throws Exception{
-		MockGetGenericVnfById_404("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("true", "false", "false", null);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_error_missingVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Incoming Required Variable is Missing or Null!]");
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_error_genericVnf500() throws Exception{
-
-		MockDeleteGenericVnf_500("testVnfId123", "testReVer123");
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Received a bad response from AAI]");
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
-	public void testGenericDeleteVnf_error_genericVnf412() throws Exception{
-		MockDeleteGenericVnf("testVnfId123", "testReVer123", 412);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=412,errorMessage=Delete Vnf Received a resource-version Mismatch Error Response from AAI]");
-
-	}
-
-	private void assertVariables(String exSuccessIndicator, String exFound, String exRVProvided, String exWorkflowException) {
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteVnf", "GENDV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericDeleteVnf", "GENDV_FoundIndicator");
-		String rvProvided = BPMNUtil.getVariable(processEngineRule, "GenericDeleteVnf", "GENDV_resourceVersionProvided");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericDeleteVnf", "WorkflowException");
-
-		assertEquals(exSuccessIndicator, successIndicator);
-		assertEquals(exFound, found);
-		assertEquals(exRVProvided, rvProvided);
-		assertEquals(exWorkflowException, workflowException);
-	}
-
-	private void setVariables(Map<String, String> variables, String vnfId, String type, String resourceVer) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENDV_vnfId", vnfId);
-		variables.put("GENDV_type", type);
-		variables.put("GENDV_resourceVersion", resourceVer);
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
deleted file mode 100644
index 6da6924d11..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*

- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.

- */

-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-

-

-/**

- * Unit Test for the GenericGetService Sub Flow

- */

-public class GenericGetServiceTest extends WorkflowTest {

-

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstance() throws Exception{

-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		assertEquals("true", successIndicator);

-		assertEquals("true", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertNotNull(response);

-		assertEquals(null, workflowException);

-	}

-

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceSubscription() throws Exception{

-

-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-

-		assertEquals("true", successIndicator);

-		assertEquals("true", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertNotNull(response);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstance_byName() throws Exception{

-

-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");

-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("true", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("true", byName);

-		assertNotNull(response);

-		assertEquals("200", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstance_byId() throws Exception{

-

-		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");

-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("true", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("false", byName);

-		assertNotNull(response);

-		assertEquals("200", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{

-

-		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceSubscription404() throws Exception{

-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);

-		

-		Map<String, String> variables = new HashMap<>();

-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertNotNull(response);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{

-

-		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("true", byName);

-		assertEquals("404", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstanceById404() throws Exception{

-

-		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals("404", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{

-

-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{

-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");

-		

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("true", byName);

-		assertEquals("200", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{

-

-	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals("200", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-

-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.]";

-

-		assertEquals("false", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals(expectedWorkflowException, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-

-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.]";

-

-

-		assertEquals("false", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals(expectedWorkflowException, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{

-

-		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-

-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

-

-		assertEquals("false", successIndicator);

-		assertEquals("false", found);

-		assertEquals("false", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals(expectedWorkflowException, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{

-

-		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

-

-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

-

-		assertEquals("false", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("false", byName);

-		assertEquals("500", siUrlResponseCode);

-		assertEquals(expectedWorkflowException, workflowException);

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{

-

-		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

-

-		assertEquals("false", successIndicator);

-		assertEquals("false", found);

-		assertEquals("true", obtainUrl);

-		assertEquals("true", byName);

-		assertEquals("500", siUrlResponseCode);

-		assertEquals(expectedWorkflowException, workflowException);

-	}

-

-    @Test

-    @Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-    public void testGenericGetService_success_serviceInstance_byNameServicePresent() throws Exception{

-

-        MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");

-        MockGetServiceInstance("XyCorporation", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

-

-        Map<String, String> variables = new HashMap<>();

-        setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null);

-

-        WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-        waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-        String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-        String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-        String resourceLink = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_resourceLink");

-        String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-        String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-        String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-        assertEquals("true", successIndicator);

-        assertEquals("true", found);

-		assertNotNull(resourceLink);

-        assertNotNull(response);

-        assertEquals("200", siUrlResponseCode);

-        assertEquals(null, workflowException);

-    }

-

-	@Test

-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

-	public void testGenericGetService_success_serviceInstance_byNameServiceNotPresent() throws Exception{

-

-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");

-		MockGetServiceInstance("CorporationNotPresent", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

-

-		Map<String, String> variables = new HashMap<>();

-		setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null);

-

-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

-

-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

-		String resourceLink = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_resourceLink");

-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

-

-		assertEquals("true", successIndicator);

-		assertEquals("false", found);

-		assertEquals(null, resourceLink);

-		assertEquals("  ", response);

-		assertEquals("200", siUrlResponseCode);

-		assertEquals(null, workflowException);

-	}

-

-	private void setVariablesInstance(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

-		variables.put("isDebugLogEnabled", "true");

-		variables.put("GENGS_serviceInstanceId", siId);

-		variables.put("GENGS_serviceInstanceName", siName);

-		variables.put("GENGS_globalCustomerId",globalCustId);

-		variables.put("GENGS_serviceType", serviceType);

-		variables.put("GENGS_type", "service-instance");

-	}

-

-	private void setVariablesSubscription(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

-		variables.put("isDebugLogEnabled", "true");

-		variables.put("GENGS_serviceInstanceId", siId);

-		variables.put("GENGS_serviceInstanceName", siName);

-		variables.put("GENGS_globalCustomerId",globalCustId);

-		variables.put("GENGS_serviceType", serviceType);

-		variables.put("GENGS_type", "service-subscription");

-	}

-

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
deleted file mode 100644
index 7de493a621..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByNameWithDepth;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVceByNameWithDepth;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVceById;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-/**
- * Please describe the GenericGetVnfTest.java class
- *
- */
-public class GenericGetVnfTest extends WorkflowTest {
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetVnf.bpmn"})
-	public void testGenericGetVnf_success_genericVnf() throws Exception{
-		MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfByNameResponse.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
-		String vnf = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_vnf");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_getVnfByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertNotNull(vnf);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetVnf.bpmn"})
-	public void testGenericGetVnf_success_vce() throws Exception{
-		MockGetVceById("testVnfId123[?]depth=1", "GenericFlows/getVceResponse.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "testVnfName123", "vce");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
-		String vnf = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_vnf");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_getVnfByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertNotNull(vnf);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetVnf.bpmn"})
-	public void testGenericGetVnf_success_genericVnfByName() throws Exception{
-		MockGetGenericVnfByNameWithDepth("testVnfName123", 1, "GenericFlows/getGenericVnfResponse.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "", "testVnfName123", "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
-		String vnf = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_vnf");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_getVnfByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", byName);
-		assertNotNull(response);
-		assertNotNull(vnf);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetVnf.bpmn"})
-	public void testGenericGetVnf_success_vceByName() throws Exception{
-		MockGetGenericVceByNameWithDepth("testVnfName123", 1, "GenericFlows/getVceByNameResponse.xml");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, null, "testVnfName123", "vce");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
-		String vnf = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_vnf");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_getVnfByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", byName);
-		assertNotNull(response);
-		assertNotNull(vnf);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Ignore // BROKEN TEST (previously ignored)
-	@Deployment(resources = {"subprocess/GenericGetVnf.bpmn"})
-	public void testGenericGetVnf_error_genericVnf500() throws Exception{
-
-		MockGetGenericVnfById_500("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "WorkflowException");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_getVnfByName");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetVnf,errorCode=500,errorMessage=Incoming VnfId and VnfName are null. VnfId or VnfName is required!]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", byName);
-
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	private void setVariables(Map<String, String> variables, String vnfId, String vnfName, String type) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGV_vnfId", vnfId);
-		variables.put("GENGV_vnfName",vnfName);
-		variables.put("GENGV_type", type);
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
deleted file mode 100644
index 7c003c986a..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVce;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-/**
- * Please describe the GenericPutVnf.java class
- *
- */
-public class GenericPutVnfTest extends WorkflowTest {
-
-	private String genericVnfPayload = "<generic-vnf><vnf-id>testId</vnf-id></generic-vnf>";
-	private String vcePayload = "<vce><vnf-id>testId</vnf-id></vce>";
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_success_genericVnf() throws Exception{
-
-		MockPutGenericVnf("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_success_vce() throws Exception{
-
-		MockPutVce("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", vcePayload, "vce");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals(null, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_error_missingType() throws Exception{
-
-		MockPutGenericVnf("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", genericVnfPayload, "");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		String expectedWFEX = "WorkflowException[processKey=GenericPutVnf,errorCode=500,errorMessage=Incoming Vnf Payload and/or Type is null. These Variables are required!]";
-
-		assertEquals("false", successIndicator);
-		assertEquals(expectedWFEX, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_error_missingPayload() throws Exception{
-
-		MockPutGenericVnf("testVnfId123");
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", genericVnfPayload, "");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		String expectedWFEX = "WorkflowException[processKey=GenericPutVnf,errorCode=500,errorMessage=Incoming Vnf Payload and/or Type is null. These Variables are required!]";
-
-		assertEquals("false", successIndicator);
-		assertEquals(expectedWFEX, workflowException);
-
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_error_404() throws Exception{
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		String expectedWFEX = "WorkflowException[processKey=GenericPutVnf,errorCode=404,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals(expectedWFEX, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
-	public void testGenericPutVnf_error_400() throws Exception{
-
-		MockPutGenericVnf("/testVnfId123", 400);
-
-		Map<String, String> variables = new HashMap<>();
-		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
-
-		String expectedWFEX = "WorkflowException[processKey=GenericPutVnf,errorCode=400,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals(expectedWFEX, workflowException);
-
-
-	}
-
-	private void setVariables(Map<String, String> variables, String vnfId, String payload, String type) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENPV_vnfId", vnfId);
-		variables.put("GENPV_vnfPayload",payload);
-		variables.put("GENPV_type", type);
-	}
-
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ManualHandlingTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ManualHandlingTest.java
deleted file mode 100644
index 85a0bb789d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ManualHandlingTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-
-import org.camunda.bpm.engine.TaskService;
-import org.camunda.bpm.ProcessEngineService;
-import org.camunda.bpm.engine.task.TaskQuery;
-import org.camunda.bpm.engine.task.Task;
-import org.camunda.bpm.engine.delegate.BpmnError;
-import org.camunda.bpm.engine.delegate.DelegateTask;
-import org.camunda.bpm.engine.runtime.Execution;
-
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.put;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponsePolicy.MockPolicyAbort;
-
-import java.io.DataOutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.List;
-
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-import org.openecomp.mso.bpmn.core.WorkflowException;
-
-/**
- * Unit test for RainyDayHandler.bpmn.
- */
-public class ManualHandlingTest extends WorkflowTest {
-	
-	@Test	
-	@Deployment(resources = {			
-			"subprocess/BuildingBlock/ManualHandling.bpmn"
-		})
-	public void  TestManualHandlingSuccess() {
-
-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("isDebugLogEnabled","true");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceType", "X");
-		variables.put("vnfType", "Y");
-		variables.put("currentActivity", "BB1");		
-		variables.put("workStep", "1");
-		variables.put("failedActivity", "AAI");
-		variables.put("vnfName", "vSAMP12");
-		variables.put("errorCode", "123");
-		variables.put("errorText", "update failed");
-		variables.put("validResponses", "Rollback");
-		variables.put("vnfName", "vSAMP1");
-		
-
-		String businessKey = UUID.randomUUID().toString();
-		invokeSubProcess("ManualHandling", businessKey, variables);
-		
-		try {
-			Thread.sleep(5);
-		} catch (Exception e) {
-			
-		}
-		
-		TaskService taskService = processEngineRule.getTaskService();
-		
-		TaskQuery q = taskService.createTaskQuery();		
-	
-		List<Task> tasks = q.orderByTaskCreateTime().asc().list();
-		  int i = 0;
-		  
-		  for (Task task : tasks) {		  
-			 
-		    
-		        System.out.println("TASK ID: " + task.getId());
-		        System.out.println("TASK NAME: " + task.getName());
-		        try {
-		        	System.out.println("Completing the task");
-		        	Map<String,Object> completeVariables = new HashMap<>();
-		        	completeVariables.put("responseValue", "skip");
-		        	taskService.complete(task.getId(), completeVariables);		        
-		        }
-		        catch(Exception e) {
-		        	System.out.println("GOT EXCEPTION: " + e.getMessage());
-		        }		        
-		 	}	
-
-		waitForProcessEnd(businessKey, 100000);
-
-		Assert.assertTrue(isProcessEnded(businessKey));
-		
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
deleted file mode 100644
index 1f64fb55f8..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
+++ /dev/null
@@ -1,781 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-package org.openecomp.mso.bpmn.common;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.core.WorkflowException;
-import org.openecomp.mso.bpmn.core.domain.AllottedResource;
-import org.openecomp.mso.bpmn.core.domain.CloudFlavor;
-import org.openecomp.mso.bpmn.core.domain.HomingSolution;
-import org.openecomp.mso.bpmn.core.domain.ModelInfo;
-import org.openecomp.mso.bpmn.core.domain.NetworkResource;
-import org.openecomp.mso.bpmn.core.domain.Resource;
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;
-import org.openecomp.mso.bpmn.core.domain.ServiceInstance;
-import org.openecomp.mso.bpmn.core.domain.VnfResource;
-import org.openecomp.mso.bpmn.mock.FileUtil;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.MockGetServiceResourcesCatalogDataByModelUuid;
-import static org.openecomp.mso.bpmn.mock.StubResponseOof.mockOof;
-import static org.openecomp.mso.bpmn.mock.StubResponseOof.mockOof_500;
-
-
-/**
- * Test the OOF Homing subflow building block.
- */
-public class OofHomingTest extends WorkflowTest {
-
-    ServiceDecomposition serviceDecomposition = new ServiceDecomposition();
-    String subscriber = "";
-    String subscriber2 = "";
-
-    private final CallbackSet callbacks = new CallbackSet();
-
-    public OofHomingTest() throws IOException {
-        String oofCallback = FileUtil.readResourceFile("__files/BuildingBlocks/oofCallbackInfraVnf");
-        String oofCallback2 = FileUtil.readResourceFile("__files/BuildingBlocks/oofCallback2AR1Vnf");
-        String oofCallback3 = FileUtil.readResourceFile("__files/BuildingBlocks/oofCallback2AR1Vnf2Net");
-
-        String oofCallbackNoSolution = FileUtil.
-                readResourceFile("__files/BuildingBlocks/oofCallbackNoSolutionFound");
-        String oofCallbackPolicyException = FileUtil.
-                readResourceFile("__files/BuildingBlocks/oofCallbackPolicyException");
-        String oofCallbackServiceException = FileUtil.
-                readResourceFile("__files/BuildingBlocks/oofCallbackServiceException");
-
-        callbacks.put("oof", JSON, "oofResponse", oofCallback);
-        callbacks.put("oof2", JSON, "oofResponse", oofCallback2);
-        callbacks.put("oof3", JSON, "oofResponse", oofCallback3);
-        callbacks.put("oofNoSol", JSON, "oofResponse", oofCallbackNoSolution);
-        callbacks.put("oofPolicyEx", JSON, "oofResponse", oofCallbackPolicyException);
-        callbacks.put("oofServiceEx", JSON, "oofResponse", oofCallbackServiceException);
-
-        // Service Model
-        ModelInfo sModel = new ModelInfo();
-        sModel.setModelCustomizationName("testModelCustomizationName");
-        sModel.setModelInstanceName("testModelInstanceName");
-        sModel.setModelInvariantUuid("testModelInvariantId");
-        sModel.setModelName("testModelName");
-        sModel.setModelUuid("testModelUuid");
-        sModel.setModelVersion("testModelVersion");
-        // Service Instance
-        ServiceInstance si = new ServiceInstance();
-        si.setInstanceId("testServiceInstanceId123");
-        // Allotted Resources
-        List<AllottedResource> arList = new ArrayList<AllottedResource>();
-        AllottedResource ar = new AllottedResource();
-        ar.setResourceId("testResourceIdAR");
-        ar.setNfFunction("testARFunctionName");
-        ModelInfo arModel = new ModelInfo();
-        arModel.setModelCustomizationUuid("testModelCustomizationUuidAR");
-        arModel.setModelInvariantUuid("testModelInvariantIdAR");
-        arModel.setModelName("testModelNameAR");
-        arModel.setModelVersion("testModelVersionAR");
-        arModel.setModelUuid("testARModelUuid");
-        arModel.setModelType("testModelTypeAR");
-        ar.setModelInfo(arModel);
-        AllottedResource ar2 = new AllottedResource();
-        ar2.setResourceId("testResourceIdAR2");
-        ar2.setNfFunction("testAR2FunctionName");
-        ModelInfo arModel2 = new ModelInfo();
-        arModel2.setModelCustomizationUuid("testModelCustomizationUuidAR2");
-        arModel2.setModelInvariantUuid("testModelInvariantIdAR2");
-        arModel2.setModelName("testModelNameAR2");
-        arModel2.setModelVersion("testModelVersionAR2");
-        arModel2.setModelUuid("testAr2ModelUuid");
-        arModel2.setModelType("testModelTypeAR2");
-        ar2.setModelInfo(arModel2);
-        arList.add(ar);
-        arList.add(ar2);
-        // Vnfs
-        List<VnfResource> vnfList = new ArrayList<VnfResource>();
-        VnfResource vnf = new VnfResource();
-        vnf.setResourceId("testResourceIdVNF");
-        vnf.setNfFunction("testVnfFunctionName");
-        ArrayList<CloudFlavor> flavors = new ArrayList<>();
-        CloudFlavor flavor1 = new CloudFlavor("flavorLabel1xxx", "vimFlavorxxx");
-        CloudFlavor flavor2 = new CloudFlavor("flavorLabel2xxx", "vimFlavorxxx");
-        flavors.add(flavor1);
-        flavors.add(flavor2);
-        vnf.getHomingSolution().setFlavors(flavors);
-        ModelInfo vnfModel = new ModelInfo();
-        vnfModel.setModelCustomizationUuid("testModelCustomizationUuidVNF");
-        vnfModel.setModelInvariantUuid("testModelInvariantIdVNF");
-        vnfModel.setModelName("testModelNameVNF");
-        vnfModel.setModelVersion("testModelVersionVNF");
-        vnfModel.setModelUuid("testVnfModelUuid");
-        vnfModel.setModelType("testModelTypeVNF");
-        vnf.setModelInfo(vnfModel);
-        vnfList.add(vnf);
-        System.out.println("SERVICE DECOMP: " + serviceDecomposition.getServiceResourcesJsonString());
-        serviceDecomposition.setModelInfo(sModel);
-        serviceDecomposition.setServiceAllottedResources(arList);
-        serviceDecomposition.setServiceVnfs(vnfList);
-        serviceDecomposition.setServiceInstance(si);
-
-        // Subscriber
-        subscriber = "{\"globalSubscriberId\": \"SUB12_0322_DS_1201\",\"subscriberCommonSiteId\": \"DALTX0101\",\"subscriberName\": \"SUB_12_0322_DS_1201\"}";
-        subscriber2 = "{\"globalSubscriberId\": \"SUB12_0322_DS_1201\",\"subscriberName\": \"SUB_12_0322_DS_1201\"}";
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_success_2AR1Vnf() throws Exception {
-
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "oof2");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-        ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey,
-                "serviceDecomposition");
-        String expectedOofRequest = (String) getVariableFromHistory(businessKey, "oofRequest");
-
-        Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-        HomingSolution resourceARHoming = resourceAR.getHomingSolution();
-        Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-        HomingSolution resourceARHoming2 = resourceAR2.getHomingSolution();
-        Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-        HomingSolution resourceVNFHoming = resourceVNF.getHomingSolution();
-        String resourceARHomingString = resourceARHoming.toString();
-        resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-        String resourceARHoming2String = resourceARHoming2.toString();
-        resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-        String resourceVNFHomingString = resourceVNFHoming.toString();
-        resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-        expectedOofRequest = expectedOofRequest.replaceAll("\\s+", "");
-
-        assertNull(workflowException);
-        assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01",
-                resourceARHoming.getVnf().getResourceId(),"aic", "dfwtx",
-                "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceARHomingString);
-        assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2",
-                resourceARHoming2.getVnf().getResourceId(),"aic", "testCloudRegionId2",
-                null, null), resourceARHoming2String);
-        assertEquals(homingSolutionCloud("cloud","aic", "testCloudRegionId3",
-                true, "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceVNFHomingString);
-        assertEquals(verifyOofRequest(), expectedOofRequest);
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_success_2AR1Vnf2Net() throws Exception {
-
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables2(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "oof3");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-        ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey,
-                "serviceDecomposition");
-        String expectedOofRequest = (String) getVariableFromHistory(businessKey, "oofRequest");
-
-        Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-        HomingSolution resourceARHoming = resourceAR.getHomingSolution();
-        Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-        HomingSolution resourceARHoming2 = resourceAR2.getHomingSolution();
-        Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-        HomingSolution resourceVNFHoming = resourceVNF.getHomingSolution();
-        Resource resourceNet = serviceDecompositionExp.getServiceResource("testResourceIdNet");
-        HomingSolution resourceNetHoming = resourceNet.getHomingSolution();
-        Resource resourceNet2 = serviceDecompositionExp.getServiceResource("testResourceIdNet2");
-        HomingSolution resourceNetHoming2 = resourceNet2.getHomingSolution();
-
-        String resourceARHomingString = resourceARHoming.toString();
-        resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-        String resourceARHoming2String = resourceARHoming2.toString();
-        resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-        String resourceVNFHomingString = resourceVNFHoming.toString();
-        resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-        String resourceNetHomingString = resourceNetHoming.toString();
-        resourceNetHomingString = resourceNetHomingString.replaceAll("\\s+", " ");
-        String resourceNetHoming2String = resourceNetHoming2.toString();
-        resourceNetHoming2String = resourceNetHoming2String.replaceAll("\\s+", " ");
-        expectedOofRequest = expectedOofRequest.replaceAll("\\s+", "");
-
-
-        assertNull(workflowException);
-        assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01",
-                resourceARHoming.getVnf().getResourceId(),"aic", "dfwtx",
-                "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceARHomingString);
-        assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2",
-                resourceARHoming2.getVnf().getResourceId(),
-                "aic", "testCloudRegionId2",
-                null, null), resourceARHoming2String);
-        assertEquals(homingSolutionCloud("cloud","aic",
-                "testCloudRegionId3",
-                true, "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceVNFHomingString);
-        assertEquals(homingSolutionService("service", "testServiceInstanceIdNet",
-                "testVnfHostNameNet", resourceNetHoming.getVnf().getResourceId(),"aic",
-                "testCloudRegionIdNet",
-                null, null), resourceNetHomingString);
-        assertEquals(homingSolutionCloud("cloud", "aic",
-                "testCloudRegionIdNet2",
-                false, "\"f1d563e8-e714-4393-8f99-cc480144a05n\", \"j1d563e8-e714-4393-8f99-cc480144a05n\"",
-                "\"s1d563e8-e714-4393-8f99-cc480144a05n\", \"b1d563e8-e714-4393-8f99-cc480144a05n\""),
-                resourceNetHoming2String);
-        assertEquals(verifyOofRequest(), expectedOofRequest);
-
-    }
-
-    @Test
-    @Ignore
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/BuildingBlock/DecomposeService.bpmn",
-            "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_success_vnfResourceList() throws Exception {
-
-        // Create a Service Decomposition
-        MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4",
-                "/BuildingBlocks/oofCatalogResp.json");
-        String busKey = UUID.randomUUID().toString();
-        Map<String, Object> vars = new HashMap<>();
-        setVariablesForServiceDecomposition(vars, "testRequestId123",
-                "ff5256d2-5a33-55df-13ab-12abad84e7ff");
-        invokeSubProcess("DecomposeService", busKey, vars);
-
-        ServiceDecomposition sd = (ServiceDecomposition) getVariableFromHistory(busKey,
-                "serviceDecomposition");
-        System.out.println("In testHoming_success_vnfResourceList, ServiceDecomposition = " + sd);
-        List<VnfResource> vnfResourceList = sd.getServiceVnfs();
-//System.out.println(" vnfResourceList = " + vnfResourceList);
-        vnfResourceList.get(0).setResourceId("test-resource-id-000");
-
-        // Invoke Homing
-
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        variables.put("homingService", "oof");
-        variables.put("isDebugLogEnabled", "true");
-        variables.put("msoRequestId", "testRequestId");
-        variables.put("serviceInstanceId", "testServiceInstanceId");
-        variables.put("serviceDecomposition", sd);
-        variables.put("subscriberInfo", subscriber2);
-        HashMap customerLocation = new HashMap<String, Object>();
-        customerLocation.put("customerLatitude", "32.89748");
-        customerLocation.put("customerLongitude", "-97.040443");
-        customerLocation.put("customerName", "xyz");
-        variables.put("customerLatitude", "32.89748");
-        variables.put("customerLongitude", "-97.040443");
-        variables.put("customerName", "xyz");
-        variables.put("customerLocation", customerLocation);
-        variables.put("cloudOwner", "amazon");
-        variables.put("cloudRegionId", "TNZED");
-
-        invokeSubProcess("Homing", businessKey, variables);
-        injectWorkflowMessages(callbacks, "oof3");
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-        ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey,
-                "serviceDecomposition");
-        System.out.println("serviceDecompositionExp is: " + serviceDecompositionExp);
-
-        Resource resourceVnf = serviceDecompositionExp.getServiceResource("test-resource-id-000");
-        System.out.println("resourceVnf is: " + resourceVnf);
-        HomingSolution resourceVnfHoming = resourceVnf.getHomingSolution();
-
-        String resourceVnfHomingString = resourceVnfHoming.toString();
-        System.out.println("resourceVnfHomingString is: " + resourceVnfHomingString);
-        resourceVnfHomingString = resourceVnfHomingString.replaceAll("\\s+", " ");
-        System.out.println("Now resourceVnfHomingString is: " + resourceVnfHomingString);
-
-        assertNull(workflowException);
-
-        //Verify request
-        String oofRequest = (String) getVariableFromHistory(businessKey, "oofRequest");
-        System.out.println("oofRequest is: " + oofRequest);
-        assertEquals(FileUtil.readResourceFile("__files/BuildingBlocks/oofRequest_infravnf").
-                replaceAll("\n", "").replaceAll("\r", "").
-                replaceAll("\t", ""), oofRequest.replaceAll("\n", "").
-                replaceAll("\r", "").replaceAll("\t", ""));
-
-        //System.out.println("resourceVnfHoming.getVnf().getResourceId() is: " + resourceVnfHoming.getVnf().getResourceId());
-
-        assertEquals(homingSolutionService("service", "service-instance-01234",
-                "MDTNJ01", "test-resource-id-000","att-aic",
-                "mtmnj1a",
-                "\"f1d563e8-e714-4393-8f99-cc480144a05e\"," +
-                        " \"j1d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"s1d563e8-e714-4393-8f99-cc480144a05e\"," +
-                        " \"b1d563e8-e714-4393-8f99-cc480144a05e\""), resourceVnfHomingString);
-    }
-
-    @Test
-    @Ignore // 1802 merge
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_success_existingLicense() throws Exception {
-
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<String, Object>();
-        setVariablesExistingLicense(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "sniro");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-        ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey, "serviceDecomposition");
-        String oofRequest = (String) getVariableFromHistory(businessKey, "sniroRequest");
-
-        Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-        HomingSolution resourceARHoming = (HomingSolution) resourceAR.getHomingSolution();
-        Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-        HomingSolution resourceARHoming2 = (HomingSolution) resourceAR2.getHomingSolution();
-        Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-        HomingSolution resourceVNFHoming = (HomingSolution) resourceVNF.getHomingSolution();
-        String resourceARHomingString = resourceARHoming.toString();
-        resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-        String resourceARHoming2String = resourceARHoming2.toString();
-        resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-        String resourceVNFHomingString = resourceVNFHoming.toString();
-        resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-        oofRequest = oofRequest.replaceAll("\\s+", "");
-
-        assertNull(workflowException);
-        assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01",
-                "aic", "dfwtx", "KDTNJ01",
-                "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceARHomingString);
-        assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2",
-                resourceARHoming2.getVnf().getResourceId(),"aic", "testCloudRegionId2",
-                null, null), resourceARHoming2String);
-        assertEquals(homingSolutionCloud("cloud", "aic",
-                "testCloudRegionId3",
-                false, "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"",
-                "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""),
-                resourceVNFHomingString);
-        assertEquals(verifyOofRequestExistingLicense(), oofRequest);
-
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_error_inputVariable() throws Exception {
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables3(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-
-        assertEquals("WorkflowException[processKey=Homing,errorCode=4000,errorMessage=A required " +
-                "input variable is missing or null]", workflowException.toString());
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_error_badResponse() throws Exception {
-        mockOof_500();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-
-        assertEquals("WorkflowException[processKey=Homing,errorCode=500,errorMessage=Received a " +
-                "Bad Sync Response from Sniro/OOF.]", workflowException.toString());
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_error_oofNoSolution() throws Exception {
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "oofNoSol");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-        Boolean errorMatch = workflowException.toString().contains("WorkflowException[processKey=Homing,errorCode=400,errorMessage=OOF Async Callback " +
-                        "Response contains error: Unable to find any candidate for demand *** Response:");
-        assert(errorMatch);
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_error_oofPolicyException() throws Exception {
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "oofPolicyEx");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-
-        assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=OOF Async Callback " +
-                "Response contains a Request Error Policy Exception: Message content size exceeds the allowable " +
-                "limit]", workflowException.toString());
-    }
-
-    @Test
-    @Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-    public void testHoming_error_oofServiceException() throws Exception {
-        mockOof();
-
-        String businessKey = UUID.randomUUID().toString();
-        Map<String, Object> variables = new HashMap<>();
-        setVariables(variables);
-
-        invokeSubProcess("Homing", businessKey, variables);
-
-        injectWorkflowMessages(callbacks, "oofServiceEx");
-
-        waitForProcessEnd(businessKey, 10000);
-
-        //Get Variables
-        WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
-                "WorkflowException");
-
-        assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=OOF Async Callback " +
-                        "Response contains a Request Error Service Exception: OOF PlacementError: " +
-                        "requests.exceptions.HTTPError: 404 Client Error: Not Found for " +
-                        "url: http://135.21.171.200:8091/v1/plans/97b4e303-5f75-492c-8fb2-21098281c8b8]",
-                workflowException.toString());
-    }
-
-
-    private void setVariables(Map<String, Object> variables) {
-        variables.put("homingService", "oof");
-        HashMap customerLocation = new HashMap<String, Object>();
-        customerLocation.put("customerLatitude", "32.89748");
-        customerLocation.put("customerLongitude", "-97.040443");
-        customerLocation.put("customerName", "xyz");
-        variables.put("customerLatitude", "32.89748");
-        variables.put("customerLongitude", "-97.040443");
-        variables.put("customerName", "xyz");
-        variables.put("customerLocation", customerLocation);
-        variables.put("cloudOwner", "amazon");
-        variables.put("cloudRegionId", "TNZED");
-        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
-        variables.put("vgMuxInfraModelId", "testArModelUuid");
-        //	variables.put("mso-request-id", "testRequestId");
-        variables.put("msoRequestId", "testRequestId");
-        variables.put("serviceInstanceId", "testServiceInstanceId123");
-        variables.put("serviceInstanceName", "testServiceName");
-        variables.put("serviceDecomposition", serviceDecomposition);
-        variables.put("subscriberInfo", subscriber2);
-    }
-
-    private void setVariables2(Map<String, Object> variables) {
-        List<NetworkResource> netList = new ArrayList<NetworkResource>();
-        NetworkResource net = new NetworkResource();
-        net.setResourceId("testResourceIdNet");
-        ModelInfo netModel = new ModelInfo();
-        netModel.setModelCustomizationUuid("testModelCustomizationUuidNet");
-        netModel.setModelInvariantUuid("testModelInvariantIdNet");
-        netModel.setModelName("testModelNameNet");
-        netModel.setModelVersion("testModelVersionNet");
-        net.setModelInfo(netModel);
-        netList.add(net);
-        NetworkResource net2 = new NetworkResource();
-        net2.setResourceId("testResourceIdNet2");
-        ModelInfo netModel2 = new ModelInfo();
-        netModel2.setModelCustomizationUuid("testModelCustomizationUuidNet2");
-        netModel2.setModelCustomizationName("testModelCustomizationNameNet2");
-        netModel2.setModelInvariantUuid("testModelInvariantIdNet2");
-        netModel2.setModelName("testModelNameNet2");
-        netModel2.setModelVersion("testModelVersionNet2");
-        net2.setModelInfo(netModel2);
-        netList.add(net2);
-        serviceDecomposition.setServiceNetworks(netList);
-
-        variables.put("homingService", "oof");
-        HashMap customerLocation = new HashMap<String, Object>();
-        customerLocation.put("customerLatitude", "32.89748");
-        customerLocation.put("customerLongitude", "-97.040443");
-        customerLocation.put("customerName", "xyz");
-        variables.put("customerLatitude", "32.89748");
-        variables.put("customerLongitude", "-97.040443");
-        variables.put("customerName", "xyz");
-        variables.put("customerLocation", customerLocation);
-        variables.put("cloudOwner", "amazon");
-        variables.put("cloudRegionId", "TNZED");
-        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
-        variables.put("vgMuxInfraModelId", "testArModelUuid");
-        variables.put("isDebugLogEnabled", "true");
-        variables.put("msoRequestId", "testRequestId");
-        variables.put("serviceInstanceId", "testServiceInstanceId123");
-        variables.put("serviceInstanceName", "testServiceName");
-        variables.put("serviceDecomposition", serviceDecomposition);
-        variables.put("subscriberInfo", subscriber2);
-    }
-
-    private void setVariables3(Map<String, Object> variables) {
-        variables.put("homingService", "oof");
-        HashMap customerLocation = new HashMap<String, Object>();
-        customerLocation.put("customerLatitude", "32.89748");
-        customerLocation.put("customerLongitude", "-97.040443");
-        customerLocation.put("customerName", "xyz");
-        variables.put("customerLatitude", "32.89748");
-        variables.put("customerLongitude", "-97.040443");
-        variables.put("customerName", "xyz");
-        variables.put("customerLocation", customerLocation);
-        variables.put("cloudOwner", "amazon");
-        variables.put("cloudRegionId", "TNZED");
-        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
-        variables.put("vgMuxInfraModelId", "testArModelUuid");
-        variables.put("isDebugLogEnabled", "true");
-        //	variables.put("mso-request-id", "testRequestId");
-        variables.put("msoRequestId", "testRequestId");
-        variables.put("serviceInstanceId", "testServiceInstanceId123");
-        variables.put("serviceInstanceName", "testServiceName");
-        variables.put("serviceDecomposition", null);
-        variables.put("subscriberInfo", subscriber2);
-    }
-
-    private void setVariablesExistingLicense(Map<String, Object> variables) {
-        HomingSolution currentHomingSolution = new HomingSolution();
-        serviceDecomposition.getServiceVnfs().get(0).setCurrentHomingSolution(currentHomingSolution);
-        serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addEntitlementPool("testEntitlementPoolId1");
-        serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addEntitlementPool("testEntitlementPoolId2");
-
-        serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addLicenseKeyGroup("testLicenseKeyGroupId1");
-        serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addLicenseKeyGroup("testLicenseKeyGroupId2");
-
-        variables.put("isDebugLogEnabled", "true");
-        variables.put("msoRequestId", "testRequestId");
-        variables.put("serviceInstanceId", "testServiceInstanceId");
-        variables.put("serviceDecomposition", serviceDecomposition);
-        variables.put("subscriberInfo", subscriber2);
-
-    }
-
-    private String homingSolutionService(String type, String serviceInstanceId, String vnfHostname,
-                                         String vnfResourceId, String cloudOwner,
-                                         String cloudRegionId, String enList,
-                                         String licenseList){
-
-        String solution = "";
-        if(enList == null){
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"serviceInstanceId\" : \"" +
-                    serviceInstanceId + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" +
-                    cloudRegionId + "\", " + "\"vnf\" : { \"resourceId\" : \"" + vnfResourceId +
-                    "\", \"resourceType\" : \"VNF\", \"resourceInstance\" : { }, \"homingSolution\" : { \"license\" :" +
-                    " { }, \"rehome\" : false }, \"vnfHostname\" : \"" + vnfHostname + "\" }, \"license\" : { }," +
-                    " \"rehome\" : false } }";
-        }else{
-            //language=JSON
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"serviceInstanceId\" : \"" +
-                    serviceInstanceId + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" +
-                    cloudRegionId + "\", \"vnf\" : { \"resourceId\" : \"" + vnfResourceId + "\", \"resourceType\" :" +
-                    " \"VNF\", \"resourceInstance\" : { }, \"homingSolution\" : { \"license\" : { }, \"rehome\" :" +
-                    " false }, \"vnfHostname\" : \"" + vnfHostname + "\" }, \"license\" : { \"entitlementPoolList\" :" +
-                    " [ " + enList + " ], \"licenseKeyGroupList\" : [ " + licenseList + " ] }, \"rehome\" : false } }";
-        }
-        return solution;
-    }
-
-    private String homingSolutionCloud(String type, String cloudOwner,
-                                       String cloudRegionId, Boolean flavors, String enList,
-                                       String licenseList){
-        String solution = "";
-        if(enList == null){
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" +
-                    cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId +
-                    "\", \"license\" : { }, \"rehome\" : false } }";
-        } else if (flavors && enList == null){
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" +
-                    cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId +
-                    "\", \"flavors\" :  [ { \"flavorLabel\" : \"flavorLabel2xxx\", \"flavor\" : \"vimFlavorxxx\" }, " +
-                    "{ \"flavorLabel\" : \"flavorLabel1xxx\", \"flavor\" : \"vimFlavorxxx\" } ], " +
-                    "\"license\" : { }, \"rehome\" : false } }";
-        } else if (flavors) {
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" +
-                    cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId +
-                    "\", \"flavors\" : [ { \"flavorLabel\" : \"flavorLabel2xxx\", \"flavor\" : \"vimFlavorxxx\" }, " +
-                    "{ \"flavorLabel\" : \"flavorLabel1xxx\", \"flavor\" : \"vimFlavorxxx\" } ], " +
-                    "\"license\" : { \"entitlementPoolList\" : [ " + enList +  " ], \"licenseKeyGroupList\" : [ " +
-                    licenseList +  " ] }, \"rehome\" : false } }";
-        } else {
-            solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" +
-                    cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId +
-                    "\", \"license\" : { \"entitlementPoolList\" : [ " + enList +  " ], \"licenseKeyGroupList\" : [ " +
-                    licenseList +  " ] }, \"rehome\" : false } }";
-        }
-        return solution;
-    }
-
-    private void setVariablesForServiceDecomposition(Map<String, Object> variables, String requestId, String siId) {
-        variables.put("homingService", "oof");
-        variables.put("isDebugLogEnabled", "true");
-        variables.put("mso-request-id", requestId);
-        variables.put("msoRequestId", requestId);
-        variables.put("serviceInstanceId", siId);
-        HashMap customerLocation = new HashMap<String, Object>();
-        customerLocation.put("customerLatitude", "32.89748");
-        customerLocation.put("customerLongitude", "-97.040443");
-        customerLocation.put("customerName", "xyz");
-        variables.put("customerLatitude", "32.89748");
-        variables.put("customerLongitude", "-97.040443");
-        variables.put("customerName", "xyz");
-        variables.put("customerLocation", customerLocation);
-        variables.put("cloudOwner", "amazon");
-        variables.put("cloudRegionId", "TNZED");
-
-
-        String serviceModelInfo = "{\"modelInvariantId\":\"1cc4e2e4-eb6e-404d-a66f-c8733cedcce8\",\"modelUuid\":" +
-                "\"2f7f309d-c842-4644-a2e4-34167be5eeb4\",\"modelName\":\"vCPE Service\",\"modelVersion\":\"2.0\",}";
-        variables.put("serviceModelInfo", serviceModelInfo);
-    }
-
-    private String verifyOofRequest() {
-        String request = "{\"requestInfo\":{\"transactionId\":\"testRequestId\",\"requestId\":\"testRequestId\"," +
-                "\"callbackUrl\":\"http://localhost:28090/workflows/messages/message/oofResponse/testRequestId\"," +
-                "\"sourceId\":\"so\",\"requestType\":\"create\",\"numSolutions\":1,\"optimizers\":[\"placement\"]," +
-                "\"timeout\":600},\"placementInfo\":{\"requestParameters\":{\"customerLatitude\":" +
-                "\"32.89748\",\"customerLongitude\":\"-97.040443\",\"customerName\":\"xyz\"},\"subscriberInfo\":" +
-                "{\"globalSubscriberId\":\"SUB12_0322_DS_1201\",\"subscriberName\":\"SUB_12_0322_DS_1201\"," +
-                "\"subscriberCommonSiteId\":\"\"},\"placementDemands\":[{\"resourceModuleName\":\"testARFunctionName\"" +
-                ",\"serviceResourceId\":\"testResourceIdAR\",\"tenantId\":" +
-                "\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"no-resourceModelInvariantId\"," +
-                "\"modelVersionId\":\"no-resourceModelVersionId\",\"modelName\":\"\",\"modelType\":" +
-                "\"\",\"modelVersion\":\"\",\"modelCustomizationName\":\"\"}}," +
-                "{\"resourceModuleName\":\"testAR2FunctionName\",\"serviceResourceId\":\"testResourceIdAR2\"," +
-                "\"tenantId\":\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"no-resourceModelInvariantId\"," +
-                "\"modelVersionId\":\"no-resourceModelVersionId\",\"modelName\":\"\"," +
-                "\"modelType\":\"\",\"modelVersion\":\"\"," +
-                "\"modelCustomizationName\":\"\"}},{\"resourceModuleName\":\"testVnfFunctionName\",\"serviceResourceId\":\"" +
-                "testResourceIdVNF\",\"tenantId\":\"\",\"resourceModelInfo\":{\"modelInvariantId\"" +
-                ":\"testModelInvariantIdVNF\",\"modelVersionId\":\"testVnfModelUuid\",\"modelName\":\"" +
-                "testModelNameVNF\",\"modelType\":\"testModelTypeVNF\",\"modelVersion\":\"testModelVersionVNF\"" +
-                ",\"modelCustomizationName\":\"\"}}]},\"serviceInfo\":" +
-                "{\"serviceInstanceId\":\"testServiceInstanceId123\"," +
-                "\"serviceName\":\"testServiceName\",\"modelInfo\":{\"modelType\":\"\",\"modelInvariantId\":" +
-                "\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":\"testModelName\"," +
-                "\"modelVersion\":\"testModelVersion\",\"modelCustomizationName\":\"" +
-                "\"}}}";
-        return request;
-    }
-
-    private String verifyOofRequestExistingLicense(){
-        String request = "{\"requestInfo\":{\"transactionId\":\"testRequestId\",\"requestId\":\"testRequestId\"," +
-                "\"callbackUrl\":\"http://localhost:28090/workflows/messages/message/SNIROResponse/testRequestId\"," +
-                "\"sourceId\":\"mso\",\"requestType\":\"speedchanged\",\"optimizer\":[\"placement\",\"license\"]," +
-                "\"numSolutions\":1,\"timeout\":1800},\"placementInfo\":{\"serviceModelInfo\":{\"modelType\":\"\"," +
-                "\"modelInvariantId\":\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":" +
-                "\"testModelName\",\"modelVersion\":\"testModelVersion\"},\"subscriberInfo\":" +
-                "{\"globalSubscriberId\":\"SUB12_0322_DS_1201\",\"subscriberName\":\"SUB_12_0322_DS_1201\"," +
-                "\"subscriberCommonSiteId\":\"\"},\"demandInfo\":{\"placementDemand\":[{\"resourceInstanceType\":" +
-                "\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR\",\"resourceModuleName\":\"\"," +
-                "\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR\"," +
-                "\"modelInvariantId\":\"testModelInvariantIdAR\",\"modelName\":\"testModelNameAR\"," +
-                "\"modelVersion\":\"testModelVersionAR\",\"modelVersionId\":\"testARModelUuid\",\"modelType\":" +
-                "\"testModelTypeAR\"},\"tenantId\":\"\",\"tenantName\":\"\"},{\"resourceInstanceType\":" +
-                "\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR2\",\"resourceModuleName\":" +
-                "\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR2\"," +
-                "\"modelInvariantId\":\"testModelInvariantIdAR2\",\"modelName\":\"testModelNameAR2\"," +
-                "\"modelVersion\":\"testModelVersionAR2\",\"modelVersionId\":\"testAr2ModelUuid\"," +
-                "\"modelType\":\"testModelTypeAR2\"},\"tenantId\":\"\",\"tenantName\":\"\"}],\"licenseDemand\":" +
-                "[{\"resourceInstanceType\":\"VNF\",\"serviceResourceId\":\"testResourceIdVNF\"," +
-                "\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":" +
-                "\"testModelCustomizationUuidVNF\",\"modelInvariantId\":\"testModelInvariantIdVNF\"," +
-                "\"modelName\":\"testModelNameVNF\",\"modelVersion\":\"testModelVersionVNF\"," +
-                "\"modelVersionId\":\"testVnfModelUuid\",\"modelType\":\"testModelTypeVNF\"}," +
-                "\"existingLicense\":[{\"entitlementPoolUUID\":[\"testEntitlementPoolId1\"," +
-                "\"testEntitlementPoolId2\"],\"licenseKeyGroupUUID\":[\"testLicenseKeyGroupId1\"," +
-                "\"testLicenseKeyGroupId2\"]}]}]},\"policyId\":[],\"serviceInstanceId\":" +
-                "\"testServiceInstanceId123\",\"orderInfo\":\"{\\\"requestParameters\\\":null}\"}}";
-        return request;
-    }
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
deleted file mode 100644
index be74770e98..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit tests for PrepareUpdateAAIVfModule.bpmn.

- */

-public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {

-	

-	/**

-	 * Test the happy path through the flow.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/PrepareUpdateAAIVfModule.bpmn"

-		})

-	public void happyPath() throws IOException {

-		

-		logStart();

-		

-		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		MockPutGenericVnf("/skask/vf-modules/vf-module/supercool", "PCRF", 200);

-		MockPatchVfModuleId("skask", "supercool");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);

-		invokeSubProcess("PrepareUpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "PUAAIVfMod_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "PUAAIVfMod_updateVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(200, responseCode.intValue());

-		String heatStackId = (String) getVariableFromHistory(businessKey, "PUAAIVfMod_heatStackId");

-		System.out.println("Ouput heat-stack-id:" + heatStackId);

-		Assert.assertEquals("slowburn", heatStackId);

-		

-		logEnd();

-	}

-	

-	/**

-	 * Test the case where the GET to AAI returns a 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/PrepareUpdateAAIVfModule.bpmn"

-		})

-	public void badGet() throws IOException {

-		

-		logStart();

-		

-		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 

-		MockGetGenericVnfById_404("skask[?]depth=1");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);

-		invokeSubProcess("PrepareUpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "PUAAIVfMod_getVnfResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "PUAAIVfMod_getVnfResponseCode");

-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		Assert.assertNotNull(workflowException);

-		System.out.println("Subflow WorkflowException error message: " + workflowException.getErrorMessage());

-		

-		logEnd();

-	}

-	

-	/**

-	 * Test the case where the validation of the VF Module fails.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/PrepareUpdateAAIVfModule.bpmn"

-		})

-	public void failValidation1() throws IOException {

-		

-		logStart();

-		

-		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml").replaceFirst("supercool", "lukewarm");

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);

-		invokeSubProcess("PrepareUpdateAAIVfModule", businessKey, variables);

-		

-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");

-		Assert.assertNotNull(workflowException);

-		System.out.println("Subflow WorkflowException error message: " + workflowException.getErrorMessage());

-		Assert.assertTrue(workflowException.getErrorMessage().startsWith("VF Module validation error: Orchestration"));

-		

-		logEnd();

-	}

-	

-	/**

-	 * Test the case where the validation of the VF Module fails.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/PrepareUpdateAAIVfModule.bpmn"

-		})

-	public void failValidation2() throws IOException {

-		

-		logStart();

-		

-		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml").replaceFirst("supercool", "notsocool");

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");		

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);

-		invokeSubProcess("PrepareUpdateAAIVfModule", businessKey, variables);

-			

-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");

-		Assert.assertNotNull(workflowException);

-		System.out.println("Subflow WorkflowException error message: " + workflowException.getErrorMessage());

-		Assert.assertTrue(workflowException.getErrorMessage().startsWith("VF Module validation error: VF Module"));

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI is successful, but the subsequent PUT returns 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/PrepareUpdateAAIVfModule.bpmn"

-		})

-	public void badPatch() throws IOException {

-		

-		logStart();

-		

-		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);

-		invokeSubProcess("PrepareUpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "PUAAIVfMod_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "PUAAIVfMod_updateVfModuleResponseCode");

-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		Assert.assertNotNull(workflowException);

-		System.out.println("Subflow WorkflowException error message: " + workflowException.getErrorMessage());

-		

-		logEnd();

-	}

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/RainyDayHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/RainyDayHandlerTest.java
deleted file mode 100644
index d450dad05e..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/RainyDayHandlerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

-import static com.github.tomakehurst.wiremock.client.WireMock.containing;

-import static com.github.tomakehurst.wiremock.client.WireMock.put;

-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

-import static org.openecomp.mso.bpmn.mock.StubResponsePolicy.MockPolicyAbort;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-

-/**

- * Unit test for RainyDayHandler.bpmn.

- */

-public class RainyDayHandlerTest extends WorkflowTest {

-	

-	@Test	

-	@Deployment(resources = {

-			"subprocess/BuildingBlock/RainyDayHandler.bpmn",

-			"subprocess/BuildingBlock/ManualHandling.bpmn"

-		})

-	public void  TestRainyDayHandlingSuccess() {

-

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();				

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("isDebugLogEnabled","true");

-		variables.put("msoRequestId", "testRequestId");

-		variables.put("serviceType", "X");

-		variables.put("vnfType", "Y");

-		variables.put("currentActivity", "BB1");		

-		variables.put("workStep", "1");

-		variables.put("failedActivity", "");

-		variables.put("errorCode", "123");

-		variables.put("errorText", "update failed");

-		variables.put("vnfName", "vSAMP1");

-		

-		MockPolicyAbort();

-		

-		

-		String businessKey = UUID.randomUUID().toString();

-		invokeSubProcess("RainyDayHandler", businessKey, variables);

-

-		waitForProcessEnd(businessKey, 10000);

-

-		Assert.assertTrue(isProcessEnded(businessKey));

-		

-	}

-

-	

-	

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ReceiveWorkflowMessageTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ReceiveWorkflowMessageTest.java
deleted file mode 100644
index 64b8ba53b7..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ReceiveWorkflowMessageTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.WorkflowTest;
-import org.openecomp.mso.bpmn.common.WorkflowTest.CallbackSet;
-import org.openecomp.mso.bpmn.core.WorkflowException;
-
-/**
- * Unit tests for SDNCAdapterRestV1.
- */
-public class ReceiveWorkflowMessageTest extends WorkflowTest {
-
-	private static final String EOL = "\n";
-
-	private final CallbackSet callbacks = new CallbackSet();
-
-	public ReceiveWorkflowMessageTest() throws IOException {
-		callbacks.put("sdnc-event-success", JSON, "SDNCAEvent",
-			"{" + EOL +
-			"  \"SDNCEvent\": {" + EOL +
-			"    \"eventType\": \"UCPE-ACTIVATION\"," + EOL +
-			"    \"eventCorrelatorType\": \"UCPE-HOST-NAME\"," + EOL +
-			"    \"eventCorrelator\": \"((CORRELATOR))\"," + EOL +
-			"    \"params\": {" + EOL +
-			"      \"success-indicator\":\"Y\"" + EOL +
-			"	 }" +EOL +
-			"  }" + EOL +
-			"}" + EOL);
-
-		callbacks.put("sdnc-event-fail", JSON, "SDNCAEvent",
-			"{" + EOL +
-			"  \"SDNCEvent\": {" + EOL +
-			"    \"eventType\": \"UCPE-ACTIVATION\"," + EOL +
-			"    \"eventCorrelatorType\": \"UCPE-HOST-NAME\"," + EOL +
-			"    \"eventCorrelator\": \"((CORRELATOR))\"," + EOL +
-			"    \"params\": {" + EOL +
-			"      \"success-indicator\":\"N\"," + EOL +
-			"      \"error-message\":\"SOMETHING BAD HAPPENED\"" + EOL +
-			"	 }" +EOL +
-			"  }" + EOL +
-			"}" + EOL);
-	}
-
-	/**
-	 * Test the happy path.
-	 */
-	@Test
-	@Deployment(resources = {
-		"subprocess/ReceiveWorkflowMessage.bpmn"
-		})
-	public void happyPath() throws Exception {
-
-		logStart();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", "dffbae0e-5588-4bd6-9749-b0f0adb52312");
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("RCVWFMSG_timeout", "PT1M");
-		variables.put("RCVWFMSG_messageType", "SDNCAEvent");
-		variables.put("RCVWFMSG_correlator", "USOSTCDALTX0101UJZZ31");
-
-		invokeSubProcess("ReceiveWorkflowMessage", businessKey, variables);
-		injectWorkflowMessages(callbacks, "sdnc-event-success");
-		waitForProcessEnd(businessKey, 10000);
-
-		String response = (String) getVariableFromHistory(businessKey, "WorkflowResponse");
-		System.out.println("Response:\n" + response);
-		assertTrue(response.contains("\"SDNCEvent\""));
-		assertTrue((boolean)getVariableFromHistory(businessKey, "RCVWFMSG_SuccessIndicator"));
-
-		logEnd();
-	}
-
-	/**
-	 * Test the timeout scenario.
-	 */
-	@Test
-	@Deployment(resources = {
-		"subprocess/ReceiveWorkflowMessage.bpmn"
-		})
-	public void timeout() throws Exception {
-
-		logStart();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", "dffbae0e-5588-4bd6-9749-b0f0adb52312");
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("RCVWFMSG_timeout", "PT5S");
-		variables.put("RCVWFMSG_messageType", "SDNCAEvent");
-		variables.put("RCVWFMSG_correlator", "USOSTCDALTX0101UJZZ31");
-
-		invokeSubProcess("ReceiveWorkflowMessage", businessKey, variables);
-
-		// No injection
-
-		waitForProcessEnd(businessKey, 10000);
-
-		// There is no response from SDNC, so the flow doesn't set WorkflowResponse.
-		String response = (String) getVariableFromHistory(businessKey, "WorkflowResponse");
-		assertNull(response);
-		WorkflowException wfe = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		assertNotNull(wfe);
-		System.out.println(wfe.toString());
-		assertEquals("Receive Workflow Message Timeout Error", wfe.getErrorMessage());
-		assertFalse((boolean)getVariableFromHistory(businessKey, "RCVWFMSG_SuccessIndicator"));
-
-		logEnd();
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterCallbackRule.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterCallbackRule.java
deleted file mode 100644
index ec1a22347b..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterCallbackRule.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common;
-
-import javax.xml.ws.Endpoint;
-
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;
-
-/**
- * A JUnit rule that starts the SDNC Adapter Callback Service before
- * every test, and tears it down after every test.  Example:
- * <pre>
- *     @Rule
- *     public final SDNCAdapterCallbackRule sdncAdapterCallbackRule =
- *         new SDNCAdapterCallbackRule(processEngineRule);
- * </pre>
- */
-public class SDNCAdapterCallbackRule implements TestRule {
-	public static final String DEFAULT_ENDPOINT_URL =
-		"http://localhost:28080/mso/SDNCAdapterCallbackService";
-
-	private final ProcessEngineServices processEngineServices;
-	private final String endpointUrl;
-
-	public SDNCAdapterCallbackRule(ProcessEngineServices processEngineServices) {
-		this(processEngineServices, DEFAULT_ENDPOINT_URL);
-	}
-
-	public SDNCAdapterCallbackRule(ProcessEngineServices processEngineServices,
-			String endpointUrl) {
-		this.processEngineServices = processEngineServices;
-		this.endpointUrl = endpointUrl;
-	}
-
-	@Override
-	public Statement apply(final Statement baseStmt, Description description) {
-		return new Statement() {
-			@Override
-			public void evaluate() throws Throwable {
-				Endpoint endpoint = null;
-
-				try {
-					SDNCAdapterCallbackServiceImpl sdncCallbackService = new SDNCAdapterCallbackServiceImpl();
-					sdncCallbackService.setProcessEngineServices4junit(processEngineServices);
-
-					System.setProperty("com.sun.xml.ws.transport.http.HttpAdapter.dump", "true");
-					System.setProperty("com.sun.xml.internal.ws.transport.http.HttpAdapter.dump", "true");
-
-					System.out.println("Publishing Endpoint - " + endpointUrl);
-					endpoint = Endpoint.publish(endpointUrl, sdncCallbackService);
-
-					baseStmt.evaluate();
-				} finally {
-					if (endpoint != null) {
-						System.out.println("Stopping Endpoint - " + endpointUrl);
-						endpoint.stop();
-					}
-				}
-			}
-		};
-	}
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterRestV2Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterRestV2Test.java
deleted file mode 100644
index 90336bb391..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterRestV2Test.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.common;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.post;

-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import javax.ws.rs.core.Response;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.WorkflowTest;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit tests for SDNCAdapterRestV2.bpmn.

- * 

- * This version of SDNCAdapterRest allows for interim notifications to be sent for

- * any non-final response received from SDNC.

- */

-public class SDNCAdapterRestV2Test extends WorkflowTest {

-		

-	private final CallbackSet callbacks = new CallbackSet();

-	

-	/**

-	 * Constructor. Insert callbacks.

-	 * 

-	 * @throws IOException

-	 */

-	public SDNCAdapterRestV2Test() throws IOException {

-		String sdncCallbackFinal = FileUtil.readResourceFile("__files/SDNCAdapterRestCallbackFinal.json");

-		String sdncCallbackNonFinal = FileUtil.readResourceFile("__files/SDNCAdapterRestCallbackNonFinal.json");

-		callbacks.put("nonfinal", sdncCallbackNonFinal);

-		callbacks.put("final", sdncCallbackFinal);

-	}

-

-	/**

-	 * Test the success path through the subflow.

-	 */

-	@Test

-	@Deployment(resources = {

-			"subprocess/SDNCAdapterRestV2.bpmn",

-			"subprocess/GenericNotificationService.bpmn"		

-		})

-	public void success() throws IOException {

-		logStart();

-		mocks();

-

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<String, Object>();

-		variables.put("mso-request-id", "a4383a52-b9de-4bc4-bedf-02f3f9466535");

-		variables.put("mso-service-instance-id", "fd8bcdbb-b799-43ce-a7ff-ed8f2965a3b5");

-		variables.put("isDebugLogEnabled", "true");

-		variables.put("SDNCREST_Request",

-			FileUtil.readResourceFile("__files/SDNCAdapterRestV2Request.json"));

-		variables.put("SDNCREST_InterimNotification1",

-			FileUtil.readResourceFile("__files/SDNCInterimNotification1.json"));

-		

-		invokeSubProcess("SDNCAdapterRestV2", businessKey, variables);

-

-		injectSDNCRestCallbacks(callbacks, "nonfinal");

-

-		// First non-final response will have done a notification

-		Object interimNotification = getVariableFromHistory(businessKey, "SDNCREST_interimNotification");

-		Assert.assertNotNull(interimNotification);

-		

-		injectSDNCRestCallbacks(callbacks, "nonfinal");

-		

-		// Second non-final response will not have done a notification

-		interimNotification = getVariableFromHistory(businessKey, "SDNCREST_interimNotification");

-		Assert.assertNull(interimNotification);

-

-		injectSDNCRestCallbacks(callbacks, "final");

-		

-		interimNotification = this.getVariableFromHistory(businessKey, "SDNCREST_interimNotification");

-		Assert.assertNull(interimNotification);

-

-		waitForProcessEnd(businessKey, 10000);

-

-		Assert.assertTrue(isProcessEnded(businessKey));

-		

-		logEnd();

-	}

-

-	/**

-	 * Injects a single SDNC adapter callback request. The specified callback data

-	 * may contain the placeholder string ((REQUEST-ID)) which is replaced with

-	 * the actual SDNC request ID. Note: this is not the requestId in the original

-	 * MSO request.

-	 * @param contentType the HTTP content type for the callback

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 */

-	@Override

-	protected boolean injectSDNCRestCallback(String contentType, String content, long timeout) {

-		String sdncRequestId = (String) getProcessVariable("SDNCAdapterRestV2",

-			"SDNCAResponse_CORRELATOR", timeout);

-

-		if (sdncRequestId == null) {

-			return false;

-		}

-

-		content = content.replace("((REQUEST-ID))", sdncRequestId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{REQUEST-ID}}", sdncRequestId);

-

-		System.out.println("Injecting SDNC adapter callback");

-		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

-		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(contentType, "SDNCAResponse", sdncRequestId, content);

-		System.out.println("Workflow response to SDNC adapter callback: " + response);

-		return true;

-	}

-

-	/**

-	 * Defines WireMock stubs needed by these tests.

-	 */

-	private void mocks() {

-		stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))

-			.willReturn(aResponse()

-				.withStatus(202)

-				.withHeader("Content-Type", "application/json")));

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
deleted file mode 100644
index 02e029de46..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;

-import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-

-import javax.ws.rs.core.Response;

-

-import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;

-import org.camunda.bpm.engine.runtime.Job;

-import org.camunda.bpm.engine.test.Deployment;

-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;

-import org.junit.Assert;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.CallbackHeader;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;

-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl.SDNCAdapterErrorResponse;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-import org.openecomp.mso.bpmn.core.PropertyConfigurationSetup;

-import org.openecomp.mso.bpmn.core.xml.XmlTool;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit test cases for SDNCAdapterV1.bpmn

- */

-public class SDNCAdapterV1Test extends WorkflowTest {

-

-	private String sdncAdapterWorkflowRequest;

-	private String sdncAdapterWorkflowRequestAct;

-	private String sdncAdapterCallbackRequestData;

-	private String sdncAdapterCallbackRequestDataNonfinal;

-

-	public SDNCAdapterV1Test() throws IOException {

-		sdncAdapterWorkflowRequest = FileUtil.readResourceFile("sdncadapterworkflowrequest.xml");

-		sdncAdapterWorkflowRequestAct = FileUtil.readResourceFile("sdncadapterworkflowrequest-act.xml");

-		sdncAdapterCallbackRequestData = FileUtil.readResourceFile("sdncadaptercallbackrequestdata.text");

-		sdncAdapterCallbackRequestDataNonfinal = FileUtil.readResourceFile("sdncadaptercallbackrequestdata-nonfinal.text");

-	}

-

-	/**

-	 * End-to-End flow - Unit test for SDNCAdapterV1.bpmn

-	 *  - String input & String response

-	 */

-

-	private WorkflowResponse invokeFlow(String workflowRequest) {

-

-		Map<String, Object>valueMap = new HashMap<>();

-		valueMap.put("value", workflowRequest);

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("sdncAdapterWorkflowRequest", valueMap);

-

-		Map<String, Object> valueMap2 = new HashMap<>();

-		valueMap2.put("value", "true");

-		variables.put("isDebugLogEnabled", valueMap2);

-

-		VariableMapImpl varMap = new VariableMapImpl();

-		varMap.put("variables", variables);

-

-		//System.out.println("Invoking the flow");

-

-		WorkflowResource workflowResource = new WorkflowResource();

-		workflowResource.setProcessEngineServices4junit(processEngineRule);

-

-		Response response = workflowResource.startProcessInstanceByKey("sdncAdapter", varMap);

-		WorkflowResponse workflowResponse = (WorkflowResponse) response.getEntity();

-

-		//String pid = workflowResponse.getProcessInstanceId();

-		//System.out.println("Back from executing process instance with pid=" + pid);

-		return workflowResponse;

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void sunnyDay() throws InterruptedException {

-

-		mockSDNCAdapter(200);

-

-		//System.out.println("SDNCAdapter sunny day flow Started!");

-

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-

-		assertProcessInstanceNotFinished(pid);

-

-		System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String generatedRequestId = (String) processEngineRule.getRuntimeService().getVariable(pid, "SDNCA_requestId");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(generatedRequestId);

-		callbackHeader.setResponseCode("200");

-		callbackHeader.setResponseMessage("OK");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestData);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceFinished(pid);

-

-		//System.out.println("SDNCAdapter sunny day flow Completed!");

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void nonFinalWithTimeout() throws InterruptedException {

-

-		mockSDNCAdapter(200);

-		mockUpdateRequestDB(200, "Database/DBAdapter.xml");

-

-		//System.out.println("SDNCAdapter interim status processing flow Started!");

-

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequestAct);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-

-		assertProcessInstanceNotFinished(pid);

-

-		//System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String generatedRequestId = (String) processEngineRule.getRuntimeService().getVariable(pid, "SDNCA_requestId");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(generatedRequestId);

-		callbackHeader.setResponseCode("200");

-		callbackHeader.setResponseMessage("OK");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestDataNonfinal);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceNotFinished(pid);

-

-		checkForTimeout(pid);

-

-		assertEquals(true, (Boolean) (getVariable(pid, "continueListening")));

-		assertEquals(false, (Boolean) (getVariable(pid, "SDNCA_InterimNotify")));

-

-

-		//System.out.println("SDNCAdapter interim status processing flow Completed!");

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void nonFinalThenFinal() throws InterruptedException {

-

-		mockSDNCAdapter(200);

-		mockUpdateRequestDB(200, "Database/DBAdapter.xml");

-

-		//System.out.println("SDNCAdapter non-final then final processing flow Started!");

-

-		// Start the flow

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequestAct);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-

-		assertProcessInstanceNotFinished(pid);

-

-		// Inject a "non-final" SDNC Adapter asynchronous callback message

-		//System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String generatedRequestId = (String) processEngineRule.getRuntimeService().getVariable(pid, "SDNCA_requestId");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(generatedRequestId);

-		callbackHeader.setResponseCode("200");

-		callbackHeader.setResponseMessage("OK");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestDataNonfinal);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceNotFinished(pid);

-		assertEquals(true, (Boolean) (getVariable(pid, "continueListening")));

-		assertEquals(false, (Boolean) (getVariable(pid, "SDNCA_InterimNotify")));

-

-		// Inject a "final" SDNC Adapter asynchronous callback message

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestData);

-		sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceFinished(pid);

-		assertEquals(false, (Boolean) (getVariable(pid, "continueListening")));

-		assertEquals(false, (Boolean) (getVariable(pid, "SDNCA_InterimNotify")));

-

-		//System.out.println("SDNCAdapter non-final then final processing flow Completed!");

-	}

-

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void nonFinalThenFinalWithNotify() throws InterruptedException {

-

-		mockSDNCAdapter(200);

-		mockUpdateRequestDB(200, "Database/DBAdapter.xml");

-

-		//System.out.println("SDNCAdapter non-final then final processing flow Started!");

-

-		String modSdncAdapterWorkflowRequestAct = sdncAdapterWorkflowRequestAct;

-		try {

-			// only service-type "uCPE-VMS" is applicable to notification, so modify the test request

-			modSdncAdapterWorkflowRequestAct = XmlTool.modifyElement(sdncAdapterWorkflowRequestAct, "tag0:service-type", "uCPE-VMS").get();

-			System.out.println("modified request: " + modSdncAdapterWorkflowRequestAct);

-		} catch (Exception e) {

-			System.out.println("request modification failed");

-			//e.printStackTrace();

-		}

-

-		// Start the flow

-		ProcessExecutionThread thread = new ProcessExecutionThread(modSdncAdapterWorkflowRequestAct);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-

-		assertProcessInstanceNotFinished(pid);

-

-		// Inject a "non-final" SDNC Adapter asynchronous callback message

-		//System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String generatedRequestId = (String) processEngineRule.getRuntimeService().getVariable(pid, "SDNCA_requestId");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(generatedRequestId);

-		callbackHeader.setResponseCode("200");

-		callbackHeader.setResponseMessage("OK");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestDataNonfinal);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceNotFinished(pid);

-		assertEquals(true, (Boolean) (getVariable(pid, "continueListening")));

-		assertEquals(true, (Boolean) (getVariable(pid, "SDNCA_InterimNotify")));

-

-		// Inject a "final" SDNC Adapter asynchronous callback message

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestData);

-		sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertProcessInstanceFinished(pid);

-		assertEquals(false, (Boolean) (getVariable(pid, "continueListening")));

-		assertEquals(false, (Boolean) (getVariable(pid, "SDNCA_InterimNotify")));

-

-		//System.out.println("SDNCAdapter non-final then final processing flow Completed!");

-	}

-

-

-	private void waitForExecutionToStart(String processDefintion, int count) throws InterruptedException {

-		//System.out.println(processEngineRule.getRuntimeService().createExecutionQuery().processDefinitionKey(processDefintion).count());

-		while (processEngineRule.getRuntimeService().createExecutionQuery().processDefinitionKey(processDefintion).count() != count) {

-			Thread.sleep(200);

-		}

-	}

-

-	@Test

-	@Ignore // Ignored because PropertyConfigurationSetup is timing out

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void badCorrelationIdTest() throws InterruptedException, IOException {

-

-		mockSDNCAdapter(200);

-

-		Map<String, String> urnProperties = PropertyConfigurationSetup.createBpmnUrnProperties();

-		urnProperties.put("mso.correlation.timeout", "5");

-		PropertyConfigurationSetup.addProperties(urnProperties, 10000);

-

-		//System.out.println("SDNCAdapter bad RequestId test Started!");

-

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-		assertProcessInstanceNotFinished(pid);

-

-		//System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String badRequestId = "This is not the RequestId that was used";

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(badRequestId);

-		callbackHeader.setResponseCode("200");

-		callbackHeader.setResponseMessage("OK");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(sdncAdapterCallbackRequestData);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertTrue(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

-		assertTrue(((SDNCAdapterErrorResponse) sdncAdapterResponse).getError().contains("No process is waiting for sdncAdapterCallbackRequest"));

-		assertProcessInstanceNotFinished(pid);

-

-		//System.out.println("SDNCAdapter bad RequestId test Completed!");

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void badSynchronousResponse() throws IOException, InterruptedException {

-

-		mockSDNCAdapter(404);

-

-		//System.out.println("SDNCAdapter bad synchronous response flow Started!");

-

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

-		thread.start();

-		while (thread.isAlive()) {

-			Thread.sleep(200);

-		}

-		WorkflowResponse response = thread.workflowResponse;

-		Assert.assertNotNull(response);

-		Assert.assertEquals("404 error", response.getMessageCode(),7000);

-//		assertProcessInstanceFinished(response.getProcessInstanceId());

-		//System.out.println("SDNCAdapter bad synchronous response flow Completed!");

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void sdncNotFound() throws IOException, InterruptedException {

-		mockSDNCAdapter(200);

-		mockSDNCAdapter("/sdncAdapterMock/404", 400, "sdncCallbackErrorResponse.xml");

-

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		String pid = getPid();

-

-		//System.out.println("Injecting SDNC Adapter asynchronous callback message to continue processing");

-		String generatedRequestId = (String) processEngineRule.getRuntimeService().getVariable(pid, "SDNCA_requestId");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(generatedRequestId);

-		callbackHeader.setResponseCode("404");

-		callbackHeader.setResponseMessage("Error processing request to SDNC. Not Found. https://sdncodl.it.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET. SDNC Returned-[error-type:application, error-tag:data-missing, error-message:Request could not be completed because the relevant data model content does not exist.]");

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		//System.out.println("Back from executing process again");

-

-		assertProcessInstanceFinished(pid);

-		assertNotNull(sdncAdapterResponse);

-		//TODO query history to see SDNCA_ResponseCode, SDNCA_ErrorResponse

-		//System.out.println("SDNCAdapter SDNC Notfound test Completed!");

-	}

-

-	@Test

-	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

-			"subprocess/GenericNotificationService.bpmn"

-			})

-	public void asynchronousMessageTimeout() throws IOException, InterruptedException {

-		mockSDNCAdapter(200);

-		//System.out.println("SDNCAdapter asynchronous message timeout flow Started!");

-		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

-		thread.start();

-		waitForExecutionToStart("sdncAdapter", 3);

-		checkForTimeout(getPid());

-	}

-

-	private void checkForTimeout(String pid) throws InterruptedException {

-

-		assertProcessInstanceNotFinished(pid);

-

-		ProcessEngineConfigurationImpl processEngineConfiguration =

-			(ProcessEngineConfigurationImpl) processEngineRule.getProcessEngine().getProcessEngineConfiguration();

-		assertTrue(processEngineConfiguration.getJobExecutor().isActive());

-

-	    Job timerJob = processEngineRule.getManagementService().createJobQuery().processInstanceId(pid).singleResult();

-	    assertNotNull(timerJob);

-

-	    processEngineRule.getManagementService().executeJob(timerJob.getId());

-

-	    assertProcessInstanceFinished(pid);

-

-		//System.out.println("SDNCAdapter asynchronous message timeout flow Completed!");

-	}

-

-	class ProcessExecutionThread extends Thread {

-

-		private String workflowRequest;

-		private WorkflowResponse workflowResponse;

-

-		public ProcessExecutionThread(String workflowRequest) {

-			this.workflowRequest = workflowRequest;

-		}

-

-		public void run() {

-			workflowResponse = invokeFlow(workflowRequest);

-			workflowResponse.getProcessInstanceId();

-		}

-	}

-

-	private String getPid() {

-		return processEngineRule.getHistoryService().createHistoricProcessInstanceQuery().list().get(0).getId();

-	}

-

-	private Object getVariable(String pid, String variableName) {

-		try {

-			return

-				processEngineRule

-					.getHistoryService()

-					.createHistoricVariableInstanceQuery()

-					.processInstanceId(pid).variableName(variableName)

-					.singleResult()

-					.getValue();

-		} catch(Exception ex) {

-			return null;

-		}

-	}

-

-	private void assertProcessInstanceFinished(String pid) {

-	    assertEquals(1, processEngineRule.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count());

-	}

-

-	private void assertProcessInstanceNotFinished(String pid) {

-	    assertEquals(0, processEngineRule.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count());

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SniroHomingTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SniroHomingTest.java
deleted file mode 100644
index 314d4d3b42..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SniroHomingTest.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-package org.openecomp.mso.bpmn.common;
-
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.MockGetServiceResourcesCatalogDataByModelUuid;
-import static org.openecomp.mso.bpmn.mock.StubResponseSNIRO.*;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import org.openecomp.mso.bpmn.core.WorkflowException;
-import org.openecomp.mso.bpmn.core.domain.*;
-import org.openecomp.mso.bpmn.mock.FileUtil;
-
-
-/**
- * Test the SNIRO Homing subflow building block.
- */
-public class SniroHomingTest extends WorkflowTest {
-
-	ServiceDecomposition serviceDecomposition = new ServiceDecomposition();
-	String subscriber = "";
-	String subscriber2 = "";
-
-	private final CallbackSet callbacks = new CallbackSet();
-
-	public SniroHomingTest() throws IOException {
-		String sniroCallback = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallback2AR1Vnf");
-		String sniroCallback2 = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallback2AR1Vnf2Net");
-		String sniroCallback3 = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallbackInfraVnf");
-		String sniroCallbackNoSolution = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallbackNoSolutionFound");
-		String sniroCallbackPolicyException = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallbackPolicyException");
-		String sniroCallbackServiceException = FileUtil.readResourceFile("__files/BuildingBlocks/sniroCallbackServiceException");
-		callbacks.put("sniro", JSON, "SNIROResponse", sniroCallback);
-		callbacks.put("sniro2", JSON, "SNIROResponse", sniroCallback2);
-		callbacks.put("sniro3", JSON, "SNIROResponse", sniroCallback3);
-		callbacks.put("sniroNoSol", JSON, "SNIROResponse", sniroCallbackNoSolution);
-		callbacks.put("sniroPolicyEx", JSON, "SNIROResponse", sniroCallbackPolicyException);
-		callbacks.put("sniroServiceEx", JSON, "SNIROResponse", sniroCallbackServiceException);
-
-		// Service Model
-		ModelInfo sModel = new ModelInfo();
-		sModel.setModelCustomizationUuid("testModelCustomizationUuid");
-		sModel.setModelInstanceName("testModelInstanceName");
-		sModel.setModelInvariantUuid("testModelInvariantId");
-		sModel.setModelName("testModelName");
-		sModel.setModelUuid("testModelUuid");
-		sModel.setModelVersion("testModelVersion");
-		// Service Instance
-		ServiceInstance si = new ServiceInstance();
-		si.setInstanceId("testServiceInstanceId123");
-		// Allotted Resources
-		List<AllottedResource> arList = new ArrayList<AllottedResource>();
-		AllottedResource ar = new AllottedResource();
-		ar.setResourceId("testResourceIdAR");
-		ar.setResourceInstanceName("testARInstanceName");
-		ModelInfo arModel = new ModelInfo();
-		arModel.setModelCustomizationUuid("testModelCustomizationUuidAR");
-		arModel.setModelInvariantUuid("testModelInvariantIdAR");
-		arModel.setModelName("testModelNameAR");
-		arModel.setModelVersion("testModelVersionAR");
-		arModel.setModelUuid("testARModelUuid");
-		arModel.setModelType("testModelTypeAR");
-		ar.setModelInfo(arModel);
-		AllottedResource ar2 = new AllottedResource();
-		ar2.setResourceId("testResourceIdAR2");
-		ar2.setResourceInstanceName("testAR2InstanceName");
-		ModelInfo arModel2 = new ModelInfo();
-		arModel2.setModelCustomizationUuid("testModelCustomizationUuidAR2");
-		arModel2.setModelInvariantUuid("testModelInvariantIdAR2");
-		arModel2.setModelName("testModelNameAR2");
-		arModel2.setModelVersion("testModelVersionAR2");
-		arModel2.setModelUuid("testAr2ModelUuid");
-		arModel2.setModelType("testModelTypeAR2");
-		ar2.setModelInfo(arModel2);
-		arList.add(ar);
-		arList.add(ar2);
-		// Vnfs
-		List<VnfResource> vnfList = new ArrayList<VnfResource>();
-		VnfResource vnf = new VnfResource();
-		vnf.setResourceId("testResourceIdVNF");
-		vnf.setResourceInstanceName("testVnfInstanceName");
-		ModelInfo vnfModel = new ModelInfo();
-		vnfModel.setModelCustomizationUuid("testModelCustomizationUuidVNF");
-		vnfModel.setModelInvariantUuid("testModelInvariantIdVNF");
-		vnfModel.setModelName("testModelNameVNF");
-		vnfModel.setModelVersion("testModelVersionVNF");
-		vnfModel.setModelUuid("testVnfModelUuid");
-		vnfModel.setModelType("testModelTypeVNF");
-		vnf.setModelInfo(vnfModel);
-		vnfList.add(vnf);
-		System.out.println("SERVICE DECOMP: " + serviceDecomposition.getServiceResourcesJsonString());
-		serviceDecomposition.setModelInfo(sModel);
-		serviceDecomposition.setServiceAllottedResources(arList);
-		serviceDecomposition.setServiceVnfs(vnfList);
-		serviceDecomposition.setServiceInstance(si);
-
-		// Subscriber
-		subscriber = "{\"globalSubscriberId\": \"SUB12_0322_DS_1201\",\"subscriberCommonSiteId\": \"DALTX0101\",\"subscriberName\": \"SUB_12_0322_DS_1201\"}";
-		subscriber2 = "{\"globalSubscriberId\": \"SUB12_0322_DS_1201\",\"subscriberName\": \"SUB_12_0322_DS_1201\"}";
-	}
-
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_success_2AR1Vnf() throws Exception {
-
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniro");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey, "serviceDecomposition");
-		String expectedSniroRequest = (String) getVariableFromHistory(businessKey, "sniroRequest");
-
-		Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-		HomingSolution resourceARHoming = resourceAR.getHomingSolution();
-		Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-		HomingSolution resourceARHoming2 = resourceAR2.getHomingSolution();
-		Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-		HomingSolution resourceVNFHoming = resourceVNF.getHomingSolution();
-		String resourceARHomingString = resourceARHoming.toString();
-		resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-		String resourceARHoming2String = resourceARHoming2.toString();
-		resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-		String resourceVNFHomingString = resourceVNFHoming.toString();
-		resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-		expectedSniroRequest = expectedSniroRequest.replaceAll("\\s+", "");
-
-		assertNull(workflowException);
-		assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01", "aic", "dfwtx", "KDTNJ01", "3.0", "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"", "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""), resourceARHomingString);
-		assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2", "aic", "testCloudRegionId2", "testAicClli2", "3.0", null, null), resourceARHoming2String);
-		assertEquals(homingSolutionCloud("cloud", "", "", "aic", "testCloudRegionId3", "testAicClli3", "3.0", "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"", "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""), resourceVNFHomingString);
-		assertEquals(verifySniroRequest(), expectedSniroRequest);
-
-	}
-
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_success_2AR1Vnf2Net() throws Exception {
-
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables2(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniro2");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey, "serviceDecomposition");
-		String expectedSniroRequest = (String) getVariableFromHistory(businessKey, "sniroRequest");
-
-		Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-		HomingSolution resourceARHoming = resourceAR.getHomingSolution();
-		Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-		HomingSolution resourceARHoming2 = resourceAR2.getHomingSolution();
-		Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-		HomingSolution resourceVNFHoming = resourceVNF.getHomingSolution();
-		Resource resourceNet = serviceDecompositionExp.getServiceResource("testResourceIdNet");
-		HomingSolution resourceNetHoming = resourceNet.getHomingSolution();
-		Resource resourceNet2 = serviceDecompositionExp.getServiceResource("testResourceIdNet2");
-		HomingSolution resourceNetHoming2 = resourceNet2.getHomingSolution();
-
-		String resourceARHomingString = resourceARHoming.toString();
-		resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-		String resourceARHoming2String = resourceARHoming2.toString();
-		resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-		String resourceVNFHomingString = resourceVNFHoming.toString();
-		resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-		String resourceNetHomingString = resourceNetHoming.toString();
-		resourceNetHomingString = resourceNetHomingString.replaceAll("\\s+", " ");
-		String resourceNetHoming2String = resourceNetHoming2.toString();
-		resourceNetHoming2String = resourceNetHoming2String.replaceAll("\\s+", " ");
-		expectedSniroRequest = expectedSniroRequest.replaceAll("\\s+", "");
-
-		assertNull(workflowException);
-		assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01", "aic", "dfwtx", "KDTNJ01", "3.0", "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"", "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""), resourceARHomingString);
-		assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2", "aic", "testCloudRegionId2", "testAicClli2", "3.0", null, null), resourceARHoming2String);
-		assertEquals(homingSolutionCloud("cloud", "", "", "aic", "testCloudRegionId3", "testAicClli3", "3.0", "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"", "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""), resourceVNFHomingString);
-		assertEquals(homingSolutionService("service", "testServiceInstanceIdNet", "testVnfHostNameNet", "aic", "testCloudRegionIdNet", "testAicClliNet", "3.0", null, null), resourceNetHomingString);
-		assertEquals(homingSolutionCloud("cloud", "", "", "aic", "testCloudRegionIdNet2", "testAicClliNet2", "3.0", "\"f1d563e8-e714-4393-8f99-cc480144a05n\", \"j1d563e8-e714-4393-8f99-cc480144a05n\"", "\"s1d563e8-e714-4393-8f99-cc480144a05n\", \"b1d563e8-e714-4393-8f99-cc480144a05n\""), resourceNetHoming2String);
-		assertEquals(verifySniroRequest(), expectedSniroRequest);
-	}
-
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/BuildingBlock/DecomposeService.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_success_vnfResourceList() throws Exception {
-
-		// Create a Service Decomposition 
-		MockGetServiceResourcesCatalogDataByModelUuid("2f7f309d-c842-4644-a2e4-34167be5eeb4", "/BuildingBlocks/catalogResp.json");
-		String busKey = UUID.randomUUID().toString();
-		Map<String, Object> vars = new HashMap<>();
-		setVariablesForServiceDecomposition(vars, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
-		invokeSubProcess("DecomposeService", busKey, vars);
-
-		ServiceDecomposition sd = (ServiceDecomposition) getVariableFromHistory(busKey, "serviceDecomposition");
-		List<VnfResource> vnfResourceList = sd.getServiceVnfs();
-		vnfResourceList.get(0).setResourceId("test-resource-id-000");
-
-		// Invoke Homing
-
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("homingService", "sniro");
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceInstanceId", "testServiceInstanceId");
-		variables.put("serviceDecomposition", sd);
-		variables.put("subscriberInfo", subscriber2);
-
-		invokeSubProcess("Homing", businessKey, variables);
-		injectWorkflowMessages(callbacks, "sniro3");
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey, "serviceDecomposition");
-
-		Resource resourceVnf = serviceDecompositionExp.getServiceResource("test-resource-id-000");
-		HomingSolution resourceVnfHoming = resourceVnf.getHomingSolution();
-
-		String resourceVnfHomingString = resourceVnfHoming.toString();
-		resourceVnfHomingString = resourceVnfHomingString.replaceAll("\\s+", " ");
-
-		assertNull(workflowException);
-
-		//Verify request
-		String sniroRequest = (String) getVariableFromHistory(businessKey, "sniroRequest");
-		assertEquals(FileUtil.readResourceFile("__files/BuildingBlocks/sniroRequest_infravnf").replaceAll("\n", "").replaceAll("\r", "").replaceAll("\t", ""), sniroRequest.replaceAll("\n", "").replaceAll("\r", "").replaceAll("\t", ""));
-
-		assertEquals(homingSolutionService("service", "service-instance-01234", "MDTNJ01", "att-aic", "mtmnj1a", "KDTNJ01", "3.0", "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"", "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""), resourceVnfHomingString);
-	}
-
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_success_existingLicense() throws Exception {
-
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		setVariablesExistingLicense(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniro");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		ServiceDecomposition serviceDecompositionExp = (ServiceDecomposition) getVariableFromHistory(businessKey, "serviceDecomposition");
-		String sniroRequest = (String) getVariableFromHistory(businessKey, "sniroRequest");
-
-		Resource resourceAR = serviceDecompositionExp.getServiceResource("testResourceIdAR");
-		HomingSolution resourceARHoming = resourceAR.getHomingSolution();
-		Resource resourceAR2 = serviceDecompositionExp.getServiceResource("testResourceIdAR2");
-		HomingSolution resourceARHoming2 = resourceAR2.getHomingSolution();
-		Resource resourceVNF = serviceDecompositionExp.getServiceResource("testResourceIdVNF");
-		HomingSolution resourceVNFHoming = resourceVNF.getHomingSolution();
-		String resourceARHomingString = resourceARHoming.toString();
-		resourceARHomingString = resourceARHomingString.replaceAll("\\s+", " ");
-		String resourceARHoming2String = resourceARHoming2.toString();
-		resourceARHoming2String = resourceARHoming2String.replaceAll("\\s+", " ");
-		String resourceVNFHomingString = resourceVNFHoming.toString();
-		resourceVNFHomingString = resourceVNFHomingString.replaceAll("\\s+", " ");
-		sniroRequest = sniroRequest.replaceAll("\\s+", "");
-
-		assertNull(workflowException);
-		assertEquals(homingSolutionService("service", "testSIID1", "MDTNJ01", "aic", "dfwtx", "KDTNJ01", "3.0", "\"f1d563e8-e714-4393-8f99-cc480144a05e\", \"j1d563e8-e714-4393-8f99-cc480144a05e\"", "\"s1d563e8-e714-4393-8f99-cc480144a05e\", \"b1d563e8-e714-4393-8f99-cc480144a05e\""), resourceARHomingString);
-		assertEquals(homingSolutionService("service", "testSIID2", "testVnfHostname2", "aic", "testCloudRegionId2", "testAicClli2", "3.0", null, null), resourceARHoming2String);
-		assertEquals(homingSolutionCloud("cloud", "", "", "aic", "testCloudRegionId3", "testAicClli3", "3.0", "\"91d563e8-e714-4393-8f99-cc480144a05e\", \"21d563e8-e714-4393-8f99-cc480144a05e\"", "\"31d563e8-e714-4393-8f99-cc480144a05e\", \"71d563e8-e714-4393-8f99-cc480144a05e\""), resourceVNFHomingString);
-		assertEquals(verifySniroRequest_existingLicense(), sniroRequest);
-
-	}
-
-
-	@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_error_inputVariable() throws Exception {
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables3(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-
-		assertEquals("WorkflowException[processKey=Homing,errorCode=4000,errorMessage=A required input variable is missing or null]", workflowException.toString());
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_error_badResponse() throws Exception {
-		mockSNIRO_500();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-
-		assertEquals("WorkflowException[processKey=Homing,errorCode=500,errorMessage=Received a Bad Sync Response from Sniro/OOF.]", workflowException.toString());
-	}
-
-	@Test
-	@Ignore // 1802 merge
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_error_sniroNoSolution() throws Exception {
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniroNoSol");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-
-		assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=No solution found for plan 08e1b8cf-144a-4bac-b293-d5e2eedc97e8]", workflowException.toString());
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_error_sniroPolicyException() throws Exception {
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniroPolicyEx");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-
-		assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=Sniro Async Callback Response contains a Request Error Policy Exception: Message content size exceeds the allowable limit]", workflowException.toString());
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/BuildingBlock/Homing.bpmn", "subprocess/ReceiveWorkflowMessage.bpmn"})
-	public void testHoming_error_sniroServiceException() throws Exception {
-		mockSNIRO();
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		setVariables(variables);
-
-		invokeSubProcess("Homing", businessKey, variables);
-
-		injectWorkflowMessages(callbacks, "sniroServiceEx");
-
-		waitForProcessEnd(businessKey, 10000);
-
-		//Get Variables
-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-
-		assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=Sniro Async Callback Response contains a Request Error Service Exception: SNIROPlacementError: requests.exceptions.HTTPError: 404 Client Error: Not Found for url: http://135.21.171.200:8091/v1/plans/97b4e303-5f75-492c-8fb2-21098281c8b8]", workflowException.toString());
-	}
-
-
-
-	private void setVariables(Map<String, Object> variables) {
-		variables.put("homingService", "sniro");
-		variables.put("isDebugLogEnabled", "true");
-	//	variables.put("mso-request-id", "testRequestId");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceInstanceId", "testServiceInstanceId");
-		variables.put("serviceDecomposition", serviceDecomposition);
-		variables.put("subscriberInfo", subscriber2);
-
-	}
-
-	private void setVariables2(Map<String, Object> variables) {
-		List<NetworkResource> netList = new ArrayList<NetworkResource>();
-		NetworkResource net = new NetworkResource();
-		net.setResourceId("testResourceIdNet");
-		ModelInfo netModel = new ModelInfo();
-		netModel.setModelCustomizationUuid("testModelCustomizationUuidNet");
-		netModel.setModelInvariantUuid("testModelInvariantIdNet");
-		netModel.setModelName("testModelNameNet");
-		netModel.setModelVersion("testModelVersionNet");
-		net.setModelInfo(netModel);
-		netList.add(net);
-		NetworkResource net2 = new NetworkResource();
-		net2.setResourceId("testResourceIdNet2");
-		ModelInfo netModel2 = new ModelInfo();
-		netModel2.setModelCustomizationUuid("testModelCustomizationUuidNet2");
-		netModel2.setModelInvariantUuid("testModelInvariantIdNet2");
-		netModel2.setModelName("testModelNameNet2");
-		netModel2.setModelVersion("testModelVersionNet2");
-		net2.setModelInfo(netModel2);
-		netList.add(net2);
-		serviceDecomposition.setServiceNetworks(netList);
-
-		variables.put("homingService", "sniro");
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceInstanceId", "testServiceInstanceId");
-		variables.put("serviceDecomposition", serviceDecomposition);
-		variables.put("subscriberInfo", subscriber2);
-	}
-
-	private void setVariables3(Map<String, Object> variables) {
-		variables.put("homingService", "sniro");
-		variables.put("isDebugLogEnabled", "true");
-	//	variables.put("mso-request-id", "testRequestId");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceInstanceId", "testServiceInstanceId");
-		variables.put("serviceDecomposition", null);
-		variables.put("subscriberInfo", subscriber2);
-
-	}
-
-	private void setVariablesExistingLicense(Map<String, Object> variables) {
-		HomingSolution currentHomingSolution = new HomingSolution();
-		serviceDecomposition.getServiceVnfs().get(0).setCurrentHomingSolution(currentHomingSolution);
-		serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addEntitlementPool("testEntitlementPoolId1");
-		serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addEntitlementPool("testEntitlementPoolId2");
-
-		serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addLicenseKeyGroup("testLicenseKeyGroupId1");
-		serviceDecomposition.getServiceVnfs().get(0).getCurrentHomingSolution().getLicense().addLicenseKeyGroup("testLicenseKeyGroupId2");
-
-		variables.put("isDebugLogEnabled", "true");
-	//	variables.put("mso-request-id", "testRequestId");
-		variables.put("msoRequestId", "testRequestId");
-		variables.put("serviceInstanceId", "testServiceInstanceId");
-		variables.put("serviceDecomposition", serviceDecomposition);
-		variables.put("subscriberInfo", subscriber2);
-
-	}
-
-	private String homingSolutionService(String type, String serviceInstanceId, String vnfHostname, String cloudOwner, String cloudRegionId, String aicClli, String aicVersion, String enList, String licenseList){
-		String solution = "";
-		if(enList == null){
-			solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"serviceInstanceId\" : \"" + serviceInstanceId + "\", \"vnfHostname\" : \"" + vnfHostname + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId + "\", \"aicClli\" : \"" + aicClli + "\", \"aicVersion\" : \"" + aicVersion + "\", \"license\" : { }, \"rehome\" : false } }";
-		}else{
-			solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"serviceInstanceId\" : \"" + serviceInstanceId + "\", \"vnfHostname\" : \"" + vnfHostname + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId + "\", \"aicClli\" : \"" + aicClli + "\", \"aicVersion\" : \"" + aicVersion + "\", \"license\" : { \"entitlementPoolList\" : [ " + enList +  " ], \"licenseKeyGroupList\" : [ " + licenseList +  " ] }, \"rehome\" : false } }";
-		}
-		return solution;
-	}
-
-	private String homingSolutionCloud(String type, String serviceInstanceId, String vnfHostname, String cloudOwner, String cloudRegionId, String aicClli, String aicVersion, String enList, String licenseList){
-		String solution = "";
-		if(enList == null){
-			solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId + "\", \"aicClli\" : \"" + aicClli + "\", \"aicVersion\" : \"" + aicVersion + "\", \"license\" : { }, \"rehome\" : false } }";
-		}else{
-			solution = "{ \"homingSolution\" : { \"inventoryType\" : \"" + type + "\", \"cloudOwner\" : \"" + cloudOwner + "\", \"cloudRegionId\" : \"" + cloudRegionId + "\", \"aicClli\" : \"" + aicClli + "\", \"aicVersion\" : \"" + aicVersion + "\", \"license\" : { \"entitlementPoolList\" : [ " + enList +  " ], \"licenseKeyGroupList\" : [ " + licenseList +  " ] }, \"rehome\" : false } }";
-		}
-		return solution;
-	}
-
-	private void setVariablesForServiceDecomposition(Map<String, Object> variables, String requestId, String siId) {
-		variables.put("homingService", "sniro");
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("mso-request-id", requestId);
-		variables.put("msoRequestId", requestId);
-		variables.put("serviceInstanceId",siId);
-
-		String serviceModelInfo = "{ "+ "\"modelType\": \"service\"," +
-				"\"modelInvariantUuid\": \"1cc4e2e4-eb6e-404d-a66f-c8733cedcce8\"," +
-				"\"modelUuid\": \"2f7f309d-c842-4644-a2e4-34167be5eeb4\"," +
-				"\"modelName\": \"ADIOD vRouter vCE 011017 Service\"," +
-				"\"modelVersion\": \"5.0\"," +
-				"}";
-		variables.put("serviceModelInfo", serviceModelInfo);
-	}
-
-	private String verifySniroRequest(){
-		String request = "{\"requestInfo\":{\"transactionId\":\"testRequestId\",\"requestId\":\"testRequestId\",\"callbackUrl\":\"http://localhost:28090/workflows/messages/message/SNIROResponse/testRequestId\",\"sourceId\":\"mso\",\"requestType\":\"initial\",\"optimizer\":[\"placement\",\"license\"],\"numSolutions\":1,\"timeout\":1800},\"placement\":{\"serviceModelInfo\":{\"modelType\":\"\",\"modelInvariantId\":\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":\"testModelName\",\"modelVersion\":\"testModelVersion\"},\"subscriberInfo\":{\"globalSubscriberId\":\"SUB12_0322_DS_1201\",\"subscriberName\":\"SUB_12_0322_DS_1201\",\"subscriberCommonSiteId\":\"\"},\"demandInfo\":{\"placementDemand\":[{\"resourceInstanceType\":\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR\",\"modelInvariantId\":\"testModelInvariantIdAR\",\"modelName\":\"testModelNameAR\",\"modelVersion\":\"testModelVersionAR\",\"modelVersionId\":\"testARModelUuid\",\"modelType\":\"testModelTypeAR\"},\"tenantId\":\"\",\"tenantName\":\"\"},{\"resourceInstanceType\":\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR2\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR2\",\"modelInvariantId\":\"testModelInvariantIdAR2\",\"modelName\":\"testModelNameAR2\",\"modelVersion\":\"testModelVersionAR2\",\"modelVersionId\":\"testAr2ModelUuid\",\"modelType\":\"testModelTypeAR2\"},\"tenantId\":\"\",\"tenantName\":\"\"}],\"licenseDemand\":[{\"resourceInstanceType\":\"VNF\",\"serviceResourceId\":\"testResourceIdVNF\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidVNF\",\"modelInvariantId\":\"testModelInvariantIdVNF\",\"modelName\":\"testModelNameVNF\",\"modelVersion\":\"testModelVersionVNF\",\"modelVersionId\":\"testVnfModelUuid\",\"modelType\":\"testModelTypeVNF\"}}]},\"policyId\":[],\"serviceInstanceId\":\"testServiceInstanceId123\",\"orderInfo\":\"{\\\"requestParameters\\\":null}\"}}";
-		return request;
-	}
-
-	private String verifySniroRequest_existingLicense(){
-		String request = "{\"requestInfo\":{\"transactionId\":\"testRequestId\",\"requestId\":\"testRequestId\",\"callbackUrl\":\"http://localhost:28090/workflows/messages/message/SNIROResponse/testRequestId\",\"sourceId\":\"mso\",\"requestType\":\"speedchanged\",\"optimizer\":[\"placement\",\"license\"],\"numSolutions\":1,\"timeout\":1800},\"placement\":{\"serviceModelInfo\":{\"modelType\":\"\",\"modelInvariantId\":\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":\"testModelName\",\"modelVersion\":\"testModelVersion\"},\"subscriberInfo\":{\"globalSubscriberId\":\"SUB12_0322_DS_1201\",\"subscriberName\":\"SUB_12_0322_DS_1201\",\"subscriberCommonSiteId\":\"\"},\"demandInfo\":{\"placementDemand\":[{\"resourceInstanceType\":\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR\",\"modelInvariantId\":\"testModelInvariantIdAR\",\"modelName\":\"testModelNameAR\",\"modelVersion\":\"testModelVersionAR\",\"modelVersionId\":\"testARModelUuid\",\"modelType\":\"testModelTypeAR\"},\"tenantId\":\"\",\"tenantName\":\"\"},{\"resourceInstanceType\":\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR2\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidAR2\",\"modelInvariantId\":\"testModelInvariantIdAR2\",\"modelName\":\"testModelNameAR2\",\"modelVersion\":\"testModelVersionAR2\",\"modelVersionId\":\"testAr2ModelUuid\",\"modelType\":\"testModelTypeAR2\"},\"tenantId\":\"\",\"tenantName\":\"\"}],\"licenseDemand\":[{\"resourceInstanceType\":\"VNF\",\"serviceResourceId\":\"testResourceIdVNF\",\"resourceModuleName\":\"\",\"resourceModelInfo\":{\"modelCustomizationId\":\"testModelCustomizationUuidVNF\",\"modelInvariantId\":\"testModelInvariantIdVNF\",\"modelName\":\"testModelNameVNF\",\"modelVersion\":\"testModelVersionVNF\",\"modelVersionId\":\"testVnfModelUuid\",\"modelType\":\"testModelTypeVNF\"},\"existingLicense\":[{\"entitlementPoolUUID\":[\"testEntitlementPoolId1\",\"testEntitlementPoolId2\"],\"licenseKeyGroupUUID\":[\"testLicenseKeyGroupId1\",\"testLicenseKeyGroupId2\"]}]}]},\"policyId\":[],\"serviceInstanceId\":\"testServiceInstanceId123\",\"orderInfo\":\"{\\\"requestParameters\\\":null}\"}}";
-		return request;
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
deleted file mode 100644
index 7c557ffe63..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf_Bad;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.core.WorkflowException;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit tests for UpdateAAIGenericVnf bpmn.

- */

-public class UpdateAAIGenericVnfTest extends WorkflowTest {

-		

-	/**

-	 * Test the happy path through the flow.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIGenericVnf.bpmn"

-		})

-	public void happyPath() throws IOException {

-		logStart();

-		

-		String updateAAIGenericVnfRequest =	FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		MockPutGenericVnf("/skask", 200);

-		MockPatchGenericVnf("skask");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);

-		invokeSubProcess("UpdateAAIGenericVnf", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIGenVnf_updateGenericVnfResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIGenVnf_updateGenericVnfResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(200, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the happy path through the flow.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIGenericVnf.bpmn"

-		})

-	public void personaMismatch() throws IOException {

-		

-		logStart();

-		

-		String updateAAIGenericVnfRequest =	FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 

-		updateAAIGenericVnfRequest = updateAAIGenericVnfRequest.replaceFirst("introvert", "extrovert");

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);

-		invokeSubProcess("UpdateAAIGenericVnf", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");

-		System.out.println("Workflow Exception: " + workflowException);

-		Assert.assertNotNull(workflowException);

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI returns a 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIGenericVnf.bpmn"

-		})

-	public void badGet() throws IOException {

-		

-		logStart();

-		

-		String updateAAIGenericVnfRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 

-		

-		MockGetGenericVnfById_404("skask[?]depth=1");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);

-		invokeSubProcess("UpdateAAIGenericVnf", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIGenVnf_getGenericVnfResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIGenVnf_getGenericVnfResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIGenericVnf.bpmn"

-		})

-	public void badPatch() throws IOException {

-		

-		logStart();

-		

-		String updateAAIGenericVnfRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIGenericVnfRequest.xml"); 

-		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		MockPutGenericVnf_Bad("skask", 404);

-		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);

-		invokeSubProcess("UpdateAAIGenericVnf", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIGenVnf_updateGenericVnfResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIGenVnf_updateGenericVnfResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
deleted file mode 100644
index 30d7e6d8c6..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * ONAP - SO 

- * ================================================================================ 

- * 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.common;

-

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

-

-import java.io.IOException;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.camunda.bpm.engine.test.Deployment;

-import org.junit.Assert;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.mock.FileUtil;

-

-/**

- * Unit tests for UpdateAAIVfModuleTest.bpmn.

- */

-public class UpdateAAIVfModuleTest extends WorkflowTest {

-		

-	/**

-	 * Test the happy path through the flow.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIVfModule.bpmn"

-		})

-	public void happyPath() throws IOException {

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 

-		MockGetGenericVnfByIdWithPriority("/skask/vf-modules/vf-module/supercool", 200, "VfModularity/VfModule-supercool.xml");

-		MockPutGenericVnf("/skask/vf-modules/vf-module/supercool", "PCRF", 200);

-		MockPatchVfModuleId("skask", "supercool");

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("UpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIVfMod_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIVfMod_updateVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(200, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI returns a 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIVfModule.bpmn"

-		})

-	public void badGet() throws IOException {

-		

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 

-		MockGetGenericVnfById("/skask/vf-modules/vf-module/.*", "VfModularity/VfModule-supercool.xml", 404);

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("UpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIVfMod_getVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIVfMod_getVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-

-	/**

-	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.

-	 */

-	@Test	

-	@Deployment(resources = {

-			"subprocess/UpdateAAIVfModule.bpmn"

-		})

-	public void badPatch() throws IOException {

-		

-		logStart();

-		

-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 

-		MockGetGenericVnfById_404("/skask/vf-modules/vf-module/supercool");

-		MockGetGenericVnfById("/skask/vf-modules/vf-module/supercool", "VfModularity/VfModule-supercool.xml", 200);

-		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

-		

-		String businessKey = UUID.randomUUID().toString();

-		Map<String, Object> variables = new HashMap<>();

-		variables.put("mso-request-id", "999-99-9999");

-		variables.put("isDebugLogEnabled","true");

-		variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);

-		invokeSubProcess("UpdateAAIVfModule", businessKey, variables);

-		

-		Assert.assertTrue(isProcessEnded(businessKey));

-		String response = (String) getVariableFromHistory(businessKey, "UAAIVfMod_updateVfModuleResponse");

-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "UAAIVfMod_updateVfModuleResponseCode");

-		System.out.println("Subflow response code: " + responseCode);

-		System.out.println("Subflow response: " + response);

-		Assert.assertEquals(404, responseCode.intValue());

-		

-		logEnd();

-	}

-}

-

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/VnfAdapterRestV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/VnfAdapterRestV1Test.java
deleted file mode 100644
index ea49176df0..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/VnfAdapterRestV1Test.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFDelete;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFPost;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFPut;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFRollbackDelete;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.core.WorkflowException;
-
-/**
- * Unit tests for VnfAdapterRestV1.
- */
-public class VnfAdapterRestV1Test extends WorkflowTest {
-
-	private static final String EOL = "\n";
-
-	private final CallbackSet callbacks = new CallbackSet();
-
-	private final String CREATE_VF_MODULE_REQUEST =
-		"<createVfModuleRequest>" + EOL +
-		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
-		"  <tenantId>tenantId</tenantId>" + EOL +
-		"  <vnfId>vnfId</vnfId>" + EOL +
-		"  <vfModuleName>vfModuleName</vfModuleName>" + EOL +
-		"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-		"  <vnfType>vnfType</vnfType>" + EOL +
-		"  <vnfVersion>vnfVersion</vnfVersion>" + EOL +
-		"  <vfModuleType>vfModuleType</vfModuleType>" + EOL +
-		"  <volumeGroupId>volumeGroupId</volumeGroupId>" + EOL +
-		"  <volumeGroupStackId>volumeGroupStackId</volumeGroupStackId>" + EOL +
-		"  <baseVfModuleId>baseVfModuleId</baseVfModuleId>" + EOL +
-		"  <baseVfModuleStackId>baseVfModuleStackId</baseVfModuleStackId>" + EOL +
-		"  <skipAAI>true</skipAAI>" + EOL +
-		"  <backout>false</backout>" + EOL +
-		"  <failIfExists>true</failIfExists>" + EOL +
-		"  <vfModuleParams>" + EOL +
-		"    <entry>" + EOL +
-		"      <key>key1</key>" + EOL +
-		"      <value>value1</value>" + EOL +
-		"    </entry>" + EOL +
-		"    <entry>" + EOL +
-		"      <key>key2</key>" + EOL +
-		"      <value>value2</value>" + EOL +
-		"    </entry>" + EOL +
-		"  </vfModuleParams>" + EOL +
-		"  <msoRequest>" + EOL +
-		"    <requestId>requestId</requestId>" + EOL +
-		"    <serviceInstanceId>serviceInstanceId</serviceInstanceId>" + EOL +
-		"  </msoRequest>" + EOL +
-		"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-		"  <notificationUrl>http://localhost:28080/mso/WorkflowMessage</notificationUrl>" + EOL +
-		"</createVfModuleRequest>" + EOL;
-
-	private final String UPDATE_VF_MODULE_REQUEST =
-		"<updateVfModuleRequest>" + EOL +
-		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
-		"  <tenantId>tenantId</tenantId>" + EOL +
-		"  <vnfId>vnfId</vnfId>" + EOL +
-		"  <vfModuleName>vfModuleName</vfModuleName>" + EOL +
-		"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-		"  <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-		"  <vnfType>vnfType</vnfType>" + EOL +
-		"  <vnfVersion>vnfVersion</vnfVersion>" + EOL +
-		"  <vfModuleType>vfModuleType</vfModuleType>" + EOL +
-		"  <volumeGroupId>volumeGroupId</volumeGroupId>" + EOL +
-		"  <volumeGroupStackId>volumeGroupStackId</volumeGroupStackId>" + EOL +
-		"  <baseVfModuleId>baseVfModuleId</baseVfModuleId>" + EOL +
-		"  <baseVfModuleStackId>baseVfModuleStackId</baseVfModuleStackId>" + EOL +
-		"  <skipAAI>true</skipAAI>" + EOL +
-		"  <backout>false</backout>" + EOL +
-		"  <failIfExists>true</failIfExists>" + EOL +
-		"  <vfModuleParams>" + EOL +
-		"    <entry>" + EOL +
-		"      <key>key1</key>" + EOL +
-		"      <value>value1</value>" + EOL +
-		"    </entry>" + EOL +
-		"    <entry>" + EOL +
-		"      <key>key2</key>" + EOL +
-		"      <value>value2</value>" + EOL +
-		"    </entry>" + EOL +
-		"  </vfModuleParams>" + EOL +
-		"  <msoRequest>" + EOL +
-		"    <requestId>requestId</requestId>" + EOL +
-		"    <serviceInstanceId>serviceInstanceId</serviceInstanceId>" + EOL +
-		"  </msoRequest>" + EOL +
-		"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-		"  <notificationUrl>http://localhost:28080/mso/WorkflowMessage</notificationUrl>" + EOL +
-		"</updateVfModuleRequest>" + EOL;
-
-	private final String DELETE_VF_MODULE_REQUEST =
-		"<deleteVfModuleRequest>" + EOL +
-		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
-		"  <tenantId>tenantId</tenantId>" + EOL +
-		"  <vnfId>vnfId</vnfId>" + EOL +
-		"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-		"  <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-		"  <skipAAI>true</skipAAI>" + EOL +
-		"  <msoRequest>" + EOL +
-		"    <requestId>requestId</requestId>" + EOL +
-		"    <serviceInstanceId>serviceInstanceId</serviceInstanceId>" + EOL +
-		"  </msoRequest>" + EOL +
-		"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-		"  <notificationUrl>http://localhost:28080/mso/WorkflowMessage</notificationUrl>" + EOL +
-		"</deleteVfModuleRequest>" + EOL;
-
-	private final String ROLLBACK_VF_MODULE_REQUEST =
-			"<rollbackVfModuleRequest>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"  <notificationUrl>http://localhost:28080/mso/WorkflowMessage</notificationUrl>" + EOL +
-			"  <skipAAI>true</skipAAI>" + EOL +
-			"  <vfModuleRollback>" + EOL +
-			"    <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
-			"    <tenantId>tenantId</tenantId>" + EOL +
-			"    <vnfId>vnfId</vnfId>" + EOL +
-			"    <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-			"    <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-			"    <msoRequest>" + EOL +
-			"      <requestId>requestId</requestId>" + EOL +
-			"      <serviceInstanceId>serviceInstanceId</serviceInstanceId>" + EOL +
-			"    </msoRequest>" + EOL +
-			"    <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"    <vfModuleCreated>true</vfModuleCreated>" + EOL +
-			"  </vfModuleRollback>" + EOL +
-			"</rollbackVfModuleRequest>" + EOL;
-
-	public VnfAdapterRestV1Test() throws IOException {
-		callbacks.put("createVfModule",
-			"<createVfModuleResponse>" + EOL +
-			"  <vnfId>vnfId</vnfId>" + EOL +
-			"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-			"  <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-			"  <vfModuleCreated>true</vfModuleCreated>" + EOL +
-			"  <vfModuleOutputs>" + EOL +
-			"    <entry>" + EOL +
-			"      <key>key1</key>" + EOL +
-			"      <value>value1</value>" + EOL +
-			"    </entry>" + EOL +
-			"    <entry>" + EOL +
-			"      <key>key2</key>" + EOL +
-			"      <value>value2</value>" + EOL +
-			"    </entry>" + EOL +
-			"  </vfModuleOutputs>" + EOL +
-			"  <rollback>" + EOL +
-			"    <vnfId>vnfId</vnfId>" + EOL +
-			"    <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-			"    <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-			"    <vfModuleCreated>true</vfModuleCreated>" + EOL +
-			"    <tenantId>tenantId</tenantId>" + EOL +
-			"    <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
-			"    <msoRequest>" + EOL +
-			"      <requestId>requestId</requestId>" + EOL +
-			"      <serviceInstanceId>serviceInstanceId</serviceInstanceId>" + EOL +
-			"    </msoRequest>" + EOL +
-			"    <messageId>messageId</messageId>" + EOL +
-			"  </rollback>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"</createVfModuleResponse>" + EOL);
-
-		callbacks.put("updateVfModule",
-			"<updateVfModuleResponse>" + EOL +
-			"  <vnfId>vnfId</vnfId>" + EOL +
-			"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-			"  <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
-			"  <vfModuleOutputs>" + EOL +
-			"    <entry>" + EOL +
-			"      <key>key1</key>" + EOL +
-			"      <value>value1</value>" + EOL +
-			"    </entry>" + EOL +
-			"    <entry>" + EOL +
-			"      <key>key2</key>" + EOL +
-			"      <value>value2</value>" + EOL +
-			"    </entry>" + EOL +
-			"  </vfModuleOutputs>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"</updateVfModuleResponse>" + EOL);
-
-		callbacks.put("deleteVfModule",
-			"<deleteVfModuleResponse>" + EOL +
-			"  <vnfId>vnfId</vnfId>" + EOL +
-			"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
-			"  <vfModuleDeleted>true</vfModuleDeleted>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"</deleteVfModuleResponse>" + EOL);
-
-		callbacks.put("rollbackVfModule",
-			"<rollbackVfModuleResponse>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"  <vfModuleRolledback>true</vfModuleRolledback>" + EOL +
-			"</rollbackVfModuleResponse>" + EOL);
-
-		callbacks.put("vfModuleException",
-			"<vfModuleException>" + EOL +
-			"  <message>message</message>" + EOL +
-			"  <category>category</category>" + EOL +
-			"  <rolledBack>false</rolledBack>" + EOL +
-			"  <messageId>{{MESSAGE-ID}}</messageId>" + EOL +
-			"</vfModuleException>" + EOL);
-	}
-
-	@Test
-	@Deployment(resources = {
-		"subprocess/VnfAdapterRestV1.bpmn"
-		})
-	public void testCreateVfModuleSuccess() throws Exception {
-		logStart();
-
-		mockVNFPost("", 202, "vnfId");
-
-		String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
-		String messageId = requestId + "-" + System.currentTimeMillis();
-		String request = CREATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", requestId);
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("vnfAdapterRestV1Request", request);
-
-		invokeSubProcess("vnfAdapterRestV1", businessKey, variables);
-		injectVNFRestCallbacks(callbacks, "createVfModule");
-		waitForProcessEnd(businessKey, 10000);
-
-		String response = (String) getVariableFromHistory(businessKey, "vnfAdapterRestV1Response");
-		System.out.println("Response:\n" + response);
-		assertTrue(response!=null && response.contains("<createVfModuleResponse>"));
-		assertTrue((boolean) getVariableFromHistory(businessKey, "VNFREST_SuccessIndicator"));
-
-		logEnd();
-	}
-
-	@Test
-	@Deployment(resources = {
-		"subprocess/VnfAdapterRestV1.bpmn"
-		})
-	public void testUpdateVfModuleSuccess() throws Exception {
-		logStart();
-
-		mockVNFPut("/vfModuleId", 202);
-
-		String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
-		String messageId = requestId + "-" + System.currentTimeMillis();
-		String request = UPDATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", requestId);
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("vnfAdapterRestV1Request", request);
-
-		invokeSubProcess("vnfAdapterRestV1", businessKey, variables);
-		injectVNFRestCallbacks(callbacks, "updateVfModule");
-		waitForProcessEnd(businessKey, 10000);
-
-		String response = (String) getVariableFromHistory(businessKey, "vnfAdapterRestV1Response");
-		System.out.println("Response:\n" + response);
-		assertTrue(response.contains("<updateVfModuleResponse>"));
-		assertTrue((boolean) getVariableFromHistory(businessKey, "VNFREST_SuccessIndicator"));
-
-		logEnd();
-	}
-
-	@Test
-	@Deployment(resources = {
-		"subprocess/VnfAdapterRestV1.bpmn"
-		})
-	public void testDeleteVfModuleSuccess() throws Exception {
-		logStart();
-
-		mockVNFDelete("vnfId", "/vfModuleId", 202);
-
-		String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
-		String messageId = requestId + "-" + System.currentTimeMillis();
-		String request = DELETE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", requestId);
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("vnfAdapterRestV1Request", request);
-
-		invokeSubProcess("vnfAdapterRestV1", businessKey, variables);
-		injectVNFRestCallbacks(callbacks, "deleteVfModule");
-		waitForProcessEnd(businessKey, 10000);
-
-		String response = (String) getVariableFromHistory(businessKey, "vnfAdapterRestV1Response");
-		System.out.println("Response:\n" + response);
-		assertTrue(response.contains("<deleteVfModuleResponse>"));
-		assertTrue((boolean) getVariableFromHistory(businessKey, "VNFREST_SuccessIndicator"));
-
-		logEnd();
-	}
-
-	@Test
-	@Deployment(resources = {
-		"subprocess/VnfAdapterRestV1.bpmn"
-		})
-	public void testRollbackVfModuleSuccess() throws Exception {
-		logStart();
-
-		mockVNFRollbackDelete("/vfModuleId", 202);
-
-		String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
-		String messageId = requestId + "-" + System.currentTimeMillis();
-		String request = ROLLBACK_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", requestId);
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("vnfAdapterRestV1Request", request);
-
-		invokeSubProcess("vnfAdapterRestV1", businessKey, variables);
-		injectVNFRestCallbacks(callbacks, "rollbackVfModule");
-		waitForProcessEnd(businessKey, 10000);
-
-		String response = (String) getVariableFromHistory(businessKey, "vnfAdapterRestV1Response");
-		System.out.println("Response:\n" + response);
-		assertTrue(response.contains("<rollbackVfModuleResponse>"));
-		assertTrue((boolean) getVariableFromHistory(businessKey, "VNFREST_SuccessIndicator"));
-
-		logEnd();
-	}
-
-	@Test
-	@Deployment(resources = {
-		"subprocess/VnfAdapterRestV1.bpmn"
-		})
-	public void testCreateVfModuleException() throws Exception {
-		logStart();
-
-		mockVNFPost("", 202, "vnfId");
-
-		String requestId = "dffbae0e-5588-4bd6-9749-b0f0adb52312";
-		String messageId = requestId + "-" + System.currentTimeMillis();
-		String request = CREATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
-
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<>();
-		variables.put("mso-request-id", requestId);
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("vnfAdapterRestV1Request", request);
-
-		invokeSubProcess("vnfAdapterRestV1", businessKey, variables);
-		injectVNFRestCallbacks(callbacks, "vfModuleException");
-		waitForProcessEnd(businessKey, 10000);
-
-		WorkflowException wfe = (WorkflowException) getVariableFromHistory(businessKey, "WorkflowException");
-		assertNotNull(wfe);
-		System.out.println(wfe.toString());
-
-		String response = (String) getVariableFromHistory(businessKey, "WorkflowResponse");
-		System.out.println("Response:\n" + response);
-		assertTrue(response.contains("<vfModuleException>"));
-		assertFalse((boolean) getVariableFromHistory(businessKey, "VNFREST_SuccessIndicator"));
-
-		logEnd();
-	}
-}
-
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
deleted file mode 100644
index 5562cb80ae..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;
-import org.jboss.resteasy.spi.AsynchronousResponse;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-public class WorkflowAsyncResourceTest extends WorkflowTest {
-
-	@Test
-	@Deployment(resources = { "testAsyncResource.bpmn" })
-	public void asyncRequestSuccess() throws InterruptedException {
-		//it can be any request which asynchronously processed by the workflow
-		String request = "<aetgt:CreateTenantRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns5=\"http://org.openecomp/mso/request/types/v1\">  <msoservtypes:service-information xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\">    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>    <msoservtypes:service-instance-id>HI/VLXM/950604//SW_INTERNET</msoservtypes:service-instance-id>    <msoservtypes:subscriber-name>SubName01</msoservtypes:subscriber-name> </msoservtypes:service-information> </aetgt:CreateTenantRequest>";
-
-		Map<String,String> variables = new HashMap<>();
-		variables.put("testAsyncRequestMsg", request);
-		variables.put("mso-request-id", UUID.randomUUID().toString());
-		variables.put("mso-service-request-timeout", "5");
-		
-		WorkflowResponse workflowResponse = BPMNUtil.executeAsyncWorkflow(processEngineRule, "testAsyncProcess", variables);
-		assertEquals("Received the request, the process is getting executed, request message<aetgt:CreateTenantRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns5=\"http://org.openecomp/mso/request/types/v1\">  <msoservtypes:service-information xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\">    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>    <msoservtypes:service-instance-id>HI/VLXM/950604//SW_INTERNET</msoservtypes:service-instance-id>    <msoservtypes:subscriber-name>SubName01</msoservtypes:subscriber-name> </msoservtypes:service-information> </aetgt:CreateTenantRequest>", workflowResponse.getContent());
-		assertEquals(200, workflowResponse.getMessageCode());
-	}
-
-	private void executeWorkflow(String request, String requestId, AsynchronousResponse asyncResponse, String processKey) {
-		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
-		VariableMapImpl variableMap = new VariableMapImpl();
-
-		Map<String, Object> variableValueType = new HashMap<>();
-
-		Map<String, Object> requestMsg = new HashMap<>();
-		requestMsg.put("value", request);
-		requestMsg.put("type", "String");
-
-		Map<String, Object> msorequestId = new HashMap<>();
-		msorequestId.put("type", "String");
-		msorequestId.put("value",requestId);
-
-		Map<String, Object> timeout = new HashMap<>();
-		timeout.put("type", "String");
-		timeout.put("value","5"); 
-
-		variableValueType.put("testAsyncRequestMsg", requestMsg);
-		variableValueType.put("mso-request-id", msorequestId);
-		variableValueType.put("mso-service-request-timeout", timeout);
-
-		variableMap.put("variables", variableValueType);
-		
-		workflowResource.setProcessEngineServices4junit(processEngineRule);
-		workflowResource.startProcessInstanceByKey(asyncResponse, processKey, variableMap);
-	}
-
-	class ProcessThread extends Thread {
-		
-		public WorkflowResponse workflowResponse;
-		public String requestId;
-		public String processKey;
-		public AsynchronousResponse asyncResponse = mock(AsynchronousResponse.class);
-		public String request;
-		public boolean started;
-		public void run() {
-			started = true;
-			executeWorkflow(request, requestId, asyncResponse, processKey);
-		}
-	}	
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java
deleted file mode 100644
index de346d2dbe..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * ONAP - SO 
- * ================================================================================ 
- * 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.common;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import java.util.UUID;
-
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.spi.AsynchronousResponse;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowCallbackResponse;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowContext;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowContextHolder;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-public class WorkflowContextHolderTest {
-
-	private WorkflowContext createContext(AsynchronousResponse asyncResponse) {
-		WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
-		String requestId = UUID.randomUUID().toString();
-		WorkflowContext workflowContext = new WorkflowContext("testAsyncProcess",
-			requestId, asyncResponse, 1000L);
-		contextHolder.put(workflowContext);
-		return workflowContext;
-	}
-
-	@Test
-	@Ignore // BROKEN TEST (previously ignored)
-	public void testContextExpiry() throws InterruptedException {
-
-		WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
-		AsynchronousResponse asyncResponse = mock(AsynchronousResponse.class);
-		WorkflowContext workflowContext = createContext(asyncResponse);
-		String requestId = workflowContext.getRequestId();
-		WorkflowContext context1 = contextHolder.getWorkflowContext(requestId);
-
-		Assert.assertNotNull(context1);
-		Assert.assertEquals(requestId, context1.getRequestId());
-		Assert.assertEquals(workflowContext.getProcessKey(), context1.getProcessKey());
-		Assert.assertEquals(workflowContext.getStartTime(), context1.getStartTime());
-
-		Thread.sleep(1000);
-		//context should not be available after a second
-		WorkflowContext context2 = contextHolder.getWorkflowContext(requestId);
-		Assert.assertNull(context2);
-	}
-
-/*	@Test
-	public void testProcessCallback() {
-		WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
-		AsynchronousResponse asyncResponse = mock(AsynchronousResponse.class);
-		WorkflowContext workflowContext = createContext(asyncResponse);
-
-		WorkflowCallbackResponse callbackResponse = new WorkflowCallbackResponse();
-		callbackResponse.setMessage("Success");
-		callbackResponse.setResponse("Successfully processed request");
-		callbackResponse.setStatusCode(200);
-
-		Response response = contextHolder.processCallback("testAsyncProcess",
-			"process-instance-id", workflowContext.getRequestId(),
-			callbackResponse);
-		WorkflowResponse response1 = (WorkflowResponse) response.getEntity();
-		Assert.assertNotNull(response1.getMessage());
-		Assert.assertEquals(200,response1.getMessageCode());
-		Assert.assertEquals("Success", response1.getMessage());
-		Assert.assertEquals("Successfully processed request", response1.getContent());
-		verify(asyncResponse).setResponse(any(Response.class));
-
-		WorkflowContext context1 = contextHolder.getWorkflowContext(workflowContext.getRequestId());
-		Assert.assertNull(context1);
-	}*/
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
deleted file mode 100644
index de25107fcc..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ /dev/null
@@ -1,2094 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * 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.common;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.fail;

-import static org.openecomp.mso.bpmn.core.json.JsonUtils.getJsonValue;

-import static org.openecomp.mso.bpmn.core.json.JsonUtils.updJsonValue;

-

-import java.io.IOException;

-import java.io.StringReader;

-import java.lang.management.ManagementFactory;

-import java.lang.management.RuntimeMXBean;

-import java.lang.reflect.Field;

-import java.lang.reflect.Modifier;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.UUID;

-

-import javax.ws.rs.core.Response;

-import javax.xml.bind.JAXBException;

-import javax.xml.namespace.NamespaceContext;

-import javax.xml.namespace.QName;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.xpath.XPath;

-import javax.xml.xpath.XPathConstants;

-import javax.xml.xpath.XPathExpression;

-import javax.xml.xpath.XPathExpressionException;

-import javax.xml.xpath.XPathFactory;

-

-import org.camunda.bpm.engine.RuntimeService;

-import org.camunda.bpm.engine.history.HistoricProcessInstance;

-import org.camunda.bpm.engine.history.HistoricVariableInstance;

-import org.camunda.bpm.engine.runtime.ProcessInstance;

-import org.camunda.bpm.engine.test.ProcessEngineRule;

-import org.camunda.bpm.engine.variable.impl.VariableMapImpl;

-import org.custommonkey.xmlunit.DetailedDiff;

-import org.custommonkey.xmlunit.XMLUnit;

-import org.jboss.resteasy.spi.AsynchronousResponse;

-import org.json.JSONArray;

-import org.json.JSONObject;

-import org.junit.Before;

-import org.junit.Rule;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.CallbackHeader;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;

-import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.DeleteVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.MsoExceptionCategory;

-import org.openecomp.mso.bpmn.common.adapter.vnf.MsoRequest;

-import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;

-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;

-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.VnfAdapterNotifyServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

-import org.openecomp.mso.bpmn.core.PropertyConfigurationSetup;

-import org.openecomp.mso.bpmn.core.domain.Resource;

-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;

-import org.openecomp.mso.bpmn.core.utils.CamundaDBSetup;

-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 org.xml.sax.SAXException;

-

-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;

-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;

-import com.github.tomakehurst.wiremock.junit.WireMockRule;

-

-

-

-/**

- * A base class for Workflow tests.

- * <p>

- * WireMock response transformers may be specified by declaring public

- * static fields with the @WorkflowTestTransformer annotation. For example:

- * <pre>

- *     @WorkflowTestTransformer

- *     public static final ResponseTransformer sdncAdapterMockTransformer =

- *         new SDNCAdapterMockTransformer();

- * </pre>

- */

-public class WorkflowTest {

-	@Rule

-	public final ProcessEngineRule processEngineRule = new ProcessEngineRule();

-

-	@Rule

-	public final WireMockRule wireMockRule;

-

-	/**

-	 * Content-Type for XML.

-	 */

-	protected static final String XML = "application/xml";

-

-	/**

-	 * Content-Type for JSON.

-	 */

-	protected static final String JSON = "application/json; charset=UTF-8";

-

-

-	/**

-	 * Constructor.

-	 */

-	public WorkflowTest() throws RuntimeException {

-		// Process WorkflowTestTransformer annotations

-		List<ResponseTransformer> transformerList = new ArrayList<ResponseTransformer>();

-

-		for (Field field : getClass().getFields()) {

-			WorkflowTestTransformer annotation = field.getAnnotation(WorkflowTestTransformer.class);

-

-			if (annotation == null) {

-				continue;

-			}

-

-			if (!Modifier.isStatic(field.getModifiers())) {

-				throw new RuntimeException(field.getDeclaringClass().getName()

-					+ "#" + field.getName() + " has a @WorkflowTestTransformer "

-					+ " annotation but it is not declared static");

-			}

-

-			ResponseTransformer transformer;

-

-			try {

-				transformer = (ResponseTransformer) field.get(null);

-			} catch (IllegalAccessException e) {

-				throw new RuntimeException(field.getDeclaringClass().getName()

-					+ "#" + field.getName() + " is not accessible", e);

-			} catch (ClassCastException e) {

-				throw new RuntimeException(field.getDeclaringClass().getName()

-					+ "#" + field.getName() + " is not a ResponseTransformer", e);

-			}

-

-			if (transformer == null) {

-				continue;

-			}

-

-			transformerList.add(transformer);

-		}

-

-		ResponseTransformer[] transformerArray =

-			transformerList.toArray(new ResponseTransformer[transformerList.size()]);

-

-		wireMockRule = new WireMockRule(WireMockConfiguration.wireMockConfig()

-			.port(28090).extensions(transformerArray));

-	}

-

-	@Before

-	public void testSetup() throws Exception {

-		CamundaDBSetup.configure();

-		PropertyConfigurationSetup.init();

-	}

-

-	/**

-	 * The current request ID.  Normally set when an "invoke" method is called.

-	 */

-	protected volatile String msoRequestId = null;

-

-	/**

-	 * The current service instance ID.  Normally set when an "invoke" method

-	 * is called.

-	 */

-	protected volatile String msoServiceInstanceId = null;

-

-	/**

-	 * Logs a test start method.

-	 */

-	protected void logStart() {

-		StackTraceElement[] st = Thread.currentThread().getStackTrace();

-		String method = st[2].getMethodName();

-		System.out.println("STARTED TEST: " + method);

-	}

-

-	/**

-	 * Logs a test end method.

-	 */

-	protected void logEnd() {

-		StackTraceElement[] st = Thread.currentThread().getStackTrace();

-		String method = st[2].getMethodName();

-		System.out.println("ENDED TEST: " + method);

-	}

-

-	/**

-	 * Invokes a subprocess.

-	 * @param processKey the process key

-	 * @param businessKey a unique key that will identify the process instance

-	 * @param injectedVariables variables to inject into the process

-	 */

-	protected void invokeSubProcess(String processKey, String businessKey, Map<String, Object> injectedVariables) {

-		RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();

-		List<String> arguments = runtimeMxBean.getInputArguments();

-		System.out.println("JVM args = " + arguments);

-

-		msoRequestId = (String) injectedVariables.get("mso-request-id");

-		String requestId = (String) injectedVariables.get("msoRequestId");

-

-		if (msoRequestId == null && requestId == null) {

-			String msg = "mso-request-id variable was not provided";

-			System.out.println(msg);

-			fail(msg);

-		}

-

-		// Note: some scenarios don't have a service-instance-id, may be null

-		msoServiceInstanceId = (String) injectedVariables.get("mso-service-instance-id");

-

-		RuntimeService runtimeService = processEngineRule.getRuntimeService();

-		runtimeService.startProcessInstanceByKey(processKey, businessKey, injectedVariables);

-	}

-

-	/**

-	 * Invokes an asynchronous process.

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param processKey the process key

-	 * @param schemaVersion the API schema version, e.g. "v1"

-	 * @param businessKey a unique key that will identify the process instance

-	 * @param request the request

-	 * @return a TestAsyncResponse object associated with the test

-	 */

-	protected TestAsyncResponse invokeAsyncProcess(String processKey,

-			String schemaVersion, String businessKey, String request) {

-		return invokeAsyncProcess(processKey, schemaVersion, businessKey, request, null);

-	}

-

-	/**

-	 * Invokes an asynchronous process.

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param processKey the process key

-	 * @param schemaVersion the API schema version, e.g. "v1"

-	 * @param businessKey a unique key that will identify the process instance

-	 * @param request the request

-	 * @param injectedVariables optional variables to inject into the process

-	 * @return a TestAsyncResponse object associated with the test

-	 */

-	protected TestAsyncResponse invokeAsyncProcess(String processKey,

-			String schemaVersion, String businessKey, String request,

-			Map<String, Object> injectedVariables) {

-

-		RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();

-		List<String> arguments = runtimeMxBean.getInputArguments();

-		System.out.println("JVM args = " + arguments);

-

-		Map<String, Object> variables = createVariables(schemaVersion, businessKey,

-			request, injectedVariables, false);

-		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);

-

-		System.out.println("Sending " + request + " to " + processKey + " process");

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

-		workflowResource.setProcessEngineServices4junit(processEngineRule);

-

-		TestAsyncResponse asyncResponse = new TestAsyncResponse();

-		workflowResource.startProcessInstanceByKey(asyncResponse, processKey, variableMapImpl);

-		return asyncResponse;

-	}

-

-	/**

-	 * Invokes an asynchronous process.

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param processKey the process key

-	 * @param schemaVersion the API schema version, e.g. "v1"

-	 * @param businessKey a unique key that will identify the process instance

-	 * @param request the request

-	 * @param injectedVariables optional variables to inject into the process

-	 * @param serviceInstantiationModel indicates whether this method is being

-	 * invoked for a flow that is designed using the service instantiation model

-	 * @return a TestAsyncResponse object associated with the test

-	 */

-	protected TestAsyncResponse invokeAsyncProcess(String processKey,

-			String schemaVersion, String businessKey, String request,

-			Map<String, Object> injectedVariables, boolean serviceInstantiationModel) {

-

-		RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();

-		List<String> arguments = runtimeMxBean.getInputArguments();

-		System.out.println("JVM args = " + arguments);

-

-		Map<String, Object> variables = createVariables(schemaVersion, businessKey,

-			request, injectedVariables, serviceInstantiationModel);

-		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);

-

-		System.out.println("Sending " + request + " to " + processKey + " process");

-		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();

-		workflowResource.setProcessEngineServices4junit(processEngineRule);

-

-		TestAsyncResponse asyncResponse = new TestAsyncResponse();

-		workflowResource.startProcessInstanceByKey(asyncResponse, processKey, variableMapImpl);

-		return asyncResponse;

-	}

-

-	/**

-	 * Private helper method that creates a variable map for a request.

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param schemaVersion the API schema version, e.g. "v1"

-	 * @param businessKey a unique key that will identify the process instance

-	 * @param request the request

-	 * @param injectedVariables optional variables to inject into the process

-	 * @param serviceInstantiationModel indicates whether this method is being

-	 * invoked for a flow that is designed using the service instantiation model

-	 * @return a variable map

-	 */

-	private Map<String, Object> createVariables(String schemaVersion,

-			String businessKey, String request, Map<String, Object> injectedVariables,

-			boolean serviceInstantiationModel) {

-

-		Map<String, Object> variables = new HashMap<>();

-

-		// These variables may be overridded by injected variables.

-		variables.put("mso-service-request-timeout", "180");

-		variables.put("isDebugLogEnabled", "true");

-

-		// These variables may not be overridded by injected variables.

-		String[] notAllowed = new String[] {

-				"mso-schema-version",

-				"mso-business-key",

-				"bpmnRequest",

-				"mso-request-id",

-				"mso-service-instance-id"

-		};

-

-		if (injectedVariables != null) {

-			for (String key : injectedVariables.keySet()) {

-				for (String var : notAllowed) {

-					if (var.equals(key)) {

-						String msg = "Cannot specify " + var + " in injected variables";

-						System.out.println(msg);

-						fail(msg);

-					}

-				}

-

-				variables.put(key, injectedVariables.get(key));

-			}

-		}

-

-		variables.put("mso-schema-version", schemaVersion);

-		variables.put("mso-business-key", businessKey);

-		variables.put("bpmnRequest", request);

-

-		if (serviceInstantiationModel) {

-

-			/*

-			 * The request ID and the service instance ID are generated for flows

-			 * that follow the service instantiation model unless "requestId" and

-			 * "serviceInstanceId" are injected variables.

-			 */

-

-			try {

-				msoRequestId = (String) injectedVariables.get("requestId");

-				variables.put("mso-request-id", msoRequestId);

-				msoServiceInstanceId = (String) injectedVariables.get("serviceInstanceId");

-				variables.put("mso-service-instance-id", msoServiceInstanceId);

-			}

-			catch(Exception e) {

-			}

-			if (msoRequestId == null || msoRequestId.trim().equals("")) {

-				System.out.println("No requestId element in injectedVariables");

-				variables.put("mso-request-id", UUID.randomUUID().toString());

-			}

-			if (msoServiceInstanceId == null || msoServiceInstanceId.trim().equals("")) {

-				System.out.println("No seviceInstanceId element in injectedVariables");

-				variables.put("mso-service-instance-id", UUID.randomUUID().toString());

-			}

-

-		} else {

-			msoRequestId = getXMLTextElement(request, "request-id");

-

-			if (msoRequestId == null) {

-				//check in injected variables

-				try {

-					msoRequestId = (String) injectedVariables.get("requestId");

-				}

-				catch(Exception e) {

-				}

-				if (msoRequestId == null || msoRequestId.trim().equals("")) {

-					String msg = "No request-id element in " + request;

-					System.out.println(msg);

-					fail(msg);

-				}

-			}

-

-			variables.put("mso-request-id", msoRequestId);

-

-			// Note: some request types don't have a service-instance-id

-			msoServiceInstanceId = getXMLTextElement(request, "service-instance-id");

-

-			if (msoServiceInstanceId != null) {

-				variables.put("mso-service-instance-id", msoServiceInstanceId);

-			}

-		}

-

-		return variables;

-	}

-

-	/**

-	 * Private helper method that creates a camunda VariableMapImpl from a simple

-	 * variable map.

-	 * @param variables the simple variable map

-	 * @return a VariableMap

-	 */

-	private VariableMapImpl createVariableMapImpl(Map<String, Object> variables) {

-		Map<String, Object> wrappedVariables = new HashMap<>();

-

-		for (String key : variables.keySet()) {

-			Object value = variables.get(key);

-			wrappedVariables.put(key, wrapVariableValue(value));

-		}

-

-		VariableMapImpl variableMapImpl = new VariableMapImpl();

-		variableMapImpl.put("variables", wrappedVariables);

-		return variableMapImpl;

-	}

-

-	/**

-	 * Private helper method that wraps a variable value for inclusion in a

-	 * camunda VariableMapImpl.

-	 * @param value the variable value

-	 * @return the wrapped variable

-	 */

-	private Map<String, Object> wrapVariableValue(Object value) {

-		HashMap<String, Object> valueMap = new HashMap<>();

-		valueMap.put("value", value);

-		return valueMap;

-	}

-

-	/**

-	 * Receives a response from an asynchronous process.

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param businessKey the process business key

-	 * @param asyncResponse the TestAsyncResponse object associated with the test

-	 * @param timeout the timeout in milliseconds

-	 * @return the WorkflowResponse

-	 */

-	protected WorkflowResponse receiveResponse(String businessKey,

-			TestAsyncResponse asyncResponse, long timeout) {

-		System.out.println("Waiting " + timeout + "ms for process with business key " + businessKey

-			+ " to send a response");

-

-		long now = System.currentTimeMillis() + timeout;

-		long endTime = now + timeout;

-

-		while (now <= endTime) {

-			Response response = asyncResponse.getResponse();

-

-			if (response != null) {

-				System.out.println("Received a response from process with business key " + businessKey);

-

-				Object entity = response.getEntity();

-

-				if (!(entity instanceof WorkflowResponse)) {

-					String msg = "Response entity is " +

-						(entity == null ? "null" : entity.getClass().getName()) +

-						", expected WorkflowResponse";

-					System.out.println(msg);

-					fail(msg);

-					return null; // unreachable

-				}

-

-				return (WorkflowResponse) entity;

-			}

-

-			try {

-				Thread.sleep(200);

-			} catch (InterruptedException e) {

-				String msg = "Interrupted waiting for a response from process with business key " +

-					businessKey;

-				System.out.println(msg);

-				fail(msg);

-				return null; // unreachable

-			}

-

-			now = System.currentTimeMillis();

-		}

-

-		String msg = "No response received from process with business key " + businessKey +

-			" within " + timeout + "ms";

-		System.out.println(msg);

-		fail("Process with business key " + businessKey + " did not end within 10000ms");

-		return null; // unreachable

-	}

-

-	/**

-	 * Runs a program to inject SDNC callback data into the test environment.

-	 * A program is essentially just a list of keys that identify callback data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     reserve, assign, delete:ERR

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing callback data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectSDNCRestCallbacks(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-			String contentType = null;

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No callback defined for '" + action + "' SDNC request";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				contentType = callbackData.getContentType();

-			} else if ("ERR".equals(modifier)) {

-				content = "{\"SDNCServiceError\":{\"sdncRequestId\":\"((REQUEST-ID))\",\"responseCode\":\"500\",\"responseMessage\":\"SIMULATED ERROR FROM SDNC ADAPTER\",\"ackFinalIndicator\":\"Y\"}}";

-				contentType = JSON;

-			} else {

-				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (contentType == null) {

-				// Default for backward compatibility with existing tests.

-				contentType = JSON;

-			}

-

-			if (!injectSDNCRestCallback(contentType, content, 10000)) {

-				fail("Failed to inject SDNC '" + action + "' callback");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of SDNC '" + action + "' callback");

-			}

-		}

-	}

-

-	/**

-	 * Runs a program to inject SDNC events into the test environment.

-	 * A program is essentially just a list of keys that identify event data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     event1, event2

-	 * </pre>

-	 * NOTE: Each callback must have a message type associated with it, e.g.

-	 * "SDNCAEvent".

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing event data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectSDNCEvents(CallbackSet callbacks, String program) {

-		injectWorkflowMessages(callbacks, program);

-	}

-

-	/**

-	 * Runs a program to inject SDNC callback data into the test environment.

-	 * A program is essentially just a list of keys that identify callback data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     reserve, assign, delete:ERR

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing callback data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectSDNCCallbacks(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-			int respCode = 200;

-			String respMsg = "OK";

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No callback defined for '" + action + "' SDNC request";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				respCode = 200;

-				respMsg = "OK";

-			} else if ("CREATED".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No callback defined for '" + action + "' SDNC request";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				respCode = 201;

-				respMsg = "Created";

-			} else if ("ERR".equals(modifier)) {

-				content = "<svc-request-id>((REQUEST-ID))</svc-request-id><response-code>500</response-code><response-message>SIMULATED ERROR FROM SDNC ADAPTER</response-message>";

-				respCode = 500;

-				respMsg = "SERVER ERROR";

-			} else {

-				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (!injectSDNCCallback(respCode, respMsg, content, 10000)) {

-				fail("Failed to inject SDNC '" + action + "' callback");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of SDNC '" + action + "' callback");

-			}

-		}

-	}

-

-	/**

-	 * Runs a program to inject VNF adapter REST callback data into the test environment.

-	 * A program is essentially just a list of keys that identify callback data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     create, rollback

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing callback data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectVNFRestCallbacks(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-			String contentType = null;

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No callback defined for '" + action + "' VNF REST request";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				contentType = callbackData.getContentType();

-			} else if ("ERR".equals(modifier)) {

-				content = "SIMULATED ERROR FROM VNF ADAPTER";

-				contentType = "text/plain";

-			} else {

-				String msg = "Invalid VNF REST program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (contentType == null) {

-				// Default for backward compatibility with existing tests.

-				contentType = XML;

-			}

-

-			if (!injectVnfAdapterRestCallback(contentType, content, 10000)) {

-				fail("Failed to inject VNF REST '" + action + "' callback");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of VNF REST '" + action + "' callback");

-			}

-		}

-	}

-

-	/**

-	 * Runs a program to inject VNF callback data into the test environment.

-	 * A program is essentially just a list of keys that identify callback data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     createVnf, deleteVnf

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing callback data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectVNFCallbacks(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No callback defined for '" + action + "' VNF request";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-			} else if ("ERR".equals(modifier)) {

-				String msg = "Currently unsupported VNF program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			} else {

-				String msg = "Invalid VNF program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			boolean injected = false;

-

-			if (content.contains("createVnfNotification")) {

-				injected = injectCreateVNFCallback(content, 10000);

-			} else if (content.contains("deleteVnfNotification")) {

-				injected = injectDeleteVNFCallback(content, 10000);

-			} else if (content.contains("updateVnfNotification")) {

-				injected = injectUpdateVNFCallback(content, 10000);

-			}

-

-			if (!injected) {

-				String msg = "Failed to inject VNF '" + action + "' callback";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of VNF '" + action + "' callback");

-			}

-		}

-	}

-

-	/**

-	 * Waits for the number of running processes with the specified process

-	 * definition key to equal a particular count.

-	 * @param processKey the process definition key

-	 * @param count the desired count

-	 * @param timeout the timeout in milliseconds

-	 */

-	protected void waitForRunningProcessCount(String processKey, int count, long timeout) {

-		System.out.println("Waiting " + timeout + "ms for there to be " + count + " "

-			+ processKey + " instances");

-

-		long now = System.currentTimeMillis() + timeout;

-		long endTime = now + timeout;

-		int last = -1;

-

-		while (now <= endTime) {

-			int actual = processEngineRule.getRuntimeService()

-				.createProcessInstanceQuery()

-				.processDefinitionKey(processKey)

-				.list().size();

-

-			if (actual != last) {

-				System.out.println("There are now " + actual + " "

-					+ processKey + " instances");

-				last = actual;

-			}

-

-			if (actual == count) {

-				return;

-			}

-

-			try {

-				Thread.sleep(200);

-			} catch (InterruptedException e) {

-				String msg = "Interrupted waiting for there to be " + count + " "

-					+ processKey + " instances";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			now = System.currentTimeMillis();

-		}

-

-		String msg = "Timed out waiting for there to be " + count + " "

-			+ processKey + " instances";

-		System.out.println(msg);

-		fail(msg);

-	}

-

-	/**

-	 * Waits for the specified process variable to be set.

-	 * @param processKey the process definition key

-	 * @param variable the variable name

-	 * @param timeout the timeout in milliseconds

-	 * @return the variable value, or null if it cannot be obtained

-	 *         in the specified time

-	 */

-	protected Object getProcessVariable(String processKey, String variable,

-			long timeout) {

-

-		System.out.println("Waiting " + timeout + "ms for "

-			+ processKey + "." + variable + " to be set");

-

-		long now = System.currentTimeMillis() + timeout;

-		long endTime = now + timeout;

-

-		ProcessInstance processInstance = null;

-		Object value = null;

-

-		while (value == null) {

-			if (now > endTime) {

-				if (processInstance == null) {

-					System.out.println("Timed out waiting for "

-						+ processKey + " to start");

-				} else {

-					System.out.println("Timed out waiting for "

-						+ processKey + "[" + processInstance.getId()

-						+ "]." + variable + " to be set");

-				}

-

-				return null;

-			}

-

-			if (processInstance == null) {

-				processInstance = processEngineRule.getRuntimeService()

-					.createProcessInstanceQuery()

-					.processDefinitionKey(processKey)

-					.singleResult();

-			}

-

-			if (processInstance != null) {

-				value = processEngineRule.getRuntimeService()

-					.getVariable(processInstance.getId(), variable);

-			}

-

-			try {

-				Thread.sleep(200);

-			} catch (InterruptedException e) {

-				System.out.println("Interrupted waiting for "

-					+ processKey + "." + variable + " to be set");

-				return null;

-			}

-

-			now = System.currentTimeMillis();

-		}

-

-		System.out.println(processKey + "["

-			+ processInstance.getId() + "]." + variable + "="

-			+ value);

-

-		return value;

-	}

-

-	/**

-	 * Injects a single SDNC adapter callback request. The specified callback data

-	 * may contain the placeholder string ((REQUEST-ID)) which is replaced with

-	 * the actual SDNC request ID. Note: this is not the requestId in the original

-	 * MSO request.

-	 * @param contentType the HTTP content type for the callback

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 */

-	protected boolean injectSDNCRestCallback(String contentType, String content, long timeout) {

-		String sdncRequestId = (String) getProcessVariable("SDNCAdapterRestV1",

-			"SDNCAResponse_CORRELATOR", timeout);

-

-		if (sdncRequestId == null) {

-			return false;

-		}

-

-		content = content.replace("((REQUEST-ID))", sdncRequestId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{REQUEST-ID}}", sdncRequestId);

-

-		System.out.println("Injecting SDNC adapter callback");

-		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

-		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(contentType, "SDNCAResponse", sdncRequestId, content);

-		System.out.println("Workflow response to SDNC adapter callback: " + response);

-		return true;

-	}

-

-	/**

-	 * Injects a single SDNC adapter callback request. The specified callback data

-	 * may contain the placeholder string ((REQUEST-ID)) which is replaced with

-	 * the actual SDNC request ID. Note: this is not the requestId in the original

-	 * MSO request.

-	 * @param content the content of the callback

-	 * @param respCode the response code (normally 200)

-	 * @param respMsg the response message (normally "OK")

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 */

-	protected boolean injectSDNCCallback(int respCode, String respMsg,

-			String content, long timeout) {

-

-		String sdncRequestId = (String) getProcessVariable("sdncAdapter",

-			"SDNCA_requestId", timeout);

-

-		if (sdncRequestId == null) {

-			return false;

-		}

-

-		content = content.replace("((REQUEST-ID))", sdncRequestId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{REQUEST-ID}}", sdncRequestId);

-

-		System.out.println("Injecting SDNC adapter callback");

-		CallbackHeader callbackHeader = new CallbackHeader();

-		callbackHeader.setRequestId(sdncRequestId);

-		callbackHeader.setResponseCode(String.valueOf(respCode));

-		callbackHeader.setResponseMessage(respMsg);

-		SDNCAdapterCallbackRequest sdncAdapterCallbackRequest = new SDNCAdapterCallbackRequest();

-		sdncAdapterCallbackRequest.setCallbackHeader(callbackHeader);

-		sdncAdapterCallbackRequest.setRequestData(content);

-		SDNCAdapterCallbackServiceImpl callbackService = new SDNCAdapterCallbackServiceImpl();

-		callbackService.setProcessEngineServices4junit(processEngineRule);

-		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

-		System.out.println("Workflow response to SDNC adapter callback: " + sdncAdapterResponse);

-

-		return true;

-	}

-

-	/**

-	 * Injects a single VNF adapter callback request. The specified callback data

-	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

-	 * the actual message ID. Note: this is not the requestId in the original

-	 * MSO request.

-	 * @param contentType the HTTP content type for the callback

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 */

-	protected boolean injectVnfAdapterRestCallback(String contentType, String content, long timeout) {

-		String messageId = (String) getProcessVariable("vnfAdapterRestV1",

-			"VNFAResponse_CORRELATOR", timeout);

-

-		if (messageId == null) {

-			return false;

-		}

-

-		content = content.replace("((MESSAGE-ID))", messageId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{MESSAGE-ID}}", messageId);

-

-		System.out.println("Injecting VNF adapter callback");

-		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

-		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(contentType, "VNFAResponse", messageId, content);

-		System.out.println("Workflow response to VNF adapter callback: " + response);

-		return true;

-	}

-

-	/**

-	 * Injects a Create VNF adapter callback request. The specified callback data

-	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

-	 * the actual message ID.  It may also contain the placeholder string

-	 * ((REQUEST-ID)) which is replaced request ID of the original MSO request.

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 * @throws JAXBException if the content does not adhere to the schema

-	 */

-	protected boolean injectCreateVNFCallback(String content, long timeout) {

-

-		String messageId = (String) getProcessVariable("vnfAdapterCreateV1",

-			"VNFC_messageId", timeout);

-

-		if (messageId == null) {

-			return false;

-		}

-

-		content = content.replace("((MESSAGE-ID))", messageId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{MESSAGE-ID}}", messageId);

-

-		if(content.contains("((REQUEST-ID))")){

-			content = content.replace("((REQUEST-ID))", msoRequestId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-			content = content.replace("{{REQUEST-ID}}", msoRequestId);

-		}

-

-		System.out.println("Injecting VNF adapter callback");

-

-		// Is it possible to unmarshal this with JAXB?  I couldn't.

-

-		CreateVnfNotification createVnfNotification = new CreateVnfNotification();

-		XPathTool xpathTool = new VnfNotifyXPathTool();

-		xpathTool.setXML(content);

-

-		try {

-			String completed = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:completed/text()");

-			createVnfNotification.setCompleted("true".equals(completed));

-

-			String vnfId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:vnfId/text()");

-			createVnfNotification.setVnfId(vnfId);

-

-			NodeList entries = (NodeList) xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:outputs/tns:entry",

-				XPathConstants.NODESET);

-

-			CreateVnfNotificationOutputs outputs = new CreateVnfNotificationOutputs();

-

-			for (int i = 0; i < entries.getLength(); i++) {

-				Node node = entries.item(i);

-

-				if (node.getNodeType() == Node.ELEMENT_NODE) {

-					Element entry = (Element) node;

-					String key = entry.getElementsByTagNameNS("*", "key").item(0).getTextContent();

-					String value = entry.getElementsByTagNameNS("*", "value").item(0).getTextContent();

-					outputs.add(key, value);

-				}

-			}

-

-			createVnfNotification.setOutputs(outputs);

-

-			VnfRollback rollback = new VnfRollback();

-

-			String cloudSiteId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:cloudSiteId/text()");

-			rollback.setCloudSiteId(cloudSiteId);

-

-			String requestId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:msoRequest/tns:requestId/text()");

-			String serviceInstanceId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:msoRequest/tns:serviceInstanceId/text()");

-

-			if (requestId != null || serviceInstanceId != null) {

-				MsoRequest msoRequest = new MsoRequest();

-				msoRequest.setRequestId(requestId);

-				msoRequest.setServiceInstanceId(serviceInstanceId);

-				rollback.setMsoRequest(msoRequest);

-			}

-

-			String tenantCreated = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:tenantCreated/text()");

-			rollback.setTenantCreated("true".equals(tenantCreated));

-

-			String tenantId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:tenantId/text()");

-			rollback.setTenantId(tenantId);

-

-			String vnfCreated = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:vnfCreated/text()");

-			rollback.setVnfCreated("true".equals(vnfCreated));

-

-			String rollbackVnfId = xpathTool.evaluate(

-				"/tns:createVnfNotification/tns:rollback/tns:vnfId/text()");

-			rollback.setVnfId(rollbackVnfId);

-

-			createVnfNotification.setRollback(rollback);

-

-		} catch (Exception e) {

-			System.out.println("Failed to unmarshal VNF callback content:");

-			System.out.println(content);

-			return false;

-		}

-

-		VnfAdapterNotifyServiceImpl notifyService = new VnfAdapterNotifyServiceImpl();

-		notifyService.setProcessEngineServices4junit(processEngineRule);

-

-		notifyService.createVnfNotification(

-			messageId,

-			createVnfNotification.isCompleted(),

-			createVnfNotification.getException(),

-			createVnfNotification.getErrorMessage(),

-			createVnfNotification.getVnfId(),

-			createVnfNotification.getOutputs(),

-			createVnfNotification.getRollback());

-

-		return true;

-	}

-

-	/**

-	 * Injects a Delete VNF adapter callback request. The specified callback data

-	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

-	 * the actual message ID.  It may also contain the placeholder string

-	 * ((REQUEST-ID)) which is replaced request ID of the original MSO request.

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 * @throws JAXBException if the content does not adhere to the schema

-	 */

-	protected boolean injectDeleteVNFCallback(String content, long timeout) {

-

-		String messageId = (String) getProcessVariable("vnfAdapterDeleteV1",

-			"VNFDEL_uuid", timeout);

-

-		if (messageId == null) {

-			return false;

-		}

-

-		content = content.replace("((MESSAGE-ID))", messageId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{MESSAGE-ID}}", messageId);

-

-		System.out.println("Injecting VNF adapter delete callback");

-

-		// Is it possible to unmarshal this with JAXB?  I couldn't.

-

-		DeleteVnfNotification deleteVnfNotification = new DeleteVnfNotification();

-		XPathTool xpathTool = new VnfNotifyXPathTool();

-		xpathTool.setXML(content);

-

-		try {

-			String completed = xpathTool.evaluate(

-				"/tns:deleteVnfNotification/tns:completed/text()");

-			deleteVnfNotification.setCompleted("true".equals(completed));

-			// if notification failure, set the exception and error message

-			if (deleteVnfNotification.isCompleted() == false) {

-				deleteVnfNotification.setException(MsoExceptionCategory.INTERNAL);

-				deleteVnfNotification.setErrorMessage(xpathTool.evaluate(

-						"/tns:deleteVnfNotification/tns:errorMessage/text()")) ;

-			}

-

-		} catch (Exception e) {

-			System.out.println("Failed to unmarshal VNF Delete callback content:");

-			System.out.println(content);

-			return false;

-		}

-

-		VnfAdapterNotifyServiceImpl notifyService = new VnfAdapterNotifyServiceImpl();

-		notifyService.setProcessEngineServices4junit(processEngineRule);

-

-		notifyService.deleteVnfNotification(

-			messageId,

-			deleteVnfNotification.isCompleted(),

-			deleteVnfNotification.getException(),

-			deleteVnfNotification.getErrorMessage());

-

-		return true;

-	}

-

-	/**

-	 * Injects a Update VNF adapter callback request. The specified callback data

-	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

-	 * the actual message ID.  It may also contain the placeholder string

-	 * ((REQUEST-ID)) which is replaced request ID of the original MSO request.

-	 * @param content the content of the callback

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the callback could be injected, false otherwise

-	 * @throws JAXBException if the content does not adhere to the schema

-	 */

-	protected boolean injectUpdateVNFCallback(String content, long timeout) {

-

-		String messageId = (String) getProcessVariable("vnfAdapterUpdate",

-			"VNFU_messageId", timeout);

-

-		if (messageId == null) {

-			return false;

-		}

-

-		content = content.replace("((MESSAGE-ID))", messageId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{MESSAGE-ID}}", messageId);

-

-		content = content.replace("((REQUEST-ID))", msoRequestId);

-		// Deprecated usage.  All test code should switch to the (( ... )) syntax.

-		content = content.replace("{{REQUEST-ID}}", msoRequestId);

-

-		System.out.println("Injecting VNF adapter callback");

-

-		// Is it possible to unmarshal this with JAXB?  I couldn't.

-

-		UpdateVnfNotification updateVnfNotification = new UpdateVnfNotification();

-		XPathTool xpathTool = new VnfNotifyXPathTool();

-		xpathTool.setXML(content);

-

-		try {

-			String completed = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:completed/text()");

-			updateVnfNotification.setCompleted("true".equals(completed));

-

-			NodeList entries = (NodeList) xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:outputs/tns:entry",

-				XPathConstants.NODESET);

-

-			UpdateVnfNotificationOutputs outputs = new UpdateVnfNotificationOutputs();

-

-			for (int i = 0; i < entries.getLength(); i++) {

-				Node node = entries.item(i);

-

-				if (node.getNodeType() == Node.ELEMENT_NODE) {

-					Element entry = (Element) node;

-					String key = entry.getElementsByTagNameNS("*", "key").item(0).getTextContent();

-					String value = entry.getElementsByTagNameNS("*", "value").item(0).getTextContent();

-					outputs.add(key, value);

-				}

-			}

-

-			updateVnfNotification.setOutputs(outputs);

-

-			VnfRollback rollback = new VnfRollback();

-

-			String cloudSiteId = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:cloudSiteId/text()");

-			rollback.setCloudSiteId(cloudSiteId);

-

-			String requestId = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:msoRequest/tns:requestId/text()");

-			String serviceInstanceId = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:msoRequest/tns:serviceInstanceId/text()");

-

-			if (requestId != null || serviceInstanceId != null) {

-				MsoRequest msoRequest = new MsoRequest();

-				msoRequest.setRequestId(requestId);

-				msoRequest.setServiceInstanceId(serviceInstanceId);

-				rollback.setMsoRequest(msoRequest);

-			}

-

-			String tenantCreated = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:tenantCreated/text()");

-			rollback.setTenantCreated("true".equals(tenantCreated));

-

-			String tenantId = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:tenantId/text()");

-			rollback.setTenantId(tenantId);

-

-			String vnfCreated = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:vnfCreated/text()");

-			rollback.setVnfCreated("true".equals(vnfCreated));

-

-			String rollbackVnfId = xpathTool.evaluate(

-				"/tns:updateVnfNotification/tns:rollback/tns:vnfId/text()");

-			rollback.setVnfId(rollbackVnfId);

-

-			updateVnfNotification.setRollback(rollback);

-

-		} catch (Exception e) {

-			System.out.println("Failed to unmarshal VNF callback content:");

-			System.out.println(content);

-			return false;

-		}

-

-		VnfAdapterNotifyServiceImpl notifyService = new VnfAdapterNotifyServiceImpl();

-		notifyService.setProcessEngineServices4junit(processEngineRule);

-

-		notifyService.updateVnfNotification(

-			messageId,

-			updateVnfNotification.isCompleted(),

-			updateVnfNotification.getException(),

-			updateVnfNotification.getErrorMessage(),

-			updateVnfNotification.getOutputs(),

-			updateVnfNotification.getRollback());

-

-		return true;

-	}

-

-	/**

-	 * Runs a program to inject workflow messages into the test environment.

-	 * A program is essentially just a list of keys that identify event data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     event1, event2

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * NOTE: Each callback must have a workflow message type associated with it.

-	 * @param callbacks an object containing event data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectWorkflowMessages(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String messageType = null;

-			String content = null;

-			String contentType = null;

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No '" + action + "' workflow message callback is defined";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				messageType = callbackData.getMessageType();

-

-				if (messageType == null || messageType.trim().equals("")) {

-					String msg = "No workflow message type is defined in the '" + action + "' callback";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				contentType = callbackData.getContentType();

-			} else {

-				String msg = "Invalid workflow message program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (!injectWorkflowMessage(contentType, messageType, content, 10000)) {

-				fail("Failed to inject '" + action + "' workflow message");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of '" + action + "' workflow message");

-			}

-		}

-	}

-

-	/**

-	 * Injects a workflow message. The specified callback data may contain the

-	 * placeholder string ((CORRELATOR)) which is replaced with the actual

-	 * correlator value.

-	 * @param contentType the HTTP contentType for the message (possibly null)

-	 * @param messageType the message type

-	 * @param content the message content (possibly null)

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the message could be injected, false otherwise

-	 */

-	protected boolean injectWorkflowMessage(String contentType, String messageType, String content, long timeout) {

-		String correlator = (String) getProcessVariable("ReceiveWorkflowMessage",

-			messageType + "_CORRELATOR", timeout);

-

-		if (correlator == null) {

-			return false;

-		}

-

-		if (content != null) {

-			content = content.replace("((CORRELATOR))", correlator);

-		}

-

-		System.out.println("Injecting " + messageType + " message");

-		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

-		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(contentType, messageType, correlator, content);

-		System.out.println("Workflow response to " + messageType + " message: " + response);

-		return true;

-	}

-

-	/**

-	 * Runs a program to inject sniro workflow messages into the test environment.

-	 * A program is essentially just a list of keys that identify event data

-	 * to be injected, in sequence. For more details, see

-	 * injectSNIROCallbacks(String contentType, String messageType, String content, long timeout)

-	 *

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * NOTE: Each callback must have a workflow message type associated with it.

-	 *

-	 * @param callbacks an object containing event data for the program

-	 * @param program the program to execute

-	 */

-	protected void injectSNIROCallbacks(CallbackSet callbacks, String program) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String messageType = null;

-			String content = null;

-			String contentType = null;

-

-			if ("STD".equals(modifier)) {

-				CallbackData callbackData = callbacks.get(action);

-

-				if (callbackData == null) {

-					String msg = "No '" + action + "' workflow message callback is defined";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				messageType = callbackData.getMessageType();

-

-				if (messageType == null || messageType.trim().equals("")) {

-					String msg = "No workflow message type is defined in the '" + action + "' callback";

-					System.out.println(msg);

-					fail(msg);

-				}

-

-				content = callbackData.getContent();

-				contentType = callbackData.getContentType();

-			} else {

-				String msg = "Invalid workflow message program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (!injectSNIROCallbacks(contentType, messageType, content, 10000)) {

-				fail("Failed to inject '" + action + "' workflow message");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of '" + action + "' workflow message");

-			}

-		}

-	}

-

-	/**

-	 * Injects a sniro workflow message. The specified callback response may

-	 * contain the placeholder strings ((CORRELATOR)) and ((SERVICE_RESOURCE_ID))

-	 * The ((CORRELATOR)) is replaced with the actual correlator value from the

-	 * request. The ((SERVICE_RESOURCE_ID)) is replaced with the actual serviceResourceId

-	 * value from the sniro request. Currently this only works with sniro request

-	 * that contain only 1 resource.

-	 *

-	 * @param contentType the HTTP contentType for the message (possibly null)

-	 * @param messageType the message type

-	 * @param content the message content (possibly null)

-	 * @param timeout the timeout in milliseconds

-	 * @return true if the message could be injected, false otherwise

-	 */

-	protected boolean injectSNIROCallbacks(String contentType, String messageType, String content, long timeout) {

-		String correlator = (String) getProcessVariable("ReceiveWorkflowMessage",

-			messageType + "_CORRELATOR", timeout);

-

-		if (correlator == null) {

-			return false;

-		}

-		if (content != null) {

-			content = content.replace("((CORRELATOR))", correlator);

-			if(messageType.equalsIgnoreCase("SNIROResponse")){

-				//TODO figure out a solution for when there is more than 1 resource being homed (i.e. more than 1 reason in the placement list)

-				ServiceDecomposition decomp = (ServiceDecomposition) getProcessVariable("Homing", "serviceDecomposition", timeout);

-				List<Resource> resourceList = decomp.getServiceResources();

-				if(resourceList.size() == 1){

-					String resourceId = "";

-					for(Resource resource:resourceList){

-						resourceId = resource.getResourceId();

-					}

-					//TODO.. most other locations refer to solutionInfo.placementInfo 

-					String homingList = getJsonValue(content, "solutionInfo.placement");

-					JSONArray placementArr = null;

-					try {

-						placementArr = new JSONArray(homingList);

-					}

-					catch (Exception e) {

-						return false;

-					}

-					if(placementArr.length() == 1){

-						content = content.replace("((SERVICE_RESOURCE_ID))", resourceId);

-					}

-					String licenseInfoList = getJsonValue(content, "solutionInfo.licenseInfo");

-					JSONArray licenseArr = null;

-					try {

-						licenseArr = new JSONArray(licenseInfoList);

-					}

-					catch (Exception e) {

-						return false;

-					}

-					if(licenseArr.length() == 1){

-						content = content.replace("((SERVICE_RESOURCE_ID))", resourceId);

-					}

-				}

-				else {

-					try {

-						String homingList = getJsonValue(content, "solutionInfo.placement");

-						String licenseInfoList = getJsonValue(content, "solutionInfo.licenseInfo");

-						JSONArray placementArr = new JSONArray(homingList);

-						JSONArray licenseArr = new JSONArray(licenseInfoList);

-						for (Resource resource: resourceList) {

-							String resourceModuleName = resource.getModelInfo().getModelInstanceName();

-							String resourceId = resource.getResourceId();

-

-							for (int i=0; i<placementArr.length(); i++) {

-								JSONObject placementObj = placementArr.getJSONObject(i);

-								String placementModuleName = placementObj.getString("resourceModuleName");

-								if (placementModuleName.equalsIgnoreCase(resourceModuleName)) {

-									String placementString = placementObj.toString();

-									placementString = placementString.replace("((SERVICE_RESOURCE_ID))", resourceId);

-									JSONObject newPlacementObj = new JSONObject(placementString);

-									placementArr.put(i, newPlacementObj);

-								}

-							}

-							

-							for (int i=0; i<licenseArr.length(); i++) {

-								JSONObject licenseObj = licenseArr.getJSONObject(i);

-								String licenseModuleName = licenseObj.getString("resourceModuleName");

-								if (licenseModuleName.equalsIgnoreCase(resourceModuleName)) {

-									String licenseString = licenseObj.toString();

-									licenseString = licenseString.replace("((SERVICE_RESOURCE_ID))", resourceId);

-									JSONObject newLicenseObj = new JSONObject(licenseString);

-									licenseArr.put(i, newLicenseObj);

-								}

-							}

-						}

-						String newPlacementInfos = placementArr.toString();

-						String newLicenseInfos = licenseArr.toString();

-						content = updJsonValue(content, "solutionInfo.placement", newPlacementInfos);

-						content = updJsonValue(content, "solutionInfo.licenseInfo", newLicenseInfos);

-					}

-					catch(Exception e) {

-						return false;

-					}

-					

-				}

-			}

-		}

-		System.out.println("Injecting " + messageType + " message");

-		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

-		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(contentType, messageType, correlator, content);

-		System.out.println("Workflow response to " + messageType + " message: " + response);

-		return true;

-	}

-

-

-	/**

-	 * Wait for the process to end.

-	 * @param businessKey the process business key

-	 * @param timeout the amount of time to wait, in milliseconds

-	 */

-	protected void waitForProcessEnd(String businessKey, long timeout) {

-		System.out.println("Waiting " + timeout + "ms for process with business key " +

-			businessKey + " to end");

-

-		long now = System.currentTimeMillis() + timeout;

-		long endTime = now + timeout;

-

-		while (now <= endTime) {

-			if (isProcessEnded(businessKey)) {

-				System.out.println("Process with business key " + businessKey + " has ended");

-				return;

-			}

-

-			try {

-				Thread.sleep(200);

-			} catch (InterruptedException e) {

-				String msg = "Interrupted waiting for process with business key " +

-					businessKey + " to end";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			now = System.currentTimeMillis();

-		}

-

-		String msg = "Process with business key " + businessKey +

-			" did not end within " + timeout + "ms";

-		System.out.println(msg);

-		fail(msg);

-	}

-

-	/**

-	 * Verifies that the specified historic process variable has the specified value.

-	 * If the variable does not have the specified value, the test is failed.

-	 * @param businessKey the process business key

-	 * @param variable the variable name

-	 * @param value the expected variable value

-	 */

-	protected void checkVariable(String businessKey, String variable, Object value) {

-		if (!isProcessEnded(businessKey)) {

-			fail("Cannot get historic variable " + variable + " because process with business key " +

-				businessKey + " has not ended");

-		}

-

-		Object variableValue = getVariableFromHistory(businessKey, variable);

-		assertEquals(value, variableValue);

-	}

-

-	/**

-	 * Checks to see if the specified process is ended.

-	 * @param businessKey the process business Key

-	 * @return true if the process is ended

-	 */

-	protected boolean isProcessEnded(String businessKey) {

-		HistoricProcessInstance processInstance = processEngineRule.getHistoryService()

-			.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).singleResult();

-		return processInstance != null && processInstance.getEndTime() != null;

-	}

-

-	/**

-	 * Gets a variable value from a historical process instance.

-	 * @param businessKey the process business key

-	 * @param variableName the variable name

-	 * @return the variable value, or null if the variable could not be

-	 * obtained

-	 */

-	protected Object getVariableFromHistory(String businessKey, String variableName) {

-		try {

-			HistoricProcessInstance processInstance = processEngineRule.getHistoryService()

-				.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).singleResult();

-

-			if (processInstance == null) {

-				return null;

-			}

-

-			HistoricVariableInstance v = processEngineRule.getHistoryService()

-				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

-				.variableName(variableName).singleResult();

-			return v == null ? null : v.getValue();

-		} catch (Exception e) {

-			System.out.println("Error retrieving variable " + variableName +

-				" from historical process with business key " + businessKey + ": " + e);

-			return null;

-		}

-	}

-

-	/**

-	 * Gets the value of a subflow variable from the specified subflow's

-	 * historical process instance.

-	 *

-	 * @param subflowName - the name of the subflow that contains the variable

-	 * @param variableName the variable name

-	 *

-	 * @return the variable value, or null if the variable could not be obtained

-	 *

-	 */

-	protected Object getVariableFromSubflowHistory(String subflowName, String variableName) {

-		try {

-			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

-					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

-

-			if (processInstanceList == null) {

-				return null;

-			}

-

-			processInstanceList.sort((m1, m2) -> m1.getStartTime().compareTo(m2.getStartTime()));

-

-			HistoricProcessInstance processInstance = processInstanceList.get(0);

-

-			HistoricVariableInstance v = processEngineRule.getHistoryService()

-				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

-				.variableName(variableName).singleResult();

-			return v == null ? null : v.getValue();

-		} catch (Exception e) {

-			System.out.println("Error retrieving variable " + variableName +

-					" from sub flow: " + subflowName + ", Exception is: " + e);

-			return null;

-		}

-	}

-

-	/**

-	 * Gets the value of a subflow variable from the subflow's

-	 * historical process x instance.

-	 *

-	 * @param subflowName - the name of the subflow that contains the variable

-	 * @param variableName the variable name

-	 * @param subflowInstanceIndex - the instance of the subflow (use when same subflow is called more than once from mainflow)

-	 *

-	 * @return the variable value, or null if the variable could not be obtained

-	 */

-	protected Object getVariableFromSubflowHistory(int subflowInstanceIndex, String subflowName, String variableName) {

-		try {

-			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

-					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

-

-			if (processInstanceList == null) {

-				return null;

-			}

-

-			processInstanceList.sort((m1, m2) -> m1.getStartTime().compareTo(m2.getStartTime()));

-

-			HistoricProcessInstance processInstance = processInstanceList.get(subflowInstanceIndex);

-

-			HistoricVariableInstance v = processEngineRule.getHistoryService()

-				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

-				.variableName(variableName).singleResult();

-			return v == null ? null : v.getValue();

-		} catch (Exception e) {

-			System.out.println("Error retrieving variable " + variableName +

-				" from " + subflowInstanceIndex + " instance index of sub flow: " + subflowName + ", Exception is: " + e);

-			return null;

-		}

-	}

-

-

-	/**

-	 * Extracts text from an XML element. This method is not namespace aware

-	 * (namespaces are ignored).  The first matching element is selected.

-	 * @param xml the XML document or fragment

-	 * @param tag the desired element, e.g. "<name>"

-	 * @return the element text, or null if the element was not found

-	 */

-	protected String getXMLTextElement(String xml, String tag) {

-		xml = removeXMLNamespaces(xml);

-

-		if (!tag.startsWith("<")) {

-			tag = "<" + tag + ">";

-		}

-

-		int start = xml.indexOf(tag);

-

-		if (start == -1) {

-			return null;

-		}

-

-		int end = xml.indexOf('<', start + tag.length());

-

-		if (end == -1) {

-			return null;

-		}

-

-		return xml.substring(start + tag.length(), end);

-	}

-

-	/**

-	 * Removes namespace definitions and prefixes from XML, if any.

-	 */

-	private String removeXMLNamespaces(String xml) {

-		// remove xmlns declaration

-		xml = xml.replaceAll("xmlns.*?(\"|\').*?(\"|\')", "");

-

-		// remove opening tag prefix

-		xml = xml.replaceAll("(<)(\\w+:)(.*?>)", "$1$3");

-

-		// remove closing tags prefix

-		xml = xml.replaceAll("(</)(\\w+:)(.*?>)", "$1$3");

-

-		// remove extra spaces left when xmlns declarations are removed

-		xml = xml.replaceAll("\\s+>", ">");

-

-		return xml;

-	}

-

-	/**

-	 * Asserts that two XML documents are semantically equivalent.  Differences

-	 * in whitespace or in namespace usage do not affect the comparison.

-	 * @param expected the expected XML

-	 * @param actual the XML to test

-	 * @throws SAXException

-	 * @throws IOException

-	 */

-    public static void assertXMLEquals(String expected, String actual)

-    		throws SAXException, IOException {

-    	XMLUnit.setIgnoreWhitespace(true);

-    	XMLUnit.setIgnoreAttributeOrder(true);

-    	DetailedDiff diff = new DetailedDiff(XMLUnit.compareXML(expected, actual));

-    	List<?> allDifferences = diff.getAllDifferences();

-    	assertEquals("Differences found: " + diff.toString(), 0, allDifferences.size());

-    }

-

-	/**

-	 * A test implementation of AsynchronousResponse.

-	 */

-	public class TestAsyncResponse implements AsynchronousResponse {

-		Response response = null;

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public synchronized void setResponse(Response response) {

-			this.response = response;

-		}

-

-		/**

-		 * Gets the response.

-		 * @return the response, or null if none has been produced yet

-		 */

-		public synchronized Response getResponse() {

-			return response;

-		}

-	}

-

-	/**

-	 * An object that contains callback data for a "program".

-	 */

-	public class CallbackSet {

-		private final Map<String, CallbackData> map = new HashMap<>();

-

-		/**

-		 * Add untyped callback data to the set.

-		 * @param action the action with which the data is associated

-		 * @param content the callback data

-		 */

-		public void put(String action, String content) {

-			map.put(action, new CallbackData(null, null, content));

-		}

-

-		/**

-		 * Add callback data to the set.

-		 * @param action the action with which the data is associated

-		 * @param messageType the callback message type

-		 * @param content the callback data

-		 */

-		public void put(String action, String messageType, String content) {

-			map.put(action, new CallbackData(null, messageType, content));

-		}

-

-		/**

-		 * Add callback data to the set.

-		 * @param action the action with which the data is associated

-		 * @param contentType the callback HTTP content type

-		 * @param messageType the callback message type

-		 * @param content the callback data

-		 */

-		public void put(String action, String contentType, String messageType, String content) {

-			map.put(action, new CallbackData(contentType, messageType, content));

-		}

-

-		/**

-		 * Retrieve callback data from the set.

-		 * @param action the action with which the data is associated

-		 * @return the callback data, or null if there is none for the specified operation

-		 */

-		public CallbackData get(String action) {

-			return map.get(action);

-		}

-	}

-

-	/**

-	 * Represents a callback data item.

-	 */

-	public class CallbackData {

-		private final String contentType;

-		private final String messageType;

-		private final String content;

-

-		/**

-		 * Constructor

-		 * @param contentType the HTTP content type (optional)

-		 * @param messageType the callback message type (optional)

-		 * @param content the content

-		 */

-		public CallbackData(String contentType, String messageType, String content) {

-			this.contentType = contentType;

-			this.messageType = messageType;

-			this.content = content;

-		}

-

-		/**

-		 * Gets the callback HTTP content type, possibly null.

-		 */

-		public String getContentType() {

-			return contentType;

-		}

-

-		/**

-		 * Gets the callback message type, possibly null.

-		 */

-		public String getMessageType() {

-			return messageType;

-		}

-

-		/**

-		 * Gets the callback content.

-		 */

-		public String getContent() {

-			return content;

-		}

-	}

-

-	/**

-	 * A tool for evaluating XPath expressions.

-	 */

-	protected class XPathTool {

-		private final DocumentBuilderFactory factory;

-		private final SimpleNamespaceContext context = new SimpleNamespaceContext();

-		private final XPath xpath = XPathFactory.newInstance().newXPath();

-		private String xml = null;

-		private Document doc = null;

-

-		/**

-		 * Constructor.

-		 */

-		public XPathTool() {

-			factory = DocumentBuilderFactory.newInstance();

-			factory.setNamespaceAware(true);

-			xpath.setNamespaceContext(context);

-		}

-

-		/**

-		 * Adds a namespace.

-		 * @param prefix the namespace prefix

-		 * @param uri the namespace uri

-		 */

-		public synchronized void addNamespace(String prefix, String uri) {

-			context.add(prefix, uri);

-		}

-

-		/**

-		 * Sets the XML content to be operated on.

-		 * @param xml the XML content

-		 */

-		public synchronized void setXML(String xml) {

-			this.xml = xml;

-			this.doc = null;

-		}

-

-		/**

-		 * Returns the document object.

-		 * @return the document object, or null if XML has not been set

-		 * @throws SAXException

-		 * @throws IOException

-		 * @throws ParserConfigurationException

-		 */

-		public synchronized Document getDocument()

-				throws ParserConfigurationException, IOException, SAXException {

-			if (xml == null) {

-				return null;

-			}

-

-			buildDocument();

-			return doc;

-		}

-

-		/**

-		 * Evaluates the specified XPath expression and returns a string result.

-		 * This method throws exceptions on error.

-		 * @param expression the expression

-		 * @return the result object

-		 * @throws ParserConfigurationException

-		 * @throws IOException

-		 * @throws SAXException

-		 * @throws XPathExpressionException on error

-		 */

-		public synchronized String evaluate(String expression)

-				throws ParserConfigurationException, SAXException,

-				IOException, XPathExpressionException {

-			return (String) evaluate(expression, XPathConstants.STRING);

-		}

-

-		/**

-		 * Evaluates the specified XPath expression.

-		 * This method throws exceptions on error.

-		 * @param expression the expression

-		 * @param returnType the return type

-		 * @return the result object

-		 * @throws ParserConfigurationException

-		 * @throws IOException

-		 * @throws SAXException

-		 * @throws XPathExpressionException on error

-		 */

-		public synchronized Object evaluate(String expression, QName returnType)

-				throws ParserConfigurationException, SAXException,

-				IOException, XPathExpressionException {

-

-			buildDocument();

-			XPathExpression expr = xpath.compile(expression);

-			return expr.evaluate(doc, returnType);

-		}

-

-		/**

-		 * Private helper method that builds the document object.

-		 * Assumes the calling method is synchronized.

-		 * @throws ParserConfigurationException

-		 * @throws IOException

-		 * @throws SAXException

-		 */

-		private void buildDocument() throws ParserConfigurationException,

-				IOException, SAXException {

-			if (doc == null) {

-				if (xml == null) {

-					throw new IOException("XML input is null");

-				}

-

-				DocumentBuilder builder = factory.newDocumentBuilder();

-				InputSource source = new InputSource(new StringReader(xml));

-				doc = builder.parse(source);

-			}

-		}

-	}

-

-	/**

-	 * A NamespaceContext class based on a Map.

-	 */

-	private class SimpleNamespaceContext implements NamespaceContext {

-		private Map<String, String> prefixMap = new HashMap<>();

-		private Map<String, String> uriMap = new HashMap<>();

-

-		public synchronized void add(String prefix, String uri) {

-			prefixMap.put(prefix, uri);

-			uriMap.put(uri, prefix);

-		}

-

-		@Override

-		public synchronized String getNamespaceURI(String prefix) {

-			return prefixMap.get(prefix);

-		}

-

-		@Override

-		public Iterator<String> getPrefixes(String uri) {

-			List<String> list = new ArrayList<>();

-			String prefix = uriMap.get(uri);

-			if (prefix != null) {

-				list.add(prefix);

-			}

-			return list.iterator();

-		}

-

-		@Override

-		public String getPrefix(String uri) {

-			return uriMap.get(uri);

-		}

-	}

-

-	/**

-	 * A VnfNotify XPathTool.

-	 */

-	protected class VnfNotifyXPathTool extends XPathTool {

-		public VnfNotifyXPathTool() {

-			addNamespace("tns", "http://org.openecomp.mso/vnfNotify");

-		}

-	}

-

-	/**

-	 * Helper class to make it easier to create this type.

-	 */

-	private static class CreateVnfNotificationOutputs

-			extends CreateVnfNotification.Outputs {

-		public void add(String key, String value) {

-			Entry entry = new Entry();

-			entry.setKey(key);

-			entry.setValue(value);

-			getEntry().add(entry);

-		}

-	}

-

-	/**

-	 * Helper class to make it easier to create this type.

-	 */

-	private static class UpdateVnfNotificationOutputs

-			extends UpdateVnfNotification.Outputs {

-		public void add(String key, String value) {

-			Entry entry = new Entry();

-			entry.setKey(key);

-			entry.setValue(value);

-			getEntry().add(entry);

-		}

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotificationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotificationTest.java
deleted file mode 100644
index 18a2108c86..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/CreateVnfNotificationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.junit.Assert.*;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs.Entry;

-

-public class CreateVnfNotificationTest {

-

-	@Test

-	public void test() {

-		CreateVnfNotification cvn=new CreateVnfNotification();

-		 Entry ent = new Entry();

-		MsoExceptionCategory exception = MsoExceptionCategory.OPENSTACK;

-		Outputs value=new Outputs();

-		VnfRollback vnf=new VnfRollback();

-		vnf.setCloudSiteId("cloud");

-		cvn.setCompleted(true);

-		cvn.setErrorMessage("emsg");

-		cvn.setException(exception);

-		cvn.setMessageId("id");

-		cvn.setOutputs(value);

-		ent.setKey("key");

-		ent.setValue("value");

-		cvn.setRollback(vnf);

-		cvn.setVnfId("vnf");

-	assertTrue(cvn.isCompleted());

-	assert(cvn.getErrorMessage().equals("emsg"));

-	assert(cvn.getException()).equals(exception);

-	assert(cvn.getMessageId()).equals("id");

-	assert(cvn.getRollback()).equals(vnf);

-	assert(cvn.getOutputs()).equals(value);

-	assert(cvn.getVnfId()).equals("vnf");

-	assert(ent.getKey()).equals("key");

-	assert(ent.getValue()).equals("value");

-	assert(ent.toString()!=null);

-	assert(cvn.toString()!=null);

-	assert(vnf.getCloudSiteId().equals("cloud"));

-    assert(value.getEntry()!=null);	

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotificationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotificationTest.java
deleted file mode 100644
index 10e760e8de..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/DeleteVnfNotificationTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class DeleteVnfNotificationTest {

-

-	@Test

-	public void test() {

-		DeleteVnfNotification dvn=new DeleteVnfNotification();

-		MsoExceptionCategory exception = MsoExceptionCategory.OPENSTACK;

-		dvn.setCompleted(true);

-		dvn.setErrorMessage("msg");

-		dvn.setMessageId("id");

-		dvn.setException(exception);

-		assert(dvn.getErrorMessage().equals("msg"));

-		assert(dvn.getMessageId().equals("id"));

-		assert(dvn.getException().equals(exception));

-		assert(dvn.toString()!=null);

-		assertTrue(dvn.isCompleted());

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequestTest.java
deleted file mode 100644
index 59aff8cf77..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequestTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-import static org.junit.Assert.assertEquals;

-import org.junit.Test;

-

-public class MsoRequestTest {

-	private MsoRequest msorequest = new MsoRequest();

-	@Test

-	public void testMsoRequest() {

-		msorequest.setRequestId("requestId");

-		msorequest.setServiceInstanceId("serviceInstanceId");

-		assertEquals(msorequest.getRequestId(), "requestId");

-		assertEquals(msorequest.getServiceInstanceId(), "serviceInstanceId");

-	}

-	@Test

-	public void testtoString() {

-		assert(msorequest.toString())!= null;	

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactoryTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactoryTest.java
deleted file mode 100644
index 77ba0ea59b..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactoryTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.mockito.Mockito.mock;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs;

-

-public class ObjectFactoryTest {

-	private ObjectFactory ofa=new ObjectFactory();

-	

-	@Test

-	public void test() {		

-		CreateVnfNotification cvn=mock( CreateVnfNotification.class);

-		UpdateVnfNotification uvn=mock (UpdateVnfNotification.class);

-		 QueryVnfNotification qn=mock(QueryVnfNotification.class);

-		 DeleteVnfNotification dvn=mock( DeleteVnfNotification.class);

-		 RollbackVnfNotification rvn=mock( RollbackVnfNotification.class);

-		 MsoRequest mr=mock( MsoRequest.class);

-		 Outputs opt=mock(Outputs.class);

-		ofa.createCreateVnfNotification();

-		ofa.createCreateVnfNotificationOutputs();

-		ofa.createDeleteVnfNotification();

-		ofa.createQueryVnfNotification();

-		ofa.createUpdateVnfNotification();

-		ofa.createMsoRequest();

-		ofa.createRollbackVnfNotification();

-		ofa.createUpdateVnfNotificationOutputs();

-		ofa.createQueryVnfNotificationOutputs();

-		ofa.createVnfRollback();

-		ofa.createUpdateVnfNotificationOutputsEntry();

-		ofa.createQueryVnfNotificationOutputsEntry();

-		ofa.createCreateVnfNotificationOutputsEntry();

-		ofa.createCreateVnfNotification(cvn);

-		ofa.createDeleteVnfNotification(dvn);

-		ofa.createQueryVnfNotification(qn);

-		ofa.createRollbackVnfNotification(rvn);

-		ofa.createUpdateVnfNotification(uvn); 

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotificationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotificationTest.java
deleted file mode 100644
index 59e10baedc..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/QueryVnfNotificationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.junit.Assert.*;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs;

-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs.Entry;

-

-public class QueryVnfNotificationTest {

-	private QueryVnfNotification qvn=new QueryVnfNotification();

-	

-	@Test

-	public void test() {

-		 Entry ent = new Entry();

-		MsoExceptionCategory exception = MsoExceptionCategory.OPENSTACK;

-		Outputs opt=new Outputs();

-		VnfStatus vnf=VnfStatus.ACTIVE;

-		qvn.setCompleted(true);

-		qvn.setErrorMessage("error");

-		qvn.setException(exception);

-		qvn.setMessageId("id");

-		qvn.setStatus(vnf);

-		qvn.setVnfId("id");

-		qvn.setVnfExists(true);

-		ent.setKey("key");

-		ent.setValue("value");

-		assert(qvn.getErrorMessage().equals("error"));

-		assert(qvn.getException()).equals(exception);

-		assert(qvn.getMessageId()).equals("id");

-		assert(qvn.getStatus()).equals(vnf);

-		assert(qvn.getVnfId()).equals("id");

-		assertTrue(qvn.isVnfExists());

-		assertTrue(qvn.isCompleted());

-		assert(opt.getEntry()!=null);

-		assert(opt.toString()!=null);

-		assert(ent.getValue()).equals("value");

-		assert(ent.getKey()).equals("key");

-		assert(ent.toString()!=null);

-		assert(qvn.toString()!=null);		

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotificationTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotificationTest.java
deleted file mode 100644
index 825695b3dd..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/UpdateVnfNotificationTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.junit.Assert.*;

-import org.junit.Test;

-import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs;

-import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs.Entry;

-

-public class UpdateVnfNotificationTest {

-	private UpdateVnfNotification updatevnf = new UpdateVnfNotification();

-	MsoExceptionCategory mso;

-	Outputs value= new Outputs();

-	VnfRollback roll = new VnfRollback();

-	private Entry entry = new Entry();

-	

-	@Test

-	public void testUpdateVnfNotification() {

-		updatevnf.setMessageId("messageId");

-		updatevnf.setCompleted(true);

-		updatevnf.setException(mso);

-		updatevnf.setErrorMessage("errorMessage");

-		updatevnf.setOutputs(value);

-		updatevnf.setRollback(roll);

-		entry.setKey("key");

-		entry.setValue("value");

-		assertEquals(updatevnf.getMessageId(), "messageId");

-		assertEquals(updatevnf.isCompleted(), true);

-		assertEquals(updatevnf.getException(), mso);

-		assertEquals(updatevnf.getErrorMessage(), "errorMessage");

-		assertEquals(updatevnf.getOutputs(), value);

-		assertEquals(updatevnf.getRollback(), roll);

-		assertEquals(entry.getKey(), "key");

-		assertEquals(entry.getValue(), "value");	

-	}

-	@Test

-	public void testtoString() {

-		assert(updatevnf.toString()!= null);

-		assert(entry.toString()!= null);

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollbackTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollbackTest.java
deleted file mode 100644
index ebed8714df..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollbackTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.common.adapter.vnf;

-

-import static org.junit.Assert.assertEquals;

-import org.junit.Test;

-

-public class VnfRollbackTest {

-	private VnfRollback vnfrollback = new VnfRollback();

-	MsoRequest mso = new MsoRequest();

-	@Test

-	public void testVnfRollback() {

-		vnfrollback.setCloudSiteId("cloudSiteId");

-		vnfrollback.setMsoRequest(mso);

-		vnfrollback.setTenantCreated(true);

-		vnfrollback.setTenantId("tenantId");

-		vnfrollback.setVnfCreated(true);

-		vnfrollback.setVnfId("vnfId");

-		assertEquals(vnfrollback.getCloudSiteId(), "cloudSiteId");

-		assertEquals(vnfrollback.getMsoRequest(), mso);

-		assertEquals(vnfrollback.isTenantCreated(), true);

-		assertEquals(vnfrollback.getTenantId(), "tenantId");

-		assertEquals(vnfrollback.isVnfCreated(), true);

-		assertEquals(vnfrollback.getVnfId(), "vnfId");	

-	}

-	@Test

-	public void testtoString() {

-		assert(vnfrollback.toString() != null);

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java
deleted file mode 100644
index 166e3d78c1..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.common.recipe;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class BpmnParamTest {
-
-	BpmnParam bp=new BpmnParam();
-	
-	@Test
-	public void test() {
-		bp.setValue("testdata");
-	    assertEquals(bp.getValue(),"testdata");
-	}
-	@Test
-	public void testToString(){
-		assert(bp.toString()!=null);
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java
deleted file mode 100644
index 89f538b085..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.common.recipe;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-public class BpmnRestClientTest {
-	
-	@Test
-	public void test() {
-		BpmnRestClient.getEncryptedPropValue("prop", "123", "456");
-		BpmnRestClient.loadMsoProperties();
-		assertEquals(true,BpmnRestClient.getNoPropertiesState());
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java
deleted file mode 100644
index 3b185bae22..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.common.recipe;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class ResourceRecipeRequestTest {
-
-	ResourceRecipeRequest rr=new ResourceRecipeRequest();
-	BpmnParam bp=new BpmnParam();
-	@Test
-	public void test() {
-		rr.setResourceInput(bp);
-		rr.setHost(bp);
-		rr.setRequestId(bp);
-		rr.setRequestAction(bp);
-		rr.setServiceInstanceId(bp);
-		rr.setServiceType(bp);
-		rr.setRecipeParams(bp);
-		assertEquals(rr.getResourceInput(),bp);
-		assertEquals(rr.getHost(),bp);
-		assertEquals(rr.getRequestId(),bp);
-		assertEquals(rr.getRequestAction(),bp);
-		assertEquals(rr.getServiceInstanceId(),bp);
-		assertEquals(rr.getServiceType(),bp);
-		assertEquals(rr.getRecipeParams(),bp);
-	}
-	@Test
-	public void testToString(){
-		assert(rr.toString()!=null);
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientTest.java
deleted file mode 100644
index 0584bea012..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/network/NetworkAdapterClientTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.network;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;

-import static com.github.tomakehurst.wiremock.client.WireMock.get;

-import static com.github.tomakehurst.wiremock.client.WireMock.post;

-import static com.github.tomakehurst.wiremock.client.WireMock.put;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;

-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;

-import static org.junit.Assert.assertEquals;

-

-import org.junit.BeforeClass;

-import org.junit.Ignore;
-import org.junit.Rule;

-import org.junit.Test;

-import org.openecomp.mso.adapters.nwrest.CreateNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.CreateNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.DeleteNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.DeleteNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.QueryNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.RollbackNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.RollbackNetworkResponse;

-import org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest;

-import org.openecomp.mso.adapters.nwrest.UpdateNetworkResponse;

-import org.openecomp.mso.openstack.beans.NetworkRollback;

-

-import com.github.tomakehurst.wiremock.junit.WireMockRule;

-

-public class NetworkAdapterClientTest {

-

-	@Rule

-	public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(28090));

-

-	private static final String TESTING_ID = "___TESTING___";

-	private static final String AAI_NETWORK_ID = "test";

-	private static final String REST_ENDPOINT = "/networks/rest/v1/networks";

-

-	private NetworkAdapterClientImpl client = new NetworkAdapterClientImpl();

-

-	@BeforeClass

-	public static void setUp() {

-		System.setProperty("mso.config.path", "src/test/resources");

-	}

-

-	@Test

-	public void createNetworkTest() {

-		CreateNetworkRequest request = new CreateNetworkRequest();

-		request.setCloudSiteId(TESTING_ID);

-

-		CreateNetworkResponse mockResponse = new CreateNetworkResponse();

-		mockResponse.setNetworkCreated(true);

-		wireMockRule.stubFor(post(urlPathEqualTo(REST_ENDPOINT)).willReturn(aResponse()

-				.withHeader("Content-Type", "application/json").withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		CreateNetworkResponse response = client.createNetwork(request);

-		assertEquals("Testing CreateVfModule response", true, response.getNetworkCreated());

-	}

-

-	@Test

-	public void deleteNetworkTest() {

-		DeleteNetworkRequest request = new DeleteNetworkRequest();

-		request.setCloudSiteId(TESTING_ID);

-

-		DeleteNetworkResponse mockResponse = new DeleteNetworkResponse();

-		mockResponse.setNetworkDeleted(true);

-

-		wireMockRule.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).willReturn(aResponse()

-				.withHeader("Content-Type", "application/json").withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		DeleteNetworkResponse response = client.deleteNetwork(AAI_NETWORK_ID, request);

-		assertEquals("Testing DeleteVfModule response", true, response.getNetworkDeleted());

-	}

-

-	@Test

-	public void rollbackNetworkTest() {

-		RollbackNetworkRequest request = new RollbackNetworkRequest();

-		NetworkRollback rollback = new NetworkRollback();

-		rollback.setCloudId(TESTING_ID);

-		request.setNetworkRollback(rollback);

-

-		RollbackNetworkResponse mockResponse = new RollbackNetworkResponse();

-		mockResponse.setNetworkRolledBack(true);

-

-		wireMockRule.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).willReturn(aResponse()

-				.withHeader("Content-Type", "application/json").withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		RollbackNetworkResponse response = client.rollbackNetwork(AAI_NETWORK_ID, request);

-		assertEquals("Testing DeleteVfModule response", true, response.getNetworkRolledBack());

-	}

-

-	@Test

-	public void queryNetworkTest() {

-		QueryNetworkResponse mockResponse = new QueryNetworkResponse();

-		mockResponse.setNetworkExists(true);

-

-		wireMockRule.stubFor(get(urlPathEqualTo(REST_ENDPOINT))

-				.withQueryParam("cloudSiteId", equalTo(TESTING_ID))

-				.withQueryParam("tenantId", equalTo(TESTING_ID))

-				.withQueryParam("networkStackId", equalTo("networkStackId"))

-				.withQueryParam("skipAAI", equalTo("true"))

-				.withQueryParam("msoRequest.requestId", equalTo("testRequestId"))

-				.withQueryParam("msoRequest.serviceInstanceId", equalTo("serviceInstanceId"))

-				.willReturn(aResponse()

-				.withHeader("Content-Type", "application/json").withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		QueryNetworkResponse response = client.queryNetwork(AAI_NETWORK_ID, TESTING_ID, TESTING_ID,

-				"networkStackId", true, "testRequestId", "serviceInstanceId");

-		assertEquals("Testing QueryVfModule response", true, response.getNetworkExists());

-	}

-

-	@Ignore
-	@Test

-	public void updateNetworkTest() {

-		UpdateNetworkRequest request = new UpdateNetworkRequest();

-		request.setCloudSiteId(TESTING_ID);

-		request.setNetworkId("test1");

-

-		UpdateNetworkResponse mockResponse = new UpdateNetworkResponse();

-		mockResponse.setNetworkId("test1");

-		wireMockRule.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_NETWORK_ID)).willReturn(aResponse()

-				.withHeader("Content-Type", "application/json").withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		UpdateNetworkResponse response = client.updateNetwork(AAI_NETWORK_ID, request);

-		assertEquals("Testing UpdateVfModule response", "test1", response.getNetworkId());

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionBeanTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionBeanTest.java
deleted file mode 100644
index f0c6e7ec52..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionBeanTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.client.adapter.requests.db.entities;
-
-import org.junit.Test;
-
-public class MsoRequestsDbExceptionBeanTest {
-
-	@Test
-	public void test() {
-		MsoRequestsDbExceptionBean mrde=new MsoRequestsDbExceptionBean("msg");
-		mrde.setMessage("msg");
-		assert(mrde.getMessage().equals("msg"));
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionTest.java
deleted file mode 100644
index 28b8cc991f..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/MsoRequestsDbExceptionTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.client.adapter.requests.db.entities;
-
-import org.junit.Test;
-
-public class MsoRequestsDbExceptionTest {
-
-	@Test
-	public void test() {
-		Throwable e = new Throwable();
-		MsoRequestsDbExceptionBean mredb=new MsoRequestsDbExceptionBean();
-		MsoRequestsDbException mrde=new MsoRequestsDbException("msg",e);
-		MsoRequestsDbException mrd=new MsoRequestsDbException("msg");
-		MsoRequestsDbException mrd1=new MsoRequestsDbException(e);
-		mrde.setFaultInfo(mredb);
-		assert(mrde.getFaultInfo().equals(mredb));
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequestTest.java
deleted file mode 100644
index d01c11948b..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/requests/db/entities/UpdateInfraRequestTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.client.adapter.requests.db.entities;
-
-import org.junit.Test;
-
-public class UpdateInfraRequestTest {
-
-	@Test
-	public void test() {
-		UpdateInfraRequest uir=new UpdateInfraRequest();
-		RequestStatusType requestStatus=RequestStatusType.COMPLETE;
-		uir.setConfigurationId("configurationId");
-		uir.setConfigurationName("configurationName");
-		uir.setLastModifiedBy("lastModifiedBy");
-		uir.setNetworkId("networkId");
-		uir.setProgress("progress");
-		uir.setRequestId("requestId");
-		uir.setRequestStatus(requestStatus);
-		uir.setResponseBody("responseBody");
-		uir.setServiceInstanceId("serviceInstanceId");
-		uir.setServiceInstanceName("serviceInstanceName");
-		uir.setStatusMessage("statusMessage");
-		uir.setVfModuleId("vfModuleId");
-		uir.setVfModuleName("vfModuleName");
-		uir.setVnfId("vnfId");
-		uir.setVnfOutputs("vnfOutputs");
-		uir.setVolumeGroupId("volumeGroupId");
-		assert(uir.getConfigurationId().equals("configurationId"));
-		assert(uir.getConfigurationName().equals("configurationName"));
-		assert(uir.getLastModifiedBy().equals("lastModifiedBy"));
-		assert(uir.getNetworkId().equals("networkId"));
-		assert(uir.getProgress().equals("progress"));
-        assert(uir.getRequestId().equals("requestId"));
-        assert(uir.getRequestStatus().equals(requestStatus));
-        assert(uir.getResponseBody().equals("responseBody"));
-        assert(uir.getServiceInstanceId().equals("serviceInstanceId"));
-        assert(uir.getServiceInstanceName().equals("serviceInstanceName"));
-        assert(uir.getStatusMessage().equals("statusMessage"));
-        assert(uir.getVfModuleId().equals("vfModuleId"));
-        assert(uir.getVnfOutputs().equals("vnfOutputs"));
-        assert(uir.getVolumeGroupId().equals("volumeGroupId"));
-        assert(uir.getVfModuleName().equals("vfModuleName"));
-        assert(uir.getVnfId().equals("vnfId"));
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientTest.java
deleted file mode 100644
index 21448256ed..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.adapter.vnf;

-

-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;

-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;

-import static com.github.tomakehurst.wiremock.client.WireMock.get;

-import static com.github.tomakehurst.wiremock.client.WireMock.post;

-import static com.github.tomakehurst.wiremock.client.WireMock.put;

-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;

-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;

-import static org.junit.Assert.assertEquals;

-

-import org.junit.BeforeClass;

-import org.junit.Rule;

-import org.junit.Test;

-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;

-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;

-import org.openecomp.mso.adapters.vnfrest.VfModuleRollback;

-

-import com.github.tomakehurst.wiremock.junit.WireMockRule;

-

-public class VnfAdapterClientTest {

-

-	@Rule

-	public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(28090));

-

-	private static final String TESTING_ID = "___TESTING___";

-	private static final String AAI_VNF_ID = "test";

-	private static final String AAI_VF_MODULE_ID = "test";

-	private static final String REST_ENDPOINT = "/vnfs/rest/v1/vnfs";

-

-	private VnfAdapterClientImpl client = new VnfAdapterClientImpl();

-

-	@BeforeClass

-	public static void setUp() {

-		System.setProperty("mso.config.path", "src/test/resources");

-	}

-

-	@Test

-	public void createVfModuleTest() {

-		CreateVfModuleRequest request = new CreateVfModuleRequest();

-		request.setCloudSiteId(TESTING_ID);

-

-		CreateVfModuleResponse mockResponse = new CreateVfModuleResponse();

-		mockResponse.setVfModuleCreated(true);

-		wireMockRule.stubFor(post(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules"))

-				.willReturn(aResponse().withHeader("Content-Type", "application/json")

-						.withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		CreateVfModuleResponse response = client.createVfModule(AAI_VNF_ID, request);

-		assertEquals("Testing CreateVfModule response", true, response.getVfModuleCreated());

-	}

-

-	@Test

-	public void rollbackVfModuleTest() {

-		RollbackVfModuleRequest request = new RollbackVfModuleRequest();

-		VfModuleRollback rollback = new VfModuleRollback();

-		rollback.setCloudSiteId(TESTING_ID);

-		request.setVfModuleRollback(rollback);

-

-		RollbackVfModuleResponse mockResponse = new RollbackVfModuleResponse();

-		mockResponse.setVfModuleRolledback(true);

-		wireMockRule.stubFor(

-				put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID + "/rollback"))

-						.willReturn(aResponse().withHeader("Content-Type", "application/json")

-								.withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		RollbackVfModuleResponse response = client.rollbackVfModule(AAI_VNF_ID, AAI_VF_MODULE_ID, request);

-		assertEquals("Testing RollbackVfModule response", true, response.getVfModuleRolledback());

-	}

-

-	@Test

-	public void deleteVfModuleTest() {

-		DeleteVfModuleRequest request = new DeleteVfModuleRequest();

-		request.setCloudSiteId(TESTING_ID);

-

-		DeleteVfModuleResponse mockResponse = new DeleteVfModuleResponse();

-		mockResponse.setVfModuleDeleted(true);

-		wireMockRule.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/" + AAI_VF_MODULE_ID))

-				.willReturn(aResponse().withHeader("Content-Type", "application/json")

-						.withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		DeleteVfModuleResponse response = client.deleteVfModule(AAI_VNF_ID, AAI_VF_MODULE_ID, request);

-		assertEquals("Testing DeleteVfModule response", true, response.getVfModuleDeleted());

-	}

-

-	@Test

-	public void updateVfModuleTest() {

-		UpdateVfModuleRequest request = new UpdateVfModuleRequest();

-		request.setCloudSiteId(TESTING_ID);

-		request.setVfModuleId("test1");

-

-		UpdateVfModuleResponse mockResponse = new UpdateVfModuleResponse();

-		mockResponse.setVfModuleId("test1");

-		wireMockRule.stubFor(put(urlPathEqualTo(REST_ENDPOINT + "/" + AAI_VNF_ID + "/vf-modules/"))

-				.willReturn(aResponse().withHeader("Content-Type", "application/json")

-						.withBody(mockResponse.toJsonString()).withStatus(200)));

-

-		UpdateVfModuleResponse response = client.updateVfModule(AAI_VNF_ID, AAI_VF_MODULE_ID, request);

-		assertEquals("Testing UpdateVfModule response", "test1", response.getVfModuleId());

-	}

-

-	@Test

-	public void queryVfModuleTest() {

-		QueryVfModuleResponse mockResponse = new QueryVfModuleResponse();

-		mockResponse.setVnfId(AAI_VNF_ID);

-		mockResponse.setVfModuleId(AAI_VF_MODULE_ID);

-		wireMockRule.stubFor(get(urlPathEqualTo(REST_ENDPOINT))

-				.withQueryParam("cloudSiteId", equalTo(TESTING_ID))

-				.withQueryParam("tenantId", equalTo(TESTING_ID))

-				.withQueryParam("vfModuleName", equalTo("someName"))

-				.withQueryParam("skipAAI", equalTo("true"))

-				.withQueryParam("msoRequest.requestId", equalTo("testRequestId"))

-				.withQueryParam("msoRequest.serviceInstanceId", equalTo("serviceInstanceId"))

-				.willReturn(aResponse().withHeader("Content-Type", "application/json")

-						.withBody(mockResponse.toJsonString()).withStatus(200)));

-		QueryVfModuleResponse response = client.queryVfModule(AAI_VNF_ID, AAI_VF_MODULE_ID, TESTING_ID, TESTING_ID,

-				"someName", true, "testRequestId", "serviceInstanceId");

-		assertEquals("Testing QueryVfModule response", AAI_VF_MODULE_ID, response.getVfModuleId());

-	}

-

-	@Test

-	public void healthCheckTest() {

-		wireMockRule.stubFor(get(urlPathEqualTo("/vnfs/rest/v1/vnfs")).willReturn(

-				aResponse().withHeader("Content-Type", "text/plain").withBody("healthCheck").withStatus(200)));

-

-		String healthCheck = client.healthCheck();

-		assertEquals("HealthCheck is correct", "healthCheck", healthCheck);

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java
deleted file mode 100644
index d9c5654989..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.appc;

-

-import static org.junit.Assert.assertEquals;

-

-import java.util.Optional;

-import java.util.UUID;

-

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-

-import org.onap.appc.client.lcm.model.Action;

-import org.onap.appc.client.lcm.model.Status;

-

-public class ApplicationControllerOrchestratorTest {

-

-	@BeforeClass

-	public static void beforeClass() {

-		System.setProperty("mso.config.path", "src/test/resources");

-	}

-

-	@Test

-	@Ignore

-	public void vnfCommandTest() {

-		ApplicationControllerOrchestrator client = new ApplicationControllerOrchestrator();

-		Status status;

-		try {

-			status = client.vnfCommand(Action.Lock, UUID.randomUUID().toString(),

-					"3ffdee3c-94d2-45fe-904d-fc1efa0f8b59", Optional.of(""), "appc");

-		} catch (ApplicationControllerOrchestratorException e) {

-			status = new Status();

-			status.setCode(e.getAppcCode());

-			status.setMessage(e.getMessage());

-		}

-		assertEquals("Status of vnfCommand is correct", status.getCode(), 306);

-	}

-

-	@Test

-	@Ignore

-	public void vnfCommandTest1() {

-		ApplicationControllerOrchestrator client = new ApplicationControllerOrchestrator();

-		Status status;

-		try {

-			status = client.vnfCommand(Action.Unlock, UUID.randomUUID().toString(),

-					"ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f", Optional.of(""), "appc");

-		} catch (ApplicationControllerOrchestratorException e) {

-			status = new Status();

-			status.setCode(e.getAppcCode());

-			status.setMessage(e.getMessage());

-		}

-		assertEquals("Status of vnfCommand is correct", status.getCode(), 306);

-	}

-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java
deleted file mode 100644
index 3fd433d017..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.client.sdnc.beans;
-
-import static org.junit.Assert.*;
-
-
-
-import org.junit.Test;
-public class SDNCRequestTest {
-	private SDNCRequest sdncrequest = new SDNCRequest();
-	SDNCSvcAction svcaction = SDNCSvcAction.ACTIVATE;
-	SDNCSvcOperation svcoperation = SDNCSvcOperation.VNF_TOPOLOGY_OPERATION; 
-	@Test
-	public void testSDNCRequestTest() {
-		sdncrequest.setRequestId("requestId");
-		sdncrequest.setSvcInstanceId("svcInstanceId");
-		sdncrequest.setSvcAction(svcaction);
-		sdncrequest.setSvcOperation(svcoperation);
-		sdncrequest.setCallbackUrl("callbackUrl");
-		sdncrequest.setMsoAction("msoAction");
-		sdncrequest.setRequestData("requestData");
-		assertEquals(sdncrequest.getRequestId(), "requestId");
-		assertEquals(sdncrequest.getSvcInstanceId(), "svcInstanceId");
-		assertEquals(sdncrequest.getSvcAction(), svcaction);
-		assertEquals(sdncrequest.getSvcOperation(), svcoperation);
-		assertEquals(sdncrequest.getCallbackUrl(), "callbackUrl");
-		assertEquals(sdncrequest.getMsoAction(), "msoAction");
-		assertEquals(sdncrequest.getRequestData(), "requestData");
-		}
-	@Test
-	public void testToString(){
-		assert(sdncrequest.toString()!=null);
-	}
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/CallbackHeaderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/CallbackHeaderTest.java
deleted file mode 100644
index 995bb5b19c..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/CallbackHeaderTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class CallbackHeaderTest {

-	

-	CallbackHeader cbh = new CallbackHeader();

-	CallbackHeader cbh1 = new CallbackHeader("reqId", "respCode", "respMsg");

-

-	@Test

-	public void testCallbackHeader() {

-		cbh.setRequestId("requestId");

-		cbh.setResponseCode("responseCode");

-		cbh.setResponseMessage("responseMessage");

-		assertEquals(cbh.getRequestId(), "requestId");

-		assertEquals(cbh.getResponseCode(), "responseCode");

-		assertEquals(cbh.getResponseMessage(), "responseMessage");

-		assert(cbh.toString()!=null);

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/ObjectFactoryTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/ObjectFactoryTest.java
deleted file mode 100644
index 04bc7dc132..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/ObjectFactoryTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ObjectFactoryTest {

-	ObjectFactory of = new ObjectFactory();

-

-	@Test

-	public void testObjectFactory() {

-		of.createRequestHeader();

-		of.createSDNCAdapterRequest();

-		of.createSDNCAdapterResponse();

-		

-		

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestHeaderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestHeaderTest.java
deleted file mode 100644
index 1d04572207..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestHeaderTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class RequestHeaderTest {

-	RequestHeader rh = new RequestHeader();

-

-	@Test

-	public void testRequestHeader() {

-		rh.setRequestId("requestId");

-		rh.setSvcInstanceId("svcInstanceId");

-		rh.setSvcAction("svcAction");

-		rh.setSvcOperation("svcOperation");

-		rh.setCallbackUrl("callbackUrl");

-		rh.setMsoAction("msoAction");

-		assertEquals(rh.getRequestId(), "requestId");

-		assertEquals(rh.getSvcInstanceId(), "svcInstanceId");

-		assertEquals(rh.getSvcAction(), "svcAction");

-		assertEquals(rh.getSvcOperation(), "svcOperation");

-		assertEquals(rh.getCallbackUrl(), "callbackUrl");

-		assertEquals(rh.getMsoAction(), "msoAction");

-		assert(rh.toString()!=null);	

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestTunablesTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestTunablesTest.java
deleted file mode 100644
index 1219f69874..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/RequestTunablesTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-import org.openecomp.mso.properties.MsoPropertiesFactory;

-

-public class RequestTunablesTest {

-	MsoPropertiesFactory mpf = new MsoPropertiesFactory();

-	

-	RequestTunables rt = new RequestTunables("reqId", "msoAction", "operation", "action", mpf);

-

-	@Test

-	public void testRequestTunables() {

-		rt.setReqId("reqId");

-		rt.setReqMethod("reqMethod");

-		rt.setMsoAction("msoAction");

-		rt.setAction("action");

-		rt.setOperation("operation");

-		rt.setSdncUrl("sdncUrl");

-		rt.setTimeout("timeout");

-		rt.setAsyncInd("asyncInd");

-		rt.setHeaderName("headerName");

-		rt.setSdncaNotificationUrl("sdncaNotificationUrl");

-		rt.setNamespace("namespace");

-		assertEquals(rt.getReqId(), "reqId");

-		assertEquals(rt.getReqMethod(), "reqMethod");

-		assertEquals(rt.getMsoAction(), "msoAction");

-		assertEquals(rt.getAction(), "action");

-		assertEquals(rt.getOperation(), "operation");

-		assertEquals(rt.getSdncUrl(), "sdncUrl");

-		assertEquals(rt.getTimeout(), "timeout");

-		assertEquals(rt.getAsyncInd(), "asyncInd");

-		assertEquals(rt.getHeaderName(), "headerName");

-		assertEquals(rt.getSdncaNotificationUrl(), "sdncaNotificationUrl");

-		assertEquals(rt.getNamespace(), "namespace");

-		assert(rt.toString()!=null);	

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequestTest.java
deleted file mode 100644
index 53fbb0a4aa..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterCallbackRequestTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class SDNCAdapterCallbackRequestTest {

-	

-	SDNCAdapterCallbackRequest sdnccall = new SDNCAdapterCallbackRequest();

-	CallbackHeader cbh = new CallbackHeader();

-	Object o = new Object();

-

-	@Test

-	public void testSDNCAdapterCallbackRequest() {

-		sdnccall.setCallbackHeader(cbh);

-		sdnccall.setRequestData(o);

-		assertEquals(sdnccall.getCallbackHeader(), cbh);

-		assertEquals(sdnccall.getRequestData(), o);

-		assert(sdnccall.toString()!=null);	

-	}

-

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequestTest.java
deleted file mode 100644
index 6b10f25e70..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCAdapterRequestTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class SDNCAdapterRequestTest {

-	

-	SDNCAdapterRequest adapter = new SDNCAdapterRequest();

-	RequestHeader rh = new RequestHeader();

-	Object o = new Object();

-

-	@Test

-	public void testSDNCAdapterRequest() {

-		adapter.setRequestHeader(rh);

-		adapter.setRequestData(o);

-		assertEquals(adapter.getRequestHeader(), rh);

-		assertEquals(adapter.getRequestData(), o);

-		}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCResponseTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCResponseTest.java
deleted file mode 100644
index d8c23249c4..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/sync/SDNCResponseTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.client.sdnc.sync;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class SDNCResponseTest {

-	

-	SDNCResponse sdnc = new SDNCResponse("reqId");

-	SDNCResponse sdnc1 = new SDNCResponse("reqId", 0, "respMsg");

-

-	@Test

-	public void testSDNCResponse() {

-		sdnc.setReqId("reqId");

-		sdnc.setRespCode(0);

-		sdnc.setRespMsg("respMsg");

-		sdnc.setSdncResp("sdncResp");

-		assertEquals(sdnc.getReqId(), "reqId");

-		assertEquals(sdnc.getRespCode(), 0);

-		assertEquals(sdnc.getRespMsg(), "respMsg");

-		assertEquals(sdnc.getSdncResp(), "sdncResp");

-		assert(sdnc.toString()!= null);	

-	}

-}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sndc/SDNCOrchTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sndc/SDNCOrchTest.java
deleted file mode 100644
index 724ae4a90d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sndc/SDNCOrchTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.client.sndc;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.core.domain.Customer;
-import org.openecomp.mso.bpmn.core.domain.ModelInfo;
-import org.openecomp.mso.bpmn.core.domain.Request;
-import org.openecomp.mso.bpmn.core.domain.ServiceDecomposition;
-import org.openecomp.mso.bpmn.core.domain.ServiceInstance;
-import org.openecomp.mso.bpmn.core.json.JsonDecomposingException;
-import org.openecomp.mso.client.orchestration.SDNCOrchestrator;
-import org.openecomp.mso.client.sdnc.sync.SDNCSyncRpcClient;
-
-public class SDNCOrchTest {
-	
-	@BeforeClass
-	public static void setup() {
-		System.setProperty("mso.config.path", "src/test/resources/");
-	}
-	
-	@Ignore // 1802 merge
-	@Test
-	public void run () throws JsonDecomposingException {
-		ServiceDecomposition serviceDecomp = new ServiceDecomposition ("{\"serviceResources\":{}}","123");
-		
-		ServiceInstance servInst = new ServiceInstance();
-		servInst.setInstanceId("RaaTest-1-id");
-		servInst.setServiceType("");
-		servInst.setInstanceName("some-junk-name");
-		servInst.setServiceId("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
-		
-		ModelInfo model = new ModelInfo();
-		model.setModelInvariantUuid("uuid-miu-svc-011-abcdef");
-		model.setModelName("SIModelName1");
-		model.setModelUuid("");
-		model.setModelVersion("2");
-		
-		Request req = new Request();
-		req.setRequestId("RaaCSIRequestId-1");
-		req.setSdncRequestId("c0c5e8bf-d5c4-4d81-b2a9-78832c2c789e");
-		req.setModelInfo(model);
-		
-		Customer cust = new Customer();
-		cust.setGlobalSubscriberId("MCBH-1610");
-		cust.setSubscriptionServiceType("viprsvc");
-		
-		serviceDecomp.setCustomer(cust);
-		serviceDecomp.setRequest(req);
-		serviceDecomp.setCallbackURN("http://localhost:28080/mso/SDNCAdapterCallbackService");
-		serviceDecomp.setServiceInstance(servInst);
-		
-		SDNCOrchestrator sdncO = new SDNCOrchestrator();
-		sdncO.createServiceInstance(serviceDecomp);
-	}
-	
-	@Test
-	public void runValidateSdncResponse () {
-		SDNCSyncRpcClient client = new SDNCSyncRpcClient(null, null);
-		client.validateSDNCResponse("{\"v1:RequestData\": {\"output\": {\"svc-request-id\": \"0ca5bf8f-c944-4318-810b-6ddfbec13cc5\",\"response-code\": \"200\",\"response-message\": \"a\"}}}");
-	}
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySim500Response.xml b/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySim500Response.xml
index 2cf94b2ef2..c9ec2f0a9d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySim500Response.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySim500Response.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 	<v1:SDNCAdapterCallback>
-		<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+		<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			<CallbackHeader>
 				<RequestId>testRequestId</RequestId>
 				<ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse_noExtraTag.xml b/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse_noExtraTag.xml
index 57dc2d6f30..d39df7934a 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse_noExtraTag.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse_noExtraTag.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
-			<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+			<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			 <CallbackHeader>
 			   <RequestId>testRequestId</RequestId>
 			   <ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json
new file mode 100644
index 0000000000..4c4c9b3f00
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json
@@ -0,0 +1,6 @@
+{
+  "requestInfo" : {"sourceId":"mso","requestType":"create","requestId":"testRequestId","callbackUrl":"http://localhost:28080/mso/WorkflowMesssage/SNIROResponse/testRequestId","transactionId":"testRequestId","timeout":1800},
+  "serviceInfo" : {"modelInfo":{"modelName":"testModelName1","modelVersionId":"testModelUUID1","modelVersion":"testModelVersion1","modelInvariantId":"testModelInvariantUUID1"},"serviceInstanceId":"testServiceInstanceId1","serviceName":"testServiceType1"},
+  "placementInfo" : {"subscriberInfo":{"subscriberName":"testCustomerName","globalSubscriberId":"testCustomerId"},"placementDemands":[{"resourceModelInfo":{"modelName":"testAllottedModelName1","modelVersionId":"testAllottedModelUuid1","modelVersion":"testAllottedModelVersion1","modelInvariantId":"testAllottedModelInvariantUuid1"},"resourceModuleName":"testAllottedInstanceName1","serviceResourceId":"testAllottedResourceId1"},{"resourceModelInfo":{"modelName":"testAllottedModelName2","modelVersionId":"testAllottedModelUuid2","modelVersion":"testAllottedModelVersion2","modelInvariantId":"testAllottedModelInvariantUuid2"},"resourceModuleName":"testAllottedInstanceName2","serviceResourceId":"testAllottedResourceId2"},{"resourceModelInfo":{"modelName":"testAllottedModelName3","modelVersionId":"testAllottedModelUuid3","modelVersion":"testAllottedModelVersion3","modelInvariantId":"testAllottedModelInvariantUuid3"},"resourceModuleName":"testAllottedInstanceName3","serviceResourceId":"testAllottedResourceId3"}],"requestParameters":{"aLaCarte":false,"subscriptionServiceType":"iptollfree"}},
+  "licenseInfo" : []
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json
deleted file mode 100644
index 09026d1d8c..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/catalogResp.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-   "serviceResources": {
-      "serviceType": null,
-      "serviceAllottedResources": [],
-      "modelInfo": {
-         "modelInvariantUuid": "1cc4e2e4-eb6e-404d-a66f-c8733cedcce8",
-         "modelName": "ADIOD vRouter vCE 011017 Service",
-         "modelVersion": "5.0",
-         "modelUuid": "2f7f309d-c842-4644-a2e4-34167be5eeb4"
-      },
-      "serviceRole": null,
-      "serviceVnfs": [
-         {
-            "toscaNodeType": "org.openecomp.resource.vf.AdiodVce",
-            "vfModules": [
-               {
-                  "initialCount": null,
-                  "vfModuleLabel": null,
-                  "modelInfo": {
-                     "modelInvariantUuid": "7fb428e1-8000-4800-a71a-f21b946973c5",
-                     "modelName": "AdiodVce..base_vCE..module-0",
-                     "modelVersion": "2",
-                     "modelCustomizationUuid": "1126e7e2-b377-4fd2-ad48-660a20caa829",
-                     "modelUuid": "435d57e1-93a2-4d58-aa5d-f2df2d126276"
-                  },
-                  "hasVolumeGroup": true,
-                  "isBase": true
-               }
-            ],
-            "modelInfo": {
-               "modelInvariantUuid": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-               "modelName": "ADIoD vCE",
-               "modelVersion": "2.0",
-               "modelCustomizationUuid": "bdaeed40-c964-4966-bdb8-51320dcaf587",
-               "modelInstanceName": "ADIoD vCE 0",
-               "modelUuid": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1"
-            },
-            "nfRole": "",
-            "nfType": "",
-            "nfFunction": "",
-            "nfNamingCode": "",
-            "multiStageDesign": "N"
-        }
-      ],
-      "serviceNetworks": []
-   }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf
deleted file mode 100644
index 53cd70c514..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "transactionId": "testRequestId",
-    "requestId": "testRequestId",
-    "requestState": "complete",
-    "statusMessage": "success",
-    "solutions": {
-        "licenseSolutions": [
-            {
-                "entitlementPoolUUID": [
-                    "f1d563e8-e714-4393-8f99-cc480144a05e",
-                    "j1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupUUID": [
-                    "s1d563e8-e714-4393-8f99-cc480144a05e",
-                    "b1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_primary_1",
-                "serviceResourceId": "testResourceIdAR"
-            },
-            {
-                "entitlementPoolUUID": [
-                    "91d563e8-e714-4393-8f99-cc480144a05e",
-                    "21d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupUUID": [
-                    "31d563e8-e714-4393-8f99-cc480144a05e",
-                    "71d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_secondary_1",
-                "serviceResourceId": "testResourceIdVNF"
-            }
-        ],
-        "placementSolutions": [
-            [
-            {
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceInstanceId": "testSIID1",
-                "serviceResourceId": "testResourceIdAR",
-                "solution": {
-                    "identifierType": "serviceInstanceId",
-                    "identifiers": ["testSIID1"]
-                },
-                "assignmentInfo": [
-                    {
-                        "key": "cloudOwner",
-                        "value": "aic"
-                    },
-                    {
-                        "key": "vnfHostName",
-                        "value": "MDTNJ01"
-                    },
-                    {
-                        "key": "isRehome",
-                        "value": "False"
-                    },
-                    {
-                        "key": "locationId",
-                        "value": "dfwtx"
-                    }
-                ]
-            },
-            {   "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceResourceId": "testResourceIdAR2",
-                "solution": {
-                    "identifierType": "serviceInstanceId",
-                    "identifiers": ["testSIID2"]
-                },
-                "assignmentInfo": [
-                    {
-                        "key": "cloudOwner",
-                        "value": "aic"
-                    },
-                    {
-                        "key": "vnfHostName",
-                        "value": "testVnfHostname2"
-                    },
-                    {
-                        "key": "isRehome",
-                        "value": "False"
-                    },
-                    {
-                        "key": "locationId",
-                        "value": "testCloudRegionId2"
-                    }
-                ]
-            },
-            {
-                "resourceModuleName": "VNF",
-                "serviceResourceId": "testResourceIdVNF",
-                "solution": {
-                    "identifierType": "cloudRegionId",
-                    "cloudOwner": "aic",
-                    "identifiers": [
-                        "testCloudRegionId3"
-                    ]
-                },
-                "assignmentInfo": [
-                        {
-                            "key": "cloudOwner",
-                            "value": "aic"
-                        },
-                        {
-                            "key": "locationId",
-                            "value": "testCloudRegionId3"
-                        },
-                        {   "key":"flavors",
-                            "value":{"flavorLabel1xxx":"vimFlavorxxx", "flavorLabel2xxx":"vimFlavorxxx"}}
-                    ]
-            }
-        ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf2Net b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf2Net
deleted file mode 100644
index d95587746b..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf2Net
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "transactionId": "testRequestId",
-    "requestId": "testRequestId",
-    "requestState": "completed",
-    "statusMessage": "success",
-    "solutions": {
-        "licenseSolutions": [
-            {
-                "resourceModuleName": "vHNPortalaaS_primary_1",
-                "serviceResourceId": "testResourceIdAR",
-                "entitlementPoolUUID": ["f1d563e8-e714-4393-8f99-cc480144a05e",
-                    "j1d563e8-e714-4393-8f99-cc480144a05e"],
-                "licenseKeyGroupUUID": ["s1d563e8-e714-4393-8f99-cc480144a05e",
-                    "b1d563e8-e714-4393-8f99-cc480144a05e"],
-                "entitlementPoolInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-                "licenseKeyGroupInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"]
-            },
-            {
-                "resourceModuleName": "net",
-                "serviceResourceId": "testResourceIdNet2",
-                "entitlementPoolUUID": ["f1d563e8-e714-4393-8f99-cc480144a05n",
-                    "j1d563e8-e714-4393-8f99-cc480144a05n"],
-                "licenseKeyGroupUUID": ["s1d563e8-e714-4393-8f99-cc480144a05n",
-                    "b1d563e8-e714-4393-8f99-cc480144a05n"],
-                "entitlementPoolInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-                "licenseKeyGroupInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"]
-            },
-            {
-                "resourceModuleName": "vHNPortalaaS_secondary_1",
-                "serviceResourceId": "testResourceIdVNF",
-                "entitlementPoolUUID": ["91d563e8-e714-4393-8f99-cc480144a05e",
-                    "21d563e8-e714-4393-8f99-cc480144a05e"],
-                "licenseKeyGroupUUID": [ "31d563e8-e714-4393-8f99-cc480144a05e",
-                    "71d563e8-e714-4393-8f99-cc480144a05e"],
-                "entitlementPoolInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-                "licenseKeyGroupInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d",
-                    "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"]
-            },
-        ],
-        "placementSolutions": [
-            [
-            {
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceResourceId": "testResourceIdAR",
-                "solution": {
-                    "identifierType": "serviceInstanceId",
-                    "identifiers": ["testSIID1"]
-                },
-                "assignmentInfo": [
-                    { "key": "cloudOwner", "value": "aic" },
-                    { "key": "vnfHostName", "value": "MDTNJ01" },
-                    { "key": "isRehome", "value": "False" },
-                    { "key": "locationId", "value": "dfwtx" }
-                ]
-            },
-            {
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceResourceId": "testResourceIdAR2",
-                "solution": {
-                    "identifierType": "serviceInstanceId",
-                    "identifiers": ["testSIID2"]
-                },
-                "assignmentInfo": [
-                    { "key": "cloudOwner", "value": "aic" },
-                    { "key": "vnfHostName", "value": "testVnfHostname2" },
-                    { "key": "isRehome", "value": "False" },
-                    { "key": "locationId", "value": "testCloudRegionId2" }
-                ]
-            },
-            {
-                "resourceModuleName": "NETWORK",
-                "serviceResourceId": "testResourceIdNet",
-                "solution": {
-                    "identifierType": "serviceInstanceId",
-                    "identifiers": ["testServiceInstanceIdNet"]
-                },
-                "assignmentInfo": [
-                    { "key": "cloudOwner", "value": "aic" },
-                    { "key": "vnfHostName", "value": "testVnfHostNameNet" },
-                    { "key": "isRehome", "value": "False" },
-                    { "key": "locationId", "value": "testCloudRegionIdNet" }
-                ]
-            },
-            {
-                "resourceModuleName": "NETWORK",
-                "serviceResourceId": "testResourceIdNet2",
-                "solution": {
-                    "identifierType": "cloudRegionId",
-                    "cloudOwner": "aic",
-                    "identifiers": ["testCloudRegionIdNet2"]
-                },
-                "assignmentInfo": [
-                    { "key": "cloudOwner", "value": "aic" },
-                    { "key": "locationId", "value": "testCloudRegionIdNet2" }
-                ]
-            },
-            {
-                "resourceModuleName": "VNF",
-                "serviceResourceId": "testResourceIdVNF",
-                "solution": {
-                    "identifierType": "cloudRegionId",
-                    "cloudOwner": "aic",
-                    "identifiers": ["testCloudRegionId3"]
-                },
-                "assignmentInfo": [
-                    { "key": "cloudOwner", "value": "aic" },
-                    { "key": "locationId", "value": "testCloudRegionId3" },
-                    { "key":"flavors", "value":{ "flavorLabel1xxx":"vimFlavorxxx", "flavorLabel2xxx":"vimFlavorxxx"}}
-                ]
-            }
-        ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackInfraVnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackInfraVnf
deleted file mode 100644
index 15e601bae8..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackInfraVnf
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-   "transactionId": "xxx-xxx-xxxx",
-   "requestId": "yyy-yyy-yyyy",
-   "requestStatus": "completed",
-   "statusMessage": "success",
-   "solutions": {
-      "placementSolutions": [
-         [
-         {
-            "resourceModuleName": "vGMuxInfra",
-            "serviceResourceId": "some_resource_id",
-            "solution": {
-               "identifierType": "serviceInstanceId",
-               "identifiers": ["gjhd-098-fhd-987"]
-            },
-            "assignmentInfo": [
-               { "key": "cloudOwner", "value": "amazon" },
-               { "key": "vnfHostName", "value": "ahr344gh" },
-               { "key": "isRehome", "value": "False" },
-               { "key": "locationId", "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" }
-            ]
-         },
-         {
-            "resourceModuleName": "vG",
-            "serviceResourceId": "some_resource_id",
-            "solution": {
-               "identifierType": "cloudRegionId",
-               "cloudOwner": "amazon",
-               "identifiers": ["gjhd-098-fhd-987"]
-            },
-            "assignmentInfo": [
-               { "key": "cloudOwner", "value": "amazon" },
-               { "key": "locationId", "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" },
-               { "key":"flavors", "value":{ "flavorLabel1xxx":"vimFlavorxxx", "flavorLabel2xxx":"vimFlavorxxx"}}
-            ]
-         }
-      ]
-      ],
-      "licenseSolutions": [
-         {
-            "resourceModuleName": "vGMuxInfra",
-            "serviceResourceId": "some_resource_id",
-            "entitlementPoolUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-            "licenseKeyGroupUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-            "entitlementPoolInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"],
-            "licenseKeyGroupInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"]
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound
deleted file mode 100644
index 2024df401b..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "plans":[
-    {
-      "name":"356fdb73-cef2-4dda-8865-31fd6733d6e4",
-      "message":"Unable to find any candidate for demand vGW",
-      "links":[
-        [
-          {
-            "rel":"self",
-            "href":"http://172.17.0.6:8091/v1/plans/1c15e194-6df5-43fe-a5ff-42e6093b8ddd"
-          }
-        ]
-      ],
-      "id":"1c15e194-6df5-43fe-a5ff-42e6093b8ddd",
-      "status":"error"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackPolicyException b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackPolicyException
deleted file mode 100644
index b82688428e..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackPolicyException
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"requestError": {
-		"policyException": {
-		  "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
-		  "text": "Message content size exceeds the allowable limit",
-		  "messageId": "SVC0001"
-		}
-	}
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackServiceException b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackServiceException
deleted file mode 100644
index de43e82c9e..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackServiceException
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"requestError": {
-		"serviceException": {
-		"variables": [
-		"severity", 400
-		],
-		 "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
-		  "text": "OOF PlacementError: requests.exceptions.HTTPError: 404 Client Error: Not Found for url: http://135.21.171.200:8091/v1/plans/97b4e303-5f75-492c-8fb2-21098281c8b8",
-		   "messageId": "SVC0001"
-		}
-	}
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCatalogResp.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCatalogResp.json
deleted file mode 100644
index 889431663d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCatalogResp.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-   "serviceResources": {
-      "serviceType": null,
-      "serviceAllottedResources": [],
-      "modelInfo": {
-         "modelInvariantUuid": "1cc4e2e4-eb6e-404d-a66f-c8733cedcce8",
-         "modelName": "ADIOD vRouter vCE 011017 Service",
-         "modelVersion": "5.0",
-         "modelUuid": "2f7f309d-c842-4644-a2e4-34167be5eeb4"
-      },
-      "serviceRole": null,
-      "serviceVnfs": [
-         {
-            "toscaNodeType": "org.openecomp.resource.vf.AdiodVce",
-            "vfModules": [
-               {
-                  "initialCount": null,
-                  "vfModuleLabel": null,
-                  "modelInfo": {
-                     "modelInvariantUuid": "7fb428e1-8000-4800-a71a-f21b946973c5",
-                     "modelName": "AdiodVce..base_vCE..module-0",
-                     "modelVersion": "2",
-                     "modelCustomizationUuid": "1126e7e2-b377-4fd2-ad48-660a20caa829",
-                     "modelUuid": "435d57e1-93a2-4d58-aa5d-f2df2d126276"
-                  },
-                  "hasVolumeGroup": true,
-                  "isBase": true
-               }
-            ],
-            "modelInfo": {
-               "modelInvariantUuid": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-               "modelName": "ADIoD vCE",
-               "modelVersion": "2.0",
-               "modelCustomizationUuid": "bdaeed40-c964-4966-bdb8-51320dcaf587",
-               "modelInstanceName": "ADIoD vCE 0",
-               "modelUuid": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1"
-            },
-            "nfRole": "",
-            "nfType": "",
-            "nfFunction": "ADIoDvCE",
-            "nfNamingCode": "",
-            "multiStageDesign": "N"
-        }
-      ],
-      "serviceNetworks": []
-   }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest
deleted file mode 100644
index 42b2a0f24a..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "requestInfo": {
-    "transactionId": "testRequestId-xxx-xxx",
-    "requestId": "testRequestId-yyy-yyy",
-    "callbackUrl": "http://localhost:28090/workflows/messages/message/oofResponse/testRequestId",
-    "sourceId": "so",
-    "requestType": "create",
-    "numSolutions": 1,
-    "optimizers": ["placement"],
-    "timeout": 600
-  },
-  "placementInfo": {
-    "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" },
-    "placementDemands": [
-      {
-        "resourceModuleName": "vGMuxInfra",
-        "serviceResourceId": "vGMuxInfra-xx",
-        "tenantId": "vGMuxInfra-tenant",
-        "resourceModelInfo": {
-          "modelInvariantId": "vGMuxInfra-modelInvariantId",
-          "modelVersionId": "vGMuxInfra-versionId",
-          "modelName": "vGMuxInfra-model",
-          "modelType": "resource",
-          "modelVersion": "1.0",
-          "modelCustomizationName": "vGMuxInfra-customeModelName"
-        }
-      },
-      {
-        "resourceModuleName": "vG",
-        "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e",
-        "tenantId": "vG-tenant",
-        "resourceModelInfo": {
-          "modelInvariantId": "vG-modelInvariantId",
-          "modelVersionId": "vG-versionId",
-          "modelName": "vG-model",
-          "modelType": "resource",
-          "modelVersion": "1.0",
-          "modelCustomizationName": "vG-customeModelName"
-        },
-        "existingCandidates": [
-          {
-            "identifierType": "service_instance_id",
-            "cloudOwner": "",
-            "identifiers": ["gjhd-098-fhd-987"]
-          }
-        ],
-        "excludedCandidates": [
-          {
-            "identifierType": "service_instance_id",
-            "cloudOwner": "",
-            "identifiers": ["gjhd-098-fhd-987"]
-          },
-          {
-            "identifierType": "vimId",
-            "cloudOwner": "vmware",
-            "identifiers": ["NYMDT67"]
-          }
-        ],
-        "requiredCandidates": [
-          {
-            "identifierType": "vimId",
-            "cloudOwner": "amazon",
-            "identifiers": ["TXAUS219"]
-          }
-        ]
-      }
-    ]
-  },
-  "serviceInfo": {
-    "serviceInstanceId": "d61b2543-5914-4b8f-8e81-81e38575b8ec",
-    "serviceName": "vCPE",
-    "modelInfo": {
-      "modelInvariantId": "vCPE-invariantId",
-      "modelVersionId": "vCPE-versionId",
-      "modelName": "vCPE-model",
-      "modelType": "service",
-      "modelVersion": "1.0",
-      "modelCustomizationName": ""
-    }
-  },
-  "licenseDemands": [
-    {
-      "resourceModuleName": "vGMuxInfra",
-      "serviceResourceId": "vGMuxInfra-xx",
-      "resourceModelInfo": {
-        "modelInvariantId": "vGMuxInfra-modelInvariantId",
-        "modelVersionId": "vGMuxInfra-versionId",
-        "modelName": "vGMuxInfra-model",
-        "modelType": "resource",
-        "modelVersion": "1.0",
-        "modelCustomizationName": ""
-      },
-      "existingLicenses": {
-        "entitlementPoolUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"],
-        "licenseKeyGroupUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest_infravnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest_infravnf
deleted file mode 100644
index 67c9fbedc9..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofRequest_infravnf
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "requestInfo": {
-    "transactionId": "testRequestId",
-    "requestId": "testRequestId",
-    "callbackUrl": "http://localhost:28090/workflows/messages/message/oofResponse/testRequestId",
-    "sourceId": "so",
-    "requestType": "create",
-    "numSolutions": 1,
-    "optimizers": ["placement"],
-    "timeout": 600    },
-  "placementInfo": {
-    "requestParameters": {
-      "customerLatitude": "32.89748",
-      "customerLongitude": "-97.040443",
-      "customerName": "xyz"    },
-    "subscriberInfo": {       "globalSubscriberId": "SUB12_0322_DS_1201",
-      "subscriberName": "SUB_12_0322_DS_1201",
-      "subscriberCommonSiteId": ""    },
-    "placementDemands": [
-      {"resourceModuleName": "VNF","serviceResourceId": "test-resource-id-000","tenantId": "null","resourceModelInfo": {
-  "modelInvariantId": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-  "modelVersionId": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1",
-  "modelName": "ADIoD vCE",
-  "modelType": "",
-  "modelVersion": "2.0",
-  "modelCustomizationName": ""  }}
-      ]
-    },
-  "serviceInfo": {
-    "serviceInstanceId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-    "serviceName": "null",
-    "modelInfo": {
-      "modelType": "",
-      "modelInvariantId": "1cc4e2e4-eb6e-404d-a66f-c8733cedcce8",
-      "modelVersionId": "2f7f309d-c842-4644-a2e4-34167be5eeb4",
-      "modelName": "ADIOD vRouter vCE 011017 Service",
-      "modelVersion": "5.0",
-      "modelCustomizationName": ""
-    }
-  },
-  "licenseInfo": {
-    "licenseDemands": [
-      {
-"resourceModuleName": "VNF",
-"serviceResourceId": "test-resource-id-000",
-"resourceInstanceType": "VNF",
-"resourceModelInfo": {
-  "modelInvariantId": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-  "modelVersionId": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1",
-  "modelName": "ADIoD vCE",
-  "modelType": "",
-  "modelVersion": "2.0",
-  "modelCustomizationName": ""
-  }
-      }]
-    }}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
deleted file mode 100644
index 372f5d9e4d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "transactionId": "testRequestId",
-	"requestId": "testRequestId",
-	"requestState": "complete",
-	"statusMessage": "",
-    "solutionInfo": {
-        "licenseInfo": [
-            {
-                "entitlementPoolList": [
-                    "f1d563e8-e714-4393-8f99-cc480144a05e",
-                    "j1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupList": [
-                    "s1d563e8-e714-4393-8f99-cc480144a05e",
-                    "b1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_primary_1",
-                "serviceResourceId": "testResourceIdAR"
-            },
-            {
-                "entitlementPoolList": [
-                    "91d563e8-e714-4393-8f99-cc480144a05e",
-                    "21d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupList": [
-                    "31d563e8-e714-4393-8f99-cc480144a05e",
-                    "71d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_secondary_1",
-                "serviceResourceId": "testResourceIdVNF"
-            }
-        ],
-        "placementInfo": [
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "vnfHostName",
-                        "variableValue": "MDTNJ01"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "KDTNJ01"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "dfwtx",
-                "inventoryType": "service",
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceInstanceId": "testSIID1",
-                "serviceResourceId": "testResourceIdAR",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "vnfHostName",
-                        "variableValue": "testVnfHostname2"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClli2"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionId2",
-                "inventoryType": "service",
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceInstanceId": "testSIID2",
-                "serviceResourceId": "testResourceIdAR2",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClli3"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionId3",
-                "inventoryType": "cloud",
-                "resourceModuleName": "VNF",
-                "serviceInstanceId": "",
-                "serviceResourceId": "testResourceIdVNF",
-                "isRehome": "False"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
deleted file mode 100644
index 694419700d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallback2AR1Vnf2Net
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "transactionId": "testRequestId",
-	"requestId": "testRequestId",
-	"requestState": "complete",
-	"statusMessage": "",
-    "solutionInfo": {
-        "licenseInfo": [
-            {
-                "entitlementPoolList": [
-                    "f1d563e8-e714-4393-8f99-cc480144a05e",
-                    "j1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupList": [
-                    "s1d563e8-e714-4393-8f99-cc480144a05e",
-                    "b1d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_primary_1",
-                "serviceResourceId": "testResourceIdAR"
-            },
-            {
-                "entitlementPoolList": [
-                    "f1d563e8-e714-4393-8f99-cc480144a05n",
-                    "j1d563e8-e714-4393-8f99-cc480144a05n"
-                ],
-                "licenseKeyGroupList": [
-                    "s1d563e8-e714-4393-8f99-cc480144a05n",
-                    "b1d563e8-e714-4393-8f99-cc480144a05n"
-                ],
-                "resourceModuleName": "net",
-                "serviceResourceId": "testResourceIdNet2"
-            },
-            {
-                "entitlementPoolList": [
-                    "91d563e8-e714-4393-8f99-cc480144a05e",
-                    "21d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "licenseKeyGroupList": [
-                    "31d563e8-e714-4393-8f99-cc480144a05e",
-                    "71d563e8-e714-4393-8f99-cc480144a05e"
-                ],
-                "resourceModuleName": "vHNPortalaaS_secondary_1",
-                "serviceResourceId": "testResourceIdVNF"
-            }
-        ],
-        "placementInfo": [
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "vnfHostName",
-                        "variableValue": "MDTNJ01"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "KDTNJ01"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "dfwtx",
-                "inventoryType": "service",
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceInstanceId": "testSIID1",
-                "serviceResourceId": "testResourceIdAR",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "vnfHostName",
-                        "variableValue": "testVnfHostname2"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClli2"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionId2",
-                "inventoryType": "service",
-                "resourceModuleName": "ALLOTTED_RESOURCE",
-                "serviceInstanceId": "testSIID2",
-                "serviceResourceId": "testResourceIdAR2",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "vnfHostName",
-                        "variableValue": "testVnfHostNameNet"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClliNet"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionIdNet",
-                "inventoryType": "service",
-                "resourceModuleName": "NETWORK",
-                "serviceInstanceId": "testServiceInstanceIdNet",
-                "serviceResourceId": "testResourceIdNet",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClliNet2"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionIdNet2",
-                "inventoryType": "cloud",
-                "resourceModuleName": "NETWORK",
-                "serviceInstanceId": "",
-                "serviceResourceId": "testResourceIdNet2",
-                "isRehome": "False"
-            },
-            {
-                "assignmentInfo": [
-                    {
-                        "variableName": "cloudOwner",
-                        "variableValue": "aic"
-                    },
-                    {
-                        "variableName": "aicClli",
-                        "variableValue": "testAicClli3"
-                    },
-                    {
-                        "variableName": "aicVersion",
-                        "variableValue": "3.0"
-                    }
-                ],
-                "cloudRegionId": "testCloudRegionId3",
-                "inventoryType": "cloud",
-                "resourceModuleName": "VNF",
-                "serviceInstanceId": "",
-                "serviceResourceId": "testResourceIdVNF",
-                "isRehome": "False"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf
deleted file mode 100644
index 9159d80c43..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackInfraVnf
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-   "transactionId": "testRequestId",
-   "requestId": "testRequestId",
-   "requestState": "complete",
-   "statusMessage": "",
-   "solutionInfo": {
-      "placementInfo": [
-         {
-            "serviceResourceId": "test-resource-id-000",
-            "resourceModuleName": "ADIOD vRouter vCE",
-            "inventoryType": "service",
-            "serviceInstanceId": "service-instance-01234",
-            "cloudRegionId": "mtmnj1a",
-            "isRehome": "False",
-            "assignmentInfo": [
-               {
-                  "variableName": "cloudOwner",
-                  "variableValue": "att-aic"
-               },
-               {
-                  "variableName": "vnfHostName",
-                  "variableValue": "MDTNJ01"
-               },
-               {
-                  "variableName": "aicClli",
-                  "variableValue": "KDTNJ01"
-               },
-               {
-                  "variableName": "aicVersion",
-                  "variableValue": "3.0"
-               }
-            ]
-         }
-      ],
-      "licenseInfo": [
-         {
-            "serviceResourceId": "test-resource-id-000",
-            "resourceModuleName": "ADIOD vRouter vCE",
-            "entitlementPoolList": [
-               "f1d563e8-e714-4393-8f99-cc480144a05e",
-               "j1d563e8-e714-4393-8f99-cc480144a05e"
-            ],
-            "licenseKeyGroupList": [
-               "s1d563e8-e714-4393-8f99-cc480144a05e",
-               "b1d563e8-e714-4393-8f99-cc480144a05e"
-            ]
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound
deleted file mode 100644
index 5cb748ae9d..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackNoSolutionFound
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestState": "",
-  "responseTime": "",
-  "solutionInfo": {
-    "placement": [],
-    "licenseInfo": {
-      "featureGroupId": ""
-    }
-  },
-  "percentProgress": "",
-  "requestId": "02c2e322-5839-4c97-9d46-0a5fa6bb642e",
-  "startTime": "",
-  "statusMessage": "No solution found for plan 08e1b8cf-144a-4bac-b293-d5e2eedc97e8",
-  "requestType": ""
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException
deleted file mode 100644
index b82688428e..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackPolicyException
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"requestError": {
-		"policyException": {
-		  "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
-		  "text": "Message content size exceeds the allowable limit",
-		  "messageId": "SVC0001"
-		}
-	}
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException
deleted file mode 100644
index 6cc78a7cdb..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroCallbackServiceException
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"requestError": {
-		"serviceException": {
-		"variables": [
-		"severity", 400
-		],
-		 "requestId": "ae81d9a8-c949-493a-999c-f76c80503233",
-		  "text": "SNIROPlacementError: requests.exceptions.HTTPError: 404 Client Error: Not Found for url: http://135.21.171.200:8091/v1/plans/97b4e303-5f75-492c-8fb2-21098281c8b8",
-		   "messageId": "SVC0001"
-		}
-	}
-}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf
deleted file mode 100644
index 2af6bf3423..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/sniroRequest_infravnf
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	  	"requestInfo": {
-				"transactionId": "testRequestId",
-				"requestId": "testRequestId",
-				"callbackUrl": "http://localhost:8090/workflows/messages/message/SNIROResponse/testRequestId",
-				"sourceId": "mso",
-				"optimizer": [
-					"placement",
-					"license"
-				],
-				"numSolutions": 1,
-				"timeout": 600
-				},
-		"placementInfo": {
-			"serviceModelInfo": {
-				"modelType": "",
-				"modelInvariantId": "1cc4e2e4-eb6e-404d-a66f-c8733cedcce8",
-				"modelVersionId": "2f7f309d-c842-4644-a2e4-34167be5eeb4",
-				"modelName": "ADIOD vRouter vCE 011017 Service",
-				"modelVersion": "5.0"
-				},
-			"subscriberInfo": {
-				"globalSubscriberId": "SUB12_0322_DS_1201",
-				"subscriberName": "SUB_12_0322_DS_1201",
-				"subscriberCommonSiteId": ""
-				},
-			"demandInfo": {
-				"placementDemand": [
-					{
-						"resourceInstanceType": "VNF",
-						"serviceResourceId": "test-resource-id-000",
-						"resourceModuleName": "ADIoD vCE 0",
-						"resourceModelInfo": {
-							"modelCustomizationId": "bdaeed40-c964-4966-bdb8-51320dcaf587",
-							"modelInvariantId": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-							"modelName": "ADIoD vCE",
-							"modelVersion": "2.0",
-							"modelVersionId": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1",
-							"modelType": ""
-						},
-						"tenantId": "",
-						"tenantName": ""
-					}
-				],
-				"licenseDemand": [
-					{
-						"resourceInstanceType": "VNF",
-						"serviceResourceId": "test-resource-id-000",
-						"resourceModuleName": "ADIoD vCE 0",
-						"resourceModelInfo": {
-							"modelCustomizationId": "bdaeed40-c964-4966-bdb8-51320dcaf587",
-							"modelInvariantId": "fc72435b-4366-4257-a2f7-c70a3a998a7b",
-							"modelName": "ADIoD vCE",
-							"modelVersion": "2.0",
-							"modelVersionId": "ec2bd873-5b2c-47e4-8858-f0495fa1dae1",
-							"modelType": ""
-						}
-					}
-				]
-			},
-			"policyId": [],
-			"serviceInstanceId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-			"orderInfo": "{\"requestParameters\": null}"
-		}
-	  }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
index 182d7c9a11..c7a42923c8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume.xml
@@ -1,22 +1,22 @@
-  <volume-group xmlns="http://com.aai.inventory/v6">

-         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>

-         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>

-         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>

-         <vnf-type>VmogSvc/moge2e2</vnf-type>

-         <orchestration-status>Active</orchestration-status>

-         <resource-version>1458839419</resource-version>

-         <relationship-list>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-               </relationship-data>

-               <related-to-property>

-                  <property-key>tenant.tenant-name</property-key>

-                  <property-value>MOG-25208-D-01</property-value>

-               </related-to-property>

-            </relationship>

-         </relationship-list>

+  <volume-group xmlns="http://com.aai.inventory/v6">
+         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>
+         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>
+         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>
+         <vnf-type>VmogSvc/moge2e2</vnf-type>
+         <orchestration-status>Active</orchestration-status>
+         <resource-version>1458839419</resource-version>
+         <relationship-list>
+            <relationship>
+               <related-to>tenant</related-to>
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
+               </relationship-data>
+               <related-to-property>
+                  <property-key>tenant.tenant-name</property-key>
+                  <property-value>MOG-25208-D-01</property-value>
+               </related-to-property>
+            </relationship>
+         </relationship-list>
       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
index 9b91bc5beb..ffa5829cdc 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml
@@ -1,22 +1,22 @@
-  <volume-group xmlns="http://com.aai.inventory/v6">

-         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>

-         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>

-         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>

-         <vnf-type>VmogSvc/moge2e2</vnf-type>

-         <orchestration-status>Active</orchestration-status>

-         <resource-version>1458839419</resource-version>

-         <relationship-list>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>83464847234ee8937416c65507d267</relationship-value>

-               </relationship-data>

-               <related-to-property>

-                  <property-key>tenant.tenant-name</property-key>

-                  <property-value>MOG-25208-D-01</property-value>

-               </related-to-property>

-            </relationship>

-         </relationship-list>

+  <volume-group xmlns="http://com.aai.inventory/v6">
+         <volume-group-id>a8399879-31b3-4973-be26-0a0cbe776b58</volume-group-id>
+         <volume-group-name>MoG_CinderVolumes_2</volume-group-name>
+         <heat-stack-id>MoG_CinderVolumes_2/19387dc6-060f-446e-b41f-dcfd29c73845</heat-stack-id>
+         <vnf-type>VmogSvc/moge2e2</vnf-type>
+         <orchestration-status>Active</orchestration-status>
+         <resource-version>1458839419</resource-version>
+         <relationship-list>
+            <relationship>
+               <related-to>tenant</related-to>
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v6/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>83464847234ee8937416c65507d267</relationship-value>
+               </relationship-data>
+               <related-to-property>
+                  <property-key>tenant.tenant-name</property-key>
+                  <property-value>MOG-25208-D-01</property-value>
+               </related-to-property>
+            </relationship>
+         </relationship-list>
       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
index 6ebc6e221e..027f2d92fc 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
@@ -1,75 +1,75 @@
-use camundabpmn;

-/* 

-Drop a archive tables

-*/

-/*-- TMP_ARCHIVING_PROCINST */

-DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;

-

-/*-- TMP_ARCHIVING_BYTEARRAY */

-DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;

-

-/*-- TMP LOG TABLE */

-DROP TABLE IF EXISTS TMPLOGTABLE;

-

-/* -- Camunda Hi Tables --*/

-DROP TABLE IF EXISTS Camunda_Hi_Tables;

-

-/* drop own extentions columns:

-alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

-*/

-

-/*--#1 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;

-/*--#2 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;

-/*--#3 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;

-/*--#4 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;

-/*--#5 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;

-/*--#6 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;

-/*--#7 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;

-/*--#8 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;

-/*--#9 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;

-/*--#10 */

-DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;

-

-/* drop PL SQL procedures: */

-DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;

-DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;

- 

-/*-- Sequence */

--- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence

- DROP PROCEDURE IF EXISTS DropSequence;

- 

-  DELIMITER //

- 

-  CREATE PROCEDURE DropSequence (vname VARCHAR(30))

-  BEGIN

-     -- Drop the sequence

-     DELETE FROM _sequences WHERE name = vname;  

-  END

-  //

-  DELIMITER ;

-

--- use the above procedure to drop sequence 

-CALL DropSequence('STAT_EXECUTION_SEQ');

-

-/*-- To Drop the MariaDB specific user defined procedures and functions */

-DROP FUNCTION IF EXISTS NextVal;

-DROP PROCEDURE IF EXISTS CreateSequence;

-DROP PROCEDURE IF EXISTS DropSequence;

+use camundabpmn;
+/* 
+Drop a archive tables
+*/
+/*-- TMP_ARCHIVING_PROCINST */
+DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;
+
+/*-- TMP_ARCHIVING_BYTEARRAY */
+DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;
+
+/*-- TMP LOG TABLE */
+DROP TABLE IF EXISTS TMPLOGTABLE;
+
+/* -- Camunda Hi Tables --*/
+DROP TABLE IF EXISTS Camunda_Hi_Tables;
+
+/* drop own extentions columns:
+alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
+*/
+
+/*--#1 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;
+/*--#2 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;
+/*--#3 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;
+/*--#4 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;
+/*--#5 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;
+/*--#6 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;
+/*--#7 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;
+/*--#8 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;
+/*--#9 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;
+/*--#10 */
+DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;
+
+/* drop PL SQL procedures: */
+DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
+DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
+ 
+/*-- Sequence */
+-- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence
+ DROP PROCEDURE IF EXISTS DropSequence;
+ 
+  DELIMITER //
+ 
+  CREATE PROCEDURE DropSequence (vname VARCHAR(30))
+  BEGIN
+     -- Drop the sequence
+     DELETE FROM _sequences WHERE name = vname;  
+  END
+  //
+  DELIMITER ;
+
+-- use the above procedure to drop sequence 
+CALL DropSequence('STAT_EXECUTION_SEQ');
+
+/*-- To Drop the MariaDB specific user defined procedures and functions */
+DROP FUNCTION IF EXISTS NextVal;
+DROP PROCEDURE IF EXISTS CreateSequence;
+DROP PROCEDURE IF EXISTS DropSequence;
 DROP TABLE IF EXISTS _sequences;
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
index c5b69c7a34..81485d3433 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
@@ -1,221 +1,221 @@
-use camundabpmn;

-/*

- 1.  Add some Camunda Indexes to history schema part (for Archiving)

-*/

-create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 

-create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);

-create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);

-create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);

-create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);

-create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 

-

-

-/*

- 2.  Create Archiving Tables in current schema 

-*/

-

-/*-- TMP_ARCHIVING_PROCINST */

-CREATE TABLE TMP_ARCHIVING_PROCINST

-( PROC_INST_ID_ varchar(64) not null,

-  END_TIME_ datetime(3)

-);

-CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);

-

-/*-- TMP_ARCHIVING_BYTEARRAY */

-CREATE TABLE TMP_ARCHIVING_BYTEARRAY

-( BYTEARRAY_ID_ varchar(64) not null,

-  PROC_INST_ID_ varchar(64)

-);

-CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);

-

-

-/*--#1 ARCHIVE_ACT_HI_PROCINST; */

-create TABLE ARCHIVE_ACT_HI_PROCINST

-AS ( select * from ACT_HI_PROCINST where 1=0);

-

-create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);

-ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);

-

-/*--#2   ARCHIVE_ACT_HI_ACTINST; */

-create TABLE ARCHIVE_ACT_HI_ACTINST

-AS ( select * from ACT_HI_ACTINST where 1=0);

-

-create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);

-create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);

-

-/*--#3  ARCHIVE_ACT_HI_TASKINST; */

-create TABLE ARCHIVE_ACT_HI_TASKINST

-AS ( select * from ACT_HI_TASKINST where 1=0);

-

-create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);

-create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);

-

-/*--#4 ARCHIVE_ACT_HI_VARINST; */

-create TABLE ARCHIVE_ACT_HI_VARINST

-AS ( select * from ACT_HI_VARINST where 1=0);

-

-create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);

-

-/*--#5 ARCHIVE_ACT_HI_DETAIL; */

-create TABLE ARCHIVE_ACT_HI_DETAIL

-AS ( select * from ACT_HI_DETAIL where 1=0);

-

-create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);

-create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);

-

-/*--#6 ARCHIVE_ACT_HI_COMMENT; */

-create TABLE ARCHIVE_ACT_HI_COMMENT

-AS ( select * from ACT_HI_COMMENT where 1=0);

-

-create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);

-create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);

-

-/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */

-create TABLE ARCHIVE_ACT_HI_ATTACHMENT

-AS ( select * from ACT_HI_ATTACHMENT where 1=0);

-

-create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);

-

-/*--#8 ARCHIVE_ACT_HI_OP_LOG; */

-create TABLE ARCHIVE_ACT_HI_OP_LOG

-AS ( select * from ACT_HI_OP_LOG where 1=0);

-

-create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);

-create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);

-

-/*--#9 ARCHIVE_ACT_HI_INCIDENT; */

-create TABLE ARCHIVE_ACT_HI_INCIDENT

-AS ( select * from ACT_HI_INCIDENT where 1=0);

-

-create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);

-

-/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */

-create TABLE ARCHIVE_ACT_GE_BYTEARRAY

-AS ( select * from ACT_GE_BYTEARRAY where 1=0);

-

-create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);

-

-/* -----------------------------------------------------------------------------

-Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 

-*/

- 

-/*

---TEMPLATE:

-alter table ARCHIVE_%TableName%

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);

-*/

-

-

-/*--#1 ACT_HI_PROCINST */

-alter table ARCHIVE_ACT_HI_PROCINST

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);

-

-/*--#2 ACT_HI_ACTINST */

-alter table ARCHIVE_ACT_HI_ACTINST

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);

-

-/*--#3 ACT_HI_TASKINST */

-alter table ARCHIVE_ACT_HI_TASKINST

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);

-

-/*--#4 ACT_HI_VARINST */

-alter table ARCHIVE_ACT_HI_VARINST

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);

-

-/*--#5 ACT_HI_DETAIL */

-alter table ARCHIVE_ACT_HI_DETAIL

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);

-

-/*--#6 ACT_HI_COMMENT */

-alter table ARCHIVE_ACT_HI_COMMENT

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);

-

-/*--#7 ACT_HI_ATTACHMENT */

-alter table ARCHIVE_ACT_HI_ATTACHMENT

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);

-

-/*--#8 ACT_HI_OP_LOG */

-alter table ARCHIVE_ACT_HI_OP_LOG

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);

-

-/*--#9 ACT_HI_INCIDENT */

-alter table ARCHIVE_ACT_HI_INCIDENT

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);

-

-/*--#10 ACT_GE_BYTEARRAY */

-alter table ARCHIVE_ACT_GE_BYTEARRAY

-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

-CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);

-

-

-/* -- Next Val as a user defined function needed only in MariaDB--*/

-DROP FUNCTION IF EXISTS NextVal;

-  DELIMITER //

-  CREATE FUNCTION NextVal (vname VARCHAR(30))

-    RETURNS INT

-  BEGIN

-     -- Retrieve and update in single statement

-     UPDATE _sequences

-       SET next = next + 1

-       WHERE name = vname;

- 

-     RETURN (SELECT next FROM _sequences LIMIT 1);

-  END

-  //

-  DELIMITER ;

-  

-/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/

-Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,

-     TableName_ varchar(80) NOT NULL,

-     PRIMARY KEY (id_));

-   

-Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');

-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');

-

-/*-- log table --*/

-CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));

-

-

-/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/

-/*-- Create a sequence SP */

-DROP PROCEDURE IF EXISTS CreateSequence;

-  DELIMITER //

-  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)

-  BEGIN

-     -- Create a table to store sequences

-     CREATE TABLE IF NOT EXISTS _sequences

-     (

-         name VARCHAR(70) NOT NULL UNIQUE,

-         next INT NOT NULL,

-         inc INT NOT NULL

-     );

- 

-     -- Add the new sequence

-     INSERT INTO _sequences VALUES (name, start, inc);  

-  END

-  //

-  DELIMITER ;

-

-/*--------------------------------------------------------------------------------------------------

- Add Meta to Archive

- -------------------------------------------------------------------------------------------------- */

-

-/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */

-CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);

+use camundabpmn;
+/*
+ 1.  Add some Camunda Indexes to history schema part (for Archiving)
+*/
+create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 
+create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);
+create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 
+
+
+/*
+ 2.  Create Archiving Tables in current schema 
+*/
+
+/*-- TMP_ARCHIVING_PROCINST */
+CREATE TABLE TMP_ARCHIVING_PROCINST
+( PROC_INST_ID_ varchar(64) not null,
+  END_TIME_ datetime(3)
+);
+CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);
+
+/*-- TMP_ARCHIVING_BYTEARRAY */
+CREATE TABLE TMP_ARCHIVING_BYTEARRAY
+( BYTEARRAY_ID_ varchar(64) not null,
+  PROC_INST_ID_ varchar(64)
+);
+CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);
+
+
+/*--#1 ARCHIVE_ACT_HI_PROCINST; */
+create TABLE ARCHIVE_ACT_HI_PROCINST
+AS ( select * from ACT_HI_PROCINST where 1=0);
+
+create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);
+ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);
+
+/*--#2   ARCHIVE_ACT_HI_ACTINST; */
+create TABLE ARCHIVE_ACT_HI_ACTINST
+AS ( select * from ACT_HI_ACTINST where 1=0);
+
+create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);
+create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);
+
+/*--#3  ARCHIVE_ACT_HI_TASKINST; */
+create TABLE ARCHIVE_ACT_HI_TASKINST
+AS ( select * from ACT_HI_TASKINST where 1=0);
+
+create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);
+create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);
+
+/*--#4 ARCHIVE_ACT_HI_VARINST; */
+create TABLE ARCHIVE_ACT_HI_VARINST
+AS ( select * from ACT_HI_VARINST where 1=0);
+
+create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);
+
+/*--#5 ARCHIVE_ACT_HI_DETAIL; */
+create TABLE ARCHIVE_ACT_HI_DETAIL
+AS ( select * from ACT_HI_DETAIL where 1=0);
+
+create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);
+create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);
+
+/*--#6 ARCHIVE_ACT_HI_COMMENT; */
+create TABLE ARCHIVE_ACT_HI_COMMENT
+AS ( select * from ACT_HI_COMMENT where 1=0);
+
+create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);
+create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);
+
+/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */
+create TABLE ARCHIVE_ACT_HI_ATTACHMENT
+AS ( select * from ACT_HI_ATTACHMENT where 1=0);
+
+create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);
+
+/*--#8 ARCHIVE_ACT_HI_OP_LOG; */
+create TABLE ARCHIVE_ACT_HI_OP_LOG
+AS ( select * from ACT_HI_OP_LOG where 1=0);
+
+create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);
+create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);
+
+/*--#9 ARCHIVE_ACT_HI_INCIDENT; */
+create TABLE ARCHIVE_ACT_HI_INCIDENT
+AS ( select * from ACT_HI_INCIDENT where 1=0);
+
+create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);
+
+/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */
+create TABLE ARCHIVE_ACT_GE_BYTEARRAY
+AS ( select * from ACT_GE_BYTEARRAY where 1=0);
+
+create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);
+
+/* -----------------------------------------------------------------------------
+Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 
+*/
+ 
+/*
+--TEMPLATE:
+alter table ARCHIVE_%TableName%
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);
+*/
+
+
+/*--#1 ACT_HI_PROCINST */
+alter table ARCHIVE_ACT_HI_PROCINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);
+
+/*--#2 ACT_HI_ACTINST */
+alter table ARCHIVE_ACT_HI_ACTINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);
+
+/*--#3 ACT_HI_TASKINST */
+alter table ARCHIVE_ACT_HI_TASKINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);
+
+/*--#4 ACT_HI_VARINST */
+alter table ARCHIVE_ACT_HI_VARINST
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);
+
+/*--#5 ACT_HI_DETAIL */
+alter table ARCHIVE_ACT_HI_DETAIL
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);
+
+/*--#6 ACT_HI_COMMENT */
+alter table ARCHIVE_ACT_HI_COMMENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);
+
+/*--#7 ACT_HI_ATTACHMENT */
+alter table ARCHIVE_ACT_HI_ATTACHMENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);
+
+/*--#8 ACT_HI_OP_LOG */
+alter table ARCHIVE_ACT_HI_OP_LOG
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);
+
+/*--#9 ACT_HI_INCIDENT */
+alter table ARCHIVE_ACT_HI_INCIDENT
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);
+
+/*--#10 ACT_GE_BYTEARRAY */
+alter table ARCHIVE_ACT_GE_BYTEARRAY
+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
+CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);
+
+
+/* -- Next Val as a user defined function needed only in MariaDB--*/
+DROP FUNCTION IF EXISTS NextVal;
+  DELIMITER //
+  CREATE FUNCTION NextVal (vname VARCHAR(30))
+    RETURNS INT
+  BEGIN
+     -- Retrieve and update in single statement
+     UPDATE _sequences
+       SET next = next + 1
+       WHERE name = vname;
+ 
+     RETURN (SELECT next FROM _sequences LIMIT 1);
+  END
+  //
+  DELIMITER ;
+  
+/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/
+Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,
+     TableName_ varchar(80) NOT NULL,
+     PRIMARY KEY (id_));
+   
+Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');
+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');
+
+/*-- log table --*/
+CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));
+
+
+/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/
+/*-- Create a sequence SP */
+DROP PROCEDURE IF EXISTS CreateSequence;
+  DELIMITER //
+  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)
+  BEGIN
+     -- Create a table to store sequences
+     CREATE TABLE IF NOT EXISTS _sequences
+     (
+         name VARCHAR(70) NOT NULL UNIQUE,
+         next INT NOT NULL,
+         inc INT NOT NULL
+     );
+ 
+     -- Add the new sequence
+     INSERT INTO _sequences VALUES (name, start, inc);  
+  END
+  //
+  DELIMITER ;
+
+/*--------------------------------------------------------------------------------------------------
+ Add Meta to Archive
+ -------------------------------------------------------------------------------------------------- */
+
+/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */
+CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Cleanup/create_mariadb_camunda7.5.6_ee.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Cleanup/create_mariadb_camunda7.5.6_ee.sql
index bf866b4878..810bce6d0d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Cleanup/create_mariadb_camunda7.5.6_ee.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Cleanup/create_mariadb_camunda7.5.6_ee.sql
@@ -1096,25 +1096,6 @@ alter table ACT_ID_TENANT_MEMBER
     foreign key (GROUP_ID_)
     references ACT_ID_GROUP (ID_);
 
-CREATE TABLE `mso_urn_mapping` (
-`NAME_` VARCHAR(64) NOT NULL COLLATE 'utf8_bin',
-`VALUE_` VARCHAR(300) NULL DEFAULT NULL COLLATE 'utf8_bin',
-`REV_` INT(11) NULL DEFAULT NULL
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-;
-
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:rollback', 'true', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('aai:endpoint', 'http://localhost:28090', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:adapters:tenant:endpoint', 'http://localhost:28090/tenantAdapterMock', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:adapters:sdnc:endpoint', 'http://localhost:28090/sdncAdapterMock', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:workflow:sdncadapter:callback', 'http://localhost:28080/mso/SDNCAdapterCallbackService', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:sdnc:timeout', 'PT5M', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:sdnc:firewall:yang:model', 'http://com/att/svc/mis/firewall-lite-gui', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:sdnc:firewall:yang:model:version', '2015-05-15', 1);
-INSERT INTO `mso_urn_mapping` (`NAME_`, `VALUE_`, `REV_`) VALUES ('mso:sdnc:timeout:firewall:minutes', '20', 1);
-
 
 -- add indexes on PROC_DEF_KEY_ columns in history tables CAM-6679
 create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_);
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/CatalogServiceExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/CatalogServiceExpected.json
new file mode 100644
index 0000000000..c4a0a29b34
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/CatalogServiceExpected.json
@@ -0,0 +1,17 @@
+{
+	"modelName": "modelName",
+	"description": "description",
+	"modelUUID": "modelUUID",
+	"modelInvariantUUID": "modelInvariantUUID",
+	"created": 10,
+	"modelVersion": "modelVersion",
+	"serviceType": "serviceType",
+	"serviceRole": "serviceRole",
+	"environmentContext": "environmentContext",
+	"workloadContext": "workloadContext",
+	"networkCustomizations": null,
+	"vnfCustomizations": [],
+	"allottedCustomizations": null,
+	"recipes": null,
+	"csar": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/InfraActiveRequestExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/InfraActiveRequestExpected.json
new file mode 100644
index 0000000000..fe58357d53
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Client/InfraActiveRequestExpected.json
@@ -0,0 +1,46 @@
+{
+	"requestId": "00032ab7-3fb3-42e5-965d-8ea592502017",
+	"clientRequestId": "00032ab7-3fb3-42e5-965d-8ea592502016",
+	"action": "deleteInstance",
+	"requestStatus": "COMPLETE",
+	"statusMessage": "Vf Module has been deleted successfully.",
+	"progress": 100,
+	"startTime": 1482451194000,
+	"endTime": 1482451228000,
+	"source": "VID",
+	"vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+	"vnfName": null,
+	"vnfType": null,
+	"serviceType": null,
+	"aicNodeClli": null,
+	"tenantId": "6accefef3cb442ff9e644d589fb04107",
+	"provStatus": null,
+	"vnfParams": null,
+	"vnfOutputs": null,
+	"requestBody": "{\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"vSAMP10aDEV::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"mtn6\"}}",
+	"responseBody": null,
+	"lastModifiedBy": "BPMN",
+	"modifyTime": 1482451228000,
+	"requestType": null,
+	"volumeGroupId": null,
+	"volumeGroupName": null,
+	"vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+	"vfModuleName": null,
+	"vfModuleModelName": "vSAMP10aDEV::base::module-0",
+	"aaiServiceId": null,
+	"aicCloudRegion": "mtn6",
+	"callBackUrl": null,
+	"correlator": null,
+	"serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+	"serviceInstanceName": null,
+	"requestScope": "vfModule",
+	"requestAction": "deleteInstance",
+	"networkId": null,
+	"networkName": null,
+	"networkType": null,
+	"requestorId": null,
+	"configurationId": null,
+	"configurationName": null,
+	"operationalEnvId": null,
+	"operationalEnvName": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml
index 40bb93bda0..81e8e2a233 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 		<v1:SDNCAdapterCallback>	
-			<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+			<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			 <CallbackHeader>
 			   <RequestId>testRequestId</RequestId>
 			   <ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
index fce5afafec..2b59145bc8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CreateServiceInstance/createServiceInstance_genericQueryByInstanceName_AAIResponse_200.xml
@@ -1,13 +1,13 @@
-<search-results xmlns="http://com.aai.inventory">

-      <service-instances> 

-	   <service-instance>

-         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

-         <persona-model-id>gg0e927b-6087-5574-9ef8-c5e4d5847db5</persona-model-id>

-         <persona-model-version>V1.0</persona-model-version>

-         <service-instance-name>vMOG-AKRON-1234</service-instance-name>

-         <resource-version>1462561835</resource-version>

-         <relationship-list/> 

-         <metadata/> 

-		</service-instance>

-      </service-instances> 		

+<search-results xmlns="http://com.aai.inventory">
+      <service-instances> 
+	   <service-instance>
+         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
+         <persona-model-id>gg0e927b-6087-5574-9ef8-c5e4d5847db5</persona-model-id>
+         <persona-model-version>V1.0</persona-model-version>
+         <service-instance-name>vMOG-AKRON-1234</service-instance-name>
+         <resource-version>1462561835</resource-version>
+         <relationship-list/> 
+         <metadata/> 
+		</service-instance>
+      </service-instances> 		
       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml
index 7c30f75497..0ae5b79484 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Database/DBUpdateResponse.xml
@@ -1,4 +1,4 @@
 
 
-<ns2:updateRequestResponse xmlns:ns2="http://org.openecomp.mso/requestsdb"
+<ns2:updateRequestResponse xmlns:ns2="http://org.onap.so/requestsdb"
                            xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml
index cb5d0001f7..41441b6f41 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 		<v1:SDNCAdapterCallback>	
-			<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+			<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			 <CallbackHeader>
 			   <RequestId>19174929-3809-49ca-89eb-17f84a035389</RequestId>
 			   <ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogDBService_getServiceInstanceNOAAIInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogDBService_getServiceInstanceNOAAIInput.json
new file mode 100644
index 0000000000..630b6f36c5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogDBService_getServiceInstanceNOAAIInput.json
@@ -0,0 +1,17 @@
+{
+	"modelName": "modelName",
+	"description": "description",
+	"modelUUID": "modelUUID",
+	"modelInvariantUUID": "modelInvariantUUID",
+	"created": null,
+	"modelVersion": "modelVersion",
+	"serviceType": "serviceType",
+	"serviceRole": "serviceRole",
+	"environmentContext": "environmentContext",
+	"workloadContext": "workloadContext",
+	"networkCustomizations": null,
+	"vnfCustomizations": [],
+	"allottedCustomizations": null,
+	"recipes": null,
+	"csar": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceExpected.json
new file mode 100644
index 0000000000..c4a0a29b34
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceExpected.json
@@ -0,0 +1,17 @@
+{
+	"modelName": "modelName",
+	"description": "description",
+	"modelUUID": "modelUUID",
+	"modelInvariantUUID": "modelInvariantUUID",
+	"created": 10,
+	"modelVersion": "modelVersion",
+	"serviceType": "serviceType",
+	"serviceRole": "serviceRole",
+	"environmentContext": "environmentContext",
+	"workloadContext": "workloadContext",
+	"networkCustomizations": null,
+	"vnfCustomizations": [],
+	"allottedCustomizations": null,
+	"recipes": null,
+	"csar": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceInput.json
new file mode 100644
index 0000000000..630b6f36c5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CatalogServiceInput.json
@@ -0,0 +1,17 @@
+{
+	"modelName": "modelName",
+	"description": "description",
+	"modelUUID": "modelUUID",
+	"modelInvariantUUID": "modelInvariantUUID",
+	"created": null,
+	"modelVersion": "modelVersion",
+	"serviceType": "serviceType",
+	"serviceRole": "serviceRole",
+	"environmentContext": "environmentContext",
+	"workloadContext": "workloadContext",
+	"networkCustomizations": null,
+	"vnfCustomizations": [],
+	"allottedCustomizations": null,
+	"recipes": null,
+	"csar": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionExpected.json
new file mode 100644
index 0000000000..ffdf75a256
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionExpected.json
@@ -0,0 +1,6 @@
+{
+    "id" : "collectionId",
+    "model-info-collection" : null,
+    "instance-group" : null,
+    "orchestration-status" : "PRECREATED"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionInput.json
new file mode 100644
index 0000000000..5c71fdc93c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionInput.json
@@ -0,0 +1,4 @@
+{
+    "collectionId" : "collectionId",
+    "orchestrationStatus" : "PRECREATED"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResource.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResource.json
new file mode 100644
index 0000000000..a500e0ba88
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResource.json
@@ -0,0 +1,11 @@
+{
+	"modelUUID":null,
+	"modelName":null,
+	"modelInvariantUUID":"modelInvariantUUID",
+	"modelVersion":null,
+	"toscaNodeType":null,
+	"description":"description",
+	"created":null,
+	"collectionResourceCustomization":null,
+	"instanceGroup":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResourceCustomization.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResourceCustomization.json
new file mode 100644
index 0000000000..d87875da81
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/CollectionResourceCustomization.json
@@ -0,0 +1,9 @@
+{
+	"modelCustomizationUUID":null,
+	"modelInstanceName":null,
+	"type":"type",
+	"role":"role",
+	"function":"function",
+	"created":null,
+	"collectionResource":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationExpected.json
new file mode 100644
index 0000000000..a27c488aca
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationExpected.json
@@ -0,0 +1,27 @@
+{
+	"configuration-id" : "configurationId",
+	"orchestration-status" : "PRECREATED",
+    "tunnel-bandwidth" : "tunnelBandwidth",
+    "vendor-allowed-max-bandwidth" : "vendorAllowedMaxBandwidth",
+    "management-option" : "managementOption",
+    "configuration-name" : "configurationName",
+    "configuration-type" : "configurationType",
+    "configuration-sub-type" : "configurationSubType",
+    "operational-status" : "operationalStatus",
+    "configuration-selflink" : "configurationSelflink",
+    "metadata" : null,
+    "forwarder-evcs" : [
+	    {
+			"forwarder-evc-id": "forwarderEvcId"
+		}
+    ],
+    "evcs" : [
+	    {
+			"evc-id": "evcId"
+		}
+    ],
+    "model-info-configuration" : null,
+    "related-configuration" : null,
+    "l3-network" : null,
+    "l-interface" : null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationInput.json
new file mode 100644
index 0000000000..748f3cde5a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ConfigurationInput.json
@@ -0,0 +1,32 @@
+{
+	"configurationId" : "configurationId",
+    "managementOption" : "managementOption",
+    "configurationName" : "configurationName",
+    "configurationType" : "configurationType",
+    "configurationSubType" : "configurationSubType",
+    "modelInvariantId" : "modelInvariantId",
+    "modelVersionId" : "modelVersionId",   
+    "orchestrationStatus" : "PRECREATED",
+    "operationalStatus" : "operationalStatus",
+    "configurationSelflink" : "configurationSelflink",
+    "modelCustomizationId" : "modelCustomizationId",
+    "tunnelBandwidth" : "tunnelBandwidth",
+    "vendorAllowedMaxBandwidth" : "vendorAllowedMaxBandwidth",
+    "resourceVersion" : "resourceVersion",
+    "relationshipList" : {},
+    "metadata" : {},
+    "forwarderEvcs" : {
+	    "forwarderEvc": [
+			{
+				"forwarderEvcId": "forwarderEvcId"
+			}
+		]
+	},
+    "evcs" : {
+	    "evc": [
+			{
+				"evcId": "evcId"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer.json
new file mode 100644
index 0000000000..8f6483b4d4
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer.json
@@ -0,0 +1,6 @@
+{
+	"global-customer-id": "globalCustomerId",
+	"subscriber-name": "subscriberName",
+	"subscriber-type": "subscriberType",
+	"service-subscription": null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer_AAI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer_AAI.json
new file mode 100644
index 0000000000..3069c10e07
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Customer_AAI.json
@@ -0,0 +1,16 @@
+{ 
+	"globalCustomerId":"globalCustomerId",
+	"subscriberName":"subscriberName",
+	"subscriberType":"subscriberType",
+	"resourceVersion":null,
+	"serviceSubscriptions":{
+		"serviceSubscription":[{
+			"serviceType":"subscriptionServiceType",
+			"tempUbSubAccountId":null,
+			"resourceVersion":null,
+			"serviceInstances":null,
+			"relationshipList":null
+		}]
+	},
+	"relationshipList":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ExecuteBuildingBlockSimple.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ExecuteBuildingBlockSimple.json
new file mode 100644
index 0000000000..ede5264a02
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ExecuteBuildingBlockSimple.json
@@ -0,0 +1,7 @@
+{
+	"buildingBlock":{
+		"mso-id":"msoId",
+		"bpmn-flow-name":"bbName"
+	},
+	"requestId":"requestId"
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GeneralBuildingBlockExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GeneralBuildingBlockExpected.json
new file mode 100644
index 0000000000..9b021ae1e7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GeneralBuildingBlockExpected.json
@@ -0,0 +1,99 @@
+{
+	"requestContext": {
+		"product-family-id": "productFamilyId",
+		"source": "source",
+		"requestor-id": "requestorId",
+		"mso-request-id": "requestId",
+		"subscription-service-type": "subscriptionServiceType",
+		"user-params": null,
+		"action": "createInstance",
+		"callback-url": "callbackURL",
+		"requestParameters": {
+			"subscriptionServiceType": "subscriptionServiceType"
+		}
+	},
+	"orchContext": {
+		"is-rollback-enabled": false
+	},
+	"cloudRegion": {
+		"lcp-cloud-region-id": "lcpCloudRegionId",
+		"cloud-owner": "att-aic",
+		"tenant-id": "tenantId",
+		"complex": "complexName"
+	},
+	"userInput": null,
+	"customer": {
+		"global-customer-id": "globalCustomerId",
+		"subscriber-name": "subscriberName",
+		"subscriber-type": "subscriberType",
+		"service-subscription": {
+			"service-type": "subscriptionServiceType",
+			"service-instances": [
+				{
+					"service-instance-id": "3655a595-05d1-433c-93c0-3afd6b572545",
+					"service-instance-name": "serviceInstanceName",
+					"orchestration-status": "PRECREATED",
+					"owning-entity": {
+						"owning-entity-id": "owningEntityId",
+						"owning-entity-name": "owningEntityName"
+					},
+					"project": {
+						"project-name": "projectName"
+					},
+					"vnfs": [],
+					"allotted-resources": [],
+					"networks": [],
+					"vhn-portal-url": null,
+					"service-instance-location-id": null,
+					"selflink": null,
+					"metadata": null,
+					"configurations": [],
+					"model-info-service-instance": {
+						"description": "description",
+						"created": null,
+						"model-name": "modelName",
+						"model-uuid": "modelUUID",
+						"model-invariant-uuid": "modelInvariantUUID",
+						"model-version": "modelVersion",
+						"service-type": "serviceType",
+						"service-role": "serviceRole",
+						"environment-context": "environmentContext",
+						"workload-context": "workloadContext"
+					}
+				}
+			]
+		}
+	},
+	"serviceInstance": {
+		"service-instance-id": "3655a595-05d1-433c-93c0-3afd6b572545",
+		"service-instance-name": "serviceInstanceName",
+		"orchestration-status": "PRECREATED",
+		"owning-entity": {
+			"owning-entity-id": "owningEntityId",
+			"owning-entity-name": "owningEntityName"
+		},
+		"project": {
+			"project-name": "projectName"
+		},
+		"vnfs": [],
+		"allotted-resources": [],
+		"networks": [],
+		"vhn-portal-url": null,
+		"service-instance-location-id": null,
+		"selflink": null,
+		"metadata": null,
+		"configurations": [],
+		"model-info-service-instance": {
+			"description": "description",
+			"created": null,
+			"model-name": "modelName",
+			"model-uuid": "modelUUID",
+			"model-invariant-uuid": "modelInvariantUUID",
+			"model-version": "modelVersion",
+			"service-type": "serviceType",
+			"service-role": "serviceRole",
+			"environment-context": "environmentContext",
+			"workload-context": "workloadContext"
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
new file mode 100644
index 0000000000..0d00e4d007
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
@@ -0,0 +1,72 @@
+{
+	"closedLoopDisabled":false,
+	"vnf-id":"vnfId",
+	"vnf-name":"vnfName",
+	"vnf-type":"vnfType",
+	"orchestration-status":"PRECREATED",
+	"vf-modules":[{
+		"vf-module-id":"vfModuleId",
+		"vf-module-name":"vfModuleName",
+		"orchestration-status":"PRECREATED",
+		"cascaded":false,
+		"heat-stack-id":"heatStackId",
+		"contrail-service-instance-fqdn":"contrailServiceInstanceFqdn",
+		"module-index":1,"selflink":"selflink",
+		"model-info-vf-module":null
+	}],
+	"volume-groups":[],
+	"line-of-business":null,
+	"platform":null,
+	"cascaded":false,
+	"cloud-params":{},
+	"cloud-context":null,
+	"solution":null,
+	"vnf-name-2":null,
+	"service-id":null,
+	"regional-resource-zone":null,
+	"prov-status":null,
+	"operational-status":null,
+	"equipment-role":null,
+	"management-option":null,
+	"ipv4-oam-address":null,
+	"ipv4-loopback0-address":null,
+	"nm-lan-v6-address":null,
+	"management-v6-address":null,
+	"vcpu":null,
+	"vcpu-units":null,
+	"vmemory":null,
+	"vmemory-units":null,
+	"vdisk":null,
+	"vdisk-units":null,
+	"in-maint":false,
+	"is-closed-loop-disabled":false,
+	"summary-status":null,
+	"encrypted-access-flag":null,
+	"as-number":null,
+	"regional-resource-subzone":null,
+	"self-link":null,
+	"ipv4-oam-gateway-address":null,
+	"ipv4-oam-gateway-address-prefix-length":null,
+	"vlan-id-outer":null,"nm-profile-name":null,
+	"l-interfaces":[],
+	"lag-interfaces":[{
+		"interface-name":"interfaceName",
+		"interface-description":"interfaceDescription",
+		"speed-value":"speedValue",
+		"speed-units":"speedUnits",
+		"interface-id":"interfaceId",
+		"interface-role":"interfaceRole",
+		"prov-status":"provStatus",
+		"in-maint":true,
+		"l-interfaces":[]
+	}],
+  "license": {
+    "entitlement-pool-uuids": [],
+    "license-key-group-uuids": []
+  },
+	"entitlements":[{
+		"group-uuid":"groupUuid",
+		"resource-uuid":"resourceUuid"
+	}],
+	"model-info-generic-vnf":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsExpected.json
new file mode 100644
index 0000000000..79c9c3015a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsExpected.json
@@ -0,0 +1,23 @@
+{
+	"customer": {
+		"global-customer-id": "globalCustomerId",
+		"subscriber-name": "subscriberName",
+		"subscriber-type": "subscriberType",
+		"service-subscription": {
+			"service-type": "subscriptionServiceType"
+		}
+	},
+	"project": {
+		"project-name": "projectName"
+	},
+	"owningEntity": {
+		"owning-entity-id": "owningEntityId",
+		"owning-entity-name": "owningEntityName"
+	},
+	"platform": {
+		"platform-name": "platformName"
+	},
+	"lineOfBusiness": {
+		"line-of-business-name": "lineOfBusinessName"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsInput.json
new file mode 100644
index 0000000000..403ca30450
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjectsInput.json
@@ -0,0 +1,19 @@
+{
+	"customer": {
+		"global-customer-id": "globalCustomerId",
+		"subscriber-name": "subscriberName",
+		"subscriber-type": "subscriberType",
+		"service-subscription": {
+			"service-type": "subscriptionServiceType"
+		}
+	},
+	"project": {
+		"project-name": "projectName"
+	},
+	"owningEntity": {
+		"owning-entity-id": "owningEntityId",
+		"owning-entity-name": "owningEntityName"
+	},
+	"platform": null,
+	"lineOfBusiness": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjects_getServiceInstanceNOAAIInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjects_getServiceInstanceNOAAIInput.json
new file mode 100644
index 0000000000..403ca30450
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/HighLevelObjects_getServiceInstanceNOAAIInput.json
@@ -0,0 +1,19 @@
+{
+	"customer": {
+		"global-customer-id": "globalCustomerId",
+		"subscriber-name": "subscriberName",
+		"subscriber-type": "subscriberType",
+		"service-subscription": {
+			"service-type": "subscriptionServiceType"
+		}
+	},
+	"project": {
+		"project-name": "projectName"
+	},
+	"owningEntity": {
+		"owning-entity-id": "owningEntityId",
+		"owning-entity-name": "owningEntityName"
+	},
+	"platform": null,
+	"lineOfBusiness": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InfraActiveRequestExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InfraActiveRequestExpected.json
new file mode 100644
index 0000000000..dd4dc65190
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InfraActiveRequestExpected.json
@@ -0,0 +1,46 @@
+{
+	"requestId": "00032ab7-3fb3-42e5-965d-8ea592502017",
+	"clientRequestId": "00032ab7-3fb3-42e5-965d-8ea592502016",
+	"action": "deleteInstance",
+	"requestStatus": "COMPLETE",
+	"statusMessage": "Vf Module has been deleted successfully.",
+	"progress": 100,
+	"startTime": 1482451194000,
+	"endTime": 1482451228000,
+	"source": "VID",
+	"vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+	"vnfName": null,
+	"vnfType": null,
+	"serviceType": null,
+	"aicNodeClli": null,
+	"tenantId": "6accefef3cb442ff9e644d589fb04107",
+	"provStatus": null,
+	"vnfParams": null,
+	"vnfOutputs": null,
+	"requestBody": "{\"requestDetails\":{\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"vSAMP10aDEV::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"mtn6\"}}}",
+	"responseBody": null,
+	"lastModifiedBy": "BPMN",
+	"modifyTime": 1482451228000,
+	"requestType": null,
+	"volumeGroupId": null,
+	"volumeGroupName": null,
+	"vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+	"vfModuleName": null,
+	"vfModuleModelName": "vSAMP10aDEV::base::module-0",
+	"aaiServiceId": null,
+	"aicCloudRegion": "mtn6",
+	"callBackUrl": null,
+	"correlator": null,
+	"serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+	"serviceInstanceName": null,
+	"requestScope": "vfModule",
+	"requestAction": "deleteInstance",
+	"networkId": null,
+	"networkName": null,
+	"networkType": null,
+	"requestorId": null,
+	"configurationId": null,
+	"configurationName": null,
+	"operationalEnvId": null,
+	"operationalEnvName": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroup.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroup.json
new file mode 100644
index 0000000000..723905b226
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroup.json
@@ -0,0 +1,11 @@
+{
+	"modelUUID" : "modelUUID",
+	"modelName" : null,
+	"modelInvariantUUID" : "modelInvariantUUID",
+	"modelVersion" : null,
+	"role" : "instanceGroupRole",
+	"toscaNodeType" : null,
+	"type" : "VNFC",
+	"created" : null,
+	"collectionResource" : null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupExpected.json
new file mode 100644
index 0000000000..b2e7b719f3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupExpected.json
@@ -0,0 +1,8 @@
+{
+	"id" : "instanceGroupId",
+	"description" : "description",
+	"resource-version" : "resourceVersion",
+	"instance-group-name" : "instanceGroupName",
+	"model-info-instance-group" : null,
+	"instance-group-function" : "instanceGroupFunction"
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupInput.json
new file mode 100644
index 0000000000..ec116fe74c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/InstanceGroupInput.json
@@ -0,0 +1,12 @@
+{
+	"id" : "instanceGroupId",
+	"instanceGroupRole" : "instanceGroupRole",
+    "modelInvariantId" : "modelInvariantId",
+    "modelVersionId" : "modelVersionId", 
+    "description" : "description",
+    "instanceGroupType" : "instanceGroupType",
+    "resourceVersion" : "resourceVersion",
+    "instanceGroupName" : "instanceGroupName",
+    "instanceGroupFunction" : "instanceGroupFunction",
+    "relationshipList" : {}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusiness.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusiness.json
new file mode 100644
index 0000000000..b2446c753a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusiness.json
@@ -0,0 +1,3 @@
+{
+	"line-of-business-name": "lineOfBusinessName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusinessExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusinessExpected.json
new file mode 100644
index 0000000000..b2446c753a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/LineOfBusinessExpected.json
@@ -0,0 +1,3 @@
+{
+	"line-of-business-name": "lineOfBusinessName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
new file mode 100644
index 0000000000..45ca00bd32
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
@@ -0,0 +1,8 @@
+{
+	"model-invariant-uuid":"modelInvariantUUID",
+	"collection-function":"function",
+	"collection-role":"role",
+	"collection-type":"type",
+	"description":"description",
+	"quantity":0
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoGenericVnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoGenericVnfExpected.json
new file mode 100644
index 0000000000..98f966e753
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoGenericVnfExpected.json
@@ -0,0 +1,21 @@
+{
+	"tosca-node-type": "toscaNodeType",
+	"description": "description",
+    "orchestration-mode": "orchestrationMode",
+    "aic-version-min" : "aicVersionMin",
+    "aic-version-max" : "aicVersionMax",
+    "min-instances": 2,
+    "max-instances": 3,
+    "availability-zone-max-count": 5,
+    "nf-function" : "nfFunction",
+    "nf-type" : "nfType",
+    "nf-role" : "nfRole",
+    "nf-naming-code" : "nfNamingCode",
+    "multi-stage-design" : "multiStageDesign",
+    "model-customization-uuid": "modelCustomizationUUID",
+    "model-instance-name": "modelInstanceName",
+    "model-version" : "modelVersion",
+    "model-invariant-uuid" : "modelInvariantUUID",
+    "model-name" : "modelName",
+    "model-uuid" : "modelUUID"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoInstanceGroup.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoInstanceGroup.json
new file mode 100644
index 0000000000..f7bc4c33db
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoInstanceGroup.json
@@ -0,0 +1,10 @@
+{
+	"modelUUID":"modelUUID",
+	"modelInvariantUUID":"modelInvariantUUID",
+	"model-uuid":"modelUUID",
+	"model-invariant-uuid":"modelInvariantUUID",
+	"type":"VNFC",
+	"instance-group-role":"instanceGroupRole",
+	"function": "function",
+	"description": "description"
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoNetworkExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoNetworkExpected.json
new file mode 100644
index 0000000000..d082cd91bf
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoNetworkExpected.json
@@ -0,0 +1,18 @@
+{
+	"model-customization-uuid": "modelCustomizationUUID",
+	"model-instance-name": "modelInstanceName",
+    "network-technology": "networkTechnology",
+    "network-type": "networkType",
+    "network-scope": "networkScope",
+    "network-role": "networkRole",
+    "description" : "description",
+    "model-version" : "modelVersion",
+    "model-invariant-uuid" : "modelInvariantUUID",
+    "model-name" : "modelName",
+    "model-uuid" : "modelUUID",
+    "neutron-network-type" : "neutronNetworkType",
+    "aic-version-min" : "aicVersionMin",
+    "aic-version-max" : "aicVersionMax",
+    "orchestration-mode" : "orchestrationMode",
+    "tosca-node-type" : "toscaNodeType"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoServiceInstance.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoServiceInstance.json
new file mode 100644
index 0000000000..42ae25a7b1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoServiceInstance.json
@@ -0,0 +1,12 @@
+{
+	"model-name": "modelName",
+	"description": "description",
+	"created": null,
+	"model-uuid": "modelUUID",
+	"model-invariant-uuid": "modelInvariantUUID",
+	"model-version": "modelVersion",
+	"service-type": "serviceType",
+	"service-role": "serviceRole",
+	"environment-context": "environmentContext",
+	"workload-context": "workloadContext"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoVfModuleExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoVfModuleExpected.json
new file mode 100644
index 0000000000..1f9a8be5cf
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoVfModuleExpected.json
@@ -0,0 +1,14 @@
+{
+	"model-customization-uuid": "modelCustomizationUUID",
+    "model-name" : "modelName",
+    "model-uuid" : "modelUUID",
+    "model-invariant-uuid" : "modelInvariantUUID",
+    "model-version" : "modelVersion",
+    "description": "description",
+    "is-base-boolean": true,
+    "min-instances": 2,
+    "max-instances": 3,
+    "availability-zone-count": 5,
+    "label": "label",
+    "initial-count": null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkPolicy.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkPolicy.json
new file mode 100644
index 0000000000..90b5108bc1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkPolicy.json
@@ -0,0 +1,6 @@
+{
+	"network-policy-id": "networkPolicyId",
+	"network-policy-fqdn" : "networkPolicyFqdn",
+    "heat-stack-id" : "heatStackId",
+    "resource-version" : "resourceVersion"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkResourceCustomizationInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkResourceCustomizationInput.json
new file mode 100644
index 0000000000..f1e5969117
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/NetworkResourceCustomizationInput.json
@@ -0,0 +1,25 @@
+{
+	"modelCustomizationUUID" : "modelCustomizationUUID",
+	"modelInstanceName" : "modelInstanceName",
+    "networkTechnology" : "networkTechnology",
+    "networkType" : "networkType",
+    "networkScope" : "networkScope",
+    "networkRole" : "networkRole",
+    "networkResource" : {
+        "modelUUID" : "modelUUID",
+        "orchestrationMode" : "orchestrationMode",
+        "description" : "description",
+        "neutronNetworkType" : "neutronNetworkType",
+        "aicVersionMin" : "aicVersionMin",
+        "aicVersionMax" : "aicVersionMax",
+        "modelName" : "modelName",
+        "modelInvariantUUID" : "modelInvariantUUID",
+        "modelVersion" : "modelVersion",
+        "toscaNodeType" : "toscaNodeType",
+        "category" : "category",
+        "subCategory" : "subCategory",
+        "networkResourceCustomization" : [],
+        "collectionNetworkResourceCustomization" : [],
+        "heatTemplate" : {}
+    }
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/OwningEntity.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/OwningEntity.json
new file mode 100644
index 0000000000..699079f6f9
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/OwningEntity.json
@@ -0,0 +1,4 @@
+{
+	"owning-entity-id": "owningEntityId",
+	"owning-entity-name": "owningEntityName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Platform.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Platform.json
new file mode 100644
index 0000000000..12b4e0b530
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Platform.json
@@ -0,0 +1,3 @@
+{
+	"platform-name": "platformName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PlatformExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PlatformExpected.json
new file mode 100644
index 0000000000..12b4e0b530
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PlatformExpected.json
@@ -0,0 +1,3 @@
+{
+	"platform-name": "platformName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Project.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Project.json
new file mode 100644
index 0000000000..4904d2cdb5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/Project.json
@@ -0,0 +1,3 @@
+{
+	"project-name": "projectName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestContextExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestContextExpected.json
new file mode 100644
index 0000000000..6f82a9dd75
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestContextExpected.json
@@ -0,0 +1,12 @@
+{
+	"product-family-id": "productFamilyId",
+	"source": "source",
+	"requestor-id": "requestorId",
+	"subscription-service-type": "subscriptionServiceType",
+	"user-params": null,
+	"action": null,
+	"callback-url": "callbackURL",
+	"requestParameters": {
+		"subscriptionServiceType": "subscriptionServiceType"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsExpected.json
new file mode 100644
index 0000000000..fa5fd9740c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsExpected.json
@@ -0,0 +1,14 @@
+{
+	"modelInfo": {
+		"modelType": "vfModule",
+		"modelName": "vSAMP10aDEV::base::module-0"
+	},
+	"requestInfo": {
+		"source": "VID",
+		"suppressRollback": false
+	},
+	"cloudConfiguration": {
+		"tenantId": "6accefef3cb442ff9e644d589fb04107",
+		"lcpCloudRegionId": "mtn6"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput.json
new file mode 100644
index 0000000000..e3c6e8c61e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput.json
@@ -0,0 +1,18 @@
+{
+	"requestParameters": {
+		"subscriptionServiceType": "subscriptionServiceType"
+	},
+	"project": {
+		"projectName": "projectName"
+	},
+	"owningEntity": {
+		"owningEntityId": "owningEntityId",
+		"owningEntityName": "owningEntityName"
+	},
+	"platform": {
+		"platformName": "platformName"
+	},
+	"lineOfBusiness": {
+		"lineOfBusinessName": "lineOfBusinessName"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContext.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContext.json
new file mode 100644
index 0000000000..e91875135b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContext.json
@@ -0,0 +1,13 @@
+{
+	"requestInfo": {
+		"callbackUrl": "callbackURL",
+		"productFamilyId": "productFamilyId",
+		"source": "source",
+		"suppressRollback": false,
+		"requestorId": "requestorId"
+	},
+	"requestParameters": {
+		"subscriptionServiceType": "subscriptionServiceType"
+	}
+}
+
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_serviceMacro.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_serviceMacro.json
new file mode 100644
index 0000000000..1cc387aaa0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_serviceMacro.json
@@ -0,0 +1,151 @@
+{
+	"modelInfo": {
+		"modelType": "service",
+		"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+		"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+		"modelName": "MOW AVPN vMX BV vPE 1 Service",
+		"modelVersion": "10.0"
+	},
+	"owningEntity": {
+		"owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+		"owningEntityName": "PACKET CORE"
+	},
+	"project": {
+		"projectName": "projectName"
+	},
+	"subscriberInfo": {
+		"globalSubscriberId": "subscriberId"
+	},
+	"requestInfo": {
+		"instanceName": "vPE_Service",
+		"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+		"source": "VID",
+		"suppressRollback": true,
+		"requestorId": "xxxxxx"
+	},
+	"requestParameters": {
+		"subscriptionServiceType": "VMX",
+		"aLaCarte": false,
+		"userParams": [
+			{
+				"service": {
+					"modelInfo": {
+						"modelType": "service",
+						"modelName": "MOW AVPN vMX BV vPE 1 Service",
+						"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+					},
+					"instanceName": "vPE_Service",
+					"instanceParams": [],
+					"resources": {
+						"vnfs": [
+							{
+								"modelInfo": {
+									"modelType": "vnf",
+									"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+									"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+									"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+									"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+								},
+								"cloudConfiguration": {
+									"lcpCloudRegionId": "mdt1",
+									"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+								},
+								"platform": {
+									"platformName": "test"
+								},
+								"lineOfBusiness": {
+									"lineOfBusinessName": "someValue"
+								},
+								"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+								"instanceName": "vmxnjr001",
+								"instanceParams": [],
+								"vfModules": [
+									{
+										"modelInfo": {
+											"modelType": "vfModule",
+											"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
+											"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
+											"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
+										},
+										"instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_001",
+										"instanceParams": [
+											{
+												"vmx_int_net_len": "24"
+											}
+										]
+									},
+									{
+										"modelInfo": {
+											"modelType": "vfModule",
+											"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+											"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+											"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+										},
+										"cloudConfiguration": {
+											"lcpCloudRegionId": "mdt1",
+											"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+										},
+										"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_001",
+										"instanceParams": [
+											{
+												"availability_zone_0": "mtpocdv-kvm-az01",
+												"vre_a_volume_size_0": "100"
+											}
+										]
+									},
+									{
+										"modelInfo": {
+											"modelType": "vfModule",
+											"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+											"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+											"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+										},
+										"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_002",
+										"instanceParams": [
+											{
+												"availability_zone_0": "mtpocdv-kvm-az01",
+												"vre_a_volume_size_0": "50"
+											}
+										]
+									},
+									{
+										"modelInfo": {
+											"modelType": "vfModule",
+											"modelName": "201673MowAvpnVpeBvL..AVPN_vPFE_BV..module-2",
+											"modelVersionId": "f555558f-d538-4876-8ffa-b102650fad64",
+											"modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969"
+										},
+										"instanceName": "vmxnjr001_AVPN_vPFE_BV_expansion_001",
+										"instanceParams": [
+											{
+												"availability_zone_0": "mtpocdv-kvm-az01",
+												"vmx_vpfe_int_ip_0": "192.168.0.16"
+											}
+										]
+									}
+								]
+							}
+						],
+						"networks": [
+							{
+								"modelInfo": {
+									"modelType": "network",
+									"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+									"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+									"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+									"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+								},
+								"cloudConfiguration": {
+									"lcpCloudRegionId": "mdt1",
+									"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+								},
+								"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+								"instanceName": "vmxnjr001"
+							}
+						]
+					}
+				}
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withRelatedInstanceList.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withRelatedInstanceList.json
new file mode 100644
index 0000000000..bb1612b11d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withRelatedInstanceList.json
@@ -0,0 +1,19 @@
+{
+	"modelInfo":{
+		"modelType":"service",
+		"modelVersionId":"modelUUID",
+		"modelUuid":"modelUUID",
+		"modelInvariantId":"modelInvariantId",
+		"modelVersion":"modelVersion"
+	},	
+	"relatedInstanceList":[{
+		"relatedInstance":{
+			"instanceId":"instanceId",	
+			"modelInfo":{
+				"modelType":"service",	
+				"modelVersionId":"modelUUID",	
+				"modelUuid":"modelUUID"
+			}
+		}
+	}]
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withoutRelatedInstanceList.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withoutRelatedInstanceList.json
new file mode 100644
index 0000000000..4111c7835f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_withoutRelatedInstanceList.json
@@ -0,0 +1,17 @@
+{
+	"modelInfo":{
+		"modelType":"service",
+		"modelVersionId":"modelUUID",
+		"modelUuid":"modelUUID"
+	},	
+	"relatedInstanceList":[{
+		"relatedInstance":{
+			"instanceId":"instanceId",	
+			"modelInfo":{
+				"modelType":"service",	
+				"modelVersionId":"modelUUID",	
+				"modelUuid":"modelUUID"
+			}
+		}
+	}]
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json
new file mode 100644
index 0000000000..8332ddc28f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json
@@ -0,0 +1,60 @@
+{
+	"modelInfo": {
+		"modelType": "vnf",
+		"modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+		"modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091",
+		"modelName": "vSAMP12",
+		"modelVersion": "1.0",
+		"modelCustomizationName": "vSAMP12 1",
+		"modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
+	},
+	"cloudConfiguration": {
+		"lcpCloudRegionId": "mdt1",
+		"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+	},
+	"subscriberInfo": {
+		"globalSubscriberId": "subscriberId"
+	},
+	"requestInfo": {
+		"instanceName": "MSOTEST103a",
+		"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+		"source": "VID",
+		"suppressRollback": false,
+		"requestorId": "xxxxxx"
+	},
+	"platform": {
+		"platformName": "{some platformName}"
+	},
+	"lineOfBusiness": {
+		"lineOfBusinessName": "{some string}"
+	},
+	"relatedInstanceList": [
+		{
+			"relatedInstance": {
+				"instanceId": "{serviceInstanceId}",
+				"modelInfo": {
+					"modelType": "service",
+					"modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+					"modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+					"modelName": "{parent service model name}",
+					"modelVersion": "1.0"
+				}
+			}
+		},
+		{
+			"relatedInstance": {
+				"instanceId": "{instanceGroupId}",
+				"modelInfo": {
+					"modelType": "networkCollection",
+					"modelInvariantId": "9ea660dc-155f-44d3-b45c-cc7648b4f31c",
+					"modelVersionId": "bb07aad1-ce2d-40c1-85cb-5392f76bb1ef",
+					"modelName": "{network collection model name}",
+					"modelVersion": "1.0"
+				}
+			}
+		}
+	],
+	"requestParameters": {
+		"userParams": []
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestLineOfBusinessInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestLineOfBusinessInput.json
new file mode 100644
index 0000000000..1fd5fffaef
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestLineOfBusinessInput.json
@@ -0,0 +1,3 @@
+{
+	"lineOfBusinessName": "lineOfBusinessName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestPlatformInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestPlatformInput.json
new file mode 100644
index 0000000000..80a5d6201a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestPlatformInput.json
@@ -0,0 +1,3 @@
+{
+	"platformName": "platformName"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceExpected.json
new file mode 100644
index 0000000000..dcef8b5831
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceExpected.json
@@ -0,0 +1,5 @@
+{
+	"route-table-reference-id": "routeTableReferenceId",
+	"route-table-reference-fqdn": "routeTableReferenceFqdn",
+    "resource-version": "resourceVersion"
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceInput.json
new file mode 100644
index 0000000000..5aec724ab3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RouteTableReferenceInput.json
@@ -0,0 +1,6 @@
+{
+	"routeTableReferenceId": "routeTableReferenceId",
+	"routeTableReferenceFqdn": "routeTableReferenceFqdn",
+    "resourceVersion": "resourceVersion",
+    "relationshipList": {}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/SerializationTest.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/SerializationTest.json
new file mode 100644
index 0000000000..5e879dc78e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/SerializationTest.json
@@ -0,0 +1,86 @@
+{
+  "requestContext" : {
+    "product-family-id" : null,
+    "source" : "VID",
+    "requestor-id" : "xxxxxx",
+    "subscription-service-type" : "Mobility",
+    "user-params" : null,
+    "action" : "createInstance",
+    "callback-url" : null,
+    "service-uri" : null,
+    "mso-request-id" : "fa807605-ebf5-4edd-83aa-c23edba607a2",
+    "requestParameters" : {
+      "subscriptionServiceType" : "Mobility",
+      "aLaCarte" : true,
+      "testApi" : "GR_API"
+    }
+  },
+  "orchContext" : {
+    "is-rollback-enabled" : false
+  },
+  "locationContext" : {
+    "cloud-owner" : null,
+    "cloud-region-id" : null,
+    "tenant-id" : null,
+    "complex" : null,
+    "aic-version" : null
+  },
+  "userInput" : null,
+  "serviceInstance" : {
+    "service-instance-id" : "a446e2ab-7c92-4b4c-bfc2-9ab88f3c99c3",
+    "service-instance-name" : "Network_vprobes_mgmt_1_SI_sk316t",
+    "orchestration-status" : "PRECREATED",
+    "owning-entity" : {
+      "owning-entity-id" : "f160c875-ddd1-4ef5-84d8-d098784daa3a",
+      "owning-entity-name" : "OE1"
+    },
+    "customer" : {
+      "global-customer-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+      "subscriber-name" : "Mobility",
+      "subscriber-type" : "INFRA",
+      "service-subscription" : {
+        "service-type" : "Mobility",
+        "temp-ub-sub-account-id" : null,
+        "service-instances" : [ ]
+      },
+      "vpn-bindings" : [ ]
+    },
+    "project" : {
+      "project-name" : "project1"
+    },
+    "collection" : null,
+    "vnfs" : [ ],
+    "allotted-resources" : [ ],
+    "networks" : [ ],
+    "bandwidth-total" : null,
+    "bandwidth-up-wan-1" : null,
+    "bandwidth-down-wan-1" : null,
+    "bandwidth-up-wan-2" : null,
+    "bandwidth-down-wan-2" : null,
+    "vhn-portal-url" : null,
+    "service-instance-location-id" : null,
+    "selflink" : null,
+    "metadata" : null,
+    "configuration" : null,
+    "vpn-bonding-links" : [ ],
+    "model-info-service-instance" : {
+      "model-name" : "Network_vprobes_mgmt_1",
+      "description" : "tbd",
+      "created" : "Mon Jan 15 10:54:06 GMT 2018",
+      "model-uuid" : "13da7f84-f380-4591-a714-937d4bef0c34",
+      "model-invariant-uuid" : "0bd8b143-41cf-4373-8601-61be1bf01c9a",
+      "model-version" : "1.0",
+      "service-type" : "",
+      "service-role" : "",
+      "environment-context" : "General_Revenue-Bearing",
+      "workload-context" : "Production"
+    }
+  },
+  "cloudRegion" : {
+    "lcp-cloud-region-id" : null,
+    "tenant-id" : null,
+    "cloud-owner" : null,
+    "cloud-region-version" : null
+  },
+  "customer" : null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIInput.json
new file mode 100644
index 0000000000..8cf6f6c3ab
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIInput.json
@@ -0,0 +1,32 @@
+{
+	"serviceInstanceId": "serviceInstanceId",
+	"serviceInstanceName": "serviceInstanceName",
+	"serviceType": null,
+	"serviceRole": null,
+	"environmentContext": null,
+	"workloadContext": null,
+	"modelInvariantId": null,
+	"modelVersionId": null,
+	"personaModelVersion": null,
+	"widgetModelId": null,
+	"widgetModelVersion": null,
+	"bandwidthTotal": "bandwidthTotal",
+	"bandwidthUpWan1": "bandwidthUpWan1",
+	"bandwidthDownWan1": "bandwidthDownWan1",
+	"bandwidthUpWan2": "bandwidthUpWan2",
+	"bandwidthDownWan2": "bandwidthDownWan2",
+	"vhnPortalUrl": "vhnPortalUrl",
+	"serviceInstanceLocationId": "serviceInstanceLocId",
+	"resourceVersion": null,
+	"selflink": "selfLink",
+	"orchestrationStatus": "Created",
+	"relationshipList": null,
+	"metadata": null,
+	"allottedResources": {
+		"allottedResource": [
+			{
+				"id": "allottedID"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIPlatformAndLOBInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIPlatformAndLOBInput.json
new file mode 100644
index 0000000000..9bf854c31d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstanceAAIPlatformAndLOBInput.json
@@ -0,0 +1,72 @@
+{
+	"service-instance-id": null,
+	"service-instance-name": null,
+	"orchestration-status": null,
+	"owning-entity": null,
+	"project": null,
+	"vnfs": [
+		{
+			"closedLoopDisabled": false,
+			"vnf-id": "vnfId",
+			"vnf-name": null,
+			"vnf-type": null,
+			"orchestration-status": null,
+			"vf-modules": [],
+			"volume-groups": [],
+			"line-of-business": {
+				"line-of-business-name": "lineOfBusinessName"
+			},
+			"platform": {
+				"platform-name": "platformName"
+			},
+			"cascaded": false,
+			"cloud-params": null,
+			"cloud-context": null,
+			"solution": null,
+			"vnf-name-2": null,
+			"service-id": null,
+			"regional-resource-zone": null,
+			"prov-status": null,
+			"operational-status": null,
+			"equipment-role": null,
+			"management-option": null,
+			"ipv4-oam-address": null,
+			"ipv4-loopback0-address": null,
+			"nm-lan-v6-address": null,
+			"management-v6-address": null,
+			"vcpu": null,
+			"vcpu-units": null,
+			"vmemory": null,
+			"vmemory-units": null,
+			"vdisk": null,
+			"vdisk-units": null,
+			"in-maint": false,
+			"is-closed-loop-disabled": false,
+			"summary-status": null,
+			"encrypted-access-flag": null,
+			"as-number": null,
+			"regional-resource-subzone": null,
+			"self-link": null,
+			"ipv4-oam-gateway-address": null,
+			"ipv4-oam-gateway-address-prefix-length": null,
+			"vlan-id-outer": null,
+			"nm-profile-name": null,
+			"l-interfaces": [],
+			"lag-interfaces": [],
+  			"license": {
+    			"entitlement-pool-uuids": [],
+    			"license-key-group-uuids": []
+  			},
+			"entitlements": [],
+			"model-info-generic-vnf": null
+		}
+	],
+	"allotted-resources": [],
+	"networks": [],
+	"vhn-portal-url": null,
+	"service-instance-location-id": null,
+	"selflink": null,
+	"metadata": null,
+	"configurations": [],
+	"model-info-service-instance": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiPlatformAndLOBToSI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiPlatformAndLOBToSI.json
new file mode 100644
index 0000000000..9d4851d34c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiPlatformAndLOBToSI.json
@@ -0,0 +1,72 @@
+{
+	"service-instance-id": null,
+	"service-instance-name": null,
+	"orchestration-status": null,
+	"owning-entity": null,
+	"project": null,
+	"vnfs": [
+		{
+			"closedLoopDisabled": false,
+			"vnf-id": "vnfId",
+			"vnf-name": null,
+			"vnf-type": null,
+			"orchestration-status": null,
+			"vf-modules": [],
+			"volume-groups": [],
+			"line-of-business": {
+				"line-of-business-name": "lineOfBusinessName"
+			},
+			"platform": {
+				"platform-name": "platformName"
+			},
+			"cascaded": false,
+			"cloud-params": null,
+			"cloud-context": null,
+			"solution": null,
+			"vnf-name-2": null,
+			"service-id": null,
+			"regional-resource-zone": null,
+			"prov-status": null,
+			"operational-status": null,
+			"equipment-role": null,
+			"management-option": null,
+			"ipv4-oam-address": null,
+			"ipv4-loopback0-address": null,
+			"nm-lan-v6-address": null,
+			"management-v6-address": null,
+			"vcpu": null,
+			"vcpu-units": null,
+			"vmemory": null,
+			"vmemory-units": null,
+			"vdisk": null,
+			"vdisk-units": null,
+			"in-maint": false,
+			"is-closed-loop-disabled": false,
+			"summary-status": null,
+			"encrypted-access-flag": null,
+			"as-number": null,
+			"regional-resource-subzone": null,
+			"self-link": null,
+			"ipv4-oam-gateway-address": null,
+			"ipv4-oam-gateway-address-prefix-length": null,
+			"vlan-id-outer": null,
+			"nm-profile-name": null,
+			"l-interfaces": [],
+			"lag-interfaces": [],
+			  "license": {
+    "entitlement-pool-uuids": [],
+    "license-key-group-uuids": []
+  },
+			"entitlements": [],
+			"model-info-generic-vnf": null
+		}
+	],
+	"allotted-resources": [],
+	"networks": [],
+	"vhn-portal-url": null,
+	"service-instance-location-id": null,
+	"selflink": null,
+	"metadata": null,
+	"configurations": [],
+	"model-info-service-instance": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiServiceInstanceToSI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiServiceInstanceToSI.json
new file mode 100644
index 0000000000..19d6e6dea1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_aaiServiceInstanceToSI.json
@@ -0,0 +1,27 @@
+{
+	"service-instance-id": "serviceInstanceId",
+	"service-instance-name": "serviceInstanceName",
+	"orchestration-status": "CREATED",
+	"owning-entity": null,
+	"project": null,
+	"vnfs": [],
+	"allotted-resources": [
+		{
+			"id": "allottedID",
+			"target-network-role": null,
+			"self-link": null,
+			"orchestration-status": null,
+			"operational-status": null,
+			"type": null,
+			"role": null,
+			"model-info-allotted-resource": null
+		}
+	],
+	"networks": [],
+	"vhn-portal-url": "vhnPortalUrl",
+	"service-instance-location-id": "serviceInstanceLocId",
+	"selflink": "selfLink",
+	"metadata": null,
+	"configurations": [],
+	"model-info-service-instance": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_catalogServiceToSI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_catalogServiceToSI.json
new file mode 100644
index 0000000000..0906ea29ab
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_catalogServiceToSI.json
@@ -0,0 +1,34 @@
+{
+	"service-instance-id": null,
+	"service-instance-name": null,
+	"orchestration-status": null,
+	"owning-entity": null,
+	"customer": null,
+	"project": null,
+	"vnfs": [],
+	"allotted-resources": [],
+	"networks": [],
+	"bandwidth-total": null,
+	"bandwidth-up-wan-1": null,
+	"bandwidth-down-wan-1": null,
+	"bandwidth-up-wan-2": null,
+	"bandwidth-down-wan-2": null,
+	"vhn-portal-url": null,
+	"service-instance-location-id": null,
+	"selflink": null,
+	"metadata": null,
+	"volume-groups": [],
+	"configuration": null,
+	"model-info-service-instance": {
+		"description": "description",
+		"created": null,
+		"model-name": "modelName",
+		"model-uuid": "modelUUID",
+		"model-invariant-uuid": "modelInvariantUUID",
+		"model-version": "modelVersion",
+		"service-type": "serviceType",
+		"service-role": "serviceRole",
+		"environment-context": "environmentContext",
+		"workload-context": "workloadContext"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_getServiceInstanceNOAAIExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_getServiceInstanceNOAAIExpected.json
new file mode 100644
index 0000000000..38cca740c7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_getServiceInstanceNOAAIExpected.json
@@ -0,0 +1,32 @@
+{
+	"service-instance-id": "3655a595-05d1-433c-93c0-3afd6b572545",
+	"service-instance-name": "serviceInstanceName",
+	"orchestration-status": "PRECREATED",
+	"owning-entity": {
+		"owning-entity-id": "owningEntityId",
+		"owning-entity-name": "owningEntityName"
+	},
+	"project": {
+		"project-name": "projectName"
+	},
+	"vnfs": [],
+	"allotted-resources": [],
+	"networks": [],
+	"vhn-portal-url": null,
+	"service-instance-location-id": null,
+	"selflink": null,
+	"metadata": null,
+	"configurations": [],
+	"model-info-service-instance": {
+		"description": "description",
+		"created": null,
+		"model-name": "modelName",
+		"model-uuid": "modelUUID",
+		"model-invariant-uuid": "modelInvariantUUID",
+		"model-version": "modelVersion",
+		"service-type": "serviceType",
+		"service-role": "serviceRole",
+		"environment-context": "environmentContext",
+		"workload-context": "workloadContext"
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_highLevelObjectsToSI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_highLevelObjectsToSI.json
new file mode 100644
index 0000000000..4cb6940a74
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceInstance_highLevelObjectsToSI.json
@@ -0,0 +1,35 @@
+{
+	"service-instance-id": null,
+	"service-instance-name": null,
+	"orchestration-status": null,
+	"owning-entity": {
+		"owning-entity-id": "owningEntityId",
+		"owning-entity-name": "owningEntityName"
+	},
+	"customer": {
+		"global-customer-id": "globalCustomerId",
+		"subscriber-name": "subscriberName",
+		"subscriber-type": "subscriberType",
+		"service-subscription": {
+			"service-type": "subscriptionServiceType"
+		}
+	},
+	"project": {
+		"project-name": "projectName"
+	},
+	"vnfs": [],
+	"allotted-resources": [],
+	"networks": [],
+	"bandwidth-total": null,
+	"bandwidth-up-wan-1": null,
+	"bandwidth-down-wan-1": null,
+	"bandwidth-up-wan-2": null,
+	"bandwidth-down-wan-2": null,
+	"vhn-portal-url": null,
+	"service-instance-location-id": null,
+	"selflink": null,
+	"metadata": null,
+	"volume-groups": [],
+	"configuration": null,
+	"model-info-service-instance": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNetworks.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNetworks.json
new file mode 100644
index 0000000000..f458d732d2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNetworks.json
@@ -0,0 +1,109 @@
+{
+	"modelInfo": {
+		"modelType": "service",
+		"modelName": "MOW AVPN vMX BV vPE 1 Service",
+		"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+	},
+	"instanceName": "vPE_Service",
+	"instanceParams": [],
+	"resources": {
+		"vnfs": [
+			{
+				"modelInfo": {
+					"modelType": "vnf",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"platform": {
+					"platformName": "test"
+				},
+				"lineOfBusiness": {
+					"lineOfBusinessName": "someValue"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001",
+				"instanceParams": [],
+				"vfModules": [
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
+							"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
+							"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_001",
+						"instanceParams": [
+							{
+								"vmx_int_net_len": "24"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "100"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_002",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "50"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vPFE_BV..module-2",
+							"modelVersionId": "f555558f-d538-4876-8ffa-b102650fad64",
+							"modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969"
+						},
+						"instanceName": "vmxnjr001_AVPN_vPFE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vmx_vpfe_int_ip_0": "128.0.0.16"
+							}
+						]
+					}
+				]
+			}
+		],
+		"networks": [
+			{
+				"modelInfo": {
+					"modelType": "network",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"cloudConfiguration": {
+					"lcpCloudRegionId": "mdt1",
+					"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNoCloudConfig.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNoCloudConfig.json
new file mode 100644
index 0000000000..0c3d8e709e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroNoCloudConfig.json
@@ -0,0 +1,105 @@
+{
+	"modelInfo": {
+		"modelType": "service",
+		"modelName": "MOW AVPN vMX BV vPE 1 Service",
+		"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+	},
+	"instanceName": "vPE_Service",
+	"instanceParams": [],
+	"resources": {
+		"vnfs": [
+			{
+				"modelInfo": {
+					"modelType": "vnf",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"platform": {
+					"platformName": "test"
+				},
+				"lineOfBusiness": {
+					"lineOfBusinessName": "someValue"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001",
+				"instanceParams": [],
+				"vfModules": [
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
+							"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
+							"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_001",
+						"instanceParams": [
+							{
+								"vmx_int_net_len": "24"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "100"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_002",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "50"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vPFE_BV..module-2",
+							"modelVersionId": "f555558f-d538-4876-8ffa-b102650fad64",
+							"modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969"
+						},
+						"instanceName": "vmxnjr001_AVPN_vPFE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vmx_vpfe_int_ip_0": "128.0.0.16"
+							}
+						]
+					}
+				]
+			}
+		],
+		"networks": [
+			{
+				"modelInfo": {
+					"modelType": "network",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVfModules.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVfModules.json
new file mode 100644
index 0000000000..3f07e8d526
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVfModules.json
@@ -0,0 +1,113 @@
+{
+	"modelInfo": {
+		"modelType": "service",
+		"modelName": "MOW AVPN vMX BV vPE 1 Service",
+		"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+	},
+	"instanceName": "vPE_Service",
+	"instanceParams": [],
+	"resources": {
+		"vnfs": [
+			{
+				"modelInfo": {
+					"modelType": "vnf",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"platform": {
+					"platformName": "test"
+				},
+				"lineOfBusiness": {
+					"lineOfBusinessName": "someValue"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001",
+				"instanceParams": [],
+				"vfModules": [
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
+							"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
+							"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_001",
+						"instanceParams": [
+							{
+								"vmx_int_net_len": "24"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"cloudConfiguration": {
+							"lcpCloudRegionId": "mdt1",
+							"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "100"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_002",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "50"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vPFE_BV..module-2",
+							"modelVersionId": "f555558f-d538-4876-8ffa-b102650fad64",
+							"modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969"
+						},
+						"instanceName": "vmxnjr001_AVPN_vPFE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vmx_vpfe_int_ip_0": "128.0.0.16"
+							}
+						]
+					}
+				]
+			}
+		],
+		"networks": [
+			{
+				"modelInfo": {
+					"modelType": "network",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"cloudConfiguration": {
+					"lcpCloudRegionId": "mdt1",
+					"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVnfs.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVnfs.json
new file mode 100644
index 0000000000..4c29f96361
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceMacroVnfs.json
@@ -0,0 +1,113 @@
+{
+	"modelInfo": {
+		"modelType": "service",
+		"modelName": "MOW AVPN vMX BV vPE 1 Service",
+		"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+	},
+	"instanceName": "vPE_Service",
+	"instanceParams": [],
+	"resources": {
+		"vnfs": [
+			{
+				"modelInfo": {
+					"modelType": "vnf",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"platform": {
+					"platformName": "test"
+				},
+				"lineOfBusiness": {
+					"lineOfBusinessName": "someValue"
+				},
+				"cloudConfiguration": {
+					"lcpCloudRegionId": "mdt1",
+					"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001",
+				"instanceParams": [],
+				"vfModules": [
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
+							"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
+							"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_001",
+						"instanceParams": [
+							{
+								"vmx_int_net_len": "24"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "100"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+							"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+							"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
+						},
+						"instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_002",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vre_a_volume_size_0": "50"
+							}
+						]
+					},
+					{
+						"modelInfo": {
+							"modelType": "vfModule",
+							"modelName": "201673MowAvpnVpeBvL..AVPN_vPFE_BV..module-2",
+							"modelVersionId": "f555558f-d538-4876-8ffa-b102650fad64",
+							"modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969"
+						},
+						"instanceName": "vmxnjr001_AVPN_vPFE_BV_expansion_001",
+						"instanceParams": [
+							{
+								"availability_zone_0": "mtpocdv-kvm-az01",
+								"vmx_vpfe_int_ip_0": "128.0.0.16"
+							}
+						]
+					}
+				]
+			}
+		],
+		"networks": [
+			{
+				"modelInfo": {
+					"modelType": "network",
+					"modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+					"modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+					"modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+					"modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+				},
+				"cloudConfiguration": {
+					"lcpCloudRegionId": "mdt1",
+					"tenantId": "88a6ca3ee0394ade9403f075db23167e"
+				},
+				"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+				"instanceName": "vmxnjr001"
+			}
+		]
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscriptionExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscriptionExpected.json
new file mode 100644
index 0000000000..5c41329fb8
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscriptionExpected.json
@@ -0,0 +1,5 @@
+{
+	"service-type": "serviceType",
+	"temp-ub-sub-account-id" : "tempUbSubAccountId",
+	"service-instances" : []
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscription_AAI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscription_AAI.json
new file mode 100644
index 0000000000..bc72bea767
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ServiceSubscription_AAI.json
@@ -0,0 +1,7 @@
+{
+    "serviceType" : "serviceType",
+    "tempUbSubAccountId" : "tempUbSubAccountId",
+    "resourceVersion" : "resourceVersion",
+    "serviceInstances" : {},
+    "relationshipList" : {}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VfModuleCustomizationInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VfModuleCustomizationInput.json
new file mode 100644
index 0000000000..08bd8c7d14
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VfModuleCustomizationInput.json
@@ -0,0 +1,24 @@
+{
+	"modelCustomizationUUID" : "modelCustomizationUUID",
+    "label" : "label",
+    "minInstances": 2,
+    "maxInstances": 3,
+    "availabilityZoneCount": 5,
+	"volumeHeatEnv" : {},
+	"heatEnvironment" : {},
+	"vfModule" : {
+	   "modelUUID" : "modelUUID",
+        "modelInvariantUUID" : "modelInvariantUUID",
+        "modelName" : "modelName",
+        "modelVersion" : "modelVersion",
+        "description" : "description",
+        "isBase" : true,
+        "volumeHeatTemplate" : {},
+        "moduleHeatTemplate" : {},
+        "heatFiles" : [],
+        "vfModuleCustomization" : [],
+        "vnfResources" : {
+            "modelName" : "vnfResourceModelName"
+        }
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfResourceCustomizationInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfResourceCustomizationInput.json
new file mode 100644
index 0000000000..26516ce907
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfResourceCustomizationInput.json
@@ -0,0 +1,25 @@
+{
+	"modelCustomizationUUID" : "modelCustomizationUUID",
+	"modelInstanceName" : "modelInstanceName",
+    "minInstances": 2,
+    "maxInstances": 3,
+    "availabilityZoneMaxCount": 5,
+    "nfFunction" : "nfFunction",
+    "nfType" : "nfType",
+    "nfRole" : "nfRole",
+    "nfNamingCode" : "nfNamingCode",
+    "multiStageDesign" : "multiStageDesign",
+    "vnfResources" : {
+        "modelUUID" : "modelUUID",
+        "modelInvariantUUID" : "modelInvariantUUID",
+        "modelName" : "modelName",
+        "modelVersion" : "modelVersion",
+        "toscaNodeType" : "toscaNodeType",
+        "description" : "description",
+        "orchestrationMode" : "orchestrationMode",
+        "aicVersionMin" : "aicVersionMin",
+        "aicVersionMax" : "aicVersionMax",
+        "category" : "category",
+        "subCategory" : "subCategory"
+    }
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfcInstanceGroupCustomization.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfcInstanceGroupCustomization.json
new file mode 100644
index 0000000000..457b23f841
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VnfcInstanceGroupCustomization.json
@@ -0,0 +1,8 @@
+{
+	"modelCustomizationUUID" : "modelCustomizationUUID",
+	"modelUUID" : "modelUUID",
+	"vnfResourceCust" : {},
+	"instanceGroup" : {},
+	"function" : "function",
+	"description" : "description"
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
new file mode 100644
index 0000000000..f807276773
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
@@ -0,0 +1,9 @@
+{
+	"volume-group-id":"volumeGroupId",	
+	"volume-group-name":"volumeGroupName",	
+	"vnf-type":"vnfType",	
+	"orchestration-status":"PRECREATED",	
+	"cloud-params":{},	
+	"cascaded":false,
+	"heat-stack-id":"heatStackId"
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup_AAI.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup_AAI.json
new file mode 100644
index 0000000000..fb46478592
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup_AAI.json
@@ -0,0 +1,11 @@
+{
+    "volumeGroupId" : "volumeGroupId",
+    "volumeGroupName" : "volumeGroupName",
+    "heatStackId" : "heatStackId",
+    "vnfType" : "vnfType",
+    "orchestrationStatus" : "PRECREATED",
+    "modelCustomizationId" : "modelCustomizationId",
+    "vfModuleModelCustomizationId" : "vfModuleModelCustomizationId",
+    "resourceVersion" : null,
+    "relationshipList" : {}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiGenericVnfInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiGenericVnfInput.json
new file mode 100644
index 0000000000..14b316d001
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiGenericVnfInput.json
@@ -0,0 +1,104 @@
+{
+	"vnfId":"vnfId",
+	"vnfName":"vnfName",
+	"vnfName2":null,
+	"vnfType":"vnfType",
+	"serviceId":null,
+	"regionalResourceZone":null,
+	"provStatus":null,
+	"operationalStatus":null,
+	"licenseKey":null,
+	"equipmentRole":null,
+	"orchestrationStatus":"PRECREATED",
+	"heatStackId":null,
+	"msoCatalogKey":null,
+	"managementOption":null,
+	"ipv4OamAddress":null,
+	"ipv4Loopback0Address":null,
+	"nmLanV6Address":null,
+	"managementV6Address":null,
+	"vcpu":null,
+	"vcpuUnits":null,
+	"vmemory":null,
+	"vmemoryUnits":null,
+	"vdisk":null,
+	"vdiskUnits":null,
+	"inMaint":false,
+	"isClosedLoopDisabled":false,
+	"resourceVersion":null,
+	"summaryStatus":null,
+	"encryptedAccessFlag":null,
+	"entitlementAssignmentGroupUuid":null,
+	"entitlementResourceUuid":null,
+	"licenseAssignmentGroupUuid":null,
+	"licenseKeyUuid":null,
+	"modelInvariantId":null,
+	"modelVersionId":null,
+	"personaModelVersion":null,
+	"modelCustomizationId":null,
+	"widgetModelId":null,
+	"widgetModelVersion":null,
+	"asNumber":null,
+	"regionalResourceSubzone":null,
+	"nfType":null,
+	"nfFunction":null,
+	"nfRole":null,
+	"nfNamingCode":null,
+	"selflink":null,
+	"ipv4OamGatewayAddress":null,
+	"ipv4OamGatewayAddressPrefixLength":null,
+	"vlanIdOuter":null,
+	"nmProfileName":null,
+	"relationshipList":null,
+	"lagInterfaces":{
+		"lagInterface":[{
+			"interfaceName":"interfaceName",
+			"interfaceDescription":"interfaceDescription",
+			"resourceVersion":null,
+			"speedValue":"speedValue",
+			"speedUnits":"speedUnits",
+			"interfaceId":"interfaceId",
+			"interfaceRole":"interfaceRole",
+			"provStatus":"provStatus",
+			"inMaint":true,"relationshipList":null,
+			"linterfaces":null
+		}]
+	},
+	"vfModules":{
+		"vfModule":[{
+			"vfModuleId":"vfModuleId",
+			"vfModuleName":"vfModuleName",
+			"heatStackId":"heatStackId",
+			"orchestrationStatus":"PRECREATED",
+			"isBaseVfModule":false,
+			"resourceVersion":null,
+			"modelInvariantId":null,
+			"modelVersionId":null,
+			"personaModelVersion":null,
+			"modelCustomizationId":null,
+			"widgetModelId":null,
+			"widgetModelVersion":null,
+			"contrailServiceInstanceFqdn":"contrailServiceInstanceFqdn",
+			"moduleIndex":1,
+			"selflink":"selflink",
+			"relationshipList":null
+		}]
+	},
+	"licenses":{
+		"license":[{
+			"groupUuid":"groupUuid",
+			"resourceUuid":null,
+			"resourceVersion":null,
+			"relationshipList":null
+		}]
+	},
+	"entitlements":{
+		"entitlement":[{
+			"groupUuid":"groupUuid",
+			"resourceUuid":"resourceUuid",
+			"resourceVersion":null,
+			"relationshipList":null
+		}]
+	},
+	"linterfaces":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiL3NetworkInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiL3NetworkInput.json
new file mode 100644
index 0000000000..212074ba06
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiL3NetworkInput.json
@@ -0,0 +1,50 @@
+{
+	"networkId": "networkId",
+	"networkName": "networkName",
+	"networkType": null,
+	"networkRole": null,
+	"networkTechnology": null,
+	"neutronNetworkId": null,
+	"isBoundToVpn": true,
+	"serviceId": "serviceId",
+	"networkRoleInstance": 1234,
+	"resourceVersion": null,
+	"orchestrationStatus": "Assigned",
+	"heatStackId": "heatStackId",
+	"msoCatalogKey": null,
+	"contrailNetworkFqdn": "contrailNetworkFqdn",
+	"modelInvariantId": null,
+	"modelVersionId": null,
+	"personaModelVersion": null,
+	"modelCustomizationId": null,
+	"widgetModelId": "widgetModelId",
+	"widgetModelVersion": "widgetModelVersion",
+	"physicalNetworkName": "physicalNetworkName",
+	"isProviderNetwork": true,
+	"isSharedNetwork": true,
+	"isExternalNetwork": true,
+	"selflink": "selflink",
+	"operationalStatus": "operationalStatus",
+	"subnets": {
+		"subnet": [
+			{
+				"subnetId": "subnetId"
+			}
+		]
+	},
+	"ctagAssignments": {
+		"ctagAssignment": [
+			{
+				"vlanIdInner": 1234
+			}
+		]
+	},
+	"segmentationAssignments": {
+		"segmentationAssignment": [
+			{
+				"segmentationId": "segmentationId"
+			}
+		]
+	},
+	"relationshipList": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiVolumeGroupInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiVolumeGroupInput.json
new file mode 100644
index 0000000000..dce65e7b67
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiVolumeGroupInput.json
@@ -0,0 +1,11 @@
+{
+	"volumeGroupId":"volumeGroupId",
+	"volumeGroupName":"volumeGroupId",
+	"heatStackId":"heatStackId",
+	"vnfType":"vnfType",
+	"orchestrationStatus":"PRECREATED",
+	"modelCustomizationId":"modelCustomizationId",
+	"vfModuleModelCustomizationId":"vfModuleModelCustomizationId",
+	"resourceVersion":null,
+	"relationshipList":null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/l3NetworkExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/l3NetworkExpected.json
new file mode 100644
index 0000000000..5006717a02
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/l3NetworkExpected.json
@@ -0,0 +1,36 @@
+{
+	"network-id": "networkId",
+	"cascaded": null,
+	"cloud-params": {},
+	"network-name": "networkName",
+	"is-bound-to-vpn": true,
+	"service-id": "serviceId",
+	"network-role-instance": 1234,
+	"orchestration-status": "ASSIGNED",
+	"heat-stack-id": "heatStackId",
+	"contrail-network-fqdn": "contrailNetworkFqdn",
+	"widget-model-id": "widgetModelId",
+	"widget-model-version": "widgetModelVersion",
+	"physical-network-name": "physicalNetworkName",
+	"is-provider-network": true,
+	"is-shared-network": true,
+	"is-external-network": true,
+	"self-link": "selflink",
+	"operational-status": "operationalStatus",
+	"subnets": [
+		{
+			"subnet-id": "subnetId"
+		}
+	],
+	"ctag-assignments": [
+		{
+			"vlan-id-inner": 1234
+		}
+	],
+	"segmentation-assignments": [
+		{
+			"segmentation-id": "segmentationId"
+		}
+	],
+	"model-info-network": null
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
index 30b0afb3dc..e11c4499e0 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GENDSI_getServiceInstanceResponse.xml
@@ -1,35 +1,35 @@
-  <service-subscription xmlns="http://com.aai.inventory">

-         <service-type>SDN-ETHERNET-INTERNET</service-type>

-         <resource-version>1234</resource-version>

-         <service-instances>

-            <service-instance>

-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

-               <relationship-list>

-                  <relationship>

-                     <related-to>cvlan-tag</related-to>

-                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

-                     <relationship-data>

-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

-                        <relationship-value>2003</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>port-group.interface-id</relationship-key>

-                        <relationship-value>slcp1447vbc.ipag</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-                  <relationship>

-                     <related-to>vce</related-to>

-					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-               </relationship-list>

-            </service-instance>

-         </service-instances>

+  <service-subscription xmlns="http://com.aai.inventory">
+         <service-type>SDN-ETHERNET-INTERNET</service-type>
+         <resource-version>1234</resource-version>
+         <service-instances>
+            <service-instance>
+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
+               <relationship-list>
+                  <relationship>
+                     <related-to>cvlan-tag</related-to>
+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
+                     <relationship-data>
+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
+                        <relationship-value>2003</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>port-group.interface-id</relationship-key>
+                        <relationship-value>slcp1447vbc.ipag</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+                  <relationship>
+                     <related-to>vce</related-to>
+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+               </relationship-list>
+            </service-instance>
+         </service-instances>
       </service-subscription>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
index a609a35857..7c879879ef 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfByNameResponse.xml
@@ -1,23 +1,23 @@
-<generic-vnfs xmlns="http://com.aai.inventory/v3">

-         <generic-vnf>

-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

-            <vnf-name>testVnfName123</vnf-name>

-            <vnf-type>mmsc-capacity</vnf-type>

-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-            <equipment-role>vMMSC</equipment-role>

-            <orchestration-status>pending-create</orchestration-status>

-            <resource-version>testReVer123</resource-version>

-            <relationship-list>

-               <relationship>

-                  <related-to>nothing</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

-                  </relationship-data>

-               </relationship>

-            </relationship-list>

-            <l-interfaces/>

-            <lag-interfaces/>

-         </generic-vnf>

+<generic-vnfs xmlns="http://com.aai.inventory/v3">
+         <generic-vnf>
+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
+            <vnf-name>testVnfName123</vnf-name>
+            <vnf-type>mmsc-capacity</vnf-type>
+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+            <equipment-role>vMMSC</equipment-role>
+            <orchestration-status>pending-create</orchestration-status>
+            <resource-version>testReVer123</resource-version>
+            <relationship-list>
+               <relationship>
+                  <related-to>nothing</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
+                  </relationship-data>
+               </relationship>
+            </relationship-list>
+            <l-interfaces/>
+            <lag-interfaces/>
+         </generic-vnf>
       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
index 2b70f0b600..0b5a822b68 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse.xml
@@ -1,90 +1,90 @@
-<generic-vnfs xmlns="http://com.aai.inventory/v3">

-         <generic-vnf>

-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

-            <vnf-name>testVnfName123</vnf-name>

-            <vnf-type>mmsc-capacity</vnf-type>

-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-            <equipment-role>vMMSC</equipment-role>

-            <orchestration-status>pending-create</orchestration-status>

-            <relationship-list>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

-                  </relationship-data>

-               </relationship>

-            </relationship-list>

-            <l-interfaces/>

-            <lag-interfaces/>

-         </generic-vnf>

-         <generic-vnf>

-            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>

-            <vnf-name>ZRDM1MMSC03</vnf-name>

-            <vnf-type>mmsc-capacity</vnf-type>

-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-            <equipment-role>vMMSC</equipment-role>

-            <orchestration-status>pending-create</orchestration-status>

-            <relationship-list>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

-                  </relationship-data>

-               </relationship>

-            </relationship-list>

-            <l-interfaces/>

-            <lag-interfaces/>

-         </generic-vnf>

+<generic-vnfs xmlns="http://com.aai.inventory/v3">
+         <generic-vnf>
+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
+            <vnf-name>testVnfName123</vnf-name>
+            <vnf-type>mmsc-capacity</vnf-type>
+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+            <equipment-role>vMMSC</equipment-role>
+            <orchestration-status>pending-create</orchestration-status>
+            <relationship-list>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
+                  </relationship-data>
+               </relationship>
+            </relationship-list>
+            <l-interfaces/>
+            <lag-interfaces/>
+         </generic-vnf>
+         <generic-vnf>
+            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
+            <vnf-name>ZRDM1MMSC03</vnf-name>
+            <vnf-type>mmsc-capacity</vnf-type>
+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+            <equipment-role>vMMSC</equipment-role>
+            <orchestration-status>pending-create</orchestration-status>
+            <relationship-list>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
+                  </relationship-data>
+               </relationship>
+            </relationship-list>
+            <l-interfaces/>
+            <lag-interfaces/>
+         </generic-vnf>
       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
index 2b70f0b600..0b5a822b68 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getGenericVnfResponse_hasRelationships.xml
@@ -1,90 +1,90 @@
-<generic-vnfs xmlns="http://com.aai.inventory/v3">

-         <generic-vnf>

-            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>

-            <vnf-name>testVnfName123</vnf-name>

-            <vnf-type>mmsc-capacity</vnf-type>

-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-            <equipment-role>vMMSC</equipment-role>

-            <orchestration-status>pending-create</orchestration-status>

-            <relationship-list>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

-                  </relationship-data>

-               </relationship>

-            </relationship-list>

-            <l-interfaces/>

-            <lag-interfaces/>

-         </generic-vnf>

-         <generic-vnf>

-            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>

-            <vnf-name>ZRDM1MMSC03</vnf-name>

-            <vnf-type>mmsc-capacity</vnf-type>

-            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-            <equipment-role>vMMSC</equipment-role>

-            <orchestration-status>pending-create</orchestration-status>

-            <relationship-list>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>

-                  </relationship-data>

-               </relationship>

-               <relationship>

-                  <related-to>l3-network</related-to>

-                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>

-                  <relationship-data>

-                     <relationship-key>l3-network.network-id</relationship-key>

-                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>

-                  </relationship-data>

-               </relationship>

-            </relationship-list>

-            <l-interfaces/>

-            <lag-interfaces/>

-         </generic-vnf>

+<generic-vnfs xmlns="http://com.aai.inventory/v3">
+         <generic-vnf>
+            <vnf-id>2f1cc940-455f-4ee2-9411-a7899cd4f124</vnf-id>
+            <vnf-name>testVnfName123</vnf-name>
+            <vnf-type>mmsc-capacity</vnf-type>
+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+            <equipment-role>vMMSC</equipment-role>
+            <orchestration-status>pending-create</orchestration-status>
+            <relationship-list>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
+                  </relationship-data>
+               </relationship>
+            </relationship-list>
+            <l-interfaces/>
+            <lag-interfaces/>
+         </generic-vnf>
+         <generic-vnf>
+            <vnf-id>802767b3-18a6-4432-96db-25522786aee0</vnf-id>
+            <vnf-name>ZRDM1MMSC03</vnf-name>
+            <vnf-type>mmsc-capacity</vnf-type>
+            <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+            <equipment-role>vMMSC</equipment-role>
+            <orchestration-status>pending-create</orchestration-status>
+            <relationship-list>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/c597ab81-fece-49f4-a4f5-710cebb13c29/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>c597ab81-fece-49f4-a4f5-710cebb13c29</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/53956c91-6e5e-49aa-88dd-535f57e66e70/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>53956c91-6e5e-49aa-88dd-535f57e66e70</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/44e0d9e0-9334-4ec6-9344-07a96dac629f/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>44e0d9e0-9334-4ec6-9344-07a96dac629f</relationship-value>
+                  </relationship-data>
+               </relationship>
+               <relationship>
+                  <related-to>l3-network</related-to>
+                  <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/ac49d99b-5daf-4624-9f8e-188b126ea166/</related-link>
+                  <relationship-data>
+                     <relationship-key>l3-network.network-id</relationship-key>
+                     <relationship-value>ac49d99b-5daf-4624-9f8e-188b126ea166</relationship-value>
+                  </relationship-data>
+               </relationship>
+            </relationship-list>
+            <l-interfaces/>
+            <lag-interfaces/>
+         </generic-vnf>
       </generic-vnfs>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
index b1f640f47f..d0fccd80c9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlById.xml
@@ -1,6 +1,6 @@
-    <search-results xmlns="http://com.aai.inventory">

-         <result-data>

-            <resource-type>service-instance</resource-type>

-            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>

-         </result-data>

+    <search-results xmlns="http://com.aai.inventory">
+         <result-data>
+            <resource-type>service-instance</resource-type>
+            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
+         </result-data>
       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
index b1f640f47f..d0fccd80c9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getSIUrlByName.xml
@@ -1,6 +1,6 @@
-    <search-results xmlns="http://com.aai.inventory">

-         <result-data>

-            <resource-type>service-instance</resource-type>

-            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>

-         </result-data>

+    <search-results xmlns="http://com.aai.inventory">
+         <result-data>
+            <resource-type>service-instance</resource-type>
+            <resource-link>https://aai-ext1.test.com:8443/aai/v7/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET</resource-link>
+         </result-data>
       </search-results>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
index 84d8600eac..e377c70474 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceInstance.xml
@@ -1,30 +1,30 @@
-<service-instance>

-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

-               <resource-version>123456789</resource-version>

-               <relationship-list>

-                  <relationship>

-                     <related-to>cvlan-tag</related-to>

-                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

-                     <relationship-data>

-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

-                        <relationship-value>2003</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>port-group.interface-id</relationship-key>

-                        <relationship-value>slcp1447vbc.ipag</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-                  <relationship>

-                     <related-to>vce</related-to>

-					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-               </relationship-list>

+<service-instance>
+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
+               <resource-version>123456789</resource-version>
+               <relationship-list>
+                  <relationship>
+                     <related-to>cvlan-tag</related-to>
+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
+                     <relationship-data>
+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
+                        <relationship-value>2003</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>port-group.interface-id</relationship-key>
+                        <relationship-value>slcp1447vbc.ipag</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+                  <relationship>
+                     <related-to>vce</related-to>
+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+               </relationship-list>
             </service-instance>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
index 85cd5d605a..52e75d970a 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getServiceSubscription.xml
@@ -1,34 +1,34 @@
-<service-subscription xmlns="http://com.aai.inventory">

-     <service-type>SDN-ETHERNET-INTERNET</service-type>

-     <resource-version>1234</resource-version>

-		<service-instance>

-               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>

-               <resource-version>123456789</resource-version>

-               <relationship-list>

-                  <relationship>

-                     <related-to>cvlan-tag</related-to>

-                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>

-                     <relationship-data>

-                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>

-                        <relationship-value>2003</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>port-group.interface-id</relationship-key>

-                        <relationship-value>slcp1447vbc.ipag</relationship-value>

-                     </relationship-data>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-                  <relationship>

-                     <related-to>vce</related-to>

-					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>

-                     <relationship-data>

-                        <relationship-key>vce.vnf-id</relationship-key>

-                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>

-                     </relationship-data>

-                  </relationship>

-               </relationship-list>

-            </service-instance>

+<service-subscription xmlns="http://com.aai.inventory">
+     <service-type>SDN-ETHERNET-INTERNET</service-type>
+     <resource-version>1234</resource-version>
+		<service-instance>
+               <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
+               <resource-version>123456789</resource-version>
+               <relationship-list>
+                  <relationship>
+                     <related-to>cvlan-tag</related-to>
+                     <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/port-groups/port-group/slcp1447vbc.ipag/cvlan-tags/cvlan-tag/2003/</related-link>
+                     <relationship-data>
+                        <relationship-key>cvlan-tag.cvlan-tag</relationship-key>
+                        <relationship-value>2003</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>port-group.interface-id</relationship-key>
+                        <relationship-value>slcp1447vbc.ipag</relationship-value>
+                     </relationship-data>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+                  <relationship>
+                     <related-to>vce</related-to>
+					 <related-link>https://aai-ext1.test.com:8443/aai/v2/network/vces/vce/832bace2-3fb0-49e0-a6a4-07c47223c535/</related-link>
+                     <relationship-data>
+                        <relationship-key>vce.vnf-id</relationship-key>
+                        <relationship-value>832bace2-3fb0-49e0-a6a4-07c47223c535</relationship-value>
+                     </relationship-data>
+                  </relationship>
+               </relationship-list>
+            </service-instance>
       </service-subscription>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
index 7ada696cb7..b55d51971d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceByNameResponse.xml
@@ -1,97 +1,97 @@
-<vce xmlns="http://com.aai.inventory">

-         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>

-         <vnf-name>testVnfName123</vnf-name>

-         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>

-         <vnf-type>esx-vce</vnf-type>

-         <prov-status>NVTPROV</prov-status>

-         <orchestration-status>created</orchestration-status>

-         <resource-version>0000020</resource-version>

-         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>

-         <mso-catalog-key/>

-         <vpe-id>VPESAT-mtanjrsv126</vpe-id>

-         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>

-         <port-groups>

-            <port-group>

-               <interface-id>slcp1476vbc.vpe</interface-id>

-               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>

-               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>

-               <interface-role>Internet</interface-role>

-               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>

-               <resource-version>0000020</resource-version>

-               <switch-name>dvs-slcp1-01</switch-name>

-               <orchestration-status>created</orchestration-status>

-               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>

-               <mso-catalog-key/>

-               <cvlan-tags>

-                  <cvlan-tag-entry>

-                     <cvlan-tag>3012</cvlan-tag>

-                     <resource-version>0000020</resource-version>

-                  </cvlan-tag-entry>

-               </cvlan-tags>

-            </port-group>

-            <port-group>

-               <interface-id>slcp1476vbc.ipag</interface-id>

-               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>

-               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>

-               <interface-role>Customer</interface-role>

-               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>

-               <switch-name>dvs-slcp1-01</switch-name>

-               <resource-version>0000020</resource-version>

-               <orchestration-status>created</orchestration-status>

-               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>

-               <mso-catalog-key/>

-               <cvlan-tags>

-                  <cvlan-tag-entry>

-                     <cvlan-tag>2003</cvlan-tag>

-                     <resource-version>0000020</resource-version>

-                  </cvlan-tag-entry>

-               </cvlan-tags>

-            </port-group>

-         </port-groups>

-         <relationship-list>

-            <relationship>

-               <related-to>service-instance</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>

-               <relationship-data>

-                  <relationship-key>service-instance.service-instance-id</relationship-key>

-                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>service-subscription.service-type</relationship-key>

-                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>customer.global-customer-id</relationship-key>

-                  <relationship-value>011216-1602-SDNC001</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>vserver</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>

-               <relationship-data>

-                  <relationship-key>vserver.vserver-id</relationship-key>

-                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>complex</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>

-               <relationship-data>

-                  <relationship-key>complex.physical-location-id</relationship-key>

-                  <relationship-value>MDTWNJ21A4</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>availability-zone</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>

-               <relationship-data>

-                  <relationship-key>availability-zone.availability-zone-name</relationship-key>

-                  <relationship-value>slcp1-esx-az01</relationship-value>

-               </relationship-data>

-            </relationship>

-         </relationship-list>

+<vce xmlns="http://com.aai.inventory">
+         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>
+         <vnf-name>testVnfName123</vnf-name>
+         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>
+         <vnf-type>esx-vce</vnf-type>
+         <prov-status>NVTPROV</prov-status>
+         <orchestration-status>created</orchestration-status>
+         <resource-version>0000020</resource-version>
+         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>
+         <mso-catalog-key/>
+         <vpe-id>VPESAT-mtanjrsv126</vpe-id>
+         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>
+         <port-groups>
+            <port-group>
+               <interface-id>slcp1476vbc.vpe</interface-id>
+               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>
+               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>
+               <interface-role>Internet</interface-role>
+               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>
+               <resource-version>0000020</resource-version>
+               <switch-name>dvs-slcp1-01</switch-name>
+               <orchestration-status>created</orchestration-status>
+               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>
+               <mso-catalog-key/>
+               <cvlan-tags>
+                  <cvlan-tag-entry>
+                     <cvlan-tag>3012</cvlan-tag>
+                     <resource-version>0000020</resource-version>
+                  </cvlan-tag-entry>
+               </cvlan-tags>
+            </port-group>
+            <port-group>
+               <interface-id>slcp1476vbc.ipag</interface-id>
+               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>
+               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>
+               <interface-role>Customer</interface-role>
+               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>
+               <switch-name>dvs-slcp1-01</switch-name>
+               <resource-version>0000020</resource-version>
+               <orchestration-status>created</orchestration-status>
+               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>
+               <mso-catalog-key/>
+               <cvlan-tags>
+                  <cvlan-tag-entry>
+                     <cvlan-tag>2003</cvlan-tag>
+                     <resource-version>0000020</resource-version>
+                  </cvlan-tag-entry>
+               </cvlan-tags>
+            </port-group>
+         </port-groups>
+         <relationship-list>
+            <relationship>
+               <related-to>service-instance</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>
+               <relationship-data>
+                  <relationship-key>service-instance.service-instance-id</relationship-key>
+                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>service-subscription.service-type</relationship-key>
+                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>customer.global-customer-id</relationship-key>
+                  <relationship-value>011216-1602-SDNC001</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>vserver</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>
+               <relationship-data>
+                  <relationship-key>vserver.vserver-id</relationship-key>
+                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>complex</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>
+               <relationship-data>
+                  <relationship-key>complex.physical-location-id</relationship-key>
+                  <relationship-value>MDTWNJ21A4</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>availability-zone</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>
+               <relationship-data>
+                  <relationship-key>availability-zone.availability-zone-name</relationship-key>
+                  <relationship-value>slcp1-esx-az01</relationship-value>
+               </relationship-data>
+            </relationship>
+         </relationship-list>
       </vce>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
index 5dc3033445..e5f98bfe33 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/GenericFlows/getVceResponse.xml
@@ -1,97 +1,92 @@
-<vce xmlns="http://com.aai.inventory">

-         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>

-         <vnf-name>testVnfName123</vnf-name>

-         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>

-         <vnf-type>esx-vce</vnf-type>

-         <prov-status>NVTPROV</prov-status>

-         <orchestration-status>created</orchestration-status>

-         <resource-version>0000020</resource-version>

-         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>

-         <mso-catalog-key/>

-         <vpe-id>VPESAT-mtanjrsv126</vpe-id>

-         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>

-         <port-groups>

-            <port-group>

-               <interface-id>slcp1476vbc.vpe</interface-id>

-               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>

-               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>

-               <interface-role>Internet</interface-role>

-               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>

-               <resource-version>0000020</resource-version>

-               <switch-name>dvs-slcp1-01</switch-name>

-               <orchestration-status>created</orchestration-status>

-               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>

-               <mso-catalog-key/>

-               <cvlan-tags>

-                  <cvlan-tag-entry>

-                     <cvlan-tag>3012</cvlan-tag>

-                     <resource-version>0000020</resource-version>

-                  </cvlan-tag-entry>

-               </cvlan-tags>

-            </port-group>

-            <port-group>

-               <interface-id>slcp1476vbc.ipag</interface-id>

-               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>

-               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>

-               <interface-role>Customer</interface-role>

-               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>

-               <switch-name>dvs-slcp1-01</switch-name>

-               <resource-version>0000020</resource-version>

-               <orchestration-status>created</orchestration-status>

-               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>

-               <mso-catalog-key/>

-               <cvlan-tags>

-                  <cvlan-tag-entry>

-                     <cvlan-tag>2003</cvlan-tag>

-                     <resource-version>0000020</resource-version>

-                  </cvlan-tag-entry>

-               </cvlan-tags>

-            </port-group>

-         </port-groups>

-         <relationship-list>

-            <relationship>

-               <related-to>service-instance</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>

-               <relationship-data>

-                  <relationship-key>service-instance.service-instance-id</relationship-key>

-                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>service-subscription.service-type</relationship-key>

-                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>customer.global-customer-id</relationship-key>

-                  <relationship-value>011216-1602-SDNC001</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>vserver</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>

-               <relationship-data>

-                  <relationship-key>vserver.vserver-id</relationship-key>

-                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>complex</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>

-               <relationship-data>

-                  <relationship-key>complex.physical-location-id</relationship-key>

-                  <relationship-value>MDTWNJ21A4</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>availability-zone</related-to>

-               <related-link>https://aai-ext1.test..com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>

-               <relationship-data>

-                  <relationship-key>availability-zone.availability-zone-name</relationship-key>

-                  <relationship-value>slcp1-esx-az01</relationship-value>

-               </relationship-data>

-            </relationship>

-         </relationship-list>

+<vce xmlns="http://com.aai.inventory">
+         <vnf-id>1936628a-d22f-4943-8587-a57bab2ece7a</vnf-id>
+         <vnf-name>testVnfName123</vnf-name>
+         <vnf-name2>US0112SLCP1VBRT076</vnf-name2>
+         <vnf-type>esx-vce</vnf-type>
+         <prov-status>NVTPROV</prov-status>
+         <orchestration-status>created</orchestration-status>
+         <heat-stack-id>slcp1476vbc/94a3c72b-94d5-444b-9a1f-647a36c2181d</heat-stack-id>
+         <mso-catalog-key/>
+         <vpe-id>VPESAT-mtanjrsv126</vpe-id>
+         <ipv4-oam-address>135.21.249.160</ipv4-oam-address>
+         <port-groups>
+            <port-group>
+               <interface-id>slcp1476vbc.vpe</interface-id>
+               <neutron-network-id>e7568706-a2a9-45f8-aef8-95a0e2910953</neutron-network-id>
+               <neutron-network-name>dvspg-VCE_VPE-slcp1476vbc</neutron-network-name>
+               <interface-role>Internet</interface-role>
+               <port-group-name>dvspg-VCE_VPE-slcp1476vbc</port-group-name>
+               <switch-name>dvs-slcp1-01</switch-name>
+               <orchestration-status>created</orchestration-status>
+               <heat-stack-id>dvspg-VCE_VPE-slcp1476vbc/c1299f74-da35-4228-b1e0-d2fd07176196</heat-stack-id>
+               <mso-catalog-key/>
+               <cvlan-tags>
+                  <cvlan-tag-entry>
+                     <cvlan-tag>3012</cvlan-tag>
+                  </cvlan-tag-entry>
+               </cvlan-tags>
+            </port-group>
+            <port-group>
+               <interface-id>slcp1476vbc.ipag</interface-id>
+               <neutron-network-id>3477ddb6-b925-4971-ab62-c84b69634c49</neutron-network-id>
+               <neutron-network-name>dvspg-IPAG_VCE-slcp1476vbc</neutron-network-name>
+               <interface-role>Customer</interface-role>
+               <port-group-name>dvspg-IPAG_VCE-slcp1476vbc</port-group-name>
+               <switch-name>dvs-slcp1-01</switch-name>
+               <orchestration-status>created</orchestration-status>
+               <heat-stack-id>dvspg-IPAG_VCE-slcp1476vbc/1e9c033a-2eef-47f5-9d48-98e0b59538e7</heat-stack-id>
+               <mso-catalog-key/>
+               <cvlan-tags>
+                  <cvlan-tag-entry>
+                     <cvlan-tag>2003</cvlan-tag>
+                  </cvlan-tag-entry>
+               </cvlan-tags>
+            </port-group>
+         </port-groups>
+         <relationship-list>
+            <relationship>
+               <related-to>service-instance</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/v2/business/customers/customer/011216-1602-SDNC001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/SDNC%2FVLXM%2F0112001%2F%2FSW_INTERNET/</related-link>
+               <relationship-data>
+                  <relationship-key>service-instance.service-instance-id</relationship-key>
+                  <relationship-value>SDNC/VLXM/0112001//SW_INTERNET</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>service-subscription.service-type</relationship-key>
+                  <relationship-value>SDN-ETHERNET-INTERNET</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>customer.global-customer-id</relationship-key>
+                  <relationship-value>011216-1602-SDNC001</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>vserver</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/servers/v2/3d5f3fe23821416fac2b69af65248c74/vservers/ecab47d5-3450-4507-ada9-2b3c58485c51/</related-link>
+               <relationship-data>
+                  <relationship-key>vserver.vserver-id</relationship-key>
+                  <relationship-value>ecab47d5-3450-4507-ada9-2b3c58485c51</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>3d5f3fe23821416fac2b69af65248c74</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>complex</related-to>
+               <related-link>https://aai-ext1.test.com:8443/aai/v2/cloud-infrastructure/complexes/complex/MDTWNJ21A4/</related-link>
+               <relationship-data>
+                  <relationship-key>complex.physical-location-id</relationship-key>
+                  <relationship-value>MDTWNJ21A4</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>availability-zone</related-to>
+               <related-link>https://aai-ext1.test..com:8443/aai/v2/cloud-infrastructure/availability-zones/availability-zone/slcp1-esx-az01/</related-link>
+               <relationship-data>
+                  <relationship-key>availability-zone.availability-zone-name</relationship-key>
+                  <relationship-value>slcp1-esx-az01</relationship-value>
+               </relationship-data>
+            </relationship>
+         </relationship-list>
       </vce>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json
new file mode 100644
index 0000000000..83a5478668
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterRestV1/sdnc_request.json
@@ -0,0 +1,21 @@
+{
+  "SDNCServiceRequest": {
+    "requestInformation": {
+      "requestId":  "0d883b7f-dd34-4e1b-9ed5-341d33052360",
+      "source":  "MSO",
+      "notificationUrl":  "null"
+    },
+    "serviceInformation": {
+      "serviceType":  "vRRaaS",
+      "serviceInstanceId":  "5dad9aac-6e05-4bdb-a8ec-4f3cd718c5c6",
+      "subscriberName":  "MSO-MUX-User",
+      "subscriberGlobalId":  "MSO-MUX-User"
+    },
+    "bpNotificationUrl":  "http://localhost:18080/mso/WorkflowMessage/SDNCAResponse/0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479",
+    "sdncRequestId":  "0d883b7f-dd34-4e1b-9ed5-341d33052360-1511808197479",
+    "sdncService":  "infra",
+    "sdncOperation":  "service-topology-infra-assign-operation",
+    "sdncServiceDataType":  "XML",
+    "sdncServiceData":  "<infra-assign-information> <vnf-host-name>vRR-Internal-Network-L2</vnf-host-name> <aic-clli>MTJWNJA4LCP</aic-clli> <cloud-region-id>RegionOne</cloud-region-id> <tenant>22eb191dd41a4f3c9be370fc638322f4</tenant> <vnf-id>6d2e2469-8708-47c3-a0d4-73fa28a8a50b</vnf-id> <vnf-license-information> <vnf-license-details> <service-provider-part-number>no</service-provider-part-number> </vnf-license-details> </vnf-license-information> <service-ecomp-model-information> <model-invariant-uuid>d6c7c582-cf7f-4542-a19e-5fa7e7d89bf2</model-invariant-uuid> <model-version>1.0</model-version> <model-name>vRR_AIC30_1702-0505-SRVS</model-name> <model-uuid>5add3a0f-5379-4800-b87a-430ff45f8793</model-uuid> </service-ecomp-model-information> <vnf-ecomp-model-information> <model-invariant-uuid>532ff79f-fbe8-4c88-aecf-4fe885b93b47</model-invariant-uuid> <vnf-model-customization-uuid>87056771-4d7c-47d0-b5df-6cf02e227458</vnf-model-customization-uuid> <model-version>1.0</model-version> <model-name>vRR_AIC30_1702-0505-VSP</model-name> <model-uuid>978ac869-b506-41d0-9125-9d0e95097c29</model-uuid> </vnf-ecomp-model-information> <vf-module-ecomp-model-information> <model-invariant-uuid>4e5868c5-8321-492b-882f-e4476c878746</model-invariant-uuid> <vf-module-model-customization-uuid-list> <vf-module-model-customization-uuid>2badc305-b2c0-4e2b-b03a-4e5d22079b30</vf-module-model-customization-uuid> </vf-module-model-customization-uuid-list> <vf-module-model-customization-uuid-list> <vf-module-model-customization-uuid>2badc305-b2c0-4e2b-b03a-4e5d22079b31</vf-module-model-customization-uuid> </vf-module-model-customization-uuid-list> <model-uuid>e1b1819f-a9d1-4c27-b419-d98a2500fc47</model-uuid> <model-version>1</model-version> <model-name>Vrr_Internal_Networks_module-1</model-name> </vf-module-ecomp-model-information> </infra-assign-information>"
+  }
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml
index f71f529593..8cbcce138f 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1/sdncadapterworkflowrequest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"
-	xmlns:v11="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/so/workflow/schema/v1"
+	xmlns:v11="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header/>
 	<soapenv:Body>
 		<v1:SDNCAdapterWorkflowRequest>
@@ -13,7 +13,7 @@
 			</v11:RequestHeader>
 			<v1:SDNCRequestData>
 				<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd" contentType="text/xml">
-					<tag0:service-request xmlns:tag0="http://org.openecomp/mso/request/details/schema/v1">
+					<tag0:service-request xmlns:tag0="http://org.onap/so/request/details/schema/v1">
 						<tag0:request-information>
 							<tag0:request-id>12570a36-7388-4c0a-bec4-189ce3kg9956</tag0:request-id>
 							<tag0:request-action>GetLayer3ServiceDetailsRequest</tag0:request-action>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
index 3d1e03916d..1d707a6cc5 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDN-ETHERNET-INTERNET/SDNCAdapterV1mock/sdncadaptercallbackrequest.xml
@@ -1,350 +1,350 @@
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-	<soapenv:Header />

-	<soapenv:Body>

-		<v1:SDNCAdapterCallback>

-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-    <CallbackHeader>

-        <RequestId>testRequestId</RequestId>

-        <ResponseCode>200</ResponseCode>

-        <ResponseMessage>OK</ResponseMessage>

-    </CallbackHeader>

-    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;

-					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-					&lt;service-status&gt;

-						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;

-						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;

-						&lt;request-status&gt;synccomplete&lt;/request-status&gt;

-						&lt;final-indicator&gt;N&lt;/final-indicator&gt;

-						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;

-						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;

-						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;

-					&lt;/service-status&gt;

-					&lt;service-data&gt;

-						&lt;internet-evc-access-information&gt;

-							&lt;ip-version&gt;ds&lt;/ip-version&gt;

-							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;

-						&lt;/internet-evc-access-information&gt;

-						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;

-							&lt;vr-lan-interface&gt;

-								&lt;static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-								&lt;/static-routes&gt;

-								&lt;dhcp&gt;

-									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;

-									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;

-									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;									

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;									

-								&lt;/dhcp&gt;

-								&lt;firewall-lite&gt;

-									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;

-									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-								&lt;/firewall-lite&gt;

-								&lt;pat&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-								&lt;/pat&gt;

-								&lt;nat&gt;

-								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								&lt;/nat&gt;

-								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;

-								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;

-								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;

-								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;

-								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;

-								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;

-								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;

-								&lt;v4-public-lan-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-								&lt;/v4-public-lan-prefixes&gt;

-								&lt;v6-public-lan-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-								&lt;/v6-public-lan-prefixes&gt;

-							&lt;/vr-lan-interface&gt;

-							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;

-						&lt;/vr-lan&gt;

-&lt;ucpe-vms-service-information&gt;				

- &lt;transport-service-information&gt;

-    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;	

- &lt;/transport-service-information&gt;

- &lt;ucpe-information&gt;

-    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;

-    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;

-    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;

-  &lt;/ucpe-information&gt;

-  &lt;vnf-list&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;1&lt;/vnf-id&gt;

-		&lt;prov-status&gt;1&lt;/prov-status&gt;

-		&lt;operational-state&gt;1&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;1&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;2&lt;/vnf-id&gt;

-		&lt;prov-status&gt;2&lt;/prov-status&gt;

-		&lt;operational-state&gt;2&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;2&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;					

-  &lt;/vnf-list&gt;

- &lt;/ucpe-vms-service-information&gt;										

-						&lt;request-information&gt;

-							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;

-							&lt;order-number&gt;4281555&lt;/order-number&gt;

-							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;

-							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;

-							&lt;source&gt;OMX&lt;/source&gt;

-							&lt;order-version&gt;1&lt;/order-version&gt;

-						&lt;/request-information&gt;

-						&lt;sdnc-request-header&gt;

-							&lt;svc-action&gt;activate&lt;/svc-action&gt;

-							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;

-							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;

-						&lt;/sdnc-request-header&gt;

-						&lt;l2-homing-information&gt;

-							&lt;topology&gt;MultiPoint&lt;/topology&gt;

-							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;

-							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;

-						&lt;/l2-homing-information&gt;

-						&lt;service-information&gt;

-							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-							&lt;subscriber-name&gt;ST E2E Test42855_1300004281555&lt;/subscriber-name&gt;

-							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;

-						&lt;/service-information&gt;

-						&lt;internet-service-change-details&gt;

-							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;2&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-						&lt;/internet-service-change-details&gt;

-					&lt;/service-data&gt;

-				&lt;/layer3-service-list&gt;

-</RequestData>

-</SDNCAdapterCallbackRequest>

-</v1:SDNCAdapterCallback>

-</soapenv:Body>

+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
+	<soapenv:Header />
+	<soapenv:Body>
+		<v1:SDNCAdapterCallback>
+<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
+    <CallbackHeader>
+        <RequestId>testRequestId</RequestId>
+        <ResponseCode>200</ResponseCode>
+        <ResponseMessage>OK</ResponseMessage>
+    </CallbackHeader>
+    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;
+					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+					&lt;service-status&gt;
+						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;
+						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;
+						&lt;request-status&gt;synccomplete&lt;/request-status&gt;
+						&lt;final-indicator&gt;N&lt;/final-indicator&gt;
+						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;
+						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;
+						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;
+					&lt;/service-status&gt;
+					&lt;service-data&gt;
+						&lt;internet-evc-access-information&gt;
+							&lt;ip-version&gt;ds&lt;/ip-version&gt;
+							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;
+						&lt;/internet-evc-access-information&gt;
+						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;
+							&lt;vr-lan-interface&gt;
+								&lt;static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+								&lt;/static-routes&gt;
+								&lt;dhcp&gt;
+									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;
+									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;
+									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;									
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;									
+								&lt;/dhcp&gt;
+								&lt;firewall-lite&gt;
+									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;
+									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+								&lt;/firewall-lite&gt;
+								&lt;pat&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+								&lt;/pat&gt;
+								&lt;nat&gt;
+								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								&lt;/nat&gt;
+								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;
+								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;
+								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;
+								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;
+								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;
+								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;
+								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;
+								&lt;v4-public-lan-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+								&lt;/v4-public-lan-prefixes&gt;
+								&lt;v6-public-lan-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+								&lt;/v6-public-lan-prefixes&gt;
+							&lt;/vr-lan-interface&gt;
+							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;
+						&lt;/vr-lan&gt;
+&lt;ucpe-vms-service-information&gt;				
+ &lt;transport-service-information&gt;
+    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;	
+ &lt;/transport-service-information&gt;
+ &lt;ucpe-information&gt;
+    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;
+    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;
+    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;
+  &lt;/ucpe-information&gt;
+  &lt;vnf-list&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;1&lt;/vnf-id&gt;
+		&lt;prov-status&gt;1&lt;/prov-status&gt;
+		&lt;operational-state&gt;1&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;1&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;2&lt;/vnf-id&gt;
+		&lt;prov-status&gt;2&lt;/prov-status&gt;
+		&lt;operational-state&gt;2&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;2&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;					
+  &lt;/vnf-list&gt;
+ &lt;/ucpe-vms-service-information&gt;										
+						&lt;request-information&gt;
+							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;
+							&lt;order-number&gt;4281555&lt;/order-number&gt;
+							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;
+							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;
+							&lt;source&gt;OMX&lt;/source&gt;
+							&lt;order-version&gt;1&lt;/order-version&gt;
+						&lt;/request-information&gt;
+						&lt;sdnc-request-header&gt;
+							&lt;svc-action&gt;activate&lt;/svc-action&gt;
+							&lt;svc-notification-url&gt;https://localhost:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;
+							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;
+						&lt;/sdnc-request-header&gt;
+						&lt;l2-homing-information&gt;
+							&lt;topology&gt;MultiPoint&lt;/topology&gt;
+							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;
+							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;
+						&lt;/l2-homing-information&gt;
+						&lt;service-information&gt;
+							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+							&lt;subscriber-name&gt;ST E2E Test42855_1300004281555&lt;/subscriber-name&gt;
+							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;
+						&lt;/service-information&gt;
+						&lt;internet-service-change-details&gt;
+							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;2&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+						&lt;/internet-service-change-details&gt;
+					&lt;/service-data&gt;
+				&lt;/layer3-service-list&gt;
+</RequestData>
+</SDNCAdapterCallbackRequest>
+</v1:SDNCAdapterCallback>
+</soapenv:Body>
 </soapenv:Envelope>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDNCAdapterRestV2Request.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDNCAdapterRestV2Request.json
index 68af27db9f..ccb9587d04 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/SDNCAdapterRestV2Request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SDNCAdapterRestV2Request.json
@@ -1,21 +1,21 @@
-{

-  "SDNCServiceRequest": {

-    "bpNotificationUrl": "http://localhost:28080/mso/WorkflowMesssage/SDNCAResponse/a4383a52-b9de-4bc4-bedf-02f3f9466535-1510232328526",

-    "sdncRequestId": "a4383a52-b9de-4bc4-bedf-02f3f9466535-1510232328526",

-    "requestInformation": {

-    "requestId": "a4383a52-b9de-4bc4-bedf-02f3f9466535",

-    "source": "CCD",

-    "notificationUrl": "http://localhost:28090/CCD/StatusNotification"

-  },

-  "serviceInformation": {

-    "serviceType": "vWanX",

-    "serviceInstanceId": "fd8bcdbb-b799-43ce-a7ff-ed8f2965a3b5",

-    "subscriberName": "Monster Joe's Truck & Tow",

-    "subscriberGlobalId": "8310000058863"

-  },

-  "sdncService": "ucpe-vnf",

-    "sdncOperation": "service-topology-cust-assign-operation",

-    "sdncServiceDataType": "XML",

-    "sdncServiceData": "<ucpe-vnf-assign-service-information><access-circuit-information><access-circuit-id>BT/SLIR/70901</access-circuit-id></access-circuit-information><access-circuit-information><access-circuit-id>AS/KRFN/34601</access-circuit-id></access-circuit-information><vnf-information><vnf-host-name>USOSTCDALTX0101VFWX01</vnf-host-name><ucpe-host-name>USOSTCDALTX0101UJZZ11</ucpe-host-name><vnf-type>WX</vnf-type><vnf-att-part-number>WX-VM00*</vnf-att-part-number><vnf-version-number>1.0.2</vnf-version-number><vnf-management-option>ATT</vnf-management-option><vnf-alternative-ownership>ATT-VENDOR-OWNED</vnf-alternative-ownership></vnf-information></ucpe-vnf-assign-service-information>"

-  }

+{
+  "SDNCServiceRequest": {
+    "bpNotificationUrl": "http://localhost:28080/mso/WorkflowMesssage/SDNCAResponse/a4383a52-b9de-4bc4-bedf-02f3f9466535-1510232328526",
+    "sdncRequestId": "a4383a52-b9de-4bc4-bedf-02f3f9466535-1510232328526",
+    "requestInformation": {
+    "requestId": "a4383a52-b9de-4bc4-bedf-02f3f9466535",
+    "source": "CCD",
+    "notificationUrl": "http://localhost:28090/CCD/StatusNotification"
+  },
+  "serviceInformation": {
+    "serviceType": "vWanX",
+    "serviceInstanceId": "fd8bcdbb-b799-43ce-a7ff-ed8f2965a3b5",
+    "subscriberName": "Monster Joe's Truck & Tow",
+    "subscriberGlobalId": "8310000058863"
+  },
+  "sdncService": "ucpe-vnf",
+    "sdncOperation": "service-topology-cust-assign-operation",
+    "sdncServiceDataType": "XML",
+    "sdncServiceData": "<ucpe-vnf-assign-service-information><access-circuit-information><access-circuit-id>BT/SLIR/70901</access-circuit-id></access-circuit-information><access-circuit-information><access-circuit-id>AS/KRFN/34601</access-circuit-id></access-circuit-information><vnf-information><vnf-host-name>USOSTCDALTX0101VFWX01</vnf-host-name><ucpe-host-name>USOSTCDALTX0101UJZZ11</ucpe-host-name><vnf-type>WX</vnf-type><vnf-att-part-number>WX-VM00*</vnf-att-part-number><vnf-version-number>1.0.2</vnf-version-number><vnf-management-option>ATT</vnf-management-option><vnf-alternative-ownership>ATT-VENDOR-OWNED</vnf-alternative-ownership></vnf-information></ucpe-vnf-assign-service-information>"
+  }
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Schemas/CreateServiceInstanceV3Schema.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/Schemas/CreateServiceInstanceV3Schema.json
new file mode 100644
index 0000000000..36b51e9575
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Schemas/CreateServiceInstanceV3Schema.json
@@ -0,0 +1,16 @@
+{
+	"CreateServiceInstanceV3": {
+		"serviceInstance": {
+			"@class": "inventory.aai.onap.org.v12.ServiceInstance"
+		},
+		"project": {
+			"@class": "inventory.aai.onap.org.v12.Project"
+		},
+		"owningEntity": {
+			"@class": "inventory.aai.onap.org.v12.OwningEntity"
+		},
+		"customer": {
+			"@class": "inventory.aai.onap.org.v12.Customer"
+		}
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/SetupServiceDecompJson.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/SetupServiceDecompJson.json
new file mode 100644
index 0000000000..a6efe9663f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/SetupServiceDecompJson.json
@@ -0,0 +1,36 @@
+{
+	"requestDetails": {
+		"serviceInstance": {
+			"serviceInstanceId": "MSORefactorTest2",
+			"serviceInstanceName": "bensServiceInstance2",
+			"serviceType": "MSO-dev-service-type",
+			"serviceRole": "abc",
+			"modelInvariantUuid": "9647dfc4-2083-11e7-93ae-92361f002671",
+			"modelUuid": "5df8b6de-2083-11e7-93ae-92361f002671",
+			"modelVersion": "1.0",
+			"modelName": "MSOTADevInfra_vSAMP10a_Service",
+			"environmentContext": "Luna",
+			"workloadContext": "Oxygen",
+			"orchestrationStatus": "ACTIVE"
+		},
+		"project": {
+			"projectName": "MSORefactorTest1234"
+		},
+		"owningEntity": {
+			"owningEntityId": "MSORefactorTestId1234",
+			"owningEntityName": "MSORefactorTest1234"
+		},
+		"customer": {
+			"subscriptionServiceType": "MSO-dev-service-type",
+			"globalSubscriberId": "MSO_1610_dev"
+		},
+		"request": {
+			"sdncRequestId": "736c7370-640b-4f7a-975d-320f73340dd3",
+			"callbackURL": "abc",
+			"requestId": "223c2e74-a23a-4ab8-bddb-2c2431dcb67f",
+			"productFamilyId": "abc",
+			"callbackUrl": "http://localhost:8080/adapters/rest/SDNCNotify",
+			"serviceId": "123"
+		}
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/StandardSDNCSynchResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/StandardSDNCSynchResponse.xml
index 919ff2c36b..77528ccf61 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/StandardSDNCSynchResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/StandardSDNCSynchResponse.xml
@@ -1,5 +1,5 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
   <soap:Body>
-    <SDNCAdapterResponse xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"/>
+    <SDNCAdapterResponse xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1"/>
   </soap:Body>
 </soap:Envelope>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml
index 07730e2df9..02996a13ea 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_500.xml
@@ -42,14 +42,14 @@
 				org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
 				org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
 				javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
-				org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
+				org.onap.so.logger.LogFilter.doFilter(LogFilter.java:35)
 			</pre>
 		</p>
 		<p>
 			<b>JBWEB000071: root cause</b>
 			<pre>java.lang.NullPointerException
-				org.openecomp.mso.adapters.network.NetworkAdapterRest$CreateNetworkVolumesTask.run(NetworkAdapterRest.java:128)
-				org.openecomp.mso.adapters.network.NetworkAdapterRest.createNetwork(NetworkAdapterRest.java:64)
+				org.onap.so.adapters.network.NetworkAdapterRest$CreateNetworkVolumesTask.run(NetworkAdapterRest.java:128)
+				org.onap.so.adapters.network.NetworkAdapterRest.createNetwork(NetworkAdapterRest.java:64)
 				sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 				sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
 				sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -65,7 +65,7 @@
 				org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)
 				org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:50)
 				javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
-				org.openecomp.mso.logger.LogFilter.doFilter(LogFilter.java:35)
+				org.onap.so.logger.LogFilter.doFilter(LogFilter.java:35)
 			</pre>
 		</p>
 		<p>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml
index 7a00744103..0faec794b0 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetworkResponse_Success.xml
@@ -1,4 +1,4 @@
-<ns2:updateNetworkContrailResponse xmlns:ns2="http://org.openecomp.mso/network"
+<ns2:updateNetworkContrailResponse xmlns:ns2="http://org.onap.so/network"
                                     xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
    <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>
    <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
index 09f01fb7ca..ca5145c226 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryInstance_Success.xml
@@ -1,4 +1,4 @@
-<result-data>

-  <resource-type>service-instance</resource-type>

-  <resource-link>https://aai-conexus-e2e.test.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>

+<result-data>
+  <resource-type>service-instance</resource-type>
+  <resource-link>https://aai-conexus-e2e.test.com:8443/aai/v8/business/customers/customer/8310000058863/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/f70e927b-6087-4974-9ef8-c5e4d5847ca4</resource-link>
 </result-data>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
index 196558633b..99ea5bace6 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<l3-network xmlns="http://com.aai.inventory/v8">

-         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-role>dmz_direct</network-role>

-         <network-technology>contrail</network-technology>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <network-role-instance>0</network-role-instance>

-         <orchestration-status>pending-create</orchestration-status>

-   		 <physical-network-name>networkName</physical-network-name>

-   		 <is-provider-network>false</is-provider-network>

-   		 <is-shared-network>true</is-shared-network>

-   	 	 <is-external-network>false</is-external-network>         

-         <subnets>

-            <subnet>

-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-               <gateway-address>107.239.52.1</gateway-address>

-               <network-start-address>107.239.52.0</network-start-address>

-               <cidr-mask>24</cidr-mask>

-               <ip-version>4</ip-version>

-               <orchestration-status>pending-create</orchestration-status>

-               <dhcp-enabled>true</dhcp-enabled>

-   	  		   <subnet-name>subnetName</subnet-name>

-               <relationship-list/>

-            </subnet>

-         </subnets>

-	  	 <segmentation-assignments>

-	  		<segmentation-id>413</segmentation-id>

-	  		<resource-version>4132176</resource-version>

-	  	 </segmentation-assignments>         

-         <relationship-list>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-				<related-to>network-policy</related-to>

-				<related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>

-				<relationship-data>

-					<relationship-key>network-policy.network-policy-id</relationship-key>

-					<relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>

-				</relationship-data>

-			</relationship>

-			<relationship>

-			   <related-to>route-table-reference</related-to>

-			   <relationship-data>

-				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-			   </relationship-data>

-			</relationship>			

-         </relationship-list>

-</l3-network>

+<?xml version="1.0" encoding="UTF-8"?>
+<l3-network xmlns="http://com.aai.inventory/v8">
+         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>
+         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
+         <network-type>CONTRAIL_EXTERNAL</network-type>
+         <network-role>dmz_direct</network-role>
+         <network-technology>contrail</network-technology>
+         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+         <network-role-instance>0</network-role-instance>
+         <orchestration-status>pending-create</orchestration-status>
+   		 <physical-network-name>networkName</physical-network-name>
+   		 <is-provider-network>false</is-provider-network>
+   		 <is-shared-network>true</is-shared-network>
+   	 	 <is-external-network>false</is-external-network>         
+         <subnets>
+            <subnet>
+               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>
+               <gateway-address>107.239.52.1</gateway-address>
+               <network-start-address>107.239.52.0</network-start-address>
+               <cidr-mask>24</cidr-mask>
+               <ip-version>4</ip-version>
+               <orchestration-status>pending-create</orchestration-status>
+               <dhcp-enabled>true</dhcp-enabled>
+   	  		   <subnet-name>subnetName</subnet-name>
+               <relationship-list/>
+            </subnet>
+         </subnets>
+	  	 <segmentation-assignments>
+	  		<segmentation-id>413</segmentation-id>
+	  		<resource-version>4132176</resource-version>
+	  	 </segmentation-assignments>         
+         <relationship-list>
+            <relationship>
+               <related-to>vpn-binding</related-to>
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>
+               <relationship-data>
+                  <relationship-key>vpn-binding.vpn-id</relationship-key>
+                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>vpn-binding</related-to>
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>
+               <relationship-data>
+                  <relationship-key>vpn-binding.vpn-id</relationship-key>
+                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+               <related-to>tenant</related-to>
+               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>
+               </relationship-data>
+            </relationship>
+            <relationship>
+				<related-to>network-policy</related-to>
+				<related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>
+				<relationship-data>
+					<relationship-key>network-policy.network-policy-id</relationship-key>
+					<relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>
+				</relationship-data>
+			</relationship>
+			<relationship>
+			   <related-to>route-table-reference</related-to>
+			   <relationship-data>
+				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>
+				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>
+			   </relationship-data>
+			</relationship>			
+         </relationship-list>
+</l3-network>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
index 48f652cc0e..886c9b4ce2 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml
@@ -1,20 +1,20 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID"

-                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <route-table-references xmlns="http://com.aai.inventory/v8">

-         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>

-         <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>

-         <resource-version>12345</resource-version>

-      </route-table-references>

-   </rest:payload>

+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+                   statusCode="200">
+   <rest:headers>
+      <rest:header name="Transfer-Encoding" value="chunked"/>
+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
+      <rest:header name="X-AAI-TXID"
+                   value="localhost-20160314-20:53:33:487-134392"/>
+      <rest:header name="Content-Type" value="application/xml"/>
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>
+      <rest:header name="Cache-Control" value="private"/>
+   </rest:headers>
+   <rest:payload contentType="text/xml">
+      <route-table-references xmlns="http://com.aai.inventory/v8">
+         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
+         <route-table-reference-fqdn>refFQDN1</route-table-reference-fqdn>
+         <resource-version>12345</resource-version>
+      </route-table-references>
+   </rest:payload>
 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
index c911d320ec..7509fd8625 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml
@@ -1,20 +1,20 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID"

-                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <route-table-references xmlns="http://com.aai.inventory/v8">

-         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>

-         <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>

-         <resource-version>12345</resource-version>

-      </route-table-references>

-   </rest:payload>

+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+                   statusCode="200">
+   <rest:headers>
+      <rest:header name="Transfer-Encoding" value="chunked"/>
+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
+      <rest:header name="X-AAI-TXID"
+                   value="localhost-20160314-20:53:33:487-134392"/>
+      <rest:header name="Content-Type" value="application/xml"/>
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>
+      <rest:header name="Cache-Control" value="private"/>
+   </rest:headers>
+   <rest:payload contentType="text/xml">
+      <route-table-references xmlns="http://com.aai.inventory/v8">
+         <route-table-reference-id>5938baec-03ca-2bd5-a3f1-d54x123e253a</route-table-reference-id>
+         <route-table-reference-fqdn>refFQDN2</route-table-reference-fqdn>
+         <resource-version>12345</resource-version>
+      </route-table-references>
+   </rest:payload>
 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySim500Response.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySim500Response.xml
index 2cf94b2ef2..c9ec2f0a9d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySim500Response.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySim500Response.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 	<v1:SDNCAdapterCallback>
-		<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+		<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			<CallbackHeader>
 				<RequestId>testRequestId</RequestId>
 				<ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml
index 40bb93bda0..81e8e2a233 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 		<v1:SDNCAdapterCallback>	
-			<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+			<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 			 <CallbackHeader>
 			   <RequestId>testRequestId</RequestId>
 			   <ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
index d3f9c1eaf3..e2db499929 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/AddNetworkPolicy_AAIResponse_Success.xml
@@ -1,21 +1,21 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID"

-                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <network-policy xmlns="http://com.aai.inventory/v8">

-         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>

-         <network-policy-fqdn>fqdn123</network-policy-fqdn>

-         <heat-stack-id>slowburn</heat-stack-id>

-         <resource-version>145878989</resource-version>

-      </network-policy>

-   </rest:payload>

+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+                   statusCode="200">
+   <rest:headers>
+      <rest:header name="Transfer-Encoding" value="chunked"/>
+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
+      <rest:header name="X-AAI-TXID"
+                   value="localhost-20160314-20:53:33:487-134392"/>
+      <rest:header name="Content-Type" value="application/xml"/>
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>
+      <rest:header name="Cache-Control" value="private"/>
+   </rest:headers>
+   <rest:payload contentType="text/xml">
+      <network-policy xmlns="http://com.aai.inventory/v8">
+         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
+         <network-policy-fqdn>fqdn123</network-policy-fqdn>
+         <heat-stack-id>slowburn</heat-stack-id>
+         <resource-version>145878989</resource-version>
+      </network-policy>
+   </rest:payload>
 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml
index d041565ac7..5232e530e9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/DoUpdateVfModuleRequest.xml
@@ -1,4 +1,4 @@
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+<vnf-request xmlns="http://org.onap/so/infra/vnf-request/v1">
 	<request-info>
 		<request-id>DEV-VF-0011</request-id>
 		<action>UPDATE_VF_MODULE</action>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
index c159e2eae2..c86a4aaa73 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
@@ -1,38 +1,38 @@
-<generic-vnf xmlns="http://com.aai.inventory/v7">

-	<vnf-id>skask</vnf-id>

-	<vnf-name>STMTN5MMSC20</vnf-name>

-	<vnf-type>pcrf-capacity</vnf-type>

-	<service-id>SDN-MOBILITY</service-id>

-	<equipment-role>vPCRF</equipment-role>

-	<orchestration-status>pending-create</orchestration-status>

-	<in-maint>false</in-maint>

-	<is-closed-loop-disabled>false</is-closed-loop-disabled>

-	<persona-model-id>introvert</persona-model-id>

-	<persona-model-version>2.0</persona-model-version>

-	<resource-version>0000020</resource-version>

-	<vf-modules>

-		<vf-module>

-			<vf-module-id>lukewarm</vf-module-id>

-			<vf-module-name>PCRF::module-0-0</vf-module-name>

-			<persona-model-id>introvert</persona-model-id>

-			<persona-model-version>2.0</persona-model-version>

-			<is-base-vf-module>true</is-base-vf-module>

-			<heat-stack-id>fastburn</heat-stack-id>

-			<orchestration-status>pending-create</orchestration-status>

-			<resource-version>0000074</resource-version>

-		</vf-module>

-		<vf-module>

-			<vf-module-id>supercool</vf-module-id>

-			<vf-module-name>PCRF::module-1-0</vf-module-name>

-			<persona-model-id>extrovert</persona-model-id>

-			<persona-model-version>2.0</persona-model-version>

-			<is-base-vf-module>false</is-base-vf-module>

-			<heat-stack-id>slowburn</heat-stack-id>

-			<orchestration-status>pending-create</orchestration-status>

-			<resource-version>0000075</resource-version>

-		</vf-module>

-	</vf-modules>

-	<relationship-list/>

-	<l-interfaces/>

-	<lag-interfaces/>

-</generic-vnf>

+<generic-vnf xmlns="http://com.aai.inventory/v7">
+	<vnf-id>skask</vnf-id>
+	<vnf-name>STMTN5MMSC20</vnf-name>
+	<vnf-type>pcrf-capacity</vnf-type>
+	<service-id>SDN-MOBILITY</service-id>
+	<equipment-role>vPCRF</equipment-role>
+	<orchestration-status>pending-create</orchestration-status>
+	<in-maint>false</in-maint>
+	<is-closed-loop-disabled>false</is-closed-loop-disabled>
+	<persona-model-id>introvert</persona-model-id>
+	<persona-model-version>2.0</persona-model-version>
+	<resource-version>0000020</resource-version>
+	<vf-modules>
+		<vf-module>
+			<vf-module-id>lukewarm</vf-module-id>
+			<vf-module-name>PCRF::module-0-0</vf-module-name>
+			<persona-model-id>introvert</persona-model-id>
+			<persona-model-version>2.0</persona-model-version>
+			<is-base-vf-module>true</is-base-vf-module>
+			<heat-stack-id>fastburn</heat-stack-id>
+			<orchestration-status>pending-create</orchestration-status>
+			<resource-version>0000074</resource-version>
+		</vf-module>
+		<vf-module>
+			<vf-module-id>supercool</vf-module-id>
+			<vf-module-name>PCRF::module-1-0</vf-module-name>
+			<persona-model-id>extrovert</persona-model-id>
+			<persona-model-version>2.0</persona-model-version>
+			<is-base-vf-module>false</is-base-vf-module>
+			<heat-stack-id>slowburn</heat-stack-id>
+			<orchestration-status>pending-create</orchestration-status>
+			<resource-version>0000075</resource-version>
+		</vf-module>
+	</vf-modules>
+	<relationship-list/>
+	<l-interfaces/>
+	<lag-interfaces/>
+</generic-vnf>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
index 94e00427a2..f40b6bc991 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml
@@ -1,21 +1,21 @@
-<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID"

-                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <network-policy xmlns="http://com.aai.inventory/v8">

-         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>

-         <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>

-         <heat-stack-id>195159195</heat-stack-id>

-         <resource-version>14567890</resource-version>

-      </network-policy>

-   </rest:payload>

+<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"
+                   statusCode="200">
+   <rest:headers>
+      <rest:header name="Transfer-Encoding" value="chunked"/>
+      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>
+      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>
+      <rest:header name="X-AAI-TXID"
+                   value="localhost-20160314-20:53:33:487-134392"/>
+      <rest:header name="Content-Type" value="application/xml"/>
+      <rest:header name="Server" value="Apache-Coyote/1.1"/>
+      <rest:header name="Cache-Control" value="private"/>
+   </rest:headers>
+   <rest:payload contentType="text/xml">
+      <network-policy xmlns="http://com.aai.inventory/v8">
+         <network-policy-id>9a7b327d9-287aa00-82c4b0-105757</network-policy-id>
+         <network-policy-fqdn>GN_EVPN_Test</network-policy-fqdn>
+         <heat-stack-id>195159195</heat-stack-id>
+         <resource-version>14567890</resource-version>
+      </network-policy>
+   </rest:payload>
 </rest:RESTResponse>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
index 7c67095af1..dbd55b0cf4 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
@@ -1,315 +1,315 @@
-<output xmlns="com:att:sdnctl:vnf">

-<vnf-list xmlns="com:att:sdnctl:vnf">

-	<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

-	<service-data>

-		<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

-		<sdnc-request-header>

-			<svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>

-			<svc-action>assign</svc-action>

-			<svc-notification-url>https://msojra.infra.aic.net:8443/adapters/rest/SDNCNotify</svc-notification-url>

-		</sdnc-request-header>

-		<service-information>

-			<subscriber-name>notsurewecare</subscriber-name>

-			<service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>

-			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

-			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		</service-information>

-		<oper-status>

-			<order-status>PendingCreate</order-status>

-		</oper-status>

-		<vnf-request-information>

-			<aic-cloud-region>VNN1CA52LCP</aic-cloud-region>

-			<vnf-name>ZVNNMOGX01_base</vnf-name>

-			<generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>

-			<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

-			<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

-			<tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>

-			<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

-			<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

-		</vnf-request-information>

-		<vnf-topology-information>

-			<vnf-assignments>

-				<vnf-networks>

-					<network-role>mog_exn</network-role>

-					<network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>

-					<sriov-vlan-filter-list>

-						<sriov-vlan-filter>filter1</sriov-vlan-filter>

-					</sriov-vlan-filter-list>

-					<sriov-vlan-filter-list>

-						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

-                     </sriov-vlan-filter-list>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>mog_oam</network-role>

-					<network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>mog_cor_B</network-role>

-					<network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>mog_cor_A</network-role>

-					<network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>mog_gn</network-role>

-					<network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>mog_dmz</network-role>

-					<network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>

-					<network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>

-					<contrail-network-fqdn/>

-					<subnet-id/>

-					<neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>

-				</vnf-networks>

-				<availability-zones>

-					<availability-zone>nova</availability-zone>

-				</availability-zones>

-				<vnf-vms>

-					<vm-type>ps</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPS001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPS002</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPS003</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPS004</vm-name>

-					</vm-names>

-					<vm-count>4</vm-count>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.251</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.252</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.253</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.254</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-				</vnf-vms>

-				<vnf-vms>

-					<vm-type>cm</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MCM001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01OAM002</vm-name>

-					</vm-names>

-					<vm-count>1</vm-count>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.249</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.250</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_oam</network-role>

-						<network-ips>

-							<ip-address>107.239.167.250</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.239.167.251</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-				</vnf-vms>

-				<vnf-vms>

-					<vm-type>oam</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01OAM001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01OAM002</vm-name>

-					</vm-names>

-					<vm-count>2</vm-count>

-					<vm-networks>

-						<network-role>mog_oam</network-role>

-						<network-ips>

-							<ip-address>107.239.167.252</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.239.167.251</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.249</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.250</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-				</vnf-vms>

-				<vnf-vms>

-					<vm-type>pd</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPD001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MPD002</vm-name>

-					</vm-names>

-					<vm-count>2</vm-count>

-					<vm-networks>

-						<network-role>mog_dmz</network-role>

-						<network-ips>

-							<ip-address>107.225.25.253</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.225.25.254</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.225.254.253</floating-ip>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_oam</network-role>

-						<network-ips>

-							<ip-address>107.239.167.254</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.239.167.253</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.239.167.249</floating-ip>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_exn</network-role>

-						<network-ips>

-							<ip-address>107.224.46.253</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.46.254</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.224.46.252</floating-ip>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.247</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.248</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.224.41.252</floating-ip>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_gn</network-role>

-						<network-ips>

-							<ip-address>107.224.41.253</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.41.254</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.224.41.252</floating-ip>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_cor_A</network-role>

-						<network-ips>

-							<ip-address>107.224.38.253</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.38.254</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-				</vnf-vms>

-				<vnf-vms>

-					<vm-type>sm</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MSM001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MSM002</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MSM003</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MSM004</vm-name>

-					</vm-names>

-					<vm-count>4</vm-count>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.243</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.244</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.245</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.246</ip-address>

-						</network-ips>

-						<use-dhcp>N</use-dhcp>

-					</vm-networks>

-				</vnf-vms>

-			</vnf-assignments>

-			<vnf-topology-identifier>

-				<vnf-name>ZVNNMOGX01_base</vnf-name>

-				<service-type>SDN-MOBILITY</service-type>

-				<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

-				<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

-				<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

-			</vnf-topology-identifier>

-		</vnf-topology-information>

-		<request-information>

-			<request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>

-			<notification-url/>

-			<source>PORTAL</source>

-			<request-action>VNFActivateRequest</request-action>

-		</request-information>

-	</service-data>

-	<service-status>

-		<response-code>200</response-code>

-		<final-indicator>Y</final-indicator>

-		<request-status>synccomplete</request-status>

-		<response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>

-		<rpc-name>vnf-topology-operation</rpc-name>

-		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

-		<rpc-action>assign</rpc-action>

-	</service-status>

-</vnf-list>

-

-</output>

+<output xmlns="com:att:sdnctl:vnf">
+<vnf-list xmlns="com:att:sdnctl:vnf">
+	<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
+	<service-data>
+		<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
+		<sdnc-request-header>
+			<svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>
+			<svc-action>assign</svc-action>
+			<svc-notification-url>https://localhost:8443/adapters/rest/SDNCNotify</svc-notification-url>
+		</sdnc-request-header>
+		<service-information>
+			<subscriber-name>notsurewecare</subscriber-name>
+			<service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>
+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+		</service-information>
+		<oper-status>
+			<order-status>PendingCreate</order-status>
+		</oper-status>
+		<vnf-request-information>
+			<aic-cloud-region>VNN1CA52LCP</aic-cloud-region>
+			<vnf-name>ZVNNMOGX01_base</vnf-name>
+			<generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>
+			<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
+			<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
+			<tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>
+			<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>
+			<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
+		</vnf-request-information>
+		<vnf-topology-information>
+			<vnf-assignments>
+				<vnf-networks>
+					<network-role>mog_exn</network-role>
+					<network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>
+					<sriov-vlan-filter-list>
+						<sriov-vlan-filter>filter1</sriov-vlan-filter>
+					</sriov-vlan-filter-list>
+					<sriov-vlan-filter-list>
+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         
+                     </sriov-vlan-filter-list>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>mog_oam</network-role>
+					<network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>mog_cor_B</network-role>
+					<network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>mog_cor_A</network-role>
+					<network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>mog_gn</network-role>
+					<network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>mog_dmz</network-role>
+					<network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>
+					<network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>
+					<contrail-network-fqdn/>
+					<subnet-id/>
+					<neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>
+				</vnf-networks>
+				<availability-zones>
+					<availability-zone>nova</availability-zone>
+				</availability-zones>
+				<vnf-vms>
+					<vm-type>ps</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPS001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPS002</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPS003</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPS004</vm-name>
+					</vm-names>
+					<vm-count>4</vm-count>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.251</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.252</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.253</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.254</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+				</vnf-vms>
+				<vnf-vms>
+					<vm-type>cm</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MCM001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01OAM002</vm-name>
+					</vm-names>
+					<vm-count>1</vm-count>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.249</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.250</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_oam</network-role>
+						<network-ips>
+							<ip-address>107.239.167.250</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.239.167.251</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+				</vnf-vms>
+				<vnf-vms>
+					<vm-type>oam</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01OAM001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01OAM002</vm-name>
+					</vm-names>
+					<vm-count>2</vm-count>
+					<vm-networks>
+						<network-role>mog_oam</network-role>
+						<network-ips>
+							<ip-address>107.239.167.252</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.239.167.251</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.249</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.250</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+				</vnf-vms>
+				<vnf-vms>
+					<vm-type>pd</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPD001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MPD002</vm-name>
+					</vm-names>
+					<vm-count>2</vm-count>
+					<vm-networks>
+						<network-role>mog_dmz</network-role>
+						<network-ips>
+							<ip-address>107.225.25.253</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.225.25.254</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.225.254.253</floating-ip>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_oam</network-role>
+						<network-ips>
+							<ip-address>107.239.167.254</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.239.167.253</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.239.167.249</floating-ip>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_exn</network-role>
+						<network-ips>
+							<ip-address>107.224.46.253</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.46.254</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.224.46.252</floating-ip>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.247</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.248</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.224.41.252</floating-ip>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_gn</network-role>
+						<network-ips>
+							<ip-address>107.224.41.253</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.41.254</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.224.41.252</floating-ip>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_cor_A</network-role>
+						<network-ips>
+							<ip-address>107.224.38.253</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.38.254</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+				</vnf-vms>
+				<vnf-vms>
+					<vm-type>sm</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MSM001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MSM002</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MSM003</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MSM004</vm-name>
+					</vm-names>
+					<vm-count>4</vm-count>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.243</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.244</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.245</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.246</ip-address>
+						</network-ips>
+						<use-dhcp>N</use-dhcp>
+					</vm-networks>
+				</vnf-vms>
+			</vnf-assignments>
+			<vnf-topology-identifier>
+				<vnf-name>ZVNNMOGX01_base</vnf-name>
+				<service-type>SDN-MOBILITY</service-type>
+				<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>
+				<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>
+				<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>
+			</vnf-topology-identifier>
+		</vnf-topology-information>
+		<request-information>
+			<request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>
+			<notification-url/>
+			<source>PORTAL</source>
+			<request-action>VNFActivateRequest</request-action>
+		</request-information>
+	</service-data>
+	<service-status>
+		<response-code>200</response-code>
+		<final-indicator>Y</final-indicator>
+		<request-status>synccomplete</request-status>
+		<response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>
+		<rpc-name>vnf-topology-operation</rpc-name>
+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>
+		<rpc-action>assign</rpc-action>
+	</service-status>
+</vnf-list>
+
+</output>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
index 9b69fdc053..e8a69da0f8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
@@ -1,141 +1,141 @@
-<output xmlns="com:att:sdnctl:vnf">

-	<vnf-list xmlns="com:att:sdnctl:vnf">

-	<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

-	<service-status>

-		<response-code>200</response-code>

-		<final-indicator>Y</final-indicator>

-		<request-status>synccomplete</request-status>

-		<response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>

-		<rpc-name>vnf-topology-operation</rpc-name>

-		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

-		<rpc-action>assign</rpc-action>

-	</service-status>

-	<service-data>

-		<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>

-		<service-information>

-			<subscriber-name>notsurewecare</subscriber-name>

-			<service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>

-			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

-			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		</service-information>

-		<sdnc-request-header>

-			<svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>

-			<svc-notification-url>http://mtanjv9moja01-eth1-0.aic.cip.com:28080/adapters/rest/SDNCNotify</svc-notification-url>

-			<svc-action>assign</svc-action>

-		</sdnc-request-header>

-		<vnf-request-information>

-			<aic-cloud-region>AAIAIC25</aic-cloud-region>

-			<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

-			<generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>

-			<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

-			<generic-vnf-name>MSOTEST06</generic-vnf-name>

-			<tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>

-			<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

-			<vnf-type>vSAMP3::base::module-0</vnf-type>

-		</vnf-request-information>

-		<oper-status>

-			<order-status>PendingCreate</order-status>			

-		</oper-status>

-		<vnf-topology-information>

-			<vnf-parameters>

-				<vnf-parameter-name>image</vnf-parameter-name>

-				<vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>

-			</vnf-parameters>

-			<vnf-parameters>

-				<vnf-parameter-name>flavor</vnf-parameter-name>

-				<vnf-parameter-value>m1.small</vnf-parameter-value>

-			</vnf-parameters>

-			<vnf-assignments>

-				<vnf-networks>

-					<network-role>int_imbl</network-role>

-					<network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>

-					<network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>

-					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>

-					<subnet-id></subnet-id>

-					<ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>

-					<neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>

-					<sriov-vlan-filter-list>

-						<sriov-vlan-filter>filter1</sriov-vlan-filter>

-					</sriov-vlan-filter-list>

-					<sriov-vlan-filter-list>

-						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

-                     </sriov-vlan-filter-list>

-				</vnf-networks>

-				<vnf-networks>

-					<network-role>sgi_protected</network-role>

-					<network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>

-					<network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>

-					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>

-					<subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>

-					<ipv6-subnet-id></ipv6-subnet-id>

-					<neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>

-				</vnf-networks>

-				<vnf-vms>

-					<vm-type>cm</vm-type>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01MCM001</vm-name>

-					</vm-names>

-					<vm-names>

-						<vm-name>ZVNN1MOGX01OAM002</vm-name>

-					</vm-names>

-					<vm-count>1</vm-count>

-					<vm-networks>

-						<network-role>mog_cor_B</network-role>

-						<network-ips>

-							<ip-address>107.224.36.249</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.224.36.250</ip-address>

-						</network-ips>

-						<network-ips-v6>

-							<ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>

-						</network-ips-v6>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip>107.224.41.252</floating-ip>

-						<floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>

-					</vm-networks>

-					<vm-networks>

-						<network-role>mog_oam</network-role>

-						<network-ips>

-							<ip-address>107.239.167.250</ip-address>

-						</network-ips>

-						<network-ips>

-							<ip-address>107.239.167.251</ip-address>

-						</network-ips>

-						<network-ips-v6>

-							<ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>							

-						</network-ips-v6>

-						<network-ips-v6>

-							<ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>

-						</network-ips-v6>

-						<interface-route-prefixes>							

-							<interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>

-						</interface-route-prefixes>

-						<interface-route-prefixes>							

-							<interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>

-						</interface-route-prefixes>

-						<use-dhcp>N</use-dhcp>

-						<floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>

-					</vm-networks>

-				</vnf-vms>

-				<availability-zones>

-					<availability-zone>nova</availability-zone>

-				</availability-zones>

-			</vnf-assignments>

-			<vnf-topology-identifier>

-				<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

-				<service-type>SDN-MOBILITY</service-type>

-				<vnf-type>vSAMP3::base::module-0</vnf-type>

-				<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

-				<generic-vnf-name>MSOTEST06</generic-vnf-name>

-			</vnf-topology-identifier>			

-		</vnf-topology-information>

-		<request-information>

-			<request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>

-			<notification-url></notification-url>

-			<source>SoapUI-bns-vf-base-vSAMP3-9001</source>

-			<request-action>VNFActivateRequest</request-action>			

-		</request-information>

-	</service-data>

-</vnf-list>

-</output>

+<output xmlns="com:att:sdnctl:vnf">
+	<vnf-list xmlns="com:att:sdnctl:vnf">
+	<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
+	<service-status>
+		<response-code>200</response-code>
+		<final-indicator>Y</final-indicator>
+		<request-status>synccomplete</request-status>
+		<response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>
+		<rpc-name>vnf-topology-operation</rpc-name>
+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>
+		<rpc-action>assign</rpc-action>
+	</service-status>
+	<service-data>
+		<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>
+		<service-information>
+			<subscriber-name>notsurewecare</subscriber-name>
+			<service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>
+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>
+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+		</service-information>
+		<sdnc-request-header>
+			<svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>
+			<svc-notification-url>http://localhost:28080/adapters/rest/SDNCNotify</svc-notification-url>
+			<svc-action>assign</svc-action>
+		</sdnc-request-header>
+		<vnf-request-information>
+			<aic-cloud-region>AAIAIC25</aic-cloud-region>
+			<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
+			<generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>
+			<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
+			<generic-vnf-name>MSOTEST06</generic-vnf-name>
+			<tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>
+			<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>
+			<vnf-type>vSAMP3::base::module-0</vnf-type>
+		</vnf-request-information>
+		<oper-status>
+			<order-status>PendingCreate</order-status>			
+		</oper-status>
+		<vnf-topology-information>
+			<vnf-parameters>
+				<vnf-parameter-name>image</vnf-parameter-name>
+				<vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>
+			</vnf-parameters>
+			<vnf-parameters>
+				<vnf-parameter-name>flavor</vnf-parameter-name>
+				<vnf-parameter-value>m1.small</vnf-parameter-value>
+			</vnf-parameters>
+			<vnf-assignments>
+				<vnf-networks>
+					<network-role>int_imbl</network-role>
+					<network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>
+					<network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>
+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>
+					<subnet-id></subnet-id>
+					<ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>
+					<neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>
+					<sriov-vlan-filter-list>
+						<sriov-vlan-filter>filter1</sriov-vlan-filter>
+					</sriov-vlan-filter-list>
+					<sriov-vlan-filter-list>
+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         
+                     </sriov-vlan-filter-list>
+				</vnf-networks>
+				<vnf-networks>
+					<network-role>sgi_protected</network-role>
+					<network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>
+					<network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>
+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>
+					<subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>
+					<ipv6-subnet-id></ipv6-subnet-id>
+					<neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>
+				</vnf-networks>
+				<vnf-vms>
+					<vm-type>cm</vm-type>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01MCM001</vm-name>
+					</vm-names>
+					<vm-names>
+						<vm-name>ZVNN1MOGX01OAM002</vm-name>
+					</vm-names>
+					<vm-count>1</vm-count>
+					<vm-networks>
+						<network-role>mog_cor_B</network-role>
+						<network-ips>
+							<ip-address>107.224.36.249</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.224.36.250</ip-address>
+						</network-ips>
+						<network-ips-v6>
+							<ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>
+						</network-ips-v6>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip>107.224.41.252</floating-ip>
+						<floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>
+					</vm-networks>
+					<vm-networks>
+						<network-role>mog_oam</network-role>
+						<network-ips>
+							<ip-address>107.239.167.250</ip-address>
+						</network-ips>
+						<network-ips>
+							<ip-address>107.239.167.251</ip-address>
+						</network-ips>
+						<network-ips-v6>
+							<ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>							
+						</network-ips-v6>
+						<network-ips-v6>
+							<ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>
+						</network-ips-v6>
+						<interface-route-prefixes>							
+							<interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>
+						</interface-route-prefixes>
+						<interface-route-prefixes>							
+							<interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>
+						</interface-route-prefixes>
+						<use-dhcp>N</use-dhcp>
+						<floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>
+					</vm-networks>
+				</vnf-vms>
+				<availability-zones>
+					<availability-zone>nova</availability-zone>
+				</availability-zones>
+			</vnf-assignments>
+			<vnf-topology-identifier>
+				<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>
+				<service-type>SDN-MOBILITY</service-type>
+				<vnf-type>vSAMP3::base::module-0</vnf-type>
+				<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>
+				<generic-vnf-name>MSOTEST06</generic-vnf-name>
+			</vnf-topology-identifier>			
+		</vnf-topology-information>
+		<request-information>
+			<request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>
+			<notification-url></notification-url>
+			<source>SoapUI-bns-vf-base-vSAMP3-9001</source>
+			<request-action>VNFActivateRequest</request-action>			
+		</request-information>
+	</service-data>
+</vnf-list>
+</output>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml
index 919ff2c36b..77528ccf61 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/StandardSDNCSynchResponse.xml
@@ -1,5 +1,5 @@
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
   <soap:Body>
-    <SDNCAdapterResponse xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"/>
+    <SDNCAdapterResponse xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1"/>
   </soap:Body>
 </soap:Envelope>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
index 7b72812f1a..8a690403c4 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
@@ -1,10 +1,10 @@
-<UpdateAAIVfModuleRequest>

-	<vnf-id>skask</vnf-id>

-	<vf-module-id>supercool</vf-module-id>

-	<heat-stack-id>slowburn</heat-stack-id>

-	<orchestration-status>complete</orchestration-status>

-	<volume-group-id>78987</volume-group-id>

-	<persona-model-id>introvert</persona-model-id>

-	<persona-model-version>3.14</persona-model-version>

-	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>

+<UpdateAAIVfModuleRequest>
+	<vnf-id>skask</vnf-id>
+	<vf-module-id>supercool</vf-module-id>
+	<heat-stack-id>slowburn</heat-stack-id>
+	<orchestration-status>complete</orchestration-status>
+	<volume-group-id>78987</volume-group-id>
+	<persona-model-id>introvert</persona-model-id>
+	<persona-model-version>3.14</persona-model-version>
+	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>
 </UpdateAAIVfModuleRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateVfModuleRequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateVfModuleRequest.xml
index 966ca50b16..0dc1b1d410 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateVfModuleRequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateVfModuleRequest.xml
@@ -1,4 +1,4 @@
-<vnf-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+<vnf-request xmlns="http://org.onap/so/infra/vnf-request/v1">
 	<request-info>
 		<request-id>DEV-VF-0011</request-id>
 		<action>UPDATE_VF_MODULE</action>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
index cfbf903ce9..b882c4c6f4 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
@@ -1,10 +1,10 @@
-<vf-module xmlns="http://com.aai.inventory/v7">

-	<vf-module-id>lukewarm</vf-module-id>

-	<vf-module-name>PCRF::module-1</vf-module-name>

-	<heat-stack-id>slowburn</heat-stack-id>

-	<orchestration-status>pending-create</orchestration-status>

-	<is-base-vf-module>true</is-base-vf-module>

-	<resource-version>330-90</resource-version>

-	<persona-model-id>introvert</persona-model-id>

-	<persona-model-version>2.0</persona-model-version>

+<vf-module xmlns="http://com.aai.inventory/v7">
+	<vf-module-id>lukewarm</vf-module-id>
+	<vf-module-name>PCRF::module-1</vf-module-name>
+	<heat-stack-id>slowburn</heat-stack-id>
+	<orchestration-status>pending-create</orchestration-status>
+	<is-base-vf-module>true</is-base-vf-module>
+	<resource-version>330-90</resource-version>
+	<persona-model-id>introvert</persona-model-id>
+	<persona-model-version>2.0</persona-model-version>
 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
index 27c8ecf60a..3b8bea4e4e 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
@@ -1,9 +1,9 @@
-<vf-module xmlns="http://com.aai.inventory/v7">

-	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>

-	<vf-module-name>PCRF::module-0-2</vf-module-name>

-	<persona-model-id>00000000-0000-0000-0000-000000000000</persona-model-id>

-	<persona-model-version>1.0</persona-model-version>

-	<is-base-vf-module>false</is-base-vf-module>

-	<orchestration-status>pending-create</orchestration-status>

-	<resource-version>330-90</resource-version>

+<vf-module xmlns="http://com.aai.inventory/v7">
+	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>
+	<vf-module-name>PCRF::module-0-2</vf-module-name>
+	<persona-model-id>00000000-0000-0000-0000-000000000000</persona-model-id>
+	<persona-model-version>1.0</persona-model-version>
+	<is-base-vf-module>false</is-base-vf-module>
+	<orchestration-status>pending-create</orchestration-status>
+	<resource-version>330-90</resource-version>
 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
index ee09c9bc4a..5a2b7300b1 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
@@ -1,27 +1,27 @@
-<vf-module xmlns="http://com.aai.inventory/v7">

-	<vf-module-id>supercool</vf-module-id>

-	<vf-module-name>PCRF::module-2</vf-module-name>

-	<heat-stack-id>fastburn</heat-stack-id>

-	<orchestration-status>pending-create</orchestration-status>

-	<is-base-vf-module>false</is-base-vf-module>

-	<resource-version>330-89</resource-version>

-	<model-invariant-id>introvert</model-invariant-id>

-	<model-version-id>2.0</model-version-id>

-	<relationship-list>

-		<relationship>

-			<related-to>volume-group</related-to>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-owner</relationship-key>

-				<relationship-value>att-aic</relationship-value>

-			</relationship-data>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-region-id</relationship-key>

-				<relationship-value>pdk1</relationship-value>

-			</relationship-data>

-			<relationship-data>

-				<relationship-key>volume-group.volume-group-id</relationship-key>

-				<relationship-value>78987</relationship-value>

-			</relationship-data>

-		</relationship>

-	</relationship-list>

+<vf-module xmlns="http://com.aai.inventory/v7">
+	<vf-module-id>supercool</vf-module-id>
+	<vf-module-name>PCRF::module-2</vf-module-name>
+	<heat-stack-id>fastburn</heat-stack-id>
+	<orchestration-status>pending-create</orchestration-status>
+	<is-base-vf-module>false</is-base-vf-module>
+	<resource-version>330-89</resource-version>
+	<model-invariant-id>introvert</model-invariant-id>
+	<model-version-id>2.0</model-version-id>
+	<relationship-list>
+		<relationship>
+			<related-to>volume-group</related-to>
+			<relationship-data>
+				<relationship-key>cloud-region.cloud-owner</relationship-key>
+				<relationship-value>att-aic</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>cloud-region.cloud-region-id</relationship-key>
+				<relationship-value>pdk1</relationship-value>
+			</relationship-data>
+			<relationship-data>
+				<relationship-key>volume-group.volume-group-id</relationship-key>
+				<relationship-value>78987</relationship-value>
+			</relationship-data>
+		</relationship>
+	</relationship-list>
 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
index b44c977eaf..7e913dd418 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VolumeGroup.xml
@@ -1,25 +1,25 @@
-  <volume-group xmlns="http://com.aai.inventory/v7">

-         <volume-group-id>78987</volume-group-id>

-         <volume-group-name>Volume_2</volume-group-name>

-         <heat-stack-id>slowburn</heat-stack-id>

-         <vnf-type>pcrf-capacity</vnf-type>

-         <orchestration-status>Active</orchestration-status>

-         <resource-version>0000020</resource-version>

-         <relationship-list>

-            <relationship>

-               <related-to>tenant</related-to>

-               <relationship-data>

-                  <relationship-key>cloud-region.cloud-owner</relationship-key>

-                  <relationship-value>att-aic</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>cloud-region.cloud-region-id</relationship-key>

-                  <relationship-value>MDTWNJ21</relationship-value>

-               </relationship-data>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>

-               </relationship-data>

-            </relationship>

-         </relationship-list>

+  <volume-group xmlns="http://com.aai.inventory/v7">
+         <volume-group-id>78987</volume-group-id>
+         <volume-group-name>Volume_2</volume-group-name>
+         <heat-stack-id>slowburn</heat-stack-id>
+         <vnf-type>pcrf-capacity</vnf-type>
+         <orchestration-status>Active</orchestration-status>
+         <resource-version>0000020</resource-version>
+         <relationship-list>
+            <relationship>
+               <related-to>tenant</related-to>
+               <relationship-data>
+                  <relationship-key>cloud-region.cloud-owner</relationship-key>
+                  <relationship-value>att-aic</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>cloud-region.cloud-region-id</relationship-key>
+                  <relationship-value>MDTWNJ21</relationship-value>
+               </relationship-data>
+               <relationship-data>
+                  <relationship-key>tenant.tenant-id</relationship-key>
+                  <relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>
+               </relationship-data>
+            </relationship>
+         </relationship-list>
       </volume-group>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
index 396f553b60..4167e2e87d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai-volume-group-id-info.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<tns:volume-group xmlns:tns="http://com.aai.inventory/v6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://com.aai.inventory/v6 aai_schema_v6.xsd ">

-  <tns:volume-group-id>VOLUME_GROUP_ID_1</tns:volume-group-id>

-  <tns:volume-group-name>VOLUME_GROUP_ID_1_NAME</tns:volume-group-name>

-  <tns:heat-stack-id>heat-stack-id</tns:heat-stack-id>

-  <tns:vnf-type>vnf-type</tns:vnf-type>

-  <tns:orchestration-status>OK</tns:orchestration-status>

-  <tns:resource-version>1</tns:resource-version>

-  <tns:relationship-list>

-            <tns:relationship>

-               <tns:related-to>tenant</tns:related-to>

-              	 <tns:relationship-data>

-                  <tns:relationship-key>cloud-region.cloud-owner</tns:relationship-key>

-                  <tns:relationship-value>att-aic</tns:relationship-value>

-               </tns:relationship-data>

-               <tns:relationship-data>

-                  <tns:relationship-key>cloud-region.cloud-region-id</tns:relationship-key>

-                  <tns:relationship-value>pdk1</tns:relationship-value>

-               </tns:relationship-data>

-               <tns:relationship-data>

-                  <tns:relationship-key>tenant.tenant-id</tns:relationship-key>

-                  <tns:relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</tns:relationship-value>

-               </tns:relationship-data>

-              </tns:relationship>

-   </tns:relationship-list>

- </tns:volume-group>

- 

-

+<?xml version="1.0" encoding="UTF-8"?>
+<tns:volume-group xmlns:tns="http://com.aai.inventory/v6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://com.aai.inventory/v6 aai_schema_v6.xsd ">
+  <tns:volume-group-id>VOLUME_GROUP_ID_1</tns:volume-group-id>
+  <tns:volume-group-name>VOLUME_GROUP_ID_1_NAME</tns:volume-group-name>
+  <tns:heat-stack-id>heat-stack-id</tns:heat-stack-id>
+  <tns:vnf-type>vnf-type</tns:vnf-type>
+  <tns:orchestration-status>OK</tns:orchestration-status>
+  <tns:resource-version>1</tns:resource-version>
+  <tns:relationship-list>
+            <tns:relationship>
+               <tns:related-to>tenant</tns:related-to>
+              	 <tns:relationship-data>
+                  <tns:relationship-key>cloud-region.cloud-owner</tns:relationship-key>
+                  <tns:relationship-value>att-aic</tns:relationship-value>
+               </tns:relationship-data>
+               <tns:relationship-data>
+                  <tns:relationship-key>cloud-region.cloud-region-id</tns:relationship-key>
+                  <tns:relationship-value>pdk1</tns:relationship-value>
+               </tns:relationship-data>
+               <tns:relationship-data>
+                  <tns:relationship-key>tenant.tenant-id</tns:relationship-key>
+                  <tns:relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</tns:relationship-value>
+               </tns:relationship-data>
+              </tns:relationship>
+   </tns:relationship-list>
+ </tns:volume-group>
+ 
+
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/e2e-complex.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/e2e-complex.json
index 6fc9cb36e6..21bacbd5ce 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/e2e-complex.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/e2e-complex.json
@@ -24,7 +24,7 @@
                                 "relationship": [
                                     {
                                         "related-to": "vpls-pe",
-                                        "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vpls-pes/vpls-pe/sfcca301vr1",
+                                        "related-link": "https://localhost:8443/aai/v9/network/vpls-pes/vpls-pe/sfcca301vr1",
                                         "relationship-data": [
                                             {
                                                 "relationship-key": "vpls-pe.equipment-name",
@@ -48,7 +48,7 @@
                     "relationship": [
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/a9fec18e-1ea3-40e4-a6c0-a89b3de07053",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/a9fec18e-1ea3-40e4-a6c0-a89b3de07053",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -64,7 +64,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj104snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj104snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -79,7 +79,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj105snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj105snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -94,7 +94,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/compute_host",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/compute_host",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -109,7 +109,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj106snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj106snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -124,7 +124,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj126sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj126sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -139,7 +139,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/8ae1e5f8-61f1-4c71-913a-b40cc4593cb9",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/8ae1e5f8-61f1-4c71-913a-b40cc4593cb9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -155,7 +155,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102sta",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102sta",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -170,7 +170,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax102",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax102",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -185,7 +185,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj107snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj107snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -200,7 +200,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj118snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj118snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -215,7 +215,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj110snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj110snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -230,7 +230,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj109snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj109snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -245,7 +245,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj114snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj114snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -260,7 +260,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj119snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj119snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -275,7 +275,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj116snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj116snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -290,7 +290,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/a2935fa9-b743-49f4-9813-a127f13c4e93",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/a2935fa9-b743-49f4-9813-a127f13c4e93",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -306,7 +306,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj108snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj108snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -321,7 +321,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj123sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj123sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -336,7 +336,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -351,7 +351,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -366,7 +366,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax101",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax101",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -381,7 +381,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj113snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj113snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -396,7 +396,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj111snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj111snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -411,7 +411,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj103snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj103snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -426,7 +426,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj117snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj117snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -441,7 +441,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101sta",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101sta",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -456,7 +456,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/c7fe7698-8063-4e26-8bd3-ca3edde0b0d4",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/c7fe7698-8063-4e26-8bd3-ca3edde0b0d4",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -472,7 +472,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj120snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj120snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -487,7 +487,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj124sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj124sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -502,7 +502,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj125sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj125sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -517,7 +517,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj112snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj112snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -532,7 +532,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj115snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj115snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -547,7 +547,7 @@
                         },
                         {
                             "related-to": "cloud-region",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtcnj2",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtcnj2",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -567,7 +567,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/f9263cat-4eaa-43a0-bea4-adcf6e123456",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/f9263cat-4eaa-43a0-bea4-adcf6e123456",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -591,7 +591,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/b9263fab-4eaa-43a0-bea4-adcf6e999999",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/b9263fab-4eaa-43a0-bea4-adcf6e999999",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -615,7 +615,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/cf33dc95-c5d2-48fd-8078-fd949363f63b",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/cf33dc95-c5d2-48fd-8078-fd949363f63b",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -639,7 +639,7 @@
                         },
                         {
                             "related-to": "availability-zone",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/availability-zones/availability-zone/mtcnj-esx-az01",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/availability-zones/availability-zone/mtcnj-esx-az01",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/service-instance-pathed-query.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
index 6ec513e4bb..0fa9515820 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
@@ -2,7 +2,7 @@
   "results": [
     {
       "resource-type": "service-instance",
-      "resource-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/business/customers/customer/key1/service-subscriptions/service-subscription/key2/service-instances/service-instance/key3"
+      "resource-link": "https://localhost:8443/aai/v9/business/customers/customer/key1/service-subscriptions/service-subscription/key2/service-instances/service-instance/key3"
     }
   ]
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/catalogDbFiles/DoCreateServiceInstance_request.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/catalogDbFiles/DoCreateServiceInstance_request.json
new file mode 100644
index 0000000000..c135923f84
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/catalogDbFiles/DoCreateServiceInstance_request.json
@@ -0,0 +1,162 @@
+{ "serviceResources"    : {
+	"modelInfo"       : {
+		"modelName"          : "MSOTADevInfra_vSAMP10a_Service",
+		"modelUuid"          : "5df8b6de-2083-11e7-93ae-92361f002671",
+		"modelInvariantUuid" : "9647dfc4-2083-11e7-93ae-92361f002671",
+		"modelVersion"       : "1.0"
+	},
+	"serviceType"        : "PortMirroring",
+	"serviceRole"        : "InfraRole",
+	"environmentContext" : "Luna",
+	"workloadContext"    : "Oxygen",
+	"serviceVnfs": [
+	
+		{ "modelInfo"                    : {
+			"modelName"              : "vSAMP10a",
+			"modelUuid"              : "ff2ae348-214a-11e7-93ae-92361f002671",
+			"modelInvariantUuid"     : "2fff5b20-214b-11e7-93ae-92361f002671",
+			"modelVersion"           : "1.0",
+			"modelCustomizationUuid" : "68dc9a92-214c-11e7-93ae-92361f002671",
+			"modelInstanceName"      : "vSAMP10a 1"
+			},
+		"toscaNodeType"            : "VF",
+		"nfFunction"           	: null,
+		"nfType"              		: null,
+		"nfRole"              		: null,
+		"nfNamingCode"         	: null,
+		"multiStageDesign"		: null,
+			"vfModules": [
+				{
+					"modelInfo"               : { 
+						"modelName"              : "NetworkFqdnTest4",
+						"modelUuid"              : "025606c1-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : "06bd0a18-65c0-4418-83c7-5b0d13cba01a",
+						"modelVersion"           : "2.0",
+						"modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba01a"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "label",
+					"initialCount"           : 0,
+					"hasVolumeGroup"           : true
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "NetworkFqdnTest3",
+						"modelUuid"              : "02560575-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : "06bd0a18-65c0-4418-83c7-5b0d13cba0bb",
+						"modelVersion"           : "1.0",
+						"modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d13cba0bb"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "label",
+					"initialCount"           : 0,
+					"hasVolumeGroup"           : false
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "NetworkFqdnTest5",
+						"modelUuid"              : "025607e4-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : "06bd0a18-65c0-4418-83c7-5b0d14cba01a",
+						"modelVersion"           : "1.0",
+						"modelCustomizationUuid" : "06bd0a18-65c0-4418-83c7-5b0d14cba01a"
+					},		"isBase"                 : false,
+					"vfModuleLabel"          : "label",
+					"initialCount"           : 0,
+					"hasVolumeGroup"           : false
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "vSAMP10aDEV::PCM::module-2",
+						"modelUuid"              : "7774b4e4-7d37-11e7-bb31-be2e44b06b34",
+						"modelInvariantUuid"     : "93e9c1d2-7d37-11e7-bb31-be2e44b06b34",
+						"modelVersion"           : "2",
+						"modelCustomizationUuid" : "6728bee8-7d3a-11e7-bb31-be2e44b06b34"
+					},		"isBase"                 : false,
+					"vfModuleLabel"          : "PCM",
+					"initialCount"           : 0,
+					"hasVolumeGroup"           : true
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "vSAMP10aDEV::PCM::module-1",
+						"modelUuid"              : "066de97e-253e-11e7-93ae-92361f002671",
+						"modelInvariantUuid"     : "64efd51a-2544-11e7-93ae-92361f002671",
+						"modelVersion"           : "2",
+						"modelCustomizationUuid" : "b4ea86b4-253f-11e7-93ae-92361f002671"
+					},		"isBase"                 : false,
+					"vfModuleLabel"          : "PCM",
+					"initialCount"           : 0,
+					"hasVolumeGroup"           : true
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "vSAMP10aDEV::base::module-0",
+						"modelUuid"              : "20c4431c-246d-11e7-93ae-92361f002671",
+						"modelInvariantUuid"     : "78ca26d0-246d-11e7-93ae-92361f002671",
+						"modelVersion"           : "2",
+						"modelCustomizationUuid" : "cb82ffd8-252a-11e7-93ae-92361f002671"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "base",
+					"initialCount"           : 1,
+					"hasVolumeGroup"           : true
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "vSAMP10a::base::module-0",
+						"modelUuid"              : "02560de2-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : null,
+						"modelVersion"           : "2",
+						"modelCustomizationUuid" : "MIGRATED_36e76920-ef30-4793-9979-cbd7d4b2bfc4"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "base",
+					"initialCount"           : 1,
+					"hasVolumeGroup"           : true
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "base::module-0",
+						"modelUuid"              : "02561381-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : null,
+						"modelVersion"           : "1",
+						"modelCustomizationUuid" : "MIGRATED_51baae4c-b7c7-4f57-b77e-6e01acca89e5"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "module-0",
+					"initialCount"           : 1,
+					"hasVolumeGroup"           : false
+				},
+				{
+					"modelInfo"               : { 
+						"modelName"              : "vSAMP10a::PCM::module-1",
+						"modelUuid"              : "02560f1b-4223-11e7-9252-005056850d2e",
+						"modelInvariantUuid"     : null,
+						"modelVersion"           : "1",
+						"modelCustomizationUuid" : "MIGRATED_e9be2ed7-45b6-479c-b06e-9093899f8ce8"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "PCM",
+					"initialCount"           : 1,
+					"hasVolumeGroup"           : true
+				}
+			]
+		}
+	],
+	"serviceNetworks": [],
+	"serviceAllottedResources": [
+		{
+			"modelInfo"       : {
+				"modelName"              : "Tunnel_Xconn",
+				"modelUuid"              : "f6b7d4c6-e8a4-46e2-81bc-31cad5072842",
+				"modelInvariantUuid"     : "b7a1b78e-6b6b-4b36-9698-8c9530da14af",
+				"modelVersion"           : "1.0",
+				"modelCustomizationUuid" : "5b9bee43-f537-4fb3-9e8b-4de9f714d28a",
+				"modelInstanceName"      : "Pri_Tunnel_Xconn 9"
+			},
+			"toscaNodeType"              : null,
+			"allottedResourceType"              : null,
+			"allottedResourceRole"              : null,
+			"providingServiceModelInvariantUuid"              : null,
+			"nfFunction"              : null,
+			"nfType"              : null,
+			"nfRole"              : null,
+			"nfNamingCode"              : null
+		}
+	]
+	}}
+
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesDataWithConfig.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesDataWithConfig.json
index 610965038f..b408af8f2c 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesDataWithConfig.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesDataWithConfig.json
@@ -1,182 +1,182 @@
-{

-  "serviceResources": {

-    "modelInfo": {

-      "modelName": "MSOTADevInfra_vSAMP10a_Service",

-      "modelUuid": "5df8b6de-2083-11e7-93ae-92361f002671",

-      "modelInvariantUuid": "9647dfc4-2083-11e7-93ae-92361f002671",

-      "modelVersion": "1.0"

-    },

-    "serviceType": "PortMirroring",

-    "serviceRole": "InfraRole",

-    "serviceVnfs": [

-      {

-        "modelInfo": {

-          "modelName": "vSAMP10a",

-          "modelUuid": "ff2ae348-214a-11e7-93ae-92361f002671",

-          "modelInvariantUuid": "2fff5b20-214b-11e7-93ae-92361f002671",

-          "modelVersion": "1.0",

-          "modelCustomizationUuid": "68dc9a92-214c-11e7-93ae-92361f002671",

-          "modelInstanceName": "vSAMP10a 1"

-        },

-        "toscaNodeType": "VF",

-        "nfFunction": null,

-        "nfType": null,

-        "nfRole": null,

-        "nfNamingCode": null,

-        "vfModules": [

-          {

-            "modelInfo": {

-              "modelName": "NetworkFqdnTest4",

-              "modelUuid": "025606c1-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba01a",

-              "modelVersion": "2.0",

-              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba01a"

-            },

-            "isBase": true,

-            "vfModuleLabel": "label",

-            "initialCount": 0,

-            "hasVolumeGroup": true

-          },

-          {

-            "modelInfo": {

-              "modelName": "NetworkFqdnTest3",

-              "modelUuid": "02560575-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba0bb",

-              "modelVersion": "1.0",

-              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba0bb"

-            },

-            "isBase": true,

-            "vfModuleLabel": "label",

-            "initialCount": 0,

-            "hasVolumeGroup": false

-          },

-          {

-            "modelInfo": {

-              "modelName": "NetworkFqdnTest5",

-              "modelUuid": "025607e4-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d14cba01a",

-              "modelVersion": "1.0",

-              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d14cba01a"

-            },

-            "isBase": false,

-            "vfModuleLabel": "label",

-            "initialCount": 0,

-            "hasVolumeGroup": false

-          },

-          {

-            "modelInfo": {

-              "modelName": "vSAMP10aDEV::PCM::module-2",

-              "modelUuid": "7774b4e4-7d37-11e7-bb31-be2e44b06b34",

-              "modelInvariantUuid": "93e9c1d2-7d37-11e7-bb31-be2e44b06b34",

-              "modelVersion": "2",

-              "modelCustomizationUuid": "6728bee8-7d3a-11e7-bb31-be2e44b06b34"

-            },

-            "isBase": false,

-            "vfModuleLabel": "PCM",

-            "initialCount": 0,

-            "hasVolumeGroup": true

-          },

-          {

-            "modelInfo": {

-              "modelName": "vSAMP10aDEV::PCM::module-1",

-              "modelUuid": "066de97e-253e-11e7-93ae-92361f002671",

-              "modelInvariantUuid": "64efd51a-2544-11e7-93ae-92361f002671",

-              "modelVersion": "2",

-              "modelCustomizationUuid": "b4ea86b4-253f-11e7-93ae-92361f002671"

-            },

-            "isBase": false,

-            "vfModuleLabel": "PCM",

-            "initialCount": 0,

-            "hasVolumeGroup": true

-          },

-          {

-            "modelInfo": {

-              "modelName": "vSAMP10aDEV::base::module-0",

-              "modelUuid": "20c4431c-246d-11e7-93ae-92361f002671",

-              "modelInvariantUuid": "78ca26d0-246d-11e7-93ae-92361f002671",

-              "modelVersion": "2",

-              "modelCustomizationUuid": "cb82ffd8-252a-11e7-93ae-92361f002671"

-            },

-            "isBase": true,

-            "vfModuleLabel": "base",

-            "initialCount": 1,

-            "hasVolumeGroup": true

-          },

-          {

-            "modelInfo": {

-              "modelName": "vSAMP10a::base::module-0",

-              "modelUuid": "02560de2-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": null,

-              "modelVersion": "2",

-              "modelCustomizationUuid": "MIGRATED_36e76920-ef30-4793-9979-cbd7d4b2bfc4"

-            },

-            "isBase": true,

-            "vfModuleLabel": "base",

-            "initialCount": 1,

-            "hasVolumeGroup": true

-          },

-          {

-            "modelInfo": {

-              "modelName": "base::module-0",

-              "modelUuid": "02561381-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": null,

-              "modelVersion": "1",

-              "modelCustomizationUuid": "MIGRATED_51baae4c-b7c7-4f57-b77e-6e01acca89e5"

-            },

-            "isBase": true,

-            "vfModuleLabel": "module-0",

-            "initialCount": 1,

-            "hasVolumeGroup": false

-          },

-          {

-            "modelInfo": {

-              "modelName": "vSAMP10a::PCM::module-1",

-              "modelUuid": "02560f1b-4223-11e7-9252-005056850d2e",

-              "modelInvariantUuid": null,

-              "modelVersion": "1",

-              "modelCustomizationUuid": "MIGRATED_e9be2ed7-45b6-479c-b06e-9093899f8ce8"

-            },

-            "isBase": true,

-            "vfModuleLabel": "PCM",

-            "initialCount": 1,

-            "hasVolumeGroup": true

-          }

-        ]

-      }

-    ],

-    "serviceNetworks": [],

-    "serviceAllottedResources": [

-      {

-        "modelInfo": {

-          "modelName": "Tunnel_Xconn",

-          "modelUuid": "f6b7d4c6-e8a4-46e2-81bc-31cad5072842",

-          "modelInvariantUuid": "b7a1b78e-6b6b-4b36-9698-8c9530da14af",

-          "modelVersion": "1.0",

-          "modelCustomizationUuid": "5b9bee43-f537-4fb3-9e8b-4de9f714d28a",

-          "modelInstanceName": "Pri_Tunnel_Xconn 9"

-        },

-        "toscaNodeType": null,

-        "allottedResourceType": null,

-        "allottedResourceRole": null,

-        "providingServiceModelInvariantUuid": null,

-        "nfFunction": null,

-        "nfType": null,

-        "nfRole": null,

-        "nfNamingCode": null

-      }

-    ],

-    "serviceConfigs": [

-      {

-        "modelInfo": {

-          "modelName": "Molder",

-          "modelUuid": "025606c1-4fff-11e7-9252-005056850d2e",

-          "modelInvariantUuid": "025606c1-4eee-11e7-9252-005056850d2e",

-          "modelVersion": "1.0",

-          "modelCustomizationUuid": "025606c1-4ddd-11e7-9252-005056850d2e",

-          "modelInstanceName": "X_FILES_001"

-        },

-        "toscaNodeType": "Scully"

-      }

-    ]

-  }

+{
+  "serviceResources": {
+    "modelInfo": {
+      "modelName": "MSOTADevInfra_vSAMP10a_Service",
+      "modelUuid": "5df8b6de-2083-11e7-93ae-92361f002671",
+      "modelInvariantUuid": "9647dfc4-2083-11e7-93ae-92361f002671",
+      "modelVersion": "1.0"
+    },
+    "serviceType": "PortMirroring",
+    "serviceRole": "InfraRole",
+    "serviceVnfs": [
+      {
+        "modelInfo": {
+          "modelName": "vSAMP10a",
+          "modelUuid": "ff2ae348-214a-11e7-93ae-92361f002671",
+          "modelInvariantUuid": "2fff5b20-214b-11e7-93ae-92361f002671",
+          "modelVersion": "1.0",
+          "modelCustomizationUuid": "68dc9a92-214c-11e7-93ae-92361f002671",
+          "modelInstanceName": "vSAMP10a 1"
+        },
+        "toscaNodeType": "VF",
+        "nfFunction": null,
+        "nfType": null,
+        "nfRole": null,
+        "nfNamingCode": null,
+        "vfModules": [
+          {
+            "modelInfo": {
+              "modelName": "NetworkFqdnTest4",
+              "modelUuid": "025606c1-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba01a",
+              "modelVersion": "2.0",
+              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba01a"
+            },
+            "isBase": true,
+            "vfModuleLabel": "label",
+            "initialCount": 0,
+            "hasVolumeGroup": true
+          },
+          {
+            "modelInfo": {
+              "modelName": "NetworkFqdnTest3",
+              "modelUuid": "02560575-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba0bb",
+              "modelVersion": "1.0",
+              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d13cba0bb"
+            },
+            "isBase": true,
+            "vfModuleLabel": "label",
+            "initialCount": 0,
+            "hasVolumeGroup": false
+          },
+          {
+            "modelInfo": {
+              "modelName": "NetworkFqdnTest5",
+              "modelUuid": "025607e4-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": "06bd0a18-65c0-4418-83c7-5b0d14cba01a",
+              "modelVersion": "1.0",
+              "modelCustomizationUuid": "06bd0a18-65c0-4418-83c7-5b0d14cba01a"
+            },
+            "isBase": false,
+            "vfModuleLabel": "label",
+            "initialCount": 0,
+            "hasVolumeGroup": false
+          },
+          {
+            "modelInfo": {
+              "modelName": "vSAMP10aDEV::PCM::module-2",
+              "modelUuid": "7774b4e4-7d37-11e7-bb31-be2e44b06b34",
+              "modelInvariantUuid": "93e9c1d2-7d37-11e7-bb31-be2e44b06b34",
+              "modelVersion": "2",
+              "modelCustomizationUuid": "6728bee8-7d3a-11e7-bb31-be2e44b06b34"
+            },
+            "isBase": false,
+            "vfModuleLabel": "PCM",
+            "initialCount": 0,
+            "hasVolumeGroup": true
+          },
+          {
+            "modelInfo": {
+              "modelName": "vSAMP10aDEV::PCM::module-1",
+              "modelUuid": "066de97e-253e-11e7-93ae-92361f002671",
+              "modelInvariantUuid": "64efd51a-2544-11e7-93ae-92361f002671",
+              "modelVersion": "2",
+              "modelCustomizationUuid": "b4ea86b4-253f-11e7-93ae-92361f002671"
+            },
+            "isBase": false,
+            "vfModuleLabel": "PCM",
+            "initialCount": 0,
+            "hasVolumeGroup": true
+          },
+          {
+            "modelInfo": {
+              "modelName": "vSAMP10aDEV::base::module-0",
+              "modelUuid": "20c4431c-246d-11e7-93ae-92361f002671",
+              "modelInvariantUuid": "78ca26d0-246d-11e7-93ae-92361f002671",
+              "modelVersion": "2",
+              "modelCustomizationUuid": "cb82ffd8-252a-11e7-93ae-92361f002671"
+            },
+            "isBase": true,
+            "vfModuleLabel": "base",
+            "initialCount": 1,
+            "hasVolumeGroup": true
+          },
+          {
+            "modelInfo": {
+              "modelName": "vSAMP10a::base::module-0",
+              "modelUuid": "02560de2-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": null,
+              "modelVersion": "2",
+              "modelCustomizationUuid": "MIGRATED_36e76920-ef30-4793-9979-cbd7d4b2bfc4"
+            },
+            "isBase": true,
+            "vfModuleLabel": "base",
+            "initialCount": 1,
+            "hasVolumeGroup": true
+          },
+          {
+            "modelInfo": {
+              "modelName": "base::module-0",
+              "modelUuid": "02561381-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": null,
+              "modelVersion": "1",
+              "modelCustomizationUuid": "MIGRATED_51baae4c-b7c7-4f57-b77e-6e01acca89e5"
+            },
+            "isBase": true,
+            "vfModuleLabel": "module-0",
+            "initialCount": 1,
+            "hasVolumeGroup": false
+          },
+          {
+            "modelInfo": {
+              "modelName": "vSAMP10a::PCM::module-1",
+              "modelUuid": "02560f1b-4223-11e7-9252-005056850d2e",
+              "modelInvariantUuid": null,
+              "modelVersion": "1",
+              "modelCustomizationUuid": "MIGRATED_e9be2ed7-45b6-479c-b06e-9093899f8ce8"
+            },
+            "isBase": true,
+            "vfModuleLabel": "PCM",
+            "initialCount": 1,
+            "hasVolumeGroup": true
+          }
+        ]
+      }
+    ],
+    "serviceNetworks": [],
+    "serviceAllottedResources": [
+      {
+        "modelInfo": {
+          "modelName": "Tunnel_Xconn",
+          "modelUuid": "f6b7d4c6-e8a4-46e2-81bc-31cad5072842",
+          "modelInvariantUuid": "b7a1b78e-6b6b-4b36-9698-8c9530da14af",
+          "modelVersion": "1.0",
+          "modelCustomizationUuid": "5b9bee43-f537-4fb3-9e8b-4de9f714d28a",
+          "modelInstanceName": "Pri_Tunnel_Xconn 9"
+        },
+        "toscaNodeType": null,
+        "allottedResourceType": null,
+        "allottedResourceRole": null,
+        "providingServiceModelInvariantUuid": null,
+        "nfFunction": null,
+        "nfType": null,
+        "nfRole": null,
+        "nfNamingCode": null
+      }
+    ],
+    "serviceConfigs": [
+      {
+        "modelInfo": {
+          "modelName": "Molder",
+          "modelUuid": "025606c1-4fff-11e7-9252-005056850d2e",
+          "modelInvariantUuid": "025606c1-4eee-11e7-9252-005056850d2e",
+          "modelVersion": "1.0",
+          "modelCustomizationUuid": "025606c1-4ddd-11e7-9252-005056850d2e",
+          "modelInstanceName": "X_FILES_001"
+        },
+        "toscaNodeType": "Scully"
+      }
+    ]
+  }
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessage.txt b/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessage.txt
new file mode 100644
index 0000000000..d28b8f9920
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessage.txt
@@ -0,0 +1 @@
+{"messageId":"43b634ca-903f-47bb-8ef9-5ceb9f1b04bd","message":"0 : Stack error (CREATE_FAILED): Resource CREATE failed: Exception: resources.network: HTTP Status: 500 Content: <pre>Traceback (most recent call last):\n  File \"/usr/lib/python2.7/dist-packages/vnc_cfg_api_server/vnc_cfg_api_server.py\", line 622, in http_resource_create\n    ok, result = stateful_create()\n  File \"/usr/lib/python2.7/dist-packages/vnc_cfg_api_server/vnc_cfg_api_server.py\", line 566, in stateful_create\n    tenant_name, obj_dict, db_conn)\n  File \"/usr/lib/python2.7/dist-packages/vnc_cfg_api_server/vnc_cfg_types.py\", line 1463, in pre_dbe_create\n    vn_uuid)\n  File \"/usr/lib/python2.7/dist-packages/vnc_cfg_api_server/vnc_cfg_types.py\", line 1396, in _check_ipam_network_subnets\n    (ok, result) = cls.addr_mgmt.net_check_subnet(ipam_subnets)\n  File \"/usr/lib/python2.7/dist-packages/vnc_cfg_api_server/vnc_addr_mgmt.py\", line 987, in net_check_subnet\n    network = IPNetwork('%s/%s' % (prefix, prefix_len))\n  File \"/usr/lib/python2.7/dist-packages/netaddr/ip/__init__.py\", line 933, in __init__\n    raise AddrFormatError('invalid IPNetwork %s' % addr)\nAddrFormatError: invalid IPNetwork /0\n</pre>\n","category":"INTERNAL","rolledBack":true}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessageFlag.txt b/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessageFlag.txt
new file mode 100644
index 0000000000..9eef2b4a48
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/invalidErrorMessageFlag.txt
@@ -0,0 +1 @@
+{ %1$d Two: %2$d, # '-' /# }
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/requestDetails.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/requestDetails.json
new file mode 100644
index 0000000000..76616e14a5
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/requestDetails.json
@@ -0,0 +1,37 @@
+{
+	"requestDetails": {
+		"project": {
+			"projectName": "vSAMP12 Project"
+		},
+		"owningEntity": {
+			"owningEntityId": "MSO-Test-OE",
+			"owningEntityName": "MSO-Test123"
+		},
+		"modelInfo": {
+			"modelType": "service",
+			"modelInvariantUuid": "d214abcc-2083-11e7-93ae-92361f002671",
+			"modelUuid": "c4503baa-2083-11e7-93ae-92361f002671",
+			"modelName": "MSOTADevInfra_vSAMP12_Service",
+			"modelVersion": "1.0"
+		},
+		"subscriberInfo": {
+			"globalSubscriberId": "MSO_1610_dev",
+			"subscriberName": "MSO_1610_dev"
+		},
+		"requestInfo": {
+			"instanceName": "bensServiceInstance3",
+			"source": "VID",
+			"suppressRollback": "true",
+			"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
+		},
+		"cloudConfiguration": {
+			"lcpCloudRegionId": "mdt1",
+			"tenantId": "8b1df54faa3b49078e3416e21370a3ba"
+		},
+		"requestParameters": {
+			"subscriptionServiceType": "MSO-dev-service-type",
+			"aLaCarte": "false",
+			"userParams": []
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/schema.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/schema.json
new file mode 100644
index 0000000000..36b51e9575
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/schema.json
@@ -0,0 +1,16 @@
+{
+	"CreateServiceInstanceV3": {
+		"serviceInstance": {
+			"@class": "inventory.aai.onap.org.v12.ServiceInstance"
+		},
+		"project": {
+			"@class": "inventory.aai.onap.org.v12.Project"
+		},
+		"owningEntity": {
+			"@class": "inventory.aai.onap.org.v12.OwningEntity"
+		},
+		"customer": {
+			"@class": "inventory.aai.onap.org.v12.Customer"
+		}
+	}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/sdncCallbackSoapWrapper.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/sdncCallbackSoapWrapper.xml
index 0b1baf2cb4..3907f463be 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/sdncCallbackSoapWrapper.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/sdncCallbackSoapWrapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header />
 	<soapenv:Body>
 			<SDNCAdapterCallbackRequest
-				xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+				xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
 				<CallbackHeader>
 					<RequestId>SDNC_REQUEST_ID</RequestId>
 					<ResponseCode>200</ResponseCode>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfCreateSimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfCreateSimResponse.xml
index 7b5d22a1de..2c10f83b05 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfCreateSimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfCreateSimResponse.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp.mso/vnfNotify">
+	xmlns:v1="http://org.onap.so/vnfNotify">
 	<soapenv:Header />
 	<soapenv:Body>
-			<ns2:createVnfNotification xmlns:ns2="http://org.openecomp.mso/vnfNotify">
+			<ns2:createVnfNotification xmlns:ns2="http://org.onap.so/vnfNotify">
    <messageId>edab9ec7-6cf8-47cf-b58c-9ba4ef5d3f70</messageId>
    <completed>true</completed>
    <vnfId>slcp34248vbc/020a112b-a0c8-4143-87a3-698680ba2efe</vnfId>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfDeleteSimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfDeleteSimResponse.xml
index a4b0becee4..923ae70b4b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfDeleteSimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfDeleteSimResponse.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp.mso/vnfNotify">
+	xmlns:v1="http://org.onap.so/vnfNotify">
 	<soapenv:Header />
 	<soapenv:Body>
-	  <ns2:deleteVnfNotification xmlns:ns2="http://org.openecomp.mso/vnfNotify" >
+	  <ns2:deleteVnfNotification xmlns:ns2="http://org.onap.so/vnfNotify" >
         <messageId>f5e42814-72c0-4422-b840-e14e757a709b</messageId>
         <completed>true</completed>
       </ns2:deleteVnfNotification>	
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfQuerySimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfQuerySimResponse.xml
index 3b99363ea8..290749bba0 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfQuerySimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfQuerySimResponse.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp.mso/vnfNotify">
+	xmlns:v1="http://org.onap.so/vnfNotify">
 	<soapenv:Header />
 	<soapenv:Body>
-			<ns2:queryVnfNotification xmlns:ns2="http://org.openecomp.mso/vnfNotify">
+			<ns2:queryVnfNotification xmlns:ns2="http://org.onap.so/vnfNotify">
    <messageId>b1a82ce6-7f5c-45fd-9273-acaf88fc2222</messageId>
    <completed>true</completed>
    <vnfExists>true</vnfExists>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfRollbackSimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfRollbackSimResponse.xml
index 4fd0b62610..554dc2cdc0 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfRollbackSimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfRollbackSimResponse.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp.mso/vnfNotify">
+	xmlns:v1="http://org.onap.so/vnfNotify">
 	<soapenv:Header />
 	<soapenv:Body>
-	  <ns2:rollbackVnfNotification xmlns:ns2="http://org.openecomp.mso/vnfNotify" >
+	  <ns2:rollbackVnfNotification xmlns:ns2="http://org.onap.so/vnfNotify" >
         <messageId>b1a82ce6-7f5c-45fd-9273-acaf88fc2137</messageId>
         <completed>true</completed>
       </ns2:rollbackVnfNotification>	
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfadapter_request.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfadapter_request.xml
new file mode 100644
index 0000000000..fb18d77ad7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/vnfAdapterMocks/vnfadapter_request.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <createVfModuleRequest>
+        <backout>true</backout>
+        <baseVfModuleId />
+        <baseVfModuleStackId />
+        <cloudSiteId>RegionOne</cloudSiteId>
+        <failIfExists>true</failIfExists>
+        <messageId>8892cffa-3514-45d4-b2b0-0fde9a96e323-1511813289000</messageId>
+        <modelCustomizationUuid>2badc305-b2c0-4e2b-b03a-4e5d22079b30</modelCustomizationUuid>
+        <msoRequest>
+            <requestId>8892cffa-3514-45d4-b2b0-0fde9a96e323</requestId>
+            <serviceInstanceId>5dad9aac-6e05-4bdb-a8ec-4f3cd718c5c6</serviceInstanceId>
+        </msoRequest>
+        <notificationUrl>http://localhost:18080/mso/WorkflowMessage/VNFAResponse/8892cffa-3514-45d4-b2b0-0fde9a96e323-1511813289000</notificationUrl>
+        <requestType />
+        <skipAAI>true</skipAAI>
+        <synchronous>false</synchronous>
+        <tenantId>22eb191dd41a4f3c9be370fc638322f4</tenantId>
+        <vfModuleId>dbfad358-de02-4370-a0aa-c6651a5848b8</vfModuleId>
+        <vfModuleName>vRR-Internal-Network-L2</vfModuleName>
+        <vfModuleParams>
+            <aic_clli>MTJWNJA4LCP</aic_clli>
+            <availability_zone_0>nova</availability_zone_0>
+            <int_ctl_net_name_1>VRR-STMTN5MMSC20-INT1</int_ctl_net_name_1>
+            <int_ctl_net_name_2>VRR-STMTN5MMSC20-INT2</int_ctl_net_name_2>
+            <svc_provider_part_number>no</svc_provider_part_number>
+            <vnf_id>6d2e2469-8708-47c3-a0d4-73fa28a8a50b</vnf_id>
+            <vnf_name>STMTN5MMSC20</vnf_name>
+            <vrr_flavor_name>ns.c16r32d128.v1</vrr_flavor_name>
+            <vrr_image_name>MDT17</vrr_image_name>
+            <vrr_int_ctl_forwarding>12</vrr_int_ctl_forwarding>
+            <vrr_int_ctl_len_1>24</vrr_int_ctl_len_1>
+            <vrr_int_ctl_len_2>24</vrr_int_ctl_len_2>
+        </vfModuleParams>
+        <vfModuleType>Vrr_Internal_Networks_module-1</vfModuleType>
+        <vnfId>6d2e2469-8708-47c3-a0d4-73fa28a8a50b</vnfId>
+        <vnfType>STMTN5MMSC20</vnfType>
+        <vnfVersion>1.0</vnfVersion>
+        <volumeGroupId />
+        <volumeGroupStackId />
+    </createVfModuleRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml b/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
new file mode 100644
index 0000000000..715ddaa937
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
@@ -0,0 +1,223 @@
+aai:
+  auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
+  endpoint: http://localhost:${wiremock.server.port}
+appc:
+  client:
+    key: iaEMAfjsVsZnraBP
+    response:
+      timeout: '120000'
+    secret: wcivUjsjXzmGFBfxMmyJu9dz
+    poolMembers: localhost
+    service: ueb
+    topic:
+      read:
+        name: APPC-TEST-AMDOCS2
+        timeout: '120000'
+      write: APPC-TEST-AMDOCS1-DEV3
+      sdnc:
+        read: SDNC-LCM-READ
+        write: SDNC-LCM-WRITE
+log:
+  debug:
+    CompleteMsoProcess: 'true'
+    CreateNetworkInstanceInfra: 'true'
+    CreateServiceInstanceInfra: 'true'
+    DeleteNetworkInstanceInfra: 'true'
+    FalloutHandler: 'true'
+    UpdateNetworkInstanceInfra: 'true'
+    VnfAdapterRestV1: 'true'
+    sdncAdapter: 'true'
+    vnfAdapterCreateV1: 'true'
+    vnfAdapterRestV1: 'true'
+mso:
+  adapters:
+    completemsoprocess:
+      endpoint: http://localhost:${wiremock.server.port}/CompleteMsoProcess
+    db:
+      auth: 757A94191D685FD2092AC1490730A4FC
+      endpoint: http://localhost:${wiremock.server.port}/dbadapters/RequestsDbAdapter
+      att-endpoint: http://localhost:${wiremock.server.port}/dbadapters/AttRequestsDbAdapter
+      spring:
+        endpoint: http://localhost:${wiremock.server.port}
+    network:
+      endpoint: http://localhost:${wiremock.server.port}/networks/NetworkAdapter
+      rest:
+        endpoint: http://localhost:${wiremock.server.port}/networks/rest/v1/networks
+    openecomp:
+      db:
+        endpoint: http://localhost:${wiremock.server.port}/dbadapters/RequestsDbAdapter
+    po:
+      auth: 757A94191D685FD2092AC1490730A4FC
+      password: 3141634BF7E070AA289CF2892C986C0B
+    sdnc:
+      endpoint: http://localhost:${wiremock.server.port}/SDNCAdapter
+      rest:
+        endpoint: http://localhost:${wiremock.server.port}/SDNCAdapter/v1/sdnc
+      timeout: PT60S
+    tenant:
+      endpoint: http://localhost:${wiremock.server.port}/tenantAdapterMock
+    vnf:
+      endpoint: http://localhost:${wiremock.server.port}/vnfs/VnfAdapter
+      rest:
+        endpoint: http://localhost:${wiremock.server.port}/services/rest/v1/vnfs
+    volume-groups:
+      rest:
+        endpoint: http://localhost:${wiremock.server.port}/services/rest/v1/volume-groups
+    vnf-async:
+      endpoint: http://localhost:${wiremock.server.port}/vnfs/VnfAdapterAsync
+    workflow:
+      message:
+        endpoint: http://localhost:${wiremock.server.port}/workflows/messages/message
+
+  async:
+      core-pool-size: 50
+      max-pool-size: 50
+      queue-capacity: 500
+
+  bpmn:
+    optimisticlockingexception:
+      retrycount: '3'
+  callbackRetryAttempts: '5'
+  catalog:
+    db:
+      endpoint: http://localhost:${wiremock.server.port}/
+      spring:
+        endpoint: http://localhost:${wiremock.server.port} 
+  correlation:
+        timeout: 60
+  db:
+    auth: Basic YnBlbDptc28tZGItMTUwNyE=
+  default:
+    adapter:
+      namespace: http://org.onap.so
+  healthcheck:
+    log:
+      debug: 'false'
+  infra:
+    customer:
+      id: testCustIdInfra
+  logPath: logs
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  po:
+    timeout: PT60S
+  request:
+    db:
+      endpoint: http://localhost:${wiremock.server.port}/
+  rollback: 'true'
+  site-name: localDevEnv
+  workflow:    
+    default:
+      aai:
+        cloud-region:
+          version: '9'
+        generic-vnf:
+          version: '9'
+        v8:
+          customer:
+            uri: /aai/v8/business/customers/customer
+          generic-query:
+            uri: /aai/v8/search/generic-query
+          l3-network:
+            uri: /aai/v8/network/l3-networks/l3-network
+          network-policy:
+            uri: /aai/v8/network/network-policies/network-policy
+          nodes-query:
+            uri: /aai/v8/search/nodes-query
+          route-table-reference:
+            uri: /aai/v8/network/route-table-references/route-table-reference
+          tenant:
+            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+          vce:
+            uri: /aai/v8/network/vces/vce
+          vpn-binding:
+            uri: /aai/v8/network/vpn-bindings/vpn-binding
+        v9:
+          cloud-region:
+            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
+          generic-vnf:
+            uri: /aai/v9/network/generic-vnfs/generic-vnf
+    global:
+      default:
+        aai:
+          namespace: http://org.openecomp.aai.inventory/
+          version: '8'
+    message:
+      endpoint: http://localhost:${wiremock.server.port}/mso/WorkflowMesssage
+    notification:
+      name: GenericNotificationService
+    sdncadapter:
+      callback: http://localhost:${wiremock.server.port}/mso/SDNCAdapterCallbackService
+    vnfadapter:
+      create:
+        callback: http://localhost:${wiremock.server.port}/mso/vnfAdapterNotify
+      delete:
+        callback: http://localhost:${wiremock.server.port}/mso/vnfAdapterNotify
+      query:
+        callback: http://localhost:${wiremock.server.port}/mso/services/VNFAdapterQuerCallbackV1
+      rollback:
+        callback: http://localhost:${wiremock.server.port}/mso/vnfAdapterNotify
+  global:
+    dmaap:
+      username: dmaapUsername
+      password: dmaapPassword
+      host: http://localhost:${wiremock.server.port}
+      publisher:
+        topic: com.att.mso.asyncStatusUpdate
+  oof:
+    auth: test
+    timeout: PT10S
+    service:
+      agnostic:
+        endpoint: /api/oof/v1/placement
+        host: http://localhost:${wiremock.server.port}
+policy:
+  auth: Basic dGVzdHBkcDphbHBoYTEyMw==
+  client:
+    auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
+  endpoint: https://localhost:8081/pdp/api/
+  environment: TEST
+sdnc:
+  auth: Basic YWRtaW46YWRtaW4=
+  host: http://localhost:8446
+  path: /restconf/operations/GENERIC-RESOURCE-API
+sniro:
+  conductor:
+    enabled: true
+    host: http://localhost:${wiremock.server.port}
+    uri: /v1/release-orders
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+  manager:
+    timeout: PT30M
+    host: http://localhost:${wiremock.server.port}
+    uri.v1: /sniro/api/v2/placement
+    uri.v2: /sniro/api/placement/v2
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+    headers.patchVersion: 1
+    headers.minorVersion: 1
+    headers.latestVersion: 2
+
+spring:
+  datasource:
+    url: jdbc:mariadb://localhost:3307/camundabpmn
+    username: root
+    password: password
+    driver-class-name: org.mariadb.jdbc.Driver
+    initialize: true
+  jpa:
+    generate-ddl: false
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+      enable-lazy-load-no-trans: true
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+
+mariaDB4j:
+  dataDir:
+  port: 3307
+  databaseName: camundabpmn
+camunda:
+  bpm:
+    metrics:
+      enabled: false
+      db-reporter-activate: false
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/camunda.cfg.xml b/bpmn/MSOCommonBPMN/src/test/resources/camunda.cfg.xml
deleted file mode 100644
index e151aca5fd..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/camunda.cfg.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans" 
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <bean id="processEngineConfiguration" class="org.camunda.bpm.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration">
-
-    <property name="jdbcUrl" value="jdbc:h2:mem:camunda;DB_CLOSE_DELAY=1000" />
-    <property name="jdbcDriver" value="org.h2.Driver" />
-    <property name="jdbcUsername" value="sa" />
-    <property name="jdbcPassword" value="" />
-
-    <!-- Database configurations -->
-    <property name="databaseSchemaUpdate" value="true" />
-
-    <!-- job executor configurations -->
-    <property name="jobExecutorActivate" value="true" />
-
-    <property name="history" value="full" />
-
-    <!--<property name="idGenerator" ref="uuidGenerator" />-->
-
-    <!-- engine plugins -->
-    <property name="processEnginePlugins">
-      <list>
-        <ref bean="connectProcessEnginePlugin" />
-        <ref bean="spinProcessEnginePlugin" />
-        <ref bean="loggingPlugin" />
-        <ref bean="workflowExceptionPlugin" />
-	  </list>
-    </property>
-  </bean>
-
-  <bean id="loggingPlugin" class="org.openecomp.mso.bpmn.core.plugins.LoggingAndURNMappingPlugin" />
-  
-  <!-- Needed until all subflows generate MSOWorkflowException events --> 
-  <bean id="workflowExceptionPlugin" class="org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin" />
-
-  <!--<bean id="uuidGenerator" class="org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator" />-->
-
-  <!-- engine plugin beans -->
-  <bean id="connectProcessEnginePlugin" class="org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin" />
-  <bean id="spinProcessEnginePlugin" class="org.camunda.spin.plugin.impl.SpinProcessEnginePlugin" />
-
-</beans>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/logback-test.xml b/bpmn/MSOCommonBPMN/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..d8f6ba3930
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/logback-test.xml
@@ -0,0 +1,30 @@
+<configuration >
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+     <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+			</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="AUDIT" level="info" additivity="false">
+    <appender-ref ref="STDOUT" />
+  </logger>
+
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="ERROR" additivity="false">
+    <appender-ref ref="STDOUT" />
+  </logger>
+	<logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+		<appender-ref ref="STDOUT" />
+	</logger>
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+  <logger name="wiremock.org" level="DEBUG" />
+
+</configuration>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/logging.properties b/bpmn/MSOCommonBPMN/src/test/resources/logging.properties
deleted file mode 100644
index 4941c55971..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/logging.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#register SLF4JBridgeHandler as handler for the j.u.l. root logger
-handlers = org.slf4j.bridge.SLF4JBridgeHandler
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.properties
deleted file mode 100644
index f800d00245..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default BPMN properties for unit tests
-
-URNMapping.FileSystemLoading.Enabled=true
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
deleted file mode 100644
index 4b338aed0c..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default URN Mappings for unit tests
-
-mso.rollback=true
-
-canopi.auth=757A94191D685FD2092AC1490730A4FC
-csi.aots.addincidentmanagement.endpoint=http://localhost:28090/AddIncidentManagementTicketRequest
-csi.networkstatus.endpoint=http://localhost:28090/SendManagedNetworkStatusNotification
-mso.csi.pwd=4EA237303511EFBBC37F17A351562131
-mso.csi.usrname=mso
-mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
-
-mso.healthcheck.log.debug=false
-
-mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
-
-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
-
-mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
-mso.adapters.network.rest.endpoint=http://localhost:28090/networks/rest/v1/networks
-
-mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC
-mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B
-mso.po.timeout=PT60S
-mso.default.adapter.namespace=http://org.openecomp.mso
-mso.adapters.workflow.message.endpoint=http://localhost:28090/workflows/messages/message
-
-aai.auth=26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
-
-policy.endpoint=https://mtanjvsgcvm02.nvp.cip.att.com:8081/pdp/api/
-policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk
-policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==
-policy.environment=TEST
-
-appc.client.topic.read=APPC-TEST-AMDOCS2
-appc.client.topic.write=APPC-TEST-AMDOCS1-DEV3
-appc.client.topic.sdnc.read=SDNC-LCM-READ
-appc.client.topic.sdnc.write=SDNC-LCM-WRITE
-appc.client.topic.read.timeout=120000
-appc.client.response.timeout=120000
-appc.client.poolMembers=uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904
-appc.client.key=iaEMAfjsVsZnraBP
-appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz
-appc.client.service=ueb
-
-mso.adapters.sdnc.endpoint=http://localhost:28090/SDNCAdapter
-mso.adapters.sdnc.rest.endpoint=http://localhost:28090/SDNCAdapter/v1/sdnc
-mso.adapters.sdnc.timeout=PT60S
-mso.sdnc.firewall.yang.model=http://com/openecomp/svc/mis/firewall-lite-gui
-mso.sdnc.firewall.yang.model.version=2015-05-15
-mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B
-mso.sdnc.timeout.firewall.minutes=20
-mso.callbackRetryAttempts=5
-mso.sdnc.timeout=PT10S
-mso.sdnc.timeout.ucpe.async.hours=120
-mso.sdnc.timeout.ucpe.async.minutes=5
-mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
-mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
-
-mso.sniro.auth=test:testpwd
-mso.sniro.timeout=PT30M
-mso.sniro.policies.dhv.2vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1
-mso.sniro.policies.dhv.4vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1
-
-mso.service.agnostic.sniro.host=http://localhost:28090
-mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement
-
-mso.oof.auth=test:testpwd
-mso.oof.endpoint=http://localhost:28090/api/oof/v1/placement
-mso.oof.timeout=PT30M
-mso.service.agnostic.oof.host=http://localhost:28090
-mso.service.agnostic.oof.endpoint=/api/oof/v1/placement
-
-mso.catalog.db.endpoint=http://localhost:28090/
-
-ruby.create-ticket-request.dmaap.username=m04768@mso.ecomp.att.com
-ruby.create-ticket-request.dmaap.password=eHQ1cUJrOUc
-ruby.create-ticket-request.publisher.topic=com.att.pdas.st1.msoCMFallout-v1
-
-
-mso.adapters.tenant.endpoint=http://localhost:28090/tenantAdapterMock
-mso.adapters.vnf-async.endpoint=http://localhost:28090/vnfs/VnfAdapterAsync
-mso.adapters.vnf.endpoint=http://localhost:28090/vnfs/VnfAdapter
-mso.adapters.vnf.rest.endpoint=http://localhost:28090/vnfs/rest/v1/vnfs
-mso.workflow.vnfadapter.create.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.delete.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.vnfadapter.query.callback=http://localhost:28080/mso/services/VNFAdapterQuerCallbackV1
-mso.workflow.vnfadapter.rollback.callback=http://localhost:28080/mso/vnfAdapterNotify
-mso.workflow.createvce.delay.seconds=1
-mso.infra.customer.id=testCustIdInfra
-
-aai.endpoint=http://localhost:28090
-
-# AAI version mappings
-
-# Example to override default version for a resource:
-#mso.workflow.default.aai.vce.version=6
-#mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce
-mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/
-mso.workflow.global.default.aai.version=8
-mso.workflow.default.aai.cloud-region.version=9
-mso.workflow.default.aai.generic-vnf.version=9
-
-mso.workflow.default.aai.v9.cloud-region.uri=/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-mso.workflow.default.aai.v8.customer.uri=/aai/v8/business/customers/customer
-mso.workflow.default.aai.v8.generic-query.uri=/aai/v8/search/generic-query
-mso.workflow.default.aai.v9.generic-vnf.uri=/aai/v9/network/generic-vnfs/generic-vnf
-mso.workflow.default.aai.v8.l3-network.uri=/aai/v8/network/l3-networks/l3-network
-mso.workflow.default.aai.v8.network-policy.uri=/aai/v8/network/network-policies/network-policy
-mso.workflow.default.aai.v8.nodes-query.uri=/aai/v8/search/nodes-query
-mso.workflow.default.aai.v8.route-table-reference.uri=/aai/v8/network/route-table-references/route-table-reference
-mso.workflow.default.aai.v8.tenant.uri=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-mso.workflow.default.aai.v8.vce.uri=/aai/v8/network/vces/vce
-mso.workflow.default.aai.v8.vpn-binding.uri=/aai/v8/network/vpn-bindings/vpn-binding
-mso.workflow.notification.name=GenericNotificationService
-mso.bpmn.optimisticlockingexception.retrycount=3
-
-log.debug.CompleteMsoProcess=true
-log.debug.CreateNetworkInstanceInfra=true
-log.debug.CreateServiceInstanceInfra=true
-log.debug.DeleteNetworkInstanceInfra=true
-log.debug.FalloutHandler=true
-log.debug.GenericGetService=true
-log.debug.sdncAdapter=true
-log.debug.UpdateNetworkInstanceInfra=true
-log.debug.VnfAdapterRestV1=true
-log.debug.GenericGetNetwork=true
-log.debug.GenericGetVnf=true
-log.debug.GenericDeleteService=true
-log.debug.GenericDeleteNetwork=true
-log.debug.GenericDeleteVnf=true
-log.debug.vnfAdapterCreateV1=true
-log.debug.vnfAdapterRestV1=true
-
-sdno.health-check.dmaap.username=m04768@mso.ecomp.att.com
-sdno.health-check.dmaap.password=eHQ1cUJrOUc
-sdno.health-check.dmaap.subscriber.topic=com.att.sdno.test-health-diagnostic-v02
-sdno.health-check.dmaap.publisher.topic=com.att.sdno.test-health-diagnostic-v02
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.properties
deleted file mode 100644
index 2428b512b1..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP 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=========================================================
-###
-
-### SDNCURL 
-###
-#EE#
-org.openecomp.mso.adapters.sdnc.sdncgeturl=https://localhost:8443/restconf/config/L3SDN-API:
-org.openecomp.mso.adapters.sdnc.sdncposturl=https://localhost:8443/restconf/operations/L3SDN-API:
-###
-### BPEL ASYNC CALLLBACK/NOTIFICATION URL
-###
-#EE#
-org.openecomp.mso.adapters.sdnc.bpelurl=http://localhost:8080/active-bpel/services/SDNCAdapterCallbackV1
-###
-### SDNC ASYNC NOTIFICATION/RESPONSE URL
-###
-#EE#
-org.openecomp.mso.adapters.sdnc.myurl=https://localhost:8443/adapters/rest/SDNCNotify
-###
-org.openecomp.mso.adapters.sdnc.sdncauth=admin:admin
-org.openecomp.mso.adapters.sdnc.bpelauth=avosAdmin:jboss123
-org.openecomp.mso.adapters.sdnc.sdncconnecttime=2000
-org.openecomp.mso.adapters.sdnc.sdncreadtime=5000
-
-org.openecomp.mso.adapters.sdnc...query=toto
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.sdnc.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.sdnc.properties
deleted file mode 100644
index f53e2d2b65..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.sdnc.properties
+++ /dev/null
@@ -1,152 +0,0 @@
-#MSO SDNCA Properties go here
-###
-### UNIQUE SDNCURLs for Requests supported by SDNCA. URLS have unique tags eg a format like sdncurlXY (XY is unique eg digits)
-###
-org.openecomp.mso.adapters.sdnc.sdncurl1=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/L3SDN-API:
-org.openecomp.mso.adapters.sdnc.sdncurl2=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/config/L3SDN-API:
-org.openecomp.mso.adapters.sdnc.sdncurl3=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/AicHoming:
-org.openecomp.mso.adapters.sdnc.sdncurl4=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/Firewall-API:
-org.openecomp.mso.adapters.sdnc.sdncurl5=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/config
-org.openecomp.mso.adapters.sdnc.sdncurl6=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/VNF-API:
-org.openecomp.mso.adapters.sdnc.sdncurl7=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/L3UCPE-API:
-org.openecomp.mso.adapters.sdnc.sdncurl8=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/NBNC-API:
-org.openecomp.mso.adapters.sdnc.sdncurl9=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/NORTHBOUND-API:service-topology-operation
-org.openecomp.mso.adapters.sdnc.sdncurl10=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/GENERIC-RESOURCE-API:
-org.openecomp.mso.adapters.sdnc.sdncurl11=https://sdncodl.it.us.03.aic.cip.att.com:8443/restconf/operations/VNFTOPOLOGYAIC-API:
-org.openecomp.mso.adapters.sdnc.sdncurl12=https://sdncodl.it.us.03.aic.cip.att.com:8443/
-org.openecomp.mso.adapters.sdnc.sdncurl13=http://mtznjv1fcbc01.kvm.cip.att.com:8181/restconf/operations/SDNW-API:
-#org.openecomp.mso.adapters.sdnc.sdncurl14=http://txcdtl01bb2697.itservices.sbc.com:8181/restconf/operations/GENERIC-RESOURCE-API:port-mirror-topology-operation
-org.openecomp.mso.adapters.sdnc.sdncurl14=http://mtanjv9sdbc51-eth1-0.aic.cip.att.com:8443/restconf/operations/GENERIC-RESOURCE-API:
-### BPEL ASYNC CALLBACK/NOTIFICATION URL
-###
-org.openecomp.mso.adapters.sdnc.bpelurl=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/mso/SDNCAdapterCallbackService
-org.openecomp.mso.adapters.sdnc.rest.bpelurl=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/mso/WorkflowMessage
-###
-### SDNC ASYNC NOTIFICATION/RESPONSE URL
-###
-org.openecomp.mso.adapters.sdnc.myurl=http://mtanjv9moja02-eth1-0.aic.cip.att.com:8080/adapters/rest/SDNCNotify
-### Production value diff from other servers
-org.openecomp.mso.adapters.sdnc.sdncauth=406B2AE613211B6FB52466DE6E1769AC
-org.openecomp.mso.adapters.sdnc.bpelauth=F8E9452B55DDE4CCE77547B0E748105C54CF5EF1351B4E2CBAABF2981EFE776D
-org.openecomp.mso.adapters.sdnc.sdncconnecttime=5000
-###
-### Distinct Requests Supported by SDNCA. sdncurls added on top of file. fields may be null eg msoaction,operation resulting in .. construct
-###
-###org.openecomp.mso.adapters.sdnc.MSOACTION.OPERATION.ACTION=METHOD|TIMEOUT|URL|HEADERNAME|NAMESPACE
-### 
-org.openecomp.mso.adapters.sdnc..service-homing-operation.homing=POST|60000|sdncurl3|sdnc-homing-header|com:att:sdnctl:aicHoming
-org.openecomp.mso.adapters.sdnc.infra..query=GET|60000|sdncurl5|
-org.openecomp.mso.adapters.sdnc.mobility..query=GET|60000|sdncurl5|
-org.openecomp.mso.adapters.sdnc.vfmodule..query=GET|60000|sdncurl12|
-org.openecomp.mso.adapters.sdnc...query=GET|60000|sdncurl2|
-org.openecomp.mso.adapters.sdnc...put=PUT|60000|sdncurl5|
-org.openecomp.mso.adapters.sdnc...restdelete=DELETE|60000|sdncurl5|
-org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.assign=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.svc-topology-operation.delete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.reserve=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.activate=POST|90000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.delete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.turnup=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changereserve=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changedelete=POST|250000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc.gammainternet.service-configuration-operation.changeactivate=POST|60000|sdncurl1|sdnc-request-header|com:att:sdnctl:l3api
-org.openecomp.mso.adapters.sdnc..feature-configuration-operation.activate=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
-org.openecomp.mso.adapters.sdnc..feature-configuration-operation.changeactivate=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
-org.openecomp.mso.adapters.sdnc..feature-configuration-operation.delete=POST|60000|sdncurl4|sdnc-feature-request-header|com:att:sdnctl:firewallapi
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..vnf-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.reserve=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.assign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.activate=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.rollback=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.delete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.changeassign=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc..network-topology-operation.changedelete=POST|270000|sdncurl6|sdnc-request-header|org:openecomp:sdnctl:vnf
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.prepare=POST|360000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activate=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.delete=POST|360000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.complete=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.activatevnf=POST|600000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.designvnf=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc.ucpe.service-configuration-operation.removevnf=POST|60000|sdncurl7|sdnc-request-header|com:att:sdnctl:l3ucpe
-org.openecomp.mso.adapters.sdnc..svc-topology-operation.assign=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-org.openecomp.mso.adapters.sdnc..svc-topology-operation.activate=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-org.openecomp.mso.adapters.sdnc..svc-topology-operation.delete=POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-
-org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe.service-topology-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.ucpe-vnf.service-topology-cust-remove-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.dhv.service-topology-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-assign-operation=POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.infra.service-topology-infra-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vhnportal.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-infra-register-vnf-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vhngw.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.vvig.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-assign-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-stage-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-org.openecomp.mso.adapters.sdnc.service.pe.service-topology-cust-activate-operation=POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-
-org.openecomp.mso.adapters.sdnc..service-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..service-topology-operation.rollback=POST|270000|sdncur10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..service-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..service-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.network-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.rollback=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.changeassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vnf-topology-operation.changedelete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.rollback=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.changeassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.generic-resource.vf-module-topology-operation.changedelete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.create=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..contrail-route-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.unassign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.create=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..security-zone-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-
-org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.assign=POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic
-org.openecomp.mso.adapters.sdnc..vnf-topology-aic-operation.activate=POST|270000|sdncurl11|sdnc-request-header|com:att:sdnctl:vnftopologyaic
-
-org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.assign=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.rollback=POST|270000|sdncur13|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.delete=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.deactivate=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc.TRANSPORT.service-topology-operation.activate=POST|270000|sdncurl13|sdnc-request-header|com:att:sdnctl:generic-resource
-
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.assign=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.activate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.deactivate=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.enable=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.disable=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-org.openecomp.mso.adapters.sdnc..port-mirror-topology-operation.delete=POST|270000|sdncurl10|sdnc-request-header|com:att:sdnctl:generic-resource
-
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json
new file mode 100644
index 0000000000..e9172c5ba0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json
@@ -0,0 +1,21 @@
+{
+  "asyncRequestStatus" : {
+    "requestId" : "rq1234d1-5a33-55df-13ab-12abad84e331",
+    "clientSource" : "SPP",
+    "correlator" : "myClientId123",
+    "instanceReferences" : {
+      "serviceInstanceId" : "bc305d54-75b4-431b-adb2-eb6b9e546014"
+    },
+    "startTime" : "2017-11-17T09:30:47Z",
+    "finishTime" : "2017-11-17T09:30:47Z",
+    "requestScope" : "service",
+    "requestType" : "createInstance",
+    "requestStatus" : {
+      "timestamp" : "2017-11-17T09:30:47Z",
+      "requestState" : "COMPLETE",
+      "statusMessage" : "Success",
+      "percentProgress" : "100",
+      "wasRolledBack" : true
+    }
+  }
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
index e388d3e9ad..e388d3e9ad 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
index b9ad7a1f94..8c3ca1938d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
@@ -1,26 +1,26 @@
-{

-	"body": {

-		"input": {

-			"request-hd-custom": {

-				"request-client-name": "MSO",

-				"request-user-id": "test-user",

-				"request-id": "test-request-id",

-				"health-diagnostic-code": "VROUTER000004",

-				"operation-type": "lport_mirroring_check",

-				"aai-param-list": [

-					{

-						"key": "configuration-id",

-						"value": "test-configuration-id"

-					},

-					{

-						"key": "interface-id",

-						"value": "test-interface-id"

-					}

-				]

-			}

-		}

-	},

-	"operation": "health-diagnostic-custom",

-	"nodeLoc": "test-clli",

-	"nodeType": "VROUTER"

+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000004",
+				"operation-type": "lport_mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					},
+					{
+						"key": "interface-id",
+						"value": "test-interface-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
index ee28da86b9..08220abe2d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
@@ -1,26 +1,26 @@
-{

-	"body": {

-		"input": {

-			"request-hd-custom": {

-				"request-client-name": "MSO",

-				"request-user-id": "test-user",

-				"request-id": "test-request-id",

-				"health-diagnostic-code": "VROUTER000003",

-				"operation-type": "lport_mirroring_check",

-				"aai-param-list": [

-					{

-						"key": "configuration-id",

-						"value": "test-configuration-id"

-					},

-					{

-						"key": "interface-id",

-						"value": "test-interface-id"

-					}

-				]

-			}

-		}

-	},

-	"operation": "health-diagnostic-custom",

-	"nodeLoc": "test-clli",

-	"nodeType": "VROUTER"

+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000003",
+				"operation-type": "lport_mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					},
+					{
+						"key": "interface-id",
+						"value": "test-interface-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
index 95746ec3f9..834fcc8e72 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
@@ -1,22 +1,22 @@
-{

-	"body": {

-		"input": {

-			"request-hd-custom": {

-				"request-client-name": "MSO",

-				"request-user-id": "test-user",

-				"request-id": "test-request-id",

-				"health-diagnostic-code": "VROUTER000004",

-				"operation-type": "mirroring_check",

-				"aai-param-list": [

-					{

-						"key": "configuration-id",

-						"value": "test-configuration-id"

-					}

-				]

-			}

-		}

-	},

-	"operation": "health-diagnostic-custom",

-	"nodeLoc": "test-clli",

-	"nodeType": "VROUTER"

+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000004",
+				"operation-type": "mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
index 19d934d291..19d934d291 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-failure.json
index 15160b9dd9..8cf0a820cd 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-failure.json
@@ -8,7 +8,7 @@
 				"response-id": "191bf423-8473-4f7c-9fbb-e5dcbb40a12b",
 				"remote_end_time": "2017-10-13T14:51:53.490+0000",
 				"response-client-name": "MSO",
-				"user_id": "md5621",
+				"user_id": "xxxxxx",
 				"remote_start_time": "2017-10-13T14:51:53.173+0000",
 				"error-message": "my error message",
 				"connection-failure-msg": "SDNO was unable to connect to an Ansible REST API server; Please ensure Ansible REST server is running"
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-success.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-success.json
index a6794327d8..a6794327d8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-success.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-success.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/response.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/response.json
index 2355e86938..2355e86938 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/response.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/response.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/response/clientServiceResponse.json b/bpmn/MSOCommonBPMN/src/test/resources/response/clientServiceResponse.json
new file mode 100644
index 0000000000..0259e2f7fe
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/response/clientServiceResponse.json
@@ -0,0 +1,105 @@
+{
+	"version": null,
+	"modelName": "MSOTADevInfra_vSAMP10a_Service",
+	"description": "MSO aLaCarte Vfmodule with addon",
+	"modelUUID": "5df8b6de-2083-11e7-93ae-92361f002672",
+	"modelInvariantUUID": "9647dfc4-2083-11e7-93ae-92361f002671",
+	"created": 1492191759000,
+	"modelVersion": "2.0",
+	"serviceType": "NA",
+	"serviceRole": "NA",
+	"environmentContext": "Luna",
+	"workloadContext": "Oxygen",
+	"networkCustomizations": [
+		{
+			"modelCustomizationUUID": "3bdbb104-476c-483e-9f8b-c095b3d308ac",
+			"modelInstanceName": "CONTRAIL30_GNDIRECT 9",
+			"created": 1484703305000,
+			"networkTechnology": "",
+			"networkType": "",
+			"networkScope": "",
+			"networkRole": "",
+			"networkResource": null,
+			"handler": {
+				
+			}
+		}
+	],
+	"vnfCustomizations": [
+		{
+			"version": null,
+			"modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002672",
+			"modelInstanceName": "vSAMP10a 2",
+			"created": "2017-04-14 21:46:28.000",
+			"minInstances": 0,
+			"maxInstances": 0,
+			"availabilityZoneMaxCount": 0,
+			"nfFunction": "vSAMP",
+			"nfType": "vSAMP",
+			"nfRole": "vSAMP",
+			"nfNamingCode": "vSAMP",
+			"multiStageDesign": null,
+			"vnfResources": null,
+			"vfModuleCustomizations": [
+				{
+					"modelCustomizationUUID": "cb82ffd8-252a-11e7-93ae-92361f002672",
+					"label": "base",
+					"minInstances": 0,
+					"maxInstances": 0,
+					"initialCount": 1,
+					"availabilityZoneCount": 0,
+					"created": "2016-09-14 18:19:56.000",
+					"volumeHeatEnv": null,
+					"heatEnvironment": null,
+					"vfModule": null
+				},
+				{
+					"modelCustomizationUUID": "b4ea86b4-253f-11e7-93ae-92361f002672",
+					"label": "PCM",
+					"minInstances": 0,
+					"maxInstances": 0,
+					"initialCount": 0,
+					"availabilityZoneCount": 0,
+					"created": "2016-09-14 18:19:56.000",
+					"volumeHeatEnv": null,
+					"heatEnvironment": null,
+					"vfModule": null
+				}
+			],
+			"handler": {
+				
+			},
+			"vnfResource": null,
+			"creationTimestamp": 1492206388000
+		}
+	],
+	"allottedCustomizations": [
+		{
+			"version": null,
+			"modelCustomizationUUID": null,
+			"created": 1484946860000,
+			"modelInstanceName": "Sec_Tunnel_Xconn 11",
+			"providingServiceModelInvariantUUID": null,
+			"providingServiceModelUUID": null,
+			"providingServiceModelName": null,
+			"targetNetworkRole": null,
+			"nfFunction": null,
+			"nfType": null,
+			"nfRole": null,
+			"nfNamingCode": null,
+			"minInstances": null,
+			"maxInstances": null,
+			"allottedResource": null,
+			"handler": {
+				
+			}
+		}
+	],
+	"recipes": {
+		
+	},
+	"csar": null,
+	"handler": {
+		
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/response/infraActiveRequestsResponse.json b/bpmn/MSOCommonBPMN/src/test/resources/response/infraActiveRequestsResponse.json
new file mode 100644
index 0000000000..9cc84f2cd4
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/response/infraActiveRequestsResponse.json
@@ -0,0 +1,46 @@
+{
+	"requestId": "00032ab7-3fb3-42e5-965d-8ea592502017",
+	"clientRequestId": "00032ab7-3fb3-42e5-965d-8ea592502016",
+	"action": "deleteInstance",
+	"requestStatus": "COMPLETE",
+	"statusMessage": "Vf Module has been deleted successfully.",
+	"progress": 100,
+	"startTime": 1482451194000,
+	"endTime": 1482451228000,
+	"source": "VID",
+	"vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+	"vnfName": null,
+	"vnfType": null,
+	"serviceType": null,
+	"aicNodeClli": null,
+	"tenantId": "6accefef3cb442ff9e644d589fb04107",
+	"provStatus": null,
+	"vnfParams": null,
+	"vnfOutputs": null,
+	"requestBody": "{\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"vSAMP10aDEV::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"mtn6\"}}",
+	"responseBody": null,
+	"lastModifiedBy": "BPMN",
+	"modifyTime": 1482451228000,
+	"requestType": null,
+	"volumeGroupId": null,
+	"volumeGroupName": null,
+	"vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+	"vfModuleName": null,
+	"vfModuleModelName": "vSAMP10aDEV::base::module-0",
+	"aaiServiceId": null,
+	"aicCloudRegion": "mtn6",
+	"callBackUrl": null,
+	"correlator": null,
+	"serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+	"serviceInstanceName": null,
+	"requestScope": "vfModule",
+	"requestAction": "deleteInstance",
+	"networkId": null,
+	"networkName": null,
+	"networkType": null,
+	"requestorId": null,
+	"configurationId": null,
+	"configurationName": null,
+	"operationalEnvId": null,
+	"operationalEnvName": null
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/schema.sql b/bpmn/MSOCommonBPMN/src/test/resources/schema.sql
new file mode 100644
index 0000000000..7a15e84662
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/schema.sql
@@ -0,0 +1,1188 @@
+
+USE `camundabpmn`;
+
+
+create table ACT_GE_PROPERTY (
+    NAME_ varchar(64),
+    VALUE_ varchar(300),
+    REV_ integer,
+    primary key (NAME_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+
+create table ACT_GE_BYTEARRAY (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    BYTES_ LONGBLOB,
+    GENERATED_ TINYINT,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RE_DEPLOYMENT (
+    ID_ varchar(64),
+    NAME_ varchar(255),
+    DEPLOY_TIME_ timestamp(3),
+    SOURCE_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXECUTION (
+    ID_ varchar(64),
+    REV_ integer,
+    PROC_INST_ID_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    IS_ACTIVE_ TINYINT,
+    IS_CONCURRENT_ TINYINT,
+    IS_SCOPE_ TINYINT,
+    IS_EVENT_SCOPE_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    CACHED_ENT_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    DEPLOYMENT_ID_ varchar(64),
+    SUSPENSION_STATE_ integer NOT NULL DEFAULT 1,
+    JOB_DEF_ID_ varchar(64),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_JOBDEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    ACT_ID_ varchar(255),
+    JOB_TYPE_ varchar(255) NOT NULL,
+    JOB_CONFIGURATION_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    JOB_PRIORITY_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RE_PROCDEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    HAS_START_FORM_KEY_ TINYINT,
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    VERSION_TAG_ varchar(64),
+    HISTORY_TTL_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp(3),
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    VAR_SCOPE_ varchar(64) not null,
+    SEQUENCE_COUNTER_ bigint,
+    IS_CONCURRENT_LOCAL_ TINYINT,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp(3) not null,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_INCIDENT (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  INCIDENT_TIMESTAMP_ timestamp(3) not null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  EXECUTION_ID_ varchar(64),
+  ACTIVITY_ID_ varchar(255),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_AUTHORIZATION (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ integer not null,
+  GROUP_ID_ varchar(255),
+  USER_ID_ varchar(255),
+  RESOURCE_TYPE_ integer not null,
+  RESOURCE_ID_ varchar(255),
+  PERMS_ integer,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_FILTER (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  RESOURCE_TYPE_ varchar(255) not null,
+  NAME_ varchar(255) not null,
+  OWNER_ varchar(255),
+  QUERY_ LONGTEXT not null,
+  PROPERTIES_ LONGTEXT,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_METER_LOG (
+  ID_ varchar(64) not null,
+  NAME_ varchar(64) not null,
+  REPORTER_ varchar(255),
+  VALUE_ bigint,
+  TIMESTAMP_ timestamp(3),
+  MILLISECONDS_ bigint DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXT_TASK (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  WORKER_ID_ varchar(255),
+  TOPIC_NAME_ varchar(255),
+  RETRIES_ integer,
+  ERROR_MSG_ varchar(4000),
+  ERROR_DETAILS_ID_ varchar(64),
+  LOCK_EXP_TIME_ timestamp(3) NULL,
+  SUSPENSION_STATE_ integer,
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  PROC_DEF_KEY_ varchar(255),
+  ACT_ID_ varchar(255),
+  ACT_INST_ID_ varchar(64),
+  TENANT_ID_ varchar(64),
+  PRIORITY_ bigint NOT NULL DEFAULT 0,
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_BATCH (
+  ID_ varchar(64) not null,
+  REV_ integer not null,
+  TYPE_ varchar(255),
+  TOTAL_JOBS_ integer,
+  JOBS_CREATED_ integer,
+  JOBS_PER_SEED_ integer,
+  INVOCATIONS_PER_JOB_ integer,
+  SEED_JOB_DEF_ID_ varchar(64),
+  BATCH_JOB_DEF_ID_ varchar(64),
+  MONITOR_JOB_DEF_ID_ varchar(64),
+  SUSPENSION_STATE_ integer,
+  CONFIGURATION_ varchar(255),
+  TENANT_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);
+create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_);
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_);
+create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_);
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_);
+create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
+create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_);
+create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
+create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_);
+create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_);
+-- CAM-5914
+create index ACT_IDX_JOB_EXECUTION_ID on ACT_RU_JOB(EXECUTION_ID_);
+-- this index needs to be limited in mariadb see CAM-6938
+create index ACT_IDX_JOB_HANDLER on ACT_RU_JOB(HANDLER_TYPE_(100),HANDLER_CFG_(155));
+create index ACT_IDX_JOB_PROCINST on ACT_RU_JOB(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_JOB_TENANT_ID on ACT_RU_JOB(TENANT_ID_);
+create index ACT_IDX_JOBDEF_TENANT_ID on ACT_RU_JOBDEF(TENANT_ID_);
+
+-- new metric milliseconds column
+CREATE INDEX ACT_IDX_METER_LOG_MS ON ACT_RU_METER_LOG(MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_NAME_MS ON ACT_RU_METER_LOG(NAME_, MILLISECONDS_);
+CREATE INDEX ACT_IDX_METER_LOG_REPORT ON ACT_RU_METER_LOG(NAME_, REPORTER_, MILLISECONDS_);
+
+-- old metric timestamp column
+CREATE INDEX ACT_IDX_METER_LOG_TIME ON ACT_RU_METER_LOG(TIMESTAMP_);
+CREATE INDEX ACT_IDX_METER_LOG ON ACT_RU_METER_LOG(NAME_, TIMESTAMP_);
+
+create index ACT_IDX_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_);
+create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_);
+create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_);
+create index ACT_IDX_EXT_TASK_ERR_DETAILS ON ACT_RU_EXT_TASK(ERROR_DETAILS_ID_);
+create index ACT_IDX_AUTH_GROUP_ID ON ACT_RU_AUTHORIZATION(GROUP_ID_);
+create index ACT_IDX_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_);
+
+alter table ACT_GE_BYTEARRAY
+    add constraint ACT_FK_BYTEARR_DEPL
+    foreign key (DEPLOYMENT_ID_)
+    references ACT_RE_DEPLOYMENT (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_SUPER
+    foreign key (SUPER_EXEC_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_EXECUTION
+    add constraint ACT_FK_EXE_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_TSKASS_TASK
+    foreign key (TASK_ID_)
+    references ACT_RU_TASK (ID_);
+
+alter table ACT_RU_IDENTITYLINK
+    add constraint ACT_FK_ATHRZ_PROCEDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF(ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_PROCDEF
+  foreign key (PROC_DEF_ID_)
+  references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BYTEARRAY
+    foreign key (BYTEARRAY_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EVENT_SUBSCR
+    add constraint ACT_FK_EVENT_EXEC
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION(ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCINST
+    foreign key (PROC_INST_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_PROCDEF
+    foreign key (PROC_DEF_ID_)
+    references ACT_RE_PROCDEF (ID_);
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_CAUSE
+    foreign key (CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_RCAUSE
+    foreign key (ROOT_CAUSE_INCIDENT_ID_)
+    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_ERROR_DETAILS
+    foreign key (ERROR_DETAILS_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_INC_JOB_DEF on ACT_RU_INCIDENT(JOB_DEF_ID_);
+alter table ACT_RU_INCIDENT
+    add constraint ACT_FK_INC_JOB_DEF
+    foreign key (JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_USER
+    unique (USER_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_AUTHORIZATION
+    add constraint ACT_UNIQ_AUTH_GROUP
+    unique (GROUP_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_UNIQ_VARIABLE
+    unique (VAR_SCOPE_, NAME_);
+
+alter table ACT_RU_EXT_TASK
+    add constraint ACT_FK_EXT_TASK_EXE
+    foreign key (EXECUTION_ID_)
+    references ACT_RU_EXECUTION (ID_);
+
+create index ACT_IDX_BATCH_SEED_JOB_DEF ON ACT_RU_BATCH(SEED_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_SEED_JOB_DEF
+    foreign key (SEED_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_MONITOR_JOB_DEF ON ACT_RU_BATCH(MONITOR_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_MONITOR_JOB_DEF
+    foreign key (MONITOR_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+create index ACT_IDX_BATCH_JOB_DEF ON ACT_RU_BATCH(BATCH_JOB_DEF_ID_);
+alter table ACT_RU_BATCH
+    add constraint ACT_FK_BATCH_JOB_DEF
+    foreign key (BATCH_JOB_DEF_ID_)
+    references ACT_RU_JOBDEF (ID_);
+
+-- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 --
+create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_);
+create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_);
+create index ACT_IDX_INC_PROCDEFID on ACT_RU_INCIDENT(PROC_DEF_ID_);
+create index ACT_IDX_INC_PROCINSTID on ACT_RU_INCIDENT(PROC_INST_ID_);
+create index ACT_IDX_INC_ROOTCAUSEINCID on ACT_RU_INCIDENT(ROOT_CAUSE_INCIDENT_ID_);
+-- index for deadlock problem - https://app.camunda.com/jira/browse/CAM-4440 --
+create index ACT_IDX_AUTH_RESOURCE_ID on ACT_RU_AUTHORIZATION(RESOURCE_ID_);
+-- index to prevent deadlock on fk constraint - https://app.camunda.com/jira/browse/CAM-5440 --
+create index ACT_IDX_EXT_TASK_EXEC on ACT_RU_EXT_TASK(EXECUTION_ID_);
+
+-- indexes to improve deployment
+create index ACT_IDX_BYTEARRAY_NAME on ACT_GE_BYTEARRAY(NAME_);
+create index ACT_IDX_DEPLOYMENT_NAME on ACT_RE_DEPLOYMENT(NAME_);
+create index ACT_IDX_DEPLOYMENT_TENANT_ID on ACT_RE_DEPLOYMENT(TENANT_ID_);
+create index ACT_IDX_JOBDEF_PROC_DEF_ID ON ACT_RU_JOBDEF(PROC_DEF_ID_);
+create index ACT_IDX_JOB_HANDLER_TYPE ON ACT_RU_JOB(HANDLER_TYPE_);
+create index ACT_IDX_EVENT_SUBSCR_EVT_NAME ON ACT_RU_EVENT_SUBSCR(EVENT_NAME_);
+create index ACT_IDX_PROCDEF_DEPLOYMENT_ID ON ACT_RE_PROCDEF(DEPLOYMENT_ID_);
+create index ACT_IDX_PROCDEF_TENANT_ID ON ACT_RE_PROCDEF(TENANT_ID_);
+create index ACT_IDX_PROCDEF_VER_TAG ON ACT_RE_PROCDEF(VERSION_TAG_);
+-- create case definition table --
+create table ACT_RE_CASE_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case execution table --
+create table ACT_RU_CASE_EXECUTION (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    SUPER_CASE_EXEC_ varchar(64),
+    SUPER_EXEC_ varchar(64),
+    BUSINESS_KEY_ varchar(255),
+    PARENT_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    PREV_STATE_ integer,
+    CURRENT_STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create case sentry part table --
+
+create table ACT_RU_CASE_SENTRY_PART (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CASE_INST_ID_ varchar(64),
+    CASE_EXEC_ID_ varchar(64),
+    SENTRY_ID_ varchar(255),
+    TYPE_ varchar(255),
+    SOURCE_CASE_EXEC_ID_ varchar(64),
+    STANDARD_EVENT_ varchar(255),
+    SOURCE_ varchar(255),
+    VARIABLE_EVENT_ varchar(255),
+    VARIABLE_NAME_ varchar(255),
+    SATISFIED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create index on business key --
+create index ACT_IDX_CASE_EXEC_BUSKEY on ACT_RU_CASE_EXECUTION(BUSINESS_KEY_);
+
+-- create foreign key constraints on ACT_RU_CASE_EXECUTION --
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_) on delete cascade on update cascade;
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_PARENT
+    foreign key (PARENT_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_EXECUTION
+    add constraint ACT_FK_CASE_EXE_CASE_DEF
+    foreign key (CASE_DEF_ID_)
+    references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_VARIABLE --
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+-- create foreign key constraints on ACT_RU_TASK --
+alter table ACT_RU_TASK
+    add constraint ACT_FK_TASK_CASE_EXE
+    foreign key (CASE_EXECUTION_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_TASK
+  add constraint ACT_FK_TASK_CASE_DEF
+  foreign key (CASE_DEF_ID_)
+  references ACT_RE_CASE_DEF(ID_);
+
+-- create foreign key constraints on ACT_RU_CASE_SENTRY_PART --
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_INST
+    foreign key (CASE_INST_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+alter table ACT_RU_CASE_SENTRY_PART
+    add constraint ACT_FK_CASE_SENTRY_CASE_EXEC
+    foreign key (CASE_EXEC_ID_)
+    references ACT_RU_CASE_EXECUTION(ID_);
+
+create index ACT_IDX_CASE_DEF_TENANT_ID on ACT_RE_CASE_DEF(TENANT_ID_);
+create index ACT_IDX_CASE_EXEC_TENANT_ID on ACT_RU_CASE_EXECUTION(TENANT_ID_);
+-- create decision definition table --
+create table ACT_RE_DECISION_DEF (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) not null,
+    VERSION_ integer not null,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
+    VERSION_TAG_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create decision requirements definition table --
+create table ACT_RE_DECISION_REQ_DEF (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    NAME_ varchar(255),
+    KEY_ varchar(255) NOT NULL,
+    VERSION_ integer NOT NULL,
+    DEPLOYMENT_ID_ varchar(64),
+    RESOURCE_NAME_ varchar(4000),
+    DGRM_RESOURCE_NAME_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_RE_DECISION_DEF
+    add constraint ACT_FK_DEC_REQ
+    foreign key (DEC_REQ_ID_)
+    references ACT_RE_DECISION_REQ_DEF(ID_);
+
+create index ACT_IDX_DEC_DEF_TENANT_ID on ACT_RE_DECISION_DEF(TENANT_ID_);
+create index ACT_IDX_DEC_DEF_REQ_ID on ACT_RE_DECISION_DEF(DEC_REQ_ID_);
+create index ACT_IDX_DEC_REQ_DEF_TENANT_ID on ACT_RE_DECISION_REQ_DEF(TENANT_ID_);
+create table ACT_HI_PROCINST (
+    ID_ varchar(64) not null,
+    PROC_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    START_USER_ID_ varchar(255),
+    START_ACT_ID_ varchar(255),
+    END_ACT_ID_ varchar(255),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    DELETE_REASON_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(255),
+    primary key (ID_),
+    unique (PROC_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64) not null,
+    PROC_INST_ID_ varchar(64) not null,
+    EXECUTION_ID_ varchar(64) not null,
+    ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    ACT_NAME_ varchar(255),
+    ACT_TYPE_ varchar(255) not null,
+    ASSIGNEE_ varchar(64),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    ACT_INST_STATE_ integer,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    TASK_DEF_KEY_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    DUE_DATE_ datetime(3),
+    FOLLOW_UP_DATE_ datetime(3),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    REV_ integer,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    STATE_ varchar(20),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_DETAIL (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255) not null,
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    VAR_INST_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(255),
+    REV_ integer,
+    TIME_ datetime(3) not null,
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    GROUP_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    OPERATION_TYPE_ varchar(64),
+    ASSIGNER_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_COMMENT (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TIME_ datetime(3) not null,
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTION_ varchar(255),
+    MESSAGE_ varchar(4000),
+    FULL_MSG_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_ATTACHMENT (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    USER_ID_ varchar(255),
+    NAME_ varchar(255),
+    DESCRIPTION_ varchar(4000),
+    TYPE_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    URL_ varchar(4000),
+    CONTENT_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_OP_LOG (
+    ID_ varchar(64) not null,
+    DEPLOYMENT_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    CASE_EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    JOB_ID_ varchar(64),
+    JOB_DEF_ID_ varchar(64),
+    BATCH_ID_ varchar(64),
+    USER_ID_ varchar(255),
+    TIMESTAMP_ timestamp(3) not null,
+    OPERATION_TYPE_ varchar(64),
+    OPERATION_ID_ varchar(64),
+    ENTITY_TYPE_ varchar(30),
+    PROPERTY_ varchar(64),
+    ORG_VALUE_ varchar(4000),
+    NEW_VALUE_ varchar(4000),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_INCIDENT (
+  ID_ varchar(64) not null,
+  PROC_DEF_KEY_ varchar(255),
+  PROC_DEF_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  EXECUTION_ID_ varchar(64),
+  CREATE_TIME_ timestamp(3) not null,
+  END_TIME_ timestamp(3) null,
+  INCIDENT_MSG_ varchar(4000),
+  INCIDENT_TYPE_ varchar(255) not null,
+  ACTIVITY_ID_ varchar(255),
+  CAUSE_INCIDENT_ID_ varchar(64),
+  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
+  CONFIGURATION_ varchar(255),
+  INCIDENT_STATE_ integer,
+  TENANT_ID_ varchar(64),
+  JOB_DEF_ID_ varchar(64),
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_JOB_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    JOB_ID_ varchar(64) not null,
+    JOB_DUEDATE_ timestamp(3) NULL,
+    JOB_RETRIES_ integer,
+    JOB_PRIORITY_ bigint NOT NULL DEFAULT 0,
+    JOB_EXCEPTION_MSG_ varchar(4000),
+    JOB_EXCEPTION_STACK_ID_ varchar(64),
+    JOB_STATE_ integer,
+    JOB_DEF_ID_ varchar(64),
+    JOB_DEF_TYPE_ varchar(255),
+    JOB_DEF_CONFIGURATION_ varchar(255),
+    ACT_ID_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROCESS_DEF_ID_ varchar(64),
+    PROCESS_DEF_KEY_ varchar(255),
+    DEPLOYMENT_ID_ varchar(64),
+    SEQUENCE_COUNTER_ bigint,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_BATCH (
+    ID_ varchar(64) not null,
+    TYPE_ varchar(255),
+    TOTAL_JOBS_ integer,
+    JOBS_PER_SEED_ integer,
+    INVOCATIONS_PER_JOB_ integer,
+    SEED_JOB_DEF_ID_ varchar(64),
+    MONITOR_JOB_DEF_ID_ varchar(64),
+    BATCH_JOB_DEF_ID_ varchar(64),
+    TENANT_ID_  varchar(64),
+    START_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_EXT_TASK_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    EXT_TASK_ID_ varchar(64) not null,
+    RETRIES_ integer,
+    TOPIC_NAME_ varchar(255),
+    WORKER_ID_ varchar(255),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    ERROR_MSG_ varchar(4000),
+    ERROR_DETAILS_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    STATE_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
+create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_);
+create index ACT_IDX_HI_PRO_INST_PROC_DEF_KEY on ACT_HI_PROCINST(PROC_DEF_KEY_);
+
+create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_);
+create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
+create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
+create index ACT_IDX_HI_ACT_INST_COMP on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_ACT_INST_STATS on ACT_HI_ACTINST(PROC_DEF_ID_, ACT_ID_, END_TIME_, ACT_INST_STATE_);
+create index ACT_IDX_HI_ACT_INST_TENANT_ID on ACT_HI_ACTINST(TENANT_ID_);
+create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_);
+
+create index ACT_IDX_HI_TASK_INST_TENANT_ID on ACT_HI_TASKINST(TENANT_ID_);
+create index ACT_IDX_HI_TASK_INST_PROC_DEF_KEY on ACT_HI_TASKINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_TASKINST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);
+create index ACT_IDX_HI_TASKINSTID_PROCINST on ACT_HI_TASKINST(ID_,PROC_INST_ID_);
+
+create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
+create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_INST on ACT_HI_DETAIL(CASE_INST_ID_);
+create index ACT_IDX_HI_DETAIL_CASE_EXEC on ACT_HI_DETAIL(CASE_EXECUTION_ID_);
+create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
+create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
+create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
+create index ACT_IDX_HI_DETAIL_TENANT_ID on ACT_HI_DETAIL(TENANT_ID_);
+create index ACT_IDX_HI_DETAIL_PROC_DEF_KEY on ACT_HI_DETAIL(PROC_DEF_KEY_);
+create index ACT_IDX_HI_DETAIL_BYTEAR on ACT_HI_DETAIL(BYTEARRAY_ID_);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_GROUP on ACT_HI_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_HI_IDENT_LNK_TENANT_ID on ACT_HI_IDENTITYLINK(TENANT_ID_);
+create index ACT_IDX_HI_IDENT_LNK_PROC_DEF_KEY on ACT_HI_IDENTITYLINK(PROC_DEF_KEY_);
+create index ACT_IDX_HI_IDENT_LINK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
+
+create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_CASEVAR_CASE_INST on ACT_HI_VARINST(CASE_INST_ID_);
+create index ACT_IDX_HI_VAR_INST_TENANT_ID on ACT_HI_VARINST(TENANT_ID_);
+create index ACT_IDX_HI_VAR_INST_PROC_DEF_KEY on ACT_HI_VARINST(PROC_DEF_KEY_);
+create index ACT_IDX_HI_VARINST_BYTEAR on ACT_HI_VARINST(BYTEARRAY_ID_);
+
+create index ACT_IDX_HI_INCIDENT_TENANT_ID on ACT_HI_INCIDENT(TENANT_ID_);
+create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_);
+create index ACT_IDX_HI_INCIDENT_PROCINST on ACT_HI_INCIDENT(PROC_INST_ID_);
+
+create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROCDEF on ACT_HI_JOB_LOG(PROCESS_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_);
+create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_ID_);
+create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_);
+create index ACT_IDX_HI_JOB_LOG_EX_STACK on ACT_HI_JOB_LOG(JOB_EXCEPTION_STACK_ID_);
+
+create index ACT_HI_EXT_TASK_LOG_PROCINST on ACT_HI_EXT_TASK_LOG(PROC_INST_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROCDEF on ACT_HI_EXT_TASK_LOG(PROC_DEF_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROC_DEF_KEY on ACT_HI_EXT_TASK_LOG(PROC_DEF_KEY_);
+create index ACT_HI_EXT_TASK_LOG_TENANT_ID on ACT_HI_EXT_TASK_LOG(TENANT_ID_);
+create index ACT_IDX_HI_EXTTASKLOG_ERRORDET on ACT_HI_EXT_TASK_LOG(ERROR_DETAILS_ID_);
+
+create index ACT_IDX_HI_OP_LOG_PROCINST on ACT_HI_OP_LOG(PROC_INST_ID_);
+create index ACT_IDX_HI_OP_LOG_PROCDEF on ACT_HI_OP_LOG(PROC_DEF_ID_);
+
+create index ACT_IDX_HI_COMMENT_TASK on ACT_HI_COMMENT(TASK_ID_);
+create index ACT_IDX_HI_COMMENT_PROCINST on ACT_HI_COMMENT(PROC_INST_ID_);
+
+create index ACT_IDX_HI_ATTACHMENT_CONTENT on ACT_HI_ATTACHMENT(CONTENT_ID_);
+create index ACT_IDX_HI_ATTACHMENT_PROCINST on ACT_HI_ATTACHMENT(PROC_INST_ID_);
+create index ACT_IDX_HI_ATTACHMENT_TASK on ACT_HI_ATTACHMENT(TASK_ID_);
+create table ACT_HI_CASEINST (
+    ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    BUSINESS_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64) not null,
+    CREATE_TIME_ datetime(3) not null,
+    CLOSE_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    CREATE_USER_ID_ varchar(255),
+    SUPER_CASE_INSTANCE_ID_ varchar(64),
+    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
+    TENANT_ID_ varchar(64),
+    primary key (ID_),
+    unique (CASE_INST_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_CASEACTINST (
+    ID_ varchar(64) not null,
+    PARENT_ACT_INST_ID_ varchar(64),
+    CASE_DEF_ID_ varchar(64) not null,
+    CASE_INST_ID_ varchar(64) not null,
+    CASE_ACT_ID_ varchar(255) not null,
+    TASK_ID_ varchar(64),
+    CALL_PROC_INST_ID_ varchar(64),
+    CALL_CASE_INST_ID_ varchar(64),
+    CASE_ACT_NAME_ varchar(255),
+    CASE_ACT_TYPE_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    END_TIME_ datetime(3),
+    DURATION_ bigint,
+    STATE_ integer,
+    REQUIRED_ boolean,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_CAS_I_CLOSE on ACT_HI_CASEINST(CLOSE_TIME_);
+create index ACT_IDX_HI_CAS_I_BUSKEY on ACT_HI_CASEINST(BUSINESS_KEY_);
+create index ACT_IDX_HI_CAS_I_TENANT_ID on ACT_HI_CASEINST(TENANT_ID_);
+create index ACT_IDX_HI_CAS_A_I_CREATE on ACT_HI_CASEACTINST(CREATE_TIME_);
+create index ACT_IDX_HI_CAS_A_I_END on ACT_HI_CASEACTINST(END_TIME_);
+create index ACT_IDX_HI_CAS_A_I_COMP on ACT_HI_CASEACTINST(CASE_ACT_ID_, END_TIME_, ID_);
+create index ACT_IDX_HI_CAS_A_I_CASEINST on ACT_HI_CASEACTINST(CASE_INST_ID_, CASE_ACT_ID_);
+create index ACT_IDX_HI_CAS_A_I_TENANT_ID on ACT_HI_CASEACTINST(TENANT_ID_);
+-- create history decision instance table --
+create table ACT_HI_DECINST (
+    ID_ varchar(64) NOT NULL,
+    DEC_DEF_ID_ varchar(64) NOT NULL,
+    DEC_DEF_KEY_ varchar(255) NOT NULL,
+    DEC_DEF_NAME_ varchar(255),
+    PROC_DEF_KEY_ varchar(255),
+    PROC_DEF_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    CASE_DEF_KEY_ varchar(255),
+    CASE_DEF_ID_ varchar(64),
+    CASE_INST_ID_ varchar(64),
+    ACT_INST_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    EVAL_TIME_ datetime(3) not null,
+    COLLECT_VALUE_ double,
+    USER_ID_ varchar(255),
+    ROOT_DEC_INST_ID_ varchar(64),
+    DEC_REQ_ID_ varchar(64),
+    DEC_REQ_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision input table --
+create table ACT_HI_DEC_IN (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+-- create history decision output table --
+create table ACT_HI_DEC_OUT (
+    ID_ varchar(64) NOT NULL,
+    DEC_INST_ID_ varchar(64) NOT NULL,
+    CLAUSE_ID_ varchar(64),
+    CLAUSE_NAME_ varchar(255),
+    RULE_ID_ varchar(64),
+    RULE_ORDER_ integer,
+    VAR_NAME_ varchar(255),
+    VAR_TYPE_ varchar(100),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ LONGBLOB,
+    TEXT2_ LONGBLOB,
+    TENANT_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+
+create index ACT_IDX_HI_DEC_INST_ID on ACT_HI_DECINST(DEC_DEF_ID_);
+create index ACT_IDX_HI_DEC_INST_KEY on ACT_HI_DECINST(DEC_DEF_KEY_);
+create index ACT_IDX_HI_DEC_INST_PI on ACT_HI_DECINST(PROC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_CI on ACT_HI_DECINST(CASE_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT on ACT_HI_DECINST(ACT_ID_);
+create index ACT_IDX_HI_DEC_INST_ACT_INST on ACT_HI_DECINST(ACT_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_TIME on ACT_HI_DECINST(EVAL_TIME_);
+create index ACT_IDX_HI_DEC_INST_TENANT_ID on ACT_HI_DECINST(TENANT_ID_);
+create index ACT_IDX_HI_DEC_INST_ROOT_ID on ACT_HI_DECINST(ROOT_DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_ID on ACT_HI_DECINST(DEC_REQ_ID_);
+create index ACT_IDX_HI_DEC_INST_REQ_KEY on ACT_HI_DECINST(DEC_REQ_KEY_);
+
+
+create index ACT_IDX_HI_DEC_IN_INST on ACT_HI_DEC_IN(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_IN_CLAUSE on ACT_HI_DEC_IN(DEC_INST_ID_, CLAUSE_ID_);
+
+create index ACT_IDX_HI_DEC_OUT_INST on ACT_HI_DEC_OUT(DEC_INST_ID_);
+create index ACT_IDX_HI_DEC_OUT_RULE on ACT_HI_DEC_OUT(RULE_ORDER_, CLAUSE_ID_);
+
+-- mariadb_identity_7.8.0-ee
+
+create table ACT_ID_GROUP (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    TYPE_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_MEMBERSHIP (
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (USER_ID_, GROUP_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_USER (
+    ID_ varchar(64),
+    REV_ integer,
+    FIRST_ varchar(255),
+    LAST_ varchar(255),
+    EMAIL_ varchar(255),
+    PWD_ varchar(255),
+    SALT_ varchar(255),
+    PICTURE_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_INFO (
+    ID_ varchar(64),
+    REV_ integer,
+    USER_ID_ varchar(64),
+    TYPE_ varchar(64),
+    KEY_ varchar(255),
+    VALUE_ varchar(255),
+    PASSWORD_ LONGBLOB,
+    PARENT_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT_MEMBER (
+    ID_ varchar(64) not null,
+    TENANT_ID_ varchar(64) not null,
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_USER
+    unique (TENANT_ID_, USER_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_GROUP
+    unique (TENANT_ID_, GROUP_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB
+    foreign key (TENANT_ID_)
+    references ACT_ID_TENANT (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
+
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
index 136917c5ff..24b7988db1 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncCallbackErrorResponse.xml
@@ -1 +1 @@
-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1"><CallbackHeader><RequestId>1a152f97-566e-4f22-b17b-761f807bfedc</RequestId><ResponseCode>404</ResponseCode><ResponseMessage>Error processing request to SDNC. Not Found. https://sdncodl.it.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET. SDNC Returned-[error-type:application, error-tag:data-missing, error-message:Request could not be completed because the relevant data model content does not exist.]</ResponseMessage></CallbackHeader></SDNCAdapterCallbackRequest>
\ No newline at end of file
+<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1"><CallbackHeader><RequestId>1a152f97-566e-4f22-b17b-761f807bfedc</RequestId><ResponseCode>404</ResponseCode><ResponseMessage>Error processing request to SDNC. Not Found. https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/AS%2FVLXM%2F000199%2F%2FSB_INTERNET. SDNC Returned-[error-type:application, error-tag:data-missing, error-message:Request could not be completed because the relevant data model content does not exist.]</ResponseMessage></CallbackHeader></SDNCAdapterCallbackRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
index c8a2e30282..6e4f4160ec 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncDeleteResponse.xml
@@ -1,212 +1,212 @@
-<?xml version="1.0" encoding="UTF-8"?> 

-<sdncadapterworkflow:SDNCAdapterWorkflowResponse

-	xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-	<sdncadapterworkflow:response-data>

-		<tag0:RequestData

-			xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">

-			<output xmlns="com:att:sdnctl:nbncapi">

-				<ack-final-indicator>Y</ack-final-indicator>

-  <svc-request-id>SK-2016-10-22-001</svc-request-id>

-  <nbnc-response-information>

-    <response-info>

-      <result>SUCCESS</result>

-      <aai-status>ERROR</aai-status>

-    </response-info>

-    <virtual-datacenter-list>

-      <vdc-id>15001417</vdc-id>

-      <router-list>

-        <router-name>ALPRTR2</router-name>

-        <ipe-loopback-address>1.1.1.2</ipe-loopback-address>

-        <vlan-list>

-          <vlan-id>1255.ae81</vlan-id>

-          <border-element-type>VDBE</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>ALPVDBE1</border-element-id>

-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>1995.ae81</vlan-id>

-          <border-element-type>ASBG</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>ALPASBG1</border-element-id>

-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/2</vlan-id>

-          <border-element-type>BGF2</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/2</port-id>

-          <border-element-id>ALPBGF2</border-element-id>

-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/1</vlan-id>

-          <border-element-type>BGF1</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/1</port-id>

-          <border-element-id>ALPBGF1</border-element-id>

-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <ipe-id>2</ipe-id>

-      </router-list>

-      <router-list>

-        <router-name>ALPRTR1</router-name>

-        <ipe-loopback-address>1.1.1.1</ipe-loopback-address>

-        <vlan-list>

-          <vlan-id>1255.ae81</vlan-id>

-          <border-element-type>VDBE</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>ALPVDBE1</border-element-id>

-          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>1995.ae81</vlan-id>

-          <border-element-type>ASBG</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>ALPASBG1</border-element-id>

-         <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/2</vlan-id>

-          <border-element-type>BGF2</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/2</port-id>

-          <border-element-id>ALPBGF2</border-element-id>

-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/1</vlan-id>

-          <border-element-type>BGF1</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/1</port-id>

-          <border-element-id>ALPBGF1</border-element-id>

-          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <ipe-id>1</ipe-id>

-      </router-list>

-    </virtual-datacenter-list>

-    <virtual-datacenter-list>

-      <vdc-id>15001418</vdc-id>

-      <router-list>

-        <router-name>SANRTR1</router-name>

-        <ipe-loopback-address>2.1.1.1</ipe-loopback-address>

-        <vlan-list>

-          <vlan-id>1255.ae81</vlan-id>

-          <border-element-type>VDBE</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>SANVDBE1</border-element-id>

-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>1995.ae81</vlan-id>

-          <border-element-type>ASBG</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>SANASBG1</border-element-id>

-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/2</vlan-id>

-          <border-element-type>BGF2</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/2</port-id>

-          <border-element-id>SANBGF2</border-element-id>

-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/1</vlan-id>

-          <border-element-type>BGF1</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/1</port-id>

-          <border-element-id>SANBGF1</border-element-id>

-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <ipe-id>1</ipe-id>

-      </router-list>

-      <router-list>

-        <router-name>SANRTR2</router-name>

-        <ipe-loopback-address>2.1.1.2</ipe-loopback-address>

-        <vlan-list>

-          <vlan-id>1255.ae81</vlan-id>

-          <border-element-type>VDBE</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>SANVDBE1</border-element-id>

-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>1995.ae81</vlan-id>

-          <border-element-type>ASBG</border-element-type>

-          <border-element-tangibility>VIRTUAL</border-element-tangibility>

-          <port-id></port-id>

-          <border-element-id>SANASBG1</border-element-id>

-          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>

-          <lag-id>ae81</lag-id>

-          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/2</vlan-id>

-          <border-element-type>BGF2</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/2</port-id>

-          <border-element-id>SANBGF2</border-element-id>

-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <vlan-list>

-          <vlan-id>85.xe-10/0/1</vlan-id>

-          <border-element-type>BGF1</border-element-type>

-          <border-element-tangibility>PHYSICAL</border-element-tangibility>

-          <port-id>xe-10/0/1</port-id>

-          <border-element-id>SANBGF1</border-element-id>

-          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>

-          <lag-id></lag-id>

-          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>

-        </vlan-list>

-        <ipe-id>2</ipe-id>

-      </router-list>

-    </virtual-datacenter-list>

-    <service-type>COLLABORATE</service-type>

-    <interface-status>DISABLE</interface-status>

-    <customer-id>custid-888</customer-id>

-    <service-instance-id>SII-2016-10-22-001</service-instance-id>

-    <provision-type>CUSTOMER</provision-type>

-    <vni-id>100668</vni-id>

-  </nbnc-response-information>

-			</output>

-		</tag0:RequestData>

-	</sdncadapterworkflow:response-data>

+<?xml version="1.0" encoding="UTF-8"?> 
+<sdncadapterworkflow:SDNCAdapterWorkflowResponse
+	xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1">
+	<sdncadapterworkflow:response-data>
+		<tag0:RequestData
+			xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
+			<output xmlns="com:att:sdnctl:nbncapi">
+				<ack-final-indicator>Y</ack-final-indicator>
+  <svc-request-id>SK-2016-10-22-001</svc-request-id>
+  <nbnc-response-information>
+    <response-info>
+      <result>SUCCESS</result>
+      <aai-status>ERROR</aai-status>
+    </response-info>
+    <virtual-datacenter-list>
+      <vdc-id>15001417</vdc-id>
+      <router-list>
+        <router-name>ALPRTR2</router-name>
+        <ipe-loopback-address>1.1.1.2</ipe-loopback-address>
+        <vlan-list>
+          <vlan-id>1255.ae81</vlan-id>
+          <border-element-type>VDBE</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>ALPVDBE1</border-element-id>
+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>1995.ae81</vlan-id>
+          <border-element-type>ASBG</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>ALPASBG1</border-element-id>
+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/2</vlan-id>
+          <border-element-type>BGF2</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/2</port-id>
+          <border-element-id>ALPBGF2</border-element-id>
+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/1</vlan-id>
+          <border-element-type>BGF1</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/1</port-id>
+          <border-element-id>ALPBGF1</border-element-id>
+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <ipe-id>2</ipe-id>
+      </router-list>
+      <router-list>
+        <router-name>ALPRTR1</router-name>
+        <ipe-loopback-address>1.1.1.1</ipe-loopback-address>
+        <vlan-list>
+          <vlan-id>1255.ae81</vlan-id>
+          <border-element-type>VDBE</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>ALPVDBE1</border-element-id>
+          <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>1995.ae81</vlan-id>
+          <border-element-type>ASBG</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>ALPASBG1</border-element-id>
+         <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/2</vlan-id>
+          <border-element-type>BGF2</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/2</port-id>
+          <border-element-id>ALPBGF2</border-element-id>
+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/1</vlan-id>
+          <border-element-type>BGF1</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/1</port-id>
+          <border-element-id>ALPBGF1</border-element-id>
+          <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <ipe-id>1</ipe-id>
+      </router-list>
+    </virtual-datacenter-list>
+    <virtual-datacenter-list>
+      <vdc-id>15001418</vdc-id>
+      <router-list>
+        <router-name>SANRTR1</router-name>
+        <ipe-loopback-address>2.1.1.1</ipe-loopback-address>
+        <vlan-list>
+          <vlan-id>1255.ae81</vlan-id>
+          <border-element-type>VDBE</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>SANVDBE1</border-element-id>
+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>1995.ae81</vlan-id>
+          <border-element-type>ASBG</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>SANASBG1</border-element-id>
+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/2</vlan-id>
+          <border-element-type>BGF2</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/2</port-id>
+          <border-element-id>SANBGF2</border-element-id>
+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/1</vlan-id>
+          <border-element-type>BGF1</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/1</port-id>
+          <border-element-id>SANBGF1</border-element-id>
+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <ipe-id>1</ipe-id>
+      </router-list>
+      <router-list>
+        <router-name>SANRTR2</router-name>
+        <ipe-loopback-address>2.1.1.2</ipe-loopback-address>
+        <vlan-list>
+          <vlan-id>1255.ae81</vlan-id>
+          <border-element-type>VDBE</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>SANVDBE1</border-element-id>
+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>1995.ae81</vlan-id>
+          <border-element-type>ASBG</border-element-type>
+          <border-element-tangibility>VIRTUAL</border-element-tangibility>
+          <port-id></port-id>
+          <border-element-id>SANASBG1</border-element-id>
+          <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+          <lag-id>ae81</lag-id>
+          <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/2</vlan-id>
+          <border-element-type>BGF2</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/2</port-id>
+          <border-element-id>SANBGF2</border-element-id>
+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <vlan-list>
+          <vlan-id>85.xe-10/0/1</vlan-id>
+          <border-element-type>BGF1</border-element-type>
+          <border-element-tangibility>PHYSICAL</border-element-tangibility>
+          <port-id>xe-10/0/1</port-id>
+          <border-element-id>SANBGF1</border-element-id>
+          <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+          <lag-id></lag-id>
+          <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+        </vlan-list>
+        <ipe-id>2</ipe-id>
+      </router-list>
+    </virtual-datacenter-list>
+    <service-type>COLLABORATE</service-type>
+    <interface-status>DISABLE</interface-status>
+    <customer-id>custid-888</customer-id>
+    <service-instance-id>SII-2016-10-22-001</service-instance-id>
+    <provision-type>CUSTOMER</provision-type>
+    <vni-id>100668</vni-id>
+  </nbnc-response-information>
+			</output>
+		</tag0:RequestData>
+	</sdncadapterworkflow:response-data>
 </sdncadapterworkflow:SDNCAdapterWorkflowResponse> 
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_data_request.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_data_request.xml
index 24fe72c62e..6962946ab2 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_data_request.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_data_request.xml
@@ -1,33 +1,33 @@
-<SDNCRequestData>

-		<request-information>

-			<request-id>ca424e60-cb22-43c5-88f9-ed68e17cebe2</request-id>

-			<source>MSO</source>

-			<notification-url />

-			<order-number />

-			<order-version />

-			<request-action>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</request-action>

-		</request-information>

-		<service-information>

-			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-			<subscription-service-type>MSO-dev-service-type

-			</subscription-service-type>

-			<ecomp-model-information>

-				<model-invariant-uuid>de19ae10-9a25-11e7-abc4-cec278b6b50a</model-invariant-uuid>

-				<model-uuid>ee938612-9a25-11e7-abc4-cec278b6b50a</model-uuid>

-				<model-version>1.0</model-version>

-				<model-name>MSOTADevInfra_Configuration_Service</model-name>

-			</ecomp-model-information>

-			<service-instance-id>14c5c14f-6caf-4028-9788-bb5ec9e8f9b8</service-instance-id>

-			<subscriber-name />

-			<global-customer-id>MSO_1610_dev</global-customer-id>

-		</service-information>

-		<service-request-input>

-			<service-instance-name>MSO-DEV-SI-1802-PCM-926-100</service-instance-name>

-			<service-input-parameters>

-				<param>

-					<name>paramName</name>

-					<value>paramValue</value>

-				</param>

-			</service-input-parameters>

-		</service-request-input>

+<SDNCRequestData>
+		<request-information>
+			<request-id>ca424e60-cb22-43c5-88f9-ed68e17cebe2</request-id>
+			<source>MSO</source>
+			<notification-url />
+			<order-number />
+			<order-version />
+			<request-action>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</request-action>
+		</request-information>
+		<service-information>
+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
+			<subscription-service-type>MSO-dev-service-type
+			</subscription-service-type>
+			<onap-model-information>
+				<model-invariant-uuid>de19ae10-9a25-11e7-abc4-cec278b6b50a</model-invariant-uuid>
+				<model-uuid>ee938612-9a25-11e7-abc4-cec278b6b50a</model-uuid>
+				<model-version>1.0</model-version>
+				<model-name>MSOTADevInfra_Configuration_Service</model-name>
+			</onap-model-information>
+			<service-instance-id>14c5c14f-6caf-4028-9788-bb5ec9e8f9b8</service-instance-id>
+			<subscriber-name />
+			<global-customer-id>MSO_1610_dev</global-customer-id>
+		</service-information>
+		<service-request-input>
+			<service-instance-name>MSO-DEV-SI-1802-PCM-926-100</service-instance-name>
+			<service-input-parameters>
+				<param>
+					<name>paramName</name>
+					<value>paramValue</value>
+				</param>
+			</service-input-parameters>
+		</service-request-input>
 	</SDNCRequestData>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_request.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_request.xml
index 2ecd36d68b..17ba0cee65 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_request.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdnc_adapter_request.xml
@@ -1,7 +1,7 @@
 <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">
+	xmlns:ns5="http://org.onap/so/request/types/v1"
+	xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+	xmlns:sdncadapter="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<sdncadapter:RequestHeader>
 		<sdncadapter:RequestId>3a77913d-6d36-4507-8c6d-ab523af21fbf</sdncadapter:RequestId>
 		<sdncadapter:SvcInstanceId>14c5c14f-6caf-4028-9788-bb5ec9e8f9b8</sdncadapter:SvcInstanceId>
@@ -24,12 +24,12 @@
 			<service-id>serviceId-test</service-id>
 			<subscription-service-type>subscriptionServiceType-test
 			</subscription-service-type>
-			<ecomp-model-information>
+			<onap-model-information>
 				<model-invariant-uuid>modelInvariantUuid-test</model-invariant-uuid>
 				<model-uuid>modelUuid-test</model-uuid>
 				<model-version>modelVersion-test</model-version>
 				<model-name>modelName-test</model-name>
-			</ecomp-model-information>
+			</onap-model-information>
 			<service-instance-id>serviceInstanceId-test</service-instance-id>
 			<subscriber-name />
 			<global-customer-id>globalSubscriberId-test</global-customer-id>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
index 754dc20ee6..21cf3460a9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest.xml
@@ -1,342 +1,342 @@
-<SDNCAdapterCallbackRequest xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-    <CallbackHeader>

-        <RequestId>2f7d1b38-2b78-4ef2-8ad6-1552d88620fa</RequestId>

-        <ResponseCode>200</ResponseCode>

-        <ResponseMessage>OK</ResponseMessage>

-    </CallbackHeader>

-    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;

-					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-					&lt;service-status&gt;

-						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;

-						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;

-						&lt;request-status&gt;synccomplete&lt;/request-status&gt;

-						&lt;final-indicator&gt;N&lt;/final-indicator&gt;

-						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;

-						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;

-						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;

-					&lt;/service-status&gt;

-					&lt;service-data&gt;

-						&lt;internet-evc-access-information&gt;

-							&lt;ip-version&gt;ds&lt;/ip-version&gt;

-							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;

-						&lt;/internet-evc-access-information&gt;

-						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;

-							&lt;vr-lan-interface&gt;

-								&lt;static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v6-static-routes&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;

-										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;

-									&lt;/v6-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-									&lt;v4-static-routes&gt;

-										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;

-									&lt;/v4-static-routes&gt;

-								&lt;/static-routes&gt;

-								&lt;dhcp&gt;

-									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;

-									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;

-									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;

-									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;

-									&lt;v4-dhcp-pools&gt;

-										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;

-										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v4-addresses&gt;

-											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;

-										&lt;/excluded-v4-addresses&gt;

-										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;

-									&lt;/v4-dhcp-pools&gt;									

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;

-									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;

-									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;

-									&lt;v6-dhcp-pools&gt;

-										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;

-										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;

-										&lt;excluded-v6-addresses&gt;

-											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;

-										&lt;/excluded-v6-addresses&gt;

-										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;

-									&lt;/v6-dhcp-pools&gt;									

-								&lt;/dhcp&gt;

-								&lt;firewall-lite&gt;

-									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;

-									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;1&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v4-firewall-packet-filters&gt;

-									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;

-									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;2&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v4-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;3&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-									&lt;v6-firewall-packet-filters&gt;

-									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;

-									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;

-									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;

-									  &lt;udp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/udp-ports&gt;

-									  &lt;tcp-ports&gt;

-									    &lt;port-number&gt;4&lt;/port-number&gt;

-									  &lt;/tcp-ports&gt;

-									&lt;/v6-firewall-packet-filters&gt;

-								&lt;/firewall-lite&gt;

-								&lt;pat&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;

-									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;

-									&lt;v4-pat-pools&gt;

-										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;

-										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;

-										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;

-									&lt;/v4-pat-pools&gt;

-								&lt;/pat&gt;

-								&lt;nat&gt;

-								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								  &lt;v4-nat-mapping-entries&gt;

-								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;

-								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;

-								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;

-								  &lt;/v4-nat-mapping-entries&gt;

-								&lt;/nat&gt;

-								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;

-								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;

-								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;

-								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;

-								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;

-								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;

-								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;

-								&lt;v4-public-lan-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-									&lt;t-provided-v4-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;

-										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;

-										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-									&lt;/t-provided-v4-lan-public-prefixes&gt;

-								&lt;/v4-public-lan-prefixes&gt;

-								&lt;v6-public-lan-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-									&lt;t-provided-v6-lan-public-prefixes&gt;

-										&lt;request-index&gt;1&lt;/request-index&gt;

-										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;

-										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-									&lt;/t-provided-v6-lan-public-prefixes&gt;

-								&lt;/v6-public-lan-prefixes&gt;

-							&lt;/vr-lan-interface&gt;

-							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;

-						&lt;/vr-lan&gt;

-&lt;ucpe-vms-service-information&gt;				

- &lt;transport-service-information&gt;

-    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;

-	&lt;access-circuit-info&gt;

-	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;

-	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;

-	&lt;/access-circuit-info&gt;	

- &lt;/transport-service-information&gt;

- &lt;ucpe-information&gt;

-    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;

-    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;

-    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;

-  &lt;/ucpe-information&gt;

-  &lt;vnf-list&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;1&lt;/vnf-id&gt;

-		&lt;prov-status&gt;1&lt;/prov-status&gt;

-		&lt;operational-state&gt;1&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;1&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;

-	&lt;vnf-information&gt; 

-		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 

-		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;

-		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;

-		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;

-		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;

-		&lt;vnf-id&gt;2&lt;/vnf-id&gt;

-		&lt;prov-status&gt;2&lt;/prov-status&gt;

-		&lt;operational-state&gt;2&lt;/operational-state&gt;

-		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;

-		&lt;equipment-role&gt;2&lt;/equipment-role&gt;

-    &lt;/vnf-information&gt;					

-  &lt;/vnf-list&gt;

- &lt;/ucpe-vms-service-information&gt;										

-						&lt;request-information&gt;

-							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;

-							&lt;order-number&gt;4281555&lt;/order-number&gt;

-							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;

-							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;

-							&lt;source&gt;OMX&lt;/source&gt;

-							&lt;order-version&gt;1&lt;/order-version&gt;

-						&lt;/request-information&gt;

-						&lt;sdnc-request-header&gt;

-							&lt;svc-action&gt;activate&lt;/svc-action&gt;

-							&lt;svc-notification-url&gt;https://msojra.mtsnjdcp1.aic.cip.com:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;

-							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;

-						&lt;/sdnc-request-header&gt;

-						&lt;l2-homing-information&gt;

-							&lt;topology&gt;MultiPoint&lt;/topology&gt;

-							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;

-							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;

-						&lt;/l2-homing-information&gt;

-						&lt;service-information&gt;

-							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;

-							&lt;subscriber-name&gt;FOUR SEASONS HEATING &amp; COOLING_8310006378683&lt;/subscriber-name&gt;

-							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;

-						&lt;/service-information&gt;

-						&lt;internet-service-change-details&gt;

-							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;

-							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v4-lan-public-prefixes&gt;

-							   &lt;request-index&gt;2&lt;/request-index&gt;

-							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;

-							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;

-							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;

-							&lt;/t-provided-v4-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-							&lt;t-provided-v6-lan-public-prefixes&gt;

-							   &lt;request-index&gt;1&lt;/request-index&gt;

-							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;

-							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;

-							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;

-							&lt;/t-provided-v6-lan-public-prefixes&gt;

-						&lt;/internet-service-change-details&gt;

-					&lt;/service-data&gt;

-				&lt;/layer3-service-list&gt;

-</RequestData>

-</SDNCAdapterCallbackRequest>

+<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
+    <CallbackHeader>
+        <RequestId>2f7d1b38-2b78-4ef2-8ad6-1552d88620fa</RequestId>
+        <ResponseCode>200</ResponseCode>
+        <ResponseMessage>OK</ResponseMessage>
+    </CallbackHeader>
+    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;
+					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+					&lt;service-status&gt;
+						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;
+						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;
+						&lt;request-status&gt;synccomplete&lt;/request-status&gt;
+						&lt;final-indicator&gt;N&lt;/final-indicator&gt;
+						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;
+						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;
+						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;
+					&lt;/service-status&gt;
+					&lt;service-data&gt;
+						&lt;internet-evc-access-information&gt;
+							&lt;ip-version&gt;ds&lt;/ip-version&gt;
+							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;
+						&lt;/internet-evc-access-information&gt;
+						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;
+							&lt;vr-lan-interface&gt;
+								&lt;static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+								&lt;/static-routes&gt;
+								&lt;dhcp&gt;
+									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;
+									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;
+									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;									
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;									
+								&lt;/dhcp&gt;
+								&lt;firewall-lite&gt;
+									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;
+									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+								&lt;/firewall-lite&gt;
+								&lt;pat&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+								&lt;/pat&gt;
+								&lt;nat&gt;
+								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								&lt;/nat&gt;
+								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;
+								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;
+								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;
+								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;
+								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;
+								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;
+								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;
+								&lt;v4-public-lan-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+								&lt;/v4-public-lan-prefixes&gt;
+								&lt;v6-public-lan-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+								&lt;/v6-public-lan-prefixes&gt;
+							&lt;/vr-lan-interface&gt;
+							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;
+						&lt;/vr-lan&gt;
+&lt;ucpe-vms-service-information&gt;				
+ &lt;transport-service-information&gt;
+    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;	
+ &lt;/transport-service-information&gt;
+ &lt;ucpe-information&gt;
+    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;
+    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;
+    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;
+  &lt;/ucpe-information&gt;
+  &lt;vnf-list&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;1&lt;/vnf-id&gt;
+		&lt;prov-status&gt;1&lt;/prov-status&gt;
+		&lt;operational-state&gt;1&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;1&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;2&lt;/vnf-id&gt;
+		&lt;prov-status&gt;2&lt;/prov-status&gt;
+		&lt;operational-state&gt;2&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;2&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;					
+  &lt;/vnf-list&gt;
+ &lt;/ucpe-vms-service-information&gt;										
+						&lt;request-information&gt;
+							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;
+							&lt;order-number&gt;4281555&lt;/order-number&gt;
+							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;
+							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;
+							&lt;source&gt;OMX&lt;/source&gt;
+							&lt;order-version&gt;1&lt;/order-version&gt;
+						&lt;/request-information&gt;
+						&lt;sdnc-request-header&gt;
+							&lt;svc-action&gt;activate&lt;/svc-action&gt;
+							&lt;svc-notification-url&gt;https://localhost:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;
+							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;
+						&lt;/sdnc-request-header&gt;
+						&lt;l2-homing-information&gt;
+							&lt;topology&gt;MultiPoint&lt;/topology&gt;
+							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;
+							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;
+						&lt;/l2-homing-information&gt;
+						&lt;service-information&gt;
+							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+							&lt;subscriber-name&gt;FOUR SEASONS HEATING &amp;amp; COOLING_8310006378683&lt;/subscriber-name&gt;
+							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;
+						&lt;/service-information&gt;
+						&lt;internet-service-change-details&gt;
+							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;2&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+						&lt;/internet-service-change-details&gt;
+					&lt;/service-data&gt;
+				&lt;/layer3-service-list&gt;
+</RequestData>
+</SDNCAdapterCallbackRequest>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
index aa481ea600..7873fd49d2 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_404CallBack.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<SDNCAdapterCallbackRequest

-	xmlns="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-	<CallbackHeader>

-		<RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</RequestId>

-		<ResponseCode>404</ResponseCode>

-		<ResponseMessage>Error processing request to SDNC. Not Found.

-			https://sdncodl.us.aic.cip.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.

-			SDNC Returned-[error-type:application, error-tag:data-missing,

-			error-message:Request could not be completed because the relevant

-			data model content does not exist.]</ResponseMessage>

-	</CallbackHeader>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<SDNCAdapterCallbackRequest
+	xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
+	<CallbackHeader>
+		<RequestId>39542e39-ccc3-4d1a-8b79-04ce88526613</RequestId>
+		<ResponseCode>404</ResponseCode>
+		<ResponseMessage>Error processing request to SDNC. Not Found.
+			https://localhost:8443/restconf/config/L3SDN-API:services/layer3-service-list/MVM%2FVLXP%2F000855%2F%2FShakeout.
+			SDNC Returned-[error-type:application, error-tag:data-missing,
+			error-message:Request could not be completed because the relevant
+			data model content does not exist.]</ResponseMessage>
+	</CallbackHeader>
 </SDNCAdapterCallbackRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_with_aic_version.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_with_aic_version.xml
new file mode 100644
index 0000000000..7ce81f1caf
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadaptercallbackrequest_with_aic_version.xml
@@ -0,0 +1,345 @@
+<SDNCAdapterCallbackRequest xmlns="http://org.onap/workflow/sdnc/adapter/schema/v1">
+    <CallbackHeader>
+        <RequestId>2f7d1b38-2b78-4ef2-8ad6-1552d88620fa</RequestId>
+        <ResponseCode>200</ResponseCode>
+        <ResponseMessage>OK</ResponseMessage>
+    </CallbackHeader>
+    <RequestData xsi:type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">				&lt;layer3-service-list xmlns="com:att:sdnctl:l3api"&gt;
+					&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+					&lt;service-status&gt;
+						&lt;rpc-name&gt;service-configuration-operation&lt;/rpc-name&gt;
+						&lt;rpc-action&gt;activate&lt;/rpc-action&gt;
+						&lt;request-status&gt;synccomplete&lt;/request-status&gt;
+						&lt;final-indicator&gt;N&lt;/final-indicator&gt;
+						&lt;l3sdn-action&gt;Layer3ServiceActivateRequest&lt;/l3sdn-action&gt;
+						&lt;l3sdn-subaction&gt;SUPP&lt;/l3sdn-subaction&gt;
+						&lt;response-timestamp&gt;2015-04-28T21:32:11.386Z&lt;/response-timestamp&gt;
+					&lt;/service-status&gt;
+					&lt;service-data&gt;
+						&lt;internet-evc-access-information&gt;
+							&lt;ip-version&gt;ds&lt;/ip-version&gt;
+							&lt;internet-evc-speed-value&gt;8&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Mbps&lt;/internet-evc-speed-units&gt;
+						&lt;/internet-evc-access-information&gt;
+						&lt;vr-lan xmlns="com:att:sdnctl:l3api"&gt;
+							&lt;vr-lan-interface&gt;
+								&lt;static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.1&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v6-static-routes&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-static-route-prefix&gt;2001:1890:12e3:2da::&lt;/v6-static-route-prefix&gt;
+										&lt;v6-static-route-prefix-length&gt;28&lt;/v6-static-route-prefix-length&gt;
+									&lt;/v6-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.2&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+									&lt;v4-static-routes&gt;
+										&lt;v4-static-route-prefix&gt;255.255.252.3&lt;/v4-static-route-prefix&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+										&lt;v4-static-route-prefix-length&gt;28&lt;/v4-static-route-prefix-length&gt;
+									&lt;/v4-static-routes&gt;
+								&lt;/static-routes&gt;
+								&lt;dhcp&gt;
+									&lt;v6-dhcp-server-enabled&gt;N&lt;/v6-dhcp-server-enabled&gt;
+									&lt;v4-dhcp-server-enabled&gt;Y&lt;/v4-dhcp-server-enabled&gt;
+									&lt;use-v6-default-pool&gt;N&lt;/use-v6-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v4-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v4-address&gt;192.168.1.8&lt;/excluded-v4-address&gt;
+									&lt;/excluded-v4-dhcp-addresses-from-default-pool&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.1&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.5&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.1&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.3&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;
+									&lt;v4-dhcp-pools&gt;
+										&lt;v4-dhcp-relay-next-hop-address&gt;1.1.1.2&lt;/v4-dhcp-relay-next-hop-address&gt;
+										&lt;v4-dhcp-pool-prefix-length&gt;28&lt;/v4-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.6&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-relay-gateway-address&gt;2.2.2.2&lt;/v4-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v4-addresses&gt;
+											&lt;excluded-v4-address&gt;192.168.1.7&lt;/excluded-v4-address&gt;
+										&lt;/excluded-v4-addresses&gt;
+										&lt;v4-dhcp-pool-prefix&gt;192.155.2.4&lt;/v4-dhcp-pool-prefix&gt;
+									&lt;/v4-dhcp-pools&gt;									
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:5&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;excluded-v6-dhcp-addresses-from-default-pool&gt;
+									  &lt;excluded-v6-address&gt;1:6&lt;/excluded-v6-address&gt;
+									&lt;/excluded-v6-dhcp-addresses-from-default-pool&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;
+									&lt;v6-dhcp-pools&gt;
+										&lt;v6-dhcp-relay-next-hop-address&gt;4:4&lt;/v6-dhcp-relay-next-hop-address&gt;
+										&lt;v6-dhcp-pool-prefix-length&gt;28&lt;/v6-dhcp-pool-prefix-length&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;1:1&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-relay-gateway-address&gt;3:3&lt;/v6-dhcp-relay-gateway-address&gt;
+										&lt;excluded-v6-addresses&gt;
+											&lt;excluded-v6-address&gt;2:2&lt;/excluded-v6-address&gt;
+										&lt;/excluded-v6-addresses&gt;
+										&lt;v6-dhcp-pool-prefix&gt;0:0&lt;/v6-dhcp-pool-prefix&gt;
+									&lt;/v6-dhcp-pools&gt;									
+								&lt;/dhcp&gt;
+								&lt;firewall-lite&gt;
+									&lt;stateful-firewall-lite-v6-enabled&gt;N&lt;/stateful-firewall-lite-v6-enabled&gt;
+									&lt;stateful-firewall-lite-v4-enabled&gt;Y&lt;/stateful-firewall-lite-v4-enabled&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.1&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;1&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;1&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v4-firewall-packet-filters&gt;
+									  &lt;v4-firewall-prefix&gt;0.0.0.2&lt;/v4-firewall-prefix&gt;
+									  &lt;v4-firewall-prefix-length&gt;2&lt;/v4-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;2&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v4-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;0&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;3&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+									&lt;v6-firewall-packet-filters&gt;
+									  &lt;v6-firewall-prefix&gt;:&lt;/v6-firewall-prefix&gt;
+									  &lt;v6-firewall-prefix-length&gt;1&lt;/v6-firewall-prefix-length&gt;
+									  &lt;allow-icmp-ping&gt;Y&lt;/allow-icmp-ping&gt;
+									  &lt;udp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/udp-ports&gt;
+									  &lt;tcp-ports&gt;
+									    &lt;port-number&gt;4&lt;/port-number&gt;
+									  &lt;/tcp-ports&gt;
+									&lt;/v6-firewall-packet-filters&gt;
+								&lt;/firewall-lite&gt;
+								&lt;pat&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.44&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.5&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;0&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+									&lt;use-v4-default-pool&gt;Y&lt;/use-v4-default-pool&gt;
+									&lt;v4-pat-enabled&gt;N&lt;/v4-pat-enabled&gt;
+									&lt;v4-pat-pools&gt;
+										&lt;v4-pat-pool-prefix&gt;192.168.1.45&lt;/v4-pat-pool-prefix&gt;
+										&lt;v4-pat-pool-next-hop-address&gt;192.168.1.6&lt;/v4-pat-pool-next-hop-address&gt;
+										&lt;v4-pat-pool-prefix-length&gt;28&lt;/v4-pat-pool-prefix-length&gt;
+									&lt;/v4-pat-pools&gt;
+								&lt;/pat&gt;
+								&lt;nat&gt;
+								  &lt;v4-nat-enabled&gt;Y&lt;/v4-nat-enabled&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.0&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.0&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.0&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								  &lt;v4-nat-mapping-entries&gt;
+								    &lt;v4-nat-internal&gt;0.0.0.1&lt;/v4-nat-internal&gt;
+								    &lt;v4-nat-next-hop-address&gt;0.0.0.1&lt;/v4-nat-next-hop-address&gt;
+								    &lt;v4-nat-external&gt;0.0.0.1&lt;/v4-nat-external&gt;
+								  &lt;/v4-nat-mapping-entries&gt;
+								&lt;/nat&gt;
+								&lt;vr-designation&gt;primary&lt;/vr-designation&gt;
+								&lt;v4-vce-loopback-address&gt;162.200.3.144&lt;/v4-vce-loopback-address&gt;
+								&lt;v6-vr-lan-prefix-length&gt;64&lt;/v6-vr-lan-prefix-length&gt;
+								&lt;v6-vce-wan-address&gt;2001:1890:12e3:2da::&lt;/v6-vce-wan-address&gt;
+								&lt;v6-vr-lan-prefix&gt;2620:0:10d0:f:ffff:ffff:ffff:fffe&lt;/v6-vr-lan-prefix&gt;
+								&lt;v4-vr-lan-prefix-length&gt;24&lt;/v4-vr-lan-prefix-length&gt;
+								&lt;v4-vr-lan-prefix&gt;10.192.27.254&lt;/v4-vr-lan-prefix&gt;
+								&lt;v4-public-lan-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.2&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.1&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.72&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.71&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+									&lt;t-provided-v4-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v4-next-hop-address&gt;192.168.1.68&lt;/v4-next-hop-address&gt;
+										&lt;v4-lan-public-prefix&gt;192.168.1.67&lt;/v4-lan-public-prefix&gt;
+										&lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+									&lt;/t-provided-v4-lan-public-prefixes&gt;
+								&lt;/v4-public-lan-prefixes&gt;
+								&lt;v6-public-lan-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:3da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+									&lt;t-provided-v6-lan-public-prefixes&gt;
+										&lt;request-index&gt;1&lt;/request-index&gt;
+										&lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+										&lt;v6-lan-public-prefix&gt;2001:1890:12e3:4da::&lt;/v6-lan-public-prefix&gt;
+										&lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+									&lt;/t-provided-v6-lan-public-prefixes&gt;
+								&lt;/v6-public-lan-prefixes&gt;
+							&lt;/vr-lan-interface&gt;
+							&lt;routing-protocol&gt;none&lt;/routing-protocol&gt;
+						&lt;/vr-lan&gt;
+&lt;ucpe-vms-service-information&gt;				
+ &lt;transport-service-information&gt;
+    &lt;transport-service-type&gt;AVPN&lt;/transport-service-type&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;1&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Active&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;
+	&lt;access-circuit-info&gt;
+	   &lt;access-circuit-id&gt;2&lt;/access-circuit-id&gt;
+	   &lt;dual-mode&gt;Standby&lt;/dual-mode&gt;
+	&lt;/access-circuit-info&gt;	
+ &lt;/transport-service-information&gt;
+ &lt;ucpe-information&gt;
+    &lt;ucpe-host-name&gt;hostname&lt;/ucpe-host-name&gt;
+    &lt;ucpe-activation-code&gt;activecode&lt;/ucpe-activation-code&gt;
+    &lt;out-of-band-management-modem&gt;OOB&lt;/out-of-band-management-modem&gt;
+  &lt;/ucpe-information&gt;
+  &lt;vnf-list&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;1&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;1&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;ZZ&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL1&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;1&lt;/vnf-id&gt;
+		&lt;prov-status&gt;1&lt;/prov-status&gt;
+		&lt;operational-state&gt;1&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;1&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;1&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;
+	&lt;vnf-information&gt; 
+		&lt;vnf-instance-id&gt;2&lt;/vnf-instance-id&gt; 
+		&lt;vnf-sequence-number&gt;2&lt;/vnf-sequence-number&gt;
+		&lt;vnf-type&gt;HY&lt;/vnf-type&gt;
+		&lt;vnf-vendor&gt;JUNIPER&lt;/vnf-vendor&gt;
+		&lt;vnf-model&gt;MODEL2&lt;/vnf-model&gt;
+		&lt;vnf-id&gt;2&lt;/vnf-id&gt;
+		&lt;prov-status&gt;2&lt;/prov-status&gt;
+		&lt;operational-state&gt;2&lt;/operational-state&gt;
+		&lt;orchestration-status&gt;2&lt;/orchestration-status&gt;
+		&lt;equipment-role&gt;2&lt;/equipment-role&gt;
+    &lt;/vnf-information&gt;					
+  &lt;/vnf-list&gt;
+ &lt;/ucpe-vms-service-information&gt;										
+						&lt;request-information&gt;
+							&lt;request-action&gt;Layer3ServiceActivateRequest&lt;/request-action&gt;
+							&lt;order-number&gt;4281555&lt;/order-number&gt;
+							&lt;request-id&gt;155415ab-b4a7-4382-b4c6-d17d9sm42855&lt;/request-id&gt;
+							&lt;notification-url&gt;https://csi-tst-q22.it.com:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws&lt;/notification-url&gt;
+							&lt;source&gt;OMX&lt;/source&gt;
+							&lt;order-version&gt;1&lt;/order-version&gt;
+						&lt;/request-information&gt;
+						&lt;sdnc-request-header&gt;
+							&lt;svc-action&gt;activate&lt;/svc-action&gt;
+							&lt;svc-notification-url&gt;https://localhost:8443/adapters/rest/SDNCNotify&lt;/svc-notification-url&gt;
+							&lt;svc-request-id&gt;5b1f3c5d-cdf9-488d-8a4b-d3f1229d7760&lt;/svc-request-id&gt;
+						&lt;/sdnc-request-header&gt;
+						&lt;l2-homing-information&gt;
+							&lt;topology&gt;MultiPoint&lt;/topology&gt;
+							&lt;preferred-aic-clli&gt;MTSNJA4LCP1&lt;/preferred-aic-clli&gt;
+		                    &lt;aic-version&gt;2.5&lt;/aic-version&gt;
+							&lt;evc-name&gt;AS/VLXM/003717//SW&lt;/evc-name&gt;
+						&lt;/l2-homing-information&gt;
+						&lt;service-information&gt;
+							&lt;service-instance-id&gt;FK/VLXM/003717//SW_INTERNET&lt;/service-instance-id&gt;
+							&lt;subscriber-name&gt;FOUR SEASONS HEATING &amp;amp; COOLING_8310006378683&lt;/subscriber-name&gt;
+							&lt;service-type&gt;SDN-ETHERNET-INTERNET&lt;/service-type&gt;
+						&lt;/service-information&gt;
+						&lt;internet-service-change-details&gt;
+							&lt;internet-evc-speed-value&gt;10&lt;/internet-evc-speed-value&gt;
+							&lt;internet-evc-speed-units&gt;Kbps&lt;/internet-evc-speed-units&gt;
+	                    	&lt;v4-vr-lan-address&gt;10.10.7.14&lt;/v4-vr-lan-address&gt;
+	                     	&lt;v4-vr-lan-prefix-length&gt;10&lt;/v4-vr-lan-prefix-length&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.15&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.15&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v4-lan-public-prefixes&gt;
+							   &lt;request-index&gt;2&lt;/request-index&gt;
+							   &lt;v4-next-hop-address&gt;192.168.1.16&lt;/v4-next-hop-address&gt;
+							   &lt;v4-lan-public-prefix&gt;192.168.1.16&lt;/v4-lan-public-prefix&gt;
+							   &lt;v4-lan-public-prefix-length&gt;28&lt;/v4-lan-public-prefix-length&gt;
+							&lt;/t-provided-v4-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+							&lt;t-provided-v6-lan-public-prefixes&gt;
+							   &lt;request-index&gt;1&lt;/request-index&gt;
+							   &lt;v6-next-hop-address&gt;2001:1890:12e3:2da::&lt;/v6-next-hop-address&gt;
+							   &lt;v6-lan-public-prefix&gt;2001:1890:12e3:2da::&lt;/v6-lan-public-prefix&gt;
+							   &lt;v6-lan-public-prefix-length&gt;28&lt;/v6-lan-public-prefix-length&gt;
+							&lt;/t-provided-v6-lan-public-prefixes&gt;
+						&lt;/internet-service-change-details&gt;
+					&lt;/service-data&gt;
+				&lt;/layer3-service-list&gt;
+</RequestData>
+</SDNCAdapterCallbackRequest>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest-act.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest-act.xml
index 231898adfa..77babba7f7 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest-act.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest-act.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"
-	xmlns:v11="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/so/workflow/schema/v1"
+	xmlns:v11="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header/>
 	<soapenv:Body>
 		<v1:SDNCAdapterWorkflowRequest>
@@ -13,7 +13,7 @@
 			</v11:RequestHeader>
 			<v1:SDNCRequestData>
 				<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd" contentType="text/xml">
-					<tag0:service-request xmlns:tag0="http://org.openecomp/mso/request/details/schema/v1">
+					<tag0:service-request xmlns:tag0="http://org.onap/so/request/details/schema/v1">
 						<tag0:request-information>
 							<tag0:request-id>12570a36-7388-4c0a-bec4-189ce3kg9956</tag0:request-id>
 							<tag0:request-action>Layer3ServiceActivate</tag0:request-action>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest.xml
index f71f529593..8cbcce138f 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/sdncadapterworkflowrequest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"
-	xmlns:v11="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	xmlns:v1="http://org.onap/so/workflow/schema/v1"
+	xmlns:v11="http://org.onap/workflow/sdnc/adapter/schema/v1">
 	<soapenv:Header/>
 	<soapenv:Body>
 		<v1:SDNCAdapterWorkflowRequest>
@@ -13,7 +13,7 @@
 			</v11:RequestHeader>
 			<v1:SDNCRequestData>
 				<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd" contentType="text/xml">
-					<tag0:service-request xmlns:tag0="http://org.openecomp/mso/request/details/schema/v1">
+					<tag0:service-request xmlns:tag0="http://org.onap/so/request/details/schema/v1">
 						<tag0:request-information>
 							<tag0:request-id>12570a36-7388-4c0a-bec4-189ce3kg9956</tag0:request-id>
 							<tag0:request-action>GetLayer3ServiceDetailsRequest</tag0:request-action>
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/testAsyncResource.bpmn b/bpmn/MSOCommonBPMN/src/test/resources/testAsyncResource.bpmn
index e5498e4d2b..5f9a6f52af 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/testAsyncResource.bpmn
+++ b/bpmn/MSOCommonBPMN/src/test/resources/testAsyncResource.bpmn
@@ -10,7 +10,7 @@
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
       <bpmn2:script><![CDATA[//import java.net.InetAddress;
-import org.openecomp.mso.bpmn.common.workflow.service.*
+import org.onap.so.bpmn.common.workflow.service.*
 
 //def hostname = InetAddress.getLocalHost().getCanonicalHostName()
 //println ("my host name =================" + hostname)
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/vnfAdapter/vnfUpdateSimResponse.xml b/bpmn/MSOCommonBPMN/src/test/resources/vnfAdapter/vnfUpdateSimResponse.xml
index 4e7c4ee687..6970aee8a0 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/vnfAdapter/vnfUpdateSimResponse.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/vnfAdapter/vnfUpdateSimResponse.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:v1="http://org.openecomp.mso/vnfNotify">
+	xmlns:v1="http://org.onap.so/vnfNotify">
 	<soapenv:Header />
 	<soapenv:Body>
-<ns2:updateVnfNotification xmlns:ns2="http://org.openecomp.mso/vnfNotify">
+<ns2:updateVnfNotification xmlns:ns2="http://org.onap.so/vnfNotify">
    <messageId>testRequestId</messageId>
    <completed>true</completed>
    <rollback>