Bug fixing in topology templates

Author: juancadavid

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/export/AbstractToscaFileGenerator.java

@@ -67,7 +67,8 @@ private Handlebars setupHandlebars() {
 
 					TRequirement tRequirement = TRequirement.safeInstantiate((Class) context);
 					if (searchedPropertyName.equals("node")) {
-						propertyStringValue = tRequirement.getNode().getName();
+						TNodeTemplate node = tRequirement.getNode();
+						propertyStringValue = node != null ? node.getName() : "''";
 					} else if (searchedPropertyName.equals("capability")) {
 						propertyStringValue = tRequirement.getCapability().getElement().getName();
 					}

ToscaDesigner/src/main/resources/fr/softeam/templates/TNodeTemplate.hbs

@@ -9,9 +9,9 @@
         {{../name}}: "{{../value}}"
       {{/eq}}{{/extension}}{{/each}}
       {{#unless (noStereotypeApplications this "RequirementsType")}}requirements:{{/unless}}
-      {{#each ../ownedElement}}{{#extension}}{{#eq name "RequirementsType"}}{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TRequirement"}}
+      {{#each ../ownedElement}}{{#extension}}{{#eq name "RequirementsType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TRequirement"}}
         - {{../name}}:
-            node: {{getProperty ../this "node"}}
+            node: {{getProperty ../this "node"}}{{/if}}
             relationship: {{relationship}}
             capability: {{getProperty ../this "capability"}}
             {{#unless (noStereotypeApplications this "TPropertyDef")}}properties:{{/unless}}

ToscaDesigner/src/main/resources/fr/softeam/templates/TParameter.hbs

@@ -0,0 +1,3 @@
+{{name}}
+  type: {{type.name}}
+  default: '{{value}}'

ToscaDesigner/src/main/resources/fr/softeam/templates/TTopologyTemplate.hbs

@@ -4,13 +4,17 @@
 {{/eq}}{{/extension}}{{/each}}
 {{imports this}}
 topology_template:
+  {{#unless (noStereotypeApplications this "InputParameterType")}}inputs:{{/unless}}  
+  {{#ownedElement}}{{#extension}}{{#eq name "InputParameterType"}}{{#ownedAttribute}}{{#extension}}{{#eq name "TParameter"}}
+    {{> (lookup this.name) ../this}}
+  {{/eq}}{{/extension}}{{/ownedAttribute}}{{/eq}}{{/extension}}{{/ownedElement}}
   {{#unless (noStereotypeApplications this "TNodeTemplate")}}node_templates:{{/unless}}  
   {{#ownedElement}}{{#extension}}{{#eq name "TNodeTemplate"}}
   {{> (lookup this.name) ../this}}
   {{/eq}}{{/extension}}{{/ownedElement}}
   {{#unless (noStereotypeApplications this "TGroup")}}groups:{{/unless}}  
   {{#ownedElement}}{{#extension}}{{#eq name "TGroup"}}
-  {{> (lookup this.name) ../this}}
+    {{> (lookup this.name) ../this}}
   {{/eq}}{{/extension}}{{/ownedElement}}
   relationship_templates:
 {{#ownedElement}}{{#targetingEnd}}{{#association}}{{#extension}}{{#eq name "TRelationshipTemplate"}}