From 8b3d821cd1fcb46feb1906951706160932e464c3 Mon Sep 17 00:00:00 2001 From: liathartal Date: Tue, 12 Apr 2016 07:46:26 +0000 Subject: [PATCH] template syntax validation - adding description Change-Id: Ia239552275dcb401eccadace98c5f6ce9d79a2dd --- vitrage/evaluator/template_fields.py | 1 + vitrage/evaluator/template_syntax_validator.py | 3 ++- vitrage/tests/resources/templates/general/basic.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vitrage/evaluator/template_fields.py b/vitrage/evaluator/template_fields.py index 4d10ac524..01505b287 100644 --- a/vitrage/evaluator/template_fields.py +++ b/vitrage/evaluator/template_fields.py @@ -26,6 +26,7 @@ class TemplateFields(object): ACTION_TYPE = 'action_type' CATEGORY = 'category' CONDITION = 'condition' + DESCRIPTION = 'description' ENTITIES = 'entities' ENTITY = 'entity' ID = 'id' diff --git a/vitrage/evaluator/template_syntax_validator.py b/vitrage/evaluator/template_syntax_validator.py index dcbcd9bc4..3b8d44c4b 100644 --- a/vitrage/evaluator/template_syntax_validator.py +++ b/vitrage/evaluator/template_syntax_validator.py @@ -64,7 +64,8 @@ def validate_template_sections(template_conf): def validate_metadata_section(metadata): schema = Schema({ - Required(TemplateFields.ID): Any(str, six.text_type) + Required(TemplateFields.ID): Any(str, six.text_type), + TemplateFields.DESCRIPTION: Any(str, six.text_type) }) error_msg = SCHEMA_CONTENT_ERROR % ( diff --git a/vitrage/tests/resources/templates/general/basic.yaml b/vitrage/tests/resources/templates/general/basic.yaml index 3bcf2c6ad..db6b9181f 100644 --- a/vitrage/tests/resources/templates/general/basic.yaml +++ b/vitrage/tests/resources/templates/general/basic.yaml @@ -1,5 +1,6 @@ metadata: id: basic_template + description: basic template for general tests definitions: entities: - entity: