Export bug fixing: Cardinalities and node type properties

Author: juancadavid

ToscaDesigner/Generated TOSCA files/MyrtusCameraFeed.tosca

@@ -15,10 +15,10 @@ node_types:
 
     requirements:
       - faceDetectionService:
-          capability: Endpoint
-          relationship: connectsTo
-          occurrences: [1, 1]
+          capability: tosca.capabilities.Endpoint
+          relationship: tosca.relationships.connectsTo
+          occurrences: [ 1, 1 ]
 	capabilities:
       CameraFeed.WebService:
-        occurrences: [0, -1]
+        occurrences: [ 0, UNBOUNDED ]
         type: tosca.capabilities.Endpoint

ToscaDesigner/Generated TOSCA files/MyrtusFaceDetectionService.tosca

@@ -13,7 +13,8 @@ node_types:
       abstract: "false"
       final: "false"
 
+    
 	capabilities:
       FaceDetectionService:
-        occurrences: [, ]
+        occurrences: [ 0, UNBOUNDED ]
         type: tosca.capabilities.Endpoint

ToscaDesigner/Generated TOSCA files/MyrtusProxy.tosca

@@ -12,12 +12,13 @@ node_types:
       targetNamespace: "example.eu.myrtus.nodetypes"
       abstract: "false"
       final: "false"
+    
     requirements:
       - egress:
           capability: tosca.capabilities.Endpoint
-          relationship: connectsTo
-          occurrences: [, ]
+          relationship: tosca.relationships.connectsTo
+          occurrences: [ 0, UNBOUNDED ]
 	capabilities:
       MyrtusProxy.WebService:
-        occurrences: [, ]
+        occurrences: [ 0, UNBOUNDED ]
         type: tosca.capabilities.Endpoint

ToscaDesigner/Generated TOSCA files/MyrtusSWComponent.tosca

@@ -7,14 +7,24 @@ imports:
 
 node_types:
   example.eu.myrtus.nodetypes.MyrtusSWComponent:
+    description: This is an example of a specialization made to represent Myrtus SW components. This component assumes the SW modules are containerized in Docker containers.
     derived_from: tosca.nodes.SoftwareComponent
     metadata:
       targetNamespace: "example.eu.myrtus.nodetypes"
       abstract: "true"
-      final: ""
+      final: "false"
+    properties:
+      dockerImage:
+      	type: string
+      	description: 
+      	
+      port:
+      	type: integer
+      	description: 
+      	required: false
     requirements:
       - connects:
           capability: tosca.capabilities.Endpoint
-          relationship: tosca.relationships.connectTo
-          occurrences: [, ]
+          relationship: tosca.relationships.connectsTo
+          occurrences: [ 0, UNBOUNDED ]
 

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

