From 235a863c1ba371198ef5f57ad422a2befe90cca0 Mon Sep 17 00:00:00 2001 From: Renat Akhmerov Date: Wed, 8 Apr 2015 13:52:43 +0600 Subject: [PATCH] Renaming "engine1" to "engine" Change-Id: I106704c26b4598f9f3dc2ed04213b1f565d00010 --- mistral/api/controllers/v2/action_execution.py | 2 +- mistral/api/controllers/v2/execution.py | 2 +- mistral/api/wsgi.py | 2 +- mistral/cmd/launch.py | 6 +++--- mistral/{engine1 => engine}/__init__.py | 0 mistral/{engine1 => engine}/base.py | 0 mistral/{engine1 => engine}/default_engine.py | 8 ++++---- mistral/{engine1 => engine}/default_executor.py | 2 +- mistral/{engine1 => engine}/policies.py | 10 +++++----- mistral/{engine1 => engine}/rpc.py | 2 +- mistral/{engine1 => engine}/task_handler.py | 12 ++++++------ mistral/{engine1 => engine}/utils.py | 0 mistral/{engine1 => engine}/workflow_handler.py | 4 ++-- mistral/services/periodic.py | 2 +- mistral/tests/unit/api/v2/test_action_executions.py | 2 +- mistral/tests/unit/api/v2/test_executions.py | 2 +- mistral/tests/unit/{engine1 => engine}/__init__.py | 0 mistral/tests/unit/{engine1 => engine}/base.py | 6 +++--- .../unit/{engine1 => engine}/test_action_context.py | 2 +- .../unit/{engine1 => engine}/test_action_defaults.py | 2 +- .../unit/{engine1 => engine}/test_adhoc_actions.py | 2 +- .../tests/unit/{engine1 => engine}/test_commands.py | 2 +- .../tests/unit/{engine1 => engine}/test_dataflow.py | 2 +- .../unit/{engine1 => engine}/test_default_engine.py | 2 +- .../unit/{engine1 => engine}/test_direct_workflow.py | 4 ++-- .../unit/{engine1 => engine}/test_environment.py | 6 +++--- .../{engine1 => engine}/test_javascript_action.py | 2 +- mistral/tests/unit/{engine1 => engine}/test_join.py | 2 +- .../tests/unit/{engine1 => engine}/test_noop_task.py | 2 +- .../tests/unit/{engine1 => engine}/test_policies.py | 4 ++-- .../unit/{engine1 => engine}/test_race_condition.py | 2 +- .../{engine1 => engine}/test_reverse_workflow.py | 2 +- .../unit/{engine1 => engine}/test_subworkflows.py | 2 +- .../unit/{engine1 => engine}/test_task_defaults.py | 2 +- .../unit/{engine1 => engine}/test_with_items.py | 2 +- .../unit/{engine1 => engine}/test_workflow_resume.py | 4 ++-- .../unit/{engine1 => engine}/test_workflow_stop.py | 2 +- 37 files changed, 55 insertions(+), 55 deletions(-) rename mistral/{engine1 => engine}/__init__.py (100%) rename mistral/{engine1 => engine}/base.py (100%) rename mistral/{engine1 => engine}/default_engine.py (98%) rename mistral/{engine1 => engine}/default_executor.py (98%) rename mistral/{engine1 => engine}/policies.py (97%) rename mistral/{engine1 => engine}/rpc.py (99%) rename mistral/{engine1 => engine}/task_handler.py (98%) rename mistral/{engine1 => engine}/utils.py (100%) rename mistral/{engine1 => engine}/workflow_handler.py (96%) rename mistral/tests/unit/{engine1 => engine}/__init__.py (100%) rename mistral/tests/unit/{engine1 => engine}/base.py (96%) rename mistral/tests/unit/{engine1 => engine}/test_action_context.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_action_defaults.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_adhoc_actions.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_commands.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_dataflow.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_default_engine.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_direct_workflow.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_environment.py (97%) rename mistral/tests/unit/{engine1 => engine}/test_javascript_action.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_join.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_noop_task.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_policies.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_race_condition.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_reverse_workflow.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_subworkflows.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_task_defaults.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_with_items.py (99%) rename mistral/tests/unit/{engine1 => engine}/test_workflow_resume.py (98%) rename mistral/tests/unit/{engine1 => engine}/test_workflow_stop.py (98%) diff --git a/mistral/api/controllers/v2/action_execution.py b/mistral/api/controllers/v2/action_execution.py index 9746a40f..98bd8cdb 100644 --- a/mistral/api/controllers/v2/action_execution.py +++ b/mistral/api/controllers/v2/action_execution.py @@ -22,7 +22,7 @@ import wsmeext.pecan as wsme_pecan from mistral.api.controllers import resource from mistral.db.v2 import api as db_api -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.utils import rest_utils diff --git a/mistral/api/controllers/v2/execution.py b/mistral/api/controllers/v2/execution.py index d76ec2b4..a4288c1b 100644 --- a/mistral/api/controllers/v2/execution.py +++ b/mistral/api/controllers/v2/execution.py @@ -21,7 +21,7 @@ import wsmeext.pecan as wsme_pecan from mistral.api.controllers import resource from mistral.api.controllers.v2 import task from mistral.db.v2 import api as db_api -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.utils import rest_utils diff --git a/mistral/api/wsgi.py b/mistral/api/wsgi.py index c7b2f88b..9de59632 100644 --- a/mistral/api/wsgi.py +++ b/mistral/api/wsgi.py @@ -14,7 +14,7 @@ from mistral.api import app from mistral import config -from mistral.engine1 import rpc +from mistral.engine import rpc config.parse_args() transport = rpc.get_transport() diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py index 3cef183b..5db845cb 100755 --- a/mistral/cmd/launch.py +++ b/mistral/cmd/launch.py @@ -42,9 +42,9 @@ from mistral.api import app from mistral import config from mistral import context as ctx from mistral.db.v2 import api as db_api -from mistral.engine1 import default_engine as def_eng -from mistral.engine1 import default_executor as def_executor -from mistral.engine1 import rpc +from mistral.engine import default_engine as def_eng +from mistral.engine import default_executor as def_executor +from mistral.engine import rpc from mistral.openstack.common import log as logging from mistral.services import scheduler from mistral import version diff --git a/mistral/engine1/__init__.py b/mistral/engine/__init__.py similarity index 100% rename from mistral/engine1/__init__.py rename to mistral/engine/__init__.py diff --git a/mistral/engine1/base.py b/mistral/engine/base.py similarity index 100% rename from mistral/engine1/base.py rename to mistral/engine/base.py diff --git a/mistral/engine1/default_engine.py b/mistral/engine/default_engine.py similarity index 98% rename from mistral/engine1/default_engine.py rename to mistral/engine/default_engine.py index 960c8bff..6ec4b4c9 100644 --- a/mistral/engine1/default_engine.py +++ b/mistral/engine/default_engine.py @@ -18,10 +18,10 @@ import traceback from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models as db_models -from mistral.engine1 import base -from mistral.engine1 import task_handler -from mistral.engine1 import utils -from mistral.engine1 import workflow_handler as wf_handler +from mistral.engine import base +from mistral.engine import task_handler +from mistral.engine import utils +from mistral.engine import workflow_handler as wf_handler from mistral.openstack.common import log as logging from mistral import utils as u from mistral.utils import wf_trace diff --git a/mistral/engine1/default_executor.py b/mistral/engine/default_executor.py similarity index 98% rename from mistral/engine1/default_executor.py rename to mistral/engine/default_executor.py index f5a5033e..800ba476 100644 --- a/mistral/engine1/default_executor.py +++ b/mistral/engine/default_executor.py @@ -15,7 +15,7 @@ # limitations under the License. from mistral.actions import action_factory as a_f -from mistral.engine1 import base +from mistral.engine import base from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.utils import inspect_utils as i_u diff --git a/mistral/engine1/policies.py b/mistral/engine/policies.py similarity index 97% rename from mistral/engine1/policies.py rename to mistral/engine/policies.py index b492df0c..e771c265 100644 --- a/mistral/engine1/policies.py +++ b/mistral/engine/policies.py @@ -14,15 +14,15 @@ # limitations under the License. from mistral.db.v2 import api as db_api -from mistral.engine1 import base -from mistral.engine1 import rpc +from mistral.engine import base +from mistral.engine import rpc from mistral.services import scheduler from mistral.utils import wf_trace from mistral.workflow import states -_ENGINE_CLIENT_PATH = 'mistral.engine1.rpc.get_engine_client' -_RUN_EXISTING_TASK_PATH = 'mistral.engine1.task_handler.run_existing_task' +_ENGINE_CLIENT_PATH = 'mistral.engine.rpc.get_engine_client' +_RUN_EXISTING_TASK_PATH = 'mistral.engine.task_handler.run_existing_task' def _log_task_delay(task_ex, delay_sec): @@ -325,7 +325,7 @@ class TimeoutPolicy(base.TaskPolicy): scheduler.schedule_call( None, - 'mistral.engine1.policies.fail_task_if_incomplete', + 'mistral.engine.policies.fail_task_if_incomplete', self.delay, task_ex_id=task_ex.id, timeout=self.delay diff --git a/mistral/engine1/rpc.py b/mistral/engine/rpc.py similarity index 99% rename from mistral/engine1/rpc.py rename to mistral/engine/rpc.py index 41f82b69..610965c6 100644 --- a/mistral/engine1/rpc.py +++ b/mistral/engine/rpc.py @@ -17,7 +17,7 @@ from oslo.config import cfg from oslo import messaging from mistral import context as auth_ctx -from mistral.engine1 import base +from mistral.engine import base from mistral.openstack.common import log as logging from mistral.workflow import utils as wf_utils diff --git a/mistral/engine1/task_handler.py b/mistral/engine/task_handler.py similarity index 98% rename from mistral/engine1/task_handler.py rename to mistral/engine/task_handler.py index a59a14a4..e86e99ac 100644 --- a/mistral/engine1/task_handler.py +++ b/mistral/engine/task_handler.py @@ -16,9 +16,9 @@ import copy from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine1 import policies -from mistral.engine1 import rpc -from mistral.engine1 import utils as e_utils +from mistral.engine import policies +from mistral.engine import rpc +from mistral.engine import utils as e_utils from mistral import expressions as expr from mistral.openstack.common import log as logging from mistral.services import action_manager as a_m @@ -395,7 +395,7 @@ def _schedule_run_action(task_ex, task_spec, action_input): scheduler.schedule_call( None, - 'mistral.engine1.task_handler.run_action', + 'mistral.engine.task_handler.run_action', 0, action_ex_id=action_ex.id, target=target @@ -421,7 +421,7 @@ def _schedule_noop_action(task_ex, task_spec): scheduler.schedule_call( None, - 'mistral.engine1.task_handler.run_action', + 'mistral.engine.task_handler.run_action', 0, action_ex_id=action_ex.id, target=target @@ -467,7 +467,7 @@ def _schedule_run_workflow(task_ex, task_spec, wf_input): scheduler.schedule_call( None, - 'mistral.engine1.task_handler.run_workflow', + 'mistral.engine.task_handler.run_workflow', 0, wf_name=wf_def.name, wf_input=wf_input, diff --git a/mistral/engine1/utils.py b/mistral/engine/utils.py similarity index 100% rename from mistral/engine1/utils.py rename to mistral/engine/utils.py diff --git a/mistral/engine1/workflow_handler.py b/mistral/engine/workflow_handler.py similarity index 96% rename from mistral/engine1/workflow_handler.py rename to mistral/engine/workflow_handler.py index 59c78569..2f01cd4d 100644 --- a/mistral/engine1/workflow_handler.py +++ b/mistral/engine/workflow_handler.py @@ -13,7 +13,7 @@ # limitations under the License. from mistral.db.v2 import api as db_api -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral import exceptions as exc from mistral.services import scheduler from mistral.utils import wf_trace @@ -47,7 +47,7 @@ def fail_workflow(wf_ex, state_info): def _schedule_send_result_to_parent_workflow(wf_ex): scheduler.schedule_call( None, - 'mistral.engine1.workflow_handler.send_result_to_parent_workflow', + 'mistral.engine.workflow_handler.send_result_to_parent_workflow', 0, wf_ex_id=wf_ex.id ) diff --git a/mistral/services/periodic.py b/mistral/services/periodic.py index 7b0d5b60..1e4c2674 100644 --- a/mistral/services/periodic.py +++ b/mistral/services/periodic.py @@ -16,7 +16,7 @@ from mistral import context as auth_ctx from mistral.db.v2 import api as db_api_v2 -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral.openstack.common import log from mistral.openstack.common import periodic_task from mistral.openstack.common import threadgroup diff --git a/mistral/tests/unit/api/v2/test_action_executions.py b/mistral/tests/unit/api/v2/test_action_executions.py index 31bd5a8d..84c7f7eb 100644 --- a/mistral/tests/unit/api/v2/test_action_executions.py +++ b/mistral/tests/unit/api/v2/test_action_executions.py @@ -20,7 +20,7 @@ import mock from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral import exceptions as exc from mistral.tests.unit.api import base from mistral.workflow import states diff --git a/mistral/tests/unit/api/v2/test_executions.py b/mistral/tests/unit/api/v2/test_executions.py index 587b87a3..1c033ecf 100644 --- a/mistral/tests/unit/api/v2/test_executions.py +++ b/mistral/tests/unit/api/v2/test_executions.py @@ -21,7 +21,7 @@ from webtest import app as webtest_app from mistral.api.controllers.v2 import execution from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine1 import rpc +from mistral.engine import rpc from mistral import exceptions as exc from mistral.tests.unit.api import base from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/__init__.py b/mistral/tests/unit/engine/__init__.py similarity index 100% rename from mistral/tests/unit/engine1/__init__.py rename to mistral/tests/unit/engine/__init__.py diff --git a/mistral/tests/unit/engine1/base.py b/mistral/tests/unit/engine/base.py similarity index 96% rename from mistral/tests/unit/engine1/base.py rename to mistral/tests/unit/engine/base.py index 28a9ba7b..786c86c3 100644 --- a/mistral/tests/unit/engine1/base.py +++ b/mistral/tests/unit/engine/base.py @@ -18,9 +18,9 @@ from oslo import messaging from mistral import context as ctx from mistral.db.v2 import api as db_api -from mistral.engine1 import default_engine as def_eng -from mistral.engine1 import default_executor as def_exec -from mistral.engine1 import rpc +from mistral.engine import default_engine as def_eng +from mistral.engine import default_executor as def_exec +from mistral.engine import rpc from mistral.openstack.common import log as logging from mistral.services import scheduler from mistral.tests import base diff --git a/mistral/tests/unit/engine1/test_action_context.py b/mistral/tests/unit/engine/test_action_context.py similarity index 98% rename from mistral/tests/unit/engine1/test_action_context.py rename to mistral/tests/unit/engine/test_action_context.py index 6ad37d62..5a06e7ca 100644 --- a/mistral/tests/unit/engine1/test_action_context.py +++ b/mistral/tests/unit/engine/test_action_context.py @@ -22,7 +22,7 @@ from mistral.actions import std_actions from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_action_defaults.py b/mistral/tests/unit/engine/test_action_defaults.py similarity index 99% rename from mistral/tests/unit/engine1/test_action_defaults.py rename to mistral/tests/unit/engine/test_action_defaults.py index 2deed15d..3a0f740d 100644 --- a/mistral/tests/unit/engine1/test_action_defaults.py +++ b/mistral/tests/unit/engine/test_action_defaults.py @@ -23,7 +23,7 @@ from mistral.actions import std_actions from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_adhoc_actions.py b/mistral/tests/unit/engine/test_adhoc_actions.py similarity index 98% rename from mistral/tests/unit/engine1/test_adhoc_actions.py rename to mistral/tests/unit/engine/test_adhoc_actions.py index 914aa357..567b0933 100644 --- a/mistral/tests/unit/engine1/test_adhoc_actions.py +++ b/mistral/tests/unit/engine/test_adhoc_actions.py @@ -17,7 +17,7 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_commands.py b/mistral/tests/unit/engine/test_commands.py similarity index 99% rename from mistral/tests/unit/engine1/test_commands.py rename to mistral/tests/unit/engine/test_commands.py index daf83ce7..20c4354e 100644 --- a/mistral/tests/unit/engine1/test_commands.py +++ b/mistral/tests/unit/engine/test_commands.py @@ -17,7 +17,7 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_dataflow.py b/mistral/tests/unit/engine/test_dataflow.py similarity index 99% rename from mistral/tests/unit/engine1/test_dataflow.py rename to mistral/tests/unit/engine/test_dataflow.py index 85005207..e6064731 100644 --- a/mistral/tests/unit/engine1/test_dataflow.py +++ b/mistral/tests/unit/engine/test_dataflow.py @@ -20,7 +20,7 @@ from mistral.db.v2.sqlalchemy import models from mistral.openstack.common import log as logging from mistral.services import workflows as wf_service from mistral.tests import base as test_base -from mistral.tests.unit.engine1 import base as engine_test_base +from mistral.tests.unit.engine import base as engine_test_base from mistral.workflow import data_flow from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_default_engine.py b/mistral/tests/unit/engine/test_default_engine.py similarity index 99% rename from mistral/tests/unit/engine1/test_default_engine.py rename to mistral/tests/unit/engine/test_default_engine.py index 29a768f4..47d81244 100644 --- a/mistral/tests/unit/engine1/test_default_engine.py +++ b/mistral/tests/unit/engine/test_default_engine.py @@ -21,7 +21,7 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine1 import default_engine as d_eng +from mistral.engine import default_engine as d_eng from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service diff --git a/mistral/tests/unit/engine1/test_direct_workflow.py b/mistral/tests/unit/engine/test_direct_workflow.py similarity index 98% rename from mistral/tests/unit/engine1/test_direct_workflow.py rename to mistral/tests/unit/engine/test_direct_workflow.py index 119db7e8..a772e259 100644 --- a/mistral/tests/unit/engine1/test_direct_workflow.py +++ b/mistral/tests/unit/engine/test_direct_workflow.py @@ -17,11 +17,11 @@ from oslo.config import cfg from yaql import exceptions as yaql_exc from mistral.db.v2 import api as db_api -from mistral.engine1 import default_engine as de +from mistral.engine import default_engine as de from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states # TODO(nmakhotkin) Need to write more tests. diff --git a/mistral/tests/unit/engine1/test_environment.py b/mistral/tests/unit/engine/test_environment.py similarity index 97% rename from mistral/tests/unit/engine1/test_environment.py rename to mistral/tests/unit/engine/test_environment.py index 2909a528..ee137f31 100644 --- a/mistral/tests/unit/engine1/test_environment.py +++ b/mistral/tests/unit/engine/test_environment.py @@ -16,11 +16,11 @@ import mock from oslo.config import cfg from mistral.db.v2 import api as db_api -from mistral.engine1 import default_executor -from mistral.engine1 import rpc +from mistral.engine import default_executor +from mistral.engine import rpc from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_javascript_action.py b/mistral/tests/unit/engine/test_javascript_action.py similarity index 98% rename from mistral/tests/unit/engine1/test_javascript_action.py rename to mistral/tests/unit/engine/test_javascript_action.py index 6af320b9..437d1380 100644 --- a/mistral/tests/unit/engine1/test_javascript_action.py +++ b/mistral/tests/unit/engine/test_javascript_action.py @@ -19,7 +19,7 @@ import testtools from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.utils import javascript from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_join.py b/mistral/tests/unit/engine/test_join.py similarity index 99% rename from mistral/tests/unit/engine1/test_join.py rename to mistral/tests/unit/engine/test_join.py index b0b81a18..47372a55 100644 --- a/mistral/tests/unit/engine1/test_join.py +++ b/mistral/tests/unit/engine/test_join.py @@ -18,7 +18,7 @@ import testtools from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_noop_task.py b/mistral/tests/unit/engine/test_noop_task.py similarity index 98% rename from mistral/tests/unit/engine1/test_noop_task.py rename to mistral/tests/unit/engine/test_noop_task.py index e32a86da..d89c5698 100644 --- a/mistral/tests/unit/engine1/test_noop_task.py +++ b/mistral/tests/unit/engine/test_noop_task.py @@ -17,7 +17,7 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_policies.py b/mistral/tests/unit/engine/test_policies.py similarity index 99% rename from mistral/tests/unit/engine1/test_policies.py rename to mistral/tests/unit/engine/test_policies.py index ba4aea57..b80b3f5b 100644 --- a/mistral/tests/unit/engine1/test_policies.py +++ b/mistral/tests/unit/engine/test_policies.py @@ -15,12 +15,12 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api -from mistral.engine1 import policies +from mistral.engine import policies from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workbook import parser as spec_parser from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_race_condition.py b/mistral/tests/unit/engine/test_race_condition.py similarity index 99% rename from mistral/tests/unit/engine1/test_race_condition.py rename to mistral/tests/unit/engine/test_race_condition.py index c87c487b..a85f67c5 100644 --- a/mistral/tests/unit/engine1/test_race_condition.py +++ b/mistral/tests/unit/engine/test_race_condition.py @@ -21,7 +21,7 @@ from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import action_manager as a_m from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_reverse_workflow.py b/mistral/tests/unit/engine/test_reverse_workflow.py similarity index 98% rename from mistral/tests/unit/engine1/test_reverse_workflow.py rename to mistral/tests/unit/engine/test_reverse_workflow.py index 1582347f..2d14099e 100644 --- a/mistral/tests/unit/engine1/test_reverse_workflow.py +++ b/mistral/tests/unit/engine/test_reverse_workflow.py @@ -17,7 +17,7 @@ from oslo.config import cfg from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_subworkflows.py b/mistral/tests/unit/engine/test_subworkflows.py similarity index 99% rename from mistral/tests/unit/engine1/test_subworkflows.py rename to mistral/tests/unit/engine/test_subworkflows.py index 52da84b1..731f6f0f 100644 --- a/mistral/tests/unit/engine1/test_subworkflows.py +++ b/mistral/tests/unit/engine/test_subworkflows.py @@ -22,7 +22,7 @@ from mistral.db.v2 import api as db_api from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base LOG = logging.getLogger(__name__) diff --git a/mistral/tests/unit/engine1/test_task_defaults.py b/mistral/tests/unit/engine/test_task_defaults.py similarity index 99% rename from mistral/tests/unit/engine1/test_task_defaults.py rename to mistral/tests/unit/engine/test_task_defaults.py index ae8f8c08..7ad3ae28 100644 --- a/mistral/tests/unit/engine1/test_task_defaults.py +++ b/mistral/tests/unit/engine/test_task_defaults.py @@ -20,7 +20,7 @@ from mistral.db.v2 import api as db_api from mistral.openstack.common import log as logging from mistral.services import scheduler from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states diff --git a/mistral/tests/unit/engine1/test_with_items.py b/mistral/tests/unit/engine/test_with_items.py similarity index 99% rename from mistral/tests/unit/engine1/test_with_items.py rename to mistral/tests/unit/engine/test_with_items.py index b125b378..d5f2c2c5 100644 --- a/mistral/tests/unit/engine1/test_with_items.py +++ b/mistral/tests/unit/engine/test_with_items.py @@ -19,7 +19,7 @@ from mistral.db.v2 import api as db_api from mistral import exceptions as exc from mistral.openstack.common import log as logging from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import data_flow from mistral.workflow import states from mistral.workflow import utils as wf_utils diff --git a/mistral/tests/unit/engine1/test_workflow_resume.py b/mistral/tests/unit/engine/test_workflow_resume.py similarity index 98% rename from mistral/tests/unit/engine1/test_workflow_resume.py rename to mistral/tests/unit/engine/test_workflow_resume.py index 626aa329..d729a171 100644 --- a/mistral/tests/unit/engine1/test_workflow_resume.py +++ b/mistral/tests/unit/engine/test_workflow_resume.py @@ -16,10 +16,10 @@ import mock from oslo.config import cfg from mistral.db.v2 import api as db_api -from mistral.engine1 import default_engine as de +from mistral.engine import default_engine as de from mistral import exceptions as exc from mistral.services import workbooks as wb_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workbook import parser as spec_parser from mistral.workflow import states from mistral.workflow import utils diff --git a/mistral/tests/unit/engine1/test_workflow_stop.py b/mistral/tests/unit/engine/test_workflow_stop.py similarity index 98% rename from mistral/tests/unit/engine1/test_workflow_stop.py rename to mistral/tests/unit/engine/test_workflow_stop.py index 263cd6d5..b50edb48 100644 --- a/mistral/tests/unit/engine1/test_workflow_stop.py +++ b/mistral/tests/unit/engine/test_workflow_stop.py @@ -15,7 +15,7 @@ from mistral.db.v2 import api as db_api from mistral.services import scheduler from mistral.services import workflows as wf_service -from mistral.tests.unit.engine1 import base +from mistral.tests.unit.engine import base from mistral.workflow import states