template list - adding uuid
Change-Id: Iccdb934a5bee92e36211bf53cf5a6046a1207a67
This commit is contained in:
parent
7b4afd0b08
commit
0a5cf1c3f2
@ -192,11 +192,12 @@ class TemplateApis(object):
|
||||
LOG.debug("TemplateApis get_templates")
|
||||
|
||||
templates_details = []
|
||||
for template in self.templates:
|
||||
for uuid, template in self.templates.items():
|
||||
|
||||
template_metadata = template.data[TemplateFields.METADATA]
|
||||
|
||||
templates_details.append({
|
||||
'uuid': str(template.uuid),
|
||||
'name': template_metadata[TemplateFields.NAME],
|
||||
'status': self._get_template_status(template.result),
|
||||
'status details': template.result.comment,
|
||||
|
@ -13,4 +13,4 @@
|
||||
# under the License.
|
||||
from collections import namedtuple
|
||||
|
||||
Template = namedtuple('Template', ['data', 'date', 'result'])
|
||||
Template = namedtuple('Template', ['uuid', 'data', 'date', 'result'])
|
||||
|
@ -13,6 +13,7 @@
|
||||
# under the License.
|
||||
from collections import defaultdict
|
||||
from collections import namedtuple
|
||||
import uuid
|
||||
|
||||
from oslo_log import log
|
||||
|
||||
@ -28,14 +29,12 @@ from vitrage.evaluator.template_validation.template_syntax_validator import \
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
EdgeKeyScenario = namedtuple('EdgeKeyScenario', ['label', 'source', 'target'])
|
||||
|
||||
|
||||
class ScenarioRepository(object):
|
||||
|
||||
def __init__(self, conf):
|
||||
self._templates = []
|
||||
self._templates = {}
|
||||
self.relationship_scenarios = defaultdict(list)
|
||||
self.entity_scenarios = defaultdict(list)
|
||||
self._load_templates_files(conf)
|
||||
@ -86,8 +85,11 @@ class ScenarioRepository(object):
|
||||
if not result.is_valid:
|
||||
LOG.info('Unable to load template: %s' % result.comment)
|
||||
|
||||
self.templates.append(Template(template_def, current_time, result))
|
||||
|
||||
template_uuid = uuid.uuid4()
|
||||
self.templates[template_uuid] = Template(template_uuid,
|
||||
template_def,
|
||||
current_time,
|
||||
result)
|
||||
if result.is_valid:
|
||||
template_data = TemplateData(template_def)
|
||||
self._add_template_scenarios(template_data)
|
||||
|
Loading…
x
Reference in New Issue
Block a user