From 014d4640d65ac43edf6f6bee6dcdb5276e115fc7 Mon Sep 17 00:00:00 2001 From: Ifat Afek Date: Wed, 28 Jun 2017 15:01:21 +0000 Subject: [PATCH] Move template_content_validator and test_template_content_validator to the correct packages. This should have been part of https://review.openstack.org/477572 but was removed due to git issues. Change-Id: I7d642cea6f6f4615262fd9e156ba842c8215bd59 Implements: blueprint support-external-actions --- vitrage/api_handler/apis/template.py | 4 ++-- vitrage/evaluator/scenario_repository.py | 2 +- .../{ => content}/template_content_validator.py | 0 .../content}/test_template_content_validator.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename vitrage/evaluator/template_validation/{ => content}/template_content_validator.py (100%) rename vitrage/tests/unit/evaluator/{ => template_validation/content}/test_template_content_validator.py (99%) diff --git a/vitrage/api_handler/apis/template.py b/vitrage/api_handler/apis/template.py index 7f35e6a4d..edb9f847a 100644 --- a/vitrage/api_handler/apis/template.py +++ b/vitrage/api_handler/apis/template.py @@ -16,9 +16,9 @@ import json from oslo_log import log from vitrage.evaluator.template_fields import TemplateFields -from vitrage.evaluator.template_validation.status_messages import status_msgs -from vitrage.evaluator.template_validation.template_content_validator \ +from vitrage.evaluator.template_validation.content.template_content_validator \ import content_validation +from vitrage.evaluator.template_validation.status_messages import status_msgs from vitrage.evaluator.template_validation.template_syntax_validator import \ syntax_validation diff --git a/vitrage/evaluator/scenario_repository.py b/vitrage/evaluator/scenario_repository.py index 953c42d60..f28ff8014 100644 --- a/vitrage/evaluator/scenario_repository.py +++ b/vitrage/evaluator/scenario_repository.py @@ -21,7 +21,7 @@ from oslo_utils import uuidutils from vitrage.evaluator.base import Template from vitrage.evaluator.equivalence_repository import EquivalenceRepository from vitrage.evaluator.template_data import TemplateData -from vitrage.evaluator.template_validation.template_content_validator \ +from vitrage.evaluator.template_validation.content.template_content_validator \ import content_validation from vitrage.evaluator.template_validation.template_syntax_validator import \ syntax_validation diff --git a/vitrage/evaluator/template_validation/template_content_validator.py b/vitrage/evaluator/template_validation/content/template_content_validator.py similarity index 100% rename from vitrage/evaluator/template_validation/template_content_validator.py rename to vitrage/evaluator/template_validation/content/template_content_validator.py diff --git a/vitrage/tests/unit/evaluator/test_template_content_validator.py b/vitrage/tests/unit/evaluator/template_validation/content/test_template_content_validator.py similarity index 99% rename from vitrage/tests/unit/evaluator/test_template_content_validator.py rename to vitrage/tests/unit/evaluator/template_validation/content/test_template_content_validator.py index e839534d7..5e1cbdadd 100644 --- a/vitrage/tests/unit/evaluator/test_template_content_validator.py +++ b/vitrage/tests/unit/evaluator/template_validation/content/test_template_content_validator.py @@ -15,7 +15,7 @@ import copy from vitrage.evaluator.template_fields import TemplateFields -from vitrage.evaluator.template_validation import \ +from vitrage.evaluator.template_validation.content import \ template_content_validator as validator from vitrage.tests.mocks import utils from vitrage.tests.unit.evaluator.template_validation.content.base import \