Update tosca lib to version 0.5

Use tosca-parser and heat-translator to analyze to the basic
nfv-tosca type definitions, and use simple tosca new feature
such as policy, group and trigger, which are now supported by
the latest version of tosca-parser and heat-translator.

JIRA:PARSER-18

Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01
Signed--off-by: shangxdy <shang.xiaodong@zte.com.cn>
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>

32 files changed, 0 insertions, 619 deletions

diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml
deleted file mode 100644
index 1ac0935..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  collectd is a daemon which gathers statistics about the system it is running on.
-
-node_types:
-  tosca.nodes.SoftwareComponent.Collectd:
-    derived_from: tosca.nodes.SoftwareComponent
-    requirements:
-      - log_endpoint:
-          capability: tosca.capabilities.Endpoint
-          node:  tosca.nodes.SoftwareComponent.Logstash
-          relationship: tosca.relationships.ConnectsTo
\ No newline at end of file
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml
deleted file mode 100644
index 4a1770f..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  Elasticsearch is an open-source search engine built on top of Apache Lucene, a full-text search-engine library.
-
-node_types:
-  tosca.nodes.SoftwareComponent.Elasticsearch:
-    derived_from: tosca.nodes.SoftwareComponent
-    capabilities:
-      search_endpoint:
-         type: tosca.capabilities.Endpoint
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml
deleted file mode 100644
index 3a4351c..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  Kibana is an open source analytics and visualization platform designed to work with Elasticsearch.
-  You use Kibana to search, view, and interact with data stored in Elasticsearch.
-
-node_types:
-  tosca.nodes.SoftwareComponent.Kibana:
-    derived_from: tosca.nodes.SoftwareComponent
-    requirements:
-        - search_endpoint:
-            capability: tosca.capabilities.Endpoint
-            node: tosca.nodes.SoftwareComponent.Elasticsearch
-            relationship: tosca.relationships.ConnectsTo
-
-
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml
deleted file mode 100644
index 8495954..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  Logstash is a tool for receiving, processing and outputting logs. All kinds of logs. System logs, webserver logs,
-  error logs, application logs, and just about anything you can throw at it.
-
-node_types:
-  tosca.nodes.SoftwareComponent.Logstash:
-    derived_from: tosca.nodes.SoftwareComponent
-    requirements:
-        - search_endpoint:
-            capability: tosca.capabilities.Endpoint
-            node: tosca.nodes.SoftwareComponent.Elasticsearch
-            relationship:
-              type: tosca.relationships.ConnectsTo
-              interfaces:
-                Configure:
-                  pre_configure_source:
-                    inputs:
-                      elasticsearch_ip:
-                        type: string
-    capabilities:
-      log_endpoint:
-         type: tosca.capabilities.Endpoint
-
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml
deleted file mode 100644
index d62c4c1..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  Pizza store app that allows you to explore the features provided by PayPal's REST APIs.
-  More detail can be found at https://github.com/paypal/rest-api-sample-app-nodejs/
-
-node_types:
-  tosca.nodes.WebApplication.PayPalPizzaStore:
-    derived_from: tosca.nodes.WebApplication
-    properties:
-      github_url:
-        required: no
-        type: string
-        description: location of the application on the github.
-        default: https://github.com/sample.git
-    requirements:
-      #WebApplication inherits Computer, so host implied.
-      - database_connection:
-          capability: tosca.capabilities.Endpoint.Database
-          node: tosca.nodes.Database
-          relationship: tosca.relationships.ConnectsTo
-    interfaces:
-      Standard:
-        configure:
-          inputs:
-            github_url:
-              type: string
-            mongodb_ip:
-              type: string
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml
deleted file mode 100644
index 4614ee7..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  RSYSLOG is the Rocket-fast SYStem for LOG processing.
-
-node_types:
-  tosca.nodes.SoftwareComponent.Rsyslog:
-    derived_from: tosca.nodes.SoftwareComponent
-    requirements:
-      - log_endpoint:
-          capability: tosca.capabilities.Endpoint
-          node: tosca.nodes.SoftwareComponent.Logstash
-          relationship: tosca.relationships.ConnectsTo
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml
deleted file mode 100644
index 932f131..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-  This TOSCA simple profile deploys nodejs, mongodb, elasticsearch, logstash and kibana each on a separate server
-  with monitoring enabled for nodejs server where a sample nodejs application is running. The rsyslog and collectd are
-  installed on a nodejs server.
-
-imports:
-  - paypalpizzastore_nodejs_app.yaml
-  - elasticsearch.yaml
-  - logstash.yaml
-  - kibana.yaml
-  - collectd.yaml
-  - rsyslog.yaml
-
-dsl_definitions:
-    host_capabilities: &host_capabilities
-      # container properties (flavor)
-      disk_size: 10 GB
-      num_cpus: { get_input: my_cpus }
-      mem_size: 4096 MB
-    os_capabilities: &os_capabilities
-      architecture: x86_64
-      type: Linux
-      distribution: Ubuntu
-      version: 14.04
-
-topology_template:
-  inputs:
-    my_cpus:
-      type: integer
-      description: Number of CPUs for the server.
-      constraints:
-        - valid_values: [ 1, 2, 4, 8 ]
-    github_url:
-       type: string
-       description: The URL to download nodejs.
-       default: http://github.com/paypal/rest-api-sample-app-nodejs.git
-
-  node_templates:
-    paypal_pizzastore:
-      type: tosca.nodes.WebApplication.PayPalPizzaStore
-      properties:
-          github_url: { get_input: github_url }
-      requirements:
-        - host: nodejs
-        - database_connection: mongo_db
-      interfaces:
-        Standard:
-           configure:
-             implementation: ../Scripts/nodejs/config.sh
-             inputs:
-               github_url: { get_property: [ SELF, github_url ] }
-               mongodb_ip: { get_attribute: [mongo_server, private_address] }
-           start: ../Scripts/nodejs/start.sh
-    nodejs:
-      type: tosca.nodes.WebServer
-      requirements:
-        - host:
-            node: app_server
-      interfaces:
-        Standard:
-          create: ../Scripts/nodejs/create.sh
-    mongo_db:
-      type: tosca.nodes.Database
-      requirements:
-        - host: mongo_dbms
-      interfaces:
-        Standard:
-          create: ../Scripts/mongodb/create_database.sh
-    mongo_dbms:
-      type: tosca.nodes.DBMS
-      requirements:
-        - host: mongo_server
-      interfaces:
-        Standard:
-          create: ../Scripts/mongodb/create.sh
-          configure:
-            implementation: ../Scripts/mongodb/config.sh
-            inputs:
-              mongodb_ip: { get_attribute: [mongo_server, private_address] }
-          start: ../Scripts/mongodb/start.sh
-    elasticsearch:
-      type: tosca.nodes.SoftwareComponent.Elasticsearch
-      requirements:
-        - host: elasticsearch_server
-      interfaces:
-        Standard:
-          create: ../Scripts/elasticsearch/create.sh
-          start: ../Scripts/elasticsearch/start.sh
-    logstash:
-      type: tosca.nodes.SoftwareComponent.Logstash
-      requirements:
-        - host: logstash_server
-        - search_endpoint:
-            node: elasticsearch
-            capability: search_endpoint
-            relationship:
-              type: tosca.relationships.ConnectsTo
-              interfaces:
-                Configure:
-                  pre_configure_source:
-                    implementation: ../Python/logstash/configure_elasticsearch.py
-                    inputs:
-                      elasticsearch_ip: { get_attribute: [elasticsearch_server, private_address] }
-      interfaces:
-        Standard:
-          create: ../Scripts/logstash/create.sh
-          start: ../Scripts/logstash/start.sh
-    kibana:
-      type: tosca.nodes.SoftwareComponent.Kibana
-      requirements:
-        - host: kibana_server
-        - search_endpoint: elasticsearch
-      interfaces:
-        Standard:
-          create: ../Scripts/kibana/create.sh
-          configure:
-            implementation: ../Scripts/kibana/config.sh
-            inputs:
-              elasticsearch_ip: { get_attribute: [elasticsearch_server, private_address] }
-              kibana_ip: { get_attribute: [kibana_server, private_address] }
-          start: ../Scripts/kibana/start.sh
-    app_collectd:
-      type: tosca.nodes.SoftwareComponent.Collectd
-      requirements:
-        - host: app_server
-        - log_endpoint:
-            node: logstash
-            capability: log_endpoint
-            relationship:
-              type: tosca.relationships.ConnectsTo
-              interfaces:
-                Configure:
-                  pre_configure_target:
-                    implementation: ../Python/logstash/configure_collectd.py
-      interfaces:
-        Standard:
-          create: ../Scripts/collectd/create.sh
-          configure:
-            implementation: ../Python/collectd/config.py
-            inputs:
-              logstash_ip: { get_attribute: [logstash_server, private_address] }
-          start: ../Scripts/collectd/start.sh
-    app_rsyslog:
-      type: tosca.nodes.SoftwareComponent.Rsyslog
-      requirements:
-        - host: app_server
-        - log_endpoint:
-            node: logstash
-            capability: log_endpoint
-            relationship:
-              type: tosca.relationships.ConnectsTo
-              interfaces:
-                Configure:
-                  pre_configure_target:
-                    implementation: ../Python/logstash/configure_rsyslog.py
-      interfaces:
-        Standard:
-          create: ../Scripts/rsyslog/create.sh
-          configure:
-            implementation: ../Scripts/rsyslog/config.sh
-            inputs:
-              logstash_ip: { get_attribute: [logstash_server, private_address] }
-          start: ../Scripts/rsyslog/start.sh
-    app_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-    mongo_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-    elasticsearch_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-    logstash_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-    kibana_server:
-      type: tosca.nodes.Compute
-      capabilities:
-        host:
-          properties: *host_capabilities
-        os:
-          properties: *os_capabilities
-
-  outputs:
-    nodejs_url:
-      description: URL for the nodejs server, http://<IP>:3000
-      value: { get_attribute: [ app_server, private_address ] }
-    mongodb_url:
-      description: URL for the mongodb server.
-      value: { get_attribute: [ mongo_server, private_address ] }
-    elasticsearch_url:
-      description: URL for the elasticsearch server.
-      value: { get_attribute: [ elasticsearch_server, private_address ] }
-    logstash_url:
-      description: URL for the logstash server.
-      value: { get_attribute: [ logstash_server, private_address ] }
-    kibana_url:
-      description: URL for the kibana server.
-      value: { get_attribute: [ kibana_server, private_address ] }
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/collectd/config.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/collectd/config.py
deleted file mode 100755
index 686bbd1..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/collectd/config.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# This script configures collectd to send metric data to the
-# logstash server port 25826
-# The environment variable logstash_ip is expected to be set up
-import os
-with open("/etc/collectd/collectd.conf.d/tosca_elk.conf", "w") as fh:
-    fh.write("""
-        LoadPlugin network
-        <Plugin network>
-                Server "%s" "25826"
-        </Plugin>
-        """ % (os.environ['logstash_ip']))
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py
deleted file mode 100755
index 18fdacf..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_collectd.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# This script configures the logstash input using the udp protocol on
-# port 25826.  This is intended to receive data from collectd from
-# any source
-with open("/etc/logstash/conf.d/collectd.conf", "w") as fh:
-    fh.write("""
-        input {
-          udp {
-            port => 25826         # 25826 is the default for collectd
-            buffer_size => 1452   # 1452 is the default for collectd
-            codec => collectd { }
-            tags => ["metrics"]
-            type => "collectd"
-          }
-        }""")
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py
deleted file mode 100755
index 2e5389c..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_elasticsearch.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# This script configures the logstash output to forward to elasticsearch
-# The environment variable elasticsearch_ip is expected to be set up
-import os
-with open("/etc/logstash/conf.d/elasticsearch.conf", 'w') as fh:
-    fh.write("""
-      output {
-        elasticsearch {
-          action => index
-          host => "%s"
-          protocol => "http"
-        }
-      }""" % (os.environ['elasticsearch_ip']))
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py
deleted file mode 100755
index fc610c2..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Python/logstash/configure_rsyslog.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# This script configures the logstash input using the RELP protocol on
-# port 2514  This is intended to receive logs from rsyslog from
-# any source
-with open("/etc/logstash/conf.d/rsyslog.conf", "w") as fh:
-    fh.write("""
-    input {
-      relp {
-        port => 2514
-        tags => ["logs"]
-      }
-    }""")
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/README.txt b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/README.txt
deleted file mode 100644
index 382c9b0..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-README:
-
-This TOSCA simple profile deploys nodejs, mongodb, elasticsearch, logstash and kibana each on a separate server with monitoring enabled for nodejs server where a sample nodejs application is running. The syslog and collectd are installed on a nodejs server.
-
-Entry information for processing through an orchestrator is contained in file TOSCA-Metadata/TOSCA.meta. This file provides high-level information such as CSAR version or creator of the CSAR. Furthermore, it provides pointers to the entry template under 'Entry-Definitions' key. The entry template itself may contain pointers to one or more files that are used to define TOSCA base type, unless provided by orchestrator as built-in TOSCA basetypes, and other non-normative types. These are typically provided under 'imports' section in the entry template file. Those type definitions will be read and processed by orchestrator or TOSCA parser to create an internal graph showing dependencies and relationships between various TOSCA types. The entry template may have references to various artifacts required for deployment and will be processed accordingly.
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh
deleted file mode 100755
index a483b88..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# This script install collectd for monitoring data
-
-apt-get update
-apt-get install -y collectd
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh
deleted file mode 100755
index 7e8e033..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/collectd/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This script starts collectd as a service in init.d
-service collectd stop
-service collectd start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh
deleted file mode 100755
index c34126c..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# This script installs java and elasticsearch
-
-apt-get update
-apt-get install -y openjdk-7-jre-headless
-
-wget -qO - https://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add -
-echo "deb http://packages.elasticsearch.org/elasticsearch/1.5/debian stable main" | tee -a /etc/apt/sources.list
-
-apt-get update
-apt-get install -y elasticsearch
-
-# set up to run as service
-update-rc.d elasticsearch defaults 95 10
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh
deleted file mode 100755
index bbc0347..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This script starts elasticsearch as a service in init.d
-service elasticsearch stop
-service elasticsearch start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh
deleted file mode 100755
index f28215a..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/config.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# This script configures kibana to connect to the elasticsearch server
-# to access data and to export the app url on port 5601:
-# The environment variable elasticsearch_ip and kibana_ip are expected
-# to be set up.
-sed -i 's/localhost/'$elasticsearch_ip'/' /opt/kibana/config/kibana.yml
-sed -i 's/0.0.0.0/'$kibana_ip'/' /opt/kibana/config/kibana.yml
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh
deleted file mode 100755
index 41914b1..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/create.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# This script installs kibana and sets it up to run as a service in init.d
-cd /opt
-wget https://download.elastic.co/kibana/kibana/kibana-4.1.0-linux-x64.tar.gz
-tar xzvf kibana-4.1.0-linux-x64.tar.gz
-mv kibana-4.1.0-linux-x64 kibana
-
-# set up to run as service
-cd /etc/init.d
-wget https://gist.githubusercontent.com/thisismitch/8b15ac909aed214ad04a/raw/bce61d85643c2dcdfbc2728c55a41dab444dca20/kibana4
-chmod +x kibana4
-update-rc.d kibana4 defaults 96 9
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh
deleted file mode 100755
index 5149bb3..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/kibana/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This script starts kibana as a service in init.d
-service kibana4 stop
-service kibana4 start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh
deleted file mode 100755
index 77cc8fd..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# This script installs java, logstash and the contrib package for logstash
-# install java as prereq
-
-apt-get update
-apt-get install -y openjdk-7-jre-headless
-mkdir /etc/logstash
-
-# install by apt-get from repo
-wget -O - http://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add -
-echo "deb http://packages.elasticsearch.org/logstash/1.4/debian stable main" | tee -a /etc/apt/sources.list
-
-apt-get update
-apt-get install -y logstash
-
-# install contrib to get the relp plugin
-/opt/logstash/bin/plugin install contrib
-
-# set up to run as service
-update-rc.d logstash defaults 95 10
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh
deleted file mode 100755
index a73cf61..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/logstash/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# Run logstash as service in init.d
-service logstash stop
-service logstash start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh
deleted file mode 100644
index 78f484e..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/config.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Edit the file /etc/mongod.conf, update with real IP of Mongo server
-# This script configures the mongodb server to export its service on
-# the server IP
-# bind_ip = 127.0.0.1     -> bind_ip = <IP for Mongo server>
-# The environment variable mongodb_ip is expected to be set up
-sed -i "s/= 127.0.0.1/= $mongodb_ip,127.0.0.1/" /etc/mongod.conf
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh
deleted file mode 100644
index d84c275..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# This script installs mongodb
-
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list
-
-apt-get update
-apt-get install -y mongodb-org
-
-#Wait for mongodb initialization
-while [[ ! -d "/var/lib/mongodb/_tmp" ]]; do
-    echo "Waiting for mongodb initialization ..."
-    sleep 5
-done
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh
deleted file mode 100644
index 16f1358..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/create_database.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-echo "conn = new Mongo();"                               > setup.js
-echo "db = conn.getDB('paypal_pizza');"                 >> setup.js
-echo "db.about.insert({'name': 'PayPal Pizza Store'});" >> setup.js
-mongo setup.js
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh
deleted file mode 100644
index ac200a5..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/mongodb/start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# This script starts mongodb
-service mongod stop
-rm /var/lib/mongodb/mongod.lock
-service mongod start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh
deleted file mode 100644
index 1e149a2..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/config.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# This script installs an app for nodejs: the app intended is the paypal app
-# and it is configured to connect to the mongodb server
-# The environment variables github_url and mongodb_ip are expected to be set up
-export app_dir=/opt/app
-git clone $github_url /opt/app
-if [ -f /opt/app/package.json ]; then
-   cd  /opt/app/ && npm install
-   sed -i "s/localhost/$mongodb_ip/" config.json
-fi
-
-cat > /etc/init/nodeapp.conf <<EOS
-description "node.js app"
- 
-start on (net-device-up
-          and local-filesystems
-          and runlevel [2345])
-stop on runlevel [!2345]
- 
-expect fork
-respawn
- 
-script
-  export HOME=/
-  export NODE_PATH=/usr/lib/node
-  exec /usr/bin/node ${app_dir}/app.js >> /var/log/nodeapp.log 2>&1 &
-end script
-EOS
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh
deleted file mode 100644
index 04fd6c6..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# This script installs nodejs and the prereq
-
-add-apt-repository ppa:chris-lea/node.js
-
-apt-get update
-apt-get install -y nodejs build-essential
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh
deleted file mode 100644
index 6939cb7..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/nodejs/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# This script starts the nodejs application
-start nodeapp
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh
deleted file mode 100644
index 630767d..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# This script configures the output for rsyslogd to send logs to the
-# logstash server port 2514 using the RELP protocol
-# The environment variable logstash_ip is expected to be set up
-echo "module(load=\"omrelp\")
-action(type=\"omrelp\" target=\"$logstash_ip\" port=\"2514\")" > /etc/rsyslog.d/tosca_elk.conf
-
-# Remove the /dev/xconsole configuration as xconsole
-# is not available by default
-l=`awk '/=warn.*\|.*\/dev\/xconsole/{print NR - 1}' /etc/rsyslog.d/50-default.conf`
-if [ ! -z $l ]; then
-    l=`expr $l + 1`
-    line=`cat /etc/rsyslog.d/50-default.conf | head -n $l | tail -1`
-    if [[ ! $line == \#* ]]; then
-       l0=`expr $l - 3`
-       sed -i -r -e "${l0},${l}s/^.{0}/&#/" /etc/rsyslog.d/50-default.conf
-    fi
-fi
-
-# Enable nodejs logs for rsyslog
-if ! grep -q nodeapp "/etc/rsyslog.conf"; then
-    sed -i 's/\$PrivDropToGroup\ syslog/\$PrivDropToGroup adm/' /etc/rsyslog.conf
-    echo "\$ModLoad imfile.so
-\$InputFileName /var/log/nodeapp.log
-\$InputFileTag paypal_pizza:
-\$InputFileStateFile stat-nodeapp
-\$InputRunFileMonitor
-\$InputFilePollInterval 1" >> /etc/rsyslog.conf
-fi
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh
deleted file mode 100755
index affdd6e..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# This script installs rsyslog and the library for RELP
-
-apt-get update
-apt-get install -y rsyslog rsyslog-relp
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh
deleted file mode 100755
index 3de82d1..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/Scripts/rsyslog/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This script starts rsyslogd as a service in init.d
-service rsyslog stop
-service rsyslog start
diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644
index feb3d4f..0000000
--- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/CSAR/tosca_elk/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,4 +0,0 @@
-TOSCA-Meta-File-Version: 1.0
-CSAR-Version: 1.1
-Created-By: OASIS TOSCA TC
-Entry-Definitions: Definitions/tosca_elk.yaml
\ No newline at end of file