Merge "Fix providing 'is_system' property in /actions"

2014-10-01 02:09:31 +00:00 · 2014-10-01 02:09:31 +00:00 · c71cdc395c
commit c71cdc395c
parent 919547512d c7ae19e6fa
2 changed files with 2 additions and 0 deletions
--- a/mistral/api/controllers/v2/action.py
+++ b/mistral/api/controllers/v2/action.py
@ -34,6 +34,7 @@ class Action(resource.Resource):

    id = wtypes.text
    name = wtypes.text
+    is_system = bool

    description = wtypes.text
    tags = [wtypes.text]
--- a/mistral/tests/unit/api/v2/test_actions.py
+++ b/mistral/tests/unit/api/v2/test_actions.py
@ -48,6 +48,7 @@ std.echo:
 ACTION = {
    'id': '123',
    'name': 'my_action',
+    'is_system': False,
    'description': 'My super cool action.',
    'tags': ['test', 'v2'],
    'definition': ACTION_DEFINITION