commit fa535cfeda40212af56f237c8c39daf184aed862
author Amit Ugol <amit.ugol@gmail.com> Thu Nov 03 13:15:29 2016 +0200
committer Rabi Mishra <ramishra@redhat.com> Tue Nov 08 05:19:10 2016 +0000
tree f971c77d76a2f3e9153ee350240ec611e94b0508
parent f9681be6a16a087fb642a3949d8d1d592f165e0f

m1.tiny is not always there

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

functional/test_autoscaling.py

diff --git a/functional/test_autoscaling.py b/functional/test_autoscaling.py
index 5af512a..369fa00 100644
--- a/functional/test_autoscaling.py
+++ b/functional/test_autoscaling.py
@@ -495,7 +495,7 @@
         policy['MaxBatchSize'] = '3'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.minimal_instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=10,
@@ -516,7 +516,7 @@
         policy['MaxBatchSize'] = '4'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.minimal_instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=8,

functional/test_instance_group.py

diff --git a/functional/test_instance_group.py b/functional/test_instance_group.py
index e8f0309..44b3aa9 100644
--- a/functional/test_instance_group.py
+++ b/functional/test_instance_group.py
@@ -469,7 +469,7 @@
         policy['MaxBatchSize'] = '3'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=5,
@@ -491,7 +491,7 @@
         policy['MaxBatchSize'] = '4'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=2,