X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=asdc-controller%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fasdc%2Finstaller%2Fheat%2FToscaResourceInstaller.java;h=c8f7f054364e31e08dae749085b9733d865a4f63;hb=7a121bf70f9547fc381766be131e635c7519b5e2;hp=1fca9d3ff2924a84df617032b22ac42e89054bc6;hpb=6c293059a4b4bfc5033c0fe6298d83df990828ce;p=so.git

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index 1fca9d3ff2..c8f7f05436 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -347,38 +347,47 @@ public class ToscaResourceInstaller {
 		}
 	}
 
-	protected void processNetworks(ToscaResourceStructure toscaResourceStruct, Service service)
-			throws ArtifactInstallerException {
-		List<NodeTemplate> nodeTemplatesVLList = toscaResourceStruct.getSdcCsarHelper().getServiceVlList();
-
-		if (nodeTemplatesVLList != null) {
-			for (NodeTemplate vlNode : nodeTemplatesVLList) {
-				String networkResourceModelName = vlNode.getMetaData()
-						.getValue(SdcPropertyNames.PROPERTY_NAME_NAME);
-				
-				TempNetworkHeatTemplateLookup tempNetworkLookUp = tempNetworkLookupRepo.findFirstBynetworkResourceModelName(networkResourceModelName);
-				
-				if (tempNetworkLookUp != null ) {					
-						HeatTemplate heatTemplate =  heatRepo.findByArtifactUuid(tempNetworkLookUp.getHeatTemplateArtifactUuid());
-						if (heatTemplate != null ) {
-						NetworkResourceCustomization networkCustomization = createNetwork(vlNode, toscaResourceStruct, heatTemplate,tempNetworkLookUp.getAicVersionMax(),
-							tempNetworkLookUp.getAicVersionMin(),service);
-						service.getNetworkCustomizations()
-						.add(networkCustomization);
-					}
-					else{
-						throw new ArtifactInstallerException(					
-							"No HeatTemplate found for artifactUUID: "
-									+ tempNetworkLookUp.getHeatTemplateArtifactUuid());
-					}
-				} else {
-					throw new ArtifactInstallerException(
-							"No NetworkResourceName found in TempNetworkHeatTemplateLookup for "
-									+ networkResourceModelName);
-				}					
-				
-			}
-		}
+    protected void processNetworks (ToscaResourceStructure toscaResourceStruct,
+                                    Service service) throws ArtifactInstallerException {
+        List <NodeTemplate> nodeTemplatesVLList = toscaResourceStruct.getSdcCsarHelper ().getServiceVlList ();
+
+        if (nodeTemplatesVLList != null) {
+            for (NodeTemplate vlNode : nodeTemplatesVLList) {
+                String networkResourceModelName = vlNode.getMetaData ().getValue (SdcPropertyNames.PROPERTY_NAME_NAME);
+
+                TempNetworkHeatTemplateLookup tempNetworkLookUp =
+                                                                tempNetworkLookupRepo.findFirstBynetworkResourceModelName (networkResourceModelName);
+
+                if (tempNetworkLookUp != null) {
+                    HeatTemplate heatTemplate =
+                                              heatRepo.findByArtifactUuid (tempNetworkLookUp.getHeatTemplateArtifactUuid ());
+                    if (heatTemplate != null) {
+                        NetworkResourceCustomization networkCustomization =
+                                                                          createNetwork (vlNode,
+                                                                                         toscaResourceStruct,
+                                                                                         heatTemplate,
+                                                                                         tempNetworkLookUp.getAicVersionMax (),
+                                                                                         tempNetworkLookUp.getAicVersionMin (),
+                                                                                         service);
+                        service.getNetworkCustomizations ().add (networkCustomization);
+                    } else {
+                        throw new ArtifactInstallerException ("No HeatTemplate found for artifactUUID: "
+                                                              + tempNetworkLookUp.getHeatTemplateArtifactUuid ());
+                    }
+                } else {
+                    NetworkResourceCustomization networkCustomization = createNetwork (vlNode,
+                                                                                       toscaResourceStruct,
+                                                                                       null,
+                                                                                       null,
+                                                                                       null,
+                                                                                       service);
+                    service.getNetworkCustomizations().add (networkCustomization);
+                    logger.debug ("No NetworkResourceName found in TempNetworkHeatTemplateLookup for "
+                                  + networkResourceModelName);
+                }
+
+            }
+        }
 	}
 
 	protected void processAllottedResources(ToscaResourceStructure toscaResourceStruct, Service service,
@@ -488,23 +497,24 @@ public class ToscaResourceInstaller {
 							.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);
 					IVfModuleData vfMetadata = vfModuleStructure.getVfModuleMetadata();	
 					
-					logger.debug("Comparing VFModule Metadata CustomizationUUID : " + vfMetadata.getVfModuleModelCustomizationUUID());
-					for(Group group : vfGroups){
-						logger.debug("To Group VFModuleModelCustomizationUUID " + group.getMetadata().getValue("vfModuleModelCustomizationUUID"));
-					}
+					logger.debug("Comparing Vf_Modules_Metadata CustomizationUUID : " + vfMetadata.getVfModuleModelCustomizationUUID());
 					
-					Optional<org.onap.sdc.toscaparser.api.Group> matchingObject = vfGroups.stream().
-						    filter(group -> group.getMetadata().getValue("vfModuleModelCustomizationUUID").equals(vfMetadata.getVfModuleModelCustomizationUUID())).
-						    findFirst();
+					Optional<org.onap.sdc.toscaparser.api.Group> matchingObject = vfGroups.stream()
+							.peek(group -> logger.debug("To Csar Group VFModuleModelCustomizationUUID " + group.getMetadata().getValue("vfModuleModelCustomizationUUID")))
+						    .filter(group -> group.getMetadata().getValue("vfModuleModelCustomizationUUID").equals(vfMetadata.getVfModuleModelCustomizationUUID()))
+						    .findFirst();
 					if(matchingObject.isPresent()){
 						VfModuleCustomization vfModuleCustomization = createVFModuleResource(matchingObject.get(), nodeTemplate, toscaResourceStruct, 
 																							 vfResourceStructure,vfMetadata, vnfResource, service, existingCvnfcSet, existingVnfcSet);
 						vfModuleCustomization.getVfModule().setVnfResources(vnfResource.getVnfResources());
 					}else
-						throw new Exception("Cannot find matching VFModule Customization for VF Module Metadata: " + vfMetadata.getVfModuleModelCustomizationUUID());
+						throw new Exception("Cannot find matching VFModule Customization in Csar for Vf_Modules_Metadata: " + vfMetadata.getVfModuleModelCustomizationUUID());
 					
 				}
 				service.getVnfCustomizations().add(vnfResource);
+			} else{
+				logger.debug("Notification VF ResourceCustomizationUUID: " + vfNotificationResource.getResourceCustomizationUUID() + " doesn't match " +
+						     "Tosca VF Customization UUID: " +  vfCustomizationUUID);
 			}
 		}
 	}
