WorkflowResponse json issues

This commit adds some robustness to the interface between the
API-H and BPMN, specifically, in how the response is handled.

I don't have proof, but there appears to be some randomness to
the json provider behavior when used with the jax-rs. Sometimes,
the serializer is adding the root element, and sometimes it
is not.  Maybe there's something wrong with the configuration.
Maybe we have competing json providers.  I couldn't pin this
down.

I'm almost certain it is the presence of the root element in
the content that causes the API-H code to fail parsing of the
BPMN response.  This doesn't kill the request, as you might
expect, but rather, the API-H passes the BPMN response through
to the client (VID, or policy, or whatever).

The original problem (SO-586) was "fixed" by "removing the
wrapper".  This "wrapper" is a needed feature of the interface
between BPMN and the API-H.  We shouldn't have removed it.
The fact that the "fix" appeared to work is due to the
behavior I described in the previous paragraph.  The API-H
chokes on the message, and it passes it through unchanged.
Not really what we want.

So, I don't know why the jackson/json behavior is flaky and
different now, but I can (and did) modify the API-H so it can
parse a json message whether or not it has a root element.

Note that WorkflowResponse.java (in BPMN) and CamundaResponse.java
(in the API-H) are basically the same bean representing the
message format.  Seems less than ideal to have two different
classes.

Also note that I changed the name of the "response" attribute
of the WorkflowResponse and CamundaResponse classes to "content".
Got tired of seeing this nonsense everywhere in the code:
	response.getResponse()

Change-Id: Icaf70f8457de99e493cf882170fe778c620308c9
Issue-ID: SO-586
Issue-ID: SO-618
Signed-off-by: Rob Daugherty <rd472p@att.com>

17 files changed, 145 insertions, 131 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
index db11db59f7..b4543b1445 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
@@ -109,13 +109,13 @@ public class WorkflowAsyncResource extends ProcessEngineAwareService {
 			msoLogger.debug(logMarker + "Exception in startProcessInstance by key");

 	        WorkflowResponse response = new WorkflowResponse();

 			response.setMessage("Fail" );

-			response.setResponse("Error occurred while executing the process: " + e);

+			response.setContent("Error occurred while executing the process: " + e);

 			response.setMessageCode(500);

 			recordEvents(processKey, response, startTime);

 			

 			msoLogger.error (MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logMarker 

 					+ response.getMessage() + " for processKey: " 

-					+ processKey + " with response: " + response.getResponse());

+					+ processKey + " with content: " + response.getContent());

 			

 			Response errorResponse = Response.serverError().entity(response).build();

 			asyncResponse.setResponse(errorResponse);

@@ -245,10 +245,10 @@ public class WorkflowAsyncResource extends ProcessEngineAwareService {
 		

 		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

 				logMarker + response.getMessage() + " for processKey: "

-				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);

+				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

 		

 		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-				logMarker + response.getMessage() + "for processKey: " + processKey + " with response: " + response.getResponse());

+				logMarker + response.getMessage() + "for processKey: " + processKey + " with content: " + response.getContent());

 		

 	}

 

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
index aab4faf23b..4dfae8b2a3 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
@@ -108,19 +108,19 @@ public class WorkflowContextHolder {
 				+ ":process key:" + processKey);
 			workflowResponse.setMessage("Fail");
 			workflowResponse.setMessageCode(400);
-			workflowResponse.setResponse("Unable to correlate workflow context, bad request. Request Id: " + requestId);
+			workflowResponse.setContent("Unable to correlate workflow context, bad request. Request Id: " + requestId);
 			return Response.serverError().entity(workflowResponse).build();
 		}
 
 		responseQueue.remove(workflowContext);
 
 		msoLogger.debug("Using callback response for request id: " + requestId);
-		workflowResponse.setResponse(callbackResponse.getResponse());
-		workflowResponse.setProcessInstanceID(processInstanceId);
+		workflowResponse.setContent(callbackResponse.getResponse());
+		workflowResponse.setProcessInstanceId(processInstanceId);
 		workflowResponse.setMessageCode(callbackResponse.getStatusCode());
 		workflowResponse.setMessage(callbackResponse.getMessage());
 		sendWorkflowResponseToClient(processKey, workflowContext, workflowResponse);
