Rename package 'workbook' to 'lang'

* The previous name of the package is not relevant anymore, it was
  chosen for reasons that don't make sense anymore. A name of the
  package should reflect that it's about the workflow language.

Change-Id: I7e05ba97abf0aa5db4e19d9d72b4ea0d52e328fb

mistral/api/controllers/v2/action.py

@@ -28,10 +28,10 @@ from mistral.api.hooks import content_type as ct_hook
 from mistral import context
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import actions
 from mistral.utils import filter_utils
 from mistral.utils import rest_utils
-from mistral.workbook import parser as spec_parser
 
 LOG = logging.getLogger(__name__)
 

mistral/api/controllers/v2/task.py

@@ -28,9 +28,9 @@ from mistral import context
 from mistral.db.v2 import api as db_api
 from mistral.engine.rpc_backend import rpc
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.utils import filter_utils
 from mistral.utils import rest_utils
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import data_flow
 from mistral.workflow import states
 

mistral/api/controllers/v2/workbook.py

@@ -27,10 +27,10 @@ from mistral.api.controllers.v2 import validation
 from mistral.api.hooks import content_type as ct_hook
 from mistral import context
 from mistral.db.v2 import api as db_api
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks
 from mistral.utils import filter_utils
 from mistral.utils import rest_utils
-from mistral.workbook import parser as spec_parser
 
 
 LOG = logging.getLogger(__name__)

mistral/api/controllers/v2/workflow.py

@@ -31,10 +31,10 @@ from mistral.api.hooks import content_type as ct_hook
 from mistral import context
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workflows
 from mistral.utils import filter_utils
 from mistral.utils import rest_utils
-from mistral.workbook import parser as spec_parser
 
 
 LOG = logging.getLogger(__name__)

mistral/engine/action_handler.py

@@ -21,7 +21,7 @@ from mistral.db.v2.sqlalchemy import models
 from mistral.engine import actions
 from mistral.engine import task_handler
 from mistral import exceptions as exc
-from mistral.workbook import parser as spec_parser
+from mistral.lang import parser as spec_parser
 
 
 LOG = logging.getLogger(__name__)

mistral/engine/actions.py

@@ -25,11 +25,11 @@ from mistral.engine import utils as e_utils
 from mistral.engine import workflow_handler as wf_handler
 from mistral import exceptions as exc
 from mistral import expressions as expr
+from mistral.lang import parser as spec_parser
 from mistral.services import action_manager as a_m
 from mistral.services import security
 from mistral import utils
 from mistral.utils import wf_trace
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import states
 from mistral.workflow import utils as wf_utils
 

mistral/engine/task_handler.py

@@ -25,8 +25,8 @@ from mistral.engine import action_queue
 from mistral.engine import tasks
 from mistral.engine import workflow_handler as wf_handler
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import scheduler
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import base as wf_base
 from mistral.workflow import commands as wf_cmds
 from mistral.workflow import states

mistral/engine/workflows.py

@@ -25,12 +25,12 @@ from mistral.engine import dispatcher
 from mistral.engine.rpc_backend import rpc
 from mistral.engine import utils as eng_utils
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import scheduler
 from mistral.services import workflows as wf_service
 from mistral import utils
 from mistral.utils import merge_dicts
 from mistral.utils import wf_trace
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import base as wf_base
 from mistral.workflow import commands
 from mistral.workflow import data_flow

mistral/lang/base.py

@@ -21,8 +21,8 @@ import six
 
 from mistral import exceptions as exc
 from mistral import expressions as expr
+from mistral.lang import types
 from mistral import utils
-from mistral.workbook import types
 
 
 CMD_PTRN = re.compile("^[\w\.]+[^=\(\s\"]*")

mistral/lang/parser.py

@@ -22,11 +22,11 @@ import six
 
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
-from mistral.workbook import base
+from mistral.lang import base
-from mistral.workbook.v2 import actions as actions_v2
+from mistral.lang.v2 import actions as actions_v2
-from mistral.workbook.v2 import tasks as tasks_v2
+from mistral.lang.v2 import tasks as tasks_v2
-from mistral.workbook.v2 import workbook as wb_v2
+from mistral.lang.v2 import workbook as wb_v2
-from mistral.workbook.v2 import workflows as wf_v2
+from mistral.lang.v2 import workflows as wf_v2
 
 V2_0 = '2.0'
 

mistral/lang/v2/actions.py

@@ -15,9 +15,9 @@
 
 import six
 
+from mistral.lang import types
+from mistral.lang.v2 import base
 from mistral import utils
-from mistral.workbook import types
-from mistral.workbook.v2 import base
 
 
 class ActionSpec(base.BaseSpec):

mistral/lang/v2/base.py

@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.workbook import base
+from mistral.lang import base
-from mistral.workbook import types
+from mistral.lang import types
 
 
 class BaseSpec(base.BaseSpec):

mistral/lang/v2/policies.py

@@ -13,9 +13,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.workbook import types
+from mistral.lang import types
-from mistral.workbook.v2 import base
+from mistral.lang.v2 import base
-from mistral.workbook.v2 import retry_policy
+from mistral.lang.v2 import retry_policy
 
 
 RETRY_SCHEMA = retry_policy.RetrySpec.get_schema(includes=None)

mistral/lang/v2/retry_policy.py

@@ -15,8 +15,8 @@
 
 import six
 
-from mistral.workbook import types
+from mistral.lang import types
-from mistral.workbook.v2 import base
+from mistral.lang.v2 import base
 
 
 class RetrySpec(base.BaseSpec):

mistral/lang/v2/task_defaults.py

@@ -15,10 +15,10 @@
 
 import six
 
-from mistral.workbook import types
+from mistral.lang import types
-from mistral.workbook.v2 import base
+from mistral.lang.v2 import base
-from mistral.workbook.v2 import policies
+from mistral.lang.v2 import policies
-from mistral.workbook.v2 import tasks
+from mistral.lang.v2 import tasks
 
 
 direct_wf_ts = tasks.DirectWorkflowTaskSpec

mistral/lang/v2/tasks.py

@@ -20,10 +20,10 @@ import six
 
 from mistral import exceptions as exc
 from mistral import expressions
+from mistral.lang import types
+from mistral.lang.v2 import base
+from mistral.lang.v2 import policies
 from mistral import utils
