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>

26 files changed, 0 insertions, 3178 deletions

diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk.yaml
deleted file mode 100644
index daa725c..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk.yaml
+++ /dev/null
@@ -1,555 +0,0 @@
-heat_template_version: 2013-05-23
-
-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.
-
-parameters:
-  github_url:
-    type: string
-    description: The URL to download nodejs.
-    default: http://github.com/paypal/rest-api-sample-app-nodejs.git
-
-  my_cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 4
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-
-  nodejs_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: nodejs_create_config
-      server:
-        get_resource: app_server
-
-  nodejs_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/create.sh
-      group: script
-
-  paypal_pizzastore_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_configure_config
-      input_values:
-        github_url: http://github.com/paypal/rest-api-sample-app-nodejs.git
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - nodejs_create_deploy
-    - mongo_db_create_deploy
-
-  paypal_pizzastore_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/config.sh
-      group: script
-
-  paypal_pizzastore_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - paypal_pizzastore_configure_deploy
-
-  paypal_pizzastore_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/start.sh
-      group: script
-
-
-  mongo_dbms_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_create_config
-      server:
-        get_resource: mongo_server
-
-  mongo_dbms_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/create.sh
-      group: script
-
-  mongo_dbms_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_configure_config
-      input_values:
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_create_deploy
-
-  mongo_dbms_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/config.sh
-      group: script
-
-  mongo_dbms_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_start_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_configure_deploy
-
-  mongo_dbms_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/start.sh
-      group: script
-
-  mongo_db_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_db_create_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_start_deploy
-
-  mongo_db_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/create_database.sh
-      group: script
-
-
-  app_collectd_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_create_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - logstash_start_deploy
-
-  app_collectd_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/create.sh
-      group: script
-
-  app_collectd_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_configure_config
-      input_values:
-        logstash_ip:
-          get_attr:
-          - logstash_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_create_deploy
-
-  app_collectd_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/config.py
-      group: script
-
-  app_collectd_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_configure_deploy
-
-  app_collectd_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/start.sh
-      group: script
-
-  app_collectd_logstash_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_logstash_connect_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  app_collectd_logstash_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/configure_collectd.py
-      group: script
-
-
-  app_rsyslog_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_create_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - logstash_start_deploy
-
-  app_rsyslog_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: rsyslog/create.sh
-      group: script
-
-  app_rsyslog_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_rsyslog_configure_deploy
-
-  app_rsyslog_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: rsyslog/start.sh
-      group: script
-
-  app_rsyslog_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_configure_config
-      input_values:
-        logstash_ip:
-          get_attr:
-          - logstash_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_rsyslog_create_deploy
-
-  app_rsyslog_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: rsyslog/config.sh
-      group: script
-
-  app_rsyslog_logstash_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_logstash_connect_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  app_rsyslog_logstash_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/configure_rsyslog.py
-      group: script
-
-
-  logstash_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_create_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - elasticsearch_start_deploy
-
-  logstash_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/create.sh
-      group: script
-
-  logstash_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_start_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  logstash_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/start.sh
-      group: script
-
-  logstash_elasticsearch_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_elasticsearch_connect_config
-      input_values:
-        elasticsearch_ip:
-          get_attr:
-          - elasticsearch_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  logstash_elasticsearch_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/configure_elasticsearch.py
-      group: script
-
-
-  elasticsearch_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: elasticsearch_create_config
-      server:
-        get_resource: elasticsearch_server
-
-  elasticsearch_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: elasticsearch/create.sh
-      group: script
-
-  elasticsearch_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: elasticsearch_start_config
-      server:
-        get_resource: elasticsearch_server
-    depends_on:
-    - elasticsearch_create_deploy
-
-  elasticsearch_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: elasticsearch/start.sh
-      group: script
-
-
-  kibana_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_create_config
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - elasticsearch_start_deploy
-
-  kibana_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: kibana/create.sh
-      group: script
-
-  kibana_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_configure_config
-      input_values:
-        elasticsearch_ip:
-          get_attr:
-          - elasticsearch_server
-          - networks
-          - private
-          - 0
-        kibana_ip:
-          get_attr:
-          - kibana_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - kibana_create_deploy
-
-  kibana_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: kibana/config.sh
-      group: script
-
-  kibana_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_start_config
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - kibana_configure_deploy
-
-  kibana_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: kibana/start.sh
-      group: script
-
-
-  app_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  mongo_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  logstash_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  elasticsearch_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  kibana_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  nodejs_url:
-    description: URL for the nodejs server, http://<IP>:3000
-    value:
-      get_attr:
-      - app_server
-      - networks
-      - private
-      - 0
-
-  mongodb_url:
-    description: URL for the mongodb server.
-    value:
-      get_attr:
-      - mongo_server
-      - networks
-      - private
-      - 0
-
-  logstash_url:
-    description: URL for the logstash server.
-    value:
-      get_attr:
-      - logstash_server
-      - networks
-      - private
-      - 0
-
-  elasticsearch_url:
-    description: URL for the elasticsearch server.
-    value:
-      get_attr:
-      - elasticsearch_server
-      - networks
-      - private
-      - 0
-
-  kibana_url:
-    description: URL for the kibana server.
-    value:
-      get_attr:
-      - kibana_server
-      - networks
-      - private
-      - 0
-
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk_from_csar.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk_from_csar.yaml
deleted file mode 100644
index 27427ba..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_elk_from_csar.yaml
+++ /dev/null
@@ -1,555 +0,0 @@
-heat_template_version: 2013-05-23
-
-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.
-
-parameters:
-  github_url:
-    type: string
-    description: The URL to download nodejs.
-    default: http://github.com/paypal/rest-api-sample-app-nodejs.git
-
-  my_cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 4
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-
-  nodejs_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: nodejs_create_config
-      server:
-        get_resource: app_server
-
-  nodejs_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/nodejs/create.sh
-      group: script
-
-  paypal_pizzastore_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_configure_config
-      input_values:
-        github_url: http://github.com/paypal/rest-api-sample-app-nodejs.git
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - nodejs_create_deploy
-    - mongo_db_create_deploy
-
-  paypal_pizzastore_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/nodejs/config.sh
-      group: script
-
-  paypal_pizzastore_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - paypal_pizzastore_configure_deploy
-
-  paypal_pizzastore_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/nodejs/start.sh
-      group: script
-
-
-  mongo_dbms_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_create_config
-      server:
-        get_resource: mongo_server
-
-  mongo_dbms_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/mongodb/create.sh
-      group: script
-
-  mongo_dbms_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_configure_config
-      input_values:
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_create_deploy
-
-  mongo_dbms_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/mongodb/config.sh
-      group: script
-
-  mongo_dbms_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_start_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_configure_deploy
-
-  mongo_dbms_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/mongodb/start.sh
-      group: script
-
-  mongo_db_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_db_create_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_start_deploy
-
-  mongo_db_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/mongodb/create_database.sh
-      group: script
-
-
-  app_collectd_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_create_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - logstash_start_deploy
-
-  app_collectd_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/collectd/create.sh
-      group: script
-
-  app_collectd_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_configure_config
-      input_values:
-        logstash_ip:
-          get_attr:
-          - logstash_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_create_deploy
-
-  app_collectd_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Python/collectd/config.py
-      group: script
-
-  app_collectd_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_configure_deploy
-
-  app_collectd_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/collectd/start.sh
-      group: script
-
-  app_collectd_logstash_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_logstash_connect_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  app_collectd_logstash_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Python/logstash/configure_collectd.py
-      group: script
-
-
-  app_rsyslog_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_create_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - logstash_start_deploy
-
-  app_rsyslog_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/rsyslog/create.sh
-      group: script
-
-  app_rsyslog_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_rsyslog_configure_deploy
-
-  app_rsyslog_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/rsyslog/start.sh
-      group: script
-
-  app_rsyslog_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_configure_config
-      input_values:
-        logstash_ip:
-          get_attr:
-          - logstash_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_rsyslog_create_deploy
-
-  app_rsyslog_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/rsyslog/config.sh
-      group: script
-
-  app_rsyslog_logstash_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_rsyslog_logstash_connect_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  app_rsyslog_logstash_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Python/logstash/configure_rsyslog.py
-      group: script
-
-
-  logstash_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_create_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - elasticsearch_start_deploy
-
-  logstash_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/logstash/create.sh
-      group: script
-
-  logstash_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_start_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  logstash_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/logstash/start.sh
-      group: script
-
-  logstash_elasticsearch_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_elasticsearch_connect_config
-      input_values:
-        elasticsearch_ip:
-          get_attr:
-          - elasticsearch_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  logstash_elasticsearch_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Python/logstash/configure_elasticsearch.py
-      group: script
-
-
-  elasticsearch_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: elasticsearch_create_config
-      server:
-        get_resource: elasticsearch_server
-
-  elasticsearch_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/elasticsearch/create.sh
-      group: script
-
-  elasticsearch_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: elasticsearch_start_config
-      server:
-        get_resource: elasticsearch_server
-    depends_on:
-    - elasticsearch_create_deploy
-
-  elasticsearch_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/elasticsearch/start.sh
-      group: script
-
-
-  kibana_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_create_config
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - elasticsearch_start_deploy
-
-  kibana_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/kibana/create.sh
-      group: script
-
-  kibana_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_configure_config
-      input_values:
-        elasticsearch_ip:
-          get_attr:
-          - elasticsearch_server
-          - networks
-          - private
-          - 0
-        kibana_ip:
-          get_attr:
-          - kibana_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - kibana_create_deploy
-
-  kibana_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/kibana/config.sh
-      group: script
-
-  kibana_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: kibana_start_config
-      server:
-        get_resource: kibana_server
-    depends_on:
-    - kibana_configure_deploy
-
-  kibana_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/kibana/start.sh
-      group: script
-
-
-  app_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  mongo_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  logstash_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  elasticsearch_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  kibana_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  nodejs_url:
-    description: URL for the nodejs server, http://<IP>:3000
-    value:
-      get_attr:
-      - app_server
-      - networks
-      - private
-      - 0
-
-  mongodb_url:
-    description: URL for the mongodb server.
-    value:
-      get_attr:
-      - mongo_server
-      - networks
-      - private
-      - 0
-
-  logstash_url:
-    description: URL for the logstash server.
-    value:
-      get_attr:
-      - logstash_server
-      - networks
-      - private
-      - 0
-
-  elasticsearch_url:
-    description: URL for the elasticsearch server.
-    value:
-      get_attr:
-      - elasticsearch_server
-      - networks
-      - private
-      - 0
-
-  kibana_url:
-    description: URL for the kibana server.
-    value:
-      get_attr:
-      - kibana_server
-      - networks
-      - private
-      - 0
-
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_hello_world.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_hello_world.yaml
deleted file mode 100644
index 60e39dc..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_hello_world.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Template for deploying a single server with predefined properties.
-
-parameters: {}
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: rhel-6.5-test-image
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-outputs: {}
\ No newline at end of file
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_host_assignment.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_host_assignment.yaml
deleted file mode 100644
index e6172e1..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_host_assignment.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  A template to test host assignment for translated hot resources.
-  It makes sure if a resource depends on multiple hosts only the
-  one with the "HostedOn" relationship is picked as the host. In
-  this template, the translated resource 'app_collectd_create_deploy'
-  would depend on 'logstash_server' and 'app_server'. But it would
-  have "HostedOn" relationship with 'app_server', and that server
-  would be its host.
-
-parameters: {}
-resources:
-  app_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  logstash_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  app_collectd_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/create.sh
-      group: script
-
-  app_collectd_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_create_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - logstash_start_deploy
-
-  app_collectd_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/config.py
-      group: script
-
-  app_collectd_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_configure_config
-      input_values:
-        logstash_ip:
-          get_attr:
-          - logstash_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_create_deploy
-
-  app_collectd_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: collectd/start.sh
-      group: script
-
-  app_collectd_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - app_collectd_configure_deploy
-
-  logstash_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/create.sh
-      group: script
-
-  logstash_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_create_config
-      server:
-        get_resource: logstash_server
-
-  logstash_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/start.sh
-      group: script
-
-  logstash_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: logstash_start_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-  app_collectd_logstash_connect_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: logstash/configure_collectd.py
-      group: script
-
-  app_collectd_logstash_connect_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: app_collectd_logstash_connect_config
-      server:
-        get_resource: logstash_server
-    depends_on:
-    - logstash_create_deploy
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
deleted file mode 100644
index 70711c8..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
+++ /dev/null
@@ -1,187 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with nodejs and mongodb.
-
-parameters:
-  github_url:
-    type: string
-    description: The URL to download nodejs.
-    default: http://github.com/paypal/rest-api-sample-app-nodejs.git
-
-  my_cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 4
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  mongo_dbms_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_create_config
-      server:
-        get_resource: mongo_server
-
-  mongo_dbms_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/create.sh
-      group: script
-
-  mongo_dbms_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_configure_config
-      input_values:
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_create_deploy
-
-  mongo_dbms_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/config.sh
-      group: script
-
-  mongo_dbms_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_dbms_start_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_configure_deploy
-
-  mongo_dbms_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/start.sh
-      group: script
-
-  mongo_db_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mongo_db_create_config
-      server:
-        get_resource: mongo_server
-    depends_on:
-    - mongo_dbms_start_deploy
-
-  mongo_db_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mongodb/create_database.sh
-      group: script
-
-  nodejs_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: nodejs_create_config
-      server:
-        get_resource: app_server
-
-  nodejs_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/create.sh
-      group: script
-
-  paypal_pizzastore_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_configure_config
-      input_values:
-        github_url: http://github.com/paypal/rest-api-sample-app-nodejs.git
-        mongodb_ip:
-          get_attr:
-          - mongo_server
-          - networks
-          - private
-          - 0
-      server:
-        get_resource: app_server
-    depends_on:
-    - mongo_db_create_deploy
-    - nodejs_create_deploy
-
-  paypal_pizzastore_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/config.sh
-      group: script
-
-  paypal_pizzastore_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: paypal_pizzastore_start_config
-      server:
-        get_resource: app_server
-    depends_on:
-    - paypal_pizzastore_configure_deploy
-
-  paypal_pizzastore_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: nodejs/start.sh
-      group: script
-
-  mongo_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  app_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  mongodb_url:
-    description: URL for the mongodb server.
-    value:
-      get_attr:
-      - mongo_server
-      - networks
-      - private
-      - 0
-  nodejs_url:
-    description: URL for the nodejs server, http://<IP>:3000
-    value:
-      get_attr:
-      - app_server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
deleted file mode 100644
index 3fa1f62..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
+++ /dev/null
@@ -1,202 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with wordpress, web server and mysql on the same server.
-
-parameters:
-  db_name:
-    type: string
-    description: The name of the database.
-    default: wordpress
-  db_user:
-    type: string
-    description: The user name of the DB user.
-    default: wp_user
-  db_pwd:
-    type: string
-    description: The WordPress database admin account password.
-    default: wp_pass
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 8
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  db_root_pwd:
-    type: string
-    description: Root password for MySQL.
-    default: passw0rd
-  db_port:
-    type: number
-    description: Port for the MySQL database.
-    default: 3366
-
-resources:
-
-  mysql_dbms_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mysql/mysql_dbms_install.sh
-      group: script
-
-  mysql_dbms_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_create_config
-      input_values:
-        db_root_password: passw0rd
-      server:
-        get_resource: server
-
-  mysql_dbms_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mysql/mysql_dbms_start.sh
-      group: script
-
-  mysql_dbms_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_configure_deploy
-
-  mysql_dbms_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mysql/mysql_dbms_configure.sh
-      group: script
-
-  mysql_dbms_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_configure_config
-      input_values:
-        db_port: 3366
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_create_deploy
-
-  mysql_database_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: mysql/mysql_database_configure.sh
-      group: script
-
-  mysql_database_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_database_configure_config
-      input_values:
-        db_name: wordpress
-        db_password: wp_pass
-        db_root_password: passw0rd
-        db_user: wp_user
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_start_deploy
-
-  webserver_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: webserver/webserver_install.sh
-      group: script
-
-  webserver_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: webserver_create_config
-      server:
-        get_resource: server
-
-  webserver_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: webserver/webserver_start.sh
-      group: script
-
-  webserver_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: webserver_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - webserver_create_deploy
-
-  wordpress_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: wordpress/wordpress_install.sh
-      group: script
-
-  wordpress_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: wordpress_create_config
-      server:
-        get_resource: server
-    depends_on:
-    - webserver_start_deploy
-    - mysql_database_configure_deploy
-
-  wordpress_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: wordpress/wordpress_configure.sh
-      group: script
-
-  wordpress_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: wordpress_configure_config
-      input_values:
-        wp_db_name: wordpress
-        wp_db_password: wp_pass
-        wp_db_user: wp_user
-      server:
-        get_resource: server
-    depends_on:
-    - wordpress_create_deploy
-
-  server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.xlarge
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  website_url:
-    description: URL for Wordpress wiki.
-    value:
-      get_attr:
-      - server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
deleted file mode 100644
index 60b043b..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
+++ /dev/null
@@ -1,200 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with wordpress, web server and mysql on the same server.
-
-parameters:
-  db_name:
-    type: string
-    description: The name of the database.
-    default: wordpress
-  db_user:
-    type: string
-    description: The user name of the DB user.
-    default: wp_user
-  db_pwd:
-    type: string
-    description: The WordPress database admin account password.
-    default: wp_pass
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 8
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  db_root_pwd:
-    type: string
-    description: Root password for MySQL.
-    default: passw0rd
-  db_port:
-    type: number
-    description: Port for the MySQL database.
-    default: 3366
-
-resources:
-
-  mysql_dbms_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/MYSQLDBMS/install.sh
-      group: script
-
-  mysql_dbms_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_create_config
-      server:
-        get_resource: server
-
-  mysql_dbms_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/MYSQLDBMS/start.sh
-      group: script
-
-  mysql_dbms_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_configure_deploy
-
-  mysql_dbms_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/MYSQLDBMS/configure.sh
-      group: script
-
-  mysql_dbms_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_dbms_configure_config
-      input_values:
-        root_password: passw0rd
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_create_deploy
-
-  mysql_database_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/MYSQLDatabase/configure.sh
-      group: script
-
-  mysql_database_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: mysql_database_configure_config
-      input_values:
-        db_name: wordpress
-        db_password: wp_pass
-        db_root_password: passw0rd
-        db_user: wp_user
-      server:
-        get_resource: server
-    depends_on:
-    - mysql_dbms_start_deploy
-
-  webserver_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/WebServer/install.sh
-      group: script
-
-  webserver_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: webserver_create_config
-      server:
-        get_resource: server
-
-  webserver_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/WebServer/start.sh
-      group: script
-
-  webserver_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: webserver_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - webserver_create_deploy
-
-  wordpress_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/WordPress/install.sh
-      group: script
-
-  wordpress_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: wordpress_create_config
-      server:
-        get_resource: server
-    depends_on:
-    - webserver_start_deploy
-    - mysql_database_configure_deploy
-
-  wordpress_configure_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: ../Scripts/WordPress/configure.sh
-      group: script
-
-  wordpress_configure_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: wordpress_configure_config
-      input_values:
-        wp_db_name: wordpress
-        wp_db_password: wp_pass
-        wp_db_user: wp_user
-      server:
-        get_resource: server
-    depends_on:
-    - wordpress_create_deploy
-
-  server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.xlarge
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  website_url:
-    description: IP address for Wordpress wiki.
-    value:
-      get_attr:
-      - server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_object_store.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_object_store.yaml
deleted file mode 100644
index 91491e3..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_object_store.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Tosca template for creating an object storage service.
-
-parameters:
-  objectstore_name:
-    type: string
-    default: myobjstore
-
-resources:
-  obj_store_server:
-    type: OS::Swift::Container
-    properties:
-      X-Container-Meta:
-        Quota-Bytes: 1000000000
-      X-Container-Read: ".r:*"
-      name:
-        get_param: objectstore_name
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server.yaml
deleted file mode 100644
index 631f509..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile that just defines a single compute instance and selects a
-  (guest) host Operating System from the Compute node's properties. Note, this
-  example does not include default values on inputs properties.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: ubuntu-12.04-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  private_ip:
-    description: The private IP address of the deployed server instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml
deleted file mode 100644
index deb4fab..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile that just defines a single compute instance and selects a
-  (guest) host Operating System from the Compute node's properties. Note, this
-  example includes default values on inputs properties.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: ubuntu-12.04-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  private_ip:
-    description: The private IP address of the deployed server instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml
deleted file mode 100644
index 4aa7d1f..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile that just defines a single compute instance and selects a
-  (guest) host Operating System from the Compute node's properties. Note, this
-  example includes default values on inputs properties.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 4
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.large
-      image: ubuntu-12.04-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-outputs:
-  private_ip:
-    description: The private IP address of the deployed server instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_software_component.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_software_component.yaml
deleted file mode 100644
index d7d3cb8..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_software_component.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a software component.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  my_software_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: my_software_create_config
-      server:
-        get_resource: server
-
-  my_software_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: software_install.sh
-      group: script
-
-  my_software_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: my_software_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - my_software_create_deploy
-
-  my_software_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: software_start.sh
-      group: script
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_web_application.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_web_application.yaml
deleted file mode 100644
index 9ab5546..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/hot_web_application.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a web application.
-
-parameters:
-  context_root:
-    type: string
-    description: Context root for installing the application.
-    default: my_web_app
-
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 2
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: ubuntu-software-config-os-init
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-
-  web_server_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: web_server_create_config
-      server:
-        get_resource: server
-
-  web_server_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: web_server_install.sh
-      group: script
-
-  web_server_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: web_server_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - web_server_create_deploy
-
-  web_server_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: web_server_start.sh
-      group: script
-
-  web_app_create_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: web_app_create_config
-      input_values:
-        context_root: my_web_app
-      server:
-        get_resource: server
-    depends_on:
-    - web_server_start_deploy
-
-  web_app_create_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: web_app_install.sh
-      group: script
-
-  web_app_start_deploy:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      config:
-        get_resource: web_app_start_config
-      server:
-        get_resource: server
-    depends_on:
-    - web_app_create_deploy
-
-  web_app_start_config:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      config:
-        get_file: web_app_start.sh
-      group: script
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml
deleted file mode 100644
index 6267a33..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 1 server bound to a new network
-
-parameters:
-  network_name:
-    type: string
-    description: Network name
-    default: private_net
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: cirros-0.3.2-x86_64-uec
-      key_name: userkey
-      networks:
-      - port: { get_resource: my_port }
-      user_data_format: SOFTWARE_CONFIG
-
-  my_network:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        get_param: network_name
-
-  my_network_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      allocation_pools:
-      - end: 192.168.0.200
-        start: 192.168.0.50
-      cidr: 192.168.0.0/24
-      gateway_ip: 192.168.0.1
-      ip_version: 4
-      network: { get_resource: my_network }
-
-  my_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network }
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml
deleted file mode 100644
index 0696ba6..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 1 server bound to 3 networks
-
-parameters: {}
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: cirros-0.3.2-x86_64-uec
-      key_name: userkey
-      networks:
-      - port: { get_resource: my_port1 }
-      - port: { get_resource: my_port2 }
-      - port: { get_resource: my_port3 }
-      user_data_format: SOFTWARE_CONFIG
-
-  my_network1:
-    type: OS::Neutron::Net
-    properties:
-      name: net1
-
-  my_network2:
-    type: OS::Neutron::Net
-    properties:
-      name: net2
-
-  my_network3:
-    type: OS::Neutron::Net
-    properties:
-      name: net3
-
-  my_network1_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.168.1.0/24
-      ip_version: 4
-      network: { get_resource: my_network1 }
-
-  my_network2_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.168.2.0/24
-      ip_version: 4
-      network: { get_resource: my_network2 }
-
-  my_network3_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.168.3.0/24
-      ip_version: 4
-      network: { get_resource: my_network3 }
-
-  my_port1:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network1 }
-
-  my_port2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network2 }
-
-  my_port3:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network3 }
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml
deleted file mode 100644
index 7d70d05..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 1 server bound to an existing network
-
-parameters:
-  network_name:
-    type: string
-    description: Network name
-    default: private_net
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: cirros-0.3.2-x86_64-uec
-      key_name: userkey
-      networks:
-      - port: { get_resource: my_port }
-      user_data_format: SOFTWARE_CONFIG
-
-  my_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_param: network_name}
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml
deleted file mode 100644
index 15224ea..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 2 servers bound to the 1 network
-
-parameters:
-  network_name:
-    type: string
-    description: Network name
-    default: my_private_net
-  network_cidr:
-    type: string
-    description: CIDR for the network
-    default: 10.0.0.0/24
-  network_start_ip:
-    type: string
-    description: Start IP for the allocation pool
-    default: 10.0.0.100
-  network_end_ip:
-    type: string
-    description: End IP for the allocation pool
-    default: 10.0.0.150
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: cirros-0.3.2-x86_64-uec
-      key_name: userkey
-      networks:
-      - port: { get_resource: my_port }
-      user_data_format: SOFTWARE_CONFIG
-
-  my_server2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: cirros-0.3.2-x86_64-uec
-      key_name: userkey
-      networks:
-      - port: { get_resource: my_port2 }
-      user_data_format: SOFTWARE_CONFIG
-
-  my_network:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        get_param: network_name
-
-  my_network_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      allocation_pools:
-      - end:
-          get_param: network_end_ip
-        start:
-          get_param: network_start_ip
-      cidr:
-        get_param: network_cidr
-      ip_version: 4
-      network: { get_resource: my_network }
-
-  my_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network }
-
-  my_port2:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: my_network }
-
-outputs: {}
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml
deleted file mode 100644
index 2a8c233..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with server and attached block storage using the normative
-  AttachesTo Relationship Type.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 2
-  storage_snapshot_id:
-    type: string
-    description: "Optional identifier for an existing snapshot to use when creating storage."
-    default: ssid
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  attachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server
-      mountpoint:
-        get_param: storage_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip:
-    description: The private IP address of the newly created compute instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml
deleted file mode 100644
index c6f8a4d..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a Single Block Storage node shared by 2-Tier
-  Application with custom AttachesTo Type and implied relationships.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  my_web_app_tier_1:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  myattachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_1
-      mountpoint: /default_location
-      volume_id:
-        get_resource: my_storage
-
-  my_web_app_tier_2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  myattachesto_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_2
-      mountpoint: /some_other_data_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip_1:
-    description: The private IP address of the applications first tier.
-    value:
-      get_attr:
-      - my_web_app_tier_1
-      - networks
-      - private
-      - 0
-  private_ip_2:
-    description: The private IP address of the applications second tier.
-    value:
-      get_attr:
-      - my_web_app_tier_2
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml
deleted file mode 100644
index e91ac2e..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a Single Block Storage node shared by 2-Tier
-  Application with custom AttachesTo Type and implied relationships.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  my_web_app_tier_1:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  myattachesto_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_1
-      mountpoint: /default_location
-      volume_id:
-        get_resource: my_storage
-
-  my_web_app_tier_2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  myattachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_2
-      mountpoint: /some_other_data_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip_1:
-    description: The private IP address of the applications first tier.
-    value:
-      get_attr:
-      - my_web_app_tier_1
-      - networks
-      - private
-      - 0
-  private_ip_2:
-    description: The private IP address of the applications second tier.
-    value:
-      get_attr:
-      - my_web_app_tier_2
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml
deleted file mode 100644
index 853716c..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a single Block Storage node shared by 2-Tier
-  Application with custom AttachesTo Type and explicit Relationship Templates.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  my_web_app_tier_1:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  storage_attachesto_1_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_1
-      mountpoint: /my_data_location
-      volume_id:
-        get_resource: my_storage
-
-  my_web_app_tier_2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  storage_attachesto_2_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_2
-      mountpoint: /some_other_data_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip_1:
-    description: The private IP address of the applications first tier.
-    value:
-      get_attr:
-      - my_web_app_tier_1
-      - networks
-      - private
-      - 0
-  private_ip_2:
-    description: The private IP address of the applications second tier.
-    value:
-      get_attr:
-      - my_web_app_tier_2
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml
deleted file mode 100644
index 2e28bc2..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with a single Block Storage node shared by 2-Tier
-  Application with custom AttachesTo Type and explicit Relationship Templates.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  my_web_app_tier_1:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  storage_attachesto_1_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_1
-      mountpoint: /my_data_location
-      volume_id:
-        get_resource: my_storage
-
-  my_web_app_tier_2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  storage_attachesto_2_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_web_app_tier_2
-      mountpoint: /some_other_data_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip_1:
-    description: The private IP address of the applications first tier.
-    value:
-      get_attr:
-      - my_web_app_tier_1
-      - networks
-      - private
-      - 0
-  private_ip_2:
-    description: The private IP address of the applications second tier.
-    value:
-      get_attr:
-      - my_web_app_tier_2
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml
deleted file mode 100644
index e16731e..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with server and attached block storage using a custom
-  AttachesTo Relationship Type.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  mycustomattachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server
-      volume_id:
-        get_resource: my_storage
-      mountpoint:
-        get_param: storage_location
-
-
-outputs:
-  private_ip:
-    description: The private IP address of the newly created compute instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml
deleted file mode 100644
index 869e31b..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with server and attached block storage using a named
-  Relationship Template for the storage attachment.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.small
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-
-  storage_attachment_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server
-      mountpoint:
-        get_input: storage_location
-      volume_id:
-        get_resource: my_storage
-
-outputs:
-  private_ip:
-    description: The private IP address of the newly created compute instance.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
-  volume_id:
-    description: The volume id of the block storage instance.
-    value:
-      get_resource: my_storage
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml
deleted file mode 100644
index 4de3e46..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 2 servers each with different attached block storage.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  attachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server
-      mountpoint:
-        get_param: storage_location
-      volume_id:
-        get_resource: my_storage
-
-  my_server2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage2
-
-  my_storage2:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  attachesto_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server2
-      mountpoint:
-        get_param: storage_location
-      volume_id:
-        get_resource: my_storage2
-
-outputs:
-  server_ip_1:
-    description: The private IP address of the applications first server.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
-  server_ip_2:
-    description: The private IP address of the applications second server.
-    value:
-      get_attr:
-      - my_server2
-      - networks
-      - private
-      - 0
-  volume_id_1:
-    description: The volume id of the first block storage instance.
-    value:
-      get_resource: my_storage
-  volume_id_2:
-    description: The volume id of the second block storage instance.
-    value:
-      get_resource: my_storage2
diff --git a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml b/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml
deleted file mode 100644
index a971073..0000000
--- a/tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  TOSCA simple profile with 2 servers each with different attached block storage.
-
-parameters:
-  cpus:
-    type: number
-    description: Number of CPUs for the server.
-    default: 1
-    constraints:
-    - allowed_values:
-      - 1
-      - 2
-      - 4
-      - 8
-  storage_location:
-    type: string
-    description: Block storage mount point (filesystem path).
-    default: /dev/vdc
-  storage_size:
-    type: number
-    description: Size of the storage to be created.
-    default: 1
-  storage_snapshot_id:
-    type: string
-    description: Optional identifier for an existing snapshot to use when creating storage.
-    default: ssid
-
-resources:
-  my_server:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage
-
-  my_storage:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  attachesto_2:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server
-      mountpoint:
-        get_param: storage_location
-      volume_id:
-        get_resource: my_storage
-
-  my_server2:
-    type: OS::Nova::Server
-    properties:
-      flavor: m1.medium
-      image: fedora-amd64-heat-config
-      key_name: userkey
-      user_data_format: SOFTWARE_CONFIG
-    depends_on:
-    - my_storage2
-
-  my_storage2:
-    type: OS::Cinder::Volume
-    properties:
-      size:
-        get_param: storage_size
-      snapshot_id:
-        get_param: storage_snapshot_id
-
-  attachesto_1:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      instance_uuid:
-        get_resource: my_server2
-      mountpoint:
-        get_param: storage_location
-      volume_id:
-        get_resource: my_storage2
-
-outputs:
-  server_ip_1:
-    description: The private IP address of the applications first server.
-    value:
-      get_attr:
-      - my_server
-      - networks
-      - private
-      - 0
-  server_ip_2:
-    description: The private IP address of the applications second server.
-    value:
-      get_attr:
-      - my_server2
-      - networks
-      - private
-      - 0
-  volume_id_1:
-    description: The volume id of the first block storage instance.
-    value:
-      get_resource: my_storage
-  volume_id_2:
-    description: The volume id of the second block storage instance.
-    value:
-      get_resource: my_storage2