-		return Response.ok().entity(workflowResponse.getResponse()).build();
+		return Response.ok().entity(workflowResponse).build();
 	}
 	
 	/**
@@ -133,7 +133,7 @@ public class WorkflowContextHolder {
 			WorkflowResponse workflowResponse) {
 		msoLogger.debug(logMarker + "Sending the response for request id: " + workflowContext.getRequestId());
 		recordEvents(processKey, workflowResponse, workflowContext.getStartTime());
-		Response response = Response.status(workflowResponse.getMessageCode()).entity(workflowResponse.getResponse()).build();
+		Response response = Response.status(workflowResponse.getMessageCode()).entity(workflowResponse).build();
 		AsynchronousResponse asyncResp = workflowContext.getAsynchronousResponse();
 		asyncResp.setResponse(response);
 	}
@@ -152,7 +152,7 @@ public class WorkflowContextHolder {
 					msoLogger.debug("Preparing timeout response for " + requestObject.getProcessKey() + ":" + ":" + requestObject.getRequestId());
 					WorkflowResponse response = new WorkflowResponse();
 					response.setMessage("Fail");
-					response.setResponse("Request timedout, request id:" + requestObject.getRequestId());
+					response.setContent("Request timedout, request id:" + requestObject.getRequestId());
 					//response.setProcessInstanceID(requestObject.getProcessInstance().getProcessInstanceId());
 					recordEvents(requestObject.getProcessKey(), response, requestObject.getStartTime());
 					response.setMessageCode(500);
@@ -178,11 +178,11 @@ public class WorkflowContextHolder {
 
 		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
 				logMarker + response.getMessage() + " for processKey: "
-				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);
+				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);
 		
 		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 
 				+ response.getMessage() + " for processKey: " 
-				+ processKey + " with response: " + response.getResponse());
+				+ processKey + " with content: " + response.getContent());
 		
 	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
index dd100a3824..25c67fed63 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
@@ -135,7 +135,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
 				}

 

 				String processInstanceId = processInstance.getId();

-				workflowResponse.setProcessInstanceID(processInstanceId);				

+				workflowResponse.setProcessInstanceId(processInstanceId);				

 

 				responseMap = getResponseMap(processInstance, processKey, timeProcessEnded);

 

@@ -172,23 +172,23 @@ public class WorkflowResource extends ProcessEngineAwareService {
 

 			workflowResponse.setMessage("Fail");

 			if (endedWithNoResponse) {

-				workflowResponse.setResponse("Process ended without producing a response");

+				workflowResponse.setContent("Process ended without producing a response");

 			} else {

-				workflowResponse.setResponse("Request timed out, process state: " + state);

+				workflowResponse.setContent("Request timed out, process state: " + state);

 			}

-			workflowResponse.setProcessInstanceID(processInstanceId);

+			workflowResponse.setProcessInstanceId(processInstanceId);

 			recordEvents(processKey, workflowResponse, startTime);

 			workflowResponse.setMessageCode(500);

 			return Response.status(500).entity(workflowResponse).build();

 		} catch (Exception ex) {

 			msoLogger.debug(LOGMARKER + "Exception in startProcessInstance by key",ex);

 			workflowResponse.setMessage("Fail" );

-			workflowResponse.setResponse("Error occurred while executing the process: " + ex.getMessage());

-			if (processInstance != null) workflowResponse.setProcessInstanceID(processInstance.getId());

+			workflowResponse.setContent("Error occurred while executing the process: " + ex.getMessage());

+			if (processInstance != null) workflowResponse.setProcessInstanceId(processInstance.getId());

 			

 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG,  "BPMN", MDC.get(processKey), 

 					MsoLogger.ErrorCode.UnknownError, LOGMARKER + workflowResponse.getMessage()

-					+ " for processKey: " + processKey + " with response: " + workflowResponse.getResponse());

+					+ " for processKey: " + processKey + " with content: " + workflowResponse.getContent());

 			

 			workflowResponse.setMessageCode(500);

 			recordEvents(processKey, workflowResponse, startTime);

@@ -221,11 +221,11 @@ public class WorkflowResource extends ProcessEngineAwareService {
 		

 		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

 				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);

+				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

 		

 		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

 				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with response: " + response.getResponse());

+				+ processKey + " with content: " + response.getContent());

 	}

 

 	private void setLogContext(String processKey, Map<String, Object> inputVariables) {

@@ -262,13 +262,13 @@ public class WorkflowResource extends ProcessEngineAwareService {
 

 	private void processResponseMap(WorkflowResponse workflowResponse, Map<String, Object> responseMap) {

 		Object object = responseMap.get("Response");

-		String response = object == null ? null : String.valueOf(object);

-		if(response == null){

+		String content = object == null ? null : String.valueOf(object);

+		if (content == null){

 			object = responseMap.get("WorkflowResponse");

-			response = object == null ? null : String.valueOf(object);

+			content = object == null ? null : String.valueOf(object);

 		}

 

-		workflowResponse.setResponse(response); 

+		workflowResponse.setContent(content); 

 

 		object = responseMap.get("ResponseCode");

 		String responseCode = object == null ? null : String.valueOf(object);

@@ -584,31 +584,31 @@ public class WorkflowResource extends ProcessEngineAwareService {
 			

 			response.setVariables(variablesMap);

 			response.setMessage("Success");

-			response.setResponse("Successfully retrieved the variables"); 

-			response.setProcessInstanceID(processInstanceId);

+			response.setContent("Successfully retrieved the variables"); 

+			response.setProcessInstanceId(processInstanceId);

 

-			msoLogger.debug(LOGMARKER + response.getMessage() + " for processKey: " + processKey + " with response: " + response.getResponse());

+			msoLogger.debug(LOGMARKER + response.getMessage() + " for processKey: " + processKey + " with content: " + response.getContent());

 		} catch (Exception ex) {

 			response.setMessage("Fail");

-			response.setResponse("Failed to retrieve the variables," + ex.getMessage()); 

-			response.setProcessInstanceID(processInstanceId);

+			response.setContent("Failed to retrieve the variables," + ex.getMessage()); 

+			response.setProcessInstanceId(processInstanceId);

 			

 			msoLogger.error (MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, "BPMN", MDC.get(processKey), MsoLogger.ErrorCode.UnknownError, LOGMARKER 

 					+ response.getMessage() 

 					+ " for processKey: " 

 					+ processKey 

-					+ " with response: " 

-					+ response.getResponse());

+					+ " with content: " 

+					+ response.getContent());

 			msoLogger.debug("Exception :",ex);

 		}

 		

 		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

 				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);

+				+ processKey + " with content: " + response.getContent(), "BPMN", MDC.get(processKey), null);

 		

 		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

 				LOGMARKER + response.getMessage() + " for processKey: "

-				+ processKey + " with response: " + response.getResponse());

+				+ processKey + " with content: " + response.getContent());

 		

 		return response;

 	}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java
index e0382d1bda..02702e3b3c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResponse.java
@@ -22,48 +22,76 @@ package org.openecomp.mso.bpmn.common.workflow.service;
 

 import java.util.Map;

 

+import com.fasterxml.jackson.annotation.JsonProperty;

+

 /**

- * @version 1.0

- * Synchronous workflow response bean 

- *

+ * A synchronous response from a workflow.

  */

 public class WorkflowResponse {

 

-	private String response;

-	private String message;

-	private String processInstanceID;

-	private Map<String,String> variables;

+	@JsonProperty("processInstanceId")

+	private String processInstanceId;

+

+	@JsonProperty("messageCode")

 	private int messageCode;

+

+	@JsonProperty("message")

+	private String message;

 	

-	public String getResponse() {

-		return response; 

+	@JsonProperty("variables")

+	private Map<String,String> variables;

+

+	@JsonProperty("content")

+	private String content;

+

+	public String getProcessInstanceId() {

+		return processInstanceId;

 	}

-	public void setResponse(String response) {

-		this.response = response;

+

+	public void setProcessInstanceId(String processInstanceId) {

+		this.processInstanceId = processInstanceId;

+	}

+

+	public int getMessageCode() {

+		return messageCode;

 	}

+

+	public void setMessageCode(int messageCode) {

+		this.messageCode = messageCode;

+	}

+

 	public String getMessage() {

 		return message;

 	}

+

 	public void setMessage(String message) {

 		this.message = message;

 	}

-	public String getProcessInstanceID() {

-		return processInstanceID;

-	}

-	public void setProcessInstanceID(String pID) {

-		this.processInstanceID = pID;

-	}

-	public Map<String, String> getVariables() {

+

+	public Map<String,String> getVariables() {

 		return variables;

 	}

-	public void setVariables(Map<String, String> variables) {

+

+	public void setVariables(Map<String,String> variables) {

 		this.variables = variables;

 	}

-	public void setMessageCode(int messageCode) {

-		this.messageCode = messageCode;

+

+	public String getContent() {

+		return content;

 	}

-	

-	public int getMessageCode() {

-		return messageCode;

+

+	public void setContent(String content) {

+		this.content = content;

+	}

+

+	@Override

+	public String toString() {

+		return getClass().getSimpleName() + "["

+			+ "processInstanceId=" + processInstanceId

+			+ ",messageCode=" + messageCode

+			+ ",message=" + message

+			+ ",variables=" + variables

+			+ ",content=" + content

+			+ "]";

 	}

-}

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index 1400e6ea77..0bb5186a17 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -238,14 +238,7 @@ public class BPMNUtil {
 			doAnswer(new Answer<Void>() {

 			    public Void answer(InvocationOnMock invocation) {

 			      Response response = (Response) invocation.getArguments()[0];

-			      try {

-			    	  workflowResponse = (WorkflowResponse) response.getEntity();

-			      } catch (ClassCastException e) {

-			    	  String workflowResponseString = (String)response.getEntity();

-			    	  workflowResponse = new WorkflowResponse();

-			    	  workflowResponse.setResponse(workflowResponseString);

-			    	  workflowResponse.setMessageCode(200);

-			      }

+			      workflowResponse = (WorkflowResponse) response.getEntity();

 			      return null;

 			    }

 			}).when(asyncResponse).setResponse(any(Response.class));		

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
index 9d4dac2333..bf69223b52 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
@@ -46,7 +46,7 @@ public class CompleteMsoProcessTest extends WorkflowTest {
 		variables.put("CompleteMsoProcessRequest",inputRequestFile);

 		

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CompleteMsoProcess", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 		logEnd();

 	}	

 	

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
index 457128f104..13c400e71e 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
@@ -50,7 +50,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest {
 		setVariables(variables);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch");
 		String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch");
@@ -70,7 +70,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest {
 		setVariables(variables);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch");
 		String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
index 257cec9b11..c3259a0de5 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
@@ -62,7 +62,7 @@ public class FalloutHandlerTest extends WorkflowTest {
 		variables.put("FalloutHandlerRequest",inputRequestFile);

 		

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "FalloutHandler", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 		System.out.println("ENDED TEST: " + method);

 	}	

 	

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
index 125a9ad916..67ac34c1d0 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
@@ -54,7 +54,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		Map<String, String> variables = new HashMap<>();
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
 		String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag");
@@ -74,7 +74,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -98,7 +98,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -122,7 +122,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, null, "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -146,7 +146,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -168,7 +168,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -193,7 +193,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -214,7 +214,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "1234");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
@@ -240,7 +240,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator");
 		String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
index add9a32d61..a318be5b10 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
@@ -55,7 +55,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "true", null);
 
@@ -70,7 +70,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "true", null);
 
@@ -87,7 +87,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "false", null);
 
@@ -103,7 +103,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "vce", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "false", null);
 
@@ -118,7 +118,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "false", "true", null);
 
@@ -133,7 +133,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "false", "true", null);
 
@@ -148,7 +148,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "false", "false", null);
 
@@ -162,7 +162,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Incoming Required Variable is Missing or Null!]");
 
@@ -177,7 +177,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Received a bad response from AAI]");
 
