From 0558b10c48734e94b65b35a4d9ad9356ada9f193 Mon Sep 17 00:00:00 2001 From: rabi Date: Tue, 25 Apr 2017 13:32:05 +0530 Subject: Remove use of CooldownMixin with scaling policy Removes the multiple use of the mixin, so that we don't set metadata for both policy and group. Setting the cooldown metadata only for group would suffice. Change-Id: I241a32b52e0708264c80c3eca313a97534927415 Related-Bug: #1555748 --- heat_integrationtests/common/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'heat_integrationtests/common/test.py') diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py index 1300169ee..88988ec48 100644 --- a/heat_integrationtests/common/test.py +++ b/heat_integrationtests/common/test.py @@ -682,13 +682,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 -- cgit v1.2.1