Casablana bugfixes

updated mock in unassignnetworkbbtest instead of base
added mock to extract pojos method in unassignnetwork
Return gBuildingBlockExecution from calls to VnfAdapter subprocess
Correct JUnit data to expect modelInfoVfModule
Enable Spring Security for logging of unauthorized/bad credentials
errors
Fix handling of a case of no VF Modules in a VNF resource.
fix populating lookupKeyMap with resource ids
removed unnecessary test resources

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

6 files changed, 128 insertions, 109 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 ab6ae35ace..b5203c676a 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
@@ -247,14 +247,18 @@ public class BBInputSetup implements JavaDelegate {
 		org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness = requestDetails.getLineOfBusiness();
 
 		if (modelType.equals(ModelType.network)) {
+			lookupKeyMap.put(ResourceKey.NETWORK_ID, resourceId);
 			this.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId, null);
 		} else if (modelType.equals(ModelType.vnf)) {
+			lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, resourceId);
 			this.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName, serviceInstance,
 					lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
 		} else if (modelType.equals(ModelType.volumeGroup)) {
+			lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, resourceId);
 			this.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
 					relatedInstanceList, instanceName, vnfType, null);
 		} else if (modelType.equals(ModelType.vfModule)) {
+			lookupKeyMap.put(ResourceKey.VF_MODULE_ID, resourceId);
 			this.populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
 					relatedInstanceList, instanceName, null, requestDetails.getCloudConfiguration());
 		} else {
@@ -321,8 +325,6 @@ public class BBInputSetup implements JavaDelegate {
 	protected void populateVfModule(ModelInfo modelInfo, Service service, String bbName,
 			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId,
 			RelatedInstanceList[] relatedInstanceList, String instanceName, List<Map<String, String>> instanceParams, CloudConfiguration cloudConfiguration) throws Exception {
-		boolean foundByName = false;
-		boolean foundById = false;
 		String vnfModelCustomizationUUID = null;
 		if (relatedInstanceList != null) {
 			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
@@ -350,29 +352,31 @@ public class BBInputSetup implements JavaDelegate {
 									cloudConfiguration.getLcpCloudRegionId(), volumeGroup.getVolumeGroupId()).getModelCustomizationId();
 					if(modelInfo.getModelCustomizationId().equalsIgnoreCase(volumeGroupCustId)) {
 						lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
+						break;
 					}
 				}
 				break;
 			}
 		}
 		if (vnf != null) {
-			for (VfModule vfModule : vnf.getVfModules()) {
+			VfModule vfModule = null;
+			for (VfModule vfModuleTemp : vnf.getVfModules()) {
 				if (lookupKeyMap.get(ResourceKey.VF_MODULE_ID) != null
-						&& vfModule.getVfModuleId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VF_MODULE_ID))) {
-					foundById = true;
-					this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
-				} else if (instanceName != null && vfModule.getVfModuleName().equalsIgnoreCase(instanceName)) {
-					foundByName = true;
-					lookupKeyMap.put(ResourceKey.VF_MODULE_ID, vfModule.getVfModuleId());
-					this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+						&& vfModuleTemp.getVfModuleId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VF_MODULE_ID))) {
+					vfModule = vfModuleTemp;
+					String vfModuleCustId = bbInputSetupUtils.getAAIVfModule(vnf.getVnfId(), vfModule.getVfModuleId()).getModelCustomizationId();
+					modelInfo.setModelCustomizationId(vfModuleCustId);
+					break;
 				}
 			}
-			if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VF_MODULE.toString())) {
-				VfModule vfModule = this.createVfModule(lookupKeyMap,
+			if (vfModule == null && bbName.equalsIgnoreCase(AssignFlows.VF_MODULE.toString())) {
+				vfModule = createVfModule(lookupKeyMap,
 						resourceId, instanceName, instanceParams);
-				this.mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
 				vnf.getVfModules().add(vfModule);
 			}
+			if(vfModule != null) {
+				mapCatalogVfModule(vfModule, modelInfo, service, vnfModelCustomizationUUID);
+			}
 		} else {
 			msoLogger.debug("Related VNF instance Id not found:  " + lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
 			throw new Exception("Could not find relevant information for related VNF");
@@ -423,48 +427,47 @@ public class BBInputSetup implements JavaDelegate {
 	protected void populateVolumeGroup(ModelInfo modelInfo, Service service, String bbName,
 			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId,
 			RelatedInstanceList[] relatedInstanceList, String instanceName, String vnfType, List<Map<String, String>> instanceParams) throws Exception {
-		boolean foundByName = false;
-		boolean foundById = false;
+		VolumeGroup volumeGroup = null;
+		GenericVnf vnf = null;
 		String vnfModelCustomizationUUID = null;
+		String generatedVnfType = vnfType;
+		if (generatedVnfType == null || generatedVnfType.isEmpty()) {
+			generatedVnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
+		}
 		if (relatedInstanceList != null) {
 			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
 				RelatedInstance relatedInstance = relatedInstList.getRelatedInstance();
 				if (relatedInstance.getModelInfo().getModelType().equals(ModelType.vnf)) {
 					vnfModelCustomizationUUID = relatedInstance.getModelInfo().getModelCustomizationUuid();
+					break;
 				}
 			}
 		}
-		GenericVnf vnf = null;
 		for (GenericVnf tempVnf : serviceInstance.getVnfs()) {
 			if (tempVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
 				vnf = tempVnf;
-				vnfModelCustomizationUUID = this.bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
+				vnfModelCustomizationUUID = bbInputSetupUtils.getAAIGenericVnf(vnf.getVnfId())
 						.getModelCustomizationId();
 				ModelInfo vnfModelInfo = new ModelInfo();
 				vnfModelInfo.setModelCustomizationUuid(vnfModelCustomizationUUID);
-				this.mapCatalogVnf(tempVnf, vnfModelInfo, service);
+				mapCatalogVnf(tempVnf, vnfModelInfo, service);
 				break;
 			}
 		}
 		if (vnf != null && vnfModelCustomizationUUID != null) {
-			for (VolumeGroup volumeGroup : vnf.getVolumeGroups()) {
-				if (lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID) != null && volumeGroup.getVolumeGroupId()
+			for (VolumeGroup volumeGroupTemp : vnf.getVolumeGroups()) {
+				if (lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID) != null && volumeGroupTemp.getVolumeGroupId()
 						.equalsIgnoreCase(lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID))) {
-					foundById = true;
-					this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
-				} else if (instanceName != null && volumeGroup.getVolumeGroupName().equalsIgnoreCase(instanceName)) {
-					foundByName = true;
-					lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, volumeGroup.getVolumeGroupId());
-					this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
+					volumeGroup = volumeGroupTemp;
+					break;
 				}
 			}
-			if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VOLUME_GROUP.toString())) {
-				if (vnfType == null || vnfType.isEmpty()) {
-					vnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
-				}
-				VolumeGroup volumeGroup = this.createVolumeGroup(lookupKeyMap, resourceId, instanceName, vnfType, instanceParams);
+			if (volumeGroup == null && bbName.equalsIgnoreCase(AssignFlows.VOLUME_GROUP.toString())) {
+				volumeGroup = createVolumeGroup(lookupKeyMap, resourceId, instanceName, generatedVnfType, instanceParams);
 				vnf.getVolumeGroups().add(volumeGroup);
-				this.mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
+			}
+			if(volumeGroup != null) {
+				mapCatalogVolumeGroup(volumeGroup, modelInfo, service, vnfModelCustomizationUUID);
 			}
 		} else {
 			msoLogger.debug("Related VNF instance Id not found:  " + lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID));
@@ -522,10 +525,13 @@ public class BBInputSetup implements JavaDelegate {
 			org.onap.so.serviceinstancebeans.LineOfBusiness lineOfBusiness, Service service, String bbName,
 			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap,
 			RelatedInstanceList[] relatedInstanceList, String resourceId, String vnfType, List<Map<String, String>> instanceParams) {
-		boolean foundByName = false;
-		boolean foundById = false;
+		GenericVnf vnf = null;
 		ModelInfo instanceGroupModelInfo = null;
 		String instanceGroupId = null;
+		String generatedVnfType = vnfType;
+		if (generatedVnfType == null || generatedVnfType.isEmpty()) {
+			generatedVnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
+		}
 		if (relatedInstanceList != null) {
 			for (RelatedInstanceList relatedInstList : relatedInstanceList) {
 				RelatedInstance relatedInstance = relatedInstList.getRelatedInstance();
@@ -535,36 +541,26 @@ public class BBInputSetup implements JavaDelegate {
 				}
 			}
 		}
-		for (GenericVnf genericVnf : serviceInstance.getVnfs()) {
+		for (GenericVnf vnfTemp : serviceInstance.getVnfs()) {
 			if (lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID) != null
-					&& genericVnf.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
-				foundById = true;
-				org.onap.aai.domain.yang.GenericVnf vnf = bbInputSetupUtils.getAAIGenericVnf(genericVnf.getVnfId());
-				if(vnf!=null){
-					modelInfo.setModelCustomizationUuid(vnf.getModelCustomizationId());
-				}
-				this.mapCatalogVnf(genericVnf, modelInfo, service);
-			} else if (instanceName != null && genericVnf.getVnfName().equalsIgnoreCase(instanceName)) {
-				foundByName = true;
-				lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, genericVnf.getVnfId());
-				org.onap.aai.domain.yang.GenericVnf vnf = bbInputSetupUtils.getAAIGenericVnf(genericVnf.getVnfId());
-				if(vnf!=null){
-					modelInfo.setModelCustomizationUuid(vnf.getModelCustomizationId());
-				}
-				this.mapCatalogVnf(genericVnf, modelInfo, service);
+					&& vnfTemp.getVnfId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID))) {
+				String vnfModelCustId = bbInputSetupUtils.getAAIGenericVnf(vnfTemp.getVnfId()).getModelCustomizationId();
+				modelInfo.setModelCustomizationUuid(vnfModelCustId);
+				vnf = vnfTemp;
+				break;
 			}
 		}
-		if (!foundByName && !foundById && bbName.equalsIgnoreCase(AssignFlows.VNF.toString())) {
-			if(vnfType == null || vnfType.isEmpty()) {
-				vnfType = service.getModelName() + "/" + modelInfo.getModelCustomizationName();
+		if (vnf == null && bbName.equalsIgnoreCase(AssignFlows.VNF.toString())) {
+			vnf = createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
+					resourceId, generatedVnfType, instanceParams);
+			serviceInstance.getVnfs().add(vnf);
+		}
+		if(vnf != null) {
+			mapCatalogVnf(vnf, modelInfo, service);
+			mapVnfcCollectionInstanceGroup(vnf, modelInfo, service);
+			if (instanceGroupId != null && instanceGroupModelInfo != null) {
+				mapNetworkCollectionInstanceGroup(vnf, instanceGroupId);
 			}
-			GenericVnf genericVnf = this.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
-					resourceId, vnfType, instanceParams);
-			serviceInstance.getVnfs().add(genericVnf);
-			this.mapCatalogVnf(genericVnf, modelInfo, service);
-			this.mapVnfcCollectionInstanceGroup(genericVnf, modelInfo, service);
-			if (instanceGroupId != null && instanceGroupModelInfo != null)
-				this.mapNetworkCollectionInstanceGroup(genericVnf, instanceGroupId);
 		}
 	}
 
