Fix rollback

removed useless error handling test case from workflow
changed method name and added junit coverage to errors
added max retry and success status after completed bb
added assertion that global count var was reset to 0
updated rollback to reset current sequence count var
revert the other change and fix the rollback logic instead
fixed current sequence and updated rollback code

Change-Id: Ifd3282de1dbda8b36d4d89e5b7135ad464a9b963
Issue-ID: SO-1107
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

3 files changed, 123 insertions, 45 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
index 2d5638c2b7..e7d09f83e0 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
@@ -290,6 +290,7 @@ public class WorkflowAction {
 
 			execution.setVariable(G_CURRENT_SEQUENCE, 0);
 			execution.setVariable("retryCount", 0);
+			execution.setVariable("isRollback", false);
 			execution.setVariable("flowsToExecute", flowsToExecute);
 
 		} catch (Exception ex) {
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index d3f817c2a5..8a16b54bf4 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -50,6 +50,7 @@ public class WorkflowActionBBTasks {
 	private static final String G_REQUEST_ID = "mso-request-id";
 	private static final String G_ALACARTE = "aLaCarte";
 	private static final String G_ACTION = "requestAction";
+	private static final String RETRY_COUNT = "retryCount";
 	private static final Logger logger = LoggerFactory.getLogger(WorkflowActionBBTasks.class);
 
 	@Autowired
@@ -221,13 +222,18 @@ public class WorkflowActionBBTasks {
 	}
 
 	public void checkRetryStatus(DelegateExecution execution) {
-		if (execution.getVariable("handlingCode").equals("Retry")) {
-			int currSequence = (int) execution.getVariable("gCurrentSequence");
-			currSequence--;
-			execution.setVariable("gCurrentSequence", currSequence);
-			int currRetryCount = (int) execution.getVariable("retryCount");
-			currRetryCount++;
-			execution.setVariable("retryCount", currRetryCount);
+		String handlingCode = (String) execution.getVariable("handlingCode");
+		int retryCount = (int) execution.getVariable(RETRY_COUNT);
+		if (handlingCode.equals("Retry")){
+			if(retryCount<5){
+				int currSequence = (int) execution.getVariable("gCurrentSequence");
+				execution.setVariable("gCurrentSequence", currSequence-1);
+				execution.setVariable(RETRY_COUNT, retryCount + 1);
+			}else{
+				workflowAction.buildAndThrowException(execution, "Exceeded maximum retries. Ending flow with status Abort");
+			}
+		}else{
+			execution.setVariable(RETRY_COUNT, 0);
 		}
 	}
 
@@ -236,37 +242,41 @@ public class WorkflowActionBBTasks {
 	 * layer will rollback the flow its currently working on.
 	 */
 	public void rollbackExecutionPath(DelegateExecution execution) {
-		List<ExecuteBuildingBlock> flowsToExecute = (List<ExecuteBuildingBlock>) execution
-				.getVariable("flowsToExecute");
-		List<ExecuteBuildingBlock> rollbackFlows = new ArrayList();
-		int currentSequence = (int) execution.getVariable(G_CURRENT_SEQUENCE) + 1;
-		int listSize = flowsToExecute.size();
-		for (int i = listSize - 1; i >= 0; i--) {
-			if (i >= currentSequence) {
-				flowsToExecute.remove(i);
-			} else {
-				ExecuteBuildingBlock ebb = flowsToExecute.get(i);
-				BuildingBlock bb = flowsToExecute.get(i).getBuildingBlock();
-				String flowName = flowsToExecute.get(i).getBuildingBlock().getBpmnFlowName();
-				if (flowName.contains("Assign")) {
-					flowName = "Unassign" + flowName.substring(6, flowName.length());
-				} else if (flowName.contains("Create")) {
-					flowName = "Delete" + flowName.substring(6, flowName.length());
-				} else if (flowName.contains("Activate")) {
-					flowName = "Deactivate" + flowName.substring(8, flowName.length());
-				}else{
-					continue;
+		if(!(boolean)execution.getVariable("isRollback")){
+			List<ExecuteBuildingBlock> flowsToExecute = (List<ExecuteBuildingBlock>) execution
+					.getVariable("flowsToExecute");
+			List<ExecuteBuildingBlock> rollbackFlows = new ArrayList();
+			int currentSequence = (int) execution.getVariable(G_CURRENT_SEQUENCE);
+			int listSize = flowsToExecute.size();
+			for (int i = listSize - 1; i >= 0; i--) {
+				if (i > currentSequence - 1) {
+					flowsToExecute.remove(i);
+				} else {
+					String flowName = flowsToExecute.get(i).getBuildingBlock().getBpmnFlowName();
+					if (flowName.contains("Assign")) {
+						flowName = "Unassign" + flowName.substring(6, flowName.length());
+					} else if (flowName.contains("Create")) {
+						flowName = "Delete" + flowName.substring(6, flowName.length());
+					} else if (flowName.contains("Activate")) {
+						flowName = "Deactivate" + flowName.substring(8, flowName.length());
+					}else{
+						continue;
+					}
+					flowsToExecute.get(i).getBuildingBlock().setBpmnFlowName(flowName);
+					rollbackFlows.add(flowsToExecute.get(i));
 				}
-				flowsToExecute.get(i).getBuildingBlock().setBpmnFlowName(flowName);
-				rollbackFlows.add(flowsToExecute.get(i));
 			}
+			if (rollbackFlows.isEmpty())
+				execution.setVariable("isRollbackNeeded", false);
+			else
+				execution.setVariable("isRollbackNeeded", true);
+			execution.setVariable("flowsToExecute", rollbackFlows);
+			execution.setVariable("handlingCode", "PreformingRollback");
+			execution.setVariable("isRollback", true);
+			execution.setVariable("gCurrentSequence", 0);
+		}else{
+			workflowAction.buildAndThrowException(execution, "Rollback has already been called. Cannot rollback a request that is currently in the rollback state.");
 		}
-		if (rollbackFlows.isEmpty())
-			execution.setVariable("isRollbackNeeded", false);
-		else
-			execution.setVariable("isRollbackNeeded", true);
-		execution.setVariable("flowsToExecute", rollbackFlows);
-		execution.setVariable("handlingCode", "PreformingRollback");
 	}
 
 	public void abortCallErrorHandling(DelegateExecution execution) {
@@ -280,9 +290,17 @@ public class WorkflowActionBBTasks {
 			String requestId = (String) execution.getVariable(G_REQUEST_ID);
 			InfraActiveRequests request = requestDbclient.getInfraActiveRequestbyRequestId(requestId);
 			String errorMsg = null;
+			boolean rollback = false;
 			try {
 				WorkflowException exception = (WorkflowException) execution.getVariable("WorkflowException");
-				request.setStatusMessage(exception.getErrorMessage());
+				if(exception.getErrorMessage()!=null || !exception.getErrorMessage().equals("")){
+					errorMsg = exception.getErrorMessage();
+					rollback = (boolean) execution.getVariable("isRollbackComplete");
+					if(rollback){
+						errorMsg = errorMsg + " + Rollback has been completed successfully.";
+					}
+					request.setStatusMessage(errorMsg);
+				}
 			} catch (Exception ex) {
 				//log error and attempt to extact WorkflowExceptionMessage
 				logger.error("Failed to extract workflow exception from execution.",ex);
@@ -303,4 +321,9 @@ public class WorkflowActionBBTasks {
 			workflowAction.buildAndThrowException(execution, "Error Updating Request Database", e);
 		}
 	}
+	
+	public void updateRequestStatusToFailedWithRollback(DelegateExecution execution) {
+		execution.setVariable("isRollbackComplete", true);
+		updateRequestStatusToFailed(execution);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
index 6cac238482..8ed1f44b8a 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
@@ -23,17 +23,22 @@ package org.onap.so.bpmn.infrastructure.workflow.tasks;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.camunda.bpm.engine.delegate.BpmnError;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.extension.mockito.delegate.DelegateExecutionFake;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
 import org.onap.so.bpmn.BaseTaskTest;
 import org.onap.so.bpmn.servicedecomposition.entities.BuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
@@ -150,59 +155,99 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
 	
 	@Test
 	public void rollbackExecutionPathTest(){
+		execution.setVariable("isRollback", false);
 		List<ExecuteBuildingBlock> flowsToExecute = new ArrayList();
 		ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
 		BuildingBlock bb1 = new BuildingBlock();
 		bb1.setBpmnFlowName("AssignVfModuleBB");
-		flowsToExecute.add(ebb1);
 		ebb1.setBuildingBlock(bb1);
+		flowsToExecute.add(ebb1);
 		ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
 		BuildingBlock bb2 = new BuildingBlock();
 		bb2.setBpmnFlowName("CreateVfModuleBB");
-		flowsToExecute.add(ebb2);
 		ebb2.setBuildingBlock(bb2);
+		flowsToExecute.add(ebb2);
 		ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
 		BuildingBlock bb3 = new BuildingBlock();
 		bb3.setBpmnFlowName("ActivateVfModuleBB");
-		flowsToExecute.add(ebb3);
 		ebb3.setBuildingBlock(bb3);
+		flowsToExecute.add(ebb3);
 		
 		execution.setVariable("flowsToExecute", flowsToExecute);
-		execution.setVariable("gCurrentSequence", 2);
+		execution.setVariable("gCurrentSequence", 3);
 		
 		workflowActionBBTasks.rollbackExecutionPath(execution);
 		List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
 		assertEquals(ebbs.get(0).getBuildingBlock().getBpmnFlowName(),"DeactivateVfModuleBB");
 		assertEquals(ebbs.get(1).getBuildingBlock().getBpmnFlowName(),"DeleteVfModuleBB");
-		assertEquals(ebbs.get(2).getBuildingBlock().getBpmnFlowName(),"UnassignVfModuleBB");	
+		assertEquals(ebbs.get(2).getBuildingBlock().getBpmnFlowName(),"UnassignVfModuleBB");
+		assertEquals(0,execution.getVariable("gCurrentSequence"));
 	}
 	
 	@Test
 	public void rollbackExecutionPathUnfinishedFlowTest(){
+		execution.setVariable("isRollback", false);
 		List<ExecuteBuildingBlock> flowsToExecute = new ArrayList();
 		ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
 		BuildingBlock bb1 = new BuildingBlock();
 		bb1.setBpmnFlowName("AssignVfModuleBB");
-		flowsToExecute.add(ebb1);
 		ebb1.setBuildingBlock(bb1);
+		flowsToExecute.add(ebb1);
 		ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
 		BuildingBlock bb2 = new BuildingBlock();
 		bb2.setBpmnFlowName("CreateVfModuleBB");
-		flowsToExecute.add(ebb2);
 		ebb2.setBuildingBlock(bb2);
+		flowsToExecute.add(ebb2);
 		ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
 		BuildingBlock bb3 = new BuildingBlock();
 		bb3.setBpmnFlowName("ActivateVfModuleBB");
-		flowsToExecute.add(ebb3);
 		ebb3.setBuildingBlock(bb3);
+		flowsToExecute.add(ebb3);
 		
 		execution.setVariable("flowsToExecute", flowsToExecute);
-		execution.setVariable("gCurrentSequence", 1);
+		execution.setVariable("gCurrentSequence", 2);
 		
 		workflowActionBBTasks.rollbackExecutionPath(execution);
 		List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
 		assertEquals(ebbs.get(0).getBuildingBlock().getBpmnFlowName(),"DeleteVfModuleBB");
 		assertEquals(ebbs.get(1).getBuildingBlock().getBpmnFlowName(),"UnassignVfModuleBB");	
+		assertEquals(0,execution.getVariable("gCurrentSequence"));
+	}
+	
+	@Test
+	public void rollbackExecutionTest(){
+		execution.setVariable("isRollback", false);
+		List<ExecuteBuildingBlock> flowsToExecute = new ArrayList();
+		ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+		BuildingBlock bb1 = new BuildingBlock();
+		bb1.setBpmnFlowName("AssignServiceInstanceBB");
+		ebb1.setBuildingBlock(bb1);
+		flowsToExecute.add(ebb1);
+		ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+		BuildingBlock bb2 = new BuildingBlock();
+		bb2.setBpmnFlowName("CreateNetworkCollectionBB");
+		ebb2.setBuildingBlock(bb2);
+		flowsToExecute.add(ebb2);
+		ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+		BuildingBlock bb3 = new BuildingBlock();
+		bb3.setBpmnFlowName("AssignNetworkBB");
+		ebb3.setBuildingBlock(bb3);
+		flowsToExecute.add(ebb3);
+		ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+		BuildingBlock bb4 = new BuildingBlock();
+		bb4.setBpmnFlowName("CreateNetworkBB");
+		ebb4.setBuildingBlock(bb4);
+		flowsToExecute.add(ebb4);
+		
+		execution.setVariable("flowsToExecute", flowsToExecute);
+		execution.setVariable("gCurrentSequence", 3);
+		
+		workflowActionBBTasks.rollbackExecutionPath(execution);
+		List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
+		assertEquals(ebbs.get(0).getBuildingBlock().getBpmnFlowName(),"UnassignNetworkBB");
+		assertEquals(ebbs.get(1).getBuildingBlock().getBpmnFlowName(),"DeleteNetworkCollectionBB");	
+		assertEquals(ebbs.get(2).getBuildingBlock().getBpmnFlowName(),"UnassignServiceInstanceBB");
+		assertEquals(0,execution.getVariable("gCurrentSequence"));
 	}
 	
 	@Test
@@ -213,4 +258,13 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
 		workflowActionBBTasks.checkRetryStatus(execution);
 		assertEquals(0,execution.getVariable("gCurrentSequence"));
 	}
+	
+	@Test
+	public void checkRetryStatusNoRetryTest(){
+		execution.setVariable("retryCount", 3);
+		execution.setVariable("handlingCode","Success");
+		execution.setVariable("gCurrentSequence",1);
+		workflowActionBBTasks.checkRetryStatus(execution);
+		assertEquals(0,execution.getVariable("retryCount"));
+	}
 }