openstack/deb-heat
Code Issues Proposed changes

Merge "cleanup watchrule delete logic/tests"

Browse Source
This commit is contained in:
Jenkins 2013-07-05 13:37:20 +00:00 committed by Gerrit Code Review
commit c03efe6bb1
7 changed files with 276 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/db/api.py
View File

@ -172,8 +172,8 @@ def watch_rule_update(context, watch_id, values):
return IMPL.watch_rule_update(context, watch_id, values) return IMPL.watch_rule_update(context, watch_id, values)
def watch_rule_delete(context, watch_rule_name): def watch_rule_delete(context, watch_id):
return IMPL.watch_rule_delete(context, watch_rule_name) return IMPL.watch_rule_delete(context, watch_id)
def watch_data_create(context, values): def watch_data_create(context, values):

8
heat/db/sqlalchemy/api.py
View File

@ -302,13 +302,11 @@ def watch_rule_update(context, watch_id, values):
wr.save(_session(context)) wr.save(_session(context))
def watch_rule_delete(context, watch_name): def watch_rule_delete(context, watch_id):
wr = model_query(context, models.WatchRule).\ wr = watch_rule_get(context, watch_id)
filter_by(name=watch_name).first()
if not wr: if not wr:
raise exception.NotFound('Attempt to delete watch_rule: %s %s' % raise exception.NotFound('Attempt to delete watch_rule: %s %s' %
(watch_name, 'that does not exist')) (watch_id, 'that does not exist'))
session = Session.object_session(wr) session = Session.object_session(wr)

6
heat/engine/resources/cloud_watch.py
View File

@ -17,7 +17,6 @@ from heat.common import exception
from heat.engine import watchrule from heat.engine import watchrule
from heat.engine import resource from heat.engine import resource
from heat.engine.properties import Properties from heat.engine.properties import Properties
from heat.db import api as db_api
from heat.openstack.common import log as logging from heat.openstack.common import log as logging
@ -107,8 +106,9 @@ class CloudWatchAlarm(resource.Resource):
def handle_delete(self): def handle_delete(self):
try: try:
db_api.watch_rule_delete(self.context, wr = watchrule.WatchRule.load(
self.physical_resource_name()) self.context, watch_name=self.physical_resource_name())
wr.destroy()
except exception.NotFound: except exception.NotFound:
pass pass

7
heat/engine/watchrule.py
View File

@ -99,6 +99,13 @@ class WatchRule(object):
else: else:
db_api.watch_rule_update(self.context, self.id, wr_values) db_api.watch_rule_update(self.context, self.id, wr_values)
def destroy(self):
'''
Delete the watchrule from the database.
'''
if self.id:
db_api.watch_rule_delete(self.context, self.id)
def do_data_cmp(self, data, threshold): def do_data_cmp(self, data, threshold):
op = self.rule['ComparisonOperator'] op = self.rule['ComparisonOperator']
if op == 'GreaterThanThreshold': if op == 'GreaterThanThreshold':

92
heat/tests/test_engine_service.py
View File

