diff --git a/heat_tempest_plugin/common/test.py b/heat_tempest_plugin/common/test.py index 4fdfb8e..de7f25a 100644 --- a/heat_tempest_plugin/common/test.py +++ b/heat_tempest_plugin/common/test.py @@ -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 diff --git a/heat_tempest_plugin/tests/scenario/test_autoscaling_lb.py b/heat_tempest_plugin/tests/scenario/test_autoscaling_lb.py index e576867..9a9cee9 100644 --- a/heat_tempest_plugin/tests/scenario/test_autoscaling_lb.py +++ b/heat_tempest_plugin/tests/scenario/test_autoscaling_lb.py @@ -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) diff --git a/heat_tempest_plugin/tests/scenario/test_autoscaling_lbv2.py b/heat_tempest_plugin/tests/scenario/test_autoscaling_lbv2.py index 65fa91c..37d22d7 100644 --- a/heat_tempest_plugin/tests/scenario/test_autoscaling_lbv2.py +++ b/heat_tempest_plugin/tests/scenario/test_autoscaling_lbv2.py @@ -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)