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 --- .../network/hot_two_servers_one_network.yaml | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml (limited to 'tosca2heat/heat-translator-0.3.0/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml') 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: {} -- cgit 1.2.3-korg