From 95b42d640c377bf0aa8094c5c47cf5b4121b027f Mon Sep 17 00:00:00 2001
From: Michael Wurster <miwurster@googlemail.com>
Date: Fri, 10 Jan 2020 16:48:53 +0100
Subject: [PATCH] Fix models

---
 admin/edmmmappings/EdmmMappings.json          | 21 +++++++
 .../PetClinic-IA/NodeTypeImplementation.tosca |  1 -
 .../SELFSERVICE-Metadata/data.xml             |  5 ++
 .../SELFSERVICE-Metadata/data.xml.mimetype    |  1 +
 .../PetClinic-Cloud/ServiceTemplate.tosca     | 63 +++++++++++++++++++
 .../ServiceTemplate.tosca.mimetype            |  1 +
 6 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml
 create mode 100644 servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml.mimetype
 create mode 100644 servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca
 create mode 100644 servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca.mimetype

diff --git a/admin/edmmmappings/EdmmMappings.json b/admin/edmmmappings/EdmmMappings.json
index 63b3e93..a018814 100644
--- a/admin/edmmmappings/EdmmMappings.json
+++ b/admin/edmmmappings/EdmmMappings.json
@@ -38,6 +38,27 @@
   }, {
     "edmmType" : "web_application",
     "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}PetClinic"
+  }, {
+    "edmmType" : "aws_aurora",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}AWS_Aurora"
+  }, {
+    "edmmType" : "aws_beanstalk",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}AWS_Beanstalk"
+  }, {
+    "edmmType" : "auth0",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}Auth0"
+  }, {
+    "edmmType" : "dbaas",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}DBaaS"
+  }, {
+    "edmmType" : "paas",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}PaaS"
+  }, {
+    "edmmType" : "platform",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}Platform"
+  }, {
+    "edmmType" : "saas",
+    "toscaType" : "{https://edmm.uni-stuttgart.de/nodetypes}SaaS"
   } ],
   "edmmTypeMapping" : [ {
     "edmmType" : "web_application",
diff --git a/nodetypeimplementations/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypeimplementations/PetClinic-IA/NodeTypeImplementation.tosca b/nodetypeimplementations/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypeimplementations/PetClinic-IA/NodeTypeImplementation.tosca
index 1319e2a..b54cabc 100644
--- a/nodetypeimplementations/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypeimplementations/PetClinic-IA/NodeTypeImplementation.tosca
+++ b/nodetypeimplementations/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fnodetypeimplementations/PetClinic-IA/NodeTypeImplementation.tosca
@@ -5,6 +5,5 @@
             <ImplementationArtifact xmlns:atyIgeneral="https://edmm.uni-stuttgart.de/artifacttypes" xmlns:ateIgeneral1="https://edmm.uni-stuttgart.de/artifacttemplates" name="configure" interfaceName="http://opentosca.org/interfaces/lifecycle" operationName="configure" artifactType="atyIgeneral:Script" artifactRef="ateIgeneral1:PetClinic-Configure"/>
             <ImplementationArtifact xmlns:atyIgeneral="https://edmm.uni-stuttgart.de/artifacttypes" xmlns:ateIgeneral1="https://edmm.uni-stuttgart.de/artifacttemplates" name="start" interfaceName="http://opentosca.org/interfaces/lifecycle" operationName="start" artifactType="atyIgeneral:Script" artifactRef="ateIgeneral1:PetClinic-Start"/>
         </ImplementationArtifacts>
-        <DeploymentArtifacts/>
     </NodeTypeImplementation>
 </Definitions>
diff --git a/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml
new file mode 100644
index 0000000..b30ce06
--- /dev/null
+++ b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<selfservice:Application xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org">
+    <selfservice:version>1.0</selfservice:version>
+    <selfservice:authors>Winery</selfservice:authors>
+</selfservice:Application>
diff --git a/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml.mimetype b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml.mimetype
new file mode 100644
index 0000000..c3c3ab5
--- /dev/null
+++ b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/SELFSERVICE-Metadata/data.xml.mimetype
@@ -0,0 +1 @@
+text/xml
\ No newline at end of file
diff --git a/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca
new file mode 100644
index 0000000..3971303
--- /dev/null
+++ b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="https://edmm.uni-stuttgart.de/servicetemplates" id="winery-defs-for_steIgeneral2-PetClinic-Cloud">
+    <ServiceTemplate name="PetClinic-Cloud" targetNamespace="https://edmm.uni-stuttgart.de/servicetemplates" id="PetClinic-Cloud">
+        <TopologyTemplate>
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="pet_clinic" minInstances="1" maxInstances="1" type="ntyIgeneral:PetClinic" id="PetClinic" winery:x="727" winery:y="104"/>
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="pet_clinic_platform" minInstances="1" maxInstances="1" type="ntyIgeneral:AWS_Beanstalk" id="AWS_Beanstalk" winery:x="728" winery:y="369">
+                <Properties>
+                    <Properties xmlns="http://www.example.org">
+                        <region>eu-west-1</region>
+                        <archetype>java</archetype>
+                        <min_instances>1</min_instances>
+                        <max_instances>1</max_instances>
+                    </Properties>
+                </Properties>
+            </NodeTemplate>
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="db" minInstances="1" maxInstances="1" type="ntyIgeneral:MySQL_Database" id="MySQL_Database" winery:x="1172" winery:y="103">
+                <Properties>
+                    <Properties xmlns="http://www.example.org">
+                        <schema_name>petclinic</schema_name>
+                        <user>pc</user>
+                        <password>petclinic</password>
+                    </Properties>
+                </Properties>
+            </NodeTemplate>
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="dbms" minInstances="1" maxInstances="1" type="ntyIgeneral:AWS_Aurora" id="AWS_Aurora" winery:x="1172" winery:y="374">
+                <Properties>
+                    <Properties xmlns="http://www.example.org">
+                        <region>eu-west-1</region>
+                        <instance_type>large</instance_type>
+                    </Properties>
+                </Properties>
+            </NodeTemplate>
+            <NodeTemplate xmlns:ntyIgeneral="https://edmm.uni-stuttgart.de/nodetypes" name="auth" minInstances="1" maxInstances="1" type="ntyIgeneral:Auth0" id="Auth0" winery:x="374" winery:y="102">
+                <Properties>
+                    <Properties xmlns="http://www.example.org">
+                        <region>eu-west-1</region>
+                        <client_id/>
+                        <client_secret>xyz123abc</client_secret>
+                        <domain>example.test</domain>
+                        <identifier>api.example.test</identifier>
+                        <scopes>user,email</scopes>
+                    </Properties>
+                </Properties>
+            </NodeTemplate>
+            <RelationshipTemplate xmlns:tyIgeneral="https://edmm.uni-stuttgart.de/relationtypes" name="HostedOn" type="tyIgeneral:HostedOn" id="con_HostedOn_0">
+                <SourceElement ref="PetClinic"/>
+                <TargetElement ref="AWS_Beanstalk"/>
+            </RelationshipTemplate>
+            <RelationshipTemplate xmlns:tyIgeneral="https://edmm.uni-stuttgart.de/relationtypes" name="ConnectsTo" type="tyIgeneral:ConnectsTo" id="con_ConnectsTo_0">
+                <SourceElement ref="PetClinic"/>
+                <TargetElement ref="MySQL_Database"/>
+            </RelationshipTemplate>
+            <RelationshipTemplate xmlns:tyIgeneral="https://edmm.uni-stuttgart.de/relationtypes" name="HostedOn" type="tyIgeneral:HostedOn" id="con_HostedOn_1">
+                <SourceElement ref="MySQL_Database"/>
+                <TargetElement ref="AWS_Aurora"/>
+            </RelationshipTemplate>
+            <RelationshipTemplate xmlns:tyIgeneral="https://edmm.uni-stuttgart.de/relationtypes" name="ConnectsTo" type="tyIgeneral:ConnectsTo" id="con_ConnectsTo_1">
+                <SourceElement ref="PetClinic"/>
+                <TargetElement ref="Auth0"/>
+            </RelationshipTemplate>
+        </TopologyTemplate>
+    </ServiceTemplate>
+</Definitions>
diff --git a/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca.mimetype b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca.mimetype
new file mode 100644
index 0000000..6cfef85
--- /dev/null
+++ b/servicetemplates/https%3A%2F%2Fedmm.uni-stuttgart.de%2Fservicetemplates/PetClinic-Cloud/ServiceTemplate.tosca.mimetype
@@ -0,0 +1 @@
+application/vnd.oasis.tosca.definitions
\ No newline at end of file