diff options
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests')
20 files changed, 48 insertions, 105 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml index a298745..1fbd44e 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml @@ -52,8 +52,6 @@ resources: get_attr: - mongo_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -110,8 +108,6 @@ resources: get_attr: - mongo_server - networks - - private - - 0 server: get_resource: mongo_server depends_on: @@ -186,8 +182,6 @@ resources: get_attr: - logstash_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -279,8 +273,6 @@ resources: get_attr: - logstash_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -355,8 +347,6 @@ resources: get_attr: - elasticsearch_server - networks - - private - - 0 server: get_resource: logstash_server depends_on: @@ -430,14 +420,10 @@ resources: get_attr: - elasticsearch_server - networks - - private - - 0 kibana_ip: get_attr: - kibana_server - networks - - private - - 0 server: get_resource: kibana_server depends_on: @@ -510,8 +496,6 @@ outputs: get_attr: - app_server - networks - - private - - 0 mongodb_url: description: URL for the mongodb server. @@ -519,8 +503,6 @@ outputs: get_attr: - mongo_server - networks - - private - - 0 logstash_url: description: URL for the logstash server. @@ -528,8 +510,6 @@ outputs: get_attr: - logstash_server - networks - - private - - 0 elasticsearch_url: description: URL for the elasticsearch server. @@ -537,8 +517,6 @@ outputs: get_attr: - elasticsearch_server - networks - - private - - 0 kibana_url: description: URL for the kibana server. @@ -546,6 +524,3 @@ outputs: get_attr: - kibana_server - networks - - private - - 0 - diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml index 5eb1701..50491ef 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml @@ -52,8 +52,7 @@ resources: get_attr: - mongo_server - networks - - private - - 0 + server: get_resource: app_server depends_on: @@ -110,8 +109,7 @@ resources: get_attr: - mongo_server - networks - - private - - 0 + server: get_resource: mongo_server depends_on: @@ -186,8 +184,6 @@ resources: get_attr: - logstash_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -279,8 +275,6 @@ resources: get_attr: - logstash_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -355,8 +349,6 @@ resources: get_attr: - elasticsearch_server - networks - - private - - 0 server: get_resource: logstash_server depends_on: @@ -430,14 +422,11 @@ resources: get_attr: - elasticsearch_server - networks - - private - - 0 kibana_ip: get_attr: - kibana_server - networks - - private - - 0 + server: get_resource: kibana_server depends_on: @@ -510,8 +499,6 @@ outputs: get_attr: - app_server - networks - - private - - 0 mongodb_url: description: URL for the mongodb server. @@ -519,8 +506,6 @@ outputs: get_attr: - mongo_server - networks - - private - - 0 logstash_url: description: URL for the logstash server. @@ -528,8 +513,6 @@ outputs: get_attr: - logstash_server - networks - - private - - 0 elasticsearch_url: description: URL for the elasticsearch server. @@ -537,8 +520,6 @@ outputs: get_attr: - elasticsearch_server - networks - - private - - 0 kibana_url: description: URL for the kibana server. @@ -546,6 +527,4 @@ outputs: get_attr: - kibana_server - networks - - private - - 0 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml index 33f3059..29f12cc 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml @@ -59,8 +59,6 @@ resources: get_attr: - logstash_server - networks - - private - - 0 server: get_resource: app_server depends_on: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml index f2d14ed..79750d4 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml @@ -8,36 +8,60 @@ resources: VDU1: type: OS::Nova::Server properties: - flavor: m1.medium + flavor: m1.tiny image: rhel-6.5-test-image networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG depends_on: - VDU2 + - BlockStorage + VDU2: type: OS::Nova::Server properties: - flavor: m1.medium + flavor: m1.tiny image: rhel-6.5-test-image networks: - port: { get_resource: CP2 } user_data_format: SOFTWARE_CONFIG + BlockStorage: + type: OS::Cinder::Volume + properties: + size: 1 + + tosca.relationships.attachesto_1: + type: OS::Cinder::VolumeAttachment + properties: + instance_uuid: + get_resource: VDU1 + mountpoint: /dev/vdb1 + volume_id: + get_resource: BlockStorage + CP1: type: OS::Neutron::Port properties: fixed_ips: - ip_address: '192.168.0.55' network: { get_resource: VL1 } + CP2: type: OS::Neutron::Port properties: fixed_ips: - ip_address: '192.168.0.56' network: { get_resource: VL1 } + VL1: type: OS::Neutron::Net + properties: + name: test_net + value_specs: + provider:network_type: vxlan + provider:segmentation_id: 100 + VL1_subnet: type: OS::Neutron::Subnet properties: @@ -48,5 +72,6 @@ resources: gateway_ip: 192.168.0.1 cidr: 192.168.0.0/24 network: { get_resource: VL1 } + outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml index b95120b..3406b51 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml @@ -46,8 +46,6 @@ resources: get_attr: - mongo_server - networks - - private - - 0 server: get_resource: mongo_server depends_on: @@ -120,8 +118,6 @@ resources: get_attr: - mongo_server - networks - - private - - 0 server: get_resource: app_server depends_on: @@ -173,13 +169,9 @@ outputs: 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/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml index 8c10a93..fbbeab2 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml @@ -205,5 +205,3 @@ outputs: get_attr: - server - networks - - private - - 0 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml index 3598540..02c0543 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml @@ -203,5 +203,3 @@ outputs: get_attr: - server - networks - - private - - 0 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml index 5cffb43..e494791 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml @@ -32,5 +32,3 @@ outputs: get_attr: - my_server - networks - - private - - 0 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml index 1eb88a7..6211cad 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml @@ -32,5 +32,3 @@ outputs: get_attr: - my_server - networks - - private - - 0 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml index 4e7e6b5..22a0198 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml @@ -32,5 +32,3 @@ outputs: get_attr: - my_server - networks - - private - - 0 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 index 5ff5382..6803858 100644 --- 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 @@ -63,8 +63,6 @@ outputs: get_attr: - my_server - networks - - private - - 0 volume_id: description: The volume id of the block storage instance. value: 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 index 9ffaf23..0450b1f 100644 --- 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 @@ -76,16 +76,12 @@ outputs: 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: 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 index 9b5e71c..e65e789 100644 --- 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 @@ -76,16 +76,12 @@ outputs: 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: 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 index 1b4eb73..a8c114e 100644 --- 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 @@ -80,16 +80,12 @@ outputs: 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: 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 index 0311a55..59b46ae 100644 --- 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 @@ -80,16 +80,12 @@ outputs: 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: 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 index bce4603..639832c 100644 --- 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 @@ -64,8 +64,6 @@ outputs: get_attr: - my_server - networks - - private - - 0 volume_id: description: The volume id of the block storage instance. value: 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 index e17dff9..20b77c2 100644 --- 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 @@ -57,8 +57,6 @@ outputs: get_attr: - my_server - networks - - private - - 0 volume_id: description: The volume id of the block storage instance. value: 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 index 55ada08..cff83f9 100644 --- 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 @@ -89,16 +89,12 @@ outputs: 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: 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 index 3386d79..0fdcb4b 100644 --- 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 @@ -89,16 +89,12 @@ outputs: 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: diff --git a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml index 538d63d..5803bd2 100644 --- a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml @@ -10,8 +10,8 @@ topology_template: capabilities: host: properties: - num_cpus: 2 - disk_size: 10 GB + num_cpus: 1 + disk_size: 1 GB mem_size: 512 MB # Guest Operating System properties os: @@ -23,14 +23,25 @@ topology_template: version: 6.5 requirements: - high_availability: VDU2 + - local_storage: + node: BlockStorage + relationship: + type: tosca.relationships.AttachesTo + properties: + location: /dev/vdb1 + + BlockStorage: + type: tosca.nodes.BlockStorage + properties: + size: 1 GB VDU2: type: tosca.nodes.nfv.VDU capabilities: host: properties: - num_cpus: 2 - disk_size: 10 GB + num_cpus: 1 + disk_size: 1 GB mem_size: 512 MB # Guest Operating System properties os: @@ -73,3 +84,6 @@ topology_template: start_ip: '192.168.0.50' end_ip: '192.168.0.200' gateway_ip: '192.168.0.1' + network_name: test_net + network_type: vxlan + segmentation_id: 100 |