@@ -585,7 +581,7 @@ public class BBInputSetup implements JavaDelegate {
 	}
 
 	protected void mapNetworkCollectionInstanceGroup(GenericVnf genericVnf, String instanceGroupId) {
-		org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = this.bbInputSetupUtils
+		org.onap.aai.domain.yang.InstanceGroup aaiInstanceGroup = bbInputSetupUtils
 				.getAAIInstanceGroup(instanceGroupId);
 		InstanceGroup instanceGroup = this.mapperLayer.mapAAIInstanceGroupIntoInstanceGroup(aaiInstanceGroup);
 		instanceGroup.setModelInfoInstanceGroup(this.mapperLayer.mapCatalogInstanceGroupToInstanceGroup(
@@ -636,25 +632,22 @@ public class BBInputSetup implements JavaDelegate {
 
 	protected void populateL3Network(String instanceName, ModelInfo modelInfo, Service service, String bbName,
 			ServiceInstance serviceInstance, Map<ResourceKey, String> lookupKeyMap, String resourceId, List<Map<String, String>> instanceParams) {
-		boolean foundByName = false;
-		boolean foundById = false;
-		for (L3Network network : serviceInstance.getNetworks()) {
+		L3Network network = null;
+		for (L3Network networkTemp : serviceInstance.getNetworks()) {
 			if (lookupKeyMap.get(ResourceKey.NETWORK_ID) != null
-					&& network.getNetworkId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.NETWORK_ID))) {
-				foundById = true;
-				this.mapCatalogNetwork(network, modelInfo, service);
-			} else if (instanceName != null && network.getNetworkName().equalsIgnoreCase(instanceName)) {
-				foundByName = true;
-				lookupKeyMap.put(ResourceKey.NETWORK_ID, network.getNetworkId());
-				this.mapCatalogNetwork(network, modelInfo, service);
+					&& networkTemp.getNetworkId().equalsIgnoreCase(lookupKeyMap.get(ResourceKey.NETWORK_ID))) {
+				network = networkTemp;
+				break;
 			}
 		}
-		if (!foundByName && !foundById 
+		if (network == null
 				&& (bbName.equalsIgnoreCase(AssignFlows.NETWORK_A_LA_CARTE.toString()) 
 						|| bbName.equalsIgnoreCase(AssignFlows.NETWORK_MACRO.toString()))) {
-			L3Network l3Network = this.createNetwork(lookupKeyMap, instanceName, resourceId, instanceParams);
-			serviceInstance.getNetworks().add(l3Network);
-			this.mapCatalogNetwork(l3Network, modelInfo, service);
+			network = createNetwork(lookupKeyMap, instanceName, resourceId, instanceParams);
+			serviceInstance.getNetworks().add(network);
+		}
+		if(network != null) {
+			mapCatalogNetwork(network, modelInfo, service);
 		}
 	}
 
@@ -1496,7 +1489,7 @@ public class BBInputSetup implements JavaDelegate {
 			Relationships relationships = relationshipsOp.get();
 			this.mapNetworkPolicies(relationships.getByType(AAIObjectType.NETWORK_POLICY),
 					network.getNetworkPolicies());
-			this.mapRouteTableReferences(relationships.getByType(AAIObjectType.ROUTE_TABLE_REFERENCE),
+			mapRouteTableReferences(relationships.getByType(AAIObjectType.ROUTE_TABLE_REFERENCE),
 					network.getContrailNetworkRouteTableReferences());
 		}
 
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index abd7ed5a8e..c2161a4fee 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -142,6 +142,10 @@ public class BBInputSetupMapperLayer {
 	protected VfModule mapAAIVfModule(org.onap.aai.domain.yang.VfModule aaiVfModule) {
 		VfModule vfModule = modelMapper.map(aaiVfModule, VfModule.class);
 		vfModule.setOrchestrationStatus(this.mapOrchestrationStatusFromAAI(aaiVfModule.getOrchestrationStatus()));
+		
+		ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
+		modelInfoVfModule.setIsBaseBoolean(aaiVfModule.isIsBaseVfModule());		
+		vfModule.setModelInfoVfModule(modelInfoVfModule);		
 		return vfModule;
 	}
 
@@ -175,7 +179,7 @@ public class BBInputSetupMapperLayer {
 
 	protected ModelInfoInstanceGroup mapCatalogInstanceGroupToInstanceGroup(CollectionResourceCustomization collectionCust, InstanceGroup instanceGroup) {
 		ModelInfoInstanceGroup modelInfoInstanceGroup = modelMapper.map(instanceGroup, ModelInfoInstanceGroup.class);
-		if(instanceGroup.getType().equals(InstanceGroupType.L3_NETWORK))
+		if(instanceGroup.getType() != null && instanceGroup.getType().equals(InstanceGroupType.L3_NETWORK))
 			modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_L3_NETWORK);
 		else
 			modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_VNFC);
@@ -462,4 +466,4 @@ public class BBInputSetupMapperLayer {
 			CollectionNetworkResourceCustomization collectionNetworkResourceCust) {
 		return modelMapper.map(collectionNetworkResourceCust, NetworkResourceCustomization.class);
 	}
-}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java
index 3a88377a51..4b85538428 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtils.java
@@ -412,4 +412,4 @@ public class BBInputSetupUtils {
 			return Optional.of(volumeGroup);
 		}
 	}
-}
+}
\ No newline at end of file
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 daa63044e4..a821d69754 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
@@ -658,8 +658,8 @@ public class BBInputSetupTest {
 	public void testPopulateObjectsOnAssignAndCreateFlows() throws Exception {
 		String bbName = AssignFlows.SERVICE_INSTANCE.toString();
 		String instanceName = "instanceName";
-		String resourceId = "123";
 		String vnfType = "vnfType";
+		String resourceId = "networkId";
 		Service service = Mockito.mock(Service.class);
 		ServiceInstance serviceInstance = Mockito.mock(ServiceInstance.class);
 		RequestDetails requestDetails = Mockito.mock(RequestDetails.class);
@@ -675,12 +675,6 @@ public class BBInputSetupTest {
 
 		doNothing().when(SPY_bbInputSetup).populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, null);
-		doNothing().when(SPY_bbInputSetup).populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness,
-				service, bbName, serviceInstance, lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
-		doNothing().when(SPY_bbInputSetup).populateVolumeGroup(modelInfo, service, bbName, serviceInstance,
-				lookupKeyMap, resourceId, relatedInstanceList, instanceName, vnfType, null);
-		doNothing().when(SPY_bbInputSetup).populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap,
-				resourceId, relatedInstanceList, instanceName, null, cloudConfiguration);
 		doReturn(modelInfo).when(requestDetails).getModelInfo();
 		doReturn(requestInfo).when(requestDetails).getRequestInfo();
 		doReturn(instanceName).when(requestInfo).getInstanceName();
@@ -690,36 +684,41 @@ public class BBInputSetupTest {
 		doReturn(cloudConfiguration).when(requestDetails).getCloudConfiguration();
 
 		doReturn(ModelType.network).when(modelInfo).getModelType();
-
 		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, vnfType);
-
 		verify(SPY_bbInputSetup, times(1)).populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, null);
+		assertEquals("NetworkId populated", true, lookupKeyMap.get(ResourceKey.NETWORK_ID).equalsIgnoreCase(resourceId));
 
 		doReturn(ModelType.vnf).when(modelInfo).getModelType();
-
+		resourceId = "vnfId";
+		doNothing().when(SPY_bbInputSetup).populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness,
+				service, bbName, serviceInstance, lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
 		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, vnfType);
-
 		verify(SPY_bbInputSetup, times(1)).populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness,
 				service, bbName, serviceInstance, lookupKeyMap, relatedInstanceList, resourceId, vnfType, null);
