CSAR export updates on node template requirements

Author: juancadavid

ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca

@@ -16,32 +16,57 @@ topology_template:
 
         properties:
           dockerImage: "thebigpotatoe/face-recognition-docker"
-        
-        
-      MyrtusCameraFeed_0:
-        type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
-        
-        properties:
-          dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
-        
+        requirements:
+          - host:
+              node: Myrtus_Workstation_1
+              relationship: 
+              capability: host
+              
 
       Myrtus_Proxy_0:
         type: example.eu.myrtus.nodetypes.MyrtusProxy
 
         properties:
           dockerImage: "nginx:alpine"
           port: "443"
+        requirements:
+          - egress1:
+              node: MyrtusCameraFeed_0
+              relationship: 
+              capability: CameraFeed.WebService
+              
+          - egress2:
+              node: MyrtusFaceDetectionService_0
+              relationship: 
+              capability: FaceDetectionService
+              
+          - host:
+              node: Myrtus_Workstation_1
+              relationship: 
+              capability: host
+              
+        
+      MyrtusCameraFeed_0:
+        type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
 
+        properties:
+          dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
+        requirements:
+          - host:
+              node: Myrtus_Workstation_1
+              relationship: 
+              capability: host
+              
 
 
   relationship_templates:
-    hostedOn:
+    con_HostedOn_2:
       type: hostedOn
-    hostedOn:
+    con_HostedOn_1:
       type: hostedOn
-    hostedOn:
+    con_HostedOn_0:
       type: hostedOn
-    connectsOn:
+    con_ConnectsTo_1:
       type: hostedOn
-    connectsOn:
+    con_ConnectsTo_0:
       type: hostedOn

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

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

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

@@ -14,7 +14,7 @@
             node: {{getProperty ../this "node"}}
             relationship: {{relationship}}
             capability: {{getProperty ../this "capability"}}
-            {{#unless (noStereotypeApplications this "TPropertyDef")}}properties:{{/unless}}
+            {{#unless (noStereotypeApplications ../this "TPropertyDef")}}properties:{{/unless}}
 		    {{#each ../ownedAttribute}}{{#extension}}{{#eq name "TPropertyDef"}}
 		      {{../name}}: "{{../value}}"
 		    {{/eq}}{{/extension}}{{/each}}