openstack/heat
Code Issues Proposed changes

Merge "Specify network for server in test_validation"

Browse Source
This commit is contained in:
Jenkins 2015-07-02 08:51:07 +00:00 committed by Gerrit Code Review
commit 74fe413631
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat_integrationtests/functional/test_validation.py
View File

@ -38,6 +38,8 @@ parameters:
type: string type: string
image: image:
type: string type: string
network:
type: string
resources: resources:
config: config:
type: My::Config type: My::Config
@ -50,7 +52,9 @@ resources:
image: {get_param: image} image: {get_param: image}
flavor: {get_param: flavor} flavor: {get_param: flavor}
key_name: {get_param: keyname} key_name: {get_param: keyname}
networks: [{network: {get_param: network} }]
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG
''' '''
config_template = ''' config_template = '''
heat_template_version: 2014-10-16 heat_template_version: 2014-10-16
@ -74,7 +78,8 @@ resources:
{'My::Config': 'provider.yaml'}} {'My::Config': 'provider.yaml'}}
parameters = {'keyname': self.keypair_name, parameters = {'keyname': self.keypair_name,
'flavor': self.conf.minimal_instance_type, 'flavor': self.conf.minimal_instance_type,
'image': self.conf.minimal_image_ref} 'image': self.conf.minimal_image_ref,
'network': self.conf.fixed_network_name}
# Note we don't wait for CREATE_COMPLETE, because we're using a # Note we don't wait for CREATE_COMPLETE, because we're using a
# minimal image without the tools to apply the config. # minimal image without the tools to apply the config.
# The point of the test is just to prove that validation won't # The point of the test is just to prove that validation won't