diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java | 16 |
1 files changed, 10 insertions, 6 deletions
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 0f1bf4603d..f78b7dfead 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 @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Set; import org.openecomp.sdc.be.config.BeEcompErrorManager; -import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig; +import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.impl.ComponentsUtils; @@ -177,13 +177,17 @@ public class ArtifactTemplateInfo { String correctType = type; if (type.equalsIgnoreCase(CSAR_NESTED)) correctType = ArtifactTypeEnum.HEAT_NESTED.getType(); - else if ((type.equalsIgnoreCase(CSAR_VOLUME))) + else if (type.equalsIgnoreCase(CSAR_VOLUME)) correctType = ArtifactTypeEnum.HEAT_VOL.getType(); - else if ((type.equalsIgnoreCase(CSAR_NETWORK))) + else if (type.equalsIgnoreCase(CSAR_NETWORK)) correctType = ArtifactTypeEnum.HEAT_NET.getType(); - else if ((type.equalsIgnoreCase(CSAR_ARTIFACT))) - correctType = ArtifactTypeEnum.HEAT_ARTIFACT.getType(); - else if ((type.equalsIgnoreCase(CSAR_HEAT))) + else if (type.equalsIgnoreCase(CSAR_ARTIFACT)){ + if( parentArtifact != null) + correctType = ArtifactTypeEnum.HEAT_ARTIFACT.getType(); + else + correctType = resourceInfo.type; + } + else if (type.equalsIgnoreCase(CSAR_HEAT)) correctType = ArtifactTypeEnum.HEAT.getType(); else correctType = ArtifactTypeEnum.OTHER.getType(); |