diff options
author | Seshu Kumar M <seshu.kumar.m@huawei.com> | 2019-05-06 11:42:51 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-06 11:42:51 +0000 |
commit | 3331b8cd74d48722a10bdb6a7e1fab6569a8305e (patch) | |
tree | a4630264a3ce18cd633058e4b321b8c82298ef23 /asdc-controller | |
parent | beb0927d4ae42fd89bacd53ee90b47f0776279ff (diff) | |
parent | 4fd7200bce3e2addf45dfade43ed901674a82398 (diff) |
Merge "VFModule To HeatTemplateUUID" into dublin
Diffstat (limited to 'asdc-controller')
-rw-r--r-- | asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 6f3e6c2ec0..ad3e2d8161 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 @@ -1181,6 +1181,8 @@ public class ToscaResourceInstaller { vfModuleArtifact.getArtifactInfo().getArtifactUUID()); heatTemplate.setParameters(heatParam); vfModuleArtifact.setHeatTemplate(heatTemplate); + } else { + vfModuleArtifact.setHeatTemplate(existingHeatTemplate); } } @@ -1209,6 +1211,8 @@ public class ToscaResourceInstaller { heatEnvironment.setArtifactChecksum(MANUAL_RECORD); } vfModuleArtifact.setHeatEnvironment(heatEnvironment); + } else { + vfModuleArtifact.setHeatEnvironment(existingHeatEnvironment); } } @@ -1233,7 +1237,8 @@ public class ToscaResourceInstaller { heatFile.setArtifactChecksum(MANUAL_RECORD); } vfModuleArtifact.setHeatFiles(heatFile); - + } else { + vfModuleArtifact.setHeatFiles(existingHeatFiles); } } |