Specify network for server in test_validation
This test does not wait, when all resources will be created. However,
it does not mean, that these resources will not be in create in
progress state. The error, mentioned in the bug, happens, when nova
tries to create server and see two available networks (private and
heat-net). Current patch prevents error by adding network
property to Server resource.
Change-Id: I7c1f4931976ae3a899563b1a9da9f8bc7564806c
Closes-Bug: #1467529
diff --git a/functional/test_validation.py b/functional/test_validation.py
index 6a65091..1111ea8 100644
--- a/functional/test_validation.py
+++ b/functional/test_validation.py
@@ -38,6 +38,8 @@
type: string
image:
type: string
+ network:
+ type: string
resources:
config:
type: My::Config
@@ -50,7 +52,9 @@
image: {get_param: image}
flavor: {get_param: flavor}
key_name: {get_param: keyname}
+ networks: [{network: {get_param: network} }]
user_data_format: SOFTWARE_CONFIG
+
'''
config_template = '''
heat_template_version: 2014-10-16
@@ -74,7 +78,8 @@
{'My::Config': 'provider.yaml'}}
parameters = {'keyname': self.keypair_name,
'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
# minimal image without the tools to apply the config.
# The point of the test is just to prove that validation won't