From 0f196dc5761332187b777104b398d3abe8a9e6a6 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Mon, 22 Jun 2015 09:49:47 -0400 Subject: [PATCH] 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 --- heat_integrationtests/functional/test_validation.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/heat_integrationtests/functional/test_validation.py b/heat_integrationtests/functional/test_validation.py index 6a65091bf8..1111ea8192 100644 --- a/heat_integrationtests/functional/test_validation.py +++ b/heat_integrationtests/functional/test_validation.py @@ -38,6 +38,8 @@ parameters: type: string image: type: string + network: + type: string resources: config: type: My::Config @@ -50,7 +52,9 @@ resources: 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 @@ resources: {'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