From cd85fa3ff3322c0990430efe55dedc2f7577ee6b Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Fri, 11 Jan 2019 21:54:58 -0500
Subject: Miscellaneous fixes

updated common pom to use aai schema version 1.4.1
removed handle sync error from SDNCHandler bpmn flow
added mso-request-id to in mapping of delete vnf flows
moved temporary test file to temporary folder
Removed obsolete genericVnfNode parameter from updateGenericVnfNode
sorted vfmodules by base last for negative action reqs

Change-Id: I7a5018d67292cfaac8d923ac3bd9b27ed037be57
Issue-ID: SO-1382
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../workflow/tasks/WorkflowAction.java               | 20 +++++++++++++++++++-
 .../workflow/tasks/WorkflowActionTest.java           | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'bpmn/so-bpmn-tasks/src')

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 10ee13ebed..50f2091ae2 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
@@ -344,6 +344,18 @@ public class WorkflowAction {
 		}
 		return vfModuleResources;
 	}
+	
+	protected List<Resource> sortVfModulesByBaseLast(List<Resource> vfModuleResources) {
+		int count = 0;
+		for(Resource resource : vfModuleResources){
+			if(resource.isBaseVfModule()){
+				Collections.swap(vfModuleResources, vfModuleResources.size()-1, count);
+				break;
+		}
+			count++;
+		}
+		return vfModuleResources;
+	}
 
 	private void updateResourceIdsFromAAITraversal(List<ExecuteBuildingBlock> flowsToExecute,
 			List<Resource> resourceCounter, List<Pair<WorkflowType, String>> aaiResourceIds, String serviceInstanceId) {
@@ -969,8 +981,14 @@ public class WorkflowAction {
 							requestAction, aLaCarte, vnfType, workflowResourceIds, requestDetails, true, resource.getVirtualLinkKey(), false));
 				}
 			} else if (orchFlow.getFlowName().contains(VFMODULE)) {
-				List<Resource> vfModuleResourcesSorted = sortVfModulesByBaseFirst(resourceCounter.stream().filter(x -> WorkflowType.VFMODULE == x.getResourceType())
+				List<Resource> vfModuleResourcesSorted = null;
+				if(requestAction.equals("createInstance")||requestAction.equals("assignInstance")||requestAction.equals("activateInstance")){
+					vfModuleResourcesSorted = sortVfModulesByBaseFirst(resourceCounter.stream().filter(x -> WorkflowType.VFMODULE == x.getResourceType())
 						.collect(Collectors.toList()));
+				}else{
+					vfModuleResourcesSorted = sortVfModulesByBaseLast(resourceCounter.stream().filter(x -> WorkflowType.VFMODULE == x.getResourceType())
+							.collect(Collectors.toList()));
+				}
 				for (int i = 0; i < vfModuleResourcesSorted.size(); i++) {
 					flowsToExecute.add(buildExecuteBuildingBlock(orchFlow, requestId, vfModuleResourcesSorted.get(i), apiVersion, resourceId,
 							requestAction, aLaCarte, vnfType, workflowResourceIds, requestDetails, false, null, false));
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 5699c94137..72f0ce4e6d 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -1200,6 +1200,24 @@ public class WorkflowActionTest extends BaseTaskTest {
 		assertEquals("111",result.get(2).getResourceId());
 	}
 	
+	@Test
+	public void sortVfModulesByBaseLastTest(){
+		List<Resource> resources = new ArrayList<>();
+		Resource resource1 = new Resource(WorkflowType.VFMODULE,"111",false);
+		resource1.setBaseVfModule(true);
+		resources.add(resource1);
+		Resource resource2 = new Resource(WorkflowType.VFMODULE,"222",false);
+		resource2.setBaseVfModule(false);
+		resources.add(resource2);
+		Resource resource3 = new Resource(WorkflowType.VFMODULE,"333",false);
+		resource3.setBaseVfModule(false);
+		resources.add(resource3);
+		List<Resource> result = workflowAction.sortVfModulesByBaseLast(resources);
+		assertEquals("333",result.get(0).getResourceId());
+		assertEquals("222",result.get(1).getResourceId());
+		assertEquals("111",result.get(2).getResourceId());
+	}
+	
 	private List<OrchestrationFlow> createFlowList (String... flowNames){
 		List<OrchestrationFlow> result = new ArrayList<>();
 		for(String flowName : flowNames){
-- 
cgit 1.2.3-korg