@@ -192,7 +192,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=412,errorMessage=Delete Vnf Received a resource-version Mismatch Error Response from AAI]");
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
index 0198395750..6da6924d11 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
@@ -59,7 +59,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		Map<String, String> variables = new HashMap<>();

 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

 		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

@@ -85,7 +85,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -113,7 +113,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -143,7 +143,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -172,7 +172,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -196,7 +196,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -223,7 +223,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -250,7 +250,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -277,7 +277,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -301,7 +301,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -328,7 +328,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -354,7 +354,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -379,7 +379,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -407,7 +407,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -434,7 +434,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -463,7 +463,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -493,7 +493,7 @@ public class GenericGetServiceTest extends WorkflowTest {
         setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null);

 

         WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-        waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+        waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

         String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

         String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

@@ -521,7 +521,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 		setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null);

 

 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());

 

 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
index 4922263744..7de493a621 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
@@ -56,7 +56,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
@@ -83,7 +83,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "testVnfName123", "vce");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
@@ -110,7 +110,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 		setVariables(variables, "", "testVnfName123", "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
@@ -137,7 +137,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 		setVariables(variables, null, "testVnfName123", "vce");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
@@ -166,7 +166,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator");
 		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
index 0e0a237090..7c003c986a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
@@ -55,7 +55,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
@@ -75,7 +75,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", vcePayload, "vce");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
@@ -95,7 +95,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", genericVnfPayload, "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
@@ -117,7 +117,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", genericVnfPayload, "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
@@ -137,7 +137,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
@@ -158,7 +158,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 		setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator");
 		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException");
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
index 0349b178cb..02e029de46 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
@@ -95,7 +95,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		Response response = workflowResource.startProcessInstanceByKey("sdncAdapter", varMap);

 		WorkflowResponse workflowResponse = (WorkflowResponse) response.getEntity();

 

-		//String pid = workflowResponse.getProcessInstanceID();

+		//String pid = workflowResponse.getProcessInstanceId();

 		//System.out.println("Back from executing process instance with pid=" + pid);

 		return workflowResponse;

 	}

