Merge "VFModule To HeatTemplateUUID" into dublin

diff --combined asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index 6f3e6c2,1a80264..ad3e2d8
--- 1/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
--- 2/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
@@@ -85,7 -85,6 +85,7 @@@ import org.onap.so.db.catalog.beans.Hea
  import org.onap.so.db.catalog.beans.HeatFiles;
  import org.onap.so.db.catalog.beans.HeatTemplate;
  import org.onap.so.db.catalog.beans.HeatTemplateParam;
 +import org.onap.so.db.catalog.beans.InstanceGroup;
  import org.onap.so.db.catalog.beans.InstanceGroupType;
  import org.onap.so.db.catalog.beans.NetworkCollectionResourceCustomization;
  import org.onap.so.db.catalog.beans.NetworkInstanceGroup;
@@@ -1181,6 -1180,8 +1181,8 @@@ public class ToscaResourceInstaller 
                      vfModuleArtifact.getArtifactInfo().getArtifactUUID());
              heatTemplate.setParameters(heatParam);
              vfModuleArtifact.setHeatTemplate(heatTemplate);
+         } else {
+             vfModuleArtifact.setHeatTemplate(existingHeatTemplate);
          }
      }
  
@@@ -1209,6 -1210,8 +1211,8 @@@
                  heatEnvironment.setArtifactChecksum(MANUAL_RECORD);
              }
              vfModuleArtifact.setHeatEnvironment(heatEnvironment);
+         } else {
+             vfModuleArtifact.setHeatEnvironment(existingHeatEnvironment);
          }
      }
  
@@@ -1233,7 -1236,8 +1237,8 @@@
                  heatFile.setArtifactChecksum(MANUAL_RECORD);
              }
              vfModuleArtifact.setHeatFiles(heatFile);
- 
+         } else {
+             vfModuleArtifact.setHeatFiles(existingHeatFiles);
          }
      }
  
@@@ -1725,25 -1729,16 +1730,25 @@@
              VnfResourceCustomization vnfResourceCustomization, ToscaResourceStructure toscaResourceStructure) {
  
          Metadata instanceMetadata = group.getMetadata();
 -        // Populate InstanceGroup
 +
 +        InstanceGroup existingInstanceGroup =
 +                instanceGroupRepo.findByModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
 +
          VFCInstanceGroup vfcInstanceGroup = new VFCInstanceGroup();
  
 -        vfcInstanceGroup.setModelName(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
 -        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.setRole("SUB-INTERFACE"); // Set Role
 -        vfcInstanceGroup.setType(InstanceGroupType.VNFC); // Set type
 +        if (existingInstanceGroup == null) {
 +            // Populate InstanceGroup
 +            vfcInstanceGroup.setModelName(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
 +            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.setRole("SUB-INTERFACE"); // Set Role
 +            vfcInstanceGroup.setType(InstanceGroupType.VNFC); // Set type
 +        } else {
 +            vfcInstanceGroup = (VFCInstanceGroup) existingInstanceGroup;
 +        }
  
          // Populate VNFCInstanceGroupCustomization
          VnfcInstanceGroupCustomization vfcInstanceGroupCustom = new VnfcInstanceGroupCustomization();