openstack/heat
Code Issues Proposed changes

m1.tiny is not always there

Browse Source 
m1.tiny flavor is hard coded to some tests.
This flavor is not always there, for instance if I don't use devstack.
heat_integrationtests/prepare_test_env.sh creates m1.heat_int flavor
which is the same size as m1.tiny according to the document at
admin-guide/cli-manage-flavors.html

Change-Id: I36524e069eacb36c7e6e7e0297c600ee68be88d6
This commit is contained in:
Amit Ugol 2016-11-03 13:15:29 +02:00 committed by Rabi Mishra
parent 18fb53154a
commit aa000b2b33
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_integrationtests/functional/test_autoscaling.py
View File

@ -495,7 +495,7 @@ class AutoscalingGroupUpdatePolicyTest(AutoscalingGroupTest):
policy['MaxBatchSize'] = '3' policy['MaxBatchSize'] = '3'
policy['PauseTime'] = 'PT0S' policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig'] config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny' config['Properties']['InstanceType'] = self.conf.minimal_instance_type
self.update_instance_group(updt_template, self.update_instance_group(updt_template,
num_updates_expected_on_updt=10, num_updates_expected_on_updt=10,
@ -516,7 +516,7 @@ class AutoscalingGroupUpdatePolicyTest(AutoscalingGroupTest):
policy['MaxBatchSize'] = '4' policy['MaxBatchSize'] = '4'
policy['PauseTime'] = 'PT0S' policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig'] config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny' config['Properties']['InstanceType'] = self.conf.minimal_instance_type
self.update_instance_group(updt_template, self.update_instance_group(updt_template,
num_updates_expected_on_updt=8, num_updates_expected_on_updt=8,

4
heat_integrationtests/functional/test_instance_group.py
View File

@ -469,7 +469,7 @@ class InstanceGroupUpdatePolicyTest(InstanceGroupTest):
policy['MaxBatchSize'] = '3' policy['MaxBatchSize'] = '3'
policy['PauseTime'] = 'PT0S' policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig'] config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny' config['Properties']['InstanceType'] = self.conf.instance_type
self.update_instance_group(updt_template, self.update_instance_group(updt_template,
num_updates_expected_on_updt=5, num_updates_expected_on_updt=5,
@ -491,7 +491,7 @@ class InstanceGroupUpdatePolicyTest(InstanceGroupTest):
policy['MaxBatchSize'] = '4' policy['MaxBatchSize'] = '4'
policy['PauseTime'] = 'PT0S' policy['PauseTime'] = 'PT0S'
config = updt_template['Resources']['JobServerConfig'] config = updt_template['Resources']['JobServerConfig']
config['Properties']['InstanceType'] = 'm1.tiny' config['Properties']['InstanceType'] = self.conf.instance_type
self.update_instance_group(updt_template, self.update_instance_group(updt_template,
num_updates_expected_on_updt=2, num_updates_expected_on_updt=2,