fix issue with instance groups and unassign req

fixed issue where instance groups were added on an Unassign request

Change-Id: I0bec76d17730553c4ff5c750dfe1d88edabd7837
Issue-ID: SO-1319
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

2 files changed, 14 insertions, 4 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 b794e4174b..9260580713 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
@@ -609,16 +609,27 @@ public class BBInputSetup implements JavaDelegate {
 			vnf = createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
 					resourceId, generatedVnfType, instanceParams);
 			serviceInstance.getVnfs().add(vnf);
+			mapVnfcCollectionInstanceGroup(vnf, modelInfo, service);
 		}
 		if(vnf != null) {
 			mapCatalogVnf(vnf, modelInfo, service);
-			mapVnfcCollectionInstanceGroup(vnf, modelInfo, service);
-			if (instanceGroupId != null && instanceGroupModelInfo != null) {
+			if (instanceGroupId != null && instanceGroupModelInfo != null
+					&& instanceGroupModelInfo.getModelType().equals(ModelType.networkInstanceGroup)
+					&& !instanceGroupInList(vnf, instanceGroupId)) {
 				mapNetworkCollectionInstanceGroup(vnf, instanceGroupId);
 			}
 		}
 	}
 
+	protected boolean instanceGroupInList(GenericVnf vnf, String instanceGroupId) {
+		for(InstanceGroup instanceGroup : vnf.getInstanceGroups()) {
+			if(instanceGroup.getId() != null && instanceGroup.getId().equalsIgnoreCase(instanceGroupId)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	protected void mapVnfcCollectionInstanceGroup(GenericVnf genericVnf, ModelInfo modelInfo, Service service) {
 		VnfResourceCustomization vnfResourceCustomization = getVnfResourceCustomizationFromService(modelInfo, service);
 		if(vnfResourceCustomization != null) {
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index f6e433bf38..78238f0271 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -1314,12 +1314,11 @@ public class BBInputSetupTest {
 		doReturn(vnf2AAI).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf2.getVnfId());
 		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf2, modelInfo, service);
 		doNothing().when(SPY_bbInputSetup).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
-		doNothing().when(SPY_bbInputSetup).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
 		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf2, modelInfo, service);
 		verify(SPY_bbInputSetup, times(2)).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
-		verify(SPY_bbInputSetup, times(2)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
 	}
 
 	@Test