openstack/vitrage
Code Issues Proposed changes

Merge "Rename 'type' to 'template_type'"

Browse Source
This commit is contained in:
Zuul 2018-01-23 19:36:52 +00:00 committed by Gerrit Code Review
commit 76588c0bc2
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vitrage/evaluator/template_data.py
View File

@ -47,10 +47,10 @@ class Scenario(object):
# noinspection PyAttributeOutsideInit
class TemplateData(object):
def __init__(self, name, type, version, entities,
def __init__(self, name, template_type, version, entities,
relationships, scenarios):
self.name = name
self.type = type
self.template_type = template_type
self.version = version
self.entities = entities
self.relationships = relationships
@ -65,12 +65,12 @@ class TemplateData(object):
self._name = template_name
@property
def type(self):
return self._type
def template_type(self):
return self._template_type
@type.setter
def type(self, template_type):
self._type = template_type
@template_type.setter
def template_type(self, template_type):
self._template_type = template_type
@property
def version(self):

6
vitrage/evaluator/template_loading/template_loader.py
View File

@ -57,8 +57,8 @@ class TemplateLoader(object):
name = template_def[TFields.METADATA][TFields.NAME]
# type might be None, it is defined only in version 2
type = template_def[TFields.METADATA].get(TFields.TYPE)
# template_type might be None, it is defined only in version 2
template_type = template_def[TFields.METADATA].get(TFields.TYPE)
if def_templates is None:
def_templates = {}
@ -89,7 +89,7 @@ class TemplateLoader(object):
self.relationships).\
build_scenarios(template_def[TFields.SCENARIOS])
return TemplateData(name, type, template_schema.version(),
return TemplateData(name, template_type, template_schema.version(),
self.entities, self.relationships, scenarios)
def _build_entities(self, entities_defs):

8
vitrage/tests/unit/evaluator/template_loading/v2/test_template_loader.py
View File

@ -45,7 +45,7 @@ class TemplateLoaderTest(base.BaseTest):
template_data = TemplateLoader().load(template_definition)
self.assertIsNotNone(template_data)
type = template_data.type
self.assertIsNotNone(type, 'v2 template must include a type')
self.assertEqual(TemplateTypes.STANDARD, type,
'type should be ' + TemplateTypes.STANDARD)
template_type = template_data.template_type
self.assertIsNotNone(template_type, 'v2 template must include a type')
self.assertEqual(TemplateTypes.STANDARD, template_type,
'template_type should be ' + TemplateTypes.STANDARD)