Merge remote-tracking branch 'origin/toscaCodeGen' into ToscaProfile

Author: Amina-Moussaoui

ToscaDesigner/Generated TOSCA files/MYRTUS Face Application.csar

@@ -1,19 +1,34 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
 
 
+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:
@@ -25,7 +40,8 @@ topology_template:
 
       Myrtus_Proxy_0:
         type: example.eu.myrtus.nodetypes.MyrtusProxy
-        
+        metadata:
+          displayName: "Proxy"
         properties:
           dockerImage: "nginx:alpine"
           port: "443"
@@ -45,10 +61,23 @@ topology_template:
               relationship: con_HostedOn_2
               capability: host
 
-        
+        artifacts:
+          fullchain.pem:
+            type: 
+            deploy_path: 
+            file: 
+          key:
+            type: 
+            deploy_path: 
+            file: 
+          nginx.conf:
+            type: 
+            deploy_path: 
+            file: 
       MyrtusCameraFeed_0:
         type: example.eu.myrtus.nodetypes.MyrtusCameraFeed
-        
+        metadata:
+          displayName: "CameraFeed"
         properties:
           dockerImage: "ci.hesi.energy:5000/myrtus/examples/myrtusface/camera_feed:web"
         requirements:
@@ -67,6 +96,6 @@ topology_template:
     con_HostedOn_0:
       type: hostedOn
     con_ConnectsTo_1:
-      type: connectTo
+      type: connectsTo
     con_ConnectsTo_0:
-      type: connectTo
+      type: connectsTo

ToscaDesigner/Generated TOSCA files/MyrtusFace_Application.tosca

@@ -3,15 +3,29 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.FileDialog;
+import org.modelio.metamodel.uml.infrastructure.ModelElement;
+import org.modelio.metamodel.uml.infrastructure.ModelTree;
+import org.modelio.metamodel.uml.infrastructure.Stereotype;
+import org.modelio.metamodel.uml.statik.Association;
+import org.modelio.metamodel.uml.statik.Class;
+import org.modelio.vcore.smkernel.mapi.MObject;
+
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Options;
 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.objid;
+
 import fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityStereotype;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityDefinition;
@@ -21,15 +35,7 @@
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.modelio.metamodel.uml.infrastructure.ModelElement;
-import org.modelio.metamodel.uml.infrastructure.ModelTree;
-import org.modelio.metamodel.uml.infrastructure.Stereotype;
-import org.modelio.metamodel.uml.statik.Association;
-import org.modelio.metamodel.uml.statik.Class;
-import org.modelio.vcore.smkernel.mapi.MObject;
+import fr.softeam.toscadesigner.impl.ToscaDesignerModule;
 
 @objid ("e7453252-f578-4da1-815c-d2ce0e765130")
 public abstract class AbstractToscaFileGenerator {
@@ -167,21 +173,19 @@ private Handlebars setupHandlebars() {
         //                }
             } else if (new TopologyTemplateChecker().isTypeOf(context)) {
                 // 3. Check for non-tosca types in node templates
-        
-                // To develop when TNodeTemplate will have the «type» property
-        //                List<ModelElement> nodeTemplates = context.getCompositionChildren().stream()
-        //                        .filter(object -> {
-        //                            Stereotype tNodeTemplateStereotype = ToscaDesignerModule.getInstance().getModuleContext().getModelingSession().getMetamodelExtensions()
-        //                                .getStereotype("TNodeTemplate", object.getMClass());
-        //                            return tNodeTemplateStereotype != null && ((ModelElement) object).isStereotyped(tNodeTemplateStereotype);
-        //                        })
-        //                        .map(ModelElement.class::cast)
-        //                        .collect(Collectors.toList());
-        //                for (ModelElement nodeTemplate : nodeTemplates) {
-        //                    if (nodeTemplate.getProperty(TNodeTemplate.STEREOTYPE_NAME, TNodeTemplate.TYPE_PROPERTY)) {
-        //                        imports.add(/* import statement */);
-        //                    }
-        //                }
+				List<TNodeTemplate> nodeTemplates = context.getCompositionChildren().stream().filter(object -> {
+					Stereotype tNodeTemplateStereotype = ToscaDesignerModule.getInstance().getModuleContext()
+							.getModelingSession().getMetamodelExtensions()
+							.getStereotype("TNodeTemplate", object.getMClass());
+					return tNodeTemplateStereotype != null
+							&& ((ModelElement) object).isStereotyped(tNodeTemplateStereotype);
+				}).map(Class.class::cast).map(c -> TNodeTemplate.safeInstantiate(c)).collect(Collectors.toList());
+				for (TNodeTemplate nodeTemplate : nodeTemplates) {
+
+					String targetNamespace = ((Class) context).getOwner().getName();
+					imports.add(new Import(nodeTemplate.getElement().getName() + ".tosca", targetNamespace , "MYRTUS-"));
+
+				}
 
             }