Merge "image correction in the Workspace section"

[so.git] / bpmn / MSOCommonBPMN / src / main / java / org / onap / so / bpmn / servicedecomposition / tasks / BBInputSetupMapperLayer.java

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 abd7ed5..877d5bb 100644 (file)
--- 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
@@ -76,6 +76,7 @@ import org.onap.so.db.catalog.beans.OrchestrationStatus;
 import org.onap.so.db.catalog.beans.Service;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.db.catalog.beans.VnfVfmoduleCvnfcConfigurationCustomization;
 import org.onap.so.logger.MsoLogger;
 import org.onap.so.serviceinstancebeans.CloudConfiguration;
 import org.onap.so.serviceinstancebeans.RequestDetails;
@@ -142,6 +143,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 +180,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);
@@ -450,11 +455,13 @@ public class BBInputSetupMapperLayer {
        }
 
        protected ModelInfoConfiguration mapCatalogConfigurationToConfiguration(
-                       ConfigurationResourceCustomization configurationResourceCustomization) {
+                       ConfigurationResourceCustomization configurationResourceCustomization, 
+                       VnfVfmoduleCvnfcConfigurationCustomization vnfVfmoduleCvnfcConfigurationCustomization) {
                ModelInfoConfiguration modelInfoConfiguration = new ModelInfoConfiguration();
                modelInfoConfiguration.setModelVersionId(configurationResourceCustomization.getConfigurationResource().getModelUUID());
                modelInfoConfiguration.setModelCustomizationId(configurationResourceCustomization.getModelCustomizationUUID());
                modelInfoConfiguration.setModelInvariantId(configurationResourceCustomization.getConfigurationResource().getModelInvariantUUID());
+               modelInfoConfiguration.setPolicyName(vnfVfmoduleCvnfcConfigurationCustomization.getPolicyName());
                return modelInfoConfiguration;
        }
 
@@ -462,4 +469,4 @@ public class BBInputSetupMapperLayer {
                        CollectionNetworkResourceCustomization collectionNetworkResourceCust) {
                return modelMapper.map(collectionNetworkResourceCust, NetworkResourceCustomization.class);
        }
-}
+}
\ No newline at end of file