Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
added generic fabric support to SO
[so.git] / bpmn / MSOCommonBPMN / src / test / java / org / onap / so / bpmn / servicedecomposition / tasks / BBInputSetupTest.java
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 daa6304..a5795f9 100644 (file)
--- 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
@@ -66,6 +66,7 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceSubscription;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
 import org.onap.so.bpmn.servicedecomposition.entities.BuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ConfigurationResourceKeys;
 import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
@@ -425,7 +426,7 @@ public class BBInputSetupTest {
 
                doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
                doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-                               project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+                               project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
                                executeBB.getBuildingBlock().getBpmnFlowName());
                doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
                                executeBB, requestAction, customer);
@@ -475,7 +476,7 @@ public class BBInputSetupTest {
                doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
                doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
                doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-                               project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+                               project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
                                executeBB.getBuildingBlock().getBpmnFlowName());
                doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
                                executeBB, requestAction,customer);
@@ -518,7 +519,7 @@ public class BBInputSetupTest {
                doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
                doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
                doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-                               null, null, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+                               null, null, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
                                executeBB.getBuildingBlock().getBpmnFlowName());
                doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
                                executeBB, requestAction,customer);
@@ -658,8 +659,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 +676,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 +685,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 +946,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 +961,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 +1023,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
@@ -1075,28 +1075,32 @@ public class BBInputSetupTest {
                Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
                lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
                String bbName = AssignFlows.FABRIC_CONFIGURATION.toString();
+               ConfigurationResourceKeys configResourceKeys = new ConfigurationResourceKeys();
+               configResourceKeys.setCvnfcCustomizationUUID("cvnfcCustomizationUUID");
+               configResourceKeys.setVfModuleCustomizationUUID("vfModuleCustomizationUUID");
+               configResourceKeys.setVnfResourceCustomizationUUID("vnfResourceCustomizationUUID");
 
-               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration, modelInfo, service);
+               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration, modelInfo, service, configResourceKeys);
 
                SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
-                               instanceName);
-               verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration, modelInfo, service);
+                               instanceName, configResourceKeys);
+               verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration, modelInfo, service, configResourceKeys);
                
                lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, null);
 
                SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
-                               instanceName);
-               verify(SPY_bbInputSetup, times(2)).mapCatalogConfiguration(configuration, modelInfo, service);
+                               instanceName, configResourceKeys);
+               verify(SPY_bbInputSetup, times(2)).mapCatalogConfiguration(configuration, modelInfo, service, configResourceKeys);
 
                instanceName = "configurationName2";
                resourceId = "resourceId2";
                lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId2");
                Configuration configuration2 = SPY_bbInputSetup.createConfiguration(lookupKeyMap, instanceName, resourceId);
                doReturn(configuration2).when(SPY_bbInputSetup).createConfiguration(lookupKeyMap, instanceName, resourceId);
-               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration2, modelInfo, service);
+               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(configuration2, modelInfo, service, configResourceKeys);
                SPY_bbInputSetup.populateConfiguration(modelInfo, service, bbName, serviceInstance, lookupKeyMap, resourceId,
-                               instanceName);
-               verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration2, modelInfo, service);
+                               instanceName, configResourceKeys);
+               verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(configuration2, modelInfo, service, configResourceKeys);
        }
 
        @Test
@@ -1148,8 +1152,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 +1168,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 +1177,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 +1216,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 +1232,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
@@ -1646,6 +1671,12 @@ public class BBInputSetupTest {
                String vnfType = "vnfType";
                Service service = Mockito.mock(Service.class);
                String requestAction = "createInstance";
+
+               ConfigurationResourceKeys configResourceKeys = new ConfigurationResourceKeys();
+               configResourceKeys.setCvnfcCustomizationUUID("cvnfcCustomizationUUID");
+               configResourceKeys.setVfModuleCustomizationUUID("vfModuleCustomizationUUID");
+               configResourceKeys.setVnfResourceCustomizationUUID("vnfResourceCustomizationUUID");
+               executeBB.setConfigurationResourceKeys(configResourceKeys);
                doReturn(gBB).when(SPY_bbInputSetup).getGBBALaCarteService(executeBB, requestDetails, lookupKeyMap,
                                requestAction, resourceId);
                doReturn(request).when(SPY_bbInputSetupUtils).getInfraActiveRequest(executeBB.getRequestId());
@@ -1694,13 +1725,13 @@ public class BBInputSetupTest {
                doReturn(configurationCustList).when(service).getConfigurationCustomizations();
                configurationCustList.add(configurationCust);
                doNothing().when(SPY_bbInputSetup).populateConfiguration(isA(ModelInfo.class), isA(Service.class), 
-                               any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class));
+                               any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class), isA(ConfigurationResourceKeys.class));
                
                executeBB.getBuildingBlock().setBpmnFlowName("AssignFabricConfigurationBB");
                executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
                SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
                verify(SPY_bbInputSetup, times(1)).populateConfiguration(isA(ModelInfo.class), isA(Service.class), 
-                               any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class));
+                               any(String.class), isA(ServiceInstance.class), any(), any(String.class), any(String.class), isA(ConfigurationResourceKeys.class));
        }
        
        @Test
