From 555ed220193bb40436e9070e6eaffdbb39b9a835 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Tue, 14 Nov 2017 22:25:08 +0100
Subject: [PATCH 01/52] copy template.yaml from docker-example

---
 .../csars/yaml/valid/lamp-csar/template.yaml  | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
new file mode 100644
index 000000000..39b1d4538
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -0,0 +1,106 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+description: Template for deploying the simple-task-app via docker
+metadata:
+  template_name: simple-task-docker-template
+  template_author: stupro-toscana
+  template_version: 1.0
+
+node_types:
+  DockerEngine:
+    derived_from: tosca.nodes.Root
+    # needs capability: DockerHost or similar..
+    capabilities:
+      host:
+        type: DockerHost
+    requirements:
+      - os:
+        type: linux
+        distribution: ubuntu
+        architecture: x86_64
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerengine_create.sh
+        start:
+          implementation: docker/dockerengine_start.sh
+        stop:
+          implementation: docker/dockerengine_stop.sh
+  DockerApp:
+    derived_from: tosca.nodes.Root
+    requirements:
+      - host:
+        capability: DockerHost
+        node: DockerEngine
+        relationship: tosca.relationships.HostedOn
+      - network:
+        capability: SimplePublicWebEndpoint
+    attributes:
+      tag:
+        type: string
+        description: the tag for the docker image
+      identifier:
+        type: string
+        description: the identifier (name) for the docker container
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerapp_create.sh
+        start:
+          implementation: docker/dockerapp_create.sh
+        stop:
+          implementation: docker/dockerapp_stop.sh
+        delete:
+          implementation: docker/dockerapp_delete.sh
+capability_types:
+  DockerHost:
+    derived_from: tosca.capabilities.Root
+    valid_source_types: [ DockerApp ]
+  SimplePublicWebEndpoint:
+    derived_from: tosca.capabilities.Endpoint
+    properties:
+      protocol:
+        default: http
+      port:
+        default: 80
+      url_path:
+        default: /
+      network_name:
+        default: PUBLIC
+
+topology_template:
+  node_templates:
+    myDockerEngine:
+      type: DockerEngine
+
+    simpleTaskApp:
+      type: DockerApp
+      attributes:
+        tag:
+          description: tag for docker image
+          value: simple-task-app
+        identifier:
+          description: identifier of docker container
+          value: simple-task-app-1
+        endpoint:
+          value: { get_operation_output: [ SELF, Standard, create, endpoint ] }
+      interfaces:
+        Standard:
+          inputs:
+            tag: { get_attribute: [ SELF, tag ] }
+            identifier: { get_attribute: [ SELF, identifier ] }
+          create:
+            implementation:
+              primary: simple-task-app/create.sh
+              # dependencies will get copied by orchestrator to the same location
+              # as create.sh, before create.sh is executed
+              dependencies:
+                - simple-task-app/Dockerfile
+                - simple-task-app/createdb.sql
+                - simple-task-app/index.php
+                - simple-task-app/mysql-credentials.php
+
+
+  outputs:
+    endpoint:
+      description: the endpoint of the simple-task-app
+value: { get_attribute: [ simpleTaskApp, endpoint ] }

From c1a37d08982382aace0e623629662e043c6e5a92 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Tue, 14 Nov 2017 22:48:59 +0100
Subject: [PATCH 02/52] add first node types to template.yaml

---
 .../csars/yaml/valid/lamp-csar/template.yaml  | 119 ++++--------------
 1 file changed, 23 insertions(+), 96 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 39b1d4538..42e094932 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -1,106 +1,33 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
-description: Template for deploying the simple-task-app via docker
+description: Template for deploying a lamp-stack application
 metadata:
-  template_name: simple-task-docker-template
+  template_name: lamp-stack-template
   template_author: stupro-toscana
   template_version: 1.0
 
 node_types:
-  DockerEngine:
-    derived_from: tosca.nodes.Root
-    # needs capability: DockerHost or similar..
-    capabilities:
-      host:
-        type: DockerHost
-    requirements:
-      - os:
-        type: linux
-        distribution: ubuntu
-        architecture: x86_64
-    interfaces:
-      Standard:
-        create:
-          implementation: docker/dockerengine_create.sh
-        start:
-          implementation: docker/dockerengine_start.sh
-        stop:
-          implementation: docker/dockerengine_stop.sh
-  DockerApp:
-    derived_from: tosca.nodes.Root
-    requirements:
-      - host:
-        capability: DockerHost
-        node: DockerEngine
-        relationship: tosca.relationships.HostedOn
-      - network:
-        capability: SimplePublicWebEndpoint
-    attributes:
-      tag:
-        type: string
-        description: the tag for the docker image
-      identifier:
-        type: string
-        description: the identifier (name) for the docker container
-    interfaces:
-      Standard:
-        create:
-          implementation: docker/dockerapp_create.sh
-        start:
-          implementation: docker/dockerapp_create.sh
-        stop:
-          implementation: docker/dockerapp_stop.sh
-        delete:
-          implementation: docker/dockerapp_delete.sh
-capability_types:
-  DockerHost:
-    derived_from: tosca.capabilities.Root
-    valid_source_types: [ DockerApp ]
-  SimplePublicWebEndpoint:
-    derived_from: tosca.capabilities.Endpoint
-    properties:
-      protocol:
-        default: http
-      port:
-        default: 80
-      url_path:
-        default: /
-      network_name:
-        default: PUBLIC
+  ApacheWebServer:
+    derived_from: tosca.nodes.WebServer
 
-topology_template:
-  node_templates:
-    myDockerEngine:
-      type: DockerEngine
+  mysql:
+    derived_from: tosca.nodes.Database
 
-    simpleTaskApp:
-      type: DockerApp
-      attributes:
-        tag:
-          description: tag for docker image
-          value: simple-task-app
-        identifier:
-          description: identifier of docker container
-          value: simple-task-app-1
-        endpoint:
-          value: { get_operation_output: [ SELF, Standard, create, endpoint ] }
-      interfaces:
-        Standard:
-          inputs:
-            tag: { get_attribute: [ SELF, tag ] }
-            identifier: { get_attribute: [ SELF, identifier ] }
-          create:
-            implementation:
-              primary: simple-task-app/create.sh
-              # dependencies will get copied by orchestrator to the same location
-              # as create.sh, before create.sh is executed
-              dependencies:
-                - simple-task-app/Dockerfile
-                - simple-task-app/createdb.sql
-                - simple-task-app/index.php
-                - simple-task-app/mysql-credentials.php
 
+topology_template:
+  node_templates:
+    ApacheWebServer:
+      type: tosca.nodes.WebServer.Apache
+      properties: #TODO
+      requirements:
+        - host: WebServer
 
-  outputs:
-    endpoint:
-      description: the endpoint of the simple-task-app
-value: { get_attribute: [ simpleTaskApp, endpoint ] }
+    mysql:
+      type: tosca.nodes.DBMS.MySQL
+      properties:
+          root_password: { get_input: my_mysql_rootpw }
+          port: { get_input: my_mysql_port }
+        requirements:
+          - host: db_server
+        interfaces:
+          Standard:
+            configure: scripts/my_own_configure.sh

From 95a1a05bc1b9c1fb2e6c19563e75c46c9d45aefd Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Tue, 14 Nov 2017 23:08:06 +0100
Subject: [PATCH 03/52] add some db nodetypes

---
 .../csars/yaml/valid/lamp-csar/template.yaml      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 42e094932..af8841f2b 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -11,6 +11,17 @@ node_types:
 
   mysql:
     derived_from: tosca.nodes.Database
+    requirements:
+      - host:
+          node: tosca.nodes.DBMS.MySQL
+
+  dbms:
+    derived_from: tosca.nodes.DBMS
+    properties:
+      port:
+        description: reflect the default MySQL server port
+        default: 3306
+
 
 
 topology_template:
@@ -21,6 +32,10 @@ topology_template:
       requirements:
         - host: WebServer
 
+    WebServer:
+      type: tosca.nodes.Compute
+      # TODO
+
     mysql:
       type: tosca.nodes.DBMS.MySQL
       properties:

From 98e2945025926cad9b70d705aaa9c8c60ecb386a Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 00:07:25 +0100
Subject: [PATCH 04/52] add node_templates for LAMP and delete node_types

---
 .../csars/yaml/valid/lamp-csar/template.yaml  | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index af8841f2b..1d9645112 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -5,44 +5,58 @@ metadata:
   template_author: stupro-toscana
   template_version: 1.0
 
-node_types:
-  ApacheWebServer:
-    derived_from: tosca.nodes.WebServer
-
-  mysql:
-    derived_from: tosca.nodes.Database
-    requirements:
-      - host:
-          node: tosca.nodes.DBMS.MySQL
-
-  dbms:
-    derived_from: tosca.nodes.DBMS
-    properties:
-      port:
-        description: reflect the default MySQL server port
-        default: 3306
-
-
 
 topology_template:
   node_templates:
+
+    my_app:
+      type: tosca.nodes.SoftwareComponent
+      requirements:
+        - host: ApacheWebServer
+
     ApacheWebServer:
-      type: tosca.nodes.WebServer.Apache
+      type: tosca.nodes.WebServer
       properties: #TODO
       requirements:
-        - host: WebServer
-
-    WebServer:
-      type: tosca.nodes.Compute
-      # TODO
+        - host: server
+      interfaces:
+        Standard:
+          create: webserver_install.sh
+          start: webserver_start.sh
+
+    my_db:
+      type: tosca.nodes.Database.MySQL
+      properties:
+        name: { get_input: database_name }
+        user: { get_input: database_user }
+        password: { get_input: database_password }
+        port: { get_input: database_port }
+      capabilities:
+        database_endpoint:
+          properties:
+            port: { get_input: db_port }
+      requirements:
+        - host: mysql_dbms
+        interfaces:
+          Standard:
+            create:
+              implementation: db_create.sh
 
-    mysql:
+    mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
       properties:
           root_password: { get_input: my_mysql_rootpw }
           port: { get_input: my_mysql_port }
         requirements:
-          - host: db_server
+          - host: server
         interfaces:
           Standard:
-            configure: scripts/my_own_configure.sh
+            inputs:
+              db_root_password: { get_property: [ mysql_dbms, root_password ] }
+              create: mysql_dbms_install.sh
+              start: mysql_dbms_start.sh
+              configure: mysql_dbms_configure.sh
+
+    server:
+      type: tosca.nodes.Compute
+      capabilities: #TODO

From 184e1d59ea36c5b21995681f6196fbc18fbcc1df Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 16:55:44 +0100
Subject: [PATCH 05/52] add php Interface to my_app node_template

---
 .../test/resources/csars/yaml/valid/lamp-csar/template.yaml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 1d9645112..d212eff8a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -13,10 +13,13 @@ topology_template:
       type: tosca.nodes.SoftwareComponent
       requirements:
         - host: ApacheWebServer
+      interfaces:
+        Standard:
+          create: install_php.sh
+          start: start_myphpapp.sh
 
     ApacheWebServer:
       type: tosca.nodes.WebServer
-      properties: #TODO
       requirements:
         - host: server
       interfaces:

From 1f85a7a861a7639cbcb1700854e3b52b3a04a064 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 17:22:02 +0100
Subject: [PATCH 06/52] add scripts to install php and start myphpapp

---
 .../valid/lamp-csar/scripts/install_php.sh    |  4 +
 .../lamp-csar/scripts/start_myphpapp.php      | 82 +++++++++++++++++++
 .../csars/yaml/valid/lamp-csar/template.yaml  | 26 ++++--
 3 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
new file mode 100644
index 000000000..ed7786e1f
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# install php on a linux machine with php-mysql
+sudo apt-get install php -Y
+sudo apt-get install php-mysql -Y
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
new file mode 100644
index 000000000..8ade46673
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
@@ -0,0 +1,82 @@
+<?php
+// include the credentials to connect to the db
+//include_once "mysql-credentials.php";
+
+$host = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "mydb";
+$port = 3306;
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($host, $username, $password, $database, $port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="index.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index d212eff8a..1276f9b42 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -15,8 +15,8 @@ topology_template:
         - host: ApacheWebServer
       interfaces:
         Standard:
-          create: install_php.sh
-          start: start_myphpapp.sh
+          create: scripts/install_php.sh
+          start: scripts/start_myphpapp.php
 
     ApacheWebServer:
       type: tosca.nodes.WebServer
@@ -24,8 +24,8 @@ topology_template:
         - host: server
       interfaces:
         Standard:
-          create: webserver_install.sh
-          start: webserver_start.sh
+          create: scripts/webserver_install.sh
+          start: scripts/webserver_start.sh
 
     my_db:
       type: tosca.nodes.Database.MySQL
@@ -43,7 +43,7 @@ topology_template:
         interfaces:
           Standard:
             create:
-              implementation: db_create.sh
+              implementation: scripts/db_create.sh
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
@@ -56,10 +56,18 @@ topology_template:
           Standard:
             inputs:
               db_root_password: { get_property: [ mysql_dbms, root_password ] }
-              create: mysql_dbms_install.sh
-              start: mysql_dbms_start.sh
-              configure: mysql_dbms_configure.sh
+              create: scripts/mysql_dbms_install.sh
+              start: scripts/mysql_dbms_start.sh
+              configure: scripts/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute
-      capabilities: #TODO
+      capabilities:
+        host:
+          properties:
+            disk_size: 10 GB
+        os:
+          properties:
+            type: linux
+            distribution: ubuntu
+            version: 16.04

From c400ce3b9362ac5cfeba6162cfb3c4afa304c792 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 17:44:32 +0100
Subject: [PATCH 07/52] add create_db script

---
 .../csars/yaml/valid/lamp-csar/scripts/db_create.sh        | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
new file mode 100644
index 000000000..e2bc21e3d
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
@@ -0,0 +1,7 @@
+# Setup MySQL root password and create user
+cat << EOF | mysql -u root --password=db_root_password
+CREATE DATABASE mydb;
+USE mydb;
+create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
+EXIT
+EOF

From c626eee21ac6f6467ebd9f24a5be715043c04832 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 17:57:23 +0100
Subject: [PATCH 08/52] add scripts for dbms

---
 .../resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh  | 1 +
 .../csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh | 2 ++
 .../csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh   | 3 +++
 .../csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh     | 2 ++
 4 files changed, 8 insertions(+)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
index e2bc21e3d..6b8e6d42f 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Setup MySQL root password and create user
 cat << EOF | mysql -u root --password=db_root_password
 CREATE DATABASE mydb;
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
new file mode 100644
index 000000000..87480b8ba
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo mysqladmin -u root -p password my_mysql_rootpw
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
new file mode 100644
index 000000000..1d4bfce3e
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo apt-get install mysql-server -Y
+sudo systemctl enable mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh
new file mode 100644
index 000000000..986fc4f72
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo systemctl start mysql.service

From 1589402424bbda90d40c83df3a923e4b886d5f23 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 15 Nov 2017 18:05:46 +0100
Subject: [PATCH 09/52] add scripts for apache

---
 .../csars/yaml/valid/lamp-csar/scripts/webserver_install.sh     | 2 ++
 .../csars/yaml/valid/lamp-csar/scripts/webserver_start.sh       | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
new file mode 100644
index 000000000..d464b6a98
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo apt-get install apache2 -Y
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh
new file mode 100644
index 000000000..d8cf0070b
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo service apache2 start

From c65bac1a897794f4759395fbf28a4d18193905c9 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Wed, 15 Nov 2017 18:23:26 +0100
Subject: [PATCH 10/52] Complete compute node

---
 .../test/resources/csars/yaml/valid/lamp-csar/template.yaml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 1276f9b42..e0a2b4f59 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -65,9 +65,12 @@ topology_template:
       capabilities:
         host:
           properties:
+            num_cpus: 1
             disk_size: 10 GB
+            meme_size: 4096 MB
         os:
           properties:
+            architecture: x86_64
             type: linux
             distribution: ubuntu
             version: 16.04

From 4239e62ce904a4126b9a6e3084136a84bd5036fd Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Wed, 15 Nov 2017 20:13:59 +0100
Subject: [PATCH 11/52] Refactor LAMP yaml template

---
 .../csars/yaml/valid/lamp-csar/template.yaml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index e0a2b4f59..2a7dd29c3 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -1,5 +1,5 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
-description: Template for deploying a lamp-stack application
+description: Template for deploying a LAMP stack.
 metadata:
   template_name: lamp-stack-template
   template_author: stupro-toscana
@@ -7,18 +7,19 @@ metadata:
 
 
 topology_template:
-  node_templates:
 
+  node_templates:
     my_app:
       type: tosca.nodes.SoftwareComponent
       requirements:
-        - host: ApacheWebServer
+        - host: apache_web_server
+        - database_endpoint: my_db
       interfaces:
         Standard:
           create: scripts/install_php.sh
           start: scripts/start_myphpapp.php
 
-    ApacheWebServer:
+    apache_web_server:
       type: tosca.nodes.WebServer
       requirements:
         - host: server
@@ -66,11 +67,10 @@ topology_template:
         host:
           properties:
             num_cpus: 1
-            disk_size: 10 GB
-            meme_size: 4096 MB
+            disk_size: 25 GB
+            mem_size: 2048 MB
         os:
           properties:
-            architecture: x86_64
             type: linux
             distribution: ubuntu
             version: 16.04

From 3197946c9a27752200514d162c2645e6187279ac Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Wed, 15 Nov 2017 20:20:38 +0100
Subject: [PATCH 12/52] Add inputs/outputs to lamp template

---
 .../csars/yaml/valid/lamp-csar/template.yaml  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 2a7dd29c3..5f739c5e1 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -7,6 +7,19 @@ metadata:
 
 
 topology_template:
+  inputs:
+    database_name:
+      type: string
+    database_user:
+      type: string
+    database_password:
+      type: string
+    database_port:
+      type: integer
+    my_mysql_rootpw:
+      type: string
+    my_mysql_port:
+      type: integer
 
   node_templates:
     my_app:
@@ -38,7 +51,7 @@ topology_template:
       capabilities:
         database_endpoint:
           properties:
-            port: { get_input: db_port }
+            port: { get_property: [SELF, port] }
       requirements:
         - host: mysql_dbms
         interfaces:
@@ -74,3 +87,7 @@ topology_template:
             type: linux
             distribution: ubuntu
             version: 16.04
+    outputs:
+      endpoint:
+        description: endpoint of the php-app
+          value: { get_attribute: [ my_app, #TODO ] }

From 839e8e5307a315615bcb7e15aada74c1ad90cbd3 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Wed, 15 Nov 2017 21:12:34 +0100
Subject: [PATCH 13/52] Fix inputs/outputs in LAMP template

---
 .../lamp-csar/scripts/mysql_dbms_configure.sh |  2 +-
 .../lamp-csar/scripts/start_myphpapp.php      | 12 +++++-----
 .../csars/yaml/valid/lamp-csar/template.yaml  | 24 ++++++++++++-------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
index 87480b8ba..c6861c967 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo mysqladmin -u root -p password my_mysql_rootpw
+sudo mysqladmin -u root -p password db_root_password
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
index 8ade46673..f31554f30 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
@@ -2,11 +2,11 @@
 // include the credentials to connect to the db
 //include_once "mysql-credentials.php";
 
-$host = "127.0.0.1";
-$username = "root";
-$password = "";
-$database = "mydb";
-$port = 3306;
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "";
+$db_name = "mydb";
+$db_port = 3306;
 
 // get task from post after task was entered in form
 $post = $_POST['task'];
@@ -49,7 +49,7 @@ function readFromDb()
 function newDbConnection()
 {
     extract($GLOBALS);
-   $conn = new mysqli($host, $username, $password, $database, $port);
+   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
     if ($conn->connect_error) {
         die("Connection failed: " . $conn->connect_error);
     }
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 5f739c5e1..be2f0b3d1 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -23,14 +23,21 @@ topology_template:
 
   node_templates:
     my_app:
-      type: tosca.nodes.SoftwareComponent
+      type: tosca.nodes.WebApplication
       requirements:
         - host: apache_web_server
         - database_endpoint: my_db
       interfaces:
         Standard:
           create: scripts/install_php.sh
-          start: scripts/start_myphpapp.php
+          start:
+            implementation: scripts/start_myphpapp.php
+            inputs:
+              db_host: { #TODO needs to be the address of the Apache server? }
+              db_name: { get_property: [ my_db, name ] }
+              db_user: { get_property: [ my_db, user ] }
+              db_password: { get_property: [ my_db, password ] }
+              db_port: { get_property: [ SELF, database_endpoint, port ] }
 
     apache_web_server:
       type: tosca.nodes.WebServer
@@ -51,13 +58,12 @@ topology_template:
       capabilities:
         database_endpoint:
           properties:
-            port: { get_property: [SELF, port] }
+            port: { get_input: database_port }
       requirements:
         - host: mysql_dbms
         interfaces:
           Standard:
-            create:
-              implementation: scripts/db_create.sh
+            create: scripts/db_create.sh
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
@@ -70,9 +76,9 @@ topology_template:
           Standard:
             inputs:
               db_root_password: { get_property: [ mysql_dbms, root_password ] }
-              create: scripts/mysql_dbms_install.sh
-              start: scripts/mysql_dbms_start.sh
-              configure: scripts/mysql_dbms_configure.sh
+            create: scripts/mysql_dbms_install.sh
+            start: scripts/mysql_dbms_start.sh
+            configure: scripts/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute
@@ -90,4 +96,4 @@ topology_template:
     outputs:
       endpoint:
         description: endpoint of the php-app
-          value: { get_attribute: [ my_app, #TODO ] }
+          value: { get_attribute: [ server, public_address ] }

From 998f2f72752d87b4e833537ff12a85098d9b6ce8 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Wed, 15 Nov 2017 21:19:33 +0100
Subject: [PATCH 14/52] Add db_host to LAMP template

---
 .../src/test/resources/csars/yaml/valid/lamp-csar/template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index be2f0b3d1..a34c63f06 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -33,7 +33,7 @@ topology_template:
           start:
             implementation: scripts/start_myphpapp.php
             inputs:
-              db_host: { #TODO needs to be the address of the Apache server? }
+              db_host: { get_attribute: [ apache_web_server, private_address ] }
               db_name: { get_property: [ my_db, name ] }
               db_user: { get_property: [ my_db, user ] }
               db_password: { get_property: [ my_db, password ] }

From c94f782e14cef83efbae922ebbf5fae765241787 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 09:33:10 +0100
Subject: [PATCH 15/52] change Y to y in installscripts

---
 .../csars/yaml/valid/lamp-csar/scripts/install_php.sh         | 4 ++--
 .../csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh  | 2 +-
 .../csars/yaml/valid/lamp-csar/scripts/webserver_install.sh   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
index ed7786e1f..0220b3fe4 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # install php on a linux machine with php-mysql
-sudo apt-get install php -Y
-sudo apt-get install php-mysql -Y
+sudo apt-get install php -y
+sudo apt-get install php-mysql -y
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
index 1d4bfce3e..002569af4 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-sudo apt-get install mysql-server -Y
+sudo apt-get install mysql-server -y
 sudo systemctl enable mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
index d464b6a98..5fe5db1b7 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo apt-get install apache2 -Y
+sudo apt-get install apache2 -y

From 788254087a39b1a19fc17f4891bbf9f6c2641a57 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 11:23:06 +0100
Subject: [PATCH 16/52] Fix some bugs in shellscripts

---
 .../resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh | 2 +-
 .../csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh  | 4 ++++
 .../csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh      | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
index 6b8e6d42f..a1d0d04a9 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Setup MySQL root password and create user
-cat << EOF | mysql -u root --password=db_root_password
+cat << EOF | mysql -u root --password=abc
 CREATE DATABASE mydb;
 USE mydb;
 create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
index 002569af4..200f9f395 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
+# install mysql-server without password promt.
+# insert a fix pw
+echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
+echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
 sudo apt-get install mysql-server -y
 sudo systemctl enable mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
new file mode 100644
index 000000000..af53975bd
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo mv myphpapp.php /var/www/html/

From 34f2dc72c234ad15fed8cbf393e9b5f42086ff9c Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 11:23:57 +0100
Subject: [PATCH 17/52] Change structure and template

---
 .../lamp-csar/scripts/{start_myphpapp.php => myphpapp.php}   | 2 +-
 .../test/resources/csars/yaml/valid/lamp-csar/template.yaml  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/{start_myphpapp.php => myphpapp.php} (98%)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
similarity index 98%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
index f31554f30..c9fd6622c 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
@@ -4,7 +4,7 @@
 
 $db_host = "127.0.0.1";
 $db_user = "root";
-$db_password = "";
+$db_password = "abc";
 $db_name = "mydb";
 $db_port = 3306;
 
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index a34c63f06..d383f9829 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -31,7 +31,10 @@ topology_template:
         Standard:
           create: scripts/install_php.sh
           start:
-            implementation: scripts/start_myphpapp.php
+            implementation:
+              primary: scripts/start_myphpapp.sh
+              dependencies:
+                - scripts/myphpapp.php
             inputs:
               db_host: { get_attribute: [ apache_web_server, private_address ] }
               db_name: { get_property: [ my_db, name ] }

From 0d940fe3e96c4ab1172f9d24f667bf9222101752 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 12:00:49 +0100
Subject: [PATCH 18/52] Add missing package to apache_install_script

---
 .../resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php   | 2 +-
 .../csars/yaml/valid/lamp-csar/scripts/webserver_install.sh     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
index c9fd6622c..0a7431b8a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
@@ -70,7 +70,7 @@ function newDbConnection()
    <body>
       <h1>SimpleTaskApp</h1>
       <!-- form to enter tasks -->
-      <form class="insertTask" action="index.php" method="post">
+      <form class="insertTask" action="myphpapp.php" method="post">
          <input type="text" name="task" />
          <button type="submit" name="button">submit</button>
       </form>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
index 5fe5db1b7..d18484e9a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
 sudo apt-get install apache2 -y
+sudo apt-get install libapache2-mod-php7.0 

From 23741e4e6dff37ad11d9187355a156a92d5f5c6a Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 18:39:52 +0100
Subject: [PATCH 19/52] Export mysql credentials and move php

---
 .../csars/yaml/valid/lamp-csar/myphpapp.php   | 82 +++++++++++++++++++
 .../valid/lamp-csar/mysql-credentials.php     |  7 ++
 .../yaml/valid/lamp-csar/scripts/myphpapp.php |  7 +-
 .../valid/lamp-csar/scripts/start_myphpapp.sh |  1 +
 .../csars/yaml/valid/lamp-csar/template.yaml  |  3 +-
 5 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php
new file mode 100644
index 000000000..0a7431b8a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php
@@ -0,0 +1,82 @@
+<?php
+// include the credentials to connect to the db
+//include_once "mysql-credentials.php";
+
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "abc";
+$db_name = "mydb";
+$db_port = 3306;
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="myphpapp.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php
new file mode 100644
index 000000000..1e4fd6878
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php
@@ -0,0 +1,7 @@
+<?php
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "abc";
+$db_name = "mydb";
+$db_port = 3306;
+?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
index 0a7431b8a..6ce7893bc 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
@@ -1,12 +1,7 @@
 <?php
 // include the credentials to connect to the db
-//include_once "mysql-credentials.php";
+include_once "mysql-credentials.php";
 
-$db_host = "127.0.0.1";
-$db_user = "root";
-$db_password = "abc";
-$db_name = "mydb";
-$db_port = 3306;
 
 // get task from post after task was entered in form
 $post = $_POST['task'];
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
index af53975bd..c278150a8 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
 sudo mv myphpapp.php /var/www/html/
+sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index d383f9829..dc3ef8797 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -34,7 +34,8 @@ topology_template:
             implementation:
               primary: scripts/start_myphpapp.sh
               dependencies:
-                - scripts/myphpapp.php
+                - myphpapp.php
+                - mysql-credentials.php
             inputs:
               db_host: { get_attribute: [ apache_web_server, private_address ] }
               db_name: { get_property: [ my_db, name ] }

From dda06264fbbfff681f7a25ad56562aa45d2125aa Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 18:42:58 +0100
Subject: [PATCH 20/52] Delete old duplicate file

---
 .../yaml/valid/lamp-csar/scripts/myphpapp.php | 77 -------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
deleted file mode 100644
index 6ce7893bc..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/myphpapp.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-// include the credentials to connect to the db
-include_once "mysql-credentials.php";
-
-
-// get task from post after task was entered in form
-$post = $_POST['task'];
-if ($post != "") {
-    saveToDb($post);
-}
-/**
-* saved task to db
-*/
-function saveToDb($task)
-{
-    $conn = newDbConnection();
-    $task = htmlspecialchars($task);
-    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
-        echo("Creating task failed");
-    }
-    $conn->close();
-}
-/**
-* reads from db and prints it in html
-*/
-function readFromDb()
-{
-    $sql = "select * from tasks";
-    $conn = newDbConnection();
-    $result = $conn->query($sql);
-    $conn->close();
-    if ($result->num_rows > 0) {
-    // output data for each row
-    while ($row = $result->fetch_assoc()) {
-        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
-    }
-    return;
-    }
-    echo "0 results";
-}
-/**
-* generates new DB connection with given credentials
-*/
-function newDbConnection()
-{
-    extract($GLOBALS);
-   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
-    if ($conn->connect_error) {
-        die("Connection failed: " . $conn->connect_error);
-    }
-    return $conn;
-}
-?>
-<!DOCTYPE html>
-<html>
-   <head>
-      <meta charset="utf-8">
-      <title>SimpleTaskApp</title>
-      <style>
-      body {
-         font-family: sans-serif;
-      }
-      </style>
-   </head>
-   <body>
-      <h1>SimpleTaskApp</h1>
-      <!-- form to enter tasks -->
-      <form class="insertTask" action="myphpapp.php" method="post">
-         <input type="text" name="task" />
-         <button type="submit" name="button">submit</button>
-      </form>
-      <?php
-      //print tasks out of the db
-      readFromDb();
-       ?>
-   </body>
-</html>

From b8df47178090aa1ff262417e967d475177803383 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Thu, 16 Nov 2017 18:58:49 +0100
Subject: [PATCH 21/52] Change LAMP-CSAR structure

---
 .../webserver_install.sh                         |  0
 .../webserver_start.sh                           |  0
 .../lamp-csar/{scripts => my_app}/install_php.sh |  0
 .../valid/lamp-csar/{ => my_app}/myphpapp.php    |  0
 .../lamp-csar/{ => my_app}/mysql-credentials.php |  0
 .../{scripts => my_app}/start_myphpapp.sh        |  0
 .../lamp-csar/{scripts => my_db}/db_create.sh    |  0
 .../mysql_dbms_configure.sh                      |  0
 .../mysql_dbms_install.sh                        |  0
 .../{scripts => mysql_dbms}/mysql_dbms_start.sh  |  0
 .../csars/yaml/valid/lamp-csar/template.yaml     | 16 ++++++++--------
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => apache_web_server}/webserver_install.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => apache_web_server}/webserver_start.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => my_app}/install_php.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{ => my_app}/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{ => my_app}/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => my_app}/start_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => my_db}/db_create.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => mysql_dbms}/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => mysql_dbms}/mysql_dbms_install.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/lamp-csar/{scripts => mysql_dbms}/mysql_dbms_start.sh (100%)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_install.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/webserver_start.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/start_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/start_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/start_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/db_create.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_install.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/scripts/mysql_dbms_start.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index dc3ef8797..16245d9ae 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -29,10 +29,10 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          create: scripts/install_php.sh
+          create: my_app/install_php.sh
           start:
             implementation:
