From 6cae574c15059b6ca3e66256817837f76c9ab202 Mon Sep 17 00:00:00 2001 From: Oleksii Chuprykov Date: Tue, 15 Mar 2016 18:59:48 +0200 Subject: [PATCH] Add validation for mistral cron trigger We need to specify pattern or first_time property (or both). Change-Id: I497f1165c2bcc954e164f448b912f44ca1b79471 --- .../openstack/mistral/cron_trigger.py | 8 ++++ .../openstack/mistral/test_cron_trigger.py | 44 ++++++++++++++++--- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/heat/engine/resources/openstack/mistral/cron_trigger.py b/heat/engine/resources/openstack/mistral/cron_trigger.py index e6eece00dd..9110762cf9 100644 --- a/heat/engine/resources/openstack/mistral/cron_trigger.py +++ b/heat/engine/resources/openstack/mistral/cron_trigger.py @@ -13,6 +13,7 @@ from oslo_log import log as logging +from heat.common import exception from heat.common.i18n import _ from heat.common.i18n import _LW from heat.engine import attributes @@ -105,6 +106,13 @@ class CronTrigger(resource.Resource): entity = 'cron_triggers' + def validate(self): + super(CronTrigger, self).validate() + if not (self.properties[self.PATTERN] + or self.properties[self.FIRST_TIME]): + raise exception.PropertyUnspecifiedError(self.PATTERN, + self.FIRST_TIME) + def _cron_trigger_name(self): return self.properties.get(self.NAME) or self.physical_resource_name() diff --git a/heat/tests/openstack/mistral/test_cron_trigger.py b/heat/tests/openstack/mistral/test_cron_trigger.py index 044754684e..8c4f45af86 100644 --- a/heat/tests/openstack/mistral/test_cron_trigger.py +++ b/heat/tests/openstack/mistral/test_cron_trigger.py @@ -13,6 +13,7 @@ import mock +from heat.common import exception from heat.common import template_format from heat.engine import resources from heat.engine.resources.openstack.mistral import cron_trigger @@ -68,6 +69,12 @@ class MistralCronTriggerTest(common.HeatTestCase): self.client.cron_triggers.get.return_value = FakeCronTrigger( 'my_cron_trigger') scheduler.TaskRunner(ct.create)() + return ct + + def test_create(self): + ct = self._create_resource('trigger', self.rsrc_defn, self.stack) + expected_state = (ct.CREATE, ct.COMPLETE) + self.assertEqual(expected_state, ct.state) args = self.client.cron_triggers.create.call_args[1] self.assertEqual('* * 0 * *', args['pattern']) self.assertEqual('get_first_glance_image', args['workflow_name']) @@ -75,12 +82,6 @@ class MistralCronTriggerTest(common.HeatTestCase): self.assertEqual('2015-04-08 06:20', args['first_time']) self.assertEqual(3, args['count']) self.assertEqual('my_cron_trigger', ct.resource_id) - return ct - - def test_create(self): - ct = self._create_resource('trigger', self.rsrc_defn, self.stack) - expected_state = (ct.CREATE, ct.COMPLETE) - self.assertEqual(expected_state, ct.state) def test_attributes(self): ct = self._create_resource('trigger', self.rsrc_defn, self.stack) @@ -88,3 +89,34 @@ class MistralCronTriggerTest(common.HeatTestCase): ct.FnGetAtt('next_execution_time')) self.assertEqual(3, ct.FnGetAtt('remaining_executions')) self.assertEqual({'trigger': 'info'}, ct.FnGetAtt('show')) + + def test_validate_fail(self): + t = template_format.parse(stack_template) + del t['resources']['cron_trigger']['properties']['first_time'] + del t['resources']['cron_trigger']['properties']['pattern'] + stack = utils.parse_stack(t) + resource_defns = stack.t.resource_definitions(stack) + self.rsrc_defn = resource_defns['cron_trigger'] + ct = self._create_resource('trigger', self.rsrc_defn, self.stack) + msg = ("At least one of the following properties must be specified: " + "pattern, first_time") + self.assertRaisesRegexp(exception.PropertyUnspecifiedError, msg, + ct.validate) + + def test_validate_ok_without_first_time(self): + t = template_format.parse(stack_template) + del t['resources']['cron_trigger']['properties']['first_time'] + stack = utils.parse_stack(t) + resource_defns = stack.t.resource_definitions(stack) + self.rsrc_defn = resource_defns['cron_trigger'] + ct = self._create_resource('trigger', self.rsrc_defn, self.stack) + ct.validate() + + def test_validate_ok_without_pattern(self): + t = template_format.parse(stack_template) + del t['resources']['cron_trigger']['properties']['pattern'] + stack = utils.parse_stack(t) + resource_defns = stack.t.resource_definitions(stack) + self.rsrc_defn = resource_defns['cron_trigger'] + ct = self._create_resource('trigger', self.rsrc_defn, self.stack) + ct.validate()