From: Merkel, Jeff <jeff.merkel@att.com>
Date: Sun, 5 May 2019 15:14:39 +0000 (-0400)
Subject: VFModule To HeatTemplateUUID
X-Git-Tag: 1.4.1~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4fd7200bce3e2addf45dfade43ed901674a82398;p=so.git

VFModule To HeatTemplateUUID

- Set existing Heat files on the vfModuleArtifact.

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

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 4e97b5f290..1a8026424a 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
@@ -1180,6 +1180,8 @@ public class ToscaResourceInstaller {
                     vfModuleArtifact.getArtifactInfo().getArtifactUUID());
             heatTemplate.setParameters(heatParam);
             vfModuleArtifact.setHeatTemplate(heatTemplate);
+        } else {
+            vfModuleArtifact.setHeatTemplate(existingHeatTemplate);
         }
     }
 
@@ -1208,6 +1210,8 @@ public class ToscaResourceInstaller {
                 heatEnvironment.setArtifactChecksum(MANUAL_RECORD);
             }
             vfModuleArtifact.setHeatEnvironment(heatEnvironment);
+        } else {
+            vfModuleArtifact.setHeatEnvironment(existingHeatEnvironment);
         }
     }
 
@@ -1232,7 +1236,8 @@ public class ToscaResourceInstaller {
                 heatFile.setArtifactChecksum(MANUAL_RECORD);
             }
             vfModuleArtifact.setHeatFiles(heatFile);
-
+        } else {
+            vfModuleArtifact.setHeatFiles(existingHeatFiles);
         }
     }