diff options
| author |   Sithara Nambiar <sitharav.aredath@huawei.com> | 2020-09-29 23:10:17 +0530 |
|---|---|---|
| committer | Sithara Nambiar <sitharav.aredath@huawei.com> | 2020-10-03 15:03:26 +0530 |
| commit | c0cd58244635c610c604066e9542058b310a706d (patch) | |
| tree | c9a2c2dd6608ce153549aa3b399ab4d952c60fe7 /catalog-be/src/main/java | |
| parent | 0fa53516c409ac136f654475c1e41c77cad9cf09 (diff) | |
sdc changes for identifying helm package as a vfm
Issue-ID: REQ-341
Signed-off-by: Sithara Nambiar <sitharav.aredath@huawei.com>
Change-Id: Ide4736655c01dd25dae5afe1207a292a6bcd6951
Diffstat (limited to 'catalog-be/src/main/java')
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java index ffccc978db..baa794c6cc 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java @@ -859,7 +859,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic { if (!type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_ENV.getType())) { finalDeploymentArtifacts.put(artifact.getArtifactLabel(), artifact); } - if (type.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT.getType())) { + if (type.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HELM.getType())|| type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT.getType())) { artifact.setTimeout(defaultHeatTimeout); } else { continue; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java index 21589e0723..ab088ec3d8 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java @@ -59,6 +59,7 @@ public class ArtifactTemplateInfo { private static final String ARTIFACT_TEMPLATE_ENV = "env"; private static final String IS_BASE = "isBase"; private static final String CSAR_HEAT = "HEAT"; + private static final String CSAR_HELM = "HELM"; private static final String CSAR_NETWORK = "network"; private static final String CSAR_VOLUME = "volume"; private static final String CSAR_NESTED = "nested"; @@ -140,6 +141,9 @@ public class ArtifactTemplateInfo { else if (type.equalsIgnoreCase(CSAR_HEAT)) { correctType = ArtifactTypeEnum.HEAT.getType(); } + else if (type.equalsIgnoreCase(CSAR_HELM)) { + correctType = ArtifactTypeEnum.HELM.getType(); + } else { correctType = ArtifactTypeEnum.OTHER.getType(); } |