diff options
| author | rabi <ramishra@redhat.com> | 2017-04-25 13:32:05 +0530 |
|---|---|---|
| committer | rabi <ramishra@redhat.com> | 2018-01-28 09:41:20 +0530 |
| commit | 0558b10c48734e94b65b35a4d9ad9356ada9f193 (patch) | |
| tree | 763e94cd9a0c7cac01e14e6ac6fe0b0ca3040b77 /heat_integrationtests | |
| parent | 3a2497a46cc4b7cf72bf7605433c91344da82704 (diff) | |
| download | heat-0558b10c48734e94b65b35a4d9ad9356ada9f193.tar.gz | |
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
Diffstat (limited to 'heat_integrationtests')
| -rw-r--r-- | heat_integrationtests/common/test.py | 4 | ||||
| -rw-r--r-- | heat_integrationtests/functional/test_heat_autoscaling.py | 6 |
2 files changed, 5 insertions, 5 deletions
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 diff --git a/heat_integrationtests/functional/test_heat_autoscaling.py b/heat_integrationtests/functional/test_heat_autoscaling.py index 474e1c3af..cd1c9c73c 100644 --- a/heat_integrationtests/functional/test_heat_autoscaling.py +++ b/heat_integrationtests/functional/test_heat_autoscaling.py @@ -120,7 +120,7 @@ outputs: self.check_autoscale_complete, asg.physical_resource_id, expected_resources, stack_id, - 'scale_up_policy')) + 'random_group')) def test_asg_scale_down_min_size(self): stack_id = self.stack_create(template=self.template, @@ -142,7 +142,7 @@ outputs: self.check_autoscale_complete, asg.physical_resource_id, expected_resources, stack_id, - 'scale_down_policy')) + 'random_group')) def test_asg_cooldown(self): cooldown_tmpl = self.template.replace('cooldown: 0', @@ -165,7 +165,7 @@ outputs: self.check_autoscale_complete, asg.physical_resource_id, expected_resources, stack_id, - 'scale_up_policy')) + 'random_group')) def test_path_attrs(self): stack_id = self.stack_create(template=self.template) |