-              primary: scripts/start_myphpapp.sh
+              primary: my_app/start_myphpapp.sh
               dependencies:
                 - myphpapp.php
                 - mysql-credentials.php
@@ -49,8 +49,8 @@ topology_template:
         - host: server
       interfaces:
         Standard:
-          create: scripts/webserver_install.sh
-          start: scripts/webserver_start.sh
+          create: apache_web_server/webserver_install.sh
+          start: apache_web_server/webserver_start.sh
 
     my_db:
       type: tosca.nodes.Database.MySQL
@@ -67,7 +67,7 @@ topology_template:
         - host: mysql_dbms
         interfaces:
           Standard:
-            create: scripts/db_create.sh
+            create: my_db/db_create.sh
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
@@ -80,9 +80,9 @@ topology_template:
           Standard:
             inputs:
               db_root_password: { get_property: [ mysql_dbms, root_password ] }
-            create: scripts/mysql_dbms_install.sh
-            start: scripts/mysql_dbms_start.sh
-            configure: scripts/mysql_dbms_configure.sh
+            create: mysql_dbms/mysql_dbms_install.sh
+            start: mysql_dbms/mysql_dbms_start.sh
+            configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute

From d28bae197724c0b9a23a640ee2f4300656a6c9e2 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Thu, 16 Nov 2017 19:08:13 +0100
Subject: [PATCH 22/52] Add no-input LAMP-CSAR