-from mistral.workbook import types
-from mistral.workbook.v2 import base
-from mistral.workbook.v2 import policies
 
 _expr_ptrns = [expressions.patterns[name] for name in expressions.patterns]
 WITH_ITEMS_PTRN = re.compile(

mistral/lang/v2/workbook.py

@@ -13,9 +13,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.workbook.v2 import actions as act
+from mistral.lang.v2 import actions as act
-from mistral.workbook.v2 import base
+from mistral.lang.v2 import base
-from mistral.workbook.v2 import workflows as wf
+from mistral.lang.v2 import workflows as wf
 
 # We want to match any single word that isn't exactly "version"
 NON_VERSION_WORD_REGEX = "^(?!version$)[\w-]+$"

mistral/lang/v2/workflows.py

@@ -18,11 +18,11 @@ import six
 import threading
 
 from mistral import exceptions as exc
+from mistral.lang import types
+from mistral.lang.v2 import base
+from mistral.lang.v2 import task_defaults
+from mistral.lang.v2 import tasks
 from mistral import utils
-from mistral.workbook import types
-from mistral.workbook.v2 import base
-from mistral.workbook.v2 import task_defaults
-from mistral.workbook.v2 import tasks
 
 
 class WorkflowSpec(base.BaseSpec):

mistral/services/actions.py

@@ -16,7 +16,7 @@ import json
 
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
-from mistral.workbook import parser as spec_parser
+from mistral.lang import parser as spec_parser
 
 
 def create_actions(definition, scope='private'):

mistral/services/triggers.py

@@ -21,8 +21,8 @@ from mistral.db.v2 import api as db_api
 from mistral.engine.rpc_backend import rpc
 from mistral.engine import utils as eng_utils
 from mistral import exceptions as exc
+from mistral.lang import parser
 from mistral.services import security
-from mistral.workbook import parser
 
 
 def get_next_execution_time(pattern, start_time):

mistral/services/workbooks.py

@@ -13,8 +13,8 @@
 #    limitations under the License.
 
 from mistral.db.v2 import api as db_api_v2
+from mistral.lang import parser as spec_parser
 from mistral.services import actions
-from mistral.workbook import parser as spec_parser
 
 
 def create_workbook_v2(definition, scope='private'):

mistral/services/workflows.py

@@ -14,8 +14,8 @@
 
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral import utils
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import data_flow
 from mistral.workflow import states
 

mistral/tests/unit/base.py

@@ -29,12 +29,12 @@ from mistral import context as auth_context
 from mistral.db.sqlalchemy import base as db_sa_base
 from mistral.db.sqlalchemy import sqlite_lock
 from mistral.db.v2 import api as db_api
+from mistral.lang import parser as spec_parser
 from mistral.services import action_manager
 from mistral.services import security
 from mistral.tests.unit import config as test_config
 from mistral.utils import inspect_utils as i_utils
 from mistral import version
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import lookup_utils
 
 RESOURCES_PATH = 'tests/resources/'

mistral/tests/unit/engine/test_policies.py

@@ -21,10 +21,10 @@ from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models
 from mistral.engine import policies
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks as wb_service
 from mistral.services import workflows as wf_service
 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_workflow_resume.py

@@ -17,9 +17,9 @@ from oslo_config import cfg
 
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks as wb_service
 from mistral.tests.unit.engine import base
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import data_flow
 from mistral.workflow import states
 from mistral.workflow import utils

mistral/tests/unit/lang/test_spec_caching.py

@@ -13,10 +13,10 @@
 #    limitations under the License.
 
 from mistral.db.v2 import api as db_api
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks as wb_service
 from mistral.services import workflows as wf_service
 from mistral.tests.unit import base
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import states
 
 

mistral/tests/unit/lang/v2/base.py

@@ -17,9 +17,9 @@ import copy
 import yaml
 
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.tests.unit import base
 from mistral import utils
-from mistral.workbook import parser as spec_parser
 
 
 class WorkflowSpecValidationTestCase(base.BaseTest):

mistral/tests/unit/lang/v2/test_actions.py

@@ -15,7 +15,7 @@
 
 import copy
 
-from mistral.tests.unit.workbook.v2 import base
+from mistral.tests.unit.lang.v2 import base
 from mistral import utils
 
 

mistral/tests/unit/lang/v2/test_tasks.py

@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.tests.unit.workbook.v2 import base as v2_base
+from mistral.lang.v2 import workflows
+from mistral.tests.unit.lang.v2 import base as v2_base
 from mistral import utils
-from mistral.workbook.v2 import workflows
 
 
 class TaskSpecValidation(v2_base.WorkflowSpecValidationTestCase):

mistral/tests/unit/lang/v2/test_workbook.py

@@ -19,8 +19,8 @@ import re
 import yaml
 
 from mistral import exceptions as exc
-from mistral.tests.unit.workbook.v2 import base
+from mistral.lang.v2 import workbook
-from mistral.workbook.v2 import workbook
+from mistral.tests.unit.lang.v2 import base
 
 
 class WorkbookSpecValidation(base.WorkbookSpecValidationTestCase):

mistral/tests/unit/lang/v2/test_workflows.py

@@ -18,7 +18,7 @@ import copy
 import yaml
 
 from mistral import exceptions as exc
-from mistral.tests.unit.workbook.v2 import base
+from mistral.tests.unit.lang.v2 import base
 from mistral import utils
 
 

mistral/tests/unit/services/test_action_service.py

@@ -15,10 +15,10 @@
 from oslo_config import cfg
 
 from mistral.db.v2 import api as db_api
+from mistral.lang import parser as spec_parser
 from mistral.services import actions as action_service
 from mistral.tests.unit import base
 from mistral import utils
-from mistral.workbook import parser as spec_parser
 
 
 # Use the set_default method to set value otherwise in certain test cases

mistral/tests/unit/services/test_workbook_service.py

@@ -15,9 +15,9 @@
 from oslo_config import cfg
 
 from mistral.db.v2 import api as db_api
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks as wb_service
 from mistral.tests.unit import base
-from mistral.workbook import parser as spec_parser
 
 
 # Use the set_default method to set value otherwise in certain test cases

mistral/tests/unit/services/test_workflow_service.py

@@ -19,10 +19,10 @@ from oslo_config import cfg
 
 from mistral.db.v2.sqlalchemy import api as db_api
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workflows as wf_service
 from mistral.tests.unit import base
 from mistral import utils
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import states
 
 

mistral/tests/unit/workflow/test_direct_workflow.py

@@ -17,9 +17,9 @@ import mock
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workflows as wf_service
 from mistral.tests.unit import base
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import direct_workflow as d_wf
 from mistral.workflow import states
 

mistral/tests/unit/workflow/test_reverse_workflow.py

@@ -15,9 +15,9 @@
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral.services import workbooks as wb_service
 from mistral.tests.unit import base
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import reverse_workflow as reverse_wf
 from mistral.workflow import states
 

mistral/tests/unit/workflow/test_workflow_base.py

@@ -13,8 +13,8 @@
 #    limitations under the License.
 
 
+from mistral.lang import parser as spec_parser
 from mistral.tests.unit import base
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import base as wf_base
 from mistral.workflow import direct_workflow as direct_wf
 from mistral.workflow import reverse_workflow as reverse_wf

mistral/workflow/base.py

@@ -21,8 +21,8 @@ from oslo_log import log as logging
 from osprofiler import profiler
 
 from mistral import exceptions as exc
+from mistral.lang import parser as spec_parser
 from mistral import utils as u
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import commands
 from mistral.workflow import data_flow
 from mistral.workflow import lookup_utils

mistral/workflow/commands.py

@@ -13,8 +13,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.workbook import parser as spec_parser
+from mistral.lang import parser as spec_parser
-from mistral.workbook.v2 import tasks
+from mistral.lang.v2 import tasks
 from mistral.workflow import states
 
 

mistral/workflow/data_flow.py

@@ -22,9 +22,9 @@ from mistral import context as auth_ctx
 from mistral.db.v2.sqlalchemy import models
 from mistral import exceptions as exc
 from mistral import expressions as expr
+from mistral.lang import parser as spec_parser
 from mistral import utils
 from mistral.utils import inspect_utils
-from mistral.workbook import parser as spec_parser
 from mistral.workflow import states
 
 LOG = logging.getLogger(__name__)