Bug killing in TOSCA node types

Author: juancadavid

ToscaDesigner/Generated TOSCA files/Myrtus-Workstation.tosca

@@ -1,19 +1,16 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
 
-metadata:
-  targetNamespace: ""
-  name: "Face_Application"
+imports:
+  - file: .tosca
+    namespace_uri: example.eu.myrtus.nodetypes
+    namespace_prefix: MYRTUS-
 
-topology_template:
-  node_templates:
-  relationship_templates:
-    con_HostedOn_2:
-      type: tosca.relationships.hostedOn
-    con_HostedOn_1:
-      type: tosca.relationships.hostedOn
-    con_HostedOn_0:
-      type: tosca.relationships.hostedOn
-    con_ConnectsTo_1:
-      type: tosca.relationships.ConnectsTo
-    con_ConnectsTo_0:
-      type: tosca.relationships.ConnectsTo
+node_types:
+  example.eu.myrtus.nodetypes.Myrtus-Workstation:
+    derived_from: tosca.nodes.Compute
+    metadata:
+      targetNamespace: "example.eu.myrtus.nodetypes"
+      abstract: "false"
+      final: "false"
+    
+	

ToscaDesigner/Generated TOSCA files/MyrtusCameraFeed.tosca

@@ -0,0 +1,16 @@
+tosca_definitions_version: tosca_simple_yaml_1_3
+
+imports:
+  - file: .tosca
+    namespace_uri: example.eu.myrtus.nodetypes
+    namespace_prefix: MYRTUS-
+
+node_types:
+  example.eu.myrtus.nodetypes.MyrtusCameraFeed:
+    derived_from: example.eu.myrtus.nodetypes.MyrtusSWComponent
+    metadata:
+      targetNamespace: "example.eu.myrtus.nodetypes"
+      abstract: "false"
+      final: "false"
+    
+	

ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca

@@ -19,7 +19,7 @@ topology_template:
         requirements:
           - host:
               node: Myrtus_Workstation_1
-              relationship: 
+              relationship: con_HostedOn_0
               capability: host
 
 
@@ -32,17 +32,17 @@ topology_template:
         requirements:
           - egress1:
               node: MyrtusCameraFeed_0
-              relationship: 
+              relationship: con_ConnectsTo_0
               capability: CameraFeed.WebService
 
           - egress2:
               node: MyrtusFaceDetectionService_0
-              relationship: 
+              relationship: con_ConnectsTo_1
               capability: FaceDetectionService
 
           - host:
               node: Myrtus_Workstation_1
-              relationship: 
+              relationship: con_HostedOn_2
               capability: host
 
 
@@ -54,7 +54,7 @@ topology_template:
         requirements:
           - host:
               node: Myrtus_Workstation_1
-              relationship: 
+              relationship: con_HostedOn_1
               capability: host
 
 
@@ -67,6 +67,6 @@ topology_template:
     con_HostedOn_0:
       type: hostedOn
     con_ConnectsTo_1:
-      type: hostedOn
+      type: connectTo
     con_ConnectsTo_0:
-      type: hostedOn
+      type: connectTo

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

@@ -25,6 +25,7 @@
 import com.github.jknack.handlebars.Template;
 import com.github.jknack.handlebars.helper.ConditionalHelpers;
 import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.modeliosoft.modelio.javadesigner.annotations.mdl.prop;
 
 import fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityDefinition;
@@ -74,6 +75,9 @@ private Handlebars setupHandlebars() {
 					} else if (searchedPropertyName.equals("capability")) {
 						CapabilityStereotype capability = tRequirement.getCapability();
 						propertyStringValue = capability != null ? capability.getElement().getName() : "";
+					} else if (searchedPropertyName.equals("relationship")) {
+						TRelationshipTemplate relationship = tRequirement.getRelationship();
+						propertyStringValue = relationship != null ? relationship.getElement().getName() : "";
 					}
 				} else if (stereotype.getName().equals("TRequirementDefinition")) {
 

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

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

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

@@ -7,15 +7,15 @@ node_types:
       targetNamespace: "{{getProperty this "targetNamespace"}}"
       abstract: "{{getProperty this "abstract"}}"
       final: "{{getProperty this "final"}}"
-    {{#unless (noStereotypeApplications this "RequirementDefinitionType")}}requirements:{{/unless}}
-	{{#each ownedElement}}{{#extension}}{{#eq name "RequirementDefinitionType"}}{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TRequirementDefinition"}}
+    {{#unless (noStereotypeApplications this "RequirementDefinitionsType")}}requirements:{{/unless}}
+	{{#each ownedElement}}{{#extension}}{{#eq name "RequirementDefinitionsType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TRequirementDefinition"}}
       - {{../name}}:
           capability: {{getProperty ../this "capability"}}
           relationship: {{getProperty ../this "relationshipType"}}
           occurrences: [{{../multiplicityMin}}, {{../multiplicityMax}}]
     {{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}
 	{{#unless (noStereotypeApplications this "CapabilityDefinitionsType")}}capabilities:{{/unless}}
-    {{#each ownedElement}}{{#extension}}{{#eq name "CapabilityDefinitionsType"}}{{#each ../ownedAttribute}}{{#extension}}{{#eq name "TCapabilityDefinition"}}
+    {{#each ownedElement}}{{#extension}}{{#eq name "CapabilityDefinitionsType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TCapabilityDefinition"}}
       {{../name}}:
         occurrences: [{{../multiplicityMin}}, {{../multiplicityMax}}]
         type: tosca.capabilities.Endpoint