@@ -101,18 +101,16 @@ private Handlebars setupHandlebars() {
 						propertyStringValue = capability.getElement().getName();
 					} else if (searchedPropertyName.equals("relationshipType")) {
 						propertyStringValue = tRequirementDefinition.getRelationshipType().getElement().getName();
-					} else if (searchedPropertyName.equals("lowerBound")) {
-						propertyStringValue = tRequirementDefinition.getLowerBound();
 					} else if (searchedPropertyName.equals("upperBound")) {
 						propertyStringValue = tRequirementDefinition.getUpperBound();
+						propertyStringValue = propertyStringValue.equals("-1") ? "UNBOUNDED" : propertyStringValue;
 					}
 				} else if (stereotype.getName().equals("TRelationshipTemplate")) {
 					if (searchedPropertyName.equals("type")) {
 						TRelationshipTemplate tRelationshipTemplate = TRelationshipTemplate
 								.safeInstantiate((Association) context);
 						TRelationshipType relationshipType = tRelationshipTemplate.getRelationshipType();
-						Class element = relationshipType.getElement();
-						propertyStringValue = element.getName();
+						propertyStringValue = relationshipType.getElement().getName();
 					}
 				} else if (stereotype.getName().equals("TNodeTemplate")) {
 					TNodeTemplate tNodeTemplate = TNodeTemplate.safeInstantiate((Class) context);
@@ -125,10 +123,9 @@ private Handlebars setupHandlebars() {
 							.safeInstantiate((Class) context);
 					if (searchedPropertyName.equals("capabilityType")) {
 						propertyStringValue = tCapabilityDefinition.getCapabilityType().getElement().getName();
-					} else if (searchedPropertyName.equals("lowerBound")) {
-						propertyStringValue = tCapabilityDefinition.getLowerBound().toString();
 					} else if (searchedPropertyName.equals("upperBound")) {
 						propertyStringValue = tCapabilityDefinition.getUpperBound().toString();
+						propertyStringValue = propertyStringValue.equals("-1") ? "UNBOUNDED" : propertyStringValue;
 					}
 				} else if (stereotype.getName().equals("TDeploymentArtifact")) {
 					TDeploymentArtifact tDeploymentArtifact = TDeploymentArtifact.safeInstantiate((Class) context);

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

@@ -1,26 +1,31 @@
 {{imports this}}
 node_types:
   {{owner.name}}.{{name}}:
-{{#if (getProperty this "description")}}   description: {{getProperty this "description"}}
-{{/if}}{{#if (getProperty this "derivedFrom")}}    derived_from: {{getProperty this "derivedFrom"}}{{/if}}
+{{#if (getProperty this "description")}}
+    description: {{getProperty this "description"}}
+{{/if}}{{#if (getProperty this "derivedFrom")}}
+    derived_from: {{getProperty this "derivedFrom"}}{{/if}}
     metadata:
       targetNamespace: "{{getProperty this "targetNamespace"}}"
       abstract: "{{getProperty this "abstract"}}"
       final: "{{getProperty this "final"}}"
     {{#unless (noStereotypeApplications this "PropertyDefinitionType")}}properties:{{/unless}}
-      {{#each ../ownedAttribute}}{{#extension}}{{#eq name "PropertyDefinitionType"}}
-        {{../name}}: "{{../value}}"
-      {{/eq}}{{/extension}}{{/each}}
+    {{#each ../ownedAttribute}}{{#extension}}{{#eq name "PropertyDefinitionType"}}
+      {{../name}}:
+      	type: {{../type.name}}
+      	description: 
+      	{{#eq ../multiplicityMin "0"}}required: false{{/eq}}
+    {{/eq}}{{/extension}}{{/each}}
     {{#unless (noStereotypeApplications this "TRequirementDefinitionType")}}requirements:{{/unless}}
 	{{#each ownedElement}}{{#extension}}{{#eq name "TRequirementDefinitionType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TRequirementDefinition"}}
       - {{../name}}:
-          capability: {{getProperty ../this "capability"}}
-          relationship: {{getProperty ../this "relationshipType"}}
-          occurrences: [{{getProperty ../this "lowerBound"}}, {{getProperty ../this "upperBound"}}]
+          capability: tosca.capabilities.{{getProperty ../this "capability"}}
+          relationship: tosca.relationships.{{getProperty ../this "relationshipType"}}
+          occurrences: [ {{getProperty ../this "lowerBound"}}, {{getProperty ../this "upperBound"}} ]
     {{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}
 	{{#unless (noStereotypeApplications this "TCapabilityDefinitionsType")}}capabilities:{{/unless}}
     {{#each ownedElement}}{{#extension}}{{#eq name "TCapabilityDefinitionsType"}}{{#each ../ownedElement}}{{#extension}}{{#eq name "TCapabilityDefinition"}}
       {{../name}}:
-        occurrences: [{{getProperty ../this "lowerBound"}}, {{getProperty ../this "upperBound"}}]
-        type: tosca.capabilities.Endpoint
+        occurrences: [ {{getProperty ../this "lowerBound"}}, {{getProperty ../this "upperBound"}} ]
+        type: tosca.capabilities.{{getProperty ../this "capabilityType"}}
     {{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}