+		assertEquals("VnfId populated", true, lookupKeyMap.get(ResourceKey.GENERIC_VNF_ID).equalsIgnoreCase(resourceId));
 
 		doReturn(ModelType.volumeGroup).when(modelInfo).getModelType();
-
+		resourceId = "volumeGroupId";
+		doNothing().when(SPY_bbInputSetup).populateVolumeGroup(modelInfo, service, bbName, serviceInstance,
+				lookupKeyMap, resourceId, relatedInstanceList, instanceName, vnfType, null);
 		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, vnfType);
-
 		verify(SPY_bbInputSetup, times(1)).populateVolumeGroup(modelInfo, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, relatedInstanceList, instanceName, vnfType, null);
+		assertEquals("VolumeGroupId populated", true, lookupKeyMap.get(ResourceKey.VOLUME_GROUP_ID).equalsIgnoreCase(resourceId));
 
 		doReturn(ModelType.vfModule).when(modelInfo).getModelType();
-
+		resourceId = "vfModuleId";
+		doNothing().when(SPY_bbInputSetup).populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap,
+				resourceId, relatedInstanceList, instanceName, null, cloudConfiguration);
 		SPY_bbInputSetup.populateObjectsOnAssignAndCreateFlows(requestDetails, service, bbName, serviceInstance,
 				lookupKeyMap, resourceId, vnfType);
