Allow to generate even if 'derivedFrom' node types is null

Author: juancadavid

ToscaDesigner/Generated TOSCA files/Myrtus-Workstation.tosca

@@ -0,0 +1,18 @@
+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.Myrtus-Workstation:
+   description: Representation of a computing node in the Myrtus systems.
+    derived_from: tosca.nodes.Compute
+    metadata:
+      targetNamespace: "example.eu.myrtus.nodetypes"
+      abstract: "false"
+      final: "false"
+    
+    
+	

ToscaDesigner/Generated TOSCA files/MyrtusCameraFeed.tosca

@@ -17,8 +17,8 @@ node_types:
       - faceDetectionService:
           capability: Endpoint
           relationship: connectsTo
-          occurrences: [, ]
+          occurrences: [1, ]
 	capabilities:
       CameraFeed.WebService:
-        occurrences: [, ]
+        occurrences: [0, ]
         type: tosca.capabilities.Endpoint

ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca

@@ -1,91 +1,13 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
 
-metadata:
-  targetNamespace: "example.eu.myrtus.servicetemplates"
-  name: "MyrtusFace_Application"
-imports:
-  - file: MyrtusFaceDetectionService_0.tosca
-    namespace_uri: example.eu.myrtus.nodetypes
-    namespace_prefix: MYRTUS-
-  - file: Myrtus_Proxy_0.tosca
-    namespace_uri: example.eu.myrtus.nodetypes
-    namespace_prefix: MYRTUS-
-  - file: MyrtusCameraFeed_0.tosca
-    namespace_uri: example.eu.myrtus.nodetypes
-    namespace_prefix: MYRTUS-
-  - file: Myrtus_Workstation_1.tosca
-    namespace_uri: example.eu.myrtus.nodetypes
-    namespace_prefix: MYRTUS-
 
-topology_template:
-  node_templates:
-    Myrtus_Workstation_1:
-      type: example.eu.myrtus.nodetypes.Myrtus-Workstation
-      metadata:
-        displayName: "Myrtus-Workstation"
-    MyrtusFaceDetectionService_0:
-      type: example.eu.myrtus.nodetypes.MyrtusFaceDetectionService
-      metadata:
-        displayName: "FaceDetection"
-      properties:
-        dockerImage: "thebigpotatoe/face-recognition-docker"
-      requirements:
-        - host:
-            node: Myrtus_Workstation_1
-            relationship: con_HostedOn_0
-            capability: host
-    Myrtus_Proxy_0:
-      type: example.eu.myrtus.nodetypes.MyrtusProxy
-      metadata:
-        displayName: "Proxy"
-      properties:
-        dockerImage: "nginx:alpine"
-        port: "443"
-      requirements:
-        - egress1:
-            node: MyrtusCameraFeed_0
-            relationship: con_ConnectsTo_0
-            capability: CameraFeed.WebService
-        - egress2:
-            node: MyrtusFaceDetectionService_0
-            relationship: con_ConnectsTo_1
-            capability: FaceDetectionService
-        - host:
-            node: Myrtus_Workstation_1
-            relationship: con_HostedOn_2
-            capability: host
-      artifacts:
-        fullchain.pem:
-          type: File
-          deploy_path: /certs/fullchain.pem
-          file: /home/hesi/cert/fullchain.pem
-        key:
-          type: File
-          deploy_path: /certs/privkey.pem
-          file: /home/hesi/cert/privkey.pem
-        nginx.conf:
-          type: File
-          deploy_path: /etc/nginx/conf.d/default.conf
-          file: /servicetemplates/example.eu.myrtus.servicetemplates/MyrtusFace_Application_w1-wip2/files/MyrtusProxy_w1-wip1_0/nginx.conf/nginx.conf
-    MyrtusCameraFeed_0:
-      type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
-      metadata:
-        displayName: "CameraFeed"
-      properties:
-        dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
-      requirements:
-        - host:
-            node: Myrtus_Workstation_1
-            relationship: con_HostedOn_1
-            capability: host
-  relationship_templates:
-    con_HostedOn_2:
-      type: hostedOn
-    con_HostedOn_1:
-      type: hostedOn
-    con_HostedOn_0:
-      type: hostedOn
-    con_ConnectsTo_1:
-      type: connectsTo
-    con_ConnectsTo_0:
-      type: connectsTo
+node_types:
+  Service Template.NodeType:
+
+    metadata:
+      targetNamespace: ""
+      abstract: ""
+      final: ""
+    
+    
+	

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

@@ -125,6 +125,10 @@ 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();
 					}
 				} else if (stereotype.getName().equals("TDeploymentArtifact")) {
 					TDeploymentArtifact tDeploymentArtifact = TDeploymentArtifact.safeInstantiate((Class) context);
@@ -164,10 +168,13 @@ private Handlebars setupHandlebars() {
 
 				// 1. Check for non-tosca derived type
 
-				String derivedFromValue = tNodeType.getDerivedFrom().getName();
-				String targetNamespace = tNodeType.getTargetNamespace();
-				if (derivedFromValue != null && !derivedFromValue.startsWith("tosca")) {
-					imports.add(new Import(derivedFromValue + ".tosca", targetNamespace, "MYRTUS-"));
+				if (tNodeType.getDerivedFrom() != null) {
+
+					String derivedFromValue = tNodeType.getDerivedFrom().getName();
+					String targetNamespace = tNodeType.getTargetNamespace();
+					if (derivedFromValue != null && !derivedFromValue.startsWith("tosca")) {
+						imports.add(new Import(derivedFromValue + ".tosca", targetNamespace, "MYRTUS-"));
+					}
 				}
 
 				// 2. Check for non-tosca valid source types in capabilities

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

@@ -16,11 +16,11 @@ node_types:
       - {{../name}}:
           capability: {{getProperty ../this "capability"}}
           relationship: {{getProperty ../this "relationshipType"}}
-          occurrences: [{{../multiplicityMin}}, {{../multiplicityMax}}]
+          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: [{{../multiplicityMin}}, {{../multiplicityMax}}]
+        occurrences: [{{getProperty ../this "lowerBound"}}, {{getProperty ../this "../upperBound"}}]
         type: tosca.capabilities.Endpoint
     {{/eq}}{{/extension}}{{/each}}{{/eq}}{{/extension}}{{/each}}