Prod fixes August 18th

fixed compilation issues and all unit tests now pass
fix condition that checks for vnf in list to set homing flags
fix resource name variable being null
Skip volume group search for alacarte VF Module creation, since that group is expected to be specified on the input
Remove temporary change to JUnit for creation of volume group.
Add mapping of isBaseVfModule setting to AAIObjectMapper for vfModule.
adding a unit test for hte issue which was fixed
Explicitly return heatStackId variable from VnfAdapter subprocess
Fixing an issue with the workflow processor/asynresource which may lead to
apihandler leaving the active_Request table record in_progress while the bpmn quits the processing due to the error.

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

2 files changed, 28 insertions, 7 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index b5203c676a..67fb6a6f37 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -346,13 +346,15 @@ public class BBInputSetup implements JavaDelegate {
 				ModelInfo vnfModelInfo = new ModelInfo();
 				vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
 				this.mapCatalogVnf(tempVnf, vnfModelInfo, service);
-				for(VolumeGroup volumeGroup : tempVnf.getVolumeGroups()) {
-					String volumeGroupCustId = 
-							this.bbInputSetupUtils.getAAIVolumeGroup(CLOUD_OWNER, 
-									cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId()).getModelCustomizationId();
-					if(modelInfo.getModelCustomizationId().equalsIgnoreCase(volumeGroupCustId)) {
-						lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
-						break;
+				if (lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID) == null) {
+					for(VolumeGroup volumeGroup : tempVnf.getVolumeGroups()) {
+						String volumeGroupCustId = 
+								this.bbInputSetupUtils.getAAIVolumeGroup(CLOUD_OWNER, 
+										cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId()).getModelCustomizationId();
+						if(modelInfo.getModelCustomizationId().equalsIgnoreCase(volumeGroupCustId)) {
+							lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
+							break;
+						}
 					}
 				}
 				break;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowProcessorException.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowProcessorException.java
new file mode 100644
index 0000000000..768bee578c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowProcessorException.java
@@ -0,0 +1,19 @@
+package org.openecomp.mso.bpmn.common.workflow.service;
+
+import org.onap.so.bpmn.common.workflow.context.WorkflowResponse;
+
+/**
+ * Exception thrown when an error occurs while processing the workflow.
+ * This encapsulates the workflow response so that the same can be sent back to api handler.
+ */
+public class WorkflowProcessorException extends RuntimeException {
+    WorkflowResponse workflowResponse;
+
+    public WorkflowProcessorException(WorkflowResponse workflowResponse) {
+        this.workflowResponse = workflowResponse;
+    }
+
+    public WorkflowResponse getWorkflowResponse() {
+        return workflowResponse;
+    }
+}