@@ -1978,6 +2009,13 @@ public class BBInputSetupTest {
                lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, "volumeGroupId");
                lookupKeyMap.put(ResourceKey.SERVICE_INSTANCE_ID, "serviceInstanceId");
                lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, "configurationId");
+
+               ConfigurationResourceKeys configResourceKeys = new ConfigurationResourceKeys();
+               configResourceKeys.setCvnfcCustomizationUUID("cvnfcCustomizationUUID");
+               configResourceKeys.setVfModuleCustomizationUUID("vfModuleCustomizationUUID");
+               configResourceKeys.setVnfResourceCustomizationUUID("vnfResourceCustomizationUUID");
+               executeBB.setConfigurationResourceKeys(configResourceKeys);
+               
                String resourceId = "123";
                String vnfType = "vnfType";
                Service service = Mockito.mock(Service.class);
@@ -2017,6 +2055,7 @@ public class BBInputSetupTest {
                                executeBB.getBuildingBlock().getBpmnFlowName(), "ab153b6e-c364-44c0-bef6-1f2982117f04", gBB, service);
                executeBB.getBuildingBlock().setBpmnFlowName(AssignFlows.FABRIC_CONFIGURATION.toString());
                executeBB.getBuildingBlock().setKey("modelCustId");
+               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(isA(Configuration.class), isA(ModelInfo.class), isA(Service.class), isA(ConfigurationResourceKeys.class));
                SPY_bbInputSetup.getGBBMacro(executeBB, requestDetails, lookupKeyMap, requestAction, resourceId, vnfType);
                verify(SPY_bbInputSetup, times(1)).getGBBMacroNoUserParamsCreate(executeBB, lookupKeyMap,
                                executeBB.getBuildingBlock().getBpmnFlowName(), "modelCustId", gBB, service);
@@ -2147,6 +2186,12 @@ public class BBInputSetupTest {
                cloudConfiguration.setLcpCloudRegionId("cloudRegionId");
                String requestAction = "unassignInstance";
 
+               ConfigurationResourceKeys configResourceKeys = new ConfigurationResourceKeys();
+               configResourceKeys.setCvnfcCustomizationUUID("cvnfcCustomizationUUID");
+               configResourceKeys.setVfModuleCustomizationUUID("vfModuleCustomizationUUID");
+               configResourceKeys.setVnfResourceCustomizationUUID("vnfResourceCustomizationUUID");
+               executeBB.setConfigurationResourceKeys(configResourceKeys);
+               
                L3Network network = new L3Network();
                network.setNetworkId("networkId");
                gBB.getServiceInstance().getNetworks().add(network);
@@ -2221,13 +2266,14 @@ public class BBInputSetupTest {
                org.onap.aai.domain.yang.Configuration aaiConfiguration = new org.onap.aai.domain.yang.Configuration();
                aaiConfiguration.setModelCustomizationId("modelCustId");
                doReturn(aaiConfiguration).when(SPY_bbInputSetupUtils).getAAIConfiguration(configuration.getConfigurationId());
+               doNothing().when(SPY_bbInputSetup).mapCatalogConfiguration(isA(Configuration.class), isA(ModelInfo.class), isA(Service.class), isA(ConfigurationResourceKeys.class));
                
                executeBB.getBuildingBlock().setBpmnFlowName("ActivateFabricConfigurationBB");
                executeBB.getBuildingBlock().setKey("72d9d1cd-f46d-447a-abdb-451d6fb05fa9");
                SPY_bbInputSetup.getGBBMacroExistingService(executeBB, lookupKeyMap,
                                executeBB.getBuildingBlock().getBpmnFlowName(), gBB, service, requestAction, cloudConfiguration);
                verify(SPY_bbInputSetup, times(1)).mapCatalogConfiguration(any(Configuration.class), any(ModelInfo.class),
-                               any(Service.class));
+                               any(Service.class), isA(ConfigurationResourceKeys.class));
        }
 
        @Test
Service Orchestrator