@@ -1152,7 +1162,7 @@ public class ToscaResourceInstaller {
 			vfcInstanceGroup.setModelInvariantUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
 			vfcInstanceGroup.setModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
 			vfcInstanceGroup.setModelVersion(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
-		vfcInstanceGroup.setToscaNodeType(group.getType());
+			vfcInstanceGroup.setToscaNodeType(group.getType());
 			vfcInstanceGroup.setRole("SUB-INTERFACE");   // Set Role
 			vfcInstanceGroup.setType(InstanceGroupType.VNFC);  // Set type	
 			
@@ -1169,27 +1179,7 @@ public class ToscaResourceInstaller {
 		return vfcInstanceGroupCustom;
 
 	}
-	
-	protected VFCInstanceGroup findExistingVnfcInstanceGroup(VnfResourceCustomization vnfResourceCustomization,
-			String modelUUID) {
-		VFCInstanceGroup vfcInstanceGroup = null;
-		List<VnfcInstanceGroupCustomization> vnfInstanceGroupCustomizations = vnfResourceCustomization
-				.getVnfcInstanceGroupCustomizations();
-		if(vnfInstanceGroupCustomizations != null){
-			for (VnfcInstanceGroupCustomization vnfcInstanceGroupCustom : vnfResourceCustomization
-					.getVnfcInstanceGroupCustomizations()) {
-				if (vnfcInstanceGroupCustom.getInstanceGroup() != null
-						&& vnfcInstanceGroupCustom.getInstanceGroup().getModelUUID().equals(modelUUID)) {
-					vfcInstanceGroup = (VFCInstanceGroup)vnfcInstanceGroupCustom.getInstanceGroup();
-				}
-			}
-		}
-		if (vfcInstanceGroup == null)
-			vfcInstanceGroup = (VFCInstanceGroup) instanceGroupRepo.findByModelUUID(modelUUID);
-
-		return vfcInstanceGroup;
-	}
-	
+		
 	protected VfModuleCustomization createVFModuleResource(Group group, NodeTemplate nodeTemplate,
 			ToscaResourceStructure toscaResourceStructure, VfResourceStructure vfResourceStructure,
 			IVfModuleData vfModuleData, VnfResourceCustomization vnfResource, Service service, Set<CvnfcCustomization> existingCvnfcSet, Set<VnfcCustomization> existingVnfcSet) {
@@ -1203,7 +1193,7 @@ public class ToscaResourceInstaller {
 			if(vfModule==null)
 				vfModule=createVfModule(group, toscaResourceStructure, vfModuleData, vfMetadata);
 			
-			vfModuleCustomization = createVfModuleCustomzation(group, toscaResourceStructure, vfModule, vfModuleData);
+			vfModuleCustomization = createVfModuleCustomization(group, toscaResourceStructure, vfModule, vfModuleData);
 			setHeatInformationForVfModule(toscaResourceStructure, vfResourceStructure, vfModule, vfModuleCustomization,
 					vfMetadata);
 			vfModuleCustomization.setVfModule(vfModule);
@@ -1418,7 +1408,7 @@ public class ToscaResourceInstaller {
 		return vfModule;
 	}
 
-	protected VfModuleCustomization createVfModuleCustomzation(Group group,
+	protected VfModuleCustomization createVfModuleCustomization(Group group,
 			ToscaResourceStructure toscaResourceStructure, VfModule vfModule, IVfModuleData vfModuleData) {
 		VfModuleCustomization vfModuleCustomization = new VfModuleCustomization();
 		
@@ -1605,16 +1595,10 @@ public class ToscaResourceInstaller {
 				
 			for (Group group : groupList) { 
 				
-				VFCInstanceGroup vfcInstanceGroup = findExistingVnfcInstanceGroup(vnfResourceCustomization,
-						group.getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
-				if(vfcInstanceGroup == null){
-					VnfcInstanceGroupCustomization vnfcInstanceGroupCustomization = createVNFCInstanceGroup(
-							vfNodeTemplate, group, vnfResourceCustomization);
-				
-					vnfcInstanceGroupCustomizationRepo.saveAndFlush(vnfcInstanceGroupCustomization);
-				}
-			}
-			
+					VnfcInstanceGroupCustomization vnfcInstanceGroupCustomization = createVNFCInstanceGroup(vfNodeTemplate, group, vnfResourceCustomization);
+					
+					vnfcInstanceGroupCustomizationRepo.saveAndFlush(vnfcInstanceGroupCustomization);				
+			}			
 		}
 		return vnfResourceCustomization;
 	}
@@ -1693,6 +1677,8 @@ public class ToscaResourceInstaller {
 				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
 		vnfResource.setAicVersionMin(
 				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MININSTANCES)));
+		vnfResource.setCategory(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));
+		vnfResource.setSubCategory(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));
 		
 		return vnfResource;
 	}