Add substitution_mapping attributes mapping

Add support of mapping the outputs to attributes in substitution_mapping

Change-Id: Ifbe95a1fdfd476aa7aca17502ee9b30bea906874
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3320

1 files changed, 5 insertions, 3 deletions

diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImpl.java b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImpl.java
index 0c8b86b5e7..801f1ee8e6 100644
--- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImpl.java
+++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImpl.java
@@ -223,11 +223,13 @@ public class NsDescriptorGeneratorImpl implements NsDescriptorGenerator {
 
     private void handleSubstitutionMappings(final ToscaTemplate componentToscaTemplate, final String nsNodeTypeName) {
         final SubstitutionMapping substitutionMapping = new SubstitutionMapping();
-        substitutionMapping.setNode_type(nsNodeTypeName);        
+        substitutionMapping.setNode_type(nsNodeTypeName);
         final SubstitutionMapping onapSubstitutionMapping = componentToscaTemplate.getTopology_template().getSubstitution_mappings();
         if (onapSubstitutionMapping != null) {
-        	substitutionMapping.setRequirements(onapSubstitutionMapping.getRequirements());
-        	substitutionMapping.setCapabilities(onapSubstitutionMapping.getCapabilities());
+            substitutionMapping.setRequirements(onapSubstitutionMapping.getRequirements());
+            substitutionMapping.setCapabilities(onapSubstitutionMapping.getCapabilities());
+            substitutionMapping.setProperties(onapSubstitutionMapping.getProperties());
+            substitutionMapping.setAttributes(onapSubstitutionMapping.getAttributes());
         }
         componentToscaTemplate.getTopology_template().setSubstitution_mappings(substitutionMapping);
     }