Fix Substitution Mapping for inputs created independently

Issue-ID: SDC-3515
Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
Change-Id: I90e489ac7f7a244d1338d0d6f6c3c2413a131fcc

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
index 5b197de..2f43a5b 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
@@ -955,6 +955,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
                 }
             }
 
+            newInputDefinition.setMappedToComponentProperty(false);
             Either<InputDefinition, StorageOperationStatus> addInputEither =
                 toscaOperationFacade.addInputToComponent(inputName, newInputDefinition, component);
 

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index ab87b5e..9664ccd 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -1866,7 +1866,7 @@ public class ToscaExportHandler {
         if (component == null || CollectionUtils.isEmpty(component.getInputs())) {
             return Collections.emptyMap();
         }
-        return component.getInputs().stream()
+        return component.getInputs().stream().filter(input -> input.isMappedToComponentProperty())
             .map(PropertyDataDefinition::getName)
             .collect(
                 Collectors.toMap(

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
index 3f68a3c..3a0d08c 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java
@@ -53,6 +53,7 @@ public class PropertyDataDefinition extends ToscaDataDefinition {
     private String value;
     private String label;
     private Boolean immutable = Boolean.FALSE;
+    private Boolean mappedToComponentProperty = Boolean.TRUE;
 
     private String inputPath;
     private String status;
@@ -102,6 +103,7 @@ public class PropertyDataDefinition extends ToscaDataDefinition {
         this.setHidden(propertyDataDefinition.isHidden());
         this.setLabel(propertyDataDefinition.getLabel());
         this.setImmutable(propertyDataDefinition.isImmutable());
+        this.setMappedToComponentProperty(propertyDataDefinition.isMappedToComponentProperty());
         this.setParentUniqueId(propertyDataDefinition.getParentUniqueId());
         this.setOwnerId(propertyDataDefinition.getOwnerId());
         this.setGetInputValues(propertyDataDefinition.getGetInputValues());
@@ -167,6 +169,8 @@ public class PropertyDataDefinition extends ToscaDataDefinition {
         return immutable;
     }
 
+    public Boolean isMappedToComponentProperty() { return mappedToComponentProperty; }
+
     public String getParentUniqueId() {
         return getOwnerId();
     }