Merge "Fix arguments for OS::Mistral::CronTrigger create" into stable/ocata
This commit is contained in:
commit
fe6ae385bc
@ -73,7 +73,7 @@ class CronTrigger(resource.Resource):
|
|||||||
schema={
|
schema={
|
||||||
WORKFLOW_NAME: properties.Schema(
|
WORKFLOW_NAME: properties.Schema(
|
||||||
properties.Schema.STRING,
|
properties.Schema.STRING,
|
||||||
_('Name of the workflow.'),
|
_('Name or ID of the workflow.'),
|
||||||
required=True,
|
required=True,
|
||||||
constraints=[
|
constraints=[
|
||||||
constraints.CustomConstraint('mistral.workflow')
|
constraints.CustomConstraint('mistral.workflow')
|
||||||
@ -122,16 +122,18 @@ class CronTrigger(resource.Resource):
|
|||||||
|
|
||||||
def handle_create(self):
|
def handle_create(self):
|
||||||
workflow = self.properties.get(self.WORKFLOW)
|
workflow = self.properties.get(self.WORKFLOW)
|
||||||
|
name = self._cron_trigger_name()
|
||||||
|
identifier = workflow[self.WORKFLOW_NAME]
|
||||||
|
|
||||||
args = {
|
args = {
|
||||||
'name': self._cron_trigger_name(),
|
|
||||||
'pattern': self.properties.get(self.PATTERN),
|
'pattern': self.properties.get(self.PATTERN),
|
||||||
'workflow_name': workflow.get(self.WORKFLOW_NAME),
|
|
||||||
'workflow_input': workflow.get(self.WORKFLOW_INPUT),
|
'workflow_input': workflow.get(self.WORKFLOW_INPUT),
|
||||||
'first_time': self.properties.get(self.FIRST_TIME),
|
'first_time': self.properties.get(self.FIRST_TIME),
|
||||||
'count': self.properties.get(self.COUNT)
|
'count': self.properties.get(self.COUNT)
|
||||||
}
|
}
|
||||||
|
|
||||||
cron_trigger = self.client().cron_triggers.create(**args)
|
cron_trigger = self.client().cron_triggers.create(name, identifier,
|
||||||
|
**args)
|
||||||
self.resource_id_set(cron_trigger.name)
|
self.resource_id_set(cron_trigger.name)
|
||||||
|
|
||||||
def _resolve_attribute(self, name):
|
def _resolve_attribute(self, name):
|
||||||
|
@ -76,12 +76,12 @@ class MistralCronTriggerTest(common.HeatTestCase):
|
|||||||
ct = self._create_resource('trigger', self.rsrc_defn, self.stack)
|
ct = self._create_resource('trigger', self.rsrc_defn, self.stack)
|
||||||
expected_state = (ct.CREATE, ct.COMPLETE)
|
expected_state = (ct.CREATE, ct.COMPLETE)
|
||||||
self.assertEqual(expected_state, ct.state)
|
self.assertEqual(expected_state, ct.state)
|
||||||
args = self.client.cron_triggers.create.call_args[1]
|
args, kwargs = self.client.cron_triggers.create.call_args
|
||||||
self.assertEqual('* * 0 * *', args['pattern'])
|
self.assertEqual('* * 0 * *', kwargs['pattern'])
|
||||||
self.assertEqual('get_first_glance_image', args['workflow_name'])
|
self.assertEqual('get_first_glance_image', args[1])
|
||||||
self.assertEqual({}, args['workflow_input'])
|
self.assertEqual({}, kwargs['workflow_input'])
|
||||||
self.assertEqual('2015-04-08 06:20', args['first_time'])
|
self.assertEqual('2015-04-08 06:20', kwargs['first_time'])
|
||||||
self.assertEqual(3, args['count'])
|
self.assertEqual(3, kwargs['count'])
|
||||||
self.assertEqual('my_cron_trigger', ct.resource_id)
|
self.assertEqual('my_cron_trigger', ct.resource_id)
|
||||||
|
|
||||||
def test_attributes(self):
|
def test_attributes(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user