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>

9 files changed, 802 insertions, 0 deletions

diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml
new file mode 100644
index 0000000..5ff5382
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml
@@ -0,0 +1,71 @@
+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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml
new file mode 100644
index 0000000..9ffaf23
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml
@@ -0,0 +1,92 @@
+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
+      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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml
new file mode 100644
index 0000000..9b5e71c
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml
@@ -0,0 +1,92 @@
+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
+      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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml
new file mode 100644
index 0000000..1b4eb73
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml
@@ -0,0 +1,96 @@
+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
+      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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml
new file mode 100644
index 0000000..0311a55
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml
@@ -0,0 +1,96 @@
+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
+      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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml
new file mode 100644
index 0000000..bce4603
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml
@@ -0,0 +1,72 @@
+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
+      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/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml
new file mode 100644
index 0000000..e17dff9
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml
@@ -0,0 +1,65 @@
+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
+      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/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml
new file mode 100644
index 0000000..55ada08
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml
@@ -0,0 +1,109 @@
+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
+      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
+      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/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml
new file mode 100644
index 0000000..3386d79
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml
@@ -0,0 +1,109 @@
+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
+      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
+      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