VoLTE groovy draft files

Issue-Id: SO-142

Change-Id: I2adbf796f46cb400d32ada1d7f0ae671e58b00ad
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

2 files changed, 722 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
new file mode 100644
index 0000000000..aece07ee90
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EGetService.groovy
@@ -0,0 +1,442 @@
+/*-

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

+ * ONAP - SO

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

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

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

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.runtime.Execution

+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(Execution 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(Execution 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(Execution 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(Execution 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)

+	}

+

+}
\ 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/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
new file mode 100644
index 0000000000..eaccdc0e27
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CustomE2EPutService.groovy
@@ -0,0 +1,280 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution;
+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 java.net.URLEncoder;
+import org.springframework.web.util.UriUtils
+
+/**
+ * This class supports the GenericPutService Sub Flow.
+ * This Generic sub flow can be used by any flow for the
+ * goal of creating a Service Instance or Service-Subscription in AAI. Upon successful completion of
+ * this sub flow the GENPS_SuccessIndicator will be true.
+ * The calling flow must set the GENPS_type variable as "service-instance"
+ * or "service-subscription".
+ *  A MSOWorkflowException will be thrown Upon unsuccessful
+ * completion or if an error occurs within this flow.
+ * Please map variables to the corresponding variable names
+ * below.
+ *
+ *
+ * Incoming Required Variables:
+ * @param - GENPS_requestId
+ * @param - GENPS_type - Required field. This will be required field populated as service-instance or service-subscription
+ * @param - GENPS_globalSubscriberId - Required field
+ * @param - GENPS_serviceType - Required Field
+ * @param - GENPS_payload - Required Field This will be the payload that needs to be sent.
+ *
+ * @param - GENPS_serviceInstanceId - Conditional Field. Required for service-instance.
+ * @param - GENPS_allottedResourceId - Conditional Field. Required for allotted-resource.
+ * @param - GENPS_tunnelXconnectId - Conditional Field. Required for tunnel-xconnect.
+ *
+ * @param - GENPS_serviceResourceVersion - Conditional Field. Needs to be provided only in case of update for both service-instance and service subscription. The calling flows
+ *          should check if a service-instance or servic-subscription exists by calling the subflow GenericGetService. if it exists then resourceversion should be
+ *          obtained from aai and sent as an input parameter.
+ *
+ * Outgoing Variables:
+ * @param - GENPS_SuccessIndicator
+ * @param - WorkflowException
+ *
+ *
+ */
+
+
+class CustomE2EPutService extends AbstractServiceTaskProcessor{
+
+	String Prefix = "GENPS_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+
+	public void preProcessRequest(Execution execution) {
+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		utils.log("DEBUG", " *** STARTED GenericPutService PreProcessRequest Process*** ", isDebugEnabled)
+
+		execution.setVariable("GENPS_SuccessIndicator", false)
+
+		try{
+			// Get Variables
+			String requestId = execution.getVariable("GENPS_requestId")
+			utils.log("DEBUG", "Incoming GENPS_requestId is: " + requestId, isDebugEnabled)
+
+			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
+			String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
+			String serviceType = execution.getVariable("GENPS_serviceType")
+			String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
+			String tunnelXconnectId = execution.getVariable("GENPS_tunnelXconnectId")
+			String type = execution.getVariable("GENPS_type")
+
+			if(type != null){
+				utils.log("DEBUG", "Incoming GENPS_type is: " + type, isDebugEnabled)
+				if(type.equalsIgnoreCase("service-instance")){
+					if(isBlank(globalSubscriberId) || isBlank(serviceType) || isBlank(serviceInstanceId)){
+						utils.log("DEBUG", "Incoming Required Variable is missing or null!", isDebugEnabled)
+						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)
+					}
+				}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)
+						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)
+					}
+				}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)
+						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)
+					}
+				}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)
+						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)
+					}
+				}else{
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming Type is Invalid. Please Specify Type as service-instance or service-subscription")
+				}
+			}else{
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Incoming GENPS_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 GenericPutService PreProcessRequest method!" + e, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in GenericPutService PreProcessRequest")
+
+		}
+		utils.log("DEBUG", "*** COMPLETED GenericPutService PreProcessRequest Process ***", isDebugEnabled)
+
+	}
+
+
+
+	/**
+	 * This method executes a Put call to AAI for the provided
+	 * service instance.
+	 *
+	 * @param - execution
+	 *
+	 */
+	public void putServiceInstance(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		utils.log("DEBUG", " *** STARTED GenericPutService PutServiceInstance method*** ", isDebugEnabled)
+		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)
+			String namespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
+			logDebug('AAI namespace is: ' + namespace, isDebugEnabled)
+
+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
+			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)
+
+			String serviceType = execution.getVariable("GENPS_serviceType")
+			utils.log("DEBUG", " Incoming GENPS_serviceType is: " + serviceType, isDebugEnabled)
+			String globalSubscriberId = execution.getVariable("GENPS_globalSubscriberId")
+			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+
+			// 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)
+
+				//	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")
+
+			}else if(type.equalsIgnoreCase("service-subscription")){
+
+				//	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")
+			}else if(type.equalsIgnoreCase("allotted-resource")){
+
+				String serviceInstanceId = execution.getVariable("GENPS_serviceInstanceId")
+				utils.log("DEBUG", " Incoming GENPS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
+				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+
+				//	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)
+				String allottedResourceId = execution.getVariable("GENPS_allottedResourceId")
+				utils.log("DEBUG", " Incoming GENPS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)
+				String tunnelXconnectId = execution.getVariable("GENPS_tunnelXconnectId")
+				utils.log("DEBUG", " Incoming GENPS_tunnelXconnectId is: " + tunnelXconnectId, isDebugEnabled)
+
+				//	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)
+			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)
+
+			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)
+
+			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)
+				execution.setVariable("GENPS_SuccessIndicator", true)
+			}
+
+			else{
+				utils.log("DEBUG", "Put Generic Service Instance 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 GenericPutService PutServiceInstance method!" + e, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Put Service Instance")
+		}
+		utils.log("DEBUG", " *** COMPLETED GenericPutService PutServiceInstance Process*** ", isDebugEnabled)
+	}
+
+
+
+}