Check group metadata for autoscaling completion

In f3eec740a8820ecf96561c9491672787c449469d we changed to set
group resource metadata rather than policy. Therefore we should
check that instead.

Change-Id: I05b309cd7dccac62183976290217cfe78edd4d48
This commit is contained in:
rabi 2018-02-07 09:21:28 +05:30
parent 8257d55634
commit 55c0f754c0
3 changed files with 4 additions and 4 deletions

View File

@ -712,13 +712,13 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
time.sleep(build_interval)
def check_autoscale_complete(self, stack_id, expected_num, parent_stack,
policy):
group_name):
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
if all_res and all_res_complete:
metadata = self.client.resources.metadata(parent_stack, policy)
metadata = self.client.resources.metadata(parent_stack, group_name)
return not metadata.get('scaling_in_progress')
return False

View File

@ -104,7 +104,7 @@ class AutoscalingLoadBalancerTest(scenario_base.ScenarioTestsBase):
test.call_until_true(self.conf.build_timeout,
self.conf.build_interval,
self.check_autoscale_complete,
asg.physical_resource_id, 2, sid, 'scale_up')
asg.physical_resource_id, 2, sid, 'asg')
# Check number of distinctive responses, must now be 2
self.check_num_responses(lb_url, 2)

View File

@ -104,7 +104,7 @@ class AutoscalingLoadBalancerv2Test(scenario_base.ScenarioTestsBase):
test.call_until_true(self.conf.build_timeout,
self.conf.build_interval,
self.check_autoscale_complete,
asg.physical_resource_id, 2, sid, 'scale_up')
asg.physical_resource_id, 2, sid, 'asg')
# Check number of distinctive responses, must now be 2
self.check_num_responses(lb_url, 2)