summaryrefslogtreecommitdiffstats
path: root/asdc-controller
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2020-03-05 12:43:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-05 12:43:12 +0000
commit93fd7052a09fecf632bfde52debc772b1686d634 (patch)
tree4730e258c8b3b552cf0384611ae1f89a173d0f1f /asdc-controller
parent7949aa8a0dcb860197310edb928bfa70f25a3f2b (diff)
parent64ddfcc11cdbc6994d685dd2c6029cb289e860f8 (diff)
Merge "mso to store the heat template timeout minutes and"
Diffstat (limited to 'asdc-controller')
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java3
1 files changed, 3 insertions, 0 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 3175839725..1c7ebb7d9a 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
@@ -1297,6 +1297,9 @@ public class ToscaResourceInstaller {
heatTemplate.setParameters(heatParam);
vfModuleArtifact.setHeatTemplate(heatTemplate);
} else {
+ if (vfModuleArtifact.getArtifactInfo().getArtifactTimeout() != null) {
+ existingHeatTemplate.setTimeoutMinutes(vfModuleArtifact.getArtifactInfo().getArtifactTimeout());
+ }
vfModuleArtifact.setHeatTemplate(existingHeatTemplate);
}
}