-
 		verify(SPY_bbInputSetup, times(1)).populateVfModule(modelInfo, service, bbName, serviceInstance, lookupKeyMap,
 				resourceId, relatedInstanceList, instanceName, null, cloudConfiguration);
+		assertEquals("VfModuleId populated", true, lookupKeyMap.get(ResourceKey.VF_MODULE_ID).equalsIgnoreCase(resourceId));
 	}
 
 	@Test
@@ -946,7 +945,6 @@ public class BBInputSetupTest {
 		vg.setVolumeGroupName("volumeGroupName");
 		vg.setVolumeGroupId("volumeGroupId");
 		vnf.getVolumeGroups().add(vg);
-		vnf.getVolumeGroups().add(vg);
 		serviceInstance.getVnfs().add(vnf);
 
 		Service service = mapper.readValue(
@@ -962,9 +960,10 @@ public class BBInputSetupTest {
 		aaiGenericVnf.setModelCustomizationId("vnfModelCustomizationUUID");
 		doReturn(aaiGenericVnf).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
 
+		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
 		SPY_bbInputSetup.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
 				requestDetails.getRelatedInstanceList(), reqInfo.getInstanceName(), null, null);
-		verify(SPY_bbInputSetup, times(2)).mapCatalogVolumeGroup(vg, modelInfo, service, "vnfModelCustomizationUUID");
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVolumeGroup(vg, modelInfo, service, "vnfModelCustomizationUUID");
 		vnf.getVolumeGroups().clear();
 		SPY_bbInputSetup.populateVolumeGroup(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
 				requestDetails.getRelatedInstanceList(), reqInfo.getInstanceName(), null, null);
@@ -1023,14 +1022,14 @@ public class BBInputSetupTest {
 
 		SPY_bbInputSetup.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap,
 				resourceId, null);
-		verify(SPY_bbInputSetup, times(2)).mapCatalogNetwork(network, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogNetwork(network, modelInfo, service);
 
 		instanceName = "networkName2";
 		L3Network network2 = SPY_bbInputSetup.createNetwork(lookupKeyMap, instanceName, resourceId, null);
 		doReturn(network2).when(SPY_bbInputSetup).createNetwork(lookupKeyMap, instanceName, resourceId, null);
 		SPY_bbInputSetup.populateL3Network(instanceName, modelInfo, service, bbName, serviceInstance, lookupKeyMap,
 				resourceId, null);
-		verify(SPY_bbInputSetup, times(1)).mapCatalogNetwork(network2, modelInfo, service);
+		verify(SPY_bbInputSetup, times(2)).mapCatalogNetwork(network2, modelInfo, service);
 	}
 
 	@Test
@@ -1148,8 +1147,15 @@ public class BBInputSetupTest {
 		String resourceId = "123";
 		doReturn(expectedPlatform).when(bbInputSetupMapperLayer).mapRequestPlatform(platform);
 		doReturn(expectedLineOfBusiness).when(bbInputSetupMapperLayer).mapRequestLineOfBusiness(lineOfBusiness);
+		org.onap.aai.domain.yang.GenericVnf vnfAAI = new org.onap.aai.domain.yang.GenericVnf();
+		vnfAAI.setModelCustomizationId("modelCustId");
+		doReturn(vnfAAI).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
 		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf, modelInfo, service);
-		doReturn(null).when(SPY_bbInputSetupUtils).getAAIGenericVnf(any(String.class));
+		org.onap.aai.domain.yang.InstanceGroup instanceGroupAAI = new org.onap.aai.domain.yang.InstanceGroup();
+		doReturn(instanceGroupAAI).when(SPY_bbInputSetupUtils).getAAIInstanceGroup(any());
+		org.onap.so.db.catalog.beans.InstanceGroup catalogInstanceGroup = new org.onap.so.db.catalog.beans.InstanceGroup();
+		doReturn(catalogInstanceGroup).when(SPY_bbInputSetupUtils).getCatalogInstanceGroup(any());
+
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
 
@@ -1157,7 +1163,7 @@ public class BBInputSetupTest {
 
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
-		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(vnf, modelInfo, service);
 
 		instanceName = "vnfName2";
 		GenericVnf vnf2 = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
@@ -1166,11 +1172,14 @@ public class BBInputSetupTest {
 				resourceId, vnfType, null);
 		doNothing().when(SPY_bbInputSetup).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
 		doNothing().when(SPY_bbInputSetup).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+
+		lookupKeyMap.put(ResourceKey.GENERIC_VNF_ID, "genericVnfId2");
+		
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
-		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(vnf2, modelInfo, service);
-		verify(SPY_bbInputSetup, times(1)).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
-		verify(SPY_bbInputSetup, times(1)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+		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);
 	}
 	
 	@Test
@@ -1202,7 +1211,14 @@ public class BBInputSetupTest {
 		String resourceId = "123";
 		doReturn(expectedPlatform).when(bbInputSetupMapperLayer).mapRequestPlatform(platform);
 		doReturn(expectedLineOfBusiness).when(bbInputSetupMapperLayer).mapRequestLineOfBusiness(lineOfBusiness);
+		org.onap.aai.domain.yang.GenericVnf vnfAAI = new org.onap.aai.domain.yang.GenericVnf();
+		vnfAAI.setModelCustomizationId("modelCustId");
+		doReturn(vnfAAI).when(SPY_bbInputSetupUtils).getAAIGenericVnf(vnf.getVnfId());
 		doNothing().when(SPY_bbInputSetup).mapCatalogVnf(vnf, modelInfo, service);
+		org.onap.aai.domain.yang.InstanceGroup instanceGroupAAI = new org.onap.aai.domain.yang.InstanceGroup();
+		doReturn(instanceGroupAAI).when(SPY_bbInputSetupUtils).getAAIInstanceGroup(any());
+		org.onap.so.db.catalog.beans.InstanceGroup catalogInstanceGroup = new org.onap.so.db.catalog.beans.InstanceGroup();
+		doReturn(catalogInstanceGroup).when(SPY_bbInputSetupUtils).getCatalogInstanceGroup(any());
 
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
@@ -1211,20 +1227,24 @@ public class BBInputSetupTest {
 
 		SPY_bbInputSetup.populateGenericVnf(modelInfo, instanceName, platform, lineOfBusiness, service, bbName,
 				serviceInstance, lookupKeyMap, requestDetails.getRelatedInstanceList(), resourceId, vnfType, null);
-		verify(SPY_bbInputSetup, times(2)).mapCatalogVnf(vnf, modelInfo, service);
+		verify(SPY_bbInputSetup, times(1)).mapCatalogVnf(vnf, modelInfo, service);
 
 		instanceName = "vnfName2";
 		GenericVnf vnf2 = SPY_bbInputSetup.createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
 				resourceId, vnfType, null);
 		doReturn(vnf2).when(SPY_bbInputSetup).createGenericVnf(lookupKeyMap, instanceName, platform, lineOfBusiness,
 				resourceId, vnfType, null);
+		org.onap.aai.domain.yang.GenericVnf vnf2AAI = new org.onap.aai.domain.yang.GenericVnf();
+		vnfAAI.setModelCustomizationId("modelCustId2");
+		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(1)).mapCatalogVnf(vnf2, modelInfo, service);
-		verify(SPY_bbInputSetup, times(1)).mapNetworkCollectionInstanceGroup(vnf2, "{instanceGroupId}");
-		verify(SPY_bbInputSetup, times(1)).mapVnfcCollectionInstanceGroup(vnf2, modelInfo, service);
+		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);
 	}
 
 	@Test
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java
index db0f408010..aa883b67a2 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupUtilsTest.java
@@ -773,4 +773,4 @@ public class BBInputSetupUtilsTest {
 		
 		assertEquals(actualVolumeGroup, Optional.empty());
 	}
-}
+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
index 0d00e4d007..e4c8a8f59b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
@@ -12,7 +12,9 @@
 		"heat-stack-id":"heatStackId",
 		"contrail-service-instance-fqdn":"contrailServiceInstanceFqdn",
 		"module-index":1,"selflink":"selflink",
-		"model-info-vf-module":null
+		"model-info-vf-module": {
+			"is-base-boolean":false
+		}
 	}],
 	"volume-groups":[],
 	"line-of-business":null,