From e11d1815d8ac63ff7b145f326d0f2261d894c9a5 Mon Sep 17 00:00:00 2001 From: liathartal Date: Wed, 15 Jun 2016 18:18:14 +0000 Subject: [PATCH] template list - change template class name to template_data Change-Id: I97ea69a72cc0f5135af41e8b131ed1ca7466c187 --- doc/source/scenario-evaluator.rst | 2 +- doc/source/vitrage-template-format.rst | 12 ++++++------ vitrage/evaluator/scenario_repository.py | 4 ++-- vitrage/evaluator/template_data.py | 2 +- vitrage/evaluator/template_fields.py | 2 +- .../template_validation/template_syntax_validator.py | 2 +- .../consistency/deduced_alarm_on_instance.yaml | 2 +- .../resources/templates/evaluator/causal_basic.yaml | 2 +- .../resources/templates/evaluator/deduced_alarm.yaml | 2 +- .../resources/templates/evaluator/deduced_state.yaml | 2 +- .../templates/evaluator/deduced_state_2.yaml | 2 +- vitrage/tests/resources/templates/general/basic.yaml | 2 +- ...ost_high_cpu_load_to_instance_cpu_suboptimal.yaml | 2 +- .../unit/evaluator/test_template_syntax_validator.py | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/source/scenario-evaluator.rst b/doc/source/scenario-evaluator.rst index 8e39955f5..0e20762bf 100644 --- a/doc/source/scenario-evaluator.rst +++ b/doc/source/scenario-evaluator.rst @@ -30,7 +30,7 @@ Evaluator Design |Loading | load | | | | | +-----v-------------+ +---------------+ +---------------+ | - | | Template | | | | | | + | | Template Data | | | | | | | | |process | Template | add | Scenario | | | |(Python Dictionary)+--------> Object +-------> Repo | | | | | | | | | | diff --git a/doc/source/vitrage-template-format.rst b/doc/source/vitrage-template-format.rst index e6a7269fd..f3f1f2e18 100644 --- a/doc/source/vitrage-template-format.rst +++ b/doc/source/vitrage-template-format.rst @@ -17,7 +17,7 @@ The template is written in YAML language, with the following structure. :: metadata: - id: + name: description: definitions: entities: @@ -35,7 +35,7 @@ The template is written in YAML language, with the following structure. The template is divided into three main sections: -- *metadata:* Contains the template identifier, and brief description of what the template does (optional) +- *metadata:* Contains the template name, and brief description of what the template does (optional) - *definitions:* This section contains the atomic definitions referenced later on, for entities and relationships - *entities –* describes the resources and alarms which are relevant to the template scenario (conceptually, corresponds to a vertex in the entity graph) - *relationships –* the relationships between the entities (conceptually, corresponds to an edge in the entity graph) @@ -84,7 +84,7 @@ The following template demonstrates :: metadata: - id: host_high_mem_load_to_instance_mem_suboptimal + name: host_high_mem_load_to_instance_mem_suboptimal description: when there is high memory on the host, show implications on the instances definitions: entities: @@ -193,7 +193,7 @@ case-insensitive. :: metadata: - id: deduced_alarm_for_all_host_in_error + name: deduced_alarm_for_all_host_in_error description: raise deduced alarm for all hosts in error definitions: entities: @@ -222,7 +222,7 @@ an alarm on the hosting zone or an alarm on the hosting host. :: metadata: - id: deduced_alarm_two_possibile_triggers + name: deduced_alarm_two_possibile_triggers description: deduced alarm using or in condition definitions: entities: @@ -337,7 +337,7 @@ E2 both are instances like this: :: metadata: - id: two_similar_instances + name: two_similar_instances definitions: entities: - entity: diff --git a/vitrage/evaluator/scenario_repository.py b/vitrage/evaluator/scenario_repository.py index d4f64110e..2b9755c55 100644 --- a/vitrage/evaluator/scenario_repository.py +++ b/vitrage/evaluator/scenario_repository.py @@ -77,8 +77,8 @@ class ScenarioRepository(object): else: metadata = template_def.get(TemplateFields.METADATA, None) if metadata: - template_id = metadata.get(TemplateFields.ID, None) - LOG.info('Unable to load template: %s' % template_id) + template_name = metadata.get(TemplateFields.NAME, None) + LOG.info('Unable to load template: %s' % template_name) else: LOG.info('Unable to load template with invalid metadata') diff --git a/vitrage/evaluator/template_data.py b/vitrage/evaluator/template_data.py index bd62dadf7..3c5099e2d 100644 --- a/vitrage/evaluator/template_data.py +++ b/vitrage/evaluator/template_data.py @@ -42,7 +42,7 @@ class TemplateData(object): def __init__(self, template_def): - self.name = template_def[TFields.METADATA][TFields.ID] + self.name = template_def[TFields.METADATA][TFields.NAME] defs = template_def[TFields.DEFINITIONS] self.entities = self._build_entities(defs[TFields.ENTITIES]) diff --git a/vitrage/evaluator/template_fields.py b/vitrage/evaluator/template_fields.py index 01505b287..8e326f349 100644 --- a/vitrage/evaluator/template_fields.py +++ b/vitrage/evaluator/template_fields.py @@ -29,7 +29,7 @@ class TemplateFields(object): DESCRIPTION = 'description' ENTITIES = 'entities' ENTITY = 'entity' - ID = 'id' + NAME = 'name' PROPERTIES = 'properties' RELATIONSHIPS = 'relationships' RELATIONSHIP = 'relationship' diff --git a/vitrage/evaluator/template_validation/template_syntax_validator.py b/vitrage/evaluator/template_validation/template_syntax_validator.py index 89e420993..07b88aa06 100644 --- a/vitrage/evaluator/template_validation/template_syntax_validator.py +++ b/vitrage/evaluator/template_validation/template_syntax_validator.py @@ -70,7 +70,7 @@ def validate_metadata_section(metadata): any_str = Any(str, six.text_type) schema = Schema({ - Required(TemplateFields.ID, msg=60): any_str, + Required(TemplateFields.NAME, msg=60): any_str, TemplateFields.DESCRIPTION: any_str }) return _validate_dict_schema(schema, metadata) diff --git a/vitrage/tests/resources/templates/consistency/deduced_alarm_on_instance.yaml b/vitrage/tests/resources/templates/consistency/deduced_alarm_on_instance.yaml index 6090bfba1..a83074081 100644 --- a/vitrage/tests/resources/templates/consistency/deduced_alarm_on_instance.yaml +++ b/vitrage/tests/resources/templates/consistency/deduced_alarm_on_instance.yaml @@ -1,5 +1,5 @@ metadata: - id: deduced_alarm_on_instance + name: deduced_alarm_on_instance definitions: entities: - entity: diff --git a/vitrage/tests/resources/templates/evaluator/causal_basic.yaml b/vitrage/tests/resources/templates/evaluator/causal_basic.yaml index c615bc462..b23964d41 100644 --- a/vitrage/tests/resources/templates/evaluator/causal_basic.yaml +++ b/vitrage/tests/resources/templates/evaluator/causal_basic.yaml @@ -1,5 +1,5 @@ metadata: - id: basic_causal_links + name: basic_causal_links definitions: entities: - entity: diff --git a/vitrage/tests/resources/templates/evaluator/deduced_alarm.yaml b/vitrage/tests/resources/templates/evaluator/deduced_alarm.yaml index 2d591cd25..389bd3d45 100644 --- a/vitrage/tests/resources/templates/evaluator/deduced_alarm.yaml +++ b/vitrage/tests/resources/templates/evaluator/deduced_alarm.yaml @@ -1,5 +1,5 @@ metadata: - id: deduced_alarm_for_host_alarms + name: deduced_alarm_for_host_alarms definitions: entities: - entity: diff --git a/vitrage/tests/resources/templates/evaluator/deduced_state.yaml b/vitrage/tests/resources/templates/evaluator/deduced_state.yaml index 49e62b811..85e9e1253 100644 --- a/vitrage/tests/resources/templates/evaluator/deduced_state.yaml +++ b/vitrage/tests/resources/templates/evaluator/deduced_state.yaml @@ -1,5 +1,5 @@ metadata: - id: deduced_state_for_host_alarms + name: deduced_state_for_host_alarms definitions: entities: - entity: diff --git a/vitrage/tests/resources/templates/evaluator/deduced_state_2.yaml b/vitrage/tests/resources/templates/evaluator/deduced_state_2.yaml index 0d3652e36..9efb493bd 100644 --- a/vitrage/tests/resources/templates/evaluator/deduced_state_2.yaml +++ b/vitrage/tests/resources/templates/evaluator/deduced_state_2.yaml @@ -1,5 +1,5 @@ metadata: - id: deduced_state_for_host_alarms_2 + name: deduced_state_for_host_alarms_2 description: replicates deduced_state.yaml, with changes to template_ids, to test overlapping templates definitions: entities: diff --git a/vitrage/tests/resources/templates/general/basic.yaml b/vitrage/tests/resources/templates/general/basic.yaml index 4eed51b40..e205b84ce 100644 --- a/vitrage/tests/resources/templates/general/basic.yaml +++ b/vitrage/tests/resources/templates/general/basic.yaml @@ -1,5 +1,5 @@ metadata: - id: basic_template + name: basic_template description: basic template for general tests definitions: entities: diff --git a/vitrage/tests/resources/templates/general/host_high_cpu_load_to_instance_cpu_suboptimal.yaml b/vitrage/tests/resources/templates/general/host_high_cpu_load_to_instance_cpu_suboptimal.yaml index 5e8af9d2b..99f18f5aa 100644 --- a/vitrage/tests/resources/templates/general/host_high_cpu_load_to_instance_cpu_suboptimal.yaml +++ b/vitrage/tests/resources/templates/general/host_high_cpu_load_to_instance_cpu_suboptimal.yaml @@ -1,5 +1,5 @@ metadata: - id: host_high_cpu_load_to_instance_cpu_suboptimal + name: host_high_cpu_load_to_instance_cpu_suboptimal definitions: entities: - entity: diff --git a/vitrage/tests/unit/evaluator/test_template_syntax_validator.py b/vitrage/tests/unit/evaluator/test_template_syntax_validator.py index a400c594e..c8747bef7 100644 --- a/vitrage/tests/unit/evaluator/test_template_syntax_validator.py +++ b/vitrage/tests/unit/evaluator/test_template_syntax_validator.py @@ -57,7 +57,7 @@ class TemplateSyntaxValidatorTest(base.BaseTest): def test_validate_template_without_id_in_metadata_section(self): template = self.clone_template - template[TemplateFields.METADATA].pop(TemplateFields.ID) + template[TemplateFields.METADATA].pop(TemplateFields.NAME) self._test_execution_with_fault_result(template, 60) def test_validate_template_without_definitions_section(self):