Renaming "engine1" to "engine"

Change-Id: I106704c26b4598f9f3dc2ed04213b1f565d00010

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

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

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()

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

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

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

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

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
 

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,

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
     )

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

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

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

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

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
 
 

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__)

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__)
 

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__)

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
 

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

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.

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__)
 

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
 

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
 
 

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__)

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
 

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__)

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__)

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__)
 

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
 
 

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

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

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