diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2023-01-31 17:13:55 +0000 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2023-02-01 10:23:31 +0000 |
| commit | 46a9238f48695d25066e2e351c275f0594f2eb9a (patch) | |
| tree | 048447f601eea9b4c2ad6d1c38ae95a0f157890b /catalog-model/src/main/java/org | |
| parent | 42d3f9feb3884301f839b55c6ed9244f051daa06 (diff) | |
Stop auto-generation of inputs from substitution mapping node
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I0ecdfe1f22790b0fc23fa99b9a85cdaca3b23515
Issue-ID: SDC-4361
Diffstat (limited to 'catalog-model/src/main/java/org')
2 files changed, 4 insertions, 3 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/config/ContainerInstanceTypesData.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/config/ContainerInstanceTypesData.java index 7bf528105c..75a0cd625e 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/config/ContainerInstanceTypesData.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/config/ContainerInstanceTypesData.java @@ -27,6 +27,7 @@ import org.apache.commons.collections4.MapUtils; import org.openecomp.sdc.be.config.ConfigurationManager; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; +import org.openecomp.sdc.common.api.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -74,12 +75,12 @@ public class ContainerInstanceTypesData { /** * Gets the list of allowed component instances for a service of the given model. * - * @param model the model + * @param modelName the model * @return the list of allowed component instances */ public List<String> getServiceAllowedList(final String modelName) { List<String> allowedInstanceResourceType = getComponentAllowedList(ComponentTypeEnum.SERVICE, null); - if (modelName == null || modelName.isEmpty() || modelName.equals("SDC AID")){ + if (modelName == null || modelName.isEmpty() || modelName.equals(Constants.DEFAULT_MODEL_NAME)){ allowedInstanceResourceType.remove("VFC"); } return allowedInstanceResourceType; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java index ceb505ac3c..31aea03a8e 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java @@ -1534,7 +1534,7 @@ public class ToscaOperationFacade { if (StorageOperationStatus.OK == status) { log.debug(COMPONENT_CREATED_SUCCESSFULLY); List<InputDefinition> inputsResList = null; - if (inputsAsDataDef != null && !inputsAsDataDef.isEmpty()) { + if (CollectionUtils.isNotEmpty(inputsAsDataDef)) { inputsResList = inputsAsDataDef.stream().map(InputDefinition::new).collect(Collectors.toList()); } return Either.left(inputsResList); |