---
 .../apache_web_server/webserver_install.sh    |  3 +
 .../apache_web_server/webserver_start.sh      |  2 +
 .../lamp-csar-no-input/my_app/install_php.sh  |  4 +
 .../lamp-csar-no-input/my_app/myphpapp.php    | 82 +++++++++++++++++
 .../my_app/mysql-credentials.php              |  7 ++
 .../my_app/start_myphpapp.sh                  |  3 +
 .../lamp-csar-no-input/my_db/db_create.sh     |  8 ++
 .../mysql_dbms/mysql_dbms_configure.sh        |  2 +
 .../mysql_dbms/mysql_dbms_install.sh          |  7 ++
 .../mysql_dbms/mysql_dbms_start.sh            |  2 +
 .../valid/lamp-csar-no-input/template.yaml    | 89 +++++++++++++++++++
 .../csars/yaml/valid/lamp-csar/template.yaml  | 18 ++--
 12 files changed, 215 insertions(+), 12 deletions(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
new file mode 100644
index 000000000..d18484e9a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo apt-get install apache2 -y
+sudo apt-get install libapache2-mod-php7.0 
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
new file mode 100644
index 000000000..d8cf0070b
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo service apache2 start
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
new file mode 100644
index 000000000..0220b3fe4
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# install php on a linux machine with php-mysql
+sudo apt-get install php -y
+sudo apt-get install php-mysql -y
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
new file mode 100644
index 000000000..0a7431b8a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
@@ -0,0 +1,82 @@
+<?php
+// include the credentials to connect to the db
+//include_once "mysql-credentials.php";
+
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "abc";
+$db_name = "mydb";
+$db_port = 3306;
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="myphpapp.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
new file mode 100644
index 000000000..1e4fd6878
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
@@ -0,0 +1,7 @@
+<?php
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "abc";
+$db_name = "mydb";
+$db_port = 3306;
+?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
new file mode 100644
index 000000000..c278150a8
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo mv myphpapp.php /var/www/html/
+sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
new file mode 100644
index 000000000..a1d0d04a9
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Setup MySQL root password and create user
+cat << EOF | mysql -u root --password=abc
+CREATE DATABASE mydb;
+USE mydb;
+create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
+EXIT
+EOF
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
new file mode 100644
index 000000000..c6861c967
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo mysqladmin -u root -p password db_root_password
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
new file mode 100644
index 000000000..200f9f395
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# install mysql-server without password promt.
+# insert a fix pw
+echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
+echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
+sudo apt-get install mysql-server -y
+sudo systemctl enable mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
new file mode 100644
index 000000000..986fc4f72
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo systemctl start mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
new file mode 100644
index 000000000..f078ade07
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
@@ -0,0 +1,89 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+description: Template for deploying a LAMP stack.
+metadata:
+  template_name: lamp-stack-template
+  template_author: stupro-toscana
+  template_version: 1.0
+
+
+topology_template:
+  node_templates:
+    my_app:
+      type: tosca.nodes.WebApplication
+      requirements:
+        - host: apache_web_server
+        - database_endpoint: my_db
+      interfaces:
+        Standard:
+          create: my_app/install_php.sh
+          start:
+            implementation:
+              primary: my_app/start_myphpapp.sh
+              dependencies:
+                - myphpapp.php
+                - mysql-credentials.php
+            inputs:
+              db_host: { get_attribute: [ apache_web_server, private_address ] }
+              db_name: { get_property: [ my_db, name ] }
+              db_user: { get_property: [ my_db, user ] }
+              db_password: { get_property: [ my_db, password ] }
+              db_port: { get_property: [ SELF, database_endpoint, port ] }
+
+    apache_web_server:
+      type: tosca.nodes.WebServer.Apache
+      requirements:
+        - host: server
+      interfaces:
+        Standard:
+          create: apache_web_server/webserver_install.sh
+          start: apache_web_server/webserver_start.sh
+
+    my_db:
+      type: tosca.nodes.Database.MySQL
+      properties:
+        name: { get_input: database_name }
+        user: { get_input: database_user }
+        password: { get_input: database_password }
+        port: { get_input: database_port }
+      capabilities:
+        database_endpoint:
+          properties:
+            port: { get_input: database_port }
+      requirements:
+        - host: mysql_dbms
+        interfaces:
+          Standard:
+            create: my_db/db_create.sh
+
+    mysql_dbms:
+      type: tosca.nodes.DBMS.MySQL
+      properties:
+          root_password: { abc }
+          port: { 3306 }
+        requirements:
+          - host: server
+        interfaces:
+          Standard:
+            inputs:
+              db_root_password: { get_property: [ mysql_dbms, root_password ] }
+            create: mysql_dbms/mysql_dbms_install.sh
+            start: mysql_dbms/mysql_dbms_start.sh
+            configure: mysql_dbms/mysql_dbms_configure.sh
+
+    server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties:
+            num_cpus: 1
+            disk_size: 25 GB
+            mem_size: 2048 MB
+        os:
+          properties:
+            type: linux
+            distribution: ubuntu
+            version: 16.04
+    outputs:
+      endpoint:
+        description: endpoint of the php-app
+          value: { get_attribute: [ server, public_address ] }
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 16245d9ae..941e70f56 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -36,15 +36,9 @@ topology_template:
               dependencies:
                 - myphpapp.php
                 - mysql-credentials.php
-            inputs:
-              db_host: { get_attribute: [ apache_web_server, private_address ] }
-              db_name: { get_property: [ my_db, name ] }
-              db_user: { get_property: [ my_db, user ] }
-              db_password: { get_property: [ my_db, password ] }
-              db_port: { get_property: [ SELF, database_endpoint, port ] }
 
     apache_web_server:
-      type: tosca.nodes.WebServer
+      type: tosca.nodes.WebServer.Apache
       requirements:
         - host: server
       interfaces:
@@ -55,14 +49,14 @@ topology_template:
     my_db:
       type: tosca.nodes.Database.MySQL
       properties:
-        name: { get_input: database_name }
-        user: { get_input: database_user }
-        password: { get_input: database_password }
-        port: { get_input: database_port }
+        name: { mydb }
+        user: { root }
+        password: { 123 }
+        port: { 3306 }
       capabilities:
         database_endpoint:
           properties:
-            port: { get_input: database_port }
+            port: { 3306 }
       requirements:
         - host: mysql_dbms
         interfaces:

From fe8130dd7390e7549b3c97c8eab72e60a7778431 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Thu, 16 Nov 2017 19:08:51 +0100
Subject: [PATCH 23/52] Add CSAR-files for LAMP CSARs

---
 .../csars/yaml/valid/lamp-csar-no-input.csar     | Bin 0 -> 5567 bytes
 .../resources/csars/yaml/valid/lamp-csar.csar    | Bin 0 -> 5269 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar.csar

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar
new file mode 100644
index 0000000000000000000000000000000000000000..c5b7f55418f04cc6ddc543acd89440bedf1c1df5
GIT binary patch
literal 5567
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

literal 0
HcmV?d00001

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar.csar
new file mode 100644
index 0000000000000000000000000000000000000000..16e3e0143116e157adddeb7202f2283c9b033ef2
GIT binary patch
literal 5269
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

literal 0
HcmV?d00001


From 0ce405ce1eb070c11caa891f32d9be6b9935f159 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Thu, 16 Nov 2017 19:13:16 +0100
Subject: [PATCH 24/52] include mysql-credentials

---
 .../csars/yaml/valid/lamp-csar/my_app/myphpapp.php        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
index 0a7431b8a..0fb716ad7 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
@@ -1,12 +1,6 @@
 <?php
 // include the credentials to connect to the db
-//include_once "mysql-credentials.php";
-
-$db_host = "127.0.0.1";
-$db_user = "root";
-$db_password = "abc";
-$db_name = "mydb";
-$db_port = 3306;
+include_once "mysql-credentials.php";
 
 // get task from post after task was entered in form
 $post = $_POST['task'];

From 376fc8077c79f24d37d02c3048801482213aee63 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Thu, 16 Nov 2017 19:18:38 +0100
Subject: [PATCH 25/52] Fix no-input LAMP-CSAR

---
 .../csars/yaml/valid/lamp-csar-no-input.csar  | Bin 5567 -> 5456 bytes
 .../mysql_dbms/mysql_dbms_configure.sh        |   2 +-
 .../valid/lamp-csar-no-input/template.yaml    |  18 +++++-------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar
index c5b7f55418f04cc6ddc543acd89440bedf1c1df5..b18272cdddfac75763c0e7a2cbd3781ed592ce2b 100644
GIT binary patch
delta 1009
zcmdn5eL-u(MMiNh1`x2ERp7l#>t~7?kPX77lLh(3CjVnpGE-L6Ps+^GPf9G#;N>bV
zP03fttt>9gNleMj%u~=URVd2OFHz7fP$)<&E-ue6N>NBmO6KL-oXAwj!Dj+AbzzM9
z-33ex3_To^A8@JFFAcq$ciBK>-~27*ADAy}Nltd!``Y1A+EfSEM@)*RJN=`xKc4@y
zSy15pxs8)eJTJF)?G!IP_w(HQ@|^0oTyB;*twM1bPhSW}w9i&u8S3W|%(Qlf&P&nQ
zn7D$1R?%bXXTlwHKRax@CB(Pv%G3bsLnr=b{heuXzN`JsC#R<LIhFO>_UutOVy+fq
z$mtzql$pk9k!{K>!d<uitxzp%@>d<zr4jO%QfsCr)_r`w_2SZdp<9kFIpI}o;SnS9
zaFS^1F%$V0TZ}GDndiFa^ghRZM$1H4yH&SaaQ8b#OjuC!>B<_(o7vB&w@8M)X|!|p
zla27%z~8y{#7t(cE@@qnM~2+<>bFZwX}G(I>DN5-d79^R`WGG6(mC>ImeMn)MCH?y
zX6-$BXCJ@I&aWr8L{GdC;-IxAu<Ue%;>@*t=O%M&X_xfPU;97L_18v)fK~~Wdsk~W
z9NmAp>U+ew4QeHiShZt$eJ&KbFW0=S;<L>wEPYbg@4xk8Zkp!`qu*yZpVf?7#w)B+
zKU4K^RghZN{~J8v+t!)Izl)ZUlV!ffKXWDjgZz?{#h;c>X6KQ88kT*3y7aR<o447#
ziiqP0x%Eq9-@dpzWuKV1PrGWi6(0Y5|AktR>~V|9mra6i7{0W+JL9I|cIC3y$Ie&!
zWjnfi>K_x)FMoYja?XS+rB#cr2KUa$I9hQa{(eXOwmX&EZKXae7OX$`!r+d3<Ca@p
zu^aS{Wii$Y{j1chxp0Yv|MF%@>C$Hws}wR5n+~U^uXu3C_QB?#+>iIyy4&65-71u_
zI_AzE_1E*Fc7Im7zICco>-@zh?seH*$uB<9{3)^H#k^Cua|(lBmwdP}L+?aq@Xh+q
z{8fv#A9>&SK-E_DaP(gJ7oAfTV|A@RO!;Z0DN>W4QRVD&;-lx%o?`BE6Xgs0{xeO^
z=abp2#^=Q(j3swWZWah*lP>Z%WsjeHU%-YbjA`;jA@NB}B9lD?BN$yLFBEKIJPITw
zCff)FGyVm$tXYI7?-uf7oH}`eknH3eEIgBqh5eWUIDk53CeIg6X8I0cDu~20woh&l
z$zt3GBxNRX@k|yLHBdm!M+^)K3@V^Z3j_*4yq61TjOgT_T)cu@U;zdOMg|FndZokq
P?31U7DznYz1t|ppBS5Wu

delta 1137
zcmcbhwO@O~MMiNE1_lNWhQ}-Ny?5<szw8L)IRmlj<U%GL-{kzfw9NF<qEx-&4AT>a
zTn7|*STDqW;M-p!)~~`TsTGp!yY$PqM-Qa$SGt@tHM;q9E^pwJ`}1ZmdD3NYAvC_F
z%`I(ySz|%e^s)+b#?4_&g&cxkXB2oJYJI1|!py*Mgo}Ye0cerf<ab=W^>f2c=G`_B
z*vo#x{sVK;&D={1KIpzI>ueO$yWkusFvVnBr-#a6)s<0S?prSr^P0GH*FyefKkl6=
zFq;%MtLLIjSxmv{r3POFw;Vh<>&k?OOSKxp*66&@-eqNf`e4c|ZE1^m#=x}3H%rtk
zS2%^myx~+XH=lj}NW`?e>d(_vBc>VGpT71yz2$~m3s=~oSt4sfx*cM+oM<>Y$JS%7
zTdZH^PLA0^Yy3N{>!v>V_vgHqD)-Ly8K*g?wVqiRZCJ<Y9vQeS<a48!Hf!(e&gZkA
zNG~z>617Rb_jKCwhX)IJRXL<hOp_h?F5NIq>`G-{;6EXVS<3vz@*e?9&M>e})IQ1j
zsjyzW@>Wp+>zBUN3)lB-^?Bm+yl$oROt$wikB>~^=1B<*C=KYe{L;B&U9LdyVRbVL
z0h#Or7E_+7UJhMuvtmJN>#2{MugbUk+gq_HJ#OxG-)|lH$GUHJds3s_LZQ=<iN{>@
zrgSs*FAI)3{@46w^U^a>XM>+Bf3BU=#r^(P@`|-K_16=4emef^F>U*mW193*^TIZ#
z*3xx)9qsBWvQo1qe)-U{B<Yxq=iKui+ox#q2Hj4+beq3iUjNwA_Fn-Du8D5xeQbJP
z`t||OyrwIicLQJ7R_^TIw&O^q?P6bknbrR*4?1urId0(l-t+$b>;SddS-+pIdupmE
zzs+I)Bq!GO$x1f$*Zfn~%r(58Y?~L(75qo+{mGUR|Btp}J0;z;pR&qZ8S5=%oBiSc
z|F`GF{cF7vvb=;h7IOA>XN0(wwoSib{MG49?fGLdjCb<3sjJA#PP)WrHGApI@^YCu
zr%zuk?LE_ybjMSl_sEybSKDo>C602$ZuxgK`DMk9#V3sX=6`*?xvze%z^kgSGZi(<
zYTkcYvUb`9|F8Dvca(2BqH(Y${71>08yttGngpMFP@Kx~<j$SP#jnM0)&Fg)*(JM3
zb&BqeT~*#@wh^-~>s;R_8na`*^67_%*4!`AD?PMJQQ2<ey2)2Vdp*<HpB6u{d9h#A
zdd>;ijqC~)JN0Ks#eC>rQ&8|l>^;}Iyy=gEb1I7evrgiZ*}R?Ci%A$u-kdBV5XR=S
zahIQO+~fiQ8>U32$%)L`ljkyVO@1uk#~3hKQAlDElgQ*a!7#=PK#uI>OM-q(94wO`
zGRsW16N+J4z%qFwi^k+5LVirq96+Yr<Sq{3$*#hFj7*aSMI<M$6;5WH1Y~6~o&=II
zlV^z7C}3n-1{Gi#0Rjp@e1Z$;1W`~P7UTj8FfcGONH9dOw4Y*~tS+j|#>EFx3IJBy
B@;3kg

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
index c6861c967..47a101c09 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo mysqladmin -u root -p password db_root_password
+sudo mysqladmin -u root -p password abc
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
index f078ade07..c9fd6bbda 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
@@ -22,12 +22,6 @@ topology_template:
               dependencies:
                 - myphpapp.php
                 - mysql-credentials.php
-            inputs:
-              db_host: { get_attribute: [ apache_web_server, private_address ] }
-              db_name: { get_property: [ my_db, name ] }
-              db_user: { get_property: [ my_db, user ] }
-              db_password: { get_property: [ my_db, password ] }
-              db_port: { get_property: [ SELF, database_endpoint, port ] }
 
     apache_web_server:
       type: tosca.nodes.WebServer.Apache
@@ -41,14 +35,14 @@ topology_template:
     my_db:
       type: tosca.nodes.Database.MySQL
       properties:
-        name: { get_input: database_name }
-        user: { get_input: database_user }
-        password: { get_input: database_password }
-        port: { get_input: database_port }
+        name: { mydb }
+        user: { root }
+        password: { abc }
+        port: { 3306 }
       capabilities:
         database_endpoint:
           properties:
-            port: { get_input: database_port }
+            port: { 3306 }
       requirements:
         - host: mysql_dbms
         interfaces:
@@ -64,8 +58,6 @@ topology_template:
           - host: server
         interfaces:
           Standard:
-            inputs:
-              db_root_password: { get_property: [ mysql_dbms, root_password ] }
             create: mysql_dbms/mysql_dbms_install.sh
             start: mysql_dbms/mysql_dbms_start.sh
             configure: mysql_dbms/mysql_dbms_configure.sh

From 0191a5ade3a8781ad4d50e16ed34ce60577945a8 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Sat, 18 Nov 2017 12:15:46 +0100
Subject: [PATCH 26/52] Change package install in one line

---
 .../valid/lamp-csar/apache_web_server/webserver_install.sh     | 3 +--
 .../resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
index d18484e9a..5bb9f5986 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
-sudo apt-get install apache2 -y
-sudo apt-get install libapache2-mod-php7.0 
+sudo apt-get install -y apache2 libapache2-mod-php7.0 
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
index 0220b3fe4..a718ff77c 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 # install php on a linux machine with php-mysql
-sudo apt-get install php -y
-sudo apt-get install php-mysql -y
+sudo apt-get install -y php php-mysql

From f8eb6ae6aff48af0086d92134ea6de4bcdc8bc0d Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Sat, 18 Nov 2017 12:27:06 +0100
Subject: [PATCH 27/52] Delete duplicate folder and copy second template

---
 .../apache_web_server/webserver_install.sh    |  3 -
 .../apache_web_server/webserver_start.sh      |  2 -
 .../lamp-csar-no-input/my_app/install_php.sh  |  4 -
 .../lamp-csar-no-input/my_app/myphpapp.php    | 82 -------------------
 .../my_app/mysql-credentials.php              |  7 --
 .../my_app/start_myphpapp.sh                  |  3 -
 .../lamp-csar-no-input/my_db/db_create.sh     |  8 --
 .../mysql_dbms/mysql_dbms_configure.sh        |  2 -
 .../mysql_dbms/mysql_dbms_install.sh          |  7 --
 .../mysql_dbms/mysql_dbms_start.sh            |  2 -
 .../template-no-input.yaml}                   |  0
 11 files changed, 120 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar-no-input/template.yaml => lamp-csar/template-no-input.yaml} (100%)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
deleted file mode 100644
index d18484e9a..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo apt-get install apache2 -y
-sudo apt-get install libapache2-mod-php7.0 
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
deleted file mode 100644
index d8cf0070b..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/apache_web_server/webserver_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo service apache2 start
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
deleted file mode 100644
index 0220b3fe4..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/install_php.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# install php on a linux machine with php-mysql
-sudo apt-get install php -y
-sudo apt-get install php-mysql -y
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
deleted file mode 100644
index 0a7431b8a..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/myphpapp.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-// include the credentials to connect to the db
-//include_once "mysql-credentials.php";
-
-$db_host = "127.0.0.1";
-$db_user = "root";
-$db_password = "abc";
-$db_name = "mydb";
-$db_port = 3306;
-
-// get task from post after task was entered in form
-$post = $_POST['task'];
-if ($post != "") {
-    saveToDb($post);
-}
-/**
-* saved task to db
-*/
-function saveToDb($task)
-{
-    $conn = newDbConnection();
-    $task = htmlspecialchars($task);
-    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
-        echo("Creating task failed");
-    }
-    $conn->close();
-}
-/**
-* reads from db and prints it in html
-*/
-function readFromDb()
-{
-    $sql = "select * from tasks";
-    $conn = newDbConnection();
-    $result = $conn->query($sql);
-    $conn->close();
-    if ($result->num_rows > 0) {
-    // output data for each row
-    while ($row = $result->fetch_assoc()) {
-        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
-    }
-    return;
-    }
-    echo "0 results";
-}
-/**
-* generates new DB connection with given credentials
-*/
-function newDbConnection()
-{
-    extract($GLOBALS);
-   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
-    if ($conn->connect_error) {
-        die("Connection failed: " . $conn->connect_error);
-    }
-    return $conn;
-}
-?>
-<!DOCTYPE html>
-<html>
-   <head>
-      <meta charset="utf-8">
-      <title>SimpleTaskApp</title>
-      <style>
-      body {
-         font-family: sans-serif;
-      }
-      </style>
-   </head>
-   <body>
-      <h1>SimpleTaskApp</h1>
-      <!-- form to enter tasks -->
-      <form class="insertTask" action="myphpapp.php" method="post">
-         <input type="text" name="task" />
-         <button type="submit" name="button">submit</button>
-      </form>
-      <?php
-      //print tasks out of the db
-      readFromDb();
-       ?>
-   </body>
-</html>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
deleted file mode 100644
index 1e4fd6878..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/mysql-credentials.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$db_host = "127.0.0.1";
-$db_user = "root";
-$db_password = "abc";
-$db_name = "mydb";
-$db_port = 3306;
-?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
deleted file mode 100644
index c278150a8..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_app/start_myphpapp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo mv myphpapp.php /var/www/html/
-sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
deleted file mode 100644
index a1d0d04a9..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/my_db/db_create.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Setup MySQL root password and create user
-cat << EOF | mysql -u root --password=abc
-CREATE DATABASE mydb;
-USE mydb;
-create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
-EXIT
-EOF
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
deleted file mode 100644
index 47a101c09..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_configure.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo mysqladmin -u root -p password abc
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
deleted file mode 100644
index 200f9f395..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_install.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# install mysql-server without password promt.
-# insert a fix pw
-echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
-echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
-sudo apt-get install mysql-server -y
-sudo systemctl enable mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
deleted file mode 100644
index 986fc4f72..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/mysql_dbms/mysql_dbms_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo systemctl start mysql.service
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar-no-input/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml

From 1d3ba141561f6b5f5e207ce0ab9eb38b1f4373a6 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 12:35:12 +0100
Subject: [PATCH 28/52] Add update&upgrade to install scripts

---
 .../valid/lamp-csar/apache_web_server/webserver_install.sh     | 3 ++-
 .../resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh | 1 +
 .../yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh      | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
index 5bb9f5986..5217bedb0 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-sudo apt-get install -y apache2 libapache2-mod-php7.0 
+sudo apt-get update -y && sudo apt-get upgrade -y
+sudo apt-get install -y apache2 libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
index a718ff77c..570f39c77 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 # install php on a linux machine with php-mysql
+sudo apt-get update -y && sudo apt-get upgrade -y
 sudo apt-get install -y php php-mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
index 200f9f395..618cf26f7 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 # install mysql-server without password promt.
 # insert a fix pw
+sudo apt-get update -y && sudo apt-get upgrade -y
 echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
 echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
 sudo apt-get install mysql-server -y
-sudo systemctl enable mysql.service
+sudo systemctl enable mysql

From 9685f1aeab18ae84c397b755e423434c0f63242a Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 12:36:50 +0100
Subject: [PATCH 29/52] Exchange deprecated version of starting service

---
 .../yaml/valid/lamp-csar/apache_web_server/webserver_start.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
index d8cf0070b..4448a1246 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo service apache2 start
+sudo systemctl start apache2

From f259aea4c2ff6a77f970a08cc1ccadf7df1b4b1d Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 12:38:55 +0100
Subject: [PATCH 30/52] Delete unnecessary .service

---
 .../csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
index 986fc4f72..563b89a3d 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo systemctl start mysql.service
+sudo systemctl start mysql

From 5a62c520d80a2063536258f6c331a2245877da8d Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 12:39:56 +0100
Subject: [PATCH 31/52] Update msql configure

---
 .../csars/yaml/valid/lamp-csar/my_db/db_create.sh         | 8 --------
 .../valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh    | 7 ++++++-
 .../csars/yaml/valid/lamp-csar/template-no-input.yaml     | 3 ---
 .../resources/csars/yaml/valid/lamp-csar/template.yaml    | 3 ---
 4 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh
deleted file mode 100644
index a1d0d04a9..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_db/db_create.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Setup MySQL root password and create user
-cat << EOF | mysql -u root --password=abc
-CREATE DATABASE mydb;
-USE mydb;
-create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
-EXIT
-EOF
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
index c6861c967..6385adbc0 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
@@ -1,2 +1,7 @@
 #!/bin/bash
-sudo mysqladmin -u root -p password db_root_password
+cat << EOF | mysql -u root --password=abc
+CREATE DATABASE mydb;
+USE mydb;
+create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
+EXIT
+EOF
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml
index c9fd6bbda..0fb779870 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml
@@ -45,9 +45,6 @@ topology_template:
             port: { 3306 }
       requirements:
         - host: mysql_dbms
-        interfaces:
-          Standard:
-            create: my_db/db_create.sh
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
index 941e70f56..7cebfc0d2 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
@@ -59,9 +59,6 @@ topology_template:
             port: { 3306 }
       requirements:
         - host: mysql_dbms
-        interfaces:
-          Standard:
-            create: my_db/db_create.sh
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL

From 5a837987443cc50b9d27bb1c7fc48e51c1a490c8 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 12:48:40 +0100
Subject: [PATCH 32/52] Create two seperate folders for input & NoInput

---
 .../apache_web_server/webserver_install.sh    |  0
 .../apache_web_server/webserver_start.sh      |  0
 .../my_app/install_php.sh                     |  0
 .../my_app/myphpapp.php                       |  0
 .../my_app/mysql-credentials.php              |  0
 .../my_app/start_myphpapp.sh                  |  0
 .../mysql_dbms/mysql_dbms_configure.sh        |  0
 .../mysql_dbms/mysql_dbms_install.sh          |  0
 .../mysql_dbms/mysql_dbms_start.sh            |  0
 .../template.yaml                             |  0
 .../apache_web_server/webserver_install.sh    |  3 +
 .../apache_web_server/webserver_start.sh      |  2 +
 .../lamp-csar_NoInput/my_app/install_php.sh   |  4 +
 .../lamp-csar_NoInput/my_app/myphpapp.php     | 76 +++++++++++++++++++
 .../my_app/mysql-credentials.php              |  7 ++
 .../my_app/start_myphpapp.sh                  |  3 +
 .../mysql_dbms/mysql_dbms_configure.sh        |  7 ++
 .../mysql_dbms/mysql_dbms_install.sh          |  8 ++
 .../mysql_dbms/mysql_dbms_start.sh            |  2 +
 .../template.yaml}                            |  0
 20 files changed, 112 insertions(+)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/apache_web_server/webserver_install.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/apache_web_server/webserver_start.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/my_app/install_php.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/my_app/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/my_app/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/my_app/start_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/mysql_dbms/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/mysql_dbms/mysql_dbms_install.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/mysql_dbms/mysql_dbms_start.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar => lamp-csar_Input}/template.yaml (100%)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar/template-no-input.yaml => lamp-csar_NoInput/template.yaml} (100%)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_install.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/apache_web_server/webserver_start.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/start_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/my_app/start_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/start_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_install.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/mysql_dbms/mysql_dbms_start.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
new file mode 100644
index 000000000..5217bedb0
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo apt-get update -y && sudo apt-get upgrade -y
+sudo apt-get install -y apache2 libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
new file mode 100644
index 000000000..4448a1246
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo systemctl start apache2
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
new file mode 100644
index 000000000..570f39c77
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# install php on a linux machine with php-mysql
+sudo apt-get update -y && sudo apt-get upgrade -y
+sudo apt-get install -y php php-mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php
new file mode 100644
index 000000000..0fb716ad7
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php
@@ -0,0 +1,76 @@
+<?php
+// include the credentials to connect to the db
+include_once "mysql-credentials.php";
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="myphpapp.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php
new file mode 100644
index 000000000..1e4fd6878
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php
@@ -0,0 +1,7 @@
+<?php
+$db_host = "127.0.0.1";
+$db_user = "root";
+$db_password = "abc";
+$db_name = "mydb";
+$db_port = 3306;
+?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh
new file mode 100644
index 000000000..c278150a8
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo mv myphpapp.php /var/www/html/
+sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh
new file mode 100644
index 000000000..6385adbc0
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+cat << EOF | mysql -u root --password=abc
+CREATE DATABASE mydb;
+USE mydb;
+create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
+EXIT
+EOF
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh
new file mode 100644
index 000000000..618cf26f7
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# install mysql-server without password promt.
+# insert a fix pw
+sudo apt-get update -y && sudo apt-get upgrade -y
+echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
+echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
+sudo apt-get install mysql-server -y
+sudo systemctl enable mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh
new file mode 100644
index 000000000..563b89a3d
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo systemctl start mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar/template-no-input.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml

From 8f23b3318b9a86c1da24e3909fa07950d0c7db58 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 13:35:24 +0100
Subject: [PATCH 33/52] Use environment variables in script to enable input

---
 .../valid/lamp-csar_Input/my_app/mysql-credentials.php    | 8 ++++----
 .../lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh    | 2 +-
 .../lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
index 1e4fd6878..d645d4e35 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
@@ -1,7 +1,7 @@
 <?php
-$db_host = "127.0.0.1";
+$db_host = getenv('database_host');
 $db_user = "root";
-$db_password = "abc";
-$db_name = "mydb";
-$db_port = 3306;
+$db_password = getenv('my_mysql_rootpw');
+$db_name = getenv('database_name');
+$db_port = getenv('database_port');
 ?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
index 6385adbc0..b16dbf6d4 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cat << EOF | mysql -u root --password=abc
+cat << EOF | mysql -u root --password=${my_mysql_rootpw}
 CREATE DATABASE mydb;
 USE mydb;
 create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
index 618cf26f7..571c736bb 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
@@ -2,7 +2,7 @@
 # install mysql-server without password promt.
 # insert a fix pw
 sudo apt-get update -y && sudo apt-get upgrade -y
-echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
-echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
+echo "mysql-server mysql-server/root_password password ${my_mysql_rootpw}" | sudo debconf-set-selections
+echo "mysql-server mysql-server/root_password_again password ${my_mysql_rootpw}" | sudo debconf-set-selections
 sudo apt-get install mysql-server -y
 sudo systemctl enable mysql

From 62cacc29b149a636974bf92d7f40fcf19f58b2e7 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Mon, 20 Nov 2017 13:48:54 +0100
Subject: [PATCH 34/52] Added input references and removed unnecessary
 references to concrete implementaion of scripts

---
 .../yaml/valid/lamp-csar_Input/template.yaml  | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
index 7cebfc0d2..162d81d56 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
@@ -10,16 +10,10 @@ topology_template:
   inputs:
     database_name:
       type: string
-    database_user:
-      type: string
-    database_password:
-      type: string
     database_port:
       type: integer
-    my_mysql_rootpw:
+    database_password:
       type: string
-    my_mysql_port:
-      type: integer
 
   node_templates:
     my_app:
@@ -29,6 +23,7 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
+          inputs: db_host: { get_attribute: [ server, private_address ] }
           create: my_app/install_php.sh
           start:
             implementation:
@@ -41,38 +36,31 @@ topology_template:
       type: tosca.nodes.WebServer.Apache
       requirements:
         - host: server
-      interfaces:
-        Standard:
-          create: apache_web_server/webserver_install.sh
-          start: apache_web_server/webserver_start.sh
 
     my_db:
       type: tosca.nodes.Database.MySQL
       properties:
-        name: { mydb }
-        user: { root }
-        password: { 123 }
-        port: { 3306 }
+        name: { get_input: database_name }
+        password: { get_input: database_password }
+        port: { get_input: database_port }
       capabilities:
         database_endpoint:
           properties:
-            port: { 3306 }
+            port: { get_property: [ SELF, port ] }
       requirements:
         - host: mysql_dbms
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
       properties:
-          root_password: { get_input: my_mysql_rootpw }
-          port: { get_input: my_mysql_port }
+          root_password: { get_input: database_password }
+          port: { get_input: database_port }
         requirements:
           - host: server
         interfaces:
           Standard:
             inputs:
-              db_root_password: { get_property: [ mysql_dbms, root_password ] }
-            create: mysql_dbms/mysql_dbms_install.sh
-            start: mysql_dbms/mysql_dbms_start.sh
+              db_root_password: { get_property: [ SELF, root_password ] }
             configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:

From 86c5d316674a1f47cd08f46d632eac9be8bb68b4 Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 13:54:16 +0100
Subject: [PATCH 35/52] Deleted unnecessary files

---
 .../apache_web_server/webserver_install.sh                | 3 ---
 .../lamp-csar_Input/apache_web_server/webserver_start.sh  | 2 --
 .../yaml/valid/lamp-csar_Input/my_app/install_php.sh      | 2 +-
 .../valid/lamp-csar_Input/my_app/mysql-credentials.php    | 2 +-
 .../lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh    | 2 +-
 .../lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh      | 8 --------
 .../valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh  | 2 --
 7 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh
deleted file mode 100644
index 5217bedb0..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo apt-get update -y && sudo apt-get upgrade -y
-sudo apt-get install -y apache2 libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh
deleted file mode 100644
index 4448a1246..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/apache_web_server/webserver_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo systemctl start apache2
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
index 570f39c77..d3d61ecb4 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # install php on a linux machine with php-mysql
 sudo apt-get update -y && sudo apt-get upgrade -y
-sudo apt-get install -y php php-mysql
+sudo apt-get install -y php php-mysql libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
index d645d4e35..f32cefde7 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
@@ -1,7 +1,7 @@
 <?php
 $db_host = getenv('database_host');
 $db_user = "root";
-$db_password = getenv('my_mysql_rootpw');
+$db_password = getenv('database_password');
 $db_name = getenv('database_name');
 $db_port = getenv('database_port');
 ?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
index b16dbf6d4..86641e949 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cat << EOF | mysql -u root --password=${my_mysql_rootpw}
+cat << EOF | mysql -u root --password=${database_password}
 CREATE DATABASE mydb;
 USE mydb;
 create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
deleted file mode 100644
index 571c736bb..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# install mysql-server without password promt.
-# insert a fix pw
-sudo apt-get update -y && sudo apt-get upgrade -y
-echo "mysql-server mysql-server/root_password password ${my_mysql_rootpw}" | sudo debconf-set-selections
-echo "mysql-server mysql-server/root_password_again password ${my_mysql_rootpw}" | sudo debconf-set-selections
-sudo apt-get install mysql-server -y
-sudo systemctl enable mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh
deleted file mode 100644
index 563b89a3d..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo systemctl start mysql

From 05e9d5d6fe340e10a0db32ea6ad117828ba2dafa Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Mon, 20 Nov 2017 16:00:57 +0100
Subject: [PATCH 36/52] Changed output to full URL

---
 .../csars/yaml/valid/lamp-csar_Input/template.yaml       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
index 162d81d56..de83d3336 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
@@ -23,7 +23,7 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          inputs: db_host: { get_attribute: [ server, private_address ] }
+          inputs: database_host: { get_attribute: [ server, private_address ] }
           create: my_app/install_php.sh
           start:
             implementation:
@@ -76,7 +76,8 @@ topology_template:
             type: linux
             distribution: ubuntu
             version: 16.04
+
     outputs:
-      endpoint:
-        description: endpoint of the php-app
-          value: { get_attribute: [ server, public_address ] }
+      server_url:
+        description: Concatenated URL with public server address and port
+        value: { concat: [ 'http://', get_attribute: [ server, public_address ], ':', get_attribute: [ server, port ]] }

From 01067248d288f80f8bd6fa8b08c361fc56b27ebe Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Mon, 20 Nov 2017 16:01:38 +0100
Subject: [PATCH 37/52] Adapted no_input template to input template

---
 .../valid/lamp-csar_NoInput/template.yaml     | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
index 0fb779870..c632c0f7a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
@@ -27,36 +27,31 @@ topology_template:
       type: tosca.nodes.WebServer.Apache
       requirements:
         - host: server
-      interfaces:
-        Standard:
-          create: apache_web_server/webserver_install.sh
-          start: apache_web_server/webserver_start.sh
 
     my_db:
       type: tosca.nodes.Database.MySQL
       properties:
-        name: { mydb }
-        user: { root }
-        password: { abc }
-        port: { 3306 }
+        name: mydb
+        user: root
+        password: abc
+        port: 3306
       capabilities:
         database_endpoint:
           properties:
-            port: { 3306 }
+            port: 3306
       requirements:
         - host: mysql_dbms
 
     mysql_dbms:
       type: tosca.nodes.DBMS.MySQL
       properties:
-          root_password: { abc }
-          port: { 3306 }
+          root_password: abc
+          port: 3306
         requirements:
           - host: server
         interfaces:
           Standard:
             create: mysql_dbms/mysql_dbms_install.sh
-            start: mysql_dbms/mysql_dbms_start.sh
             configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:
@@ -72,7 +67,8 @@ topology_template:
             type: linux
             distribution: ubuntu
             version: 16.04
+
     outputs:
-      endpoint:
-        description: endpoint of the php-app
-          value: { get_attribute: [ server, public_address ] }
+      server_url:
+        description: Concatenated URL with public server address and port
+        value: { concat: [ 'http://', get_attribute: [ server, public_address ], ':', get_attribute: [ server, port ]] }

From ef9751e2116fe60da688df9da3b1ece027986d5e Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 16:36:08 +0100
Subject: [PATCH 38/52] Add missing variables

---
 .../valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
index 86641e949..87050fd58 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 cat << EOF | mysql -u root --password=${database_password}
-CREATE DATABASE mydb;
-USE mydb;
+CREATE DATABASE ${database_name};
+USE ${database_name};
 create table tasks (id INT not null auto_increment,task varchar(255), primary key(id));
 EXIT
 EOF

From 0db48a55eac95539fffe45be68a1a36fbfd001dd Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Mon, 20 Nov 2017 16:36:25 +0100
Subject: [PATCH 39/52] Delete unnecessary files

---
 .../lamp-csar_NoInput/apache_web_server/webserver_install.sh   | 3 ---
 .../lamp-csar_NoInput/apache_web_server/webserver_start.sh     | 2 --
 .../csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh   | 2 +-
 .../valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh     | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
deleted file mode 100644
index 5217bedb0..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo apt-get update -y && sudo apt-get upgrade -y
-sudo apt-get install -y apache2 libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
deleted file mode 100644
index 4448a1246..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/apache_web_server/webserver_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo systemctl start apache2
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
index 570f39c77..d3d61ecb4 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # install php on a linux machine with php-mysql
 sudo apt-get update -y && sudo apt-get upgrade -y
-sudo apt-get install -y php php-mysql
+sudo apt-get install -y php php-mysql libapache2-mod-php7.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh
deleted file mode 100644
index 563b89a3d..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo systemctl start mysql

From d758fcafce2488f8f4551c4878327bf4869c9ef2 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Tue, 21 Nov 2017 12:09:55 +0100
Subject: [PATCH 40/52] Remove mysl_dbms_install.sh from no-input LAMP-CSAR

---
 .../lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh    | 8 --------
 .../csars/yaml/valid/lamp-csar_NoInput/template.yaml      | 1 -
 2 files changed, 9 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh
deleted file mode 100644
index 618cf26f7..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# install mysql-server without password promt.
-# insert a fix pw
-sudo apt-get update -y && sudo apt-get upgrade -y
-echo "mysql-server mysql-server/root_password password abc" | sudo debconf-set-selections
-echo "mysql-server mysql-server/root_password_again password abc" | sudo debconf-set-selections
-sudo apt-get install mysql-server -y
-sudo systemctl enable mysql
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
index c632c0f7a..7e2494ee6 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
@@ -51,7 +51,6 @@ topology_template:
           - host: server
         interfaces:
           Standard:
-            create: mysql_dbms/mysql_dbms_install.sh
             configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:

From 4c77efe727451b77f4cebae2de24798a0c4e5e65 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Tue, 21 Nov 2017 12:23:57 +0100
Subject: [PATCH 41/52] Rename lamp-csar folders to use lower-case

---
 .../{lamp-csar_Input => lamp-csar_input}/my_app/install_php.sh    | 0
 .../{lamp-csar_Input => lamp-csar_input}/my_app/myphpapp.php      | 0
 .../my_app/mysql-credentials.php                                  | 0
 .../{lamp-csar_Input => lamp-csar_input}/my_app/start_myphpapp.sh | 0
 .../mysql_dbms/mysql_dbms_configure.sh                            | 0
 .../yaml/valid/{lamp-csar_Input => lamp-csar_input}/template.yaml | 0
 .../my_app/install_php.sh                                         | 0
 .../{lamp-csar_NoInput => lamp-csar_noinput}/my_app/myphpapp.php  | 0
 .../my_app/mysql-credentials.php                                  | 0
 .../my_app/start_myphpapp.sh                                      | 0
 .../mysql_dbms/mysql_dbms_configure.sh                            | 0
 .../valid/{lamp-csar_NoInput => lamp-csar_noinput}/template.yaml  | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/my_app/install_php.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/my_app/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/my_app/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/my_app/start_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/mysql_dbms/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_Input => lamp-csar_input}/template.yaml (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/my_app/install_php.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/my_app/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/my_app/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/my_app/start_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/mysql_dbms/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_NoInput => lamp-csar_noinput}/template.yaml (100%)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/install_php.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/install_php.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/my_app/start_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/mysql_dbms/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_Input/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/install_php.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/install_php.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/my_app/start_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/mysql_dbms/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_NoInput/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml

From 0284d0ccfccba159f9f8c15dcb23a224925f5186 Mon Sep 17 00:00:00 2001
From: Marvin Munoz Baron <mmunozba@outlook.com>
Date: Tue, 21 Nov 2017 12:26:18 +0100
Subject: [PATCH 42/52] Rebuild LAMP-CSARs

---
 .../csars/yaml/valid/lamp-csar-no-input.csar     | Bin 5456 -> 0 bytes
 .../resources/csars/yaml/valid/lamp-csar.csar    | Bin 5269 -> 0 bytes
 .../csars/yaml/valid/lamp-csar_input.csar        | Bin 0 -> 3379 bytes
 .../csars/yaml/valid/lamp-csar_noinput.csar      | Bin 0 -> 3280 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar.csar
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar-no-input.csar
deleted file mode 100644
index b18272cdddfac75763c0e7a2cbd3781ed592ce2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5456
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
MfqzY0;-mcfA3JZPTmS$7

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar.csar
deleted file mode 100644
index 16e3e0143116e157adddeb7202f2283c9b033ef2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5269
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

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
new file mode 100644
index 0000000000000000000000000000000000000000..5f9d3db222ee7bdce5041264e9a568a188677ecd
GIT binary patch
literal 3379
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

literal 0
HcmV?d00001

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar
new file mode 100644
index 0000000000000000000000000000000000000000..c6a61ce7d55c544dc719970018f11d76deb9cd2b
GIT binary patch
literal 3280
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
W??Pt)Lt6Rc!3?y5o}Oe``SmZH)ZFv{

literal 0
HcmV?d00001


From 1ac9d53d680122f0f974bdbce542060e774772a7 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Tue, 21 Nov 2017 23:32:30 +0100
Subject: [PATCH 43/52] Removed concat function and replaced it by two outputs

---
 .../csars/yaml/valid/lamp-csar_input/template.yaml       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index de83d3336..d1fb1fc4e 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -78,6 +78,9 @@ topology_template:
             version: 16.04
 
     outputs:
-      server_url:
-        description: Concatenated URL with public server address and port
-        value: { concat: [ 'http://', get_attribute: [ server, public_address ], ':', get_attribute: [ server, port ]] }
+      public_address:
+        description: Public address of the server
+        value: { get_attribute: [ server, public_address ] }
+      port:
+        description: Port of the server
+        value: { get_attribute: [ server, port ] }

From bf8e5b5b84161fabe479fb77a14b6798f78c5d18 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Tue, 21 Nov 2017 23:33:10 +0100
Subject: [PATCH 44/52] Added configure script and adapted template

---
 .../valid/lamp-csar_input/my_app/configure_myphpapp.sh    | 7 +++++++
 .../valid/lamp-csar_input/my_app/mysql-credentials.php    | 8 ++++----
 .../csars/yaml/valid/lamp-csar_input/template.yaml        | 8 +++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
new file mode 100644
index 000000000..b5471e617
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+CREDENTIALS="mysql-credentials.php"
+
+sed -i "s:DATABASE_HOST:${database_host}:g" $CREDENTIALS
+sed -i "s:DATABASE_PASSWORD:${database_password}:g" $CREDENTIALS
+sed -i "s:DATABASE_NAME:${database_name}:g" $CREDENTIALS
+sed -i "s:DATABASE_PORT:${database_port}:g" $CREDENTIALS
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
index f32cefde7..380ca89e0 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
@@ -1,7 +1,7 @@
 <?php
-$db_host = getenv('database_host');
+$db_host = "DATABASE_HOST";
 $db_user = "root";
-$db_password = getenv('database_password');
-$db_name = getenv('database_name');
-$db_port = getenv('database_port');
+$db_password = "DATABASE_PASSWORD";
+$db_name = "DATABASE_NAME";
+$db_port = DATABASE_PORT;
 ?>
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index d1fb1fc4e..54e5b4f33 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -23,8 +23,14 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          inputs: database_host: { get_attribute: [ server, private_address ] }
           create: my_app/install_php.sh
+          configure:
+            implementation: my_app/configure_myphpapp.sh
+            inputs:
+              database_host: { get_attribute: [ server, private_address ] }
+              database_password: { get_property: [ my_db, password ] }
+              database_name: { get_property: [ my_db, name ] }
+              database_port: { get_property: [ my_db, port ] }
           start:
             implementation:
               primary: my_app/start_myphpapp.sh

From e6102cc4e53fe45860aba0b20207ed106262a0ce Mon Sep 17 00:00:00 2001
From: jmuell <jmuell.dev@gmail.com>
Date: Wed, 22 Nov 2017 17:14:47 +0100
Subject: [PATCH 45/52] Update input-csar

---
 .../csars/yaml/valid/lamp-csar_input.csar     | Bin 3379 -> 3720 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
index 5f9d3db222ee7bdce5041264e9a568a188677ecd..bf4e1279c016375c5c3088c447b4264d24436aea 100644
GIT binary patch
delta 2077
zcmdli)gj9p;LXg!#Q*~7on;ewWmOg}6pgwB#HAJ742&!<m>C$r1W26-P!$JA-DDqD
zJyEO*C-<{@O2XB7-;N3Dj0ftP1jI57GL!4L<s~>7n6Ybp$RZpaP*liMSW?7O*8BYf
zKVRS`w$oF^mWwq$>H759dw~;c=h352f4XXFL@~)UHy{4n9J3(nlTdMR;FG^HwXuo6
zK6g7@Q{3{4y)~lv=Iug81{6n6^wY%d=8ZjG%*-HP-DK9ru41wzOI<xsh4<<-&$E3%
zzsNFz{lk!38J}2Cpr4$dmzJ4cT9g`}TUn4%02I<I&Ik>`<x>WR;IJ$Hr_NmV_tH7{
zpop)iwD2qU$C59c+d@yR)zLe1(O1vQ*Ym9QNuM*C*R)S)1U!1A<(J_bc;ReFfYvsY
z5ZV~D($7=JlV#RqsreJ*V}i1$u3NI8DMiVwm$C2Q!H54G^-j#<7V7Rk{kc1+!|1^I
zi`PXXi{p~=v<l6BvoEyRsj#1;dom+RBAEP;Rgt(<pvGo_BfN^)c7nreiPgTXpP3jK
zRDns17nlM{QgaJ(5=&C`Did>a@CDG^u#<VW4FvZ7*8ah`^^r(s;E!n~yN@_<iN9E=
z!Qmx!+eKy4!$%>yzuwCRNvq!MijLJOmP@bv+%{#ZTCz#ItoWUxdQBeNCbJ)#)XZk^
z=!Y_HNlJBG|1xW0^GTC%GlzXlQZrdMO`i2+0as+<M)jUM_w(dBHtJOSh^a<QGd_Kd
z+bL&rBUjj=St4sfPBTPrn<jB&j;+UDH+R3xojjbJV#>Qx)=$2gv~fewNvC((x0q^t
z^rmb+wqNkkXOEegkJ?qgglX1)a5Q;l=c2jtt-#UNR@)bXJ(8bwO6x8uuH&5PJUwW#
zXJp{AD+TTv1|Ksf*ED|#TiKL;Ciw0F6C2BQ3t29TJ(;g+>5+WBMRS^LgPpS%?~CNg
zsl6|XSSM<ChOVh)tGwk<6IpfKsN+tauCV3n)t~&A9o&2?rT!?Z*?Nr?Rx6Ik)F;gm
zvEElM_2{g`vFwxS=d=Er<XM^MYL~QnJLeyk`{o}W68k@Y6TA0J*L%UwH~;a=l8X~u
z`qNND>%6IibKL~{=QX8gbN(#+B$5$bS>9;$<(k8@J6D+OUmu#CzWKwc*(Vv!E`EEX
zGj5IgOSz*?eqPH~uj4*=@Ft&t{e2BN0m=4yPxU=VcFp}!d?{yMmns)WY{WS(;Q~er
z!FO*Wa+p<i^3K+i>PeHjwe$4l&;RUAcs<OnemnhlQL2_nLO}VQ`wPx}-S9my|5%sQ
zVQWj*=tbZBAME?CYvTMaDDFdI(dEp3siIZ03eQ9o-R}QBU#)Aly3H4<N<Clis^9f(
zKX;$~=30NvaKn@`qs8I|zxe0OTb-x0qU`6DmzBT%*i=ti`XwdtvK>#tWZ@<D<;v&Q
z{|djw_@}0Qt-kM_>d2&H2CKIpIK?U?yl%<NBDVLh4_2K!t6Z1)=g@`q_a~e$XHMo!
z&5pjiM|t)=t+T3*uP1To-8o-);ny;b@QL1YH{>zAu-Ch%w%T>}EZvtmckG`A?OAj?
zTUF}75ABzV4Ib6sPsna$m&kr`f{Xog`3;4zE5Ckdr^?)V{cAt-Hs$}~0p5&Ea?J1&
zd2&3LWZ+*%V37kWYeGX<Aq6N#0S(fKD0&}%4U2OIYKsM82_OUkV5!BhrO}aL@_lZ3
zdr%=vzzo#l8`+F&43lfQm6ZsaF?kJ_B<q&OZbpWQaboqvIbBHO!=)miQ&$18D2mg?
zSmEK2nO9trn3EF^EN{VuEipzXqnF^wUb>Dj8%KGL&k970Dey>I{B_*T26Aa}VNQHX
zQf{$6k+C+pkVlebOCtmO<UStF8p5ILjatAWdxw*Q0lm1z<$hM6TNxNQflwb<-8*xG
FcmUQy;?)2E

delta 1766
zcmeB>-7Li$;LXg!#Q*{m;z}p-%BtkEibQGgibR!Ga5FHn{BUDnVDWHgU;wET0jlBv
zshd25QBxG8@Bj~*!p+why_lInN|af(u`8LJ%v#3_RN;NcI%!G_(8w(l-)hujHI0E`
z^G5v>8V`azJ-g1I(ANvx5bEKt>v>lDa)7_5j;D{8jvs6H>g=fIt5d|5i!ol+5PkZ5
zx`ty5mr!^2>CfFk8!}r@9^CR=_1UtdV0NMQm6|8?553}<VByibS5_RwON^xx{q(TA
zcj81(PIw4SKEb9)ToCcHTVOYDauoYcK9K*rV#*z!Gcho{=9sL=A%QCd=7xIrUp5ff
z_dWc_w&`YX7qKq9Q#Sqh(y0wi778hrAGd5Z+t@1~%k*f!aoN4vw@yn|bw2-WvoGJK
z?9{WKq8l8Va{?}1vX$u8*DSo4;<}Q1fv7fjm9MxkpP9MSZjPTk87X`x+$0Y<ir23a
zD)N?yytmFy;B~~m2|iv0J;ui`aVoC6>7c5usLHDSRp(IJ+Ek9DdvB+BUYvN{?QD|M
zBwoSTP1jE*8O^j<8oF?sXfC7TvI)1WrSEZYR;HXW`}kO>YPCs=0$Z{C;w?sbJwlfb
zik)HXiTu5S$Nr_j^(BukEWMHv6gDN(_MRYjy${nZwRpwdS9b|ma)+23Fx&4j2x!XT
z<~rZ=W=g4M;;g6E3;HJna;M!-iB#Sd<5;wILzhX)fz50}r;Mbh9X{~(mf^|B_|V?&
zm~Zc1o!Ea;OeU32`<%@tzkL&}nl&%Fy;(eMj`W6UHR|<j|B9F$m$vopoN$B3)$yyJ
zdYSowheh@4T_$_IIDNoHB_l^!G3TVu)yh7;jL3!Qe`Kutqng~(9G)e4IG&H+F8tqb
z*4zH1wyO)c)guy>^_coYcCPqo<uvK`j+c?E%!9W39^L%;-+hx+s;jg97FuS`43g@R
zz8X9KT+~&KN-H}{X5QWR?3wf59@c#rGPim0+U92`V%4||>;2yCn9ANXXVo)<wC0sg
zv)A3%yYIWW^uo;Poc&SC=a=Ss=I_@xsNWuCf6|IA?9|2o318$bY{TycI&VF_-0kqo
zhX!(6{~k83+O#2A)@?&`VB^~bPuz0$HZElQ{BLSmL&3hs*OvR;*{fxkyyHgx#Hs09
zW_(dSyY=|X3frjXhwL7h*8k#m-e2K)?|yHO>Xfy)g`a1wsan11JZIGO5RRAia%^kc
z3-`#@K3n=(*`dC8pO=`qY4oYx3+qfPugp#=_|bO#|K3Rzwv9*R)#L4SPcAO7UR2w5
zJ#6#rEyeP;Rn0P=XP)PhZ}*Yg+oHDPmgVxxKmTM^J+$k*_xp8<*SbsHKPt8)IBWl9
z4e(}Ul4FMFHg8b51Ox005>Tc9!&^rXGq*B6v7kUdG=!Cb8B~5?6j>m{5QSDek0i^I
zMn{IpH9S(_+=gGhw~)q%OGQ9yRspdn)N)23dr9LNX1L{<dBr7(IXUqK83lU98ALk8
z`;IiM>;sx7gJO0s%Va4YWhEl~GoM?MbxET=E5pP%>3V!YfIU39QNr^IE67X5g*ovl
zNx8+uhN*Wj%dyjILE-ZNNGPFrM3RkRvMjqQUYEfm2dOY*VBkeDM~R(*p(Hi8ASbaT
cRj)EJHwSkhv$6qQ0j#1p7|sIA)c~-+0V26ikpKVy


From 917a2891dc0c6a39548c403f645fff642d16fc04 Mon Sep 17 00:00:00 2001
From: hnicke <dev@heiko-nickerl.com>
Date: Thu, 23 Nov 2017 15:27:50 +0100
Subject: [PATCH 46/52] FIx issues regarding phpapp's lifecycle

---
 .../lamp-csar_input/my_app/configure_myphpapp.sh  |  2 +-
 .../my_app/create_myphpapp.sh}                    |  4 ++++
 .../lamp-csar_input/my_app/start_myphpapp.sh      |  3 ---
 .../yaml/valid/lamp-csar_input/template.yaml      | 15 +++++++--------
 .../my_app/create_myphpapp.sh}                    |  3 +++
 .../lamp-csar_noinput/my_app/start_myphpapp.sh    |  3 ---
 .../yaml/valid/lamp-csar_noinput/template.yaml    |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput/my_app/install_php.sh => lamp-csar_input/my_app/create_myphpapp.sh} (67%)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input/my_app/install_php.sh => lamp-csar_noinput/my_app/create_myphpapp.sh} (67%)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
index b5471e617..373db8a68 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-CREDENTIALS="mysql-credentials.php"
+CREDENTIALS="/var/www/html/mysql-credentials.php"
 
 sed -i "s:DATABASE_HOST:${database_host}:g" $CREDENTIALS
 sed -i "s:DATABASE_PASSWORD:${database_password}:g" $CREDENTIALS
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/create_myphpapp.sh
similarity index 67%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/create_myphpapp.sh
index d3d61ecb4..8db477e8b 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/create_myphpapp.sh
@@ -2,3 +2,7 @@
 # install php on a linux machine with php-mysql
 sudo apt-get update -y && sudo apt-get upgrade -y
 sudo apt-get install -y php php-mysql libapache2-mod-php7.0
+
+sudo mv myphpapp.php /var/www/html/
+sudo mv mysql-credentials.php /var/www/html/
+
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh
deleted file mode 100644
index c278150a8..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/start_myphpapp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo mv myphpapp.php /var/www/html/
-sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index 54e5b4f33..dbaddbbf0 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -23,20 +23,19 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          create: my_app/install_php.sh
+          create: 
+            implementation:
+              primary: my_app/create_myphpapp.sh
+              dependencies:
+                - my_app/myphpapp.php
+                - my_app/mysql-credentials.php
           configure:
-            implementation: my_app/configure_myphpapp.sh
+            implemenation: my_app/configure_myphpapp.sh
             inputs:
               database_host: { get_attribute: [ server, private_address ] }
               database_password: { get_property: [ my_db, password ] }
               database_name: { get_property: [ my_db, name ] }
               database_port: { get_property: [ my_db, port ] }
-          start:
-            implementation:
-              primary: my_app/start_myphpapp.sh
-              dependencies:
-                - myphpapp.php
-                - mysql-credentials.php
 
     apache_web_server:
       type: tosca.nodes.WebServer.Apache
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/install_php.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/create_myphpapp.sh
similarity index 67%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/install_php.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/create_myphpapp.sh
index d3d61ecb4..b0746ca72 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/install_php.sh
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/create_myphpapp.sh
@@ -2,3 +2,6 @@
 # install php on a linux machine with php-mysql
 sudo apt-get update -y && sudo apt-get upgrade -y
 sudo apt-get install -y php php-mysql libapache2-mod-php7.0
+
+sudo mv myphpapp.php /var/www/html/
+sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh
deleted file mode 100644
index c278150a8..000000000
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/start_myphpapp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo mv myphpapp.php /var/www/html/
-sudo mv mysql-credentials.php /var/www/html/
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
index 7e2494ee6..7ed3b0f1e 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
@@ -18,7 +18,7 @@ topology_template:
           create: my_app/install_php.sh
           start:
             implementation:
-              primary: my_app/start_myphpapp.sh
+              primary: my_app/create_myphpapp.sh
               dependencies:
                 - myphpapp.php
                 - mysql-credentials.php

From 81af33540c56c79e59bf0e424f81a3a18db6ac96 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Sun, 26 Nov 2017 14:35:46 +0100
Subject: [PATCH 47/52] Adapted no input csar

---
 .../csars/yaml/valid/lamp-csar_noinput/template.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
index 7ed3b0f1e..b75f66ceb 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
@@ -15,8 +15,7 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          create: my_app/install_php.sh
-          start:
+          create:
             implementation:
               primary: my_app/create_myphpapp.sh
               dependencies:
@@ -68,6 +67,9 @@ topology_template:
             version: 16.04
 
     outputs:
-      server_url:
-        description: Concatenated URL with public server address and port
-        value: { concat: [ 'http://', get_attribute: [ server, public_address ], ':', get_attribute: [ server, port ]] }
+      public_address:
+        description: Public address of the server
+        value: { get_attribute: [ server, public_address ] }
+      port:
+        description: Port of the server
+        value: { get_attribute: [ server, port ] }

From 77d3a1507fb91610943b136954b11aff039c4240 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Sun, 26 Nov 2017 16:09:55 +0100
Subject: [PATCH 48/52] Fixed indentation error and build csars

---
 .../csars/yaml/valid/lamp-csar_input.csar     | Bin 3720 -> 3088 bytes
 .../yaml/valid/lamp-csar_input/template.yaml  |  16 ++++++++--------
 .../csars/yaml/valid/lamp-csar_noinput.csar   | Bin 3280 -> 2655 bytes
 .../valid/lamp-csar_noinput/template.yaml     |  10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
index bf4e1279c016375c5c3088c447b4264d24436aea..14677b50a8f330d24ee030b78e0c574583b33d77 100644
GIT binary patch
literal 3088
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

literal 3720
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
Bn@<1$

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index dbaddbbf0..dad3122ea 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -23,7 +23,7 @@ topology_template:
         - database_endpoint: my_db
       interfaces:
         Standard:
-          create: 
+          create:
             implementation:
               primary: my_app/create_myphpapp.sh
               dependencies:
@@ -60,13 +60,13 @@ topology_template:
       properties:
           root_password: { get_input: database_password }
           port: { get_input: database_port }
-        requirements:
-          - host: server
-        interfaces:
-          Standard:
-            inputs:
-              db_root_password: { get_property: [ SELF, root_password ] }
-            configure: mysql_dbms/mysql_dbms_configure.sh
+      requirements:
+        - host: server
+      interfaces:
+        Standard:
+          inputs:
+            db_root_password: { get_property: [ SELF, root_password ] }
+          configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar
index c6a61ce7d55c544dc719970018f11d76deb9cd2b..470546a763aa58fdca15093749f2302349e5a026 100644
GIT binary patch
literal 2655
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
Ph#PpAU=S#TXXEXEGn+}7

literal 3280
zcma)<c|25W7=X_h>u6B65Fum9zNH0OvW<P2h#0ap7-k`)BDrKHlqIEPiMgokWS6Cy
z8nPuxl52}nq!7tHa<9^Ue!uUWGk=`td(Zcs_j%v3Fox2@fR*E{Q-Ja3oBvKsz!m@-
zjCR4{<WV*(0Mw6x%bpF+Wgig43P9-R^#Oq1&;S4|KmZr`2=ixv_*vVJnos~3U<3fp
zF92*X?l2A{$$^(O*sTrU!D3LBetkPQPV^L1a4^aUBy`up%U%ha7H4R+bCsw$OTtdY
zn{8B#wlT`fR~)W?V~8YGy>mICcyICbP=DZE>m&W$j)@duw~lv+@EaRpF$kn|kn64O
zl8K3Sb~pVWDaA2P8Qr5hS;jk)ZRBAl@Q+&`wL??n1Aa!$#=fjw%JrlzPry!fB6RrF
zFcPAb?Jpp!ewc~eb@y)5bXO-NIql}T9AUQdYk~^p;i01GX@ltLoY!xi9k5r&BpnN`
zmZ>EU^208NJN<3hO>2Z9Je}AINpwAp?nql>^?{L_BHlW8n<rYY_%M}W1-e|cb9q#I
zJcL<<c}J5ZkhAEc50fv{F5@bemzdw|-Lmz#y7+9+{LJWJ+@fxcn}B(t3ys?$Cb)7d
zPZ_EAhQ9A#$N2q+GaKUJH#O>;Q(uww`ObK5I_ruFf9uY6@O(Q)<Oakg^{HIk8yoyQ
zn#HurB;Eoe<?d04mn~%T(PS-OLT6%Bjt{Z!=Dj_gU%vOu2^;*B$!xKoxqT}9)nKb6
zd)fI3Y>$Iv<w!me2)2X{)+`-NFp1So?eE@(`l~$0{OM*?b3xV#M?3NRH*YyZW5>Fz
z5@~G$Pb6?+kkRw)S=Zn+Lapb_lf$L8=Vv%WxkI2L;u1r41rmulm3l+X5!Hc1G-BB<
zR)?m9c@p81dcE|(HP{B#X21P2jd#ccLP7)m>RZC^lvJGzZ4h-z{E$nreaBgW^0SCS
z8HA@M$u*h1<%uF@Pu4i=is;fyJhUILypydpF`AsHBh9Y#i8@yn3mN08erC|y-9I!r
zT@W`{hbv_drGMZxF}#GsKN1Z%Eid^*@Fh0sW25+0?(&8u?NY~6`FU!N$=QRrh|M9v
zy(4)wEriSm2|IFwq*G`P{L-CbVwZBtq5lMn8KLcp{bBM%|1Q1vZOiZoGyNe{{5)iw
zaxv}VAh%Au35TB?f8L{579+f!L33D0ZJ<gHMqws@W`@u3ynWK1(b3VYsH+=0Yo$ZR
zad%}@*`c-s`;cOPw$>2u+<1uhLJc?P?hB7KFMD7fn-@{!9%IJpbzD*@Ck)}e9ov{t
zF$1Y#7vgd)Ju8H=;NkIvI^ItV>r?S`VTp`2n3%rc*z$EM67fE=t^{{CcVB;uix2U4
zIayL9PnCRbWn@HZqsq%!7NRVaRFry@0Uce0cVQ3)@3qmeMsjaG{dSwPb_Wk$K_}8}
zGBZI&l134ul<<87Y3q1r*bG_AgI_@4!U1A$A0G0JGlt&pchUuebOgudFM$&MT?qc@
zHFFRT|4JOz`yZO$Z|O2e$~<_!UC#8LEmhW<dP9aPX(%Jv4z+?UxJT<PjEsyd@F6O9
zEf{){Sc(1#WGic{8Ke>?kyIqb_)SooB&RwFU_g1`;QkU6#up6B#|I61OzzhaIkq;i
zH41Y?4DK;kq!{@<zC&&+VU`jryiV6qcYH8CT4VX*2MX;FoqQz8mXj_Ssi;#Utjw&4
zTNLhSVmcBOHDS<&k#EaEmhg$8{PHuSvnSF6Ta?Y*L(U0~hfd#Ka0{v*h~<wrtGZ;?
zJ0bMC2PL?&{i`Y$MXy&m>*p5$_Z{ta2uobmc_`x_=)9%qkYzf!0yn`Sx*mcJ{-1|-
z_4D<>cm@#Mf3qYSu|=>(1unh0W4Aezd1M$etY2EF>hLneJQtV8q-S8P5^SXArzvFG
z2;11f*GH3x?u6L7ZFEo@?sghWokGi}Y>`X14hRU-^xu7Qb*$EvqYfgy^#|=rj-m$+
zM>sgeFV?e2C>k<T-^bU@oz3A%QHFB%v}CD1=Xzy*@ibd!M5|7NK<bNjL|>+%n!;|?
z^h+7Z#L})(v3DH`o0iXQ{gOZ4-~#5cTbifP0e}J%0Kma__jkwQd|dq9<$_(XKA*ou
z7!#NM4~rPhw@-ni=B4!Pd1IM9ru<x02&s1C4W$8OAyQa+R+-+uV-ay#ULB!tNJs6w
zwn#8;u&!?E?dK!SKH<KcRKbl5%1CmJJ1i)xG^IEap`uzGNlQsBLRn=>Usur7sS`m|
z8a(!5MWooP=}d+-O?EFR?`$J4s+@Zfd{3io6ENWCOfqgsAMKP8^-*-A2n!v{#_I2D
zu&X@{m(tWb(|RTQnwU||j;cr1k?^o`N+%)~(xVT!HB~6~r@Y`lwN!&49~ozFDL9j>
z*U+aOa^ZHAunf}X8QcNFV}Th{ejdroT`bXZQP()elw)#!S0L3QNuN~@H<8{F!pzX_
z8+?-UNz7Q@aQRaM07jlPIX-8cVOUk=K~c)RCcYEqu(#h3Vb9z5U`T6bOIVQ(q3=w~
zxv+bY7sl~s&rVRiQs_}46xlapf`OfF4W%JDyee?ZpaySV{Kk2c+gF9KqGGkAOV5U_
z{919$_dmLSimSzpSM?sNG-b>#)qd$o4D>v(<7ygka>C8IY}S>E8@r;y2UC}ywKO$r
z`0!z(n4LRIOU_GCe)=O|>Zb9qOZ)Xu=RRA*jpK~Lkz?EV9ShV7CZLwgN9@9&*t&-=
zlzF43GUmpn1oka>m2p=)<9AOH>fN@bYs}(bdNWPy8*{1)sVdAaF}B&9y{^#E5wnAw
z+}Pjc`0*05K7>6j-_t0XK)oTSdFyCe_iI_b>T_NhjRni(qtb8N9cM+@??>@Dhb}o$
zu93}T1=VvE_rGX%ZFrQ>rM|>o*+KF>VDnCPaIwcBXj2^>C!y;2V*f2#XC_fA^3ITw
zlE&NJ7B55X9ikDZ(r{M6e#Ikihq;ct;G64bemuIns_RNByfpA{T)g0IYtxGAQ}y@u
zS{Os<grGlb_cnt`zH)E?liDlSwdRjuwfXz5@mqoYto2)kK|oB_$rajvur-~3ZUp}f
zyuOfq4Q>HD%{A~3%i5pKu)YF)JwpKf+6+IaM}J0NUrN5F!x+}+-xii%p?@a%RrKlx
z(mtdAS2U=65V)fJ-)!P~;eQ<~2iVbnalZVQ+i&#$tH4)3mha{I^*kFu-F~B55V@k-
W??Pt)Lt6Rc!3?y5o}Oe``SmZH)ZFv{

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
index b75f66ceb..2a53af19a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
@@ -46,11 +46,11 @@ topology_template:
       properties:
           root_password: abc
           port: 3306
-        requirements:
-          - host: server
-        interfaces:
-          Standard:
-            configure: mysql_dbms/mysql_dbms_configure.sh
+      requirements:
+        - host: server
+      interfaces:
+        Standard:
+          configure: mysql_dbms/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute

From 52912e455cd40caf26155923e32019399f317ce5 Mon Sep 17 00:00:00 2001
From: Manuel Kloppenburg <mklopp@outlook.de>
Date: Sun, 26 Nov 2017 21:30:38 +0100
Subject: [PATCH 49/52] Non-normative Types aren't supported by the
 winery-parser so changed to normative Types

---
 .../csars/yaml/valid/lamp-csar_input.csar     | Bin 3088 -> 3105 bytes
 .../yaml/valid/lamp-csar_input/template.yaml  |  36 ++++++++++--------
 .../csars/yaml/valid/lamp-csar_noinput.csar   | Bin 2655 -> 2679 bytes
 .../valid/lamp-csar_noinput/template.yaml     |  30 ++++++++-------
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
index 14677b50a8f330d24ee030b78e0c574583b33d77..a106f7b1e3558918ad2c3b4050504fd7a77e1493 100644
GIT binary patch
delta 932
zcmbOru~331z?+#xgqZ;d)-IgLqs#;(4KD-9$!v_Lfz;;9jA_gut~Ki%5OtGP9Yis)
zy{>OrUF99Z8ff%_iGiVpi-Ca`XhunDZb43BNvd9DVs6gXFz@`^20Z(ohjZL0Exf%@
zn(h9ry?VSC6q(B;*c`XbbXlRhvTDocw!hy4KRHjlyX0oWOQGX`JnEjfpWJk5N>A8^
zhfUFXtqb`V@Y+3DVk~)Yg;d7rS+n9Ue0F7Bb|t3%Cc{srj1;jGZdpN%t5Q!Non}x}
zymgoAu}z=!qD>MakLsKjZ@F==k?Wd+U)Hr1sSUd9r|mi{cTcuD?%<cXlc$B{wzJD7
z@tZ%BHf{(y8I>1p#Zcp?H)S*1{DMk3R^!-z??m0QMSrMB?Od**y45#8;>;njFD%D;
zDyQtKGE&$lT)(MlV$k^|nVP{`UpZLQ<Z?Hy4~WqW{XFSs*mnco?|s=B4lPZ;wyIcX
z=J?G>ddl}gS>#H?v1=|aPq-EZ39UY1+q~+9!a|+BiK=f}W24oy#8yd#uUz;(E2hqY
zY3YG2n~yFv$)Az;dEbN0dQ7=dTZ4bt8}GhyuwSr<CGb<NQL<{i^BhBle=^Q9e^+%{
z8ZLOc#!R?E^JrWCT)VhS0=W+IOXSmY>yJJwxB9CTy<tk^oc=?RSN=-B{8IID_g4Y6
z{i{qQocB$>pSkAe1>TPZ?HU)h9W9u<MPhBc&!IDBhb9W#vnibac7pP|dop+S{;zRp
zciU@V{qj|ph{0Xv*A1uFH9fB{*?gu^{q1DE@&#8u*0de_z3)cO)phpweLT)2+AetS
zW_0xTS-!=SmOCA>>%S%2#Q*Ju(5zaHce%=2Tok$DKDXTY(;?yWIqQ+tlK;OBpFOVe
z-*Z#T-mWZ@Ws}wZ)%(qVeYI-cS)L*naowd$|8IV*&if=@?&xy4SZDF`kCbKS`rFhW
z;F`7N#fC?mId^{6wzlstd!N!=`S3=~ueiA;lMb0~2|4#*sX}FZVR8HQne%7-x|;pz
zrIn%C1)go6Pj62VU3+QHq%GPjpB?%;Lyh-%je48*oDF)6N2Jfpe)H#2xwn<HX~4Pz
z)(-z|C5qLiZ@A5%cv#&zuj8(xRWSdWvVu2<jZex7w@9=7dATIx$MulI3qP<2cr!BD
zGsCjd<j<VOpp2ry<pH9KxLiThPA+>8^$Q~C!fg)X)pGmsq2{H@H@OYjzHx#wB>+81
BwaWki

delta 915
zcmZ1|F+qYSz?+#xgqZ;d&NfWsQDy>?hL?flWH!drKx*@4#x!OS*P3+>h`PzD4x*UY
zUe~{CsPeuj>YjU@iGkrCCj$d7(2SDQ+=86Ml2pCQ#N3>@VYl;c8}QVg4}ZZdwq15t
z;)m$nx4oH5PBhr^G%MWpQMxiMB=%P2;eWMLQliU(mS=tyQn#^D;rBcmHfz#FF0+_|
z(@PD$Fm5^6KF4M9!`@Ym+t#dn$!Z%PlHhfADsTOS_YH1ojX6uyL{~&@i^<_sHV<DN
zous4vev>Qnw9qq~Y8*S>%B)D>eX=C2H;V1XrtLkBXKv2DVku;~^r?}G$_<W*llGoC
zC*IvU)$3Z(?MreGl8YA3G5yhU{CS{(@Z;n2C#(&9(429mwks&;HYe9fogBya2WJ@e
z2Zj3!J<4|qt2bD3CH2ylDVnBVIat%=ayQ8b#At?oo>aNgdPZCIaZ?ioC&#;yljfS3
zsrzg!V*et@mF2M5gmYpMYoKOl=o7o<RUH!orrp~h<hCXIw98Sa(8HRhC99S_W>;Av
zV${2>WXdz%%enVNYs4foF0Yz<=>5!_zOsKL68jXq?EKPJEO}lp$?@T_#Hl;iy?Z)a
zrft6U=AgHxS<UM&KAsyF&0E8MK5f2RZq1}`8-43fis__^9ba4^cKhGtBV~I(CfT+e
zT(8A@Y(o5#`%_*QJgc&c5n#Qw%|qO}J4ZI9|5*ZmUqHp@dA|=f$rOHn_Tb%L{^y@x
zd|A(|vYX3K{cODo@5Usi&wuLY?_$~%y8B<*<%7GJ)QZiosh60~&zinO^2xmB@86yX
zeVN%@eVaiyaCg)7nn`ya27O<4IP22P?3=$npPhbX<75{8+pSjSYF+d8$p`+c+FBP@
z%A>P%>H2^#th45s_~`GJn}6&7ss)pio^6#+$js!|U$ya7`pb!Y4E5@)$DfzIS)5aE
z5N%<W7}q_y&1*;7v{RCQl;??^KP$V>>CeFn`S&NTzb>52?3-`B|Bpl1Nv*S*j>(>;
z;_trKT`1Uo?DTC>zX)^2CEMG+-~5>x;%#O9Zf+6lzwh6~3%jf<|L){fxOD$ok@FkA
zUneD-Hr_h8F}hwqETcy1>COuoRka7|PX1>O@aAD;vS)_noXIR)#-My*$>jl}nz>v-
k)G01|5XH?677XP!2l4v2{rFI`&g56zhHOuPIf#J)013CL%K!iX

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index dad3122ea..1bce90785 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -30,7 +30,7 @@ topology_template:
                 - my_app/myphpapp.php
                 - my_app/mysql-credentials.php
           configure:
-            implemenation: my_app/configure_myphpapp.sh
+            implementation: my_app/configure_myphpapp.sh
             inputs:
               database_host: { get_attribute: [ server, private_address ] }
               database_password: { get_property: [ my_db, password ] }
@@ -38,12 +38,14 @@ topology_template:
               database_port: { get_property: [ my_db, port ] }
 
     apache_web_server:
-      type: tosca.nodes.WebServer.Apache
+      #should be tosca.nodes.WebServer.Apache
+      type: tosca.nodes.WebServer
       requirements:
         - host: server
 
     my_db:
-      type: tosca.nodes.Database.MySQL
+      #should be tosca.nodes.Database.MySQL
+      type: tosca.nodes.Database
       properties:
         name: { get_input: database_name }
         password: { get_input: database_password }
@@ -56,17 +58,19 @@ topology_template:
         - host: mysql_dbms
 
     mysql_dbms:
-      type: tosca.nodes.DBMS.MySQL
+      #should be tosca.nodes.DBMS.MySQL
+      type: tosca.nodes.DBMS
       properties:
-          root_password: { get_input: database_password }
-          port: { get_input: database_port }
+        root_password: { get_input: database_password }
+        port: { get_input: database_port }
       requirements:
         - host: server
       interfaces:
         Standard:
-          inputs:
-            db_root_password: { get_property: [ SELF, root_password ] }
-          configure: mysql_dbms/mysql_dbms_configure.sh
+          configure:
+            implementation: mysql_dbms/mysql_dbms_configure.sh
+            inputs:
+              db_root_password: { get_property: [ SELF, root_password ] }
 
     server:
       type: tosca.nodes.Compute
@@ -82,10 +86,10 @@ topology_template:
             distribution: ubuntu
             version: 16.04
 
-    outputs:
-      public_address:
-        description: Public address of the server
-        value: { get_attribute: [ server, public_address ] }
-      port:
-        description: Port of the server
-        value: { get_attribute: [ server, port ] }
+  outputs:
+    public_address:
+      description: Public address of the server
+      value: { get_attribute: [ server, public_address ] }
+    port:
+      description: Port of the server
+      value: { get_attribute: [ server, port ] }
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar
index 470546a763aa58fdca15093749f2302349e5a026..07dac4519ba17d42370e1b07845349199670446c 100644
GIT binary patch
delta 780
zcmcaF@?C@{z?+#xgqZ;d)-IgLqs#;(4Nn2djepaafz;$wmVOZRjYS<q$+O<$<z8Lo
zEv5Z&Qw0+P!-UCPY%=w~wK={-Y5PrPYt8fH{vyPz8MB~$kwVy|TS`iHhunj<zSv)`
zd2w3m(}&Z<y>}nJdsDLO+pVbwwC`}J?zwR4Bm0&<xuR>!=S*1Uc&{nvhh_X3t&*jp
z$I2(H_wf91!tB;2F5kt`3%BvyI9pVDdQST%z1f~$0vg+Ej?M6w-oeyqnO*NNtCD^8
zd!u#*j(yk6mOCAcuzk;=Y2m<=a(?sC9J9~2Uby8)?_)kP&ntWfzeU%DNxJOGztXj?
zOZj|G6MVZVKSHNB(}lC}0?XzK`4-pCQ^$=m&ql7DdtOpPBl}5zL_zzs4q1gqKUgiE
ztk7EAs$^lfqKjoA!!6z^6#->$9YYi9wY%PgXBwV0S(D-KzB2jN^S0DA6B2IQ@YY-l
zf3V4P>%#A6u0H0y=<=vzl}LL^o98#{m(Ndb*`5FFN~>1|WAEz%L5r*D;s1J9mu6^%
zJ=n<lns2)9?zzX~d>hqoPTAA>@m_OyMvd3C)YWBwpFZn2A~KDkB!)N2UTCBBrz^&{
z=7rTOm|1R)`dxdXp}2omO?to-=aA?}b%h&ucrBdtM8`$hO?TPz91mYh-|YD+3F(F}
z)nfG@efT$P()HC}LymGjsbsZY_@k3)ZVA`FkDo7RDQ`Qt?+2?KSBaU;r@zmBoIU!t
z^YG{L3+}qUAAU@FSU794O_<}SODyi<Pc`B=%iY8O=+|fceP{c-#@5Sg%I-UlJ~2o0
zM!xmSyw!h&L$prL{A-xV!s*%~jz0~Uc((rv-L|7A>*WK_?vVQ}O?hd2p{W<&R`>mz
zk!Q`}EwIe|%yo;hzl^gSzSM2jt>W94?$Y?4^V_!-{J#(WJ5%QV_T{oEKkkQZ*_!=9
zJiwcg$(|XUa+!ficXAJhF(`o^<ZuO19Gvzb%9GOrL`~*22T^A@{m>GxI+qdKG!9VW
F2LSJRZL9zQ

delta 776
zcmew^a$kfez?+#xgqZ;d&NfWsQDy>?hNpn!#=mLIKx%R-OFxME#-a|Q<XP|WzHF%S
zcCXO0PhetT5TDG&CR6`f`v>FJM<$s8FQ#pA&^MfLh_y<CD@k>2uF@mr8k5lOf7Rh4
zYu)cy<W+3kVtr@k+@+f9V_Ekc>kT->y;kOb<F$*<2Y*cwzGQMDdIGQg^V4hG!Xp!F
zT524<n%uWtoOU%s>MqyT)B}0z!^_W9u6Xy^XHmP9jfiBjUG4)e6|psp^_gOV+is*U
zQ{bpup6l4!w6RK%Rda@d+s5ZVjZPb_@6G$N?P;~c@s%aL&IbZprsY^lT(%G1c`f0U
z`TGlc|GS=UHSArnAlu}ijvY&4;G$2lGq;H4ET5|{A+e(Dg#5-Qe7c;o6?T2|E;tc*
z)s5S=AShrurxW8A=@kV*Wp5p?CS=!l@vPo7qe?2=e4d7;*4yI8MqwTsawkgJz1A+c
zIcx61?|0rllisB`$t`5+j4nxQ$+Ao5?JvJu7%9L#^#hZXc%kfv3-cGhTd%CLzi+nR
zr~Ud;JFAN4um5k@s~o@e_4)0bZt7<ieBHe7vF6gOyGt%{9SJsAy;a_cZBF$S6D_t>
zQ@8r9s-fcIr&o)tI?)(plH^ucVRG!s!exhVsYePgck1)Fe%pAT{Kpq*Tk9^$i}gMz
zW{%U{JpaM}f9hLqb>wca$o-sC^MrYU^_#-S-pAiJPgAR~G27<%(Q|T;<EK+B?&eo?
z;<(HG%U|m+s{7qnyKAPZ>Z#hi%AfPr9$Qnke8M+f(|V`Y`Tm}JMN?nszYk!0dYH!`
zZh836Pn*iU+5Pi)c+{qp=oYQW?#?@8{af#jtAMw{GV?R<3+(SV^2~BDs^6?z#kViq
ztudeT$1_gx-{=0NJU&>}H!Enp`jWE~pXmp9GcwsT!%}FKHz=jT06T;+c_)V)C~@B8
ja0O8coc16pk<$Z2t>!cbQBOGi&=Rgaml0bX2gn2feZ5py

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
index 2a53af19a..3010abf3a 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
@@ -23,12 +23,14 @@ topology_template:
                 - mysql-credentials.php
 
     apache_web_server:
-      type: tosca.nodes.WebServer.Apache
+      #should be tosca.nodes.WebServer.Apache
+      type: tosca.nodes.WebServer
       requirements:
         - host: server
 
     my_db:
-      type: tosca.nodes.Database.MySQL
+      #should be tosca.nodes.Database.MySQL
+      type: tosca.nodes.Database
       properties:
         name: mydb
         user: root
@@ -42,15 +44,17 @@ topology_template:
         - host: mysql_dbms
 
     mysql_dbms:
-      type: tosca.nodes.DBMS.MySQL
+      #should be tosca.nodes.DBMS.MySQL
+      type: tosca.nodes.DBMS
       properties:
-          root_password: abc
-          port: 3306
+        root_password: abc
+        port: 3306
       requirements:
         - host: server
       interfaces:
         Standard:
-          configure: mysql_dbms/mysql_dbms_configure.sh
+          configure:
+            implementation: mysql_dbms/mysql_dbms_configure.sh
 
     server:
       type: tosca.nodes.Compute
@@ -66,10 +70,10 @@ topology_template:
             distribution: ubuntu
             version: 16.04
 
-    outputs:
-      public_address:
-        description: Public address of the server
-        value: { get_attribute: [ server, public_address ] }
-      port:
-        description: Port of the server
-        value: { get_attribute: [ server, port ] }
+  outputs:
+    public_address:
+      description: Public address of the server
+      value: { get_attribute: [ server, public_address ] }
+    port:
+      description: Port of the server
+      value: { get_attribute: [ server, port ] }

From 83b310423d09555e0c0e80618cc7b556b87c9d24 Mon Sep 17 00:00:00 2001
From: Heiko Nickerl <dev@heiko-nickerl.com>
Date: Mon, 27 Nov 2017 23:20:14 +0100
Subject: [PATCH 50/52] Revert NodeTypes to non-normative ones

---
 .../csars/yaml/valid/lamp-csar_input.csar        | Bin 3105 -> 0 bytes
 .../yaml/valid/lamp-csar_input/template.yaml     |   9 +++------
 .../csars/yaml/valid/lamp-csar_noinput.csar      | Bin 2679 -> 0 bytes
 .../yaml/valid/lamp-csar_noinput/template.yaml   |   9 +++------
 .../resources/csars/yaml/valid/lamp_input.csar   | Bin 0 -> 3502 bytes
 .../resources/csars/yaml/valid/lamp_noinput.csar | Bin 0 -> 3024 bytes
 6 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp_input.csar
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp_noinput.csar

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_input.csar
deleted file mode 100644
index a106f7b1e3558918ad2c3b4050504fd7a77e1493..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3105
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
C`5Jxz

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
index 1bce90785..c00d080ab 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
@@ -38,14 +38,12 @@ topology_template:
               database_port: { get_property: [ my_db, port ] }
 
     apache_web_server:
-      #should be tosca.nodes.WebServer.Apache
-      type: tosca.nodes.WebServer
+      type: tosca.nodes.WebServer.Apache
       requirements:
         - host: server
 
     my_db:
-      #should be tosca.nodes.Database.MySQL
-      type: tosca.nodes.Database
+      type: tosca.nodes.Database.MySQL
       properties:
         name: { get_input: database_name }
         password: { get_input: database_password }
@@ -58,8 +56,7 @@ topology_template:
         - host: mysql_dbms
 
     mysql_dbms:
-      #should be tosca.nodes.DBMS.MySQL
-      type: tosca.nodes.DBMS
+      type: tosca.nodes.DBMS.MySQL
       properties:
         root_password: { get_input: database_password }
         port: { get_input: database_port }
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput.csar
deleted file mode 100644
index 07dac4519ba17d42370e1b07845349199670446c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2679
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

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
index 3010abf3a..1e10cf600 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
@@ -23,14 +23,12 @@ topology_template:
                 - mysql-credentials.php
 
     apache_web_server:
-      #should be tosca.nodes.WebServer.Apache
-      type: tosca.nodes.WebServer
+      type: tosca.nodes.WebServer.Apache
       requirements:
         - host: server
 
     my_db:
-      #should be tosca.nodes.Database.MySQL
-      type: tosca.nodes.Database
+      type: tosca.nodes.Database.MySQL
       properties:
         name: mydb
         user: root
@@ -44,8 +42,7 @@ topology_template:
         - host: mysql_dbms
 
     mysql_dbms:
-      #should be tosca.nodes.DBMS.MySQL
-      type: tosca.nodes.DBMS
+      type: tosca.nodes.DBMS.MySQL
       properties:
         root_password: abc
         port: 3306
diff --git a/server/src/test/resources/csars/yaml/valid/lamp_input.csar b/server/src/test/resources/csars/yaml/valid/lamp_input.csar
new file mode 100644
index 0000000000000000000000000000000000000000..be8c8ea754a568ec1b3065dde713d21888bd073a
GIT binary patch
literal 3502
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

literal 0
HcmV?d00001

diff --git a/server/src/test/resources/csars/yaml/valid/lamp_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp_noinput.csar
new file mode 100644
index 0000000000000000000000000000000000000000..22e3e45e8aaf1c4ba3a0d6ae7104a1990934013b
GIT binary patch
literal 3024
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

literal 0
HcmV?d00001


From 9e01ffbbd9d68555fe2c9c4f6f82d26bf453daaf Mon Sep 17 00:00:00 2001
From: Heiko Nickerl <dev@heiko-nickerl.com>
Date: Tue, 28 Nov 2017 13:47:28 +0100
Subject: [PATCH 51/52] Unify test csars and provide zip script

---
 .../core/csar/CsarFilesystemDaoTest.java      |   2 +-
 server/src/test/resources/csars/csar-make     |  11 ++
 .../yaml/invalid/dependencies_missing.csar    | Bin 6229 -> 6045 bytes
 .../docker/dockerapp_create.sh                |   0
 .../docker/dockerapp_delete.sh                |   0
 .../docker/dockerapp_start.sh                 |   0
 .../docker/dockerapp_stop.sh                  |   0
 .../docker/dockerengine_create.sh             |   0
 .../docker/dockerengine_start.sh              |   0
 .../docker/dockerengine_stop.sh               |   0
 .../docker/dockertypes.yaml                   |  67 ++++++++++++
 .../simple-task-app/Dockerfile                |   0
 .../simple-task-app/createdb.sql              |   0
 .../simple-task-app/index.php                 |   0
 .../simple-task-app/mysql-credentials.php     |   0
 .../dependencies_missing/template.yaml        |  99 ++++++++++++++++++
 .../csars/yaml/invalid/dockerapp_missing.csar | Bin 6041 -> 5864 bytes
 .../docker/dockerapp_create.sh                |   9 ++
 .../docker/dockerapp_delete.sh                |   3 +
 .../docker/dockerapp_start.sh                 |   4 +
 .../docker/dockerapp_stop.sh                  |   3 +
 .../docker/dockerengine_create.sh             |   4 +
 .../docker/dockerengine_start.sh              |   2 +
 .../docker/dockerengine_stop.sh               |   2 +
 .../dockerapp_missing/docker/dockertypes.yaml |  67 ++++++++++++
 .../simple-task-app/Dockerfile                |  14 +++
 .../simple-task-app/createdb.sql              |   7 ++
 .../simple-task-app/index.php                 |  79 ++++++++++++++
 .../simple-task-app/mysql-credentials.php     |   7 ++
 .../invalid/dockerapp_missing/template.yaml   |  82 +++++++++++++++
 .../yaml/invalid/entrypoint_ambiguous.csar    | Bin 3745 -> 2754 bytes
 ...cond_entrypoint_this_will_cause_error.yaml |   2 +
 .../entrypoint_ambiguous/template.yaml        |   2 +
 .../yaml/invalid/entrypoint_missing.csar      | Bin 5015 -> 5165 bytes
 .../invalid/entrypoint_missing/nothing.txt    |   0
 .../csars/yaml/valid/entrypoint_is_yml.csar   | Bin 5636 -> 5319 bytes
 .../yaml/valid/entrypoint_is_yml/template.yml |   5 +
 .../csars/yaml/valid/lamp-input.csar          | Bin 0 -> 3502 bytes
 .../my_app/configure_myphpapp.sh              |   0
 .../my_app/create_myphpapp.sh                 |   0
 .../my_app/myphpapp.php                       |   0
 .../my_app/mysql-credentials.php              |   0
 .../mysql_dbms/mysql_dbms_configure.sh        |   0
 .../template.yaml                             |   2 +-
 .../csars/yaml/valid/lamp-noinput.csar        | Bin 0 -> 3024 bytes
 .../my_app/create_myphpapp.sh                 |   0
 .../my_app/myphpapp.php                       |   0
 .../my_app/mysql-credentials.php              |   0
 .../mysql_dbms/mysql_dbms_configure.sh        |   0
 .../template.yaml                             |   2 +-
 .../csars/yaml/valid/lamp_input.csar          | Bin 3502 -> 0 bytes
 .../csars/yaml/valid/lamp_noinput.csar        | Bin 3024 -> 0 bytes
 .../csars/yaml/valid/simple-task-csar/zip     |   2 -
 .../csars/yaml/valid/simple-task.csar         | Bin 6278 -> 5335 bytes
 .../simple-task/docker/dockerapp_create.sh    |   9 ++
 .../simple-task/docker/dockerapp_delete.sh    |   3 +
 .../simple-task/docker/dockerapp_start.sh     |   4 +
 .../simple-task/docker/dockerapp_stop.sh      |   3 +
 .../simple-task/docker/dockerengine_create.sh |   4 +
 .../simple-task/docker/dockerengine_start.sh  |   2 +
 .../simple-task/docker/dockerengine_stop.sh   |   2 +
 .../simple-task/simple-task-app/Dockerfile    |  14 +++
 .../simple-task/simple-task-app/createdb.sql  |   7 ++
 .../simple-task/simple-task-app/index.php     |  79 ++++++++++++++
 .../simple-task-app/mysql-credentials.php     |   7 ++
 .../template.yaml                             |  15 ++-
 66 files changed, 612 insertions(+), 14 deletions(-)
 create mode 100755 server/src/test/resources/csars/csar-make
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerapp_create.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerapp_delete.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerapp_start.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerapp_stop.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerengine_create.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerengine_start.sh (100%)
 mode change 100644 => 100755
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/docker/dockerengine_stop.sh (100%)
 mode change 100644 => 100755
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockertypes.yaml
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/simple-task-app/Dockerfile (100%)
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/simple-task-app/createdb.sql (100%)
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/simple-task-app/index.php (100%)
 rename server/src/test/resources/csars/yaml/{valid/simple-task-csar => invalid/dependencies_missing}/simple-task-app/mysql-credentials.php (100%)
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dependencies_missing/template.yaml
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_create.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_delete.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_start.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_stop.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_create.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_start.sh
 create mode 100755 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_stop.sh
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockertypes.yaml
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/Dockerfile
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/createdb.sql
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/index.php
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/mysql-credentials.php
 create mode 100644 server/src/test/resources/csars/yaml/invalid/dockerapp_missing/template.yaml
 create mode 100644 server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/second_entrypoint_this_will_cause_error.yaml
 create mode 100644 server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/template.yaml
 create mode 100644 server/src/test/resources/csars/yaml/invalid/entrypoint_missing/nothing.txt
 create mode 100644 server/src/test/resources/csars/yaml/valid/entrypoint_is_yml/template.yml
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-input.csar
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/my_app/configure_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/my_app/create_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/my_app/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/my_app/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/mysql_dbms/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_input => lamp-input}/template.yaml (98%)
 create mode 100644 server/src/test/resources/csars/yaml/valid/lamp-noinput.csar
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput => lamp-noinput}/my_app/create_myphpapp.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput => lamp-noinput}/my_app/myphpapp.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput => lamp-noinput}/my_app/mysql-credentials.php (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput => lamp-noinput}/mysql_dbms/mysql_dbms_configure.sh (100%)
 rename server/src/test/resources/csars/yaml/valid/{lamp-csar_noinput => lamp-noinput}/template.yaml (97%)
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp_input.csar
 delete mode 100644 server/src/test/resources/csars/yaml/valid/lamp_noinput.csar
 delete mode 100644 server/src/test/resources/csars/yaml/valid/simple-task-csar/zip
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_create.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_delete.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_start.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_stop.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_create.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_start.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_stop.sh
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/Dockerfile
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/createdb.sql
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/index.php
 create mode 100644 server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/mysql-credentials.php
 rename server/src/test/resources/csars/yaml/valid/{simple-task-csar => simple-task}/template.yaml (93%)

diff --git a/server/src/test/java/org/opentosca/toscana/core/csar/CsarFilesystemDaoTest.java b/server/src/test/java/org/opentosca/toscana/core/csar/CsarFilesystemDaoTest.java
index 3e18e3295..4787a2a69 100644
--- a/server/src/test/java/org/opentosca/toscana/core/csar/CsarFilesystemDaoTest.java
+++ b/server/src/test/java/org/opentosca/toscana/core/csar/CsarFilesystemDaoTest.java
@@ -60,7 +60,7 @@ public void create() throws Exception {
         File transformationFolder = new File(csarFolder, CsarFilesystemDao.TRANSFORMATION_DIR);
         assertTrue(contentFolder.isDirectory());
         assertTrue(transformationFolder.isDirectory());
-        assertTrue(contentFolder.list().length > 3); // not elegant but lazy..
+        assertTrue(contentFolder.list().length > 2); // not elegant but lazy..
     }
 
     @Test
diff --git a/server/src/test/resources/csars/csar-make b/server/src/test/resources/csars/csar-make
new file mode 100755
index 000000000..f6f3e0cfa
--- /dev/null
+++ b/server/src/test/resources/csars/csar-make
@@ -0,0 +1,11 @@
+#!/bin/bash
+# run this script (no args required) in order to (re)pack all csars
+pushd "$(dirname "$0")" > /dev/null
+for CSAR_DIR in $(find -mindepth 3 -maxdepth 3 -type d); do
+    pushd $CSAR_DIR > /dev/null
+    NAME=$(basename $CSAR_DIR)
+    zip -r ../${NAME}.csar * > /dev/null
+    echo Packaged $NAME as ${NAME}.csar
+    popd > /dev/null
+done
+popd > /dev/null
diff --git a/server/src/test/resources/csars/yaml/invalid/dependencies_missing.csar b/server/src/test/resources/csars/yaml/invalid/dependencies_missing.csar
index b1444e29d9747c963acae34d3991bc3b97461416..4d2ca9a70ea2d8ef7797bda234aae5c19062bcfb 100644
GIT binary patch
delta 1450
zcmca=Fjs$qs!V7ICj)be^Xo_{Z`r8Q3T_5QmKV$n3}9lSqZLFxQsQ;w4=)V)$+ax<
z6SukJS0l+d1+Rk5CmCZI@v4~Y#9V`4!7b)?{0eGWlJG0|%~A?cFjE|>S2y>tmN6lW
zz!F%K<v7d{3b2IM=0c8AX8bCccw`6!g%$5kyhcps=ZmXfnOoz1B2Y3d8W@r9xEL6C
z8DtnrQgaJ(5=&C`Did>az>yvsB^wn7#AuPeH7vUOwuMOD_w^PRrpL}mu?p}yc{?uc
zrPIQtmoK#k^(4(bk|g7)E$gp7<==O?Sf$$=(=#K?^fxXo{#?HAy+=xoa(z~(^-@vI
z#kGGM&V4@2rjb`!x<U4ud*O>$vwtm{^g?>Mj_YLp6SJEH%8oU<+@87kQuP8c#h+_E
ze*B)gK}>E6L*}gNk^tEWEg~vrq6|+3wu-Ue@wqeU=c^P$Gcnt($2MAiy*4vcC$xK`
z>(8FqUq7$9<d)>?-fj2fk1^Z6tJO;l>-R8Ue|LrXRMqn{iuFIOe*E}aovbm-hPhY6
z*5pvv+E*g7=9U+-A9G4Dtcxu@wD$VNeK%H4G5Hg<?T$m;!=#-H3McG%_+fsWrOkq6
zkG3-f&-2fld+Bd-<m6M6gKyh?U3&l9tY4cnV=ikQYO6Zl*S|jQntuEd-=&;){Y;!&
z%T>0B)cf(>lxpvJ{^4BQLf3_M6E`iji(PKtv*Oyx?6<ccJ@>TOW#UsZ%gylHCxv6n
zBsgE)U-S3nI{k9xZ-ovS69rSPUGDf;m>V2O6zBfFcGGgMW7&1GP77;Rd*}6jxw_-`
z(=X+M{pEkR1)o*Fb1y5C*WB_Jmlu!ZEZ?O1bE^(0?Um1{Hw~+vV7l97WBYTR^iqN9
zGjd)=0a?p0#7b3sXo)|h@#CwFZ}N_lJoA3<pK&_)mHp*!D<#Ayn6*eqR6DIc%)MV_
zXMw;9wx&7#2d=js_YRWq-{2_7zbJUqw`JvLGnX8C?il%@b?v+b5B-<T+A!_-ZdY@;
zMSGl<8Qx`!QmT$JxuaTN@zrMkw{@%6E+}KZUa5LoP2Tvu-M@d&-rKM0Dm0sW)7aqW
z9S+Y+i4(<(ZXGVH%kW{ZxV7?;pVd*j4~k)FXRpkd{`pnR)bw38*S*9ZH2o+l|Ft<e
zWJ=8GUpC$bLW^$dcE7(Lv^KAcbKWh!;`R9(+*dhgD>r6ep8QtR;N`n-XXER`UC)L`
z9t~HOs%d<`Jkwa3$vau$Mq!S9oTtQdEidl2FN{wW&-3hFF6;in_wVz=8G4USrYTsJ
zUzbf6h(E9H^UIdI+~62z>EWuz^{ZYx&Ans0I^fW^6WgaObCo;Vbg01e<+5X44d+ZY
zc0{^7T)1R+ldjSCf(XW^jPe^3c~V4o$j|>ZW8<;Tcj9ezFEx#GA6|;k4M=PH>5|?p
sGE>IxD*xsZA!}AX)J!^guecfuC`V2<kPzqNXW(aOVr5`p6=DDa0L!9FTL1t6

delta 1604
zcmbQMf7M`us!VAGHv=Qf3uXoeFcBKU$-tcA{5rDN>viNrM=PxIkrJ;XL3na4i~PiG
z?)cS6GETv(VDm}FSVp`mCOa|L;8$>qxgEcPT9zdI3VyScVpT9x{B<M<Z|-3&W5TKe
z9vE^Q=6DrsF61a>#;<~jM}|O9Sn=+}Ys6%JzPS27*%99Du4(g=fUzpi&A`CRAj43S
znp=>QSdyw&nV6e{Ez;GBUPprP*0AXAD+VHU@7HtuShT@-H@A{eeq5Lc%hAx92}@IE
z8DHKoQ$=n0YraSI-=7#|TEFdTw$Q(<_WWA$zW3f2ezaX@GOG{rp5pfV7vG%a?V^Ww
zJbijjYsL4P<*!cvS|s#9T3y#|@_C2ZGL5-C$xLgEs#k93iB33~-+1S~-j1zr{EF0k
zin;qjtsV3%K7}5YcqXv*nRP_(ok>3*B^a7KlihY~qGj2&nXWpapBK9R>^c3^H8fLs
z!Lhxp@<sdl8rOdb%i?(7Q=e7-iO*$kVcPWlHIg-dK20{1@Rc*<Rj|q4@icp-%DZsO
z3(=1!1~RWGTe%}zZ*lF$$(orzwx;Y%`q|pGw5iSUQCsu-xg{HzdynQH^r^Jlp}BJR
z?@ek;+|{qg&hp;=&ZI1L^6q6*Ie5$ZWZuuWUp?QpcXp8S4&MA<T<a%hADsK5ezPgx
ziur%7D_aFye^s2C_N-*yKZUZbesSLS#q9g<JY1Q$=(0uE#^vmWW=B2N)+N4;_phy!
zD(tImPZJE>=6vKTN3kuF%!-H|`Acm>3}QZ?7T`L<9$S=sK>pa>bIbSl{rz!c?bMuo
zhkki+XJ?$aI4#-9!#?N9?c@+vk(asrs}<{SGp{|VI?2{1-RiXLeWz~|nxs_Ch3>3u
ztoHwA;c;;CW0T&6iou`n{CCn@dBy(lw}lew4Q4Gb1gl?6YZBhCvNJ#+>??!iv;*5&
zj~9nXXhodwuwJ)h#om`O#S=oltxXr(t+<*!;m7oqZYxwPw?Al8^3u+bS{&B=EvI6+
zM`W~1b^QjT!y84rpNm(nEnc-v=C<VQ&wHlKoaVP|<;~;z`uF!&hlZMHFFrGE*6j21
z5@z$w*)zfW{@dm3=YI%zScl&6RDYOm#nBzt+nZ^*-fw2@k+;eFQiaY7SorU-w(6=p
zX?p(SVisnj*=KDU|4+#(jP!ZHAZzyZ*U4=Sr48;Xj=5G_>SftX;^Oz#7l(;F)X_c|
z*?BDQ#`@+Y-<A|VuO``}-wsc`@;Js-(s90B$<Fh}FYg}iYkt@JcX^YUXw$_s1#aK#
zZ`F0}=C2C*Wy|&5;+61=HjCqR9!s6(n%HVPZumMc&&rou<+)6=!|amV%3TJjvm%bD
zD1BeE#5y@!;f>?|Lrdz@3;21zI)pI(&g|QH-QZH+%;v>src5v^{<tPh!T8nBj&yf{
zm37Pk-pnjq3?Sec7wT>QJ8iW#kPX7j!2DX3S%58<!b%%uMg64AJpH7^;tT}^E}&us
zJw5&6Okf^Q)#WcqEY8+TE>0{`&@EEX;@ZqAWX;NlS}08R6IWwWE1K*mq^O8$wFJmT
k42(ehwvk7O0pyU$8^xqVSlK}00zi10m4TrID8s-205ZB~?f?J)

diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_create.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_create.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_create.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_create.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_delete.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_delete.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_delete.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_delete.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_start.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_start.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_start.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_stop.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_stop.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerapp_stop.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerapp_stop.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_create.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_create.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_create.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_create.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_start.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_start.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_start.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_start.sh
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_stop.sh b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_stop.sh
old mode 100644
new mode 100755
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/docker/dockerengine_stop.sh
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockerengine_stop.sh
diff --git a/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockertypes.yaml b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockertypes.yaml
new file mode 100644
index 000000000..19bf4f55a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/docker/dockertypes.yaml
@@ -0,0 +1,67 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+node_types:
+  DockerEngine:
+    derived_from: tosca.nodes.Root
+    # needs capability: DockerHost or similar..
+    capabilities:
+      host: 
+        type: DockerHost
+    requirements:
+      - os:
+        type: linux
+        distribution: ubuntu
+        architecture: x86_64
+    interfaces:
+      Standard:
+        create:
+          implementation: dockerengine_create.sh
+        start:
+          implementation: dockerengine_start.sh
+        stop:
+          implementation: dockerengine_stop.sh
+  DockerApp:
+    derived_from: tosca.nodes.Root
+    requirements:
+      - host:
+        capability: DockerHost
+        node: DockerEngine 
+        relationship: tosca.relationships.HostedOn
+      - network:
+        capability: SimplePublicWebEndpoint
+    attributes:
+      tag:
+        type: string
+        description: the tag for the docker image
+      identifier:
+        type: string
+        description: the identifier (name) for the docker container
+      endpoint: { get_operation_output: [ SELF, Standard, create, endpoint ] }
+    interfaces:
+      Standard:
+        inputs:
+          tag: { get_attribute: [ SELF, tag ] }
+          identifier: { get_attribute: [ SELF, identifier ] }
+        create:
+          implementation: dockerapp_create.sh
+        start:
+          implementation: dockerapp_create.sh
+        stop:
+          implementation: dockerapp_stop.sh
+        delete:
+          implementation: dockerapp_delete.sh 
+capability_types:
+  DockerHost:
+    derived_from: tosca.capabilities.Root
+    type: tosca.capabilities.Root
+    sources: [ DockerApp ]
+  SimplePublicWebEndpoint:
+    derived_from: tosca.capabilities.Endpoint
+    properties:
+      protocol:
+        value: http
+      port:
+        value: 80
+      url_path:
+        value: /
+      network_name:
+        value: PUBLIC
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/Dockerfile b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/Dockerfile
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/Dockerfile
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/Dockerfile
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/createdb.sql b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/createdb.sql
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/createdb.sql
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/createdb.sql
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/index.php b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/index.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/index.php
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/index.php
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/mysql-credentials.php b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/simple-task-app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/invalid/dependencies_missing/simple-task-app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/invalid/dependencies_missing/template.yaml b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/template.yaml
new file mode 100644
index 000000000..dd10c12c1
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dependencies_missing/template.yaml
@@ -0,0 +1,99 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+description: Template for deploying the simple-task-app via docker 
+metadata:
+  template_name: simple-task-docker-template
+  template_author: stupro-toscana
+  template_version: 1.0
+
+node_types:
+  DockerEngine:
+    derived_from: tosca.nodes.Root
+    # needs capability: DockerHost or similar..
+    capabilities:
+      host: 
+        type: DockerHost
+    requirements:
+      - os:
+        type: linux
+        distribution: ubuntu
+        architecture: x86_64
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerengine_create.sh
+        start:
+          implementation: docker/dockerengine_start.sh
+        stop:
+          implementation: docker/dockerengine_stop.sh
+  DockerApp:
+    derived_from: tosca.nodes.Root
+    requirements:
+      - host:
+        capability: DockerHost
+        node: DockerEngine 
+        relationship: tosca.relationships.HostedOn
+      - network:
+        capability: SimplePublicWebEndpoint
+    attributes:
+      tag:
+        type: string
+        description: the tag for the docker image
+      identifier:
+        type: string
+        description: the identifier (name) for the docker container
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerapp_create.sh
+        start:
+          implementation: docker/dockerapp_create.sh
+        stop:
+          implementation: docker/dockerapp_stop.sh
+        delete:
+          implementation: docker/dockerapp_delete.sh 
+capability_types:
+  DockerHost:
+    derived_from: tosca.capabilities.Root
+    valid_source_types: [ DockerApp ]
+  SimplePublicWebEndpoint:
+    derived_from: tosca.capabilities.Endpoint
+    properties:
+      protocol: http
+      port: 80
+      url_path: /
+      network_name: PUBLIC
+
+topology_template:
+  node_templates:
+    myDockerEngine:
+      type: DockerEngine
+
+    simpleTaskApp:
+      type: DockerApp
+      attributes:
+        tag:
+          description: tag for docker image
+          value: simple-task-app
+        identifier:
+          description: identifier of docker container
+          value: simple-task-app-1
+        endpoint: 
+          value: { get_operation_output: [ SELF, Standard, create, endpoint ] }
+      interfaces:
+        Standard:
+          inputs:
+            tag: { get_attribute: [ SELF, tag ] }
+            identifier: { get_attribute: [ SELF, identifier ] }
+          create:
+            implementation: 
+              primary: simple-task-app/create.sh
+              # dependencies will get copied by orchestrator to the same location
+              # as create.sh, before create.sh is executed
+
+
+  outputs:
+    endpoint:
+      description: the endpoint of the simple-task-app
+      value: { get_attribute: [ simpleTaskApp, endpoint ] }
+      type: string
+
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing.csar b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing.csar
index 76619132d12a367472c577cf66010b5650a3b734..1ab62b908f796a2eed72da77f313590d092bc50b 100644
GIT binary patch
delta 607
zcmbQK|3Y_ys!V7ICj)be^Xo_}Z`r8Q3T_5QmKV$n3}9lSqZLFxQUa^|<XRT_iQC-q
ztC3`!f>*)jlZ>&9cvVbxVy?lj;1+W`eg(BGN%$4~W+{azm?@6ctDAdR%b4&RA;)2k
zSHb2&j#6g)Dwud=2n2-{?@qi%Oy=i{v)!0m<GudjsbkBS7#P$z7#MgNWEe_Pa|?13
zOH%bJ6LWLGk)9VN8wJ8>kv@49Ule2NW>$V*rp>zqEm=8WrcM4WrlW~PLx49c8v_vV
O17Q;@14Doyhz9@!%aoG<

delta 744
zcmaE%J5zsxs!VAGHv=Qf3uXoeFcBKU$-tcA{5rDN>viNrM=PxIkrJ;XL3na4i~PiG
z?)cS6GETv(VDm}FSVp`mCOa|L;8$>qxgEcPT9zdI3VyScVpT9x{B<M<Z|-3&W5TKe
z9vE^Q=6DrsF61a>#;<~jM}|O9Sn=+}Ys6%JzBpU&+z9W~AD*_$m>3w;I2ags8Dtnr
zQgaJ(5=&C`Did>autmCB(d$SMp1g`LiZN|7E59#O8Z!$Q0|<D=g?iinPFt-FWP>m>
z(7>w90&K>>f<swRKPfX$KPj;|LqUNHs8~TyPro=5=!jI^lEmU{z2xG=A_d(d1ud@4
z0fN@7956>uo-C%rq*gRJP)J-Gm+cZDM=>x0@!Q4#K?aapCjSwY5@BTni3<SXX;ub?
J9Y7fd1_0@!yu1Ja

diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_create.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_create.sh
new file mode 100755
index 000000000..44336c750
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_create.sh
@@ -0,0 +1,9 @@
+#!/bin/bash  
+# IMPORTANT:    don't simply run script like this:  ./create
+#               instead, run it like this:          . create
+# This sources the script (executes commands in same shell);
+# the exported endpoint will therefore be available afterwards
+docker build -t $tag .
+docker create -p 80:80 --name="$identifier" -i $tag &&
+export endpoint=$(curl -s http://whatismyip.akamai.com/)
+echo "created container '$identifier' from image "$tag". endpoint is: '$endpoint'"
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_delete.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_delete.sh
new file mode 100755
index 000000000..ff3b70a0f
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_delete.sh
@@ -0,0 +1,3 @@
+#!/bin/bash  
+docker rm simple-task-app-1 &&
+echo "deleted simple-task-app"
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_start.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_start.sh
new file mode 100755
index 000000000..fb8a128af
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_start.sh
@@ -0,0 +1,4 @@
+#!/bin/bash  
+docker start $identifier > /dev/null &&
+echo "started $identifier"
+
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_stop.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_stop.sh
new file mode 100755
index 000000000..c9d606fef
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerapp_stop.sh
@@ -0,0 +1,3 @@
+#!/bin/bash  
+docker stop -t0 simple-task-app-1 > /dev/null &&
+echo 'stopped simple-task-app'
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_create.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_create.sh
new file mode 100755
index 000000000..f54500b53
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_create.sh
@@ -0,0 +1,4 @@
+#!/bin/bash  
+sudo apt-get update && sudo apt-get install -y docker-ce
+sudo groupadd docker
+sudo usermod -aG docker $USER
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_start.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_start.sh
new file mode 100755
index 000000000..a7d0ed4dc
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash  
+sudo systemctl start dockerd
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_stop.sh b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_stop.sh
new file mode 100755
index 000000000..83d30db99
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockerengine_stop.sh
@@ -0,0 +1,2 @@
+#!/bin/bash  
+sudo systemctl stop dockerd
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockertypes.yaml b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockertypes.yaml
new file mode 100644
index 000000000..19bf4f55a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/docker/dockertypes.yaml
@@ -0,0 +1,67 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+node_types:
+  DockerEngine:
+    derived_from: tosca.nodes.Root
+    # needs capability: DockerHost or similar..
+    capabilities:
+      host: 
+        type: DockerHost
+    requirements:
+      - os:
+        type: linux
+        distribution: ubuntu
+        architecture: x86_64
+    interfaces:
+      Standard:
+        create:
+          implementation: dockerengine_create.sh
+        start:
+          implementation: dockerengine_start.sh
+        stop:
+          implementation: dockerengine_stop.sh
+  DockerApp:
+    derived_from: tosca.nodes.Root
+    requirements:
+      - host:
+        capability: DockerHost
+        node: DockerEngine 
+        relationship: tosca.relationships.HostedOn
+      - network:
+        capability: SimplePublicWebEndpoint
+    attributes:
+      tag:
+        type: string
+        description: the tag for the docker image
+      identifier:
+        type: string
+        description: the identifier (name) for the docker container
+      endpoint: { get_operation_output: [ SELF, Standard, create, endpoint ] }
+    interfaces:
+      Standard:
+        inputs:
+          tag: { get_attribute: [ SELF, tag ] }
+          identifier: { get_attribute: [ SELF, identifier ] }
+        create:
+          implementation: dockerapp_create.sh
+        start:
+          implementation: dockerapp_create.sh
+        stop:
+          implementation: dockerapp_stop.sh
+        delete:
+          implementation: dockerapp_delete.sh 
+capability_types:
+  DockerHost:
+    derived_from: tosca.capabilities.Root
+    type: tosca.capabilities.Root
+    sources: [ DockerApp ]
+  SimplePublicWebEndpoint:
+    derived_from: tosca.capabilities.Endpoint
+    properties:
+      protocol:
+        value: http
+      port:
+        value: 80
+      url_path:
+        value: /
+      network_name:
+        value: PUBLIC
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/Dockerfile b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/Dockerfile
new file mode 100644
index 000000000..95abd426a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/Dockerfile
@@ -0,0 +1,14 @@
+FROM janes/alpine-lamp
+MAINTAINER hnicke
+COPY index.php /www
+COPY mysql-credentials.php /www
+COPY createdb.sql /
+
+EXPOSE 80
+
+RUN nohup mysqld --skip-grant-tables --bind-address 0.0.0.0 --user mysql > /dev/null 2>&1 & \
+    sleep 10 && mysql -u root < /createdb.sql
+
+ENTRYPOINT httpd && \
+           nohup mysqld --skip-grant-tables --bind-address 0.0.0.0 --user mysql > /dev/null 2>&1 & \
+           tail -f /dev/null
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/createdb.sql b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/createdb.sql
new file mode 100644
index 000000000..4a62e2720
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/createdb.sql
@@ -0,0 +1,7 @@
+CREATE database mydb;
+create table mydb.tasks
+   (id int not null unique auto_increment,
+      task varchar(255),
+      primary key (id)
+   );
+
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/index.php b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/index.php
new file mode 100644
index 000000000..0065fa98f
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/index.php
@@ -0,0 +1,79 @@
+<?php
+
+// include the credentials to connect to the db
+include_once "mysql-credentials.php";
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($host, $username, $password, $database, $port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="index.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/mysql-credentials.php b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/mysql-credentials.php
new file mode 100644
index 000000000..5196befdb
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/simple-task-app/mysql-credentials.php
@@ -0,0 +1,7 @@
+<?php
+$host = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "mydb";
+$port = 3306;
+?>
diff --git a/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/template.yaml b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/template.yaml
new file mode 100644
index 000000000..4f5b2af0d
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/dockerapp_missing/template.yaml
@@ -0,0 +1,82 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+description: Template for deploying the simple-task-app via docker 
+metadata:
+  template_name: simple-task-docker-template
+  template_author: stupro-toscana
+  template_version: 1.0
+
+node_types:
+  DockerEngine:
+    derived_from: tosca.nodes.Root
+    # needs capability: DockerHost or similar..
+    capabilities:
+      host: 
+        type: DockerHost
+    requirements:
+      - os:
+        type: linux
+        distribution: ubuntu
+        architecture: x86_64
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerengine_create.sh
+        start:
+          implementation: docker/dockerengine_start.sh
+        stop:
+          implementation: docker/dockerengine_stop.sh
+  DockerApp:
+    derived_from: tosca.nodes.Root
+    requirements:
+      - host:
+        capability: DockerHost
+        node: DockerEngine 
+        relationship: tosca.relationships.HostedOn
+      - network:
+        capability: SimplePublicWebEndpoint
+    attributes:
+      tag:
+        type: string
+        description: the tag for the docker image
+      identifier:
+        type: string
+        description: the identifier (name) for the docker container
+    interfaces:
+      Standard:
+        create:
+          implementation: docker/dockerapp_create.sh
+        start:
+          implementation: docker/dockerapp_create.sh
+        stop:
+          implementation: docker/dockerapp_stop.sh
+        delete:
+          implementation: docker/dockerapp_delete.sh 
+capability_types:
+  DockerHost:
+    derived_from: tosca.capabilities.Root
+    valid_source_types: [ DockerApp ]
+  SimplePublicWebEndpoint:
+    derived_from: tosca.capabilities.Endpoint
+    properties:
+      protocol:
+        default: http
+      port:
+        default: 80
+      url_path:
+        default: /
+      network_name:
+        default: PUBLIC
+
+topology_template:
+  node_templates:
+    myDockerEngine:
+      type: DockerEngine
+
+
+
+
+  outputs:
+    endpoint:
+      description: the endpoint of the simple-task-app
+      value: { get_attribute: [ simpleTaskApp, endpoint ] }
+
diff --git a/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous.csar b/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous.csar
index 1d6975a4e5b77893c19df26286b3f14bde839c48..fa1dce20de52138b546f6b58ba2625b16d7a16b2 100644
GIT binary patch
delta 570
zcmZ1|dq`9`z?+#xgn@y9gJD^2jdy`y!->qv&zWsF!lPuP;(&OvHj7kT*opjQ8YK+M
zPsA5Jif{~Ky1Q@P|GwSc+z*2`W?v6^9Vl19b3-GY%XWR+r>C2zZe8Q;+VOg7F=xkD
zug;GJO=Y<YY%DbSc1No|wEoBTC5ius^uHB6$xnVb6q#{;d&)j}35z*Poj1^~`z-z}
z^+3jEBi3GK2<tG12_u*_`8Vf92;%}*dOgI+i-1l(|8~D)0?-4cK+MY^!%&i%Tac4j
zlB!pkn41$C!pXqw5A;R=5SLbPGcdBeU}j(d6RO>Yd@Tk%EY)!j`2#N8vwoqg9cj@m
z5WTVW$b0_6yB@}q#awqJU0%2HTC;vn#RKP`t1euY{xNOy$3v$>0tHi7JfFR$Vu?z|
zW=GL`Z?5eNu5<jK@7I|uR=z7_MU<sM#xKSIZ$>6LX0*Tsy0Qz1br>XoBm)B@5HD#2
z5|ckN>$9^mFoVK<av+Z-^Le1yK^Ec33wRuuB^enebF<1!{?FsUxN`DC9^uJrICv(<
z^ExoyXPvx|H-ULI8^h$eTpE*g_+*lC1r4%=aqJA}0R^-h6i{e^6yVLu2687m5H4q8
JU|{6{@c=|=x&QzG

delta 1532
zcmZvcdpOit7{`BeV~jCbq{+IB6&8)lB9}@^Xqwc73AJd9yJB)F8Vt%Ng_xy=L6b3U
za>;G9?i!autc_L3eI;tN6oqN_r~YWS-9NtPd7pE>?|II9p6B~{u$iO6AQ5431pok$
zK+Rb)F<#H_LkbK4x}*U>22cjVeNNL(QNn%nqbR3Ok)5Rg*m0YAx1J;OZV{2v00ce@
zdOs~C$A*)Y&17R1%4FYb#^)~U!>Kd)>oORuR|O^t$?K~M<h2!Px)pgW$SyAExZA}%
zH^i`RtG;9?lOqN!3hky&j3Uhs;*To5&e5jjsV<|ZvaUCfe`80LW!KH{<;G8F<Lw^W
z-*iZAPHi`W9Aj1XYyYHjuXR{`C2eOgo}R&$dSaD8C2x9&ux~8G3ZnNHL~UBzif=i$
zrB$I@^3_!hbIczs_e10*om=(o?lC9GLrDKOr&=yCZtQ8hu<(u$h!k)AQ#dW3G&6fB
zf2<y(>?!s|+db6dK`#2?Yu0g@txHyFZ+jxWoq<kwUE!SNr1W9l&56NpLVFk04ra+^
ztIC-vN2_u#sG2B_rm_~JIXZVPy{ORQ+G}sJnd_oqO)x&pIzAJL$D}6phK!knG+xPZ
z)VR;k2<bqpT?=Z-#THa!e#x6+cqJ+(u16+kt-{OM4he&edhoQ7iGlT`yeBCl6u<m3
zyJ)qc+Qlrg?oGK5)o4eKCtq-RjaA?7yOU%@9V5^movfXirzs?PMqDm|G+|fnt9(>f
zoD|SV6(SgB<+!Vj=&EZf0ZsKx&(DIQ7zus1kM4D%N=nLWu3GN$d(oMfk2B`p-1n#e
zzEUljc4*mwCaUQ&Ea3<p{~8hNJ7(_}yK@ZE%liDrQzz>c>{_Y`+S|+BOp{Mq^o?#V
z34Rn~dChKM&lyeIsmJ3(T^GF>sX|IV@?AoIDcaOY%OOZQ*it?K;Skgx>v&y5jiDgZ
ziRtqo`3`XsBI!AU61SDQ%7>fldx*~*UfyyOSgn5)ta-*3>jq{Vo!Q^^*oDx{ThlO@
z?q6G4Rb}<Qt#WG14KI)3(o4Fz7B{k%=7t)i#rnH5Q)(%{k4#X`R4&Q|4R>4t<OSJN
ze1aI?FD$hl|4xPPD{4C&=WxxQ;mn{)RKX-ntwx%}A9(jaYSoE&>~^d2CIhDc)9w6r
z+vdJ!v9%e2?8@))SivRTv@^%5=`8a*qwFTt<MUF6!)RZQuy(1awQMj<N92*%`$LiZ
zY}T%h#sh`>^7?n{?Y$>pS^YSK@%Iix+dSo_nN=X2cqxS9!_#@0G_zL>fV&&(a^o#J
zk5j0Wgow!QoEvzMSQCAB`f7nQ4Pows!&HllOXG;0)4%d_8=%AaFS}I`NhQ;r_8x|3
z<pLDtx+SLCAG^SbJBHpL=&53<`6gt`q$hs7%K*Ma+dP&`oIC#v83+bF8Ps+#+F?G_
zkYMlhZF&qkY2Ix^UqxCaxlc-9h(?Hw6YcyNJ8d~Iq<WJqq63p5H@h4mIyd6JOqxg-
z$S!=R7%iYSUkT;in<^eJQ_jp^cSY@c-oqwZ)AfGFrfu`DMs+%5c+I=uxuI=iaifzE
zadXHMilxO_{~n%tBXk`|?=^#OK!u5d9QjmKx<gW6pDQ8U1Oj)%f`?iXeV<)x5`GL6
zI0gU^Jjld7Yrc2&z<NV4aIo_Mv`?hk==mQ~X{Z}`1q2&-QNsLjI235c>FXPW1%RCM
z!G}}Ag7m3jlu#T#6sL<K5g|}j*#FW|8^j}a;{^Z&6gPgO`U;ka4OlXtOR3=g`~ClH
z?T0aqkj79t3G{AZ#vr#rxo~Cy(itj*Ge02Rp|MD&tCR<<N(x}EBh;8rrL3WGD5et1
o7WATU|DOKKy|3eqL580XU|OTTWtO5OFh~&bZ=e8>18xJr-#sIX!vFvP

diff --git a/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/second_entrypoint_this_will_cause_error.yaml b/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/second_entrypoint_this_will_cause_error.yaml
new file mode 100644
index 000000000..fef6c0ce7
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/second_entrypoint_this_will_cause_error.yaml
@@ -0,0 +1,2 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+description: second template file that should cause the ParserService to reject the csar
diff --git a/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/template.yaml b/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/template.yaml
new file mode 100644
index 000000000..5871c834a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/invalid/entrypoint_ambiguous/template.yaml
@@ -0,0 +1,2 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+description: Template for deploying the simple-task-app via docker 
diff --git a/server/src/test/resources/csars/yaml/invalid/entrypoint_missing.csar b/server/src/test/resources/csars/yaml/invalid/entrypoint_missing.csar
index f9626f4ad512f7abbf566b757695f85ce412c773..c13f345a484cdd080a02ac8ca1a9bbe171426b24 100644
GIT binary patch
delta 306
zcmbQPzE)#`9?Jx8*{F#|L121v9*f?@Z2=HA7vmZ*WAiS?Qbvf-8y3~c5zP4z&S~cP
z5JnzL6->Gp%-CGZTFV3x`p51M5enq!WrnaGahpJmlj6MyQT3iT)r6Uaiva`<<konD
z8Bl_oL53kOza%3wFI}&sq9inglYzM-N;YZ<5Ko>UsJ%IlPn0#4kx7mjmwpMjaZ4J5
p_!v-4V}+PjTEWf0$nt`jfdNbec(byBbnydW11kf=bf7i{1_0Z4OT_>H

delta 168
zcmZ3hF<pIv9?J}qSCJEqg243TJQlr)+X5hLF2*%r#^zm&rHl}vH!P}?Bbf6coYTzn
zA&fkhDwuRHn6bH*wU!AY^pD*iA{5Bc%M4*X;x>UAC&haaqUt?w>gJhz`m7?XYz#oa
O2ZZ{p3=BbhARYkpN;~BM

diff --git a/server/src/test/resources/csars/yaml/invalid/entrypoint_missing/nothing.txt b/server/src/test/resources/csars/yaml/invalid/entrypoint_missing/nothing.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/server/src/test/resources/csars/yaml/valid/entrypoint_is_yml.csar b/server/src/test/resources/csars/yaml/valid/entrypoint_is_yml.csar
index 1efaa7030d24db1048e8374a03eff6ae75b35f25..d793d46d8030d31ca49ff5bb6e93ec8274e896e7 100644
GIT binary patch
delta 369
zcmZqCIj*^3CR_caoEq<nX-6VvFfcIu24Wrt8HSS7+=86Ml2pCQ+?>!5P6p<X2-zqQ
zF0J5ZU}Sm0%)kI9e9s4R9X8-#d+>eUA?_t>*56KSQkmAKX1L<+i?`yp)_!qyv43(s
zg87$6@v4(T;a~HG-kueH6OpN<JNf>`6#Ji<9ZMWTgEmi|5Tzfx;3D@ewce?9pU*pO
zn{Z&qbe`f<OB$RSA|(x2vfKm%8dsgXXAx?BmEpQ){KhZE>1^pMR(H#U34IqY@0qQu
zGxzqjmb(-8KZ=dn@B29U2h#+p%||$<bMm2jZgQrODhtRPlMjl>Pp%c<nY>qsk13aZ
z@>wBo=5_20li%}*PnPH8m>eUbHaS69idmlnBqlm}9w+zYxxx-ik2ogZ7mj0!;hJnO
x63g@zM2Suo5mlaiO+<xxDmO^6++=A{2PP4o$+4nwOe=skh&r+v@B_n@0RS2Ri*^72

delta 667
zcmV;M0%ZNiDTFMrnFfEIoK#D;P~<q(0RRAa1ONaG02}~xWo>Y5VRU6Kd2MV}R0#kB
zIW+27IW+27b$AN^0R-p+000E&0{{SxQ_F7LFbur=D+u%&JK3vyD$ssGb1MpiE75Bq
zvZP9M5~Ik!hnBqFR}SlgZBWA@ha9m_3Oh}`afXd|se7fE<fnfH&PU0N!BRKlXuDna
zRB1{on!p7@iRC2-Wcm(aioqvZ<8K4;KoOdGw9p$%2{00%O&(Aw3QQU>0XdFy@WydL
zRj^TZ4o9IYJ=BcprPf}(P^^!Lb1+Uk_$Y9mLiBa+-{Co8)3$4#Dk1feQ!9WP3T?Z7
zAIpd5K&e@zS5<$-K6vX7b9ZE05}nty1u_-DIRDJqzudt%DlzFnxLP<rsq#tD_AJtV
zgzyzu!fO<nquEbep^U`C<$Q310~jr{HN9DcU193oijuKY>`|SQ{$_L<qdr9dRHRk&
z>B*F%)WBkgi$j1A&4_Wnsr^{EnlxM`d;?8^oOG>>xaEJ%SPKVYP(B#(%6<kP)ga!A
z$UcfeK@0{-JOb9M+{6u|7;G!|0DJ1acyNn=5&ylDlA-FW)bmzuq%D@YR#n!uSojWb
z=|JzB^v~V_H`2*_6NYdHcASN?mI8VEa@}&?;x<2Vn0Q^Zh|8DmxYEmuEpt5r!1ra&
zU%KoS?Iaam{l6@#+Z@`$pG#*yoap|-M^$|SkQ%dx2bT#Bot#ulwov3a)d2ticm$Iy
z5hVgSG?M`l7n5ocBm$}klaLWh0_zBqzY`df^$|z{YzdP;5@7)!lK~SHleH2{0+|bw
zVG|XTjS2{p9}_?VG7OVp6I=q)43obTUjk7LlVKARlQR@c0_6>pfD}OnZ4dwe0094L
BA;ACu

diff --git a/server/src/test/resources/csars/yaml/valid/entrypoint_is_yml/template.yml b/server/src/test/resources/csars/yaml/valid/entrypoint_is_yml/template.yml
new file mode 100644
index 000000000..e2b3b588d
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/entrypoint_is_yml/template.yml
@@ -0,0 +1,5 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+description: test template; purpose: test whether .yml files are also accepted as entrypoint files
+  template_name: simple-task-docker-template
+  template_author: stupro-toscana
+  template_version: 1.0
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-input.csar b/server/src/test/resources/csars/yaml/valid/lamp-input.csar
new file mode 100644
index 0000000000000000000000000000000000000000..58400b6d4c0de1f344afdee872c7c952c1571673
GIT binary patch
literal 3502
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

literal 0
HcmV?d00001

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-input/my_app/configure_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/configure_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-input/my_app/configure_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/create_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-input/my_app/create_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/create_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-input/my_app/create_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-input/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-input/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-input/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/my_app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-input/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-input/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/mysql_dbms/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-input/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-input/template.yaml
similarity index 98%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-input/template.yaml
index c00d080ab..4c4a76aac 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_input/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-input/template.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 description: Template for deploying a LAMP stack.
 metadata:
   template_name: lamp-stack-template
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp-noinput.csar
new file mode 100644
index 0000000000000000000000000000000000000000..c374e3c607a888e444ffb976d0c3d7b032fadca5
GIT binary patch
literal 3024
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

literal 0
HcmV?d00001

diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/create_myphpapp.sh b/server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/create_myphpapp.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/create_myphpapp.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/create_myphpapp.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/myphpapp.php b/server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/myphpapp.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/myphpapp.php
rename to server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/myphpapp.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/mysql-credentials.php
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/my_app/mysql-credentials.php
rename to server/src/test/resources/csars/yaml/valid/lamp-noinput/my_app/mysql-credentials.php
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/mysql_dbms/mysql_dbms_configure.sh b/server/src/test/resources/csars/yaml/valid/lamp-noinput/mysql_dbms/mysql_dbms_configure.sh
similarity index 100%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/mysql_dbms/mysql_dbms_configure.sh
rename to server/src/test/resources/csars/yaml/valid/lamp-noinput/mysql_dbms/mysql_dbms_configure.sh
diff --git a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml b/server/src/test/resources/csars/yaml/valid/lamp-noinput/template.yaml
similarity index 97%
rename from server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
rename to server/src/test/resources/csars/yaml/valid/lamp-noinput/template.yaml
index 1e10cf600..c59c91d14 100644
--- a/server/src/test/resources/csars/yaml/valid/lamp-csar_noinput/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/lamp-noinput/template.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 description: Template for deploying a LAMP stack.
 metadata:
   template_name: lamp-stack-template
diff --git a/server/src/test/resources/csars/yaml/valid/lamp_input.csar b/server/src/test/resources/csars/yaml/valid/lamp_input.csar
deleted file mode 100644
index be8c8ea754a568ec1b3065dde713d21888bd073a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3502
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

diff --git a/server/src/test/resources/csars/yaml/valid/lamp_noinput.csar b/server/src/test/resources/csars/yaml/valid/lamp_noinput.csar
deleted file mode 100644
index 22e3e45e8aaf1c4ba3a0d6ae7104a1990934013b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3024
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

diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/zip b/server/src/test/resources/csars/yaml/valid/simple-task-csar/zip
deleted file mode 100644
index 1ad436c94..000000000
--- a/server/src/test/resources/csars/yaml/valid/simple-task-csar/zip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash  
-zip ../simple-task.csar -r *
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task.csar b/server/src/test/resources/csars/yaml/valid/simple-task.csar
index 075dcbe789db0d9eb3fcb07c276aa24694cb0463..ccb5b7cfd27d13e4878419469f2e15ef765da752 100644
GIT binary patch
delta 1907
zcmZWpc|25m9KB<%bqq3=VaAfBS7bM2$zFJ)2?<T1u{GKEoiT|v#N1Lu`DA!hR4BAd
zTE>=Mk*y+aQt_#VLcM#b7;iqGGk=_WzUTKl-}|{IORskg)|re3MF8Zdbub|xtDq*c
z5l^kRCQ@S)FaQdCiw1!CKVBV0UkK4*EfuIx7^t0pS(Xo;?lM?pMNo0rg9&68vw`AO
zC;)hdf^LGcGJa73w3q<xX!=$+VF3NxqV5XH3I!WLvwS*>4&$IY<cT&z_@ij;MZOJ9
zM>rCwx5$Nob_iDw>MnBQ;1=OO$)I7uRr8OKXpp#&JR;W=S~%{rh61(DSI7g6kXJDa
z9ta72#>^tzr09~on%F#qyN)%RH$-$Su~3GQe+rp%%`5v5ys<V60AK+k5EBp@5rPCx
zq=kmeM?UVTKt-@@yO-RD4h<SfFs6J~-X~)kZV-=1aI2L(T!jq3xPEuu(@m`lj;v)n
zylm4d|CwyBq&X1m^He>?r$@2lSYX;sxw1(uMmRWLUa&fc+ksoRS$uoe<o&j18uZ+2
z9vxoM9>NpVkW3lJzSK7N7Wb|m%Du4cv0#?M1^))?k4naaRIZu{t|Aq@cSbP}lbf<#
zFRO1uS)%wr;WpRj#fBA}lv|zaT<<lT)*Yw{vUsw(xAClx$5A6bd2{N-%GWyGlh-XA
zu#DjnmyZ++CY{^)<=gAn3zJ`!?(TF;Y&A@uIQOdH6PuMV7-;_~+kPW|>0tRtO-)%^
zH?)R69m{SC_?F2k-&;W$VP<q?#5~Nn>)Sx9FhA9P<Z(-MzVN&52Sa(^^~VKrY)wXM
zKB(Co%1~{2(-2-{Y<b7FYQ^Bm2EQ!v`<GrYDB0aqLAS2Sl5;kPY|_j(kW;U0Vo03r
zS3BDu-`c4fpHO{*ZaC#T{*{uw$-=dYQO_NzIUldejXd{ILxmGL(O5zYvr9)y<EBdL
z{}HXw_Yw3^PU}^_EHLXk_%dmFpXXum7Rm#z&eNe_8kS@-7Ud))cOqvtBKJ(XN-Cbl
zAO$3sk_zo=_q}o2)%O|gk6Bac9HrCj^**8A|9Pg%#9ZR>9%ra3;p0ym?M+qTSs%z2
zH9%;Do(k7Zi{Im!T45f}JqIvRVtx|I?XA=;*{P~}vXOOqGBD!9Zg%ZW`@oBv*<blY
zbwo+FS~>BUFjG6nJr$&&HdDJ~N%=8JM)Hj5O)(0oz^@^oVH;~V)Z4z#l9BXtplj=f
zSR)RxQa3Stuk!9~{?=jxO2^247PtO&l-~SEX2yYhuDz&9|3F>L1CD|B$!K+4L}p5p
zSxcY%EA<{z%Pu~r{dDg8(HUxGhnEX;%Rt|wF{L;l#3ooZonTO^psW0D_{ZFNV@76&
zabc@*D`Do&kM)~Qv`Tmq(AI}jW~$VltlQ;6)y)#$s`zqk&{XX(J1KhRl`fT)5Qk5v
z48`8ta3K5`Zq=N3X1MMd+}ncb+czA_ZB9O3uW5Z@DF23QzZhLATD0W}TZiNeZmGy|
zTx%ZH^>-uTGWxb+w&bey8N29J0we9-F-4q_AX<LOa}7N|9qApV#rhIg`x)-Cm1NFn
z)8&%uRt=V{E-e54>QRpURjYCEk*L~n?4_eQ?f}`4`c0)X(7>V{AQ4o~PM-?x8MAaI
zqxclji~UhAsR<%|1>x~T<nu@2<Ulsl8emD|#c5G7^OeTGP-zfVmPmxVuk~WuiXCvV
zCc#hu@JPo3a1{b<C>8hDg4r+SVoL&mJdg4PPK`$yLKw>52z$7~kmFHWNvZNEiwMRb
z1y*^(!1E|iNvZsag4}akv8R^?tU^HGQO-%J^LRGrspwn5Dkm7c_w<(jb<f}Hks+YX
z_yK5A5GS}~Ez0n5)^U=a>*11oDzGd9GZP*#6Cy4jn7Lu^KLVe48eSgHsZ42M0BXZ1
zEFWm@)rpLQ2l8MLmj+^zMF0qeRa!ovJYA&c28;b+sPhcSVgRTEyL!n0LHYkpzvSIA
cIT#jR3Pd^{qTyx5!~iisogV;-#bIyYKX50bwg3PC

delta 2716
zcmaJ@2{=@J7r(P*7-O3TgRzvQ3^P;+Nl~_;ERn4RVPwsgEi=?7M8%b2EG?$UD_hAv
zlsBR%pEX;SR$B=v-nZ|LUZn5&zI&f@@ALfb`Tfs1|9j5=obIhLs#tR>0?7k#F6CnT
zBrH*OZqJMzM}k5y01Wva0RYR7^?C=kp*cG9kbpi&a#EQH9AdX^Uqg9d!PsJZs)cr6
zhCB=a24Nr@DFRLkU@+VOVuf2;3EKmMnBWqevPPXi%7L~BZ4Q0~L0-dK5Ht>^hE!d{
ze31J%*nOnR8a9EnqHlx(LIa~mtf?8S8et<i0BCRlfCwM~obYw=boHnFd<BO3xdxC!
zoxHuQ4?%vViHzHE<hR%}4-H+wsR~3+9~1nv|HeIqrc<+%9nIWalER<&Uc5YYplZ0x
zIK%WKapZ?jvKcr@=?$P~C#QXLb7Oy#&+%3cL6GufjSG~9;P&)us_|r!#%;vkvg$;7
z3q{^Uqwd2~My8qQV(vIsU4=arHQZ{8*z)kjC;UgVW(!n8LG4L1)iIP6km&kA#d)i?
z@xjuR_XZBmVrdjb?I>&fXh6oqg_y#*r0uEXgnz}v7~ez;-vQ}par2Z@g=wwth<||1
zI&Kb|m2Ws|#mknntj0>Ljt`hbr%Qyr9_^H4M~Gxv3cfb!U_C~0ccQ&a9*FG~NU1VJ
z`RLPc7IrmAF^m+ZACvmr7;;fN#H4P09e%Y7QDDYDWmlu_Hp@7OlQOhv+NrrT!AEcp
zpHX~l@ZPzx?1~$`yZ(h+{$-wYiek6T9`=si8Dw_szWxeVh4Ja4jQl4w-8NBDu84jb
zDQ@ltBl>tp<rcJ8V*6~4B?k7$=4jV&KR8h#;%S8L4Y@gH0^hB1YH!I^6R+2uPHFaw
zAHrr--Y{l;x6d;RqRQ17NgDTvgm;s=J<gGf9_eqi%}O%qZc0_|bOX<$irJlf)*=hk
z&g~T}uj?nT{)o-|QUnv!pY2J+Jz4runTfb$SH@6gmNEUgT$ocXI_YNdH~F*QF{?xF
z1fO20OvO*leJw=i6JuU362?TL2g1A4g2a032j>aAaANJ^pk8IyksIzLt#=OIanHyG
z{Eewghee($j1-L;n1^rtEKg{6sDG?SL=Bt?r!RhcJVsepNT3l){{L0n&oqWA6HG>}
zRY>Vm)L{fC?Kg4%lJ@r8OB~FW=a<?{=DEzlWHH*y<-w^t&>iEAg;u1hh!53)P<bzb
z!x#dc^NAzBrTzn(zWB`=0%xWR1tzHQ(JTVGW#plwyw`CVs++##qxPnP5{CpO57x(C
zRhb`I?SFn8M=}N2<qldw7M+?bgHeY;bPrY8LTr-h?w2K5#ygsN)iD3M=I2`{r<heH
z4ByQAqB7YGbxk_FPrMOn>w3UaN;J4Gd0;~Y{gt0*Z|RunwRvud{EG}nzp=h})n{a}
z=a-5yugNXEO%OdBdMWc1vT;zWG%oMtZi5t;{_fM(tVG6!gTfK9->d?cuJc>!hq$Ly
zfo;<1HQO5_X0&=1zH7Ls=nbl1rFVH&ywT2+%_{4C89tgsw}5RqomZYe9!uGo79DfU
zut~XvlA<KHBUng7BH{z<>}Hx$u((_EmtIrj0d|U-jE+{txYe=mM+%E6%>D<N`)I|d
zPb|z#d4HL&D&MLW-S;K9>62iEaDSYP{W#;JW;JL{vuL_>hn9En;Rk+aYvu{-#d|%W
zV|;}{xWwB>6X-RAam7y!73aQo9qpf+^J&=4hqrg#*UKmQ5Z8+3^}FsoQVY&!)Q3Fp
zuE)n73yLd%vBkdLm;76`Yt)5pRq_`inBU%3-|V98#W)%L(j=+3fAA=^pO3O}dB9}{
z8gC2_Y4uMvjAVGppztPBa^;>x{?rMk3Quk3c@L~wT0H&T-;}rQDc{@fpLyPh&%u&6
zJju#uy>13&asH3)MoE7WT&VpNV#YJdt-fU>jkHzFH>^9$P;oK9TzJtm_b@HQDVN*R
zquRl5RK|ovv%gh#Yi1&}kX8~LJD;#^v<%-+RaM=k-D!Jqfak3`#g)ZkdT=i;Eb>c5
zek;D4d)R=UhQMnK>A;xejOxo)x>>0rZL>l~+SdKX8p8^e=$7jAXb;Uo@)ezb&pZ0s
zHIU$~#3}c~s+8g`wcQvMq0-($%)*eK_Y?-%+TldaXZOI0xMyQG(M&IuHP$_8JkPH?
zloIC$D%6{OezLoi-G=j2HR>`ju1oUOJ!-7hYDZ5I<{j3*a(?H9S2aF6?+$iEYQ9K4
zd%T3upf?b7XMddURV&562G33Jyo-CEx}&kygr%3&p+nkRG!R!C_==B~5x|Rhl~bsb
zjJCR+Xsoo$zs;mvybLiS$xAW~+dz3?iEVfmn9)2!8{U?Yt+>^Nf_DTC5Mqx^vU4%7
zledK)%ky@p)JYy33($u-lPYFjlF`~pJ8<0cXHUJcQ936_D2T9jFO8FwKbOv%MEH?U
z2iBb<RNY0ld=k|2ID&w>T$qR7az|S!Yp6>Tl^{@>Or`{Qc>8&|DhE0Rc#>TLocyJg
z{iPLo%&9QABw}?G0Q31t$mR1QTL2GE^K(f<M}|G#YX6EA2|yIG1prWU2PUKT0zlFb
z9wZ51S4a{Z!k@*Ff{u_v7$n4Xghw2LG#BdUFaTx?NN^6S8UX@q66_X`U0sEP5(NpU
z$*5^K0P-Rvey2nTaww^Sn^q{R-r8l@9#Mo0b3}Zd@h!+@Z?QtWE2L%X+CrSAtc6ys
zi|hUO1hE!%PLwtZ_}}vc6dGrifI?gLh!Y4?NSxRK%^|=10c9sYKZ^CC-}d3NkT_ft
z4f5fn*Ewj86Nlf!fZjNnb#M^`kMV-fahq3RDQNSh7t&P^L9w5JMDCaPbE1l{AZ4S{
zs<Otf-2ejs*mcS-d;k#W3Z;xwpzA-Q(weu+p;<!w^$EDPNt01JLeT%`q~kxV-#Uyr
U6}16!5D<Xw7HB_NkU9YT2dXw+ivR!s

diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_create.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_create.sh
new file mode 100644
index 000000000..44336c750
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_create.sh
@@ -0,0 +1,9 @@
+#!/bin/bash  
+# IMPORTANT:    don't simply run script like this:  ./create
+#               instead, run it like this:          . create
+# This sources the script (executes commands in same shell);
+# the exported endpoint will therefore be available afterwards
+docker build -t $tag .
+docker create -p 80:80 --name="$identifier" -i $tag &&
+export endpoint=$(curl -s http://whatismyip.akamai.com/)
+echo "created container '$identifier' from image "$tag". endpoint is: '$endpoint'"
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_delete.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_delete.sh
new file mode 100644
index 000000000..ff3b70a0f
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_delete.sh
@@ -0,0 +1,3 @@
+#!/bin/bash  
+docker rm simple-task-app-1 &&
+echo "deleted simple-task-app"
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_start.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_start.sh
new file mode 100644
index 000000000..fb8a128af
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_start.sh
@@ -0,0 +1,4 @@
+#!/bin/bash  
+docker start $identifier > /dev/null &&
+echo "started $identifier"
+
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_stop.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_stop.sh
new file mode 100644
index 000000000..c9d606fef
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerapp_stop.sh
@@ -0,0 +1,3 @@
+#!/bin/bash  
+docker stop -t0 simple-task-app-1 > /dev/null &&
+echo 'stopped simple-task-app'
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_create.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_create.sh
new file mode 100644
index 000000000..f54500b53
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_create.sh
@@ -0,0 +1,4 @@
+#!/bin/bash  
+sudo apt-get update && sudo apt-get install -y docker-ce
+sudo groupadd docker
+sudo usermod -aG docker $USER
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_start.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_start.sh
new file mode 100644
index 000000000..a7d0ed4dc
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash  
+sudo systemctl start dockerd
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_stop.sh b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_stop.sh
new file mode 100644
index 000000000..83d30db99
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/docker/dockerengine_stop.sh
@@ -0,0 +1,2 @@
+#!/bin/bash  
+sudo systemctl stop dockerd
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/Dockerfile b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/Dockerfile
new file mode 100644
index 000000000..95abd426a
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/Dockerfile
@@ -0,0 +1,14 @@
+FROM janes/alpine-lamp
+MAINTAINER hnicke
+COPY index.php /www
+COPY mysql-credentials.php /www
+COPY createdb.sql /
+
+EXPOSE 80
+
+RUN nohup mysqld --skip-grant-tables --bind-address 0.0.0.0 --user mysql > /dev/null 2>&1 & \
+    sleep 10 && mysql -u root < /createdb.sql
+
+ENTRYPOINT httpd && \
+           nohup mysqld --skip-grant-tables --bind-address 0.0.0.0 --user mysql > /dev/null 2>&1 & \
+           tail -f /dev/null
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/createdb.sql b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/createdb.sql
new file mode 100644
index 000000000..4a62e2720
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/createdb.sql
@@ -0,0 +1,7 @@
+CREATE database mydb;
+create table mydb.tasks
+   (id int not null unique auto_increment,
+      task varchar(255),
+      primary key (id)
+   );
+
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/index.php b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/index.php
new file mode 100644
index 000000000..0065fa98f
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/index.php
@@ -0,0 +1,79 @@
+<?php
+
+// include the credentials to connect to the db
+include_once "mysql-credentials.php";
+
+// get task from post after task was entered in form
+$post = $_POST['task'];
+if ($post != "") {
+    saveToDb($post);
+}
+
+/**
+* saved task to db
+*/
+function saveToDb($task)
+{
+    $conn = newDbConnection();
+    $task = htmlspecialchars($task);
+    if (!$conn->query("INSERT INTO tasks(task) VALUES('".$task."')")) {
+        echo("Creating task failed");
+    }
+    $conn->close();
+}
+/**
+* reads from db and prints it in html
+*/
+function readFromDb()
+{
+    $sql = "select * from tasks";
+    $conn = newDbConnection();
+    $result = $conn->query($sql);
+    $conn->close();
+    if ($result->num_rows > 0) {
+    // output data for each row
+    while ($row = $result->fetch_assoc()) {
+        echo htmlspecialchars("id: " . $row['id']. " - Task: " . $row['task'])."<br>";
+    }
+    return;
+    }
+    echo "0 results";
+}
+
+/**
+* generates new DB connection with given credentials
+*/
+function newDbConnection()
+{
+    extract($GLOBALS);
+   $conn = new mysqli($host, $username, $password, $database, $port);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
+    return $conn;
+}
+?>
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="utf-8">
+      <title>SimpleTaskApp</title>
+      <style>
+      body {
+         font-family: sans-serif;
+      }
+      </style>
+   </head>
+   <body>
+      <h1>SimpleTaskApp</h1>
+      <!-- form to enter tasks -->
+      <form class="insertTask" action="index.php" method="post">
+         <input type="text" name="task" />
+         <button type="submit" name="button">submit</button>
+      </form>
+      <?php
+      //print tasks out of the db
+      readFromDb();
+       ?>
+   </body>
+</html>
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/mysql-credentials.php b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/mysql-credentials.php
new file mode 100644
index 000000000..5196befdb
--- /dev/null
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/simple-task-app/mysql-credentials.php
@@ -0,0 +1,7 @@
+<?php
+$host = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "mydb";
+$port = 3306;
+?>
diff --git a/server/src/test/resources/csars/yaml/valid/simple-task-csar/template.yaml b/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
similarity index 93%
rename from server/src/test/resources/csars/yaml/valid/simple-task-csar/template.yaml
rename to server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
index 403400252..0482789cf 100644
--- a/server/src/test/resources/csars/yaml/valid/simple-task-csar/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
+tosca_definitions_version: tosca_simple_yaml_1_1
 description: Template for deploying the simple-task-app via docker 
 metadata:
   template_name: simple-task-docker-template
@@ -58,14 +58,10 @@ capability_types:
   SimplePublicWebEndpoint:
     derived_from: tosca.capabilities.Endpoint
     properties:
-      protocol:
-        default: http
-      port:
-        default: 80
-      url_path:
-        default: /
-      network_name:
-        default: PUBLIC
+      protocol: http
+      port: 80
+      url_path: /
+      network_name: PUBLIC
 
 topology_template:
   node_templates:
@@ -104,4 +100,5 @@ topology_template:
     endpoint:
       description: the endpoint of the simple-task-app
       value: { get_attribute: [ simpleTaskApp, endpoint ] }
+      type: string
 

From e860c2afc836a2df489ad78720d240eb4d5d026f Mon Sep 17 00:00:00 2001
From: Heiko Nickerl <dev@heiko-nickerl.com>
Date: Tue, 28 Nov 2017 15:02:22 +0100
Subject: [PATCH 52/52] Fix simple-task csar

---
 .../test/resources/csars/yaml/valid/simple-task/template.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml b/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
index 0482789cf..6eb687794 100644
--- a/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
+++ b/server/src/test/resources/csars/yaml/valid/simple-task/template.yaml
@@ -46,7 +46,7 @@ node_types:
         create:
           implementation: docker/dockerapp_create.sh
         start:
-          implementation: docker/dockerapp_create.sh
+          implementation: docker/dockerapp_start.sh
         stop:
           implementation: docker/dockerapp_stop.sh
         delete: