Merge "Implement custom workflow API"

13 files changed, 1597 insertions, 791 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
new file mode 100644
index 0000000000..1580c9fb34
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
@@ -0,0 +1,206 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.apihandlerinfra;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.http.HttpStatus;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandler.common.RequestClientParameter;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.logging.ErrorLoggerInfo;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.client.RequestsDbClient;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.logger.ErrorCode;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.serviceinstancebeans.ModelType;
+import org.onap.so.serviceinstancebeans.RequestReferences;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.transaction.Transactional;
+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.container.ContainerRequestContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.HashMap;
+
+@Component
+@Path("/onap/so/infra/instanceManagement")
+@Api(value="/onap/so/infra/instanceManagement",description="Infrastructure API Requests for Instance Management")
+public class InstanceManagement {
+
+	private static Logger logger = LoggerFactory.getLogger(InstanceManagement.class);	
+	private static String uriPrefix = "/instanceManagement/";
+	private static final String SAVE_TO_DB = "save instance to db";
+
+	@Autowired
+	private RequestsDbClient infraActiveRequestsClient;
+	
+	@Autowired
+	private MsoRequest msoRequest;
+	
+	@Autowired
+	private RequestHandlerUtils requestHandlerUtils;
+	
+	@POST
+	@Path("/{version:[vV][1]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/workflows/{workflowUuid}")
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	@ApiOperation(value="Execute custom workflow",response=Response.class)
+	@Transactional
+	public Response executeCustomWorkflow(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+                                          @PathParam("vnfInstanceId") String vnfInstanceId, @PathParam("workflowUuid") String workflowUuid, @Context ContainerRequestContext requestContext) throws ApiException {
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
+		HashMap<String, String> instanceIdMap = new HashMap<>();
+		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
+		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
+		instanceIdMap.put("workflowUuid", workflowUuid);	
+		return processCustomWorkflowRequest(request, Action.inPlaceSoftwareUpdate, instanceIdMap, version, requestId, requestContext);
+	}	
+
+	private Response processCustomWorkflowRequest(String requestJSON, Actions action, HashMap<String, String> instanceIdMap, String version, String requestId, ContainerRequestContext requestContext) throws ApiException {
+		String serviceInstanceId = null;
+		if (instanceIdMap != null) {
+			serviceInstanceId = instanceIdMap.get("serviceInstanceId");
+		}
+		Boolean aLaCarte = true;
+		long startTime = System.currentTimeMillis ();
+		ServiceInstancesRequest sir = null;
+		String apiVersion = version.substring(1);
+		
+		String requestUri = requestHandlerUtils.getRequestUri(requestContext, uriPrefix);
+		
+		sir = requestHandlerUtils.convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
+		String requestScope = requestHandlerUtils.deriveRequestScope(action, sir, requestUri);
+		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.IN_PROGRESS, requestJSON, requestScope);
+				
+		try {
+			requestHandlerUtils.validateHeaders(requestContext);
+		} catch (ValidationException e) {
+			logger.error("Exception occurred", e);
+            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            ValidateException validateException = new ValidateException.Builder(e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
+                        .errorInfo(errorLoggerInfo).build();
+            requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+            throw validateException;
+		}
+		
+		requestHandlerUtils.parseRequest(sir, instanceIdMap, action, version, requestJSON, aLaCarte, requestId, currentActiveReq);
+		requestHandlerUtils.setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
+		 
+		int requestVersion = Integer.parseInt(version.substring(1));
+		String vnfType = msoRequest.getVnfType(sir,requestScope,action,requestVersion);
+				
+		if(requestScope.equalsIgnoreCase(ModelType.vnf.name()) && vnfType != null){
+			currentActiveReq.setVnfType(vnfType);
+		}
+		
+		InfraActiveRequests dup = null;
+		boolean inProgress = false;		
+
+		dup = requestHandlerUtils.duplicateCheck(action, instanceIdMap, startTime, msoRequest, null, requestScope, currentActiveReq);
+
+		if(dup != null){
+			inProgress = requestHandlerUtils.camundaHistoryCheck(dup, currentActiveReq);
+		}
+		
+		if (dup != null && inProgress) {
+            requestHandlerUtils.buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, null, requestScope, dup);
+		}
+		ServiceInstancesResponse serviceResponse = new ServiceInstancesResponse();
+
+		RequestReferences referencesResponse = new RequestReferences();
+
+		referencesResponse.setRequestId(requestId);
+
+		serviceResponse.setRequestReferences(referencesResponse);
+		Boolean isBaseVfModule = false;
+		
+		String workflowUuid = null;
+		if (instanceIdMap !=null) {
+			workflowUuid = instanceIdMap.get("workflowUuid");
+		}
+
+        RecipeLookupResult recipeLookupResult = getCustomWorkflowUri(workflowUuid);
+        String serviceInstanceType = requestHandlerUtils.getServiceType(requestScope, sir, true);						
+	
+		serviceInstanceId = requestHandlerUtils.setServiceInstanceId(requestScope, sir);
+		String vnfId = "";
+		
+		if(sir.getVnfInstanceId () != null){
+			vnfId = sir.getVnfInstanceId ();
+		}
+		
+        try{
+            infraActiveRequestsClient.save(currentActiveReq);
+        }catch(Exception e){
+            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ACCESS_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            throw new RequestDbFailureException.Builder(SAVE_TO_DB, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
+                    .errorInfo(errorLoggerInfo).build();
+        }		
+		
+		RequestClientParameter requestClientParameter = null;
+		try {
+			requestClientParameter = new RequestClientParameter.Builder()
+						.setRequestId(requestId)
+						.setBaseVfModule(isBaseVfModule)
+						.setRecipeTimeout(recipeLookupResult.getRecipeTimeout())
+						.setRequestAction(action.toString())
+						.setServiceInstanceId(serviceInstanceId)						
+						.setVnfId(vnfId)						
+						.setServiceType(serviceInstanceType)
+						.setVnfType(vnfType)						
+						.setRequestDetails(requestHandlerUtils.mapJSONtoMSOStyle(requestJSON, sir, aLaCarte, action))
+						.setApiVersion(apiVersion)
+						.setALaCarte(aLaCarte)
+						.setRequestUri(requestUri)
+						.build();
+		} catch (IOException e) {
+			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+			throw new ValidateException.Builder("Unable to generate RequestClientParamter object" + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER)
+	                  .errorInfo(errorLoggerInfo).build();
+		}
+		return requestHandlerUtils.postBPELRequest(currentActiveReq, requestClientParameter, recipeLookupResult.getOrchestrationURI(), requestScope);
+	}	
+   
+    private RecipeLookupResult getCustomWorkflowUri(String workflowUuid) {
+    	
+		RecipeLookupResult recipeLookupResult = new RecipeLookupResult("/mso/async/services/VnfInPlaceUpdate", 180);
+		return recipeLookupResult;		
+	}	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/JerseyConfiguration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/JerseyConfiguration.java
index 5790f1afe9..434b9e9364 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/JerseyConfiguration.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/JerseyConfiguration.java
@@ -63,6 +63,7 @@ public class JerseyConfiguration extends ResourceConfig {
 		register(RequestUriFilter.class);
 		register(E2EServiceInstances.class);
 		register(WorkflowSpecificationsHandler.class);
+		register(InstanceManagement.class);
 		// this registration seems to be needed to get predictable
 		// execution behavior for the above JSON Exception Mappers
 		register(com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider.class);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
index de7d26379c..dc8e6b6958 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
@@ -50,6 +50,7 @@ import org.onap.so.apihandlerinfra.validation.MembersValidation;
 import org.onap.so.apihandlerinfra.validation.ApplyUpdatedConfigValidation;
 import org.onap.so.apihandlerinfra.validation.CloudConfigurationValidation;
 import org.onap.so.apihandlerinfra.validation.ConfigurationParametersValidation;
+import org.onap.so.apihandlerinfra.validation.CustomWorkflowValidation;
 import org.onap.so.apihandlerinfra.validation.InPlaceSoftwareUpdateValidation;
 import org.onap.so.apihandlerinfra.validation.InstanceIdMapValidation;
 import org.onap.so.apihandlerinfra.validation.ModelInfoValidation;
@@ -175,7 +176,14 @@ public class MsoRequest {
         
         rules.add(new InstanceIdMapValidation());
         
-        if(reqVersion >= 6 && action == Action.inPlaceSoftwareUpdate){
+        String workflowUuid = null;
+        if (instanceIdMap != null) {
+        	workflowUuid = instanceIdMap.get("workflowUuid");
+        }
+        
+        if (workflowUuid != null) {
+        	rules.add(new CustomWorkflowValidation());
+        }else if(reqVersion >= 6 && action == Action.inPlaceSoftwareUpdate){
         	rules.add(new InPlaceSoftwareUpdateValidation());
         }else if(reqVersion >= 6 && action == Action.applyUpdatedConfig){
         	rules.add(new ApplyUpdatedConfigValidation());
@@ -361,7 +369,9 @@ public class MsoRequest {
 	            	aq.setInstanceGroupName(requestInfo.getInstanceName());
 	            }
 	            if(ModelType.vnf.name().equalsIgnoreCase(requestScope)){
-	              	aq.setVnfName(requestInfo.getInstanceName());
+	            	if (requestInfo != null) {
+	            		aq.setVnfName(requestInfo.getInstanceName());
+	            	}
 					if (null != servInsReq.getRequestDetails()) {
 						RelatedInstanceList[] instanceList = servInsReq.getRequestDetails().getRelatedInstanceList();
 	
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java
new file mode 100644
index 0000000000..c02b40aeca
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java
@@ -0,0 +1,567 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.apihandlerinfra;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.camunda.bpm.engine.history.HistoricProcessInstance;
+import org.camunda.bpm.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+import org.onap.so.apihandler.camundabeans.CamundaResponse;
+import org.onap.so.apihandler.common.CommonConstants;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandler.common.RequestClient;
+import org.onap.so.apihandler.common.RequestClientFactory;
+import org.onap.so.apihandler.common.RequestClientParameter;
+import org.onap.so.apihandler.common.ResponseBuilder;
+import org.onap.so.apihandler.common.ResponseHandler;
+import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.BPMNFailureException;
+import org.onap.so.apihandlerinfra.exceptions.ClientConnectionException;
+import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
+import org.onap.so.apihandlerinfra.exceptions.DuplicateRequestException;
+import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
+import org.onap.so.apihandlerinfra.exceptions.ValidateException;
+import org.onap.so.apihandlerinfra.logging.ErrorLoggerInfo;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.client.RequestsDbClient;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.logger.ErrorCode;
+import org.onap.so.logger.LogConstants;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.serviceinstancebeans.ModelType;
+import org.onap.so.serviceinstancebeans.RelatedInstance;
+import org.onap.so.serviceinstancebeans.RelatedInstanceList;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
+import org.onap.so.utils.CryptoUtils;
+import org.onap.so.utils.UUIDChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestTemplate;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.xml.bind.DatatypeConverter;
+
+import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
+
+import java.io.IOException;
+import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+public class RequestHandlerUtils {
+
+	private static Logger logger = LoggerFactory.getLogger(RequestHandlerUtils.class);
+	
+	private static final String SAVE_TO_DB = "save instance to db";
+	
+	@Autowired
+	private Environment env;	
+
+	@Autowired
+	private RequestClientFactory reqClientFactory;
+	
+	@Autowired
+	private RequestsDbClient infraActiveRequestsClient;
+	
+	@Autowired
+	private ResponseBuilder builder;
+	
+	@Autowired
+	private MsoRequest msoRequest;
+	
+	@Autowired
+	private RestTemplate restTemplate;
+	
+	@Autowired
+	private CatalogDbClient catalogDbClient;
+		
+	public Response postBPELRequest(InfraActiveRequests currentActiveReq, RequestClientParameter requestClientParameter, String orchestrationUri, String requestScope)throws ApiException {
+		RequestClient requestClient = null;
+		HttpResponse response = null;
+		try {
+			requestClient = reqClientFactory.getRequestClient (orchestrationUri);
+			response = requestClient.post(requestClientParameter);
+		} catch (Exception e) {
+			
+            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            String url = requestClient != null ? requestClient.getUrl() : "";
+            ClientConnectionException clientException = new ClientConnectionException.Builder(url, HttpStatus.SC_BAD_GATEWAY, ErrorNumbers.SVC_NO_SERVER_RESOURCES).cause(e).errorInfo(errorLoggerInfo).build();
+            updateStatus(currentActiveReq, Status.FAILED, clientException.getMessage());
+
+            throw clientException;
+		}
+
+		if (response == null) {
+			
+            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.BusinessProcesssError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            ClientConnectionException clientException = new ClientConnectionException.Builder(requestClient.getUrl(), HttpStatus.SC_BAD_GATEWAY, ErrorNumbers.SVC_NO_SERVER_RESOURCES).errorInfo(errorLoggerInfo).build();
+
+            updateStatus(currentActiveReq, Status.FAILED, clientException.getMessage());
+
+            throw clientException;
+		}
+
+		ResponseHandler respHandler = null;
+        int bpelStatus = 500;
+        try {
+            respHandler = new ResponseHandler (response, requestClient.getType ());
+            bpelStatus = respHandler.getStatus ();
+        } catch (ApiException e) {
+            logger.error("Exception occurred", e);
+            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            ValidateException validateException = new ValidateException.Builder("Exception caught mapping Camunda JSON response to object", HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
+                        .errorInfo(errorLoggerInfo).build();
+            updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+            throw validateException;
+        }
+
+		// BPEL accepted the request, the request is in progress
+		if (bpelStatus == HttpStatus.SC_ACCEPTED) {
+			ServiceInstancesResponse jsonResponse;
+			CamundaResponse camundaResp = respHandler.getResponse();
+			
+			if("Success".equalsIgnoreCase(camundaResp.getMessage())) {
+				try {
+					ObjectMapper mapper = new ObjectMapper();
+					jsonResponse = mapper.readValue(camundaResp.getResponse(), ServiceInstancesResponse.class);
+					jsonResponse.getRequestReferences().setRequestId(requestClientParameter.getRequestId());
+					Optional<URL> selfLinkUrl = msoRequest.buildSelfLinkUrl(currentActiveReq.getRequestUrl(), requestClientParameter.getRequestId());
+					if(selfLinkUrl.isPresent()){
+						jsonResponse.getRequestReferences().setRequestSelfLink(selfLinkUrl.get());
+					} else {
+					    jsonResponse.getRequestReferences().setRequestSelfLink(null);
+					}    
+				} catch (IOException e) {
+					logger.error("Exception occurred", e);
+					ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+					ValidateException validateException = new ValidateException.Builder("Exception caught mapping Camunda JSON response to object", HttpStatus.SC_NOT_ACCEPTABLE, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
+			                    .errorInfo(errorLoggerInfo).build();
+					updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+					throw validateException;
+				}	
+				return builder.buildResponse(HttpStatus.SC_ACCEPTED, requestClientParameter.getRequestId(), jsonResponse, requestClientParameter.getApiVersion());
+			} 
+		}
+			
+		List<String> variables = new ArrayList<>();
+		variables.add(bpelStatus + "");
+		String camundaJSONResponseBody = respHandler.getResponseBody ();
+		if (camundaJSONResponseBody != null && !camundaJSONResponseBody.isEmpty ()) {
+			
+		    ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.BusinessProcesssError).errorSource(requestClient.getUrl()).build();
+		    BPMNFailureException bpmnException = new BPMNFailureException.Builder(String.valueOf(bpelStatus) + camundaJSONResponseBody, bpelStatus, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
+		            .errorInfo(errorLoggerInfo).build();
+
+		    updateStatus(currentActiveReq, Status.FAILED, bpmnException.getMessage());
+
+		    throw bpmnException;
+		} else {
+		
+		    ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.BusinessProcesssError).errorSource(requestClient.getUrl()).build();
+
+
+		    BPMNFailureException servException = new BPMNFailureException.Builder(String.valueOf(bpelStatus), bpelStatus, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
+		            .errorInfo(errorLoggerInfo).build();
+		    updateStatus(currentActiveReq, Status.FAILED, servException.getMessage());
+
+		    throw servException;
+		}
+	}
+	
+	public void updateStatus(InfraActiveRequests aq, Status status, String errorMessage) throws RequestDbFailureException{
+		if ((status == Status.FAILED) || (status == Status.COMPLETE)) {
+			aq.setStatusMessage (errorMessage);
+			aq.setProgress(new Long(100));
+			aq.setRequestStatus(status.toString());
+			Timestamp endTimeStamp = new Timestamp (System.currentTimeMillis());
+			aq.setEndTime (endTimeStamp);
+			try{
+				infraActiveRequestsClient.save(aq);
+			}catch(Exception e){
+				ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ACCESS_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+	            throw new RequestDbFailureException.Builder(SAVE_TO_DB, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
+	                    .errorInfo(errorLoggerInfo).build();
+			}
+		}
+	}
+	
+	public String deriveRequestScope(Actions action, ServiceInstancesRequest sir, String requestUri) {
+		if(action == Action.inPlaceSoftwareUpdate || action == Action.applyUpdatedConfig){
+			return (ModelType.vnf.name());
+		}else if(action == Action.addMembers || action == Action.removeMembers){
+			return(ModelType.instanceGroup.toString());
+		}else{
+			String requestScope;
+			if(sir.getRequestDetails().getModelInfo().getModelType() == null){
+				requestScope = requestScopeFromUri(requestUri);
+			}else{
+				requestScope = sir.getRequestDetails().getModelInfo().getModelType().name(); 
+			}
+			return requestScope; 
+		}
+	}
+	
+	
+	public void validateHeaders(ContainerRequestContext context) throws ValidationException{
+		MultivaluedMap<String, String> headers = context.getHeaders();
+		if(!headers.containsKey(ONAPLogConstants.Headers.REQUEST_ID)){
+			 throw new ValidationException(ONAPLogConstants.Headers.REQUEST_ID + " header", true);
+		}
+		if(!headers.containsKey(ONAPLogConstants.Headers.PARTNER_NAME)){
+			throw new ValidationException(ONAPLogConstants.Headers.PARTNER_NAME + " header", true);
+		}
+		if(!headers.containsKey(REQUESTOR_ID)){
+			throw new ValidationException(REQUESTOR_ID + " header", true);
+		}
+	}
+	
+	public String getRequestUri(ContainerRequestContext context, String uriPrefix){
+		String requestUri = context.getUriInfo().getPath();
+		String httpUrl = MDC.get(LogConstants.URI_BASE).concat(requestUri);
+		MDC.put(LogConstants.HTTP_URL, httpUrl);
+		requestUri = requestUri.substring(requestUri.indexOf(uriPrefix) + uriPrefix.length());
+		return requestUri;
+	}
+	
+	public InfraActiveRequests duplicateCheck(Actions action, HashMap<String, String> instanceIdMap, long startTime,
+            MsoRequest msoRequest, String instanceName, String requestScope, InfraActiveRequests currentActiveReq) throws ApiException {
+		InfraActiveRequests dup = null;
+		try {
+			if(!(instanceName==null && requestScope.equals("service") && (action == Action.createInstance || action == Action.activateInstance || action == Action.assignInstance))){
+				dup = infraActiveRequestsClient.checkInstanceNameDuplicate (instanceIdMap, instanceName, requestScope);
+			}
+		} catch (Exception e) {
+			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_CHECK_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+			RequestDbFailureException requestDbFailureException = new RequestDbFailureException.Builder("check for duplicate instance", e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
+					.errorInfo(errorLoggerInfo).build();
+			updateStatus(currentActiveReq, Status.FAILED, requestDbFailureException.getMessage());
+			throw requestDbFailureException;
+		}
+		return dup;
+	}
+	
+	public boolean camundaHistoryCheck(InfraActiveRequests duplicateRecord, InfraActiveRequests currentActiveReq) throws RequestDbFailureException, ContactCamundaException{
+		String requestId = duplicateRecord.getRequestId();
+		String path = env.getProperty("mso.camunda.rest.history.uri") + requestId;
+		String targetUrl = env.getProperty("mso.camundaURL") + path;
+		HttpHeaders headers = setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey")); 
+		HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+		ResponseEntity<List<HistoricProcessInstanceEntity>> response = null;
+		try{
+			response = restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity, new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>(){});
+		}catch(HttpStatusCodeException e){
+			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_CHECK_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+			ContactCamundaException contactCamundaException= new ContactCamundaException.Builder(requestId, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
+					.errorInfo(errorLoggerInfo).build();
+			updateStatus(currentActiveReq, Status.FAILED, contactCamundaException.getMessage());
+			throw contactCamundaException;
+		}
+		if(response.getBody().isEmpty()){
+			updateStatus(duplicateRecord, Status.COMPLETE, "Request Completed");
+		}
+		for(HistoricProcessInstance instance : response.getBody()){
+			if(instance.getState().equals("ACTIVE")){
+				return true;
+			}else{
+				updateStatus(duplicateRecord, Status.COMPLETE, "Request Completed");
+			}
+		}	
+		return false;
+	}
+	
+	protected HttpHeaders setCamundaHeaders(String auth, String msoKey) {
+		HttpHeaders headers = new HttpHeaders();
+		List<org.springframework.http.MediaType> acceptableMediaTypes = new ArrayList<>();
+		acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON);
+		headers.setAccept(acceptableMediaTypes);
+		try {
+			String userCredentials = CryptoUtils.decrypt(auth, msoKey);
+			if(userCredentials != null) {
+				headers.add(HttpHeaders.AUTHORIZATION, "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));
+			}
+		} catch(GeneralSecurityException e) {
+			logger.error("Security exception", e);
+		}
+		return headers;
+	}
+
+	public ServiceInstancesRequest convertJsonToServiceInstanceRequest(String requestJSON, Actions action, long startTime,
+                                     ServiceInstancesRequest sir, MsoRequest msoRequest, String requestId, String requestUri) throws ApiException {
+		try{
+			ObjectMapper mapper = new ObjectMapper();
+			return mapper.readValue(requestJSON, ServiceInstancesRequest.class);
+
+		} catch (IOException e) {
+
+			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+
+			ValidateException validateException = new ValidateException.Builder("Error mapping request: " + e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
+					.errorInfo(errorLoggerInfo).build();
+			String requestScope = requestScopeFromUri(requestUri);
+
+			msoRequest.createErrorRequestRecord(Status.FAILED, requestId, validateException.getMessage(), action, requestScope, requestJSON);
+
+			throw validateException;
+		}
+	}
+
+	public void parseRequest(ServiceInstancesRequest sir, HashMap<String, String> instanceIdMap, Actions action, String version, 
+			String requestJSON, Boolean aLaCarte, String requestId, InfraActiveRequests currentActiveReq) throws ValidateException, RequestDbFailureException {
+		int reqVersion = Integer.parseInt(version.substring(1));
+		try {
+			msoRequest.parse(sir, instanceIdMap, action, version, requestJSON, reqVersion, aLaCarte);
+		} catch (Exception e) {
+			logger.error("failed to parse request", e);
+			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+			ValidateException validateException = new ValidateException.Builder("Error parsing request: " + e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
+					.errorInfo(errorLoggerInfo).build();
+
+			updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+
+			throw validateException;
+		}
+	}
+	
+	public void buildErrorOnDuplicateRecord(InfraActiveRequests currentActiveReq, Actions action, HashMap<String, String> instanceIdMap, long startTime, MsoRequest msoRequest,
+             String instanceName, String requestScope, InfraActiveRequests dup) throws ApiException {
+
+		String instance = null;
+		if(instanceName != null){
+			instance = instanceName;
+		}else{
+			instance = instanceIdMap.get(requestScope + "InstanceId");
+		}		
+		ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_FOUND, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+
+		DuplicateRequestException dupException = new DuplicateRequestException.Builder(requestScope,instance,dup.getRequestStatus(),dup.getRequestId(), HttpStatus.SC_CONFLICT, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
+				.errorInfo(errorLoggerInfo).build();
+
+		updateStatus(currentActiveReq, Status.FAILED, dupException.getMessage());
+
+		throw dupException;
+	}
+	
+	 public String getRequestId(ContainerRequestContext requestContext) throws ValidateException {
+	    String requestId = null;
+	    if (requestContext.getProperty("requestId") != null) {
+	    	requestId = requestContext.getProperty("requestId").toString();
+	    }
+	    if (UUIDChecker.isValidUUID(requestId)) {
+	    	return requestId;
+	    } else {
+	    	ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+			ValidateException validateException = new ValidateException.Builder("Request Id " + requestId + " is not a valid UUID", HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER)
+		                   .errorInfo(errorLoggerInfo).build();
+			
+			throw validateException;
+	    }
+	 }	
+	
+	 public void setInstanceId(InfraActiveRequests currentActiveReq, String requestScope, String instanceId, Map<String, String> instanceIdMap) {
+		if(StringUtils.isNotBlank(instanceId)) {
+			if(ModelType.service.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setServiceInstanceId(instanceId);
+			} else if(ModelType.vnf.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setVnfId(instanceId);
+			} else if(ModelType.vfModule.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setVfModuleId(instanceId);
+			} else if(ModelType.volumeGroup.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setVolumeGroupId(instanceId);
+			} else if(ModelType.network.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setNetworkId(instanceId);
+			} else if(ModelType.configuration.name().equalsIgnoreCase(requestScope)) {
+				currentActiveReq.setConfigurationId(instanceId);
+			}else if(ModelType.instanceGroup.toString().equalsIgnoreCase(requestScope)){
+				currentActiveReq.setInstanceGroupId(instanceId);
+			}
+		} else if(instanceIdMap != null && !instanceIdMap.isEmpty()) {
+			if(instanceIdMap.get("serviceInstanceId") != null){
+				currentActiveReq.setServiceInstanceId(instanceIdMap.get("serviceInstanceId"));
+	       	}
+	       	if(instanceIdMap.get("vnfInstanceId") != null){
+	       		currentActiveReq.setVnfId(instanceIdMap.get("vnfInstanceId"));
+	       	}
+	       	if(instanceIdMap.get("vfModuleInstanceId") != null){
+	       		currentActiveReq.setVfModuleId(instanceIdMap.get("vfModuleInstanceId"));
+	       	}
+	       	if(instanceIdMap.get("volumeGroupInstanceId") != null){
+	       		currentActiveReq.setVolumeGroupId(instanceIdMap.get("volumeGroupInstanceId"));
+	       	}
+	       	if(instanceIdMap.get("networkInstanceId") != null){
+	       		currentActiveReq.setNetworkId(instanceIdMap.get("networkInstanceId"));
+	       	}
+	       	if(instanceIdMap.get("configurationInstanceId") != null){
+	       		currentActiveReq.setConfigurationId(instanceIdMap.get("configurationInstanceId"));
+	       	}
+	       	if(instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID) != null){
+	       		currentActiveReq.setInstanceGroupId(instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID));
+	       	}
+		}
+	 }
+	 
+	 public String mapJSONtoMSOStyle(String msoRawRequest, ServiceInstancesRequest serviceInstRequest, boolean isAlaCarte, Actions action) throws IOException {
+	    ObjectMapper mapper = new ObjectMapper();    	
+	    mapper.setSerializationInclusion(Include.NON_NULL);    	
+	    if(msoRawRequest != null){
+		   	ServiceInstancesRequest sir = mapper.readValue(msoRawRequest, ServiceInstancesRequest.class);    	
+		   	if(	serviceInstRequest != null && 
+		   		serviceInstRequest.getRequestDetails() != null && 
+		   		serviceInstRequest.getRequestDetails().getRequestParameters() != null) {
+		   		if(	!isAlaCarte && Action.createInstance.equals(action)) {
+		   			sir.getRequestDetails().setCloudConfiguration(serviceInstRequest.getRequestDetails().getCloudConfiguration());
+		   			sir.getRequestDetails().getRequestParameters().setUserParams(serviceInstRequest.getRequestDetails().getRequestParameters().getUserParams());
+		   		}
+		   		sir.getRequestDetails().getRequestParameters().setUsePreload(serviceInstRequest.getRequestDetails().getRequestParameters().getUsePreload());
+		   	}
+		    	
+		   	logger.debug("Value as string: {}", mapper.writeValueAsString(sir));
+		   	return mapper.writeValueAsString(sir);
+	    }
+	    return null;
+	}
+	 
+	public Optional<String> retrieveModelName(RequestParameters requestParams) {
+	   	String requestTestApi = null;
+	   	TestApi testApi = null;
+	    	
+	   	if (requestParams != null) {
+	   		requestTestApi = requestParams.getTestApi();
+	   	}
+	    	
+	   	if (requestTestApi == null) {
+	   		if(requestParams != null && requestParams.getALaCarte() != null && !requestParams.getALaCarte()) {
+		    	requestTestApi = env.getProperty(CommonConstants.MACRO_TEST_API);
+	   		} else {
+	   			requestTestApi = env.getProperty(CommonConstants.ALACARTE_TEST_API);
+	   		}
+	   	}
+	    	
+		try {
+			testApi = TestApi.valueOf(requestTestApi);
+			return Optional.of(testApi.getModelName());
+		} catch (Exception e) {
+			logger.warn("Catching the exception on the valueOf enum call and continuing", e);
+			throw new IllegalArgumentException("Invalid TestApi is provided", e);
+		}
+	   }
+	    
+	public String getDefaultModel(ServiceInstancesRequest sir) {
+	   	String defaultModel = sir.getRequestDetails().getRequestInfo().getSource() + "_DEFAULT";
+	   	Optional<String> oModelName = retrieveModelName(sir.getRequestDetails().getRequestParameters());
+		if (oModelName.isPresent()) {
+			defaultModel = oModelName.get();
+		}
+		return defaultModel;
+	}
+		
+	public String getServiceType(String requestScope, ServiceInstancesRequest sir, Boolean aLaCarteFlag){
+		String serviceType = null;
+		if(requestScope.equalsIgnoreCase(ModelType.service.toString())){
+			String defaultServiceModelName = getDefaultModel(sir);
+			org.onap.so.db.catalog.beans.Service serviceRecord;
+			if(aLaCarteFlag){
+				 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
+				 if(serviceRecord != null){
+					 serviceType = serviceRecord.getServiceType();
+				 }
+			}else{
+				serviceRecord = catalogDbClient.getServiceByID(sir.getRequestDetails().getModelInfo().getModelVersionId());
+				if(serviceRecord != null){
+					 serviceType = serviceRecord.getServiceType();
+				 }else{
+					 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
+					 if(serviceRecord != null){
+						 serviceType = serviceRecord.getServiceType();
+					 }
+				 }
+			}
+		}else{
+			serviceType = msoRequest.getServiceInstanceType(sir, requestScope);
+			}
+		return serviceType;
+	}
+	
+	protected String setServiceInstanceId(String requestScope, ServiceInstancesRequest sir){
+		if(sir.getServiceInstanceId () != null){
+			return sir.getServiceInstanceId ();
+		}else if(requestScope.equalsIgnoreCase(ModelType.instanceGroup.toString())){
+			RelatedInstanceList[] relatedInstances = sir.getRequestDetails().getRelatedInstanceList();
+			if(relatedInstances != null){
+				for(RelatedInstanceList relatedInstanceList : relatedInstances){
+					RelatedInstance relatedInstance = relatedInstanceList.getRelatedInstance();
+					if(relatedInstance.getModelInfo().getModelType() == ModelType.service){
+						return relatedInstance.getInstanceId();
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	private String requestScopeFromUri(String requestUri){
+		String requestScope;
+		if(requestUri.contains(ModelType.network.name())){
+			requestScope = ModelType.network.name();
+		}else if(requestUri.contains(ModelType.vfModule.name())){
+			requestScope = ModelType.vfModule.name();
+		}else if(requestUri.contains(ModelType.volumeGroup.name())){
+			requestScope = ModelType.volumeGroup.name();
+		}else if(requestUri.contains(ModelType.configuration.name())){
+			requestScope = ModelType.configuration.name();
+		}else if(requestUri.contains(ModelType.vnf.name())){
+			requestScope = ModelType.vnf.name();
+		}else{
+			requestScope = ModelType.service.name();
+		}
+		return requestScope;
+	}
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
index 8c5904fb21..c6a45d540c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
@@ -23,8 +23,6 @@
 
 package org.onap.so.apihandlerinfra;
 
-
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -32,22 +30,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
-import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.apihandler.camundabeans.CamundaResponse;
 import org.onap.so.apihandler.common.CommonConstants;
 import org.onap.so.apihandler.common.ErrorNumbers;
-import org.onap.so.apihandler.common.RequestClient;
-import org.onap.so.apihandler.common.RequestClientFactory;
 import org.onap.so.apihandler.common.RequestClientParameter;
-import org.onap.so.apihandler.common.ResponseBuilder;
-import org.onap.so.apihandler.common.ResponseHandler;
 import org.onap.so.apihandlerinfra.exceptions.ApiException;
-import org.onap.so.apihandlerinfra.exceptions.BPMNFailureException;
-import org.onap.so.apihandlerinfra.exceptions.ClientConnectionException;
-import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
-import org.onap.so.apihandlerinfra.exceptions.DuplicateRequestException;
 import org.onap.so.apihandlerinfra.exceptions.RecipeNotFoundException;
 import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
 import org.onap.so.apihandlerinfra.exceptions.ValidateException;
@@ -67,7 +54,6 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.client.RequestsDbClient;
 import org.onap.so.exceptions.ValidationException;
 import org.onap.so.logger.ErrorCode;
-import org.onap.so.logger.LogConstants;
 import org.onap.so.logger.MessageEnum;
 import org.onap.so.serviceinstancebeans.CloudConfiguration;
 import org.onap.so.serviceinstancebeans.ModelInfo;
@@ -83,23 +69,11 @@ import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
 import org.onap.so.serviceinstancebeans.VfModules;
 import org.onap.so.serviceinstancebeans.Vnfs;
-import org.onap.so.utils.CryptoUtils;
-import org.onap.so.utils.UUIDChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.HttpStatusCodeException;
-import org.springframework.web.client.RestTemplate;
-import org.camunda.bpm.engine.history.HistoricProcessInstance;
-import org.camunda.bpm.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
 
 import javax.transaction.Transactional;
 import javax.ws.rs.Consumes;
@@ -112,21 +86,14 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import javax.xml.bind.DatatypeConverter;
 import java.io.IOException;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
-
 @Component
 @Path("/onap/so/infra/serviceInstantiation")
 @Api(value="/onap/so/infra/serviceInstantiation",description="Infrastructure API Requests for Service Instances")
@@ -135,28 +102,23 @@ public class ServiceInstances {
 	private static Logger logger = LoggerFactory.getLogger(MsoRequest.class);
 	private static String NAME = "name";
 	private static String VALUE = "value";
+	private static String uriPrefix = "/serviceInstantiation/";
 	private static final String SAVE_TO_DB = "save instance to db";
 
 	@Autowired
 	private Environment env;
 	
 	@Autowired
-	private RequestClientFactory reqClientFactory;
-	
-	@Autowired
 	private CatalogDbClient catalogDbClient;
 
 	@Autowired
 	private RequestsDbClient infraActiveRequestsClient;
 	
 	@Autowired
-	private ResponseBuilder builder;
-	
-	@Autowired
 	private MsoRequest msoRequest;
 	
 	@Autowired
-	private RestTemplate restTemplate;
+	private RequestHandlerUtils requestHandlerUtils;
 	
 	@POST
     @Path("/{version:[vV][5-7]}/serviceInstances")
@@ -165,8 +127,8 @@ public class ServiceInstances {
 	@ApiOperation(value="Create a Service Instance on a version provided",response=Response.class)
 	@Transactional
     public Response createServiceInstance(String request, @PathParam("version") String version, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
-		return serviceInstances(request, Action.createInstance, null, version, requestId, getRequestUri(requestContext));
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
+		return serviceInstances(request, Action.createInstance, null, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -176,10 +138,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Activate provided Service Instance",response=Response.class)
 	@Transactional
     public Response activateServiceInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.activateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.activateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -189,10 +151,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Deactivate provided Service Instance",response=Response.class)
 	@Transactional
     public Response deactivateServiceInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.deactivateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deactivateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@DELETE
@@ -202,10 +164,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Delete provided Service Instance",response=Response.class)
 	@Transactional
     public Response deleteServiceInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -215,8 +177,8 @@ public class ServiceInstances {
 	@ApiOperation(value="Assign Service Instance", response=Response.class)
 	@Transactional
 	public Response assignServiceInstance(String request, @PathParam("version") String version, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
-		return serviceInstances(request, Action.assignInstance, null, version, requestId, getRequestUri(requestContext));
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
+		return serviceInstances(request, Action.assignInstance, null, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@POST
@@ -226,10 +188,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Unassign Service Instance", response=Response.class)
 	@Transactional
 	public Response unassignServiceInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.unassignInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.unassignInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -239,10 +201,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Create Port Mirroring Configuration",response=Response.class)
 	@Transactional
     public Response createPortConfiguration(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return configurationRecipeLookup(request, Action.createInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.createInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@DELETE
@@ -253,11 +215,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response deletePortConfiguration(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                             @PathParam("configurationInstanceId") String configurationInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("configurationInstanceId", configurationInstanceId);
-		return configurationRecipeLookup(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -268,11 +230,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response enablePort(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                @PathParam("configurationInstanceId") String configurationInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("configurationInstanceId", configurationInstanceId);
-		return configurationRecipeLookup(request, Action.enablePort, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.enablePort, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -283,11 +245,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response disablePort(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                 @PathParam("configurationInstanceId") String configurationInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("configurationInstanceId", configurationInstanceId);
-		return configurationRecipeLookup(request, Action.disablePort, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.disablePort, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -298,11 +260,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response activatePort(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                  @PathParam("configurationInstanceId") String configurationInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("configurationInstanceId", configurationInstanceId);
-		return configurationRecipeLookup(request, Action.activateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.activateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -313,11 +275,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response deactivatePort(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                    @PathParam("configurationInstanceId") String configurationInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("configurationInstanceId", configurationInstanceId);
-		return configurationRecipeLookup(request, Action.deactivateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.deactivateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@POST
@@ -327,10 +289,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Add Relationships to a Service Instance",response=Response.class)
 	@Transactional
     public Response addRelationships(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return configurationRecipeLookup(request, Action.addRelationships, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.addRelationships, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -340,10 +302,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Remove Relationships from Service Instance",response=Response.class)
 	@Transactional
     public Response removeRelationships(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return configurationRecipeLookup(request, Action.removeRelationships, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return configurationRecipeLookup(request, Action.removeRelationships, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -353,10 +315,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Create VNF on a specified version and serviceInstance",response=Response.class)
 	@Transactional
     public Response createVnfInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -367,11 +329,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response replaceVnfInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                        @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
-		return serviceInstances(request, Action.replaceInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.replaceInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@PUT
@@ -382,11 +344,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response updateVnfInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                       @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);		
-		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -396,11 +358,11 @@ public class ServiceInstances {
 	@ApiOperation(value="Apply updated configuration",response=Response.class)
 	public Response applyUpdatedConfig(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                        @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);		
-		return serviceInstances(request, Action.applyUpdatedConfig, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.applyUpdatedConfig, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -410,11 +372,11 @@ public class ServiceInstances {
 	@ApiOperation(value="Recreate VNF Instance",response=Response.class)
 	public Response recreateVnfInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                        @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);		
-		return serviceInstances(request, Action.recreateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.recreateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 
@@ -426,11 +388,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response deleteVnfInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                       @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
-		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@POST
@@ -441,11 +403,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response createVfModuleInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                            @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
-		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -457,12 +419,12 @@ public class ServiceInstances {
 	public Response replaceVfModuleInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId,
                                             @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("vfModuleInstanceId", vfmoduleInstanceId);
-		return serviceInstances(request, Action.replaceInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.replaceInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@PUT
@@ -474,12 +436,12 @@ public class ServiceInstances {
 	public Response updateVfModuleInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId,
                                            @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("vfModuleInstanceId", vfmoduleInstanceId);
-		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -490,11 +452,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response inPlaceSoftwareUpdate(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                           @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);		
-		return serviceInstances(request, Action.inPlaceSoftwareUpdate, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.inPlaceSoftwareUpdate, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@DELETE
@@ -506,12 +468,12 @@ public class ServiceInstances {
 	public Response deleteVfModuleInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId,
                                            @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("vfModuleInstanceId", vfmoduleInstanceId);
-		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -522,12 +484,12 @@ public class ServiceInstances {
 	@Transactional
 	public Response deactivateAndCloudDeleteVfModuleInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId, @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("vfModuleInstanceId", vfmoduleInstanceId);
-		Response response = serviceInstances(request, Action.deactivateAndCloudDelete, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		Response response = serviceInstances(request, Action.deactivateAndCloudDelete, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 		return response;
 	}
 	
@@ -539,11 +501,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response scaleOutVfModule(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                            @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
-		return serviceInstances(request, Action.scaleOut, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.scaleOut, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 
@@ -555,11 +517,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response createVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                               @PathParam("vnfInstanceId") String vnfInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
-		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@PUT
@@ -571,12 +533,12 @@ public class ServiceInstances {
 	public Response updateVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId,
                                               @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("volumeGroupInstanceId", volumeGroupInstanceId);
-		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@DELETE
@@ -588,12 +550,12 @@ public class ServiceInstances {
 	public Response deleteVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 			@PathParam("vnfInstanceId") String vnfInstanceId,
                                               @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		instanceIdMap.put("volumeGroupInstanceId", volumeGroupInstanceId);
-		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@POST
@@ -603,10 +565,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Create NetworkInstance on a specified version and serviceInstance ",response=Response.class)
 	@Transactional
     public Response createNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
-		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.createInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@PUT
@@ -617,11 +579,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response updateNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                           @PathParam("networkInstanceId") String networkInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("networkInstanceId", networkInstanceId);
-		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.updateInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 
 	@DELETE
@@ -632,11 +594,11 @@ public class ServiceInstances {
 	@Transactional
 	public Response deleteNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
                                           @PathParam("networkInstanceId") String networkInstanceId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("networkInstanceId", networkInstanceId);
-		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -646,8 +608,8 @@ public class ServiceInstances {
 	@ApiOperation(value="Create instanceGroups",response=Response.class)
 	@Transactional
     public Response createInstanceGroups(String request, @PathParam("version") String version, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
-		return serviceInstances(request, Action.createInstance, null, version, requestId, getRequestUri(requestContext));
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
+		return serviceInstances(request, Action.createInstance, null, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@DELETE
@@ -657,10 +619,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Delete instanceGroup",response=Response.class)
 	@Transactional
 	public Response deleteInstanceGroups(@PathParam("version") String version, @PathParam("instanceGroupId") String instanceGroupId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put(CommonConstants.INSTANCE_GROUP_INSTANCE_ID, instanceGroupId);
-		return deleteInstanceGroups(Action.deleteInstance, instanceIdMap, version, requestId, getRequestUri(requestContext), requestContext);
+		return deleteInstanceGroups(Action.deleteInstance, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix), requestContext);
 	}
 	
 	@POST
@@ -670,10 +632,10 @@ public class ServiceInstances {
 	@ApiOperation(value="Add instanceGroup members",response=Response.class)
 	@Transactional
     public Response addInstanceGroupMembers(String request, @PathParam("version") String version, @PathParam("instanceGroupId") String instanceGroupId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put(CommonConstants.INSTANCE_GROUP_INSTANCE_ID, instanceGroupId);
-		return serviceInstances(request, Action.addMembers, instanceIdMap, version, requestId, getRequestUri(requestContext));
+		return serviceInstances(request, Action.addMembers, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
 	@POST
@@ -683,33 +645,12 @@ public class ServiceInstances {
 	@ApiOperation(value="Remove instanceGroup members",response=Response.class)
 	@Transactional
     public Response removeInstanceGroupMembers(String request, @PathParam("version") String version, @PathParam("instanceGroupId") String instanceGroupId, @Context ContainerRequestContext requestContext) throws ApiException {
-		String requestId = getRequestId(requestContext);
+		String requestId = requestHandlerUtils.getRequestId(requestContext);
 		HashMap<String, String> instanceIdMap = new HashMap<>();
 		instanceIdMap.put(CommonConstants.INSTANCE_GROUP_INSTANCE_ID, instanceGroupId);
-		return serviceInstances(request, Action.removeMembers, instanceIdMap, version, requestId, getRequestUri(requestContext));
-	}
-
-	public String getRequestUri(ContainerRequestContext context){
-		String requestUri = context.getUriInfo().getPath();
-		String httpUrl = MDC.get(LogConstants.URI_BASE).concat(requestUri);
-		MDC.put(LogConstants.HTTP_URL, httpUrl);
-		requestUri = requestUri.substring(requestUri.indexOf("/serviceInstantiation/") + 22);
-		return requestUri;
+		return serviceInstances(request, Action.removeMembers, instanceIdMap, version, requestId, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
 	}
 	
-	public void validateHeaders(ContainerRequestContext context) throws ValidationException{
-		MultivaluedMap<String, String> headers = context.getHeaders();
-		if(!headers.containsKey(ONAPLogConstants.Headers.REQUEST_ID)){
-			 throw new ValidationException(ONAPLogConstants.Headers.REQUEST_ID + " header", true);
-		}
-		if(!headers.containsKey(ONAPLogConstants.Headers.PARTNER_NAME)){
-			throw new ValidationException(ONAPLogConstants.Headers.PARTNER_NAME + " header", true);
-		}
-		if(!headers.containsKey(REQUESTOR_ID)){
-			throw new ValidationException(REQUESTOR_ID + " header", true);
-		}
-	}
-    
 	public Response serviceInstances(String requestJSON, Actions action, HashMap<String, String> instanceIdMap, String version, String requestId, String requestUri) throws ApiException {
 		String serviceInstanceId = (instanceIdMap ==null)? null:instanceIdMap.get("serviceInstanceId");
 		Boolean aLaCarte = null;
@@ -717,17 +658,20 @@ public class ServiceInstances {
 		ServiceInstancesRequest sir = null;
 		String apiVersion = version.substring(1);
 		
-		sir = convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
-		String requestScope = deriveRequestScope(action, sir, requestUri);
+		sir = requestHandlerUtils.convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
+		String requestScope = requestHandlerUtils.deriveRequestScope(action, sir, requestUri);
 		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.IN_PROGRESS, requestJSON, requestScope);
 		if(sir.getRequestDetails().getRequestParameters() != null){
 			aLaCarte = sir.getRequestDetails().getRequestParameters().getALaCarte();
 		}
-		parseRequest(sir, instanceIdMap, action, version, requestJSON, aLaCarte, requestId, currentActiveReq);
-		setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
+		requestHandlerUtils.parseRequest(sir, instanceIdMap, action, version, requestJSON, aLaCarte, requestId, currentActiveReq);
+		requestHandlerUtils.setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
 		 
 		int requestVersion = Integer.parseInt(version.substring(1));
-		String instanceName = sir.getRequestDetails().getRequestInfo().getInstanceName();
+		String instanceName = null;
+		if (sir.getRequestDetails().getRequestInfo() != null) {
+			instanceName = sir.getRequestDetails().getRequestInfo().getInstanceName();
+		}
 		boolean alaCarteFlag = msoRequest.getAlacarteFlag(sir);
 		String vnfType = msoRequest.getVnfType(sir,requestScope,action,requestVersion);
 		String networkType = msoRequest.getNetworkType(sir,requestScope);
@@ -743,14 +687,14 @@ public class ServiceInstances {
 		InfraActiveRequests dup = null;
 		boolean inProgress = false;		
 
-		dup = duplicateCheck(action, instanceIdMap, startTime, msoRequest, instanceName,requestScope, currentActiveReq);
+		dup = requestHandlerUtils.duplicateCheck(action, instanceIdMap, startTime, msoRequest, instanceName,requestScope, currentActiveReq);
 
 		if(dup != null){
-			inProgress = camundaHistoryCheck(dup, currentActiveReq);
+			inProgress = requestHandlerUtils.camundaHistoryCheck(dup, currentActiveReq);
 		}
 		
 		if (dup != null && inProgress) {
-            buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, instanceName, requestScope, dup);
+            requestHandlerUtils.buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, instanceName, requestScope, dup);
 		}
 		ServiceInstancesResponse serviceResponse = new ServiceInstancesResponse();
 
@@ -760,9 +704,9 @@ public class ServiceInstances {
 
 		serviceResponse.setRequestReferences(referencesResponse);
 		Boolean isBaseVfModule = false;
-
+		
         RecipeLookupResult recipeLookupResult = getServiceInstanceOrchestrationURI(sir, action, alaCarteFlag, currentActiveReq);
-        String serviceInstanceType = getServiceType(requestScope, sir, alaCarteFlag);						
+        String serviceInstanceType = requestHandlerUtils.getServiceType(requestScope, sir, alaCarteFlag);						
 			ModelType modelType;
 			ModelInfo modelInfo =  sir.getRequestDetails().getModelInfo();
 			if (action == Action.applyUpdatedConfig || action == Action.inPlaceSoftwareUpdate) {
@@ -803,14 +747,14 @@ public class ServiceInstances {
                 String errorMessage = "VnfType " + vnfType + " and VF Module Model Name " + modelInfo.getModelName() + serviceVersionText + " not found in MSO Catalog DB";
                 ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ATTRIBUTE_NOT_FOUND, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
                 VfModuleNotFoundException vfModuleException = new VfModuleNotFoundException.Builder(errorMessage, HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_BAD_PARAMETER).errorInfo(errorLoggerInfo).build();
-                updateStatus(currentActiveReq, Status.FAILED, vfModuleException.getMessage());
+                requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, vfModuleException.getMessage());
 
                 throw vfModuleException;
 		}
 		}
 		
 		
-		serviceInstanceId = setServiceInstanceId(requestScope, sir);
+		serviceInstanceId = requestHandlerUtils.setServiceInstanceId(requestScope, sir);
 		String vnfId = "";
 		String vfModuleId = "";
 		String volumeGroupId = "";
@@ -870,7 +814,7 @@ public class ServiceInstances {
 						.setVnfType(vnfType)
 						.setVfModuleType(vfModuleType)
 						.setNetworkType(networkType)
-						.setRequestDetails(mapJSONtoMSOStyle(requestJSON, sir, aLaCarte, action))
+						.setRequestDetails(requestHandlerUtils.mapJSONtoMSOStyle(requestJSON, sir, aLaCarte, action))
 						.setApiVersion(apiVersion)
 						.setALaCarte(aLaCarte)
 						.setRequestUri(requestUri)
@@ -880,7 +824,7 @@ public class ServiceInstances {
 			throw new ValidateException.Builder("Unable to generate RequestClientParamter object" + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER)
 	                  .errorInfo(errorLoggerInfo).build();
 		}
-		return postBPELRequest(currentActiveReq, requestClientParameter, recipeLookupResult.getOrchestrationURI(), requestScope);
+		return requestHandlerUtils.postBPELRequest(currentActiveReq, requestClientParameter, recipeLookupResult.getOrchestrationURI(), requestScope);
 	}
 	public Response deleteInstanceGroups(Actions action, HashMap<String, String> instanceIdMap, String version, String requestId, String requestUri, ContainerRequestContext requestContext) throws ApiException {
 		String instanceGroupId = instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID);
@@ -892,27 +836,27 @@ public class ServiceInstances {
 	
 		String requestScope = ModelType.instanceGroup.toString();
 		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.IN_PROGRESS, null, requestScope);
-		setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
+		requestHandlerUtils.setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
 		try {
-			validateHeaders(requestContext);
+			requestHandlerUtils.validateHeaders(requestContext);
 		} catch (ValidationException e) {
 			logger.error("Exception occurred", e);
             ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
             ValidateException validateException = new ValidateException.Builder(e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
                         .errorInfo(errorLoggerInfo).build();
-            updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+            requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
             throw validateException;
 		}
 		
-		InfraActiveRequests dup = duplicateCheck(action, instanceIdMap, startTime, msoRequest, null, requestScope, currentActiveReq);
+		InfraActiveRequests dup = requestHandlerUtils.duplicateCheck(action, instanceIdMap, startTime, msoRequest, null, requestScope, currentActiveReq);
 		boolean inProgress = false;
 		
 		if(dup != null){
-			inProgress = camundaHistoryCheck(dup, currentActiveReq);
+			inProgress = requestHandlerUtils.camundaHistoryCheck(dup, currentActiveReq);
 		}
 		
 		if (dup != null && inProgress) {
-            buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, null, requestScope, dup);
+            requestHandlerUtils.buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, null, requestScope, dup);
 		}
 		
 		ServiceInstancesResponse serviceResponse = new ServiceInstancesResponse();
@@ -944,7 +888,7 @@ public class ServiceInstances {
 					.setRequestUri(requestUri)
 					.setInstanceGroupId(instanceGroupId).build();
 		
-		return postBPELRequest(currentActiveReq, requestClientParameter, recipeLookupResult.getOrchestrationURI(), requestScope);
+		return requestHandlerUtils.postBPELRequest(currentActiveReq, requestClientParameter, recipeLookupResult.getOrchestrationURI(), requestScope);
 	}
 
 	private String getPnfCorrelationId(ServiceInstancesRequest sir) {
@@ -953,315 +897,7 @@ public class ServiceInstances {
 				.map(RequestDetails::getRequestParameters)
 				.map(parameters -> parameters.getUserParamValue("pnfId"))
 				.orElse("");
-	}
-
-	private String deriveRequestScope(Actions action, ServiceInstancesRequest sir, String requestUri) {
-		if(action == Action.inPlaceSoftwareUpdate || action == Action.applyUpdatedConfig){
-			return (ModelType.vnf.name());
-		}else if(action == Action.addMembers || action == Action.removeMembers){
-			return(ModelType.instanceGroup.toString());
-		}else{
-			String requestScope;
-			if(sir.getRequestDetails().getModelInfo().getModelType() == null){
-				requestScope = requestScopeFromUri(requestUri);
-			}else{
-				requestScope = sir.getRequestDetails().getModelInfo().getModelType().name(); 
-			}
-			return requestScope; 
-		}
-	}
-	private String requestScopeFromUri(String requestUri){
-		String requestScope;
-		if(requestUri.contains(ModelType.network.name())){
-			requestScope = ModelType.network.name();
-		}else if(requestUri.contains(ModelType.vfModule.name())){
-			requestScope = ModelType.vfModule.name();
-		}else if(requestUri.contains(ModelType.volumeGroup.name())){
-			requestScope = ModelType.volumeGroup.name();
-		}else if(requestUri.contains(ModelType.configuration.name())){
-			requestScope = ModelType.configuration.name();
-		}else if(requestUri.contains(ModelType.vnf.name())){
-			requestScope = ModelType.vnf.name();
-		}else{
-			requestScope = ModelType.service.name();
-		}
-		return requestScope;
-	}
-	private Response postBPELRequest(InfraActiveRequests currentActiveReq, RequestClientParameter requestClientParameter, String orchestrationUri, String requestScope)throws ApiException {
-		RequestClient requestClient = null;
-		HttpResponse response = null;
-		try {
-			requestClient = reqClientFactory.getRequestClient (orchestrationUri);
-			response = requestClient.post(requestClientParameter);
-		} catch (Exception e) {
-			
-            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-            String url = requestClient != null ? requestClient.getUrl() : "";
-            ClientConnectionException clientException = new ClientConnectionException.Builder(url, HttpStatus.SC_BAD_GATEWAY, ErrorNumbers.SVC_NO_SERVER_RESOURCES).cause(e).errorInfo(errorLoggerInfo).build();
-            updateStatus(currentActiveReq, Status.FAILED, clientException.getMessage());
-
-            throw clientException;
-		}
-
-		if (response == null) {
-			
-            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.BusinessProcesssError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-            ClientConnectionException clientException = new ClientConnectionException.Builder(requestClient.getUrl(), HttpStatus.SC_BAD_GATEWAY, ErrorNumbers.SVC_NO_SERVER_RESOURCES).errorInfo(errorLoggerInfo).build();
-
-            updateStatus(currentActiveReq, Status.FAILED, clientException.getMessage());
-
-            throw clientException;
-		}
-
-		ResponseHandler respHandler = null;
-        int bpelStatus = 500;
-        try {
-            respHandler = new ResponseHandler (response, requestClient.getType ());
-            bpelStatus = respHandler.getStatus ();
-        } catch (ApiException e) {
-            logger.error("Exception occurred", e);
-            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-            ValidateException validateException = new ValidateException.Builder("Exception caught mapping Camunda JSON response to object", HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
-                        .errorInfo(errorLoggerInfo).build();
-            updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
-            throw validateException;
-        }
-
-		// BPEL accepted the request, the request is in progress
-		if (bpelStatus == HttpStatus.SC_ACCEPTED) {
-			ServiceInstancesResponse jsonResponse;
-			CamundaResponse camundaResp = respHandler.getResponse();
-			
-			if("Success".equalsIgnoreCase(camundaResp.getMessage())) {
-				try {
-					ObjectMapper mapper = new ObjectMapper();
-					jsonResponse = mapper.readValue(camundaResp.getResponse(), ServiceInstancesResponse.class);
-					jsonResponse.getRequestReferences().setRequestId(requestClientParameter.getRequestId());
-					Optional<URL> selfLinkUrl = msoRequest.buildSelfLinkUrl(currentActiveReq.getRequestUrl(), requestClientParameter.getRequestId());
-					if(selfLinkUrl.isPresent()){
-						jsonResponse.getRequestReferences().setRequestSelfLink(selfLinkUrl.get());
-					} else {
-					    jsonResponse.getRequestReferences().setRequestSelfLink(null);
-					}    
-				} catch (IOException e) {
-					logger.error("Exception occurred", e);
-					ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-					ValidateException validateException = new ValidateException.Builder("Exception caught mapping Camunda JSON response to object", HttpStatus.SC_NOT_ACCEPTABLE, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
-			                    .errorInfo(errorLoggerInfo).build();
-					updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
-					throw validateException;
-				}	
-				return builder.buildResponse(HttpStatus.SC_ACCEPTED, requestClientParameter.getRequestId(), jsonResponse, requestClientParameter.getApiVersion());
-			} 
-		}
-			
-		List<String> variables = new ArrayList<>();
-		variables.add(bpelStatus + "");
-		String camundaJSONResponseBody = respHandler.getResponseBody ();
-		if (camundaJSONResponseBody != null && !camundaJSONResponseBody.isEmpty ()) {
-			
-		    ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.BusinessProcesssError).errorSource(requestClient.getUrl()).build();
-		    BPMNFailureException bpmnException = new BPMNFailureException.Builder(String.valueOf(bpelStatus) + camundaJSONResponseBody, bpelStatus, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
-		            .errorInfo(errorLoggerInfo).build();
-
-		    updateStatus(currentActiveReq, Status.FAILED, bpmnException.getMessage());
-
-		    throw bpmnException;
-		} else {
-		
-		    ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.BusinessProcesssError).errorSource(requestClient.getUrl()).build();
-
-
-		    BPMNFailureException servException = new BPMNFailureException.Builder(String.valueOf(bpelStatus), bpelStatus, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
-		            .errorInfo(errorLoggerInfo).build();
-		    updateStatus(currentActiveReq, Status.FAILED, servException.getMessage());
-
-		    throw servException;
-		}
-	}
-
-	private void setInstanceId(InfraActiveRequests currentActiveReq, String requestScope, String instanceId, Map<String, String> instanceIdMap) {
-		if(StringUtils.isNotBlank(instanceId)) {
-			if(ModelType.service.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setServiceInstanceId(instanceId);
-			} else if(ModelType.vnf.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setVnfId(instanceId);
-			} else if(ModelType.vfModule.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setVfModuleId(instanceId);
-			} else if(ModelType.volumeGroup.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setVolumeGroupId(instanceId);
-			} else if(ModelType.network.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setNetworkId(instanceId);
-			} else if(ModelType.configuration.name().equalsIgnoreCase(requestScope)) {
-				currentActiveReq.setConfigurationId(instanceId);
-			}else if(ModelType.instanceGroup.toString().equalsIgnoreCase(requestScope)){
-				currentActiveReq.setInstanceGroupId(instanceId);
-			}
-		} else if(instanceIdMap != null && !instanceIdMap.isEmpty()) {
-			if(instanceIdMap.get("serviceInstanceId") != null){
-				currentActiveReq.setServiceInstanceId(instanceIdMap.get("serviceInstanceId"));
-        	}
-        	if(instanceIdMap.get("vnfInstanceId") != null){
-        		currentActiveReq.setVnfId(instanceIdMap.get("vnfInstanceId"));
-        	}
-        	if(instanceIdMap.get("vfModuleInstanceId") != null){
-        		currentActiveReq.setVfModuleId(instanceIdMap.get("vfModuleInstanceId"));
-        	}
-        	if(instanceIdMap.get("volumeGroupInstanceId") != null){
-        		currentActiveReq.setVolumeGroupId(instanceIdMap.get("volumeGroupInstanceId"));
-        	}
-        	if(instanceIdMap.get("networkInstanceId") != null){
-        		currentActiveReq.setNetworkId(instanceIdMap.get("networkInstanceId"));
-        	}
-        	if(instanceIdMap.get("configurationInstanceId") != null){
-        		currentActiveReq.setConfigurationId(instanceIdMap.get("configurationInstanceId"));
-        	}
-        	if(instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID) != null){
-        		currentActiveReq.setInstanceGroupId(instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID));
-        	}
-		}
-	}
-
-    protected String mapJSONtoMSOStyle(String msoRawRequest, ServiceInstancesRequest serviceInstRequest, boolean isAlaCarte, Actions action) throws IOException {
-    	ObjectMapper mapper = new ObjectMapper();    	
-    	mapper.setSerializationInclusion(Include.NON_NULL);    	
-    	if(msoRawRequest != null){
-	    	ServiceInstancesRequest sir = mapper.readValue(msoRawRequest, ServiceInstancesRequest.class);    	
-	    	if(	serviceInstRequest != null && 
-	    		serviceInstRequest.getRequestDetails() != null && 
-	    		serviceInstRequest.getRequestDetails().getRequestParameters() != null) {
-	    		if(	!isAlaCarte && Action.createInstance.equals(action)) {
-	    			sir.getRequestDetails().setCloudConfiguration(serviceInstRequest.getRequestDetails().getCloudConfiguration());
-	    			sir.getRequestDetails().getRequestParameters().setUserParams(serviceInstRequest.getRequestDetails().getRequestParameters().getUserParams());
-	    		}
-	    		sir.getRequestDetails().getRequestParameters().setUsePreload(serviceInstRequest.getRequestDetails().getRequestParameters().getUsePreload());
-	    	}
-	    	
-	    	logger.debug("Value as string: {}", mapper.writeValueAsString(sir));
-	    	return mapper.writeValueAsString(sir);
-    	}
-    	return null;
-	}
-
-    private void buildErrorOnDuplicateRecord(InfraActiveRequests currentActiveReq, Actions action, HashMap<String, String> instanceIdMap, long startTime, MsoRequest msoRequest,
-                                             String instanceName, String requestScope, InfraActiveRequests dup) throws ApiException {
-
-		// Found the duplicate record. Return the appropriate error.
-		String instance = null;
-		if(instanceName != null){
-			instance = instanceName;
-		}else{
-			instance = instanceIdMap.get(requestScope + "InstanceId");
-		}
-		//List<String> variables = new ArrayList<String>();
-		//variables.add(dup.getRequestStatus());
-        ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_FOUND, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-
-
-        DuplicateRequestException dupException = new DuplicateRequestException.Builder(requestScope,instance,dup.getRequestStatus(),dup.getRequestId(), HttpStatus.SC_CONFLICT, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
-            .errorInfo(errorLoggerInfo).build();
-
-        updateStatus(currentActiveReq, Status.FAILED, dupException.getMessage());
-
-        throw dupException;
-	}
-
-	private InfraActiveRequests duplicateCheck(Actions action, HashMap<String, String> instanceIdMap, long startTime,
-                                               MsoRequest msoRequest, String instanceName, String requestScope, InfraActiveRequests currentActiveReq) throws ApiException {
-		InfraActiveRequests dup = null;
-		try {
-			if(!(instanceName==null && requestScope.equals("service") && (action == Action.createInstance || action == Action.activateInstance || action == Action.assignInstance))){
-				dup = infraActiveRequestsClient.checkInstanceNameDuplicate (instanceIdMap, instanceName, requestScope);
-			}
-		} catch (Exception e) {
-            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_CHECK_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-            RequestDbFailureException requestDbFailureException = new RequestDbFailureException.Builder("check for duplicate instance", e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
-                    .errorInfo(errorLoggerInfo).build();
-            updateStatus(currentActiveReq, Status.FAILED, requestDbFailureException.getMessage());
-            throw requestDbFailureException;
-		}
-		return dup;
-	}
-    protected boolean camundaHistoryCheck(InfraActiveRequests duplicateRecord, InfraActiveRequests currentActiveReq) throws RequestDbFailureException, ContactCamundaException{
-    	String requestId = duplicateRecord.getRequestId();
-    	String path = env.getProperty("mso.camunda.rest.history.uri") + requestId;
-    	String targetUrl = env.getProperty("mso.camundaURL") + path;
-    	HttpHeaders headers = setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey")); 
-    	HttpEntity<?> requestEntity = new HttpEntity<>(headers);
-    	ResponseEntity<List<HistoricProcessInstanceEntity>> response = null;
-    	try{
-    		response = restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity, new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>(){});
-    	}catch(HttpStatusCodeException e){
-    		ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_CHECK_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-            ContactCamundaException contactCamundaException= new ContactCamundaException.Builder(requestId, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
-                    .errorInfo(errorLoggerInfo).build();
-            updateStatus(currentActiveReq, Status.FAILED, contactCamundaException.getMessage());
-            throw contactCamundaException;
-		}
-    	if(response.getBody().isEmpty()){
-    		updateStatus(duplicateRecord, Status.COMPLETE, "Request Completed");
-    	}
-		for(HistoricProcessInstance instance : response.getBody()){
-			if(instance.getState().equals("ACTIVE")){
-				return true;
-			}else{
-				updateStatus(duplicateRecord, Status.COMPLETE, "Request Completed");
-			}
-    	}	
-		return false;
-	}
-    protected HttpHeaders setCamundaHeaders(String auth, String msoKey) {
-		HttpHeaders headers = new HttpHeaders();
-		List<org.springframework.http.MediaType> acceptableMediaTypes = new ArrayList<>();
-		acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON);
-		headers.setAccept(acceptableMediaTypes);
-       	try {
-       		String userCredentials = CryptoUtils.decrypt(auth, msoKey);
-       		if(userCredentials != null) {
-       			headers.add(HttpHeaders.AUTHORIZATION, "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));
-       		}
-        } catch(GeneralSecurityException e) {
-                logger.error("Security exception", e);
-        }
-		return headers;
-	}
-
-	private ServiceInstancesRequest convertJsonToServiceInstanceRequest(String requestJSON, Actions action, long startTime,
-                                                                        ServiceInstancesRequest sir, MsoRequest msoRequest, String requestId, String requestUri) throws ApiException {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			return mapper.readValue(requestJSON, ServiceInstancesRequest.class);
-
-        } catch (IOException e) {
-
-            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-
-            ValidateException validateException = new ValidateException.Builder("Error mapping request: " + e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
-                    .errorInfo(errorLoggerInfo).build();
-            String requestScope = requestScopeFromUri(requestUri);
-
-            msoRequest.createErrorRequestRecord(Status.FAILED, requestId, validateException.getMessage(), action, requestScope, requestJSON);
-
-            throw validateException;
-		}
-	}
-	
-	private void parseRequest(ServiceInstancesRequest sir, HashMap<String, String> instanceIdMap, Actions action, String version, 
-								String requestJSON, Boolean aLaCarte, String requestId, InfraActiveRequests currentActiveReq) throws ValidateException, RequestDbFailureException {
-		int reqVersion = Integer.parseInt(version.substring(1));
-		try {
-			msoRequest.parse(sir, instanceIdMap, action, version, requestJSON, reqVersion, aLaCarte);
-		} catch (Exception e) {
-			logger.error("failed to parse request", e);
-			ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-	        ValidateException validateException = new ValidateException.Builder("Error parsing request: " + e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
-                 .errorInfo(errorLoggerInfo).build();
-
-	        updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
-
-	        throw validateException;
-		}
-	}
+	}	
 
     private RecipeLookupResult getServiceInstanceOrchestrationURI(ServiceInstancesRequest sir, Actions action, boolean alaCarteFlag, 
     																InfraActiveRequests currentActiveReq) throws ApiException {
@@ -1284,7 +920,7 @@ public class ServiceInstances {
                 ValidateException validateException = new ValidateException.Builder(e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
                         .errorInfo(errorLoggerInfo).build();
 
-                updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+                requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
 
                 throw validateException;
 			}
@@ -1299,7 +935,7 @@ public class ServiceInstances {
                 ValidateException validateException = new ValidateException.Builder(e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
                         .errorInfo(errorLoggerInfo).build();
 
-                updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+                requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
 
                 throw validateException;
             }
@@ -1313,7 +949,7 @@ public class ServiceInstances {
 
                 ValidateException validateException = new ValidateException.Builder(e.getMessage(), HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_BAD_PARAMETER).cause(e)
                         .errorInfo(errorLoggerInfo).build();
-                updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+                requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
 
                 throw validateException;
             }
@@ -1328,7 +964,7 @@ public class ServiceInstances {
             RecipeNotFoundException recipeNotFoundExceptionException = new RecipeNotFoundException.Builder("Recipe could not be retrieved from catalog DB.", HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_GENERAL_SERVICE_ERROR)
                     .errorInfo(errorLoggerInfo).build();
 
-            updateStatus(currentActiveReq, Status.FAILED, recipeNotFoundExceptionException.getMessage());
+            requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, recipeNotFoundExceptionException.getMessage());
             throw recipeNotFoundExceptionException;
 		}
 		return recipeLookupResult;
@@ -1338,7 +974,7 @@ public class ServiceInstances {
 		// SERVICE REQUEST
 		// Construct the default service name
 		// TODO need to make this a configurable property
-		String defaultServiceModelName = getDefaultModel(servInstReq);
+		String defaultServiceModelName = requestHandlerUtils.getDefaultModel(servInstReq);
 		RequestDetails requestDetails = servInstReq.getRequestDetails();
 		ModelInfo modelInfo = requestDetails.getModelInfo();
 		org.onap.so.db.catalog.beans.Service serviceRecord;
@@ -1525,7 +1161,7 @@ public class ServiceInstances {
 		}
 
 		Recipe recipe = null;
-		String defaultSource = getDefaultModel(servInstReq);
+		String defaultSource = requestHandlerUtils.getDefaultModel(servInstReq);
 		String modelCustomizationId = modelInfo.getModelCustomizationId();
 		String modelCustomizationName = modelInfo.getModelCustomizationName();
 		String relatedInstanceModelVersionId = null;
@@ -1728,7 +1364,7 @@ public class ServiceInstances {
 	
     private RecipeLookupResult getDefaultVnfUri(ServiceInstancesRequest sir, Actions action) {
     	
-		String defaultSource = getDefaultModel(sir);
+		String defaultSource = requestHandlerUtils.getDefaultModel(sir);
 
 		VnfRecipe vnfRecipe = catalogDbClient.getFirstVnfRecipeByNfRoleAndAction(defaultSource, action.toString());
 
@@ -1742,7 +1378,7 @@ public class ServiceInstances {
 
     private RecipeLookupResult getNetworkUri(ServiceInstancesRequest sir, Actions action) throws ValidationException {
 
-		String defaultNetworkType = getDefaultModel(sir);
+		String defaultNetworkType = requestHandlerUtils.getDefaultModel(sir);
 
 		ModelInfo modelInfo = sir.getRequestDetails().getModelInfo();
 		String modelName = modelInfo.getModelName();
@@ -1777,40 +1413,7 @@ public class ServiceInstances {
 		return recipe !=null ? new RecipeLookupResult(recipe.getOrchestrationUri(), recipe.getRecipeTimeout()) : null;
 	}
     
-    private Optional<String> retrieveModelName(RequestParameters requestParams) {
-    	String requestTestApi = null;
-    	TestApi testApi = null;
-    	
-    	if (requestParams != null) {
-    		requestTestApi = requestParams.getTestApi();
-    	}
-    	
-    	if (requestTestApi == null) {
-    		if(requestParams != null && requestParams.getALaCarte() != null && !requestParams.getALaCarte()) {
-		    	requestTestApi = env.getProperty(CommonConstants.MACRO_TEST_API);
-    		} else {
-    			requestTestApi = env.getProperty(CommonConstants.ALACARTE_TEST_API);
-    		}
-    	}
-    	
-		try {
-			testApi = TestApi.valueOf(requestTestApi);
-			return Optional.of(testApi.getModelName());
-		} catch (Exception e) {
-			logger.warn("Catching the exception on the valueOf enum call and continuing", e);
-			throw new IllegalArgumentException("Invalid TestApi is provided", e);
-		}
-    }
     
-    private String getDefaultModel(ServiceInstancesRequest sir) {
-    	String defaultModel = sir.getRequestDetails().getRequestInfo().getSource() + "_DEFAULT";
-    	Optional<String> oModelName = retrieveModelName(sir.getRequestDetails().getRequestParameters());
-		if (oModelName.isPresent()) {
-			defaultModel = oModelName.get();
-		}
-		return defaultModel;
-    }
-	
     private Response configurationRecipeLookup(String requestJSON, Action action, HashMap<String, String> instanceIdMap, String version, String requestId, String requestUri) throws ApiException {
 		String serviceInstanceId = (instanceIdMap ==null)? null:instanceIdMap.get("serviceInstanceId");
 		Boolean aLaCarte = null;
@@ -1820,26 +1423,26 @@ public class ServiceInstances {
 		long startTime = System.currentTimeMillis ();
 		ServiceInstancesRequest sir = null;		
 
-		sir = convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
-		String requestScope = deriveRequestScope(action,sir, requestUri);
+		sir = requestHandlerUtils.convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
+		String requestScope = requestHandlerUtils.deriveRequestScope(action,sir, requestUri);
 		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject ( sir,  action, requestId, Status.IN_PROGRESS, requestJSON, requestScope);
 		if(sir.getRequestDetails().getRequestParameters() != null){
 			aLaCarte = sir.getRequestDetails().getRequestParameters().getALaCarte();
 		}
-		parseRequest(sir, instanceIdMap, action, version, requestJSON, aLaCarte, requestId, currentActiveReq);
-		setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
+		requestHandlerUtils.parseRequest(sir, instanceIdMap, action, version, requestJSON, aLaCarte, requestId, currentActiveReq);
+		requestHandlerUtils.setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
 		String instanceName = sir.getRequestDetails().getRequestInfo().getInstanceName();
 
 		InfraActiveRequests dup = null;
 		
-		dup = duplicateCheck(action, instanceIdMap, startTime, msoRequest, instanceName,requestScope, currentActiveReq);
+		dup = requestHandlerUtils.duplicateCheck(action, instanceIdMap, startTime, msoRequest, instanceName,requestScope, currentActiveReq);
 		
 		if(dup != null){
-			inProgress = camundaHistoryCheck(dup, currentActiveReq);
+			inProgress = requestHandlerUtils.camundaHistoryCheck(dup, currentActiveReq);
 		}
 
 		if (instanceIdMap != null && dup != null && inProgress) {
-            buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, instanceName, requestScope, dup);
+            requestHandlerUtils.buildErrorOnDuplicateRecord(currentActiveReq, action, instanceIdMap, startTime, msoRequest, instanceName, requestScope, dup);
 		}
 		
 		ServiceInstancesResponse serviceResponse = new ServiceInstancesResponse();
@@ -1860,7 +1463,7 @@ public class ServiceInstances {
             ValidateException validateException = new ValidateException.Builder(error, HttpStatus.SC_NOT_FOUND, ErrorNumbers.SVC_GENERAL_SERVICE_ERROR)
                     .errorInfo(errorLoggerInfo).build();
 
-            updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
+            requestHandlerUtils.updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
 
             throw validateException;
 			
@@ -1903,7 +1506,7 @@ public class ServiceInstances {
 				.setServiceInstanceId(serviceInstanceId)
 				.setPnfCorrelationId(pnfCorrelationId)
 				.setConfigurationId(configurationId)
-				.setRequestDetails(mapJSONtoMSOStyle(requestJSON, sir, aLaCarte, action))
+				.setRequestDetails(requestHandlerUtils.mapJSONtoMSOStyle(requestJSON, sir, aLaCarte, action))
 				.setApiVersion(apiVersion)
 				.setALaCarte(aLaCarte)
 				.setRequestUri(requestUri).build();
@@ -1913,80 +1516,7 @@ public class ServiceInstances {
 	                    .errorInfo(errorLoggerInfo).build();
 		}
 				
-			return postBPELRequest(currentActiveReq, requestClientParameter, orchestrationUri, requestScope);
-	}
-
-	public String getRequestId(ContainerRequestContext requestContext) throws ValidateException {
-    	String requestId = null;
-    	if (requestContext.getProperty("requestId") != null) {
-    		requestId = requestContext.getProperty("requestId").toString();
-    	}
-    	if (UUIDChecker.isValidUUID(requestId)) {
-    		return requestId;
-    	} else {
-    		ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.SchemaError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-			ValidateException validateException = new ValidateException.Builder("Request Id " + requestId + " is not a valid UUID", HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_BAD_PARAMETER)
-	                    .errorInfo(errorLoggerInfo).build();
-			
-			throw validateException;
-    	}
-    }
-	public void updateStatus(InfraActiveRequests aq, Status status, String errorMessage) throws RequestDbFailureException{
-		if ((status == Status.FAILED) || (status == Status.COMPLETE)) {
-			aq.setStatusMessage (errorMessage);
-			aq.setProgress(new Long(100));
-			aq.setRequestStatus(status.toString());
-			Timestamp endTimeStamp = new Timestamp (System.currentTimeMillis());
-			aq.setEndTime (endTimeStamp);
-			try{
-				infraActiveRequestsClient.save(aq);
-			}catch(Exception e){
-				ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ACCESS_EXC, ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-	            throw new RequestDbFailureException.Builder(SAVE_TO_DB, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
-	                    .errorInfo(errorLoggerInfo).build();
-			}
-		}
-	}
-	protected String getServiceType(String requestScope, ServiceInstancesRequest sir, Boolean aLaCarteFlag){
-		String serviceType = null;
-		if(requestScope.equalsIgnoreCase(ModelType.service.toString())){
-			String defaultServiceModelName = getDefaultModel(sir);
-			org.onap.so.db.catalog.beans.Service serviceRecord;
-			if(aLaCarteFlag){
-				 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
-				 if(serviceRecord != null){
-					 serviceType = serviceRecord.getServiceType();
-				 }
-			}else{
-				serviceRecord = catalogDbClient.getServiceByID(sir.getRequestDetails().getModelInfo().getModelVersionId());
-				if(serviceRecord != null){
-					 serviceType = serviceRecord.getServiceType();
-				 }else{
-					 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
-					 if(serviceRecord != null){
-						 serviceType = serviceRecord.getServiceType();
-					 }
-				 }
-			}
-		}else{
-			serviceType = msoRequest.getServiceInstanceType(sir, requestScope);
-		}
-		return serviceType;
-	}
-	protected String setServiceInstanceId(String requestScope, ServiceInstancesRequest sir){
-		if(sir.getServiceInstanceId () != null){
-			return sir.getServiceInstanceId ();
-		}else if(requestScope.equalsIgnoreCase(ModelType.instanceGroup.toString())){
-			RelatedInstanceList[] relatedInstances = sir.getRequestDetails().getRelatedInstanceList();
-			if(relatedInstances != null){
-				for(RelatedInstanceList relatedInstanceList : relatedInstances){
-					RelatedInstance relatedInstance = relatedInstanceList.getRelatedInstance();
-					if(relatedInstance.getModelInfo().getModelType() == ModelType.service){
-						return relatedInstance.getInstanceId();
-					}
-				}
-			}
-		}
-		return null;
-	}
+			return requestHandlerUtils.postBPELRequest(currentActiveReq, requestClientParameter, orchestrationUri, requestScope);
+	}    
+   
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidation.java
new file mode 100644
index 0000000000..695213bf20
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidation.java
@@ -0,0 +1,64 @@
+/*-
+ * ============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.apihandlerinfra.validation;
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+
+import com.google.common.base.Strings;
+
+public class CustomWorkflowValidation implements ValidationRule{
+    
+	@Override
+	public ValidationInformation validate(ValidationInformation info) throws ValidationException{
+    	RequestParameters requestParameters = info.getSir().getRequestDetails().getRequestParameters();
+    	CloudConfiguration cloudConfiguration = info.getSir().getRequestDetails ().getCloudConfiguration();
+    	String workflowUuid = info.getInstanceIdMap().get("workflowUuid");
+    	
+		if (cloudConfiguration == null) {
+			throw new ValidationException ("cloudConfiguration");
+		}else if (Strings.isNullOrEmpty((cloudConfiguration.getCloudOwner ()))) {
+    		throw new ValidationException ("cloudOwner");			
+		}else if (Strings.isNullOrEmpty((cloudConfiguration.getLcpCloudRegionId ()))) {
+    		throw new ValidationException ("lcpCloudRegionId");
+    	}else if (Strings.isNullOrEmpty((cloudConfiguration.getTenantId ()))) {
+    		throw new ValidationException ("tenantId");
+    	}
+    	if(requestParameters == null){
+    		throw new ValidationException("requestParameters");
+    	}
+    	
+    	List<Map<String, Object>> userParams = requestParameters.getUserParams();
+    	if (!validateCustomUserParams(userParams, workflowUuid)) {
+    		throw new ValidationException("userParams");
+    	}
+        return info;
+	}
+	
+	private boolean validateCustomUserParams(List<Map<String, Object>> userParams, String workflowUuid) {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java
new file mode 100644
index 0000000000..146062533e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/InstanceManagementTest.java
@@ -0,0 +1,181 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.apihandlerinfra;
+
+
+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.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.onap.so.logger.HttpHeadersConstants.ONAP_REQUEST_ID;
+import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
+import static org.onap.so.logger.MdcConstants.CLIENT_ID;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+import org.onap.so.logger.HttpHeadersConstants;
+import org.onap.so.serviceinstancebeans.RequestReferences;
+import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class InstanceManagementTest extends BaseTest{
+
+	private final ObjectMapper mapper = new ObjectMapper();
+	private ObjectMapper errorMapper = new ObjectMapper();
+	
+    @Autowired
+    private InstanceManagement instanceManagement;
+    
+    @Value("${wiremock.server.port}")
+	private String wiremockPort;
+
+    private final String instanceManagementUri = "/onap/so/infra/instanceManagement/";
+
+    private String uri;
+    private URL selfLink;
+    private URL initialUrl;
+    private int initialPort;
+    private HttpHeaders headers;
+
+	@Before
+	public  void beforeClass() {
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		errorMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		errorMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+        // set headers
+		headers = new HttpHeaders();
+        headers.set(ONAPLogConstants.Headers.PARTNER_NAME, "test_name");        
+		headers.set(HttpHeadersConstants.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(ONAP_REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(ONAPLogConstants.MDCs.REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(CLIENT_ID, "VID");
+        headers.set(REQUESTOR_ID, "xxxxxx");
+		try {  // generate one-time port number to avoid RANDOM port number later.
+			initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH));
+			initialPort = initialUrl.getPort();
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} 
+		stubFor(post(urlMatching(".*/infraActiveRequests.*"))
+				.willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+						.withStatus(HttpStatus.SC_OK)));
+	}
+	
+    public String inputStream(String JsonInput)throws IOException{
+        JsonInput = "src/test/resources/ServiceInstanceTest" + JsonInput;
+        return new String(Files.readAllBytes(Paths.get(JsonInput)));
+    }
+
+    private URL createExpectedSelfLink(String version, String requestId) {
+    	System.out.println("createdUrl: " + initialUrl.toString()); 
+		try {	
+			selfLink = new URL(initialUrl.toString().concat("/").concat(version).concat("/").concat(requestId));
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		}    	
+    	return selfLink;
+    }
+    
+	private String getWiremockResponseForCatalogdb(String file) {
+		try {
+			File resource= ResourceUtils.getFile("classpath:__files/catalogdb/"+file);
+			return new String(Files.readAllBytes(resource.toPath())).replaceAll("localhost:8090","localhost:"+wiremockPort);
+		} catch (IOException e) {
+			e.printStackTrace();
+			return null;
+		}
+
+	}
+	
+	public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod, HttpHeaders headers){
+		
+		if (!headers.containsKey(HttpHeaders.ACCEPT)) {
+			headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+		}
+		if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
+			headers.set(HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON);
+		}
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(uriPath, initialPort));
+
+        HttpEntity<String> request = new HttpEntity<>(requestJson, headers);
+
+        return restTemplate.exchange(builder.toUriString(),
+                reqMethod, request, String.class);
+    }
+	
+    public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){
+    	return sendRequest(requestJson, uriPath, reqMethod, new HttpHeaders());
+    }
+
+    @Test
+    public void executeCustomWorkflow() throws IOException {
+        stubFor(post(urlPathEqualTo("/mso/async/services/VnfInPlaceUpdate"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBodyFile("Camunda/TestResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+        
+        stubFor(get(urlMatching(".*/vnfRecipe/search/findFirstVnfRecipeByNfRoleAndAction[?]" +
+                "nfRole=GR-API-DEFAULT&action=inPlaceSoftwareUpdate"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(getWiremockResponseForCatalogdb("vnfRecipeInPlaceUpdate_Response.json"))
+                        .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+        //expected response
+        ServiceInstancesResponse expectedResponse = new ServiceInstancesResponse();
+        RequestReferences requestReferences = new RequestReferences();
+        requestReferences.setInstanceId("1882939");
+        requestReferences.setRequestSelfLink(createExpectedSelfLink("v1","32807a28-1a14-4b88-b7b3-2950918aa76d"));        
+        expectedResponse.setRequestReferences(requestReferences);
+        uri = instanceManagementUri + "v1" + "/serviceInstances/f7ce78bb-423b-11e7-93f8-0050569a7968/vnfs/ff305d54-75b4-431b-adb2-eb6b9e5ff000/workflows/71526781-e55c-4cb7-adb3-97e09d9c76be";
+        ResponseEntity<String> response = sendRequest(inputStream("/ExecuteCustomWorkflow.json"), uri, HttpMethod.POST, headers);
+
+        assertEquals(Response.Status.ACCEPTED.getStatusCode(), response.getStatusCode().value());
+        ServiceInstancesResponse realResponse = mapper.readValue(response.getBody(), ServiceInstancesResponse.class);
+        assertThat(realResponse, sameBeanAs(expectedResponse).ignoring("requestReferences.requestId"));	
+    }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java
index ee98accfdc..d6fff7bdfb 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/MsoRequestTest.java
@@ -153,6 +153,27 @@ public class MsoRequestTest extends BaseTest {
 		});
 	}
 	@Test
+	@Parameters(method = "customWorkflowSuccessParameters")
+	public void customWorkflowSuccessTest(ServiceInstancesRequest sir, HashMap<String, String> instanceIdMapTest, Action action, int reqVersion) throws ValidationException, IOException{
+		this.sir = sir;
+		this.instanceIdMapTest = instanceIdMapTest;
+		this.action = action;
+		this.reqVersion = reqVersion;
+		this.version = "v" + reqVersion;
+		this.instanceIdMapTest.put("serviceInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("vnfInstanceId", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");
+		this.instanceIdMapTest.put("workflowUuid", "ff305d54-75b4-431b-adb2-eb6b9e5ff000");		
+		this.msoRequest = new MsoRequest();
+		this.msoRequest.parse(sir, instanceIdMapTest, action, version, originalRequestJSON, reqVersion, false);
+	}
+	@Parameters
+	private Collection<Object[]> customWorkflowSuccessParameters() throws JsonParseException, JsonMappingException, IOException{
+		return Arrays.asList(new Object[][]{
+			{mapper.readValue(inputStream("/SuccessfulValidation/v1ExecuteCustomWorkflow.json"), ServiceInstancesRequest.class), instanceIdMapTest, Action.inPlaceSoftwareUpdate, "1"}
+			
+		});
+	}
+	@Test
 	@Parameters(method = "aLaCarteParameters")
 	public void aLaCarteFlagTest(boolean expected, ServiceInstancesRequest sir) throws JsonParseException, IOException, ValidationException{
 		this.expected = expected;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
new file mode 100644
index 0000000000..b1a6e9f826
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
@@ -0,0 +1,331 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.apihandlerinfra;
+
+
+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.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.onap.so.logger.HttpHeadersConstants.ONAP_REQUEST_ID;
+import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
+import static org.onap.so.logger.MdcConstants.CLIENT_ID;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+
+import org.junit.Test;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
+import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.logger.HttpHeadersConstants;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.onap.so.serviceinstancebeans.RequestInfo;
+import org.onap.so.serviceinstancebeans.RequestParameters;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class RequestHandlerUtilsTest extends BaseTest{
+
+	private final ObjectMapper mapper = new ObjectMapper();
+	private ObjectMapper errorMapper = new ObjectMapper();
+	
+    @Autowired
+    private RequestHandlerUtils requestHandlerUtils;
+
+	@Value("${wiremock.server.port}")
+	private String wiremockPort;
+    
+    private URL initialUrl;
+    private int initialPort;
+    private HttpHeaders headers;
+
+	@Before
+	public  void beforeClass() {
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		errorMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		errorMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+        // set headers
+		headers = new HttpHeaders();
+        headers.set(ONAPLogConstants.Headers.PARTNER_NAME, "test_name");        
+		headers.set(HttpHeadersConstants.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(ONAP_REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(ONAPLogConstants.MDCs.REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers.set(CLIENT_ID, "VID");
+        headers.set(REQUESTOR_ID, "xxxxxx");
+		try {  // generate one-time port number to avoid RANDOM port number later.
+			initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH));
+			initialPort = initialUrl.getPort();
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} 
+		stubFor(post(urlMatching(".*/infraActiveRequests.*"))
+				.willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+						.withStatus(HttpStatus.SC_OK)));
+	}
+	
+    public String inputStream(String JsonInput)throws IOException{
+        JsonInput = "src/test/resources/ServiceInstanceTest" + JsonInput;
+        return new String(Files.readAllBytes(Paths.get(JsonInput)));
+    }
+    
+	public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod, HttpHeaders headers){
+		
+		if (!headers.containsKey(HttpHeaders.ACCEPT)) {
+			headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+		}
+		if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
+			headers.set(HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON);
+		}
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(uriPath, initialPort));
+
+        HttpEntity<String> request = new HttpEntity<>(requestJson, headers);
+
+        return restTemplate.exchange(builder.toUriString(),
+                reqMethod, request, String.class);
+    }
+	
+    public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){
+    	return sendRequest(requestJson, uriPath, reqMethod, new HttpHeaders());
+    }
+
+    @Test
+    public void test_mapJSONtoMSOStyle() throws IOException{
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(Include.NON_NULL);
+        String testRequest= inputStream("/ServiceInstanceDefault.json");
+        String resultString = requestHandlerUtils.mapJSONtoMSOStyle(testRequest, null, false, null);
+        ServiceInstancesRequest sir = mapper.readValue(resultString, ServiceInstancesRequest.class);
+        ModelInfo modelInfo = sir.getRequestDetails().getModelInfo();
+        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a796",modelInfo.getModelCustomizationUuid());
+        assertEquals("modelInstanceName",modelInfo.getModelInstanceName());
+        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a7965",modelInfo.getModelInvariantUuid());
+        assertEquals("10",modelInfo.getModelUuid());
+
+    }
+    
+    
+    @Test
+    public void test_mapJSONtoMSOStyleUsePreload() throws IOException{
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(Include.NON_NULL);
+        String testRequest= inputStream("/ServiceInstanceDefault.json");
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        RequestDetails rd = new RequestDetails();
+        RequestParameters rp = new RequestParameters();
+        rp.setUsePreload(true);
+        rd.setRequestParameters(rp);
+        sir.setRequestDetails(rd);
+        String resultString = requestHandlerUtils.mapJSONtoMSOStyle(testRequest, sir, false, null);
+        ServiceInstancesRequest sir1 = mapper.readValue(resultString, ServiceInstancesRequest.class);
+        assertTrue(sir1.getRequestDetails().getRequestParameters().getUsePreload());
+    }   
+  
+    @Test
+    public void setServiceTypeTestALaCarte() throws JsonProcessingException{
+    	String requestScope = ModelType.service.toString();
+    	Boolean aLaCarteFlag = true;
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	RequestDetails requestDetails = new RequestDetails();
+    	RequestInfo requestInfo = new RequestInfo();
+    	requestInfo.setSource("VID");
+    	requestDetails.setRequestInfo(requestInfo);
+    	sir.setRequestDetails(requestDetails);
+		Service defaultService = new Service();
+		defaultService.setServiceType("testServiceTypeALaCarte");
+    	
+    	stubFor(get(urlMatching(".*/service/search/.*"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(mapper.writeValueAsString(defaultService))
+                        .withStatus(HttpStatus.SC_OK)));
+    	
+    	String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+    	assertEquals(serviceType, "testServiceTypeALaCarte");
+    }
+    @Test
+    public void setServiceTypeTest() throws JsonProcessingException{
+    	String requestScope = ModelType.service.toString();
+    	Boolean aLaCarteFlag = false;
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	RequestDetails requestDetails = new RequestDetails();
+    	RequestInfo requestInfo = new RequestInfo();
+    	ModelInfo modelInfo = new ModelInfo();
+    	modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
+    	requestInfo.setSource("VID");
+    	requestDetails.setModelInfo(modelInfo);
+    	requestDetails.setRequestInfo(requestInfo);
+    	sir.setRequestDetails(requestDetails);
+		Service defaultService = new Service();
+		defaultService.setServiceType("testServiceType");
+    	
+    	stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(mapper.writeValueAsString(defaultService))
+                        .withStatus(HttpStatus.SC_OK)));
+    	
+    	String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+    	assertEquals(serviceType, "testServiceType");
+    }
+    @Test
+    public void setServiceTypeTestDefault() throws JsonProcessingException{
+    	String requestScope = ModelType.service.toString();
+    	Boolean aLaCarteFlag = false;
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	RequestDetails requestDetails = new RequestDetails();
+    	RequestInfo requestInfo = new RequestInfo();
+    	ModelInfo modelInfo = new ModelInfo();
+    	modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
+    	requestInfo.setSource("VID");
+    	requestDetails.setModelInfo(modelInfo);
+    	requestDetails.setRequestInfo(requestInfo);
+    	sir.setRequestDetails(requestDetails);
+		Service defaultService = new Service();
+		defaultService.setServiceType("testServiceType");
+    	
+    	stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withStatus(HttpStatus.SC_NOT_FOUND)));
+    	stubFor(get(urlMatching(".*/service/search/.*"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody(mapper.writeValueAsString(defaultService))
+                        .withStatus(HttpStatus.SC_OK)));
+    	
+    	String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+    	assertEquals(serviceType, "testServiceType");
+    }
+    @Test
+    public void setServiceTypeTestNetwork() throws JsonProcessingException{
+    	String requestScope = ModelType.network.toString();
+    	Boolean aLaCarteFlag = null;
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	RequestDetails requestDetails = new RequestDetails();
+    	RequestInfo requestInfo = new RequestInfo();
+    	ModelInfo modelInfo = new ModelInfo();
+    	modelInfo.setModelName("networkModelName");
+    	requestInfo.setSource("VID");
+    	requestDetails.setModelInfo(modelInfo);
+    	requestDetails.setRequestInfo(requestInfo);
+    	sir.setRequestDetails(requestDetails);
+    	
+    	String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+    	assertEquals(serviceType, "networkModelName");
+    }
+    @Test
+    public void setServiceInstanceIdInstanceGroupTest() throws JsonParseException, JsonMappingException, IOException{
+    	String requestScope = "instanceGroup";
+    	ServiceInstancesRequest sir = mapper.readValue(inputStream("/CreateInstanceGroup.json"), ServiceInstancesRequest.class);
+    	assertEquals("ddcbbf3d-f2c1-4ca0-8852-76a807285efc", requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    }
+    @Test
+    public void setServiceInstanceIdTest(){
+    	String requestScope = "vnf";
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	sir.setServiceInstanceId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+    	assertEquals("f0a35706-efc4-4e27-80ea-a995d7a2a40f", requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    }
+    @Test
+    public void setServiceInstanceIdReturnNullTest(){
+    	String requestScope = "vnf";
+    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
+    	assertNull(requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    }
+    @Test
+    public void camundaHistoryCheckTest() throws ContactCamundaException, RequestDbFailureException{
+    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBodyFile("Camunda/HistoryCheckResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+    	
+    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+    	boolean inProgress = false;
+    	inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+    	assertTrue(inProgress);
+    }
+    @Test
+    public void camundaHistoryCheckNoneFoundTest() throws ContactCamundaException, RequestDbFailureException{
+    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBody("[]").withStatus(org.apache.http.HttpStatus.SC_OK)));
+    	
+    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+    	boolean inProgress = false;
+    	inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+    	assertFalse(inProgress);
+    }
+    @Test
+    public void camundaHistoryCheckNotInProgressTest()throws ContactCamundaException, RequestDbFailureException{
+    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                        .withBodyFile("Camunda/HistoryCheckResponseCompleted.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
+    	
+    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+    	boolean inProgress = false;
+    	inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+    	assertFalse(inProgress);
+    }
+    @Test
+    public void setCamundaHeadersTest()throws ContactCamundaException, RequestDbFailureException{
+    	String encryptedAuth   = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
+    	String key = "07a7159d3bf51a0e53be7a8f89699be7";
+    	HttpHeaders headers = requestHandlerUtils.setCamundaHeaders(encryptedAuth, key);
+    	List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
+    	String expectedAcceptedType = "application/json";
+    	assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
+    	String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
+    	String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";    	
+    	assertEquals(expectedBasicAuth, basicAuth);
+    }    
+    
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
index 17fa011c93..639367074b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
@@ -29,9 +29,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 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.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.onap.so.logger.HttpHeadersConstants.ONAP_REQUEST_ID;
@@ -63,20 +61,14 @@ import javax.ws.rs.core.Response;
 
 import org.apache.http.HttpStatus;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
-import org.onap.so.apihandlerinfra.exceptions.RequestDbFailureException;
 import org.onap.so.db.catalog.beans.Service;
 import org.onap.so.db.catalog.beans.ServiceRecipe;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.logger.HttpHeadersConstants;
 import org.onap.so.serviceinstancebeans.CloudConfiguration;
-import org.onap.so.serviceinstancebeans.ModelInfo;
-import org.onap.so.serviceinstancebeans.RequestDetails;
 import org.onap.so.serviceinstancebeans.RequestError;
-import org.onap.so.serviceinstancebeans.RequestInfo;
 import org.onap.so.serviceinstancebeans.RequestParameters;
 import org.onap.so.serviceinstancebeans.RequestReferences;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
@@ -108,7 +100,7 @@ public class ServiceInstancesTest extends BaseTest{
 	
     @Autowired
     private ServiceInstances servInstances;
-
+  
 	@Value("${wiremock.server.port}")
 	private String wiremockPort;
 
@@ -190,39 +182,7 @@ public class ServiceInstancesTest extends BaseTest{
     public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){
     	return sendRequest(requestJson, uriPath, reqMethod, new HttpHeaders());
     }
-
-    @Test
-    public void test_mapJSONtoMSOStyle() throws IOException{
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(Include.NON_NULL);
-        String testRequest= inputStream("/ServiceInstanceDefault.json");
-        String resultString = servInstances.mapJSONtoMSOStyle(testRequest, null, false, null);
-        ServiceInstancesRequest sir = mapper.readValue(resultString, ServiceInstancesRequest.class);
-        ModelInfo modelInfo = sir.getRequestDetails().getModelInfo();
-        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a796",modelInfo.getModelCustomizationUuid());
-        assertEquals("modelInstanceName",modelInfo.getModelInstanceName());
-        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a7965",modelInfo.getModelInvariantUuid());
-        assertEquals("10",modelInfo.getModelUuid());
-
-    }
-    
-    
-    @Test
-    public void test_mapJSONtoMSOStyleUsePreload() throws IOException{
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(Include.NON_NULL);
-        String testRequest= inputStream("/ServiceInstanceDefault.json");
-        ServiceInstancesRequest sir = new ServiceInstancesRequest();
-        RequestDetails rd = new RequestDetails();
-        RequestParameters rp = new RequestParameters();
-        rp.setUsePreload(true);
-        rd.setRequestParameters(rp);
-        sir.setRequestDetails(rd);
-        String resultString = servInstances.mapJSONtoMSOStyle(testRequest, sir, false, null);
-        ServiceInstancesRequest sir1 = mapper.readValue(resultString, ServiceInstancesRequest.class);
-        assertTrue(sir1.getRequestDetails().getRequestParameters().getUsePreload());
-    }
-    
+   
     @Test
     public void createServiceInstanceVIDDefault() throws IOException{
         TestAppender.events.clear();
@@ -2569,160 +2529,5 @@ public class ServiceInstancesTest extends BaseTest{
         assertEquals(realResponse.getServiceException().getText(), "No valid modelCustomizationId for networkResourceCustomization lookup is specified");
     }
     
-    @Test
-    public void setServiceTypeTestALaCarte() throws JsonProcessingException{
-    	String requestScope = ModelType.service.toString();
-    	Boolean aLaCarteFlag = true;
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	RequestDetails requestDetails = new RequestDetails();
-    	RequestInfo requestInfo = new RequestInfo();
-    	requestInfo.setSource("VID");
-    	requestDetails.setRequestInfo(requestInfo);
-    	sir.setRequestDetails(requestDetails);
-		Service defaultService = new Service();
-		defaultService.setServiceType("testServiceTypeALaCarte");
-    	
-    	stubFor(get(urlMatching(".*/service/search/.*"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-    	
-    	String serviceType = servInstances.getServiceType(requestScope, sir, aLaCarteFlag);
-    	assertEquals(serviceType, "testServiceTypeALaCarte");
-    }
-    @Test
-    public void setServiceTypeTest() throws JsonProcessingException{
-    	String requestScope = ModelType.service.toString();
-    	Boolean aLaCarteFlag = false;
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	RequestDetails requestDetails = new RequestDetails();
-    	RequestInfo requestInfo = new RequestInfo();
-    	ModelInfo modelInfo = new ModelInfo();
-    	modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
-    	requestInfo.setSource("VID");
-    	requestDetails.setModelInfo(modelInfo);
-    	requestDetails.setRequestInfo(requestInfo);
-    	sir.setRequestDetails(requestDetails);
-		Service defaultService = new Service();
-		defaultService.setServiceType("testServiceType");
-    	
-    	stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-    	
-    	String serviceType = servInstances.getServiceType(requestScope, sir, aLaCarteFlag);
-    	assertEquals(serviceType, "testServiceType");
-    }
-    @Test
-    public void setServiceTypeTestDefault() throws JsonProcessingException{
-    	String requestScope = ModelType.service.toString();
-    	Boolean aLaCarteFlag = false;
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	RequestDetails requestDetails = new RequestDetails();
-    	RequestInfo requestInfo = new RequestInfo();
-    	ModelInfo modelInfo = new ModelInfo();
-    	modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
-    	requestInfo.setSource("VID");
-    	requestDetails.setModelInfo(modelInfo);
-    	requestDetails.setRequestInfo(requestInfo);
-    	sir.setRequestDetails(requestDetails);
-		Service defaultService = new Service();
-		defaultService.setServiceType("testServiceType");
-    	
-    	stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withStatus(HttpStatus.SC_NOT_FOUND)));
-    	stubFor(get(urlMatching(".*/service/search/.*"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-    	
-    	String serviceType = servInstances.getServiceType(requestScope, sir, aLaCarteFlag);
-    	assertEquals(serviceType, "testServiceType");
-    }
-    @Test
-    public void setServiceTypeTestNetwork() throws JsonProcessingException{
-    	String requestScope = ModelType.network.toString();
-    	Boolean aLaCarteFlag = null;
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	RequestDetails requestDetails = new RequestDetails();
-    	RequestInfo requestInfo = new RequestInfo();
-    	ModelInfo modelInfo = new ModelInfo();
-    	modelInfo.setModelName("networkModelName");
-    	requestInfo.setSource("VID");
-    	requestDetails.setModelInfo(modelInfo);
-    	requestDetails.setRequestInfo(requestInfo);
-    	sir.setRequestDetails(requestDetails);
-    	
-    	String serviceType = servInstances.getServiceType(requestScope, sir, aLaCarteFlag);
-    	assertEquals(serviceType, "networkModelName");
-    }
-    @Test
-    public void setServiceInstanceIdInstanceGroupTest() throws JsonParseException, JsonMappingException, IOException{
-    	String requestScope = "instanceGroup";
-    	ServiceInstancesRequest sir = mapper.readValue(inputStream("/CreateInstanceGroup.json"), ServiceInstancesRequest.class);
-    	assertEquals("ddcbbf3d-f2c1-4ca0-8852-76a807285efc", servInstances.setServiceInstanceId(requestScope, sir));
-    }
-    @Test
-    public void setServiceInstanceIdTest(){
-    	String requestScope = "vnf";
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	sir.setServiceInstanceId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-    	assertEquals("f0a35706-efc4-4e27-80ea-a995d7a2a40f", servInstances.setServiceInstanceId(requestScope, sir));
-    }
-    @Test
-    public void setServiceInstanceIdReturnNullTest(){
-    	String requestScope = "vnf";
-    	ServiceInstancesRequest sir = new ServiceInstancesRequest();
-    	assertNull(servInstances.setServiceInstanceId(requestScope, sir));
-    }
-    @Test
-    public void camundaHistoryCheckTest() throws ContactCamundaException, RequestDbFailureException{
-    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBodyFile("Camunda/HistoryCheckResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
-    	
-    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-    	boolean inProgress = false;
-    	inProgress = servInstances.camundaHistoryCheck(duplicateRecord, null);
-    	assertTrue(inProgress);
-    }
-    @Test
-    public void camundaHistoryCheckNoneFoundTest() throws ContactCamundaException, RequestDbFailureException{
-    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody("[]").withStatus(org.apache.http.HttpStatus.SC_OK)));
-    	
-    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-    	boolean inProgress = false;
-    	inProgress = servInstances.camundaHistoryCheck(duplicateRecord, null);
-    	assertFalse(inProgress);
-    }
-    @Test
-    public void camundaHistoryCheckNotInProgressTest()throws ContactCamundaException, RequestDbFailureException{
-    	stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBodyFile("Camunda/HistoryCheckResponseCompleted.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
-    	
-    	InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-    	duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-    	boolean inProgress = false;
-    	inProgress = servInstances.camundaHistoryCheck(duplicateRecord, null);
-    	assertFalse(inProgress);
-    }
-    @Test
-    public void setCamundaHeadersTest()throws ContactCamundaException, RequestDbFailureException{
-    	String encryptedAuth   = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
-    	String key = "07a7159d3bf51a0e53be7a8f89699be7";
-    	HttpHeaders headers = servInstances.setCamundaHeaders(encryptedAuth, key);
-    	List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
-    	String expectedAcceptedType = "application/json";
-    	assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
-    	String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
-    	String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";    	
-    	assertEquals(expectedBasicAuth, basicAuth);
-    }  
+   
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidationTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidationTest.java
new file mode 100644
index 0000000000..90c994fce0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/validation/CustomWorkflowValidationTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.apihandlerinfra.validation;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+
+import org.junit.Test;
+import org.onap.so.apihandlerinfra.Action;
+import org.onap.so.apihandlerinfra.BaseTest;
+import org.onap.so.exceptions.ValidationException;
+import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class CustomWorkflowValidationTest extends BaseTest{
+
+	@Test
+	public void testCustomWorkflowValidation() throws IOException, ValidationException {
+		String requestJson = new String(Files.readAllBytes(Paths.get("src/test/resources/MsoRequestTest/SuccessfulValidation/v1ExecuteCustomWorkflow.json")));
+		ObjectMapper mapper = new ObjectMapper();
+		ServiceInstancesRequest sir  = mapper.readValue(requestJson, ServiceInstancesRequest.class);
+		ValidationInformation info = new ValidationInformation(sir, new HashMap<String, String>(), Action.inPlaceSoftwareUpdate, 
+																1, false, sir.getRequestDetails().getRequestParameters());
+		info.setRequestScope("vnf");
+		
+		CustomWorkflowValidation validation = new CustomWorkflowValidation();
+		validation.validate(info);
+		
+		assertEquals(info.getSir().getRequestDetails().getCloudConfiguration().getCloudOwner(), "att-aic");
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v1ExecuteCustomWorkflow.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v1ExecuteCustomWorkflow.json
new file mode 100644
index 0000000000..611ccb3c66
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v1ExecuteCustomWorkflow.json
@@ -0,0 +1,18 @@
+{
+  "requestDetails": {
+    "cloudConfiguration": {
+      "cloudOwner": "att-aic",
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+    },
+    "requestParameters": {
+      "userParams": [
+        {
+          "existing_software_version": "3.1",
+          "new_software_version": "3.2",
+          "operations_timeout": "3600"
+        }
+      ]
+    }
+  }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ExecuteCustomWorkflow.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ExecuteCustomWorkflow.json
new file mode 100644
index 0000000000..611ccb3c66
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ExecuteCustomWorkflow.json
@@ -0,0 +1,18 @@
+{
+  "requestDetails": {
+    "cloudConfiguration": {
+      "cloudOwner": "att-aic",
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+    },
+    "requestParameters": {
+      "userParams": [
+        {
+          "existing_software_version": "3.1",
+          "new_software_version": "3.2",
+          "operations_timeout": "3600"
+        }
+      ]
+    }
+  }
+}