openstack/heat
Code Issues Proposed changes

Merge "Removes duplicate code autoscale_complete"

Browse Source
This commit is contained in:
Jenkins 2016-05-19 11:05:47 +00:00 committed by Gerrit Code Review
commit 93ce8e1d30
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat_integrationtests/common/test.py
View File

@ -589,3 +589,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

10
heat_integrationtests/scenario/test_autoscaling_lb.py
View File

@ -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

10
heat_integrationtests/scenario/test_autoscaling_lbv2.py
View File

@ -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