2 files changed, 36 insertions, 42 deletions

diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index 14081960e6..cffb67a968 100644
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -78,6 +78,24 @@
           <generateSupportingFiles>false</generateSupportingFiles>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.basedir}/target/generated-sources/src/gen/java/main</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencyManagement>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
index 33b60a9ed3..a162088cb2 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
@@ -128,62 +128,23 @@ public class AAIUpdateTasks {
 
     /**
      * BPMN access method to update status of VolumeGroup to Assigned in AAI
-     *
-     * @param execution
      */
     public void updateOrchestrationStatusAssignedVolumeGroup(BuildingBlockExecution execution) {
-        try {
-            GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
-
-            VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID);
-            CloudRegion cloudRegion = gBBInput.getCloudRegion();
-            volumeGroup.setHeatStackId("");
-            aaiVolumeGroupResources.updateOrchestrationStatusVolumeGroup(volumeGroup, cloudRegion,
-                    OrchestrationStatus.ASSIGNED);
-        } catch (Exception ex) {
-            logger.error("Exception occurred in AAIUpdateTasks updateOrchestrationStatusAssignedVolumeGroup", ex);
-            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
-        }
+        updateOrchestrationStatusForVolumeGroup(execution, OrchestrationStatus.ASSIGNED);
     }
 
     /**
      * BPMN access method to update status of VolumeGroup to Active in AAI
-     *
-     * @param execution
      */
     public void updateOrchestrationStatusActiveVolumeGroup(BuildingBlockExecution execution) {
-        try {
-            GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
-
-            VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID);
-            CloudRegion cloudRegion = gBBInput.getCloudRegion();
-
-            aaiVolumeGroupResources.updateOrchestrationStatusVolumeGroup(volumeGroup, cloudRegion,
-                    OrchestrationStatus.ACTIVE);
-        } catch (Exception ex) {
-            logger.error("Exception occurred in AAIUpdateTasks updateOrchestrationStatusActiveVolumeGroup", ex);
-            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
-        }
+        updateOrchestrationStatusForVolumeGroup(execution, OrchestrationStatus.ACTIVE);
     }
 
     /**
      * BPMN access method to update status of VolumeGroup to Created in AAI
-     *
-     * @param execution
      */
     public void updateOrchestrationStatusCreatedVolumeGroup(BuildingBlockExecution execution) {
-        try {
-            GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
-
-            VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID);
-            CloudRegion cloudRegion = gBBInput.getCloudRegion();
-
-            aaiVolumeGroupResources.updateOrchestrationStatusVolumeGroup(volumeGroup, cloudRegion,
-                    OrchestrationStatus.CREATED);
-        } catch (Exception ex) {
-            logger.error("Exception occurred in AAIUpdateTasks updateOrchestrationStatusCreatedVolumeGroup", ex);
-            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
-        }
+        updateOrchestrationStatusForVolumeGroup(execution, OrchestrationStatus.CREATED);
     }
 
     /**
@@ -824,4 +785,19 @@ public class AAIUpdateTasks {
         }
     }
 
+    private void updateOrchestrationStatusForVolumeGroup(BuildingBlockExecution execution, OrchestrationStatus status) {
+        try {
+            VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID);
+            if (status.equals(OrchestrationStatus.ASSIGNED)) {
+                volumeGroup.setHeatStackId("");
+            }
+            aaiVolumeGroupResources.updateOrchestrationStatusVolumeGroup(volumeGroup,
+                    execution.getGeneralBuildingBlock().getCloudRegion(), status);
+        } catch (Exception ex) {
+            logger.error("Exception occurred in AAIUpdateTasks during update orchestration status to {} for "
+                    + "volume group", status, ex);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+        }
+    }
+
 }