@ -1026,12 +1026,10 @@ class stackServiceTest(HeatTestCase):
self.m.VerifyAll() self.m.VerifyAll()
@stack_context('service_show_watch_test_stack', False) @stack_context('service_show_watch_test_stack', False)
@utils.wr_delete_after
def test_show_watch(self): def test_show_watch(self):
# Insert two dummy watch rules into the DB # Insert two dummy watch rules into the DB
values = {'stack_id': self.stack.id, rule = {u'EvaluationPeriods': u'1',
'state': 'NORMAL',
'name': u'HttpFailureAlarm',
'rule': {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
u'AlarmDescription': u'Restart the WikiDatabase', u'AlarmDescription': u'Restart the WikiDatabase',
u'Namespace': u'system/linux', u'Namespace': u'system/linux',
@ -1039,12 +1037,23 @@ class stackServiceTest(HeatTestCase):
u'ComparisonOperator': u'GreaterThanThreshold', u'ComparisonOperator': u'GreaterThanThreshold',
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'}} u'MetricName': u'ServiceFailure'}
db_ret = db_api.watch_rule_create(self.ctx, values) self.wr = []
self.assertNotEqual(db_ret, None) self.wr.append(watchrule.WatchRule(context=self.ctx,
values['name'] = "AnotherWatch" watch_name='HttpFailureAlarm',
db_ret = db_api.watch_rule_create(self.ctx, values) rule=rule,
self.assertNotEqual(db_ret, None) watch_data=[],
stack_id=self.stack.id,
state='NORMAL'))
self.wr[0].store()
self.wr.append(watchrule.WatchRule(context=self.ctx,
watch_name='AnotherWatch',
rule=rule,
watch_data=[],
stack_id=self.stack.id,
state='NORMAL'))
self.wr[1].store()
# watch_name=None should return both watches # watch_name=None should return both watches
result = self.eng.show_watch(self.ctx, watch_name=None) result = self.eng.show_watch(self.ctx, watch_name=None)
@ -1062,17 +1071,11 @@ class stackServiceTest(HeatTestCase):
for key in engine_api.WATCH_KEYS: for key in engine_api.WATCH_KEYS:
self.assertTrue(key in result[0]) self.assertTrue(key in result[0])
# Cleanup, delete the dummy rules
db_api.watch_rule_delete(self.ctx, "HttpFailureAlarm")
db_api.watch_rule_delete(self.ctx, "AnotherWatch")
@stack_context('service_show_watch_metric_test_stack', False) @stack_context('service_show_watch_metric_test_stack', False)
@utils.wr_delete_after
def test_show_watch_metric(self): def test_show_watch_metric(self):
# Insert dummy watch rule into the DB # Insert dummy watch rule into the DB
values = {'stack_id': self.stack.id, rule = {u'EvaluationPeriods': u'1',
'state': 'NORMAL',
'name': u'HttpFailureAlarm',
'rule': {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
u'AlarmDescription': u'Restart the WikiDatabase', u'AlarmDescription': u'Restart the WikiDatabase',
u'Namespace': u'system/linux', u'Namespace': u'system/linux',
@ -1080,9 +1083,14 @@ class stackServiceTest(HeatTestCase):
u'ComparisonOperator': u'GreaterThanThreshold', u'ComparisonOperator': u'GreaterThanThreshold',
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'}} u'MetricName': u'ServiceFailure'}
db_ret = db_api.watch_rule_create(self.ctx, values) self.wr = watchrule.WatchRule(context=self.ctx,
self.assertNotEqual(db_ret, None) watch_name='HttpFailureAlarm',
rule=rule,
watch_data=[],
stack_id=self.stack.id,
state='NORMAL')
self.wr.store()
# And add a metric datapoint # And add a metric datapoint
watch = db_api.watch_rule_get_by_name(self.ctx, "HttpFailureAlarm") watch = db_api.watch_rule_get_by_name(self.ctx, "HttpFailureAlarm")
@ -1106,20 +1114,15 @@ class stackServiceTest(HeatTestCase):
metric_name=None) metric_name=None)
self.assertEqual(2, len(result)) self.assertEqual(2, len(result))
# Cleanup, delete the dummy rule
db_api.watch_rule_delete(self.ctx, "HttpFailureAlarm")
# Check the response has all keys defined in the engine API # Check the response has all keys defined in the engine API
for key in engine_api.WATCH_DATA_KEYS: for key in engine_api.WATCH_DATA_KEYS:
self.assertTrue(key in result[0]) self.assertTrue(key in result[0])
@stack_context('service_show_watch_state_test_stack') @stack_context('service_show_watch_state_test_stack')
@utils.wr_delete_after
def test_set_watch_state(self): def test_set_watch_state(self):
# Insert dummy watch rule into the DB # Insert dummy watch rule into the DB
values = {'stack_id': self.stack.id, rule = {u'EvaluationPeriods': u'1',
'state': 'NORMAL',
'name': u'OverrideAlarm',
'rule': {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
u'AlarmDescription': u'Restart the WikiDatabase', u'AlarmDescription': u'Restart the WikiDatabase',
u'Namespace': u'system/linux', u'Namespace': u'system/linux',
@ -1127,9 +1130,14 @@ class stackServiceTest(HeatTestCase):
u'ComparisonOperator': u'GreaterThanThreshold', u'ComparisonOperator': u'GreaterThanThreshold',
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'}} u'MetricName': u'ServiceFailure'}
db_ret = db_api.watch_rule_create(self.ctx, values) self.wr = watchrule.WatchRule(context=self.ctx,
self.assertNotEqual(db_ret, None) watch_name='OverrideAlarm',
rule=rule,
watch_data=[],
stack_id=self.stack.id,
state='NORMAL')
self.wr.store()
class DummyAction: class DummyAction:
alarm = "dummyfoo" alarm = "dummyfoo"
@ -1168,16 +1176,12 @@ class stackServiceTest(HeatTestCase):
[DummyAction.alarm]) [DummyAction.alarm])
self.m.VerifyAll() self.m.VerifyAll()
# Cleanup, delete the dummy rule
db_api.watch_rule_delete(self.ctx, "OverrideAlarm")
@stack_context('service_show_watch_state_badstate_test_stack') @stack_context('service_show_watch_state_badstate_test_stack')
@utils.wr_delete_after
def test_set_watch_state_badstate(self): def test_set_watch_state_badstate(self):
# Insert dummy watch rule into the DB # Insert dummy watch rule into the DB
values = {'stack_id': self.stack.id, rule = {u'EvaluationPeriods': u'1',
'state': 'NORMAL',
'name': u'OverrideAlarm2',
'rule': {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
u'AlarmDescription': u'Restart the WikiDatabase', u'AlarmDescription': u'Restart the WikiDatabase',
u'Namespace': u'system/linux', u'Namespace': u'system/linux',
@ -1185,9 +1189,14 @@ class stackServiceTest(HeatTestCase):
u'ComparisonOperator': u'GreaterThanThreshold', u'ComparisonOperator': u'GreaterThanThreshold',
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'}} u'MetricName': u'ServiceFailure'}
db_ret = db_api.watch_rule_create(self.ctx, values) self.wr = watchrule.WatchRule(context=self.ctx,
self.assertNotEqual(db_ret, None) watch_name='OverrideAlarm2',
rule=rule,
watch_data=[],
stack_id=self.stack.id,
state='NORMAL')
self.wr.store()
self.m.StubOutWithMock(watchrule.WatchRule, 'set_watch_state') self.m.StubOutWithMock(watchrule.WatchRule, 'set_watch_state')
for state in ["HGJHGJHG", "1234", "!\*(&%"]: for state in ["HGJHGJHG", "1234", "!\*(&%"]:
@ -1203,9 +1212,6 @@ class stackServiceTest(HeatTestCase):
self.m.VerifyAll() self.m.VerifyAll()
# Cleanup, delete the dummy rule
db_api.watch_rule_delete(self.ctx, "OverrideAlarm2")
def test_set_watch_state_noexist(self): def test_set_watch_state_noexist(self):
state = watchrule.WatchRule.ALARM # State valid state = watchrule.WatchRule.ALARM # State valid

234
heat/tests/test_watch.py
View File

@ -18,6 +18,7 @@ import mox
from heat.common import context from heat.common import context
import heat.db.api as db_api import heat.db.api as db_api
from heat.common import exception
from heat.openstack.common import timeutils from heat.openstack.common import timeutils
from heat.engine import watchrule from heat.engine import watchrule
from heat.engine import parser from heat.engine import parser
@ -97,23 +98,23 @@ class WatchRuleTest(HeatTestCase):
data.append(WatchData(53, now - datetime.timedelta(seconds=150))) data.append(WatchData(53, now - datetime.timedelta(seconds=150)))
# all > 50 -> NORMAL # all > 50 -> NORMAL
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
data.append(WatchData(25, now - datetime.timedelta(seconds=250))) data.append(WatchData(25, now - datetime.timedelta(seconds=250)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'ALARM') self.assertEqual(new_state, 'ALARM')
def test_maximum(self): def test_maximum(self):
@ -130,25 +131,25 @@ class WatchRuleTest(HeatTestCase):
data.append(WatchData(23, now - datetime.timedelta(seconds=150))) data.append(WatchData(23, now - datetime.timedelta(seconds=150)))
# all < 30 -> NORMAL # all < 30 -> NORMAL
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
data.append(WatchData(35, now - datetime.timedelta(seconds=150))) data.append(WatchData(35, now - datetime.timedelta(seconds=150)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'ALARM') self.assertEqual(new_state, 'ALARM')
def test_samplecount(self): def test_samplecount(self):
@ -166,39 +167,39 @@ class WatchRuleTest(HeatTestCase):
data.append(WatchData(1, now - datetime.timedelta(seconds=150))) data.append(WatchData(1, now - datetime.timedelta(seconds=150)))
# only 2 samples -> NORMAL # only 2 samples -> NORMAL
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
# only 3 samples -> ALARM # only 3 samples -> ALARM
data.append(WatchData(1, now - datetime.timedelta(seconds=200))) data.append(WatchData(1, now - datetime.timedelta(seconds=200)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'ALARM') self.assertEqual(new_state, 'ALARM')
# only 3 samples (one old) -> NORMAL # only 3 samples (one old) -> NORMAL
data.pop(0) data.pop(0)
data.append(WatchData(1, now - datetime.timedelta(seconds=400))) data.append(WatchData(1, now - datetime.timedelta(seconds=400)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
def test_sum(self): def test_sum(self):
@ -215,26 +216,26 @@ class WatchRuleTest(HeatTestCase):
data.append(WatchData(23, now - datetime.timedelta(seconds=150))) data.append(WatchData(23, now - datetime.timedelta(seconds=150)))
# all < 40 -> NORMAL # all < 40 -> NORMAL
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
# sum > 100 -> ALARM # sum > 100 -> ALARM
data.append(WatchData(85, now - datetime.timedelta(seconds=150))) data.append(WatchData(85, now - datetime.timedelta(seconds=150)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'ALARM') self.assertEqual(new_state, 'ALARM')
def test_ave(self): def test_ave(self):
@ -250,33 +251,31 @@ class WatchRuleTest(HeatTestCase):
data = [WatchData(117, now - datetime.timedelta(seconds=100))] data = [WatchData(117, now - datetime.timedelta(seconds=100))]
data.append(WatchData(23, now - datetime.timedelta(seconds=150))) data.append(WatchData(23, now - datetime.timedelta(seconds=150)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'NORMAL') self.assertEqual(new_state, 'NORMAL')
data.append(WatchData(195, now - datetime.timedelta(seconds=250))) data.append(WatchData(195, now - datetime.timedelta(seconds=250)))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=data, watch_data=data,
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
watcher.now = now self.wr.now = now
new_state = watcher.get_alarm_state() new_state = self.wr.get_alarm_state()
self.assertEqual(new_state, 'ALARM') self.assertEqual(new_state, 'ALARM')
@utils.wr_delete_after
def test_load(self): def test_load(self):
# Insert two dummy watch rules into the DB # Insert two dummy watch rules into the DB
values = {'stack_id': self.stack_id, rule = {u'EvaluationPeriods': u'1',
'state': 'NORMAL',
'name': u'HttpFailureAlarm',
'rule': {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
u'AlarmDescription': u'Restart the WikiDatabase', u'AlarmDescription': u'Restart the WikiDatabase',
u'Namespace': u'system/linux', u'Namespace': u'system/linux',
@ -284,12 +283,23 @@ class WatchRuleTest(HeatTestCase):
u'ComparisonOperator': u'GreaterThanThreshold', u'ComparisonOperator': u'GreaterThanThreshold',
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'}} u'MetricName': u'ServiceFailure'}
db_ret = db_api.watch_rule_create(self.ctx, values) self.wr = []
self.assertNotEqual(db_ret, None) self.wr.append(watchrule.WatchRule(context=self.ctx,
values['name'] = 'AnotherWatch' watch_name='HttpFailureAlarm',
db_ret = db_api.watch_rule_create(self.ctx, values) rule=rule,
self.assertNotEqual(db_ret, None) watch_data=[],
stack_id=self.stack_id,
state='NORMAL'))
self.wr[0].store()
self.wr.append(watchrule.WatchRule(context=self.ctx,
watch_name='AnotherWatch',
rule=rule,
watch_data=[],
stack_id=self.stack_id,
state='NORMAL'))
self.wr[1].store()
# Then use WatchRule.load() to retrieve each by name # Then use WatchRule.load() to retrieve each by name
# and check that the object properties match the data above # and check that the object properties match the data above
@ -297,15 +307,12 @@ class WatchRuleTest(HeatTestCase):
wr = watchrule.WatchRule.load(self.ctx, wn) wr = watchrule.WatchRule.load(self.ctx, wn)
self.assertEqual(type(wr), watchrule.WatchRule) self.assertEqual(type(wr), watchrule.WatchRule)
self.assertEqual(wr.name, wn) self.assertEqual(wr.name, wn)
self.assertEqual(wr.state, values['state']) self.assertEqual(wr.state, 'NORMAL')
self.assertEqual(wr.rule, values['rule']) self.assertEqual(wr.rule, rule)
self.assertEqual(wr.timeperiod, datetime.timedelta( self.assertEqual(wr.timeperiod, datetime.timedelta(
seconds=int(values['rule']['Period']))) seconds=int(rule['Period'])))
# Cleanup
db_api.watch_rule_delete(self.ctx, 'HttpFailureAlarm')
db_api.watch_rule_delete(self.ctx, 'AnotherWatch')
@utils.wr_delete_after
def test_store(self): def test_store(self):
rule = {u'EvaluationPeriods': u'1', rule = {u'EvaluationPeriods': u'1',
u'AlarmActions': [u'WebServerRestartPolicy'], u'AlarmActions': [u'WebServerRestartPolicy'],
@ -316,9 +323,9 @@ class WatchRuleTest(HeatTestCase):
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'ServiceFailure'} u'MetricName': u'ServiceFailure'}
wr = watchrule.WatchRule(context=self.ctx, watch_name='storetest', self.wr = watchrule.WatchRule(context=self.ctx, watch_name='storetest',
stack_id=self.stack_id, rule=rule) stack_id=self.stack_id, rule=rule)
wr.store() self.wr.store()
dbwr = db_api.watch_rule_get_by_name(self.ctx, 'storetest') dbwr = db_api.watch_rule_get_by_name(self.ctx, 'storetest')
self.assertNotEqual(dbwr, None) self.assertNotEqual(dbwr, None)
@ -326,9 +333,7 @@ class WatchRuleTest(HeatTestCase):
self.assertEqual(dbwr.state, watchrule.WatchRule.NODATA) self.assertEqual(dbwr.state, watchrule.WatchRule.NODATA)
self.assertEqual(dbwr.rule, rule) self.assertEqual(dbwr.rule, rule)
# Cleanup @utils.wr_delete_after
db_api.watch_rule_delete(self.ctx, 'storetest')
def test_evaluate(self): def test_evaluate(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -345,47 +350,48 @@ class WatchRuleTest(HeatTestCase):
# It's not time to evaluate, so should stay NODATA # It's not time to evaluate, so should stay NODATA
last = now - datetime.timedelta(seconds=299) last = now - datetime.timedelta(seconds=299)
data = WatchData(25, now - datetime.timedelta(seconds=150)) data = WatchData(25, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NODATA') self.assertEqual(self.wr.state, 'NODATA')
self.assertEqual(actions, []) self.assertEqual(actions, [])
# now - last == Period, so should set NORMAL # now - last == Period, so should set NORMAL
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(25, now - datetime.timedelta(seconds=150)) data = WatchData(25, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NORMAL') self.assertEqual(self.wr.state, 'NORMAL')
self.assertEqual(watcher.last_evaluated, now) self.assertEqual(self.wr.last_evaluated, now)
self.assertEqual(actions, []) self.assertEqual(actions, [])
# Now data breaches Threshold, so should set ALARM # Now data breaches Threshold, so should set ALARM
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(35, now - datetime.timedelta(seconds=150)) data = WatchData(35, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'ALARM') self.assertEqual(self.wr.state, 'ALARM')
self.assertEqual(watcher.last_evaluated, now) self.assertEqual(self.wr.last_evaluated, now)
self.assertEqual(actions, []) self.assertEqual(actions, [])
@utils.wr_delete_after
def test_rule_actions_alarm_normal(self): def test_rule_actions_alarm_normal(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -401,18 +407,19 @@ class WatchRuleTest(HeatTestCase):
# Set data so rule evaluates to NORMAL state # Set data so rule evaluates to NORMAL state
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(25, now - datetime.timedelta(seconds=150)) data = WatchData(25, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NORMAL') self.assertEqual(self.wr.state, 'NORMAL')
self.assertEqual(actions, []) self.assertEqual(actions, [])
self.m.VerifyAll() self.m.VerifyAll()
@utils.wr_delete_after
def test_rule_actions_alarm_alarm(self): def test_rule_actions_alarm_alarm(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -428,25 +435,26 @@ class WatchRuleTest(HeatTestCase):
# Set data so rule evaluates to ALARM state # Set data so rule evaluates to ALARM state
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(35, now - datetime.timedelta(seconds=150)) data = WatchData(35, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'ALARM') self.assertEqual(self.wr.state, 'ALARM')
self.assertEqual(actions, ['DummyAction']) self.assertEqual(actions, ['DummyAction'])
# re-set last_evaluated so the rule will be evaluated again. # re-set last_evaluated so the rule will be evaluated again.
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
watcher.last_evaluated = last self.wr.last_evaluated = last
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'ALARM') self.assertEqual(self.wr.state, 'ALARM')
self.assertEqual(actions, ['DummyAction']) self.assertEqual(actions, ['DummyAction'])
self.m.VerifyAll() self.m.VerifyAll()
@utils.wr_delete_after
def test_rule_actions_alarm_two_actions(self): def test_rule_actions_alarm_two_actions(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -462,18 +470,19 @@ class WatchRuleTest(HeatTestCase):
# Set data so rule evaluates to ALARM state # Set data so rule evaluates to ALARM state
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(35, now - datetime.timedelta(seconds=150)) data = WatchData(35, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'ALARM') self.assertEqual(self.wr.state, 'ALARM')
self.assertEqual(actions, ['DummyAction', 'DummyAction']) self.assertEqual(actions, ['DummyAction', 'DummyAction'])
self.m.VerifyAll() self.m.VerifyAll()
@utils.wr_delete_after
def test_rule_actions_ok_alarm(self): def test_rule_actions_ok_alarm(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -488,15 +497,15 @@ class WatchRuleTest(HeatTestCase):
# On creation the rule evaluates to NODATA state # On creation the rule evaluates to NODATA state
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[], watch_data=[],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NODATA') self.assertEqual(self.wr.state, 'NODATA')
self.assertEqual(actions, []) self.assertEqual(actions, [])
# Move time forward and add data below threshold so we transition from # Move time forward and add data below threshold so we transition from
@ -507,13 +516,14 @@ class WatchRuleTest(HeatTestCase):
self._action_set_stubs(now) self._action_set_stubs(now)
data = WatchData(25, now - datetime.timedelta(seconds=150)) data = WatchData(25, now - datetime.timedelta(seconds=150))
watcher.watch_data = [data] self.wr.watch_data = [data]
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NORMAL') self.assertEqual(self.wr.state, 'NORMAL')
self.assertEqual(actions, ['DummyAction']) self.assertEqual(actions, ['DummyAction'])
self.m.VerifyAll() self.m.VerifyAll()
@utils.wr_delete_after
def test_rule_actions_nodata(self): def test_rule_actions_nodata(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric', 'MetricName': 'test_metric',
@ -529,15 +539,15 @@ class WatchRuleTest(HeatTestCase):
# Set data so rule evaluates to ALARM state # Set data so rule evaluates to ALARM state
last = now - datetime.timedelta(seconds=300) last = now - datetime.timedelta(seconds=300)
data = WatchData(35, now - datetime.timedelta(seconds=150)) data = WatchData(35, now - datetime.timedelta(seconds=150))
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[data], watch_data=[data],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'ALARM') self.assertEqual(self.wr.state, 'ALARM')
self.assertEqual(actions, []) self.assertEqual(actions, [])
# Move time forward and don't add data so we transition from # Move time forward and don't add data so we transition from
@ -547,11 +557,12 @@ class WatchRuleTest(HeatTestCase):
self.m.UnsetStubs() self.m.UnsetStubs()
self._action_set_stubs(now) self._action_set_stubs(now)
actions = watcher.evaluate() actions = self.wr.evaluate()
self.assertEqual(watcher.state, 'NODATA') self.assertEqual(self.wr.state, 'NODATA')
self.assertEqual(actions, ['DummyAction']) self.assertEqual(actions, ['DummyAction'])
self.m.VerifyAll() self.m.VerifyAll()
@utils.wr_delete_after
def test_create_watch_data(self): def test_create_watch_data(self):
rule = {u'EvaluationPeriods': u'1', rule = {u'EvaluationPeriods': u'1',
u'AlarmDescription': u'test alarm', u'AlarmDescription': u'test alarm',
@ -560,16 +571,16 @@ class WatchRuleTest(HeatTestCase):
u'Statistic': u'SampleCount', u'Statistic': u'SampleCount',
u'Threshold': u'2', u'Threshold': u'2',
u'MetricName': u'CreateDataMetric'} u'MetricName': u'CreateDataMetric'}
wr = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name='create_data_test', watch_name='create_data_test',
stack_id=self.stack_id, rule=rule) stack_id=self.stack_id, rule=rule)
wr.store() self.wr.store()
data = {u'CreateDataMetric': {"Unit": "Counter", data = {u'CreateDataMetric': {"Unit": "Counter",
"Value": "1", "Value": "1",
"Dimensions": []}} "Dimensions": []}}
wr.create_watch_data(data) self.wr.create_watch_data(data)
dbwr = db_api.watch_rule_get_by_name(self.ctx, 'create_data_test') dbwr = db_api.watch_rule_get_by_name(self.ctx, 'create_data_test')
self.assertEqual(dbwr.watch_data[0].data, data) self.assertEqual(dbwr.watch_data[0].data, data)
@ -581,8 +592,33 @@ class WatchRuleTest(HeatTestCase):
# correctly get a list of all datapoints where watch_rule_id == # correctly get a list of all datapoints where watch_rule_id ==
# watch_rule.id, so leave it as a single-datapoint test for now. # watch_rule.id, so leave it as a single-datapoint test for now.
# Cleanup def test_destroy(self):
db_api.watch_rule_delete(self.ctx, 'create_data_test') rule = {'EvaluationPeriods': '1',
'MetricName': 'test_metric',
'AlarmActions': ['DummyAction'],
'Period': '300',
'Statistic': 'Maximum',
'ComparisonOperator': 'GreaterThanOrEqualToThreshold',
'Threshold': '30'}
last = timeutils.utcnow()
self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch_destroy",
rule=rule,
watch_data=[],
stack_id=self.stack_id,
last_evaluated=last)
self.wr.store()
check = watchrule.WatchRule.load(context=self.ctx,
watch_name="testwatch_destroy")
self.assertTrue(isinstance(check, watchrule.WatchRule))
self.wr.destroy()
self.assertRaises(exception.WatchRuleNotFound,
watchrule.WatchRule.load, context=self.ctx,
watch_name="testwatch_destroy")
def test_set_watch_state(self): def test_set_watch_state(self):
rule = {'EvaluationPeriods': '1', rule = {'EvaluationPeriods': '1',
@ -598,20 +634,20 @@ class WatchRuleTest(HeatTestCase):
# Set data so rule evaluates to ALARM state # Set data so rule evaluates to ALARM state
last = now - datetime.timedelta(seconds=200) last = now - datetime.timedelta(seconds=200)
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[], watch_data=[],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
actions = watcher.set_watch_state(watchrule.WatchRule.NODATA) actions = self.wr.set_watch_state(watchrule.WatchRule.NODATA)
self.assertEqual(actions, []) self.assertEqual(actions, [])
actions = watcher.set_watch_state(watchrule.WatchRule.NORMAL) actions = self.wr.set_watch_state(watchrule.WatchRule.NORMAL)
self.assertEqual(actions, []) self.assertEqual(actions, [])
actions = watcher.set_watch_state(watchrule.WatchRule.ALARM) actions = self.wr.set_watch_state(watchrule.WatchRule.ALARM)
self.assertEqual(actions, ['DummyAction']) self.assertEqual(actions, ['DummyAction'])
self.m.VerifyAll() self.m.VerifyAll()
@ -627,13 +663,13 @@ class WatchRuleTest(HeatTestCase):
now = timeutils.utcnow() now = timeutils.utcnow()
last = now - datetime.timedelta(seconds=200) last = now - datetime.timedelta(seconds=200)
watcher = watchrule.WatchRule(context=self.ctx, self.wr = watchrule.WatchRule(context=self.ctx,
watch_name="testwatch", watch_name="testwatch",
rule=rule, rule=rule,
watch_data=[], watch_data=[],
stack_id=self.stack_id, stack_id=self.stack_id,
last_evaluated=last) last_evaluated=last)
self.assertRaises(ValueError, watcher.set_watch_state, None) self.assertRaises(ValueError, self.wr.set_watch_state, None)
self.assertRaises(ValueError, watcher.set_watch_state, "BADSTATE") self.assertRaises(ValueError, self.wr.set_watch_state, "BADSTATE")

39
heat/tests/utils.py
View File

@ -16,6 +16,7 @@ import sys
import functools import functools
from heat.common import context from heat.common import context
from heat.common import exception
from heat.engine import environment from heat.engine import environment
from heat.engine import parser from heat.engine import parser
@ -49,6 +50,44 @@ def stack_delete_after(test_fn):
return wrapped_test return wrapped_test
def wr_delete_after(test_fn):
"""
Decorator which calls test class self.wr.destroy()
to ensure tests clean up their watchrule regardless of test success/failure
Used by tests which create watchrule objects directly to cleanup correctly
self.wr can be either a single watchrule, or a list of several watchrules
"""
@functools.wraps(test_fn)
def wrapped_test(test_case, *args, **kwargs):
def delete_wrs():
wr = getattr(test_case, 'wr', None)
try:
for w in wr:
delete_wr(w)
except TypeError:
delete_wr(wr)
def delete_wr(w):
if w.id is not None:
try:
w.destroy()
except exception.NotFound:
pass
try:
test_fn(test_case, *args, **kwargs)
except:
exc_class, exc_val, exc_tb = sys.exc_info()
try:
delete_wrs()
finally:
raise exc_class, exc_val, exc_tb
else:
delete_wrs()
return wrapped_test
def setup_dummy_db(): def setup_dummy_db():
migration.db_sync() migration.db_sync()
engine = get_engine() engine = get_engine()