From c8201c119ec686e79797721156767685fe848aca Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 7 Apr 2016 14:08:49 -0400 Subject: 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 Signed-off-by: shangxdy --- ...multiple_blockstorage_with_attachment_alt2.yaml | 111 --------------------- 1 file changed, 111 deletions(-) delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml (limited to 'tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml') 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 -- cgit 1.2.3-korg