aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJvD_Ericsson <jeff.van.dam@est.tech>2023-06-16 14:56:52 +0100
committerMichael Morris <michael.morris@est.tech>2023-06-16 16:05:27 +0000
commite72d1667c08d3f018b483cebfb077108206b5e49 (patch)
tree2ae9825160841194d23e1eaaf09dcec99ac7a3c4
parentdecb69997badb5c8de17268ca0c9bccf93f937e3 (diff)
Fix normative VFCs being set to non normative during service import
Issue-ID: SDC-4541 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Change-Id: I711a4a157b0ad9ee43df707a224a28fc056927c4
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java
index 3bfa76dc49..7d2f8c3170 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java
@@ -488,6 +488,9 @@ public class ServiceImportBusinessLogic {
Map<String, Object> combinedMappedToscaTemplate =
getNewChangesToToscaTemplate(newMappedToscaTemplate, (Map<String, Object>) existingMappedToscaTemplate.getValue());
if (!combinedMappedToscaTemplate.equals(existingMappedToscaTemplate.getValue())) {
+ if (latestResource.getComponentMetadataDefinition().getMetadataDataDefinition().isNormative()) {
+ nodeTypeDefinition.getNodeTypeMetadata().setNormative(true);
+ }
existingMappedToscaTemplate.setValue(combinedMappedToscaTemplate);
nodeTypeDefinition.setMappedNodeType(existingMappedToscaTemplate);
namesOfNodeTypesToCreate.add(nodeTypeDefinition);