From 606059add8ccd708afcdd3b4b8e45a82714ed266 Mon Sep 17 00:00:00 2001 From: Roman Dobosz Date: Thu, 14 Jul 2016 14:56:32 +0200 Subject: [PATCH] Rename package mistral.engine.rpc to mistral.engine.rpc_backend There is a small issue during changing branch from current to Mitaka, where there was module called rpc.py, and currently there is a package rpc. Problem is, if Mistral from master was already at least run once, and changed back to Mitaka, there is a chance, that directory rpc still exists, and contains pyc files. Trying to use old rpc module will fail with unable to find get_transport method due remains of bytecode from master branch. Simple solution for this situation is to rename rpc module to rpc_backend. Change-Id: Ib5d05930a9715caf2bb5ce1dba4e520a503bc0cd --- mistral/api/controllers/v2/action_execution.py | 2 +- mistral/api/controllers/v2/execution.py | 2 +- mistral/api/controllers/v2/task.py | 2 +- mistral/cmd/launch.py | 2 +- mistral/engine/actions.py | 2 +- mistral/engine/{rpc => rpc_backend}/__init__.py | 0 mistral/engine/{rpc => rpc_backend}/base.py | 0 mistral/engine/{rpc => rpc_backend}/kombu/__init__.py | 0 mistral/engine/{rpc => rpc_backend}/kombu/base.py | 0 .../{rpc => rpc_backend}/kombu/examples/__init__.py | 0 .../{rpc => rpc_backend}/kombu/examples/client.py | 2 +- .../{rpc => rpc_backend}/kombu/examples/server.py | 2 +- .../engine/{rpc => rpc_backend}/kombu/kombu_client.py | 4 ++-- .../engine/{rpc => rpc_backend}/kombu/kombu_server.py | 4 ++-- mistral/engine/{rpc => rpc_backend}/oslo/__init__.py | 0 .../engine/{rpc => rpc_backend}/oslo/oslo_client.py | 4 ++-- .../engine/{rpc => rpc_backend}/oslo/oslo_server.py | 4 ++-- mistral/engine/{rpc => rpc_backend}/rpc.py | 4 ++-- mistral/engine/workflows.py | 2 +- 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/api/v2/test_tasks.py | 2 +- mistral/tests/unit/engine/base.py | 2 +- .../tests/unit/engine/{rpc => rpc_backend}/__init__.py | 0 .../unit/engine/{rpc => rpc_backend}/kombu/__init__.py | 0 .../unit/engine/{rpc => rpc_backend}/kombu/base.py | 0 .../engine/{rpc => rpc_backend}/kombu/fake_kombu.py | 0 .../{rpc => rpc_backend}/kombu/test_kombu_client.py | 6 +++--- .../{rpc => rpc_backend}/kombu/test_kombu_server.py | 6 +++--- .../tests/unit/engine/{rpc => rpc_backend}/test_rpc.py | 0 mistral/tests/unit/engine/test_environment.py | 2 +- mistral/tests/unit/services/test_trigger_service.py | 2 +- setup.cfg | 10 +++++----- 34 files changed, 36 insertions(+), 36 deletions(-) rename mistral/engine/{rpc => rpc_backend}/__init__.py (100%) rename mistral/engine/{rpc => rpc_backend}/base.py (100%) rename mistral/engine/{rpc => rpc_backend}/kombu/__init__.py (100%) rename mistral/engine/{rpc => rpc_backend}/kombu/base.py (100%) rename mistral/engine/{rpc => rpc_backend}/kombu/examples/__init__.py (100%) rename mistral/engine/{rpc => rpc_backend}/kombu/examples/client.py (95%) rename mistral/engine/{rpc => rpc_backend}/kombu/examples/server.py (96%) rename mistral/engine/{rpc => rpc_backend}/kombu/kombu_client.py (98%) rename mistral/engine/{rpc => rpc_backend}/kombu/kombu_server.py (97%) rename mistral/engine/{rpc => rpc_backend}/oslo/__init__.py (100%) rename mistral/engine/{rpc => rpc_backend}/oslo/oslo_client.py (93%) rename mistral/engine/{rpc => rpc_backend}/oslo/oslo_server.py (94%) rename mistral/engine/{rpc => rpc_backend}/rpc.py (99%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/__init__.py (100%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/kombu/__init__.py (100%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/kombu/base.py (100%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/kombu/fake_kombu.py (100%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/kombu/test_kombu_client.py (96%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/kombu/test_kombu_server.py (97%) rename mistral/tests/unit/engine/{rpc => rpc_backend}/test_rpc.py (100%) diff --git a/mistral/api/controllers/v2/action_execution.py b/mistral/api/controllers/v2/action_execution.py index f4d32537..af2bb84a 100644 --- a/mistral/api/controllers/v2/action_execution.py +++ b/mistral/api/controllers/v2/action_execution.py @@ -25,7 +25,7 @@ from mistral.api.controllers import resource from mistral.api.controllers.v2 import types from mistral import context from mistral.db.v2 import api as db_api -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.utils import rest_utils from mistral.workflow import states diff --git a/mistral/api/controllers/v2/execution.py b/mistral/api/controllers/v2/execution.py index 84000df5..f96ec405 100644 --- a/mistral/api/controllers/v2/execution.py +++ b/mistral/api/controllers/v2/execution.py @@ -25,7 +25,7 @@ from mistral.api.controllers.v2 import task from mistral.api.controllers.v2 import types from mistral import context from mistral.db.v2 import api as db_api -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.services import workflows as wf_service from mistral.utils import rest_utils diff --git a/mistral/api/controllers/v2/task.py b/mistral/api/controllers/v2/task.py index be6a131b..93190684 100644 --- a/mistral/api/controllers/v2/task.py +++ b/mistral/api/controllers/v2/task.py @@ -27,7 +27,7 @@ from mistral.api.controllers.v2 import action_execution from mistral.api.controllers.v2 import types from mistral import context from mistral.db.v2 import api as db_api -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.utils import rest_utils from mistral.workbook import parser as spec_parser diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py index e13ab70c..b20bf915 100644 --- a/mistral/cmd/launch.py +++ b/mistral/cmd/launch.py @@ -54,7 +54,7 @@ from mistral import config from mistral.db.v2 import api as db_api from mistral.engine import default_engine as def_eng from mistral.engine import default_executor as def_executor -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral.services import expiration_policy from mistral.services import scheduler from mistral.utils import profiler diff --git a/mistral/engine/actions.py b/mistral/engine/actions.py index 1cca71ff..b154ea1d 100644 --- a/mistral/engine/actions.py +++ b/mistral/engine/actions.py @@ -20,7 +20,7 @@ from osprofiler import profiler import six from mistral.db.v2 import api as db_api -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral.engine import utils as e_utils from mistral.engine import workflow_handler as wf_handler from mistral import exceptions as exc diff --git a/mistral/engine/rpc/__init__.py b/mistral/engine/rpc_backend/__init__.py similarity index 100% rename from mistral/engine/rpc/__init__.py rename to mistral/engine/rpc_backend/__init__.py diff --git a/mistral/engine/rpc/base.py b/mistral/engine/rpc_backend/base.py similarity index 100% rename from mistral/engine/rpc/base.py rename to mistral/engine/rpc_backend/base.py diff --git a/mistral/engine/rpc/kombu/__init__.py b/mistral/engine/rpc_backend/kombu/__init__.py similarity index 100% rename from mistral/engine/rpc/kombu/__init__.py rename to mistral/engine/rpc_backend/kombu/__init__.py diff --git a/mistral/engine/rpc/kombu/base.py b/mistral/engine/rpc_backend/kombu/base.py similarity index 100% rename from mistral/engine/rpc/kombu/base.py rename to mistral/engine/rpc_backend/kombu/base.py diff --git a/mistral/engine/rpc/kombu/examples/__init__.py b/mistral/engine/rpc_backend/kombu/examples/__init__.py similarity index 100% rename from mistral/engine/rpc/kombu/examples/__init__.py rename to mistral/engine/rpc_backend/kombu/examples/__init__.py diff --git a/mistral/engine/rpc/kombu/examples/client.py b/mistral/engine/rpc_backend/kombu/examples/client.py similarity index 95% rename from mistral/engine/rpc/kombu/examples/client.py rename to mistral/engine/rpc_backend/kombu/examples/client.py index bb9d737a..7bdf3339 100644 --- a/mistral/engine/rpc/kombu/examples/client.py +++ b/mistral/engine/rpc_backend/kombu/examples/client.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mistral.engine.rpc.kombu import kombu_client +from mistral.engine.rpc_backend.kombu import kombu_client # Example of using Kombu based RPC client. diff --git a/mistral/engine/rpc/kombu/examples/server.py b/mistral/engine/rpc_backend/kombu/examples/server.py similarity index 96% rename from mistral/engine/rpc/kombu/examples/server.py rename to mistral/engine/rpc_backend/kombu/examples/server.py index 85b8374a..119d5abc 100644 --- a/mistral/engine/rpc/kombu/examples/server.py +++ b/mistral/engine/rpc_backend/kombu/examples/server.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mistral.engine.rpc.kombu import kombu_server +from mistral.engine.rpc_backend.kombu import kombu_server # Simple example of endpoint of RPC server, which just diff --git a/mistral/engine/rpc/kombu/kombu_client.py b/mistral/engine/rpc_backend/kombu/kombu_client.py similarity index 98% rename from mistral/engine/rpc/kombu/kombu_client.py rename to mistral/engine/rpc_backend/kombu/kombu_client.py index 4a3536cf..69bc6db0 100644 --- a/mistral/engine/rpc/kombu/kombu_client.py +++ b/mistral/engine/rpc_backend/kombu/kombu_client.py @@ -18,8 +18,8 @@ import time import kombu from oslo_log import log as logging -from mistral.engine.rpc import base as rpc_base -from mistral.engine.rpc.kombu import base as kombu_base +from mistral.engine.rpc_backend import base as rpc_base +from mistral.engine.rpc_backend.kombu import base as kombu_base from mistral import exceptions as exc from mistral import utils diff --git a/mistral/engine/rpc/kombu/kombu_server.py b/mistral/engine/rpc_backend/kombu/kombu_server.py similarity index 97% rename from mistral/engine/rpc/kombu/kombu_server.py rename to mistral/engine/rpc_backend/kombu/kombu_server.py index 14ff5316..413bb05f 100644 --- a/mistral/engine/rpc/kombu/kombu_server.py +++ b/mistral/engine/rpc_backend/kombu/kombu_server.py @@ -19,8 +19,8 @@ import kombu from oslo_log import log as logging from mistral import context as auth_context -from mistral.engine.rpc import base as rpc_base -from mistral.engine.rpc.kombu import base as kombu_base +from mistral.engine.rpc_backend import base as rpc_base +from mistral.engine.rpc_backend.kombu import base as kombu_base from mistral import exceptions as exc diff --git a/mistral/engine/rpc/oslo/__init__.py b/mistral/engine/rpc_backend/oslo/__init__.py similarity index 100% rename from mistral/engine/rpc/oslo/__init__.py rename to mistral/engine/rpc_backend/oslo/__init__.py diff --git a/mistral/engine/rpc/oslo/oslo_client.py b/mistral/engine/rpc_backend/oslo/oslo_client.py similarity index 93% rename from mistral/engine/rpc/oslo/oslo_client.py rename to mistral/engine/rpc_backend/oslo/oslo_client.py index 4e44c374..27255b93 100644 --- a/mistral/engine/rpc/oslo/oslo_client.py +++ b/mistral/engine/rpc_backend/oslo/oslo_client.py @@ -15,8 +15,8 @@ import oslo_messaging as messaging from mistral import context as auth_ctx -from mistral.engine.rpc import base as rpc_base -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import base as rpc_base +from mistral.engine.rpc_backend import rpc class OsloRPCClient(rpc_base.RPCClient): diff --git a/mistral/engine/rpc/oslo/oslo_server.py b/mistral/engine/rpc_backend/oslo/oslo_server.py similarity index 94% rename from mistral/engine/rpc/oslo/oslo_server.py rename to mistral/engine/rpc_backend/oslo/oslo_server.py index 6191d7fb..399a87e9 100644 --- a/mistral/engine/rpc/oslo/oslo_server.py +++ b/mistral/engine/rpc_backend/oslo/oslo_server.py @@ -16,8 +16,8 @@ from oslo_log import log as logging import oslo_messaging as messaging from mistral import context as ctx -from mistral.engine.rpc import base as rpc_base -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import base as rpc_base +from mistral.engine.rpc_backend import rpc LOG = logging.getLogger(__name__) diff --git a/mistral/engine/rpc/rpc.py b/mistral/engine/rpc_backend/rpc.py similarity index 99% rename from mistral/engine/rpc/rpc.py rename to mistral/engine/rpc_backend/rpc.py index 65869cb8..79c5e50b 100644 --- a/mistral/engine/rpc/rpc.py +++ b/mistral/engine/rpc_backend/rpc.py @@ -86,7 +86,7 @@ def get_rpc_server_driver(): global _IMPL_SERVER if not _IMPL_SERVER: _IMPL_SERVER = driver.DriverManager( - 'mistral.engine.rpc', + 'mistral.engine.rpc_backend', '%s_server' % rpc_impl ).driver @@ -99,7 +99,7 @@ def get_rpc_client_driver(): global _IMPL_CLIENT if not _IMPL_CLIENT: _IMPL_CLIENT = driver.DriverManager( - 'mistral.engine.rpc', + 'mistral.engine.rpc_backend', '%s_client' % rpc_impl ).driver diff --git a/mistral/engine/workflows.py b/mistral/engine/workflows.py index efb339ff..3256a571 100644 --- a/mistral/engine/workflows.py +++ b/mistral/engine/workflows.py @@ -23,7 +23,7 @@ import six from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models as db_models from mistral.engine import dispatcher -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral.engine import utils as eng_utils from mistral import exceptions as exc from mistral.services import scheduler diff --git a/mistral/services/periodic.py b/mistral/services/periodic.py index 804eb0d8..044fbf15 100644 --- a/mistral/services/periodic.py +++ b/mistral/services/periodic.py @@ -21,7 +21,7 @@ from oslo_service import threadgroup from mistral import context as auth_ctx from mistral.db.v2 import api as db_api_v2 -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.services import security from mistral.services import triggers diff --git a/mistral/tests/unit/api/v2/test_action_executions.py b/mistral/tests/unit/api/v2/test_action_executions.py index 851b45b0..4a0e8d59 100644 --- a/mistral/tests/unit/api/v2/test_action_executions.py +++ b/mistral/tests/unit/api/v2/test_action_executions.py @@ -25,7 +25,7 @@ import oslo_messaging from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend 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 5f2e7687..5eca6306 100644 --- a/mistral/tests/unit/api/v2/test_executions.py +++ b/mistral/tests/unit/api/v2/test_executions.py @@ -27,7 +27,7 @@ from webtest import app as webtest_app from mistral.db.v2 import api as db_api from mistral.db.v2.sqlalchemy import api as sql_db_api from mistral.db.v2.sqlalchemy import models -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.tests.unit.api import base from mistral import utils diff --git a/mistral/tests/unit/api/v2/test_tasks.py b/mistral/tests/unit/api/v2/test_tasks.py index 5c3ba2da..bfc977c2 100644 --- a/mistral/tests/unit/api/v2/test_tasks.py +++ b/mistral/tests/unit/api/v2/test_tasks.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.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.tests.unit.api import base from mistral.workflow import data_flow diff --git a/mistral/tests/unit/engine/base.py b/mistral/tests/unit/engine/base.py index 1234a22f..1948bd96 100644 --- a/mistral/tests/unit/engine/base.py +++ b/mistral/tests/unit/engine/base.py @@ -22,7 +22,7 @@ from mistral import context as ctx from mistral.db.v2 import api as db_api from mistral.engine import default_engine as def_eng from mistral.engine import default_executor as def_exec -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral.services import scheduler from mistral.tests.unit import base from mistral.workflow import states diff --git a/mistral/tests/unit/engine/rpc/__init__.py b/mistral/tests/unit/engine/rpc_backend/__init__.py similarity index 100% rename from mistral/tests/unit/engine/rpc/__init__.py rename to mistral/tests/unit/engine/rpc_backend/__init__.py diff --git a/mistral/tests/unit/engine/rpc/kombu/__init__.py b/mistral/tests/unit/engine/rpc_backend/kombu/__init__.py similarity index 100% rename from mistral/tests/unit/engine/rpc/kombu/__init__.py rename to mistral/tests/unit/engine/rpc_backend/kombu/__init__.py diff --git a/mistral/tests/unit/engine/rpc/kombu/base.py b/mistral/tests/unit/engine/rpc_backend/kombu/base.py similarity index 100% rename from mistral/tests/unit/engine/rpc/kombu/base.py rename to mistral/tests/unit/engine/rpc_backend/kombu/base.py diff --git a/mistral/tests/unit/engine/rpc/kombu/fake_kombu.py b/mistral/tests/unit/engine/rpc_backend/kombu/fake_kombu.py similarity index 100% rename from mistral/tests/unit/engine/rpc/kombu/fake_kombu.py rename to mistral/tests/unit/engine/rpc_backend/kombu/fake_kombu.py diff --git a/mistral/tests/unit/engine/rpc/kombu/test_kombu_client.py b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py similarity index 96% rename from mistral/tests/unit/engine/rpc/kombu/test_kombu_client.py rename to mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py index 12bfd1e3..b33087b3 100644 --- a/mistral/tests/unit/engine/rpc/kombu/test_kombu_client.py +++ b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_client.py @@ -14,8 +14,8 @@ # under the License. from mistral import exceptions as exc -from mistral.tests.unit.engine.rpc.kombu import base -from mistral.tests.unit.engine.rpc.kombu import fake_kombu +from mistral.tests.unit.engine.rpc_backend.kombu import base +from mistral.tests.unit.engine.rpc_backend.kombu import fake_kombu from mistral import utils import mock @@ -23,7 +23,7 @@ import socket import sys with mock.patch.dict('sys.modules', kombu=fake_kombu): - from mistral.engine.rpc.kombu import kombu_client + from mistral.engine.rpc_backend.kombu import kombu_client class TestException(exc.MistralException): diff --git a/mistral/tests/unit/engine/rpc/kombu/test_kombu_server.py b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py similarity index 97% rename from mistral/tests/unit/engine/rpc/kombu/test_kombu_server.py rename to mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py index b4fa5f4c..3f3e2084 100644 --- a/mistral/tests/unit/engine/rpc/kombu/test_kombu_server.py +++ b/mistral/tests/unit/engine/rpc_backend/kombu/test_kombu_server.py @@ -14,14 +14,14 @@ # under the License. from mistral import exceptions as exc -from mistral.tests.unit.engine.rpc.kombu import base -from mistral.tests.unit.engine.rpc.kombu import fake_kombu +from mistral.tests.unit.engine.rpc_backend.kombu import base +from mistral.tests.unit.engine.rpc_backend.kombu import fake_kombu import mock import socket with mock.patch.dict('sys.modules', kombu=fake_kombu): - from mistral.engine.rpc.kombu import kombu_server + from mistral.engine.rpc_backend.kombu import kombu_server class TestException(exc.MistralError): diff --git a/mistral/tests/unit/engine/rpc/test_rpc.py b/mistral/tests/unit/engine/rpc_backend/test_rpc.py similarity index 100% rename from mistral/tests/unit/engine/rpc/test_rpc.py rename to mistral/tests/unit/engine/rpc_backend/test_rpc.py diff --git a/mistral/tests/unit/engine/test_environment.py b/mistral/tests/unit/engine/test_environment.py index c8c41443..04529a1c 100644 --- a/mistral/tests/unit/engine/test_environment.py +++ b/mistral/tests/unit/engine/test_environment.py @@ -17,7 +17,7 @@ from oslo_config import cfg from mistral.db.v2 import api as db_api from mistral.engine import default_executor -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral.services import workbooks as wb_service from mistral.tests.unit.engine import base diff --git a/mistral/tests/unit/services/test_trigger_service.py b/mistral/tests/unit/services/test_trigger_service.py index 1bd278b5..6aed8d23 100644 --- a/mistral/tests/unit/services/test_trigger_service.py +++ b/mistral/tests/unit/services/test_trigger_service.py @@ -17,7 +17,7 @@ import eventlet import mock from oslo_config import cfg -from mistral.engine.rpc import rpc +from mistral.engine.rpc_backend import rpc from mistral import exceptions as exc from mistral.services import periodic from mistral.services import security diff --git a/setup.cfg b/setup.cfg index 9840eb9b..a02d10d6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,11 +40,11 @@ console_scripts = mistral-server = mistral.cmd.launch:main mistral-db-manage = mistral.db.sqlalchemy.migration.cli:main -mistral.engine.rpc = - oslo_client = mistral.engine.rpc.oslo.oslo_client:OsloRPCClient - oslo_server = mistral.engine.rpc.oslo.oslo_server:OsloRPCServer - kombu_client = mistral.engine.rpc.kombu.kombu_client:KombuRPCClient - kombu_server = mistral.engine.rpc.kombu.kombu_server:KombuRPCServer +mistral.engine.rpc_backend = + oslo_client = mistral.engine.rpc_backend.oslo.oslo_client:OsloRPCClient + oslo_server = mistral.engine.rpc_backend.oslo.oslo_server:OsloRPCServer + kombu_client = mistral.engine.rpc_backend.kombu.kombu_client:KombuRPCClient + kombu_server = mistral.engine.rpc_backend.kombu.kombu_server:KombuRPCServer oslo.config.opts = mistral.config = mistral.config:list_opts