From 9561c540fa12f16d6c1b163a183704fc6b0f502e Mon Sep 17 00:00:00 2001 From: Rakesh H S Date: Thu, 28 Apr 2016 15:38:09 +0530 Subject: [PATCH] Removes duplicate code autoscale_complete Function autoscale_complete will be required by many test cases, hence moving it to common. Change-Id: Ie0545ad35c6704bc86b26748ae99f9c66ca5a468 --- heat_integrationtests/common/test.py | 8 ++++++++ heat_integrationtests/scenario/test_autoscaling_lb.py | 10 +--------- .../scenario/test_autoscaling_lbv2.py | 10 +--------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py index 42fa43ccb6..976ae8b26e 100644 --- a/heat_integrationtests/common/test.py +++ b/heat_integrationtests/common/test.py @@ -595,3 +595,11 @@ class HeatIntegrationTest(testscenarios.WithScenarios, if len(matched) == num_expected: return matched time.sleep(build_interval) + + def check_autoscale_complete(self, stack_id, expected_num): + res_list = self.client.resources.list(stack_id) + all_res_complete = all(res.resource_status in ('UPDATE_COMPLETE', + 'CREATE_COMPLETE') + for res in res_list) + all_res = len(res_list) == expected_num + return all_res and all_res_complete diff --git a/heat_integrationtests/scenario/test_autoscaling_lb.py b/heat_integrationtests/scenario/test_autoscaling_lb.py index f5b292ec31..833e9a8087 100644 --- a/heat_integrationtests/scenario/test_autoscaling_lb.py +++ b/heat_integrationtests/scenario/test_autoscaling_lb.py @@ -48,14 +48,6 @@ class AutoscalingLoadBalancerTest(scenario_base.ScenarioTestsBase): resp.add(r.text) self.assertEqual(expected_num, len(resp)) - def autoscale_complete(self, stack_id, expected_num): - res_list = self.client.resources.list(stack_id) - all_res_complete = all(res.resource_status in ('UPDATE_COMPLETE', - 'CREATE_COMPLETE') - for res in res_list) - all_res = len(res_list) == expected_num - return all_res and all_res_complete - def test_autoscaling_loadbalancer_neutron(self): """Check work of AutoScaing and Neutron LBaaS v1 resource in Heat. @@ -111,7 +103,7 @@ class AutoscalingLoadBalancerTest(scenario_base.ScenarioTestsBase): asg = self.client.resources.get(sid, 'asg') test.call_until_true(self.conf.build_timeout, self.conf.build_interval, - self.autoscale_complete, + self.check_autoscale_complete, asg.physical_resource_id, 2) # Check number of distinctive responses, must now be 2 diff --git a/heat_integrationtests/scenario/test_autoscaling_lbv2.py b/heat_integrationtests/scenario/test_autoscaling_lbv2.py index 89c48775c9..b3a1842158 100644 --- a/heat_integrationtests/scenario/test_autoscaling_lbv2.py +++ b/heat_integrationtests/scenario/test_autoscaling_lbv2.py @@ -48,14 +48,6 @@ class AutoscalingLoadBalancerv2Test(scenario_base.ScenarioTestsBase): resp.add(r.text) self.assertEqual(expected_num, len(resp)) - def autoscale_complete(self, stack_id, expected_num): - res_list = self.client.resources.list(stack_id) - all_res_complete = all(res.resource_status in ('UPDATE_COMPLETE', - 'CREATE_COMPLETE') - for res in res_list) - all_res = len(res_list) == expected_num - return all_res and all_res_complete - def test_autoscaling_loadbalancer_neutron(self): """Check work of AutoScaing and Neutron LBaaS v2 resource in Heat. @@ -109,7 +101,7 @@ class AutoscalingLoadBalancerv2Test(scenario_base.ScenarioTestsBase): asg = self.client.resources.get(sid, 'asg') test.call_until_true(self.conf.build_timeout, self.conf.build_interval, - self.autoscale_complete, + self.check_autoscale_complete, asg.physical_resource_id, 2) # Check number of distinctive responses, must now be 2