@@ -364,7 +364,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		WorkflowResponse response = thread.workflowResponse;

 		Assert.assertNotNull(response);

 		Assert.assertEquals("404 error", response.getMessageCode(),7000);

-//		assertProcessInstanceFinished(response.getProcessInstanceID());

+//		assertProcessInstanceFinished(response.getProcessInstanceId());

 		//System.out.println("SDNCAdapter bad synchronous response flow Completed!");

 	}

 

@@ -442,7 +442,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 

 		public void run() {

 			workflowResponse = invokeFlow(workflowRequest);

-			workflowResponse.getProcessInstanceID();

+			workflowResponse.getProcessInstanceId();

 		}

 	}

 

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
index 5f91298958..5562cb80ae 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
@@ -48,7 +48,7 @@ public class WorkflowAsyncResourceTest extends WorkflowTest {
 		variables.put("mso-service-request-timeout", "5");
 		
 		WorkflowResponse workflowResponse = BPMNUtil.executeAsyncWorkflow(processEngineRule, "testAsyncProcess", variables);
-		assertEquals("Received the request, the process is getting executed, request message<aetgt:CreateTenantRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns5=\"http://org.openecomp/mso/request/types/v1\">  <msoservtypes:service-information xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\">    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>    <msoservtypes:service-instance-id>HI/VLXM/950604//SW_INTERNET</msoservtypes:service-instance-id>    <msoservtypes:subscriber-name>SubName01</msoservtypes:subscriber-name> </msoservtypes:service-information> </aetgt:CreateTenantRequest>", workflowResponse.getResponse());
+		assertEquals("Received the request, the process is getting executed, request message<aetgt:CreateTenantRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns5=\"http://org.openecomp/mso/request/types/v1\">  <msoservtypes:service-information xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\">    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>    <msoservtypes:service-instance-id>HI/VLXM/950604//SW_INTERNET</msoservtypes:service-instance-id>    <msoservtypes:subscriber-name>SubName01</msoservtypes:subscriber-name> </msoservtypes:service-information> </aetgt:CreateTenantRequest>", workflowResponse.getContent());
 		assertEquals(200, workflowResponse.getMessageCode());
 	}
 
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java
index 47005c80e1..6e2699a40e 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java
@@ -69,7 +69,6 @@ public class WorkflowContextHolderTest {
 		Assert.assertNull(context2);
 	}
 
-	@Ignore // broken by SO-586
 	@Test
 	public void testProcessCallback() {
 		WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
@@ -88,7 +87,7 @@ public class WorkflowContextHolderTest {
 		Assert.assertNotNull(response1.getMessage());
 		Assert.assertEquals(200,response1.getMessageCode());
 		Assert.assertEquals("Success", response1.getMessage());
-		Assert.assertEquals("Successfully processed request", response1.getResponse());
+		Assert.assertEquals("Successfully processed request", response1.getContent());
 		verify(asyncResponse).setResponse(any(Response.class));
 
 		WorkflowContext context1 = contextHolder.getWorkflowContext(workflowContext.getRequestId());
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
index 8208b43fa5..9b8a249511 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
@@ -473,12 +473,6 @@ public class WorkflowTest {
 						(entity == null ? "null" : entity.getClass().getName()) +

 						", expected WorkflowResponse";

 					System.out.println(msg);

-					

-					if (entity instanceof String) {

-						WorkflowResponse toRet = new WorkflowResponse();

-						toRet.setResponse((String)entity);

-						return toRet;

-					}

 					fail(msg);

 					return null; // unreachable

 				}