Move heat_autoscaling_policy to tests/autoscaling/
Also start with a policy test similar to the aws one. Part of blueprint decouple-nested Change-Id: I4298841967001e90f562b3248c0d177877a6a1cd
This commit is contained in:
Angus Salkeld
parent
2d29b96a75
commit
49341ced62
|
|
@ -90,4 +90,11 @@ as_heat_template = '''
|
|||
type: ResourceWithPropsAndAttrs
|
||||
properties:
|
||||
Foo: hello
|
||||
my-policy:
|
||||
type: OS::Heat::ScalingPolicy
|
||||
properties:
|
||||
auto_scaling_group_id: {get_resource: my-group}
|
||||
scaling_adjustment: 1
|
||||
adjustment_type: change_in_capacity
|
||||
cooldown: 60
|
||||
'''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,198 @@
|
|||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import datetime
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
from oslo.utils import timeutils
|
||||
|
||||
from heat.common import template_format
|
||||
from heat.engine import scheduler
|
||||
from heat.tests.autoscaling import inline_templates
|
||||
from heat.tests import common
|
||||
from heat.tests import utils
|
||||
|
||||
|
||||
as_template = inline_templates.as_heat_template
|
||||
as_params = inline_templates.as_params
|
||||
|
||||
|
||||
class TestAutoScalingPolicy(common.HeatTestCase):
|
||||
def setUp(self):
|
||||
super(TestAutoScalingPolicy, self).setUp()
|
||||
cfg.CONF.set_default('heat_waitcondition_server_url',
|
||||
'http://server.test:8000/v1/waitcondition')
|
||||
self.stub_keystoneclient()
|
||||
|
||||
def create_scaling_policy(self, t, stack, resource_name):
|
||||
rsrc = stack[resource_name]
|
||||
self.assertIsNone(rsrc.validate())
|
||||
scheduler.TaskRunner(rsrc.create)()
|
||||
self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
|
||||
return rsrc
|
||||
|
||||
def test_scaling_policy_not_alarm_state(self):
|
||||
"""If the details don't have 'alarm' then don't progress."""
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
test = {'current': 'not_an_alarm'}
|
||||
with mock.patch.object(pol, '_cooldown_inprogress',
|
||||
side_effect=AssertionError()) as dont_call:
|
||||
pol.handle_signal(details=test)
|
||||
self.assertEqual([], dont_call.call_args_list)
|
||||
|
||||
def test_scaling_policy_cooldown_toosoon(self):
|
||||
"""If _cooldown_inprogress() returns True don't progress."""
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
test = {'current': 'alarm'}
|
||||
|
||||
with mock.patch.object(pol.stack, 'resource_by_refid',
|
||||
side_effect=AssertionError) as dont_call:
|
||||
with mock.patch.object(pol, '_cooldown_inprogress',
|
||||
return_value=True) as mock_cip:
|
||||
pol.handle_signal(details=test)
|
||||
mock_cip.assert_called_once_with()
|
||||
self.assertEqual([], dont_call.call_args_list)
|
||||
|
||||
def test_scaling_policy_cooldown_ok(self):
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
test = {'current': 'alarm'}
|
||||
|
||||
group = self.patchobject(pol.stack, 'resource_by_refid').return_value
|
||||
group.name = 'fluffy'
|
||||
with mock.patch.object(pol, '_cooldown_inprogress',
|
||||
return_value=False) as mock_cip:
|
||||
pol.handle_signal(details=test)
|
||||
mock_cip.assert_called_once_with()
|
||||
group.adjust.assert_called_once_with(1, 'ChangeInCapacity')
|
||||
|
||||
|
||||
class TestCooldownMixin(common.HeatTestCase):
|
||||
def setUp(self):
|
||||
super(TestCooldownMixin, self).setUp()
|
||||
cfg.CONF.set_default('heat_waitcondition_server_url',
|
||||
'http://server.test:8000/v1/waitcondition')
|
||||
self.stub_keystoneclient()
|
||||
|
||||
def create_scaling_policy(self, t, stack, resource_name):
|
||||
rsrc = stack[resource_name]
|
||||
self.assertIsNone(rsrc.validate())
|
||||
scheduler.TaskRunner(rsrc.create)()
|
||||
self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
|
||||
return rsrc
|
||||
|
||||
def test_is_in_progress(self):
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
now = timeutils.utcnow()
|
||||
previous_meta = {timeutils.strtime(now): 'ChangeInCapacity : 1'}
|
||||
self.patchobject(pol, 'metadata_get', return_value=previous_meta)
|
||||
self.assertTrue(pol._cooldown_inprogress())
|
||||
|
||||
def test_not_in_progress(self):
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
awhile_ago = timeutils.utcnow() - datetime.timedelta(seconds=100)
|
||||
previous_meta = {timeutils.strtime(awhile_ago): 'ChangeInCapacity : 1'}
|
||||
self.patchobject(pol, 'metadata_get', return_value=previous_meta)
|
||||
self.assertFalse(pol._cooldown_inprogress())
|
||||
|
||||
def test_scaling_policy_cooldown_zero(self):
|
||||
t = template_format.parse(as_template)
|
||||
|
||||
# Create the scaling policy (with cooldown=0) and scale up one
|
||||
properties = t['resources']['my-policy']['properties']
|
||||
properties['cooldown'] = '0'
|
||||
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
now = timeutils.utcnow()
|
||||
previous_meta = {timeutils.strtime(now): 'ChangeInCapacity : 1'}
|
||||
self.patchobject(pol, 'metadata_get', return_value=previous_meta)
|
||||
self.assertFalse(pol._cooldown_inprogress())
|
||||
|
||||
def test_scaling_policy_cooldown_none(self):
|
||||
t = template_format.parse(as_template)
|
||||
|
||||
# Create the scaling policy no cooldown property, should behave the
|
||||
# same as when cooldown==0
|
||||
properties = t['resources']['my-policy']['properties']
|
||||
del properties['cooldown']
|
||||
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
now = timeutils.utcnow()
|
||||
previous_meta = {timeutils.strtime(now): 'ChangeInCapacity : 1'}
|
||||
self.patchobject(pol, 'metadata_get', return_value=previous_meta)
|
||||
self.assertFalse(pol._cooldown_inprogress())
|
||||
|
||||
def test_metadata_is_written(self):
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
pol = self.create_scaling_policy(t, stack, 'my-policy')
|
||||
|
||||
nowish = timeutils.strtime()
|
||||
reason = 'cool as'
|
||||
meta_set = self.patchobject(pol, 'metadata_set')
|
||||
self.patchobject(timeutils, 'strtime', return_value=nowish)
|
||||
pol._cooldown_timestamp(reason)
|
||||
meta_set.assert_called_once_with({nowish: reason})
|
||||
|
||||
|
||||
class ScalingPolicyAttrTest(common.HeatTestCase):
|
||||
def setUp(self):
|
||||
super(ScalingPolicyAttrTest, self).setUp()
|
||||
self.stub_keystoneclient()
|
||||
cfg.CONF.set_default('heat_waitcondition_server_url',
|
||||
'http://server.test:8000/v1/waitcondition')
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
self.policy = stack['my-policy']
|
||||
self.assertIsNone(self.policy.validate())
|
||||
scheduler.TaskRunner(self.policy.create)()
|
||||
self.assertEqual((self.policy.CREATE, self.policy.COMPLETE),
|
||||
self.policy.state)
|
||||
|
||||
def test_alarm_attribute(self):
|
||||
alarm_url = self.policy.FnGetAtt('alarm_url')
|
||||
|
||||
base = alarm_url.split('?')[0].split('%3A')
|
||||
self.assertEqual('http://server.test:8000/v1/signal/arn', base[0])
|
||||
self.assertEqual('openstack', base[1])
|
||||
self.assertEqual('heat', base[2])
|
||||
self.assertEqual('test_tenant_id', base[4])
|
||||
|
||||
res = base[5].split('%2F')
|
||||
self.assertEqual('stacks', res[0])
|
||||
self.assertEqual('test_stack', res[1])
|
||||
self.assertEqual('resources', res[3])
|
||||
self.assertEqual('my-policy', res[4])
|
||||
|
||||
args = alarm_url.split('?')[1].split('&')
|
||||
self.assertEqual('Timestamp', args[0].split('=')[0])
|
||||
self.assertEqual('SignatureMethod', args[1].split('=')[0])
|
||||
self.assertEqual('AWSAccessKeyId', args[2].split('=')[0])
|
||||
self.assertEqual('SignatureVersion', args[3].split('=')[0])
|
||||
self.assertEqual('Signature', args[4].split('=')[0])
|
||||
|
|
@ -159,3 +159,20 @@ class TestCooldownMixin(common.HeatTestCase):
|
|||
self.patchobject(timeutils, 'strtime', return_value=nowish)
|
||||
pol._cooldown_timestamp(reason)
|
||||
meta_set.assert_called_once_with({nowish: reason})
|
||||
|
||||
|
||||
class ScalingPolicyAttrTest(common.HeatTestCase):
|
||||
def setUp(self):
|
||||
super(ScalingPolicyAttrTest, self).setUp()
|
||||
self.stub_keystoneclient()
|
||||
t = template_format.parse(as_template)
|
||||
stack = utils.parse_stack(t, params=as_params)
|
||||
self.policy = stack['WebServerScaleUpPolicy']
|
||||
self.assertIsNone(self.policy.validate())
|
||||
scheduler.TaskRunner(self.policy.create)()
|
||||
self.assertEqual((self.policy.CREATE, self.policy.COMPLETE),
|
||||
self.policy.state)
|
||||
|
||||
def test_alarm_attribute(self):
|
||||
self.assertIn("WebServerScaleUpPolicy",
|
||||
self.policy.FnGetAtt('AlarmUrl'))
|
||||
|
|
|
|||
|
|
@ -200,42 +200,6 @@ class AutoScalingGroupTest(common.HeatTestCase):
|
|||
self.assertEqual(1, grouputils.get_size(rsrc))
|
||||
|
||||
|
||||
class ScalingPolicyTest(common.HeatTestCase):
|
||||
# TODO(Qiming): Add more tests to the scaling policy
|
||||
as_template = '''
|
||||
heat_template_version: 2013-05-23
|
||||
resources:
|
||||
my-policy:
|
||||
type: OS::Heat::ScalingPolicy
|
||||
properties:
|
||||
auto_scaling_group_id: {get_resource: my-group}
|
||||
adjustment_type: change_in_capacity
|
||||
scaling_adjustment: 1
|
||||
my-group:
|
||||
type: OS::Heat::AutoScalingGroup
|
||||
properties:
|
||||
max_size: 5
|
||||
min_size: 1
|
||||
resource:
|
||||
type: ResourceWithProps
|
||||
properties:
|
||||
Foo: hello
|
||||
'''
|
||||
|
||||
def setUp(self):
|
||||
super(ScalingPolicyTest, self).setUp()
|
||||
resource._register_class('ResourceWithProps',
|
||||
generic_resource.ResourceWithProps)
|
||||
self.stub_keystoneclient()
|
||||
self.parsed = template_format.parse(self.as_template)
|
||||
|
||||
def test_alarm_attribute(self):
|
||||
stack = utils.parse_stack(self.parsed)
|
||||
stack.create()
|
||||
policy = stack['my-policy']
|
||||
self.assertIn("my-policy", policy.FnGetAtt('alarm_url'))
|
||||
|
||||
|
||||
class RollingUpdatesTest(common.HeatTestCase):
|
||||
|
||||
as_template = '''
|
||||
|
|
|
|||
Loading…
Reference in New Issue