From 7f8a96f92c76deeddb46726093c687d9f77a09eb Mon Sep 17 00:00:00 2001
From: "Kalkere Ramesh, Sharan" <sharan.kalkere.ramesh@att.com>
Date: Mon, 6 Jul 2020 09:43:45 -0400
Subject: added in fix to use old volume group name for

added in fix to use old volume group name for volume group

Issue-ID: SO-3020
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Iaab124e8420d7b0a09b1f709b03b37b8a97425cf
---
 .../servicedecomposition/entities/ExecuteBuildingBlock.java    | 10 ++++++++++
 .../onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java  |  4 ++++
 2 files changed, 14 insertions(+)

(limited to 'bpmn/MSOCommonBPMN/src/main/java')

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
index e867b670b7..e45811117c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
@@ -28,6 +28,7 @@ public class ExecuteBuildingBlock extends BuildingBlockBase<ExecuteBuildingBlock
     private BuildingBlock buildingBlock;
     private ConfigurationResourceKeys configurationResourceKeys;
     private Boolean homing = false;
+    private String oldVolumeGroupName;
     private static final long serialVersionUID = 3L;
 
     public BuildingBlock getBuildingBlock() {
@@ -56,4 +57,13 @@ public class ExecuteBuildingBlock extends BuildingBlockBase<ExecuteBuildingBlock
         this.configurationResourceKeys = configurationResourceKeys;
         return this;
     }
+
+    public String getOldVolumeGroupName() {
+        return oldVolumeGroupName;
+    }
+
+    public ExecuteBuildingBlock setOldVolumeGroupName(String oldVolumeGroupName) {
+        this.oldVolumeGroupName = oldVolumeGroupName;
+        return this;
+    }
 }
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 fcc8484385..0cdf8a6e5d 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
@@ -750,6 +750,10 @@ public class BBInputSetup implements JavaDelegate {
                         parameter.getInstanceName(), generatedVnfType, parameter.getInstanceParams());
                 vnf.getVolumeGroups().add(volumeGroup);
                 if (parameter.getIsReplace()) {
+                    if (parameter.getExecuteBB().getOldVolumeGroupName() != null
+                            && !parameter.getExecuteBB().getOldVolumeGroupName().isEmpty()) {
+                        volumeGroup.setVolumeGroupName(parameter.getExecuteBB().getOldVolumeGroupName());
+                    }
                     mapCatalogVolumeGroup(volumeGroup, parameter.getModelInfo(),
                             parameter.getServiceModel().getNewService(), replaceVnfModelCustomizationUUID);
                 } else {
-- 
cgit 1.2.3-korg