openstack/heat-translator
Code Issues Proposed changes

Sync network examples with the spec

Browse Source 
Sync two network examples with the spec:
- Network 1: Server bound to a new network
- Network 2: Server bound to an existing network

Change-Id: I5f0dfa2d6a3d6e9c3fdc2ecbe4a10f1e16b2c768
Partial-Bug: #1475807
This commit is contained in:
Vahid Hashemian 2015-07-17 20:34:27 -07:00
parent dcd77567e5
commit 0d0c3a75b7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
translator/hot/tosca/tosca_compute.py
View File

@ -49,6 +49,10 @@ IMAGES = {'ubuntu-software-config-os-init': {'architecture': 'x86_64',
'type': 'Linux', 'type': 'Linux',
'distribution': 'CirrOS', 'distribution': 'CirrOS',
'version': '0.3.1'}, 'version': '0.3.1'},
'cirros-0.3.2-x86_64-uec': {'architecture': 'x86_64',
'type': 'Linux',
'distribution': 'CirrOS',
'version': '0.3.2'},
'rhel-6.5-test-image': {'architecture': 'x86_64', 'rhel-6.5-test-image': {'architecture': 'x86_64',
'type': 'Linux', 'type': 'Linux',
'distribution': 'RHEL', 'distribution': 'RHEL',

7
translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
View File

@ -1,9 +1,10 @@
tosca_definitions_version: tosca_simple_yaml_1_0 tosca_definitions_version: tosca_simple_yaml_1_0
description: > description: >
TOSCA simple profile with 1 network and 1 attached server TOSCA simple profile with 1 server bound to a new network
topology_template: topology_template:
inputs: inputs:
network_name: network_name:
type: string type: string
@ -24,15 +25,17 @@ topology_template:
type: Linux type: Linux
distribution: CirrOS distribution: CirrOS
version: 0.3.2 version: 0.3.2
my_network: my_network:
type: tosca.nodes.network.Network type: tosca.nodes.network.Network
properties: properties:
network_name: { get_input: network_name }
ip_version: 4 ip_version: 4
cidr: '192.168.0.0/24' cidr: '192.168.0.0/24'
network_name: { get_input: network_name }
start_ip: '192.168.0.50' start_ip: '192.168.0.50'
end_ip: '192.168.0.200' end_ip: '192.168.0.200'
gateway_ip: '192.168.0.1' gateway_ip: '192.168.0.1'
my_port: my_port:
type: tosca.nodes.network.Port type: tosca.nodes.network.Port
requirements: requirements:

4
translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
View File

@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0 tosca_definitions_version: tosca_simple_yaml_1_0
description: > description: >
TOSCA simple profile with 1 server attached to existing network TOSCA simple profile with 1 server bound to an existing network
topology_template: topology_template:
inputs: inputs:
@ -24,10 +24,12 @@ topology_template:
type: Linux type: Linux
distribution: CirrOS distribution: CirrOS
version: 0.3.2 version: 0.3.2
my_network: my_network:
type: tosca.nodes.network.Network type: tosca.nodes.network.Network
properties: properties:
network_name: { get_input: network_name } network_name: { get_input: network_name }
my_port: my_port:
type: tosca.nodes.network.Port type: tosca.nodes.network.Port
requirements: requirements: