From 024802aafd7568888c95772d30a29ed460e5d55e Mon Sep 17 00:00:00 2001 From: Boden R Date: Mon, 4 Feb 2019 12:53:38 -0700 Subject: [PATCH] remove neutron.common.rpc The neutron.common.rpc module has been in neutron-lib for awhile now and neutron is shimmed to use neutron-lib already. This patch removes neutron.common.rpc and switches the code over to use neutron-lib's implementation where needed. NeutronLibImpact Change-Id: I733f07a8c4a2af071b3467bd710290eee11a4f4c --- neutron/agent/dhcp/agent.py | 2 +- neutron/agent/l3/agent.py | 2 +- .../agent/l3/extensions/port_forwarding.py | 2 +- neutron/agent/l3/extensions/qos/base.py | 2 +- neutron/agent/metadata/agent.py | 2 +- neutron/agent/resource_cache.py | 2 +- neutron/agent/rpc.py | 7 ++-- .../rpc/agentnotifiers/dhcp_rpc_agent_api.py | 2 +- .../rpc/agentnotifiers/l3_rpc_agent_api.py | 2 +- .../agentnotifiers/metering_rpc_agent_api.py | 2 +- neutron/api/rpc/handlers/dvr_rpc.py | 2 +- neutron/api/rpc/handlers/resources_rpc.py | 2 +- .../api/rpc/handlers/securitygroups_rpc.py | 2 +- neutron/api/v2/base.py | 2 +- neutron/cmd/eventlet/usage_audit.py | 2 +- neutron/common/config.py | 2 +- neutron/common/rpc.py | 33 ------------------- neutron/db/l3_db.py | 2 +- neutron/extensions/dhcpagentscheduler.py | 2 +- neutron/extensions/l3agentscheduler.py | 2 +- neutron/extensions/tagging.py | 2 +- neutron/pecan_wsgi/hooks/notifier.py | 2 +- neutron/plugins/ml2/drivers/l2pop/rpc.py | 3 +- neutron/plugins/ml2/plugin.py | 2 +- neutron/plugins/ml2/rpc.py | 2 +- neutron/service.py | 2 +- .../services/l3_router/l3_router_plugin.py | 2 +- neutron/services/logapi/agent/l3/base.py | 2 +- neutron/services/logapi/rpc/agent.py | 2 +- neutron/services/logapi/rpc/server.py | 2 +- .../metering/agents/metering_agent.py | 2 +- neutron/services/metering/metering_plugin.py | 2 +- neutron/services/trunk/rpc/agent.py | 2 +- neutron/services/trunk/rpc/server.py | 2 +- .../unit/agent/l3/extensions/qos/test_fip.py | 2 +- .../l3/extensions/qos/test_gateway_ip.py | 2 +- .../l3/extensions/test_port_forwarding.py | 2 +- .../unit/agent/l3/extensions/test_snat_log.py | 2 +- neutron/tests/unit/agent/test_rpc.py | 2 +- .../unit/agent/test_securitygroups_rpc.py | 2 +- .../agentnotifiers/test_l3_rpc_agent_api.py | 3 +- .../tests/unit/db/test_agentschedulers_db.py | 2 +- .../agent/test_ovs_neutron_agent.py | 2 +- .../unit/scheduler/test_l3_agent_scheduler.py | 2 +- .../unit/services/trunk/rpc/test_agent.py | 2 +- .../unit/services/trunk/rpc/test_server.py | 2 +- 46 files changed, 48 insertions(+), 82 deletions(-) delete mode 100644 neutron/common/rpc.py diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py index 19b950877f0..a32d45aab5f 100644 --- a/neutron/agent/dhcp/agent.py +++ b/neutron/agent/dhcp/agent.py @@ -23,6 +23,7 @@ from neutron_lib.agent import topics from neutron_lib import constants from neutron_lib import context from neutron_lib import exceptions +from neutron_lib import rpc as n_rpc from oslo_concurrency import lockutils from oslo_config import cfg from oslo_log import log as logging @@ -39,7 +40,6 @@ from neutron.agent.linux import external_process from neutron.agent.metadata import driver as metadata_driver from neutron.agent import rpc as agent_rpc from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron.common import utils from neutron import manager diff --git a/neutron/agent/l3/agent.py b/neutron/agent/l3/agent.py index 31b361569d7..a115dfcc32b 100644 --- a/neutron/agent/l3/agent.py +++ b/neutron/agent/l3/agent.py @@ -23,6 +23,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants as lib_const from neutron_lib import context as n_context from neutron_lib.exceptions import l3 as l3_exc +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_context import context as common_context from oslo_log import log as logging @@ -54,7 +55,6 @@ from neutron.agent.metadata import driver as metadata_driver from neutron.agent import rpc as agent_rpc from neutron.common import constants as l3_constants from neutron.common import ipv6_utils -from neutron.common import rpc as n_rpc from neutron.common import utils from neutron import manager diff --git a/neutron/agent/l3/extensions/port_forwarding.py b/neutron/agent/l3/extensions/port_forwarding.py index f7b172f173c..cc99ad0545e 100644 --- a/neutron/agent/l3/extensions/port_forwarding.py +++ b/neutron/agent/l3/extensions/port_forwarding.py @@ -16,6 +16,7 @@ import collections import netaddr +from neutron_lib import rpc as n_rpc from oslo_concurrency import lockutils from oslo_log import log as logging @@ -25,7 +26,6 @@ from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc from neutron.common import constants -from neutron.common import rpc as n_rpc from neutron_lib.agent import l3_extension from neutron_lib import constants as lib_consts diff --git a/neutron/agent/l3/extensions/qos/base.py b/neutron/agent/l3/extensions/qos/base.py index 8ab50b10333..372ddac6eb0 100644 --- a/neutron/agent/l3/extensions/qos/base.py +++ b/neutron/agent/l3/extensions/qos/base.py @@ -17,6 +17,7 @@ import collections from neutron_lib import constants from neutron_lib.db import constants as db_consts +from neutron_lib import rpc as n_rpc from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging @@ -24,7 +25,6 @@ from neutron.agent.linux import l3_tc_lib as tc_lib from neutron.api.rpc.callbacks.consumer import registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc LOG = logging.getLogger(__name__) diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index 79df50ca27b..b3fb9aa1ac7 100644 --- a/neutron/agent/metadata/agent.py +++ b/neutron/agent/metadata/agent.py @@ -18,6 +18,7 @@ import hmac from neutron_lib.agent import topics from neutron_lib import constants from neutron_lib import context +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_log import log as logging import oslo_messaging @@ -34,7 +35,6 @@ from neutron.agent import rpc as agent_rpc from neutron.common import cache_utils as cache from neutron.common import constants as n_const from neutron.common import ipv6_utils -from neutron.common import rpc as n_rpc from neutron.conf.agent.metadata import config LOG = logging.getLogger(__name__) diff --git a/neutron/agent/resource_cache.py b/neutron/agent/resource_cache.py index 0d333d59bc7..439b1fd2fdb 100644 --- a/neutron/agent/resource_cache.py +++ b/neutron/agent/resource_cache.py @@ -15,13 +15,13 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib import context as n_ctx +from neutron_lib import rpc as n_rpc from oslo_log import log as logging from neutron._i18n import _ from neutron.api.rpc.callbacks.consumer import registry as registry_rpc from neutron.api.rpc.callbacks import events as events_rpc from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron import objects LOG = logging.getLogger(__name__) diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py index 6360d38ed5b..a018b12c36e 100644 --- a/neutron/agent/rpc.py +++ b/neutron/agent/rpc.py @@ -32,7 +32,6 @@ from oslo_utils import uuidutils from neutron.agent import resource_cache from neutron.api.rpc.callbacks import resources from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron import objects LOG = logging.getLogger(__name__) @@ -52,7 +51,7 @@ def create_consumers(endpoints, prefix, topic_details, start_listening=True): :returns: A common Connection. """ - connection = n_rpc.Connection() + connection = lib_rpc.Connection() for details in topic_details: topic, operation, node_name = itertools.islice( itertools.chain(details, [None]), 3) @@ -80,7 +79,7 @@ class PluginReportStateAPI(object): def __init__(self, topic): target = oslo_messaging.Target(topic=topic, version='1.2', namespace=n_const.RPC_NAMESPACE_STATE) - self.client = n_rpc.get_client(target) + self.client = lib_rpc.get_client(target) def has_alive_neutron_server(self, context, **kwargs): cctxt = self.client.prepare() @@ -117,7 +116,7 @@ class PluginApi(object): def __init__(self, topic): target = oslo_messaging.Target(topic=topic, version='1.0') - self.client = n_rpc.get_client(target) + self.client = lib_rpc.get_client(target) def get_device_details(self, context, device, agent_id, host=None): cctxt = self.client.prepare() diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py index d862ed33024..a8e691d0c07 100644 --- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py @@ -23,11 +23,11 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_log import log as logging import oslo_messaging -from neutron.common import rpc as n_rpc # Priorities - lower value is higher priority PRIORITY_NETWORK_CREATE = 0 diff --git a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py index e980baaad79..6e102e78b75 100644 --- a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py @@ -20,11 +20,11 @@ from neutron_lib.api import extensions from neutron_lib import constants from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_log import log as logging import oslo_messaging from neutron.api.rpc.agentnotifiers import utils as ag_utils -from neutron.common import rpc as n_rpc LOG = logging.getLogger(__name__) diff --git a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py index 4d39d54e3c8..dd73cecfdd1 100644 --- a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py @@ -17,10 +17,10 @@ from neutron_lib.api import extensions from neutron_lib import constants from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_log import log as logging import oslo_messaging -from neutron.common import rpc as n_rpc from neutron.db import agentschedulers_db LOG = logging.getLogger(__name__) diff --git a/neutron/api/rpc/handlers/dvr_rpc.py b/neutron/api/rpc/handlers/dvr_rpc.py index c7b5dd10208..6fd03687d4c 100644 --- a/neutron/api/rpc/handlers/dvr_rpc.py +++ b/neutron/api/rpc/handlers/dvr_rpc.py @@ -15,12 +15,12 @@ from neutron_lib.agent import topics from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers from oslo_log import log as logging import oslo_messaging from neutron.common import constants -from neutron.common import rpc as n_rpc LOG = logging.getLogger(__name__) diff --git a/neutron/api/rpc/handlers/resources_rpc.py b/neutron/api/rpc/handlers/resources_rpc.py index 4090dcd147e..076beb8b72b 100644 --- a/neutron/api/rpc/handlers/resources_rpc.py +++ b/neutron/api/rpc/handlers/resources_rpc.py @@ -17,6 +17,7 @@ import collections from neutron_lib.agent import topics from neutron_lib import exceptions +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers from oslo_log import log as logging import oslo_messaging @@ -28,7 +29,6 @@ from neutron.api.rpc.callbacks.producer import registry as prod_registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.callbacks import version_manager from neutron.common import constants -from neutron.common import rpc as n_rpc from neutron.objects import base as obj_base LOG = logging.getLogger(__name__) diff --git a/neutron/api/rpc/handlers/securitygroups_rpc.py b/neutron/api/rpc/handlers/securitygroups_rpc.py index 1e5def02b30..7b03e5adcf5 100644 --- a/neutron/api/rpc/handlers/securitygroups_rpc.py +++ b/neutron/api/rpc/handlers/securitygroups_rpc.py @@ -18,13 +18,13 @@ from neutron_lib.agent import topics from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron_lib.utils import net from oslo_log import log as logging import oslo_messaging from neutron.api.rpc.handlers import resources_rpc from neutron.common import constants -from neutron.common import rpc as n_rpc from neutron.db import securitygroups_rpc_base as sg_rpc_base LOG = logging.getLogger(__name__) diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py index 337e97a5bdf..be29d2381c1 100644 --- a/neutron/api/v2/base.py +++ b/neutron/api/v2/base.py @@ -22,6 +22,7 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.db import api as db_api from neutron_lib import exceptions +from neutron_lib import rpc as n_rpc from oslo_log import log as logging from oslo_policy import policy as oslo_policy from oslo_utils import excutils @@ -31,7 +32,6 @@ from neutron._i18n import _ from neutron.api import api_common from neutron.api.v2 import resource as wsgi_resource from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron import policy from neutron import quota from neutron.quota import resource_registry diff --git a/neutron/cmd/eventlet/usage_audit.py b/neutron/cmd/eventlet/usage_audit.py index 888f0aa89fb..4d1435af4c6 100644 --- a/neutron/cmd/eventlet/usage_audit.py +++ b/neutron/cmd/eventlet/usage_audit.py @@ -22,9 +22,9 @@ import sys from neutron_lib import context from neutron_lib.plugins import constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron.common import config -from neutron.common import rpc as n_rpc from neutron import manager diff --git a/neutron/common/config.py b/neutron/common/config.py index a9a798fcdd5..f144f64841c 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -21,6 +21,7 @@ import sys from keystoneauth1 import loading as ks_loading from neutron_lib.api import validators +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_log import log as logging import oslo_messaging @@ -28,7 +29,6 @@ from oslo_middleware import cors from oslo_service import wsgi from neutron._i18n import _ -from neutron.common import rpc as n_rpc from neutron.conf import common as common_config from neutron import policy from neutron import version diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py deleted file mode 100644 index 5a790b7de90..00000000000 --- a/neutron/common/rpc.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2012 OpenStack Foundation. -# Copyright (c) 2014 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from neutron_lib import rpc - - -# TODO(boden): remove lib rpc shims -TRANSPORT = rpc.TRANSPORT -NOTIFICATION_TRANSPORT = rpc.NOTIFICATION_TRANSPORT -NOTIFIER = rpc.NOTIFIER - -init = rpc.init -cleanup = rpc.cleanup -BackingOffClient = rpc.BackingOffClient -get_client = rpc.get_client -get_server = rpc.get_server -get_notifier = rpc.get_notifier -RequestContextSerializer = rpc.RequestContextSerializer -Service = rpc.Service -Connection = rpc.Connection diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index ec46a168f9c..b15162d6895 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -35,6 +35,7 @@ from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory from neutron_lib.plugins import utils as plugin_utils +from neutron_lib import rpc as n_rpc from neutron_lib.services import base as base_services from oslo_log import log as logging from oslo_utils import uuidutils @@ -44,7 +45,6 @@ from sqlalchemy.orm import exc from neutron._i18n import _ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.common import ipv6_utils -from neutron.common import rpc as n_rpc from neutron.common import utils from neutron.db import _utils as db_utils from neutron.db.models import l3 as l3_models diff --git a/neutron/extensions/dhcpagentscheduler.py b/neutron/extensions/dhcpagentscheduler.py index 235466f75c4..e1c95b32a60 100644 --- a/neutron/extensions/dhcpagentscheduler.py +++ b/neutron/extensions/dhcpagentscheduler.py @@ -21,11 +21,11 @@ from neutron_lib.api.definitions import network as net_apidef from neutron_lib.api import extensions as api_extensions from neutron_lib.api import faults from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc import six from neutron.api import extensions from neutron.api.v2 import resource -from neutron.common import rpc as n_rpc from neutron import policy from neutron import wsgi diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py index d976f426a2d..980486f23a9 100644 --- a/neutron/extensions/l3agentscheduler.py +++ b/neutron/extensions/l3agentscheduler.py @@ -22,6 +22,7 @@ from neutron_lib import exceptions from neutron_lib.exceptions import agent as agent_exc from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_log import log as logging import six import webob.exc @@ -29,7 +30,6 @@ import webob.exc from neutron._i18n import _ from neutron.api import extensions from neutron.api.v2 import resource -from neutron.common import rpc as n_rpc from neutron import policy from neutron import wsgi diff --git a/neutron/extensions/tagging.py b/neutron/extensions/tagging.py index b1029ff83b6..b65978ee97c 100644 --- a/neutron/extensions/tagging.py +++ b/neutron/extensions/tagging.py @@ -18,6 +18,7 @@ from neutron_lib.api import faults from neutron_lib.api import validators from neutron_lib import exceptions from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron_lib.services import base as service_base import six import webob.exc @@ -25,7 +26,6 @@ import webob.exc from neutron._i18n import _ from neutron.api import extensions from neutron.api.v2 import resource as api_resource -from neutron.common import rpc as n_rpc from neutron.db import standard_attr diff --git a/neutron/pecan_wsgi/hooks/notifier.py b/neutron/pecan_wsgi/hooks/notifier.py index f9167e910be..1b4334cf2d2 100644 --- a/neutron/pecan_wsgi/hooks/notifier.py +++ b/neutron/pecan_wsgi/hooks/notifier.py @@ -15,10 +15,10 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry +from neutron_lib import rpc as n_rpc from oslo_log import log from pecan import hooks -from neutron.common import rpc as n_rpc from neutron.pecan_wsgi import constants as pecan_constants from neutron.pecan_wsgi.hooks import utils diff --git a/neutron/plugins/ml2/drivers/l2pop/rpc.py b/neutron/plugins/ml2/drivers/l2pop/rpc.py index bc75cc85eb0..91eed7118c5 100644 --- a/neutron/plugins/ml2/drivers/l2pop/rpc.py +++ b/neutron/plugins/ml2/drivers/l2pop/rpc.py @@ -16,11 +16,10 @@ import collections from neutron_lib.agent import topics +from neutron_lib import rpc as n_rpc from oslo_log import log as logging import oslo_messaging -from neutron.common import rpc as n_rpc - LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 2604a563a3a..272efa0f818 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -46,6 +46,7 @@ from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory from neutron_lib.plugins.ml2 import api from neutron_lib.plugins import utils as p_utils +from neutron_lib import rpc as n_rpc from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from oslo_db import exception as os_db_exception @@ -68,7 +69,6 @@ from neutron.api.rpc.handlers import metadata_rpc from neutron.api.rpc.handlers import resources_rpc from neutron.api.rpc.handlers import securitygroups_rpc from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron.common import utils from neutron.db import address_scope_db from neutron.db import agents_db diff --git a/neutron/plugins/ml2/rpc.py b/neutron/plugins/ml2/rpc.py index 669fec84cc6..609864c114d 100644 --- a/neutron/plugins/ml2/rpc.py +++ b/neutron/plugins/ml2/rpc.py @@ -21,6 +21,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants as n_const from neutron_lib.plugins import directory from neutron_lib.plugins.ml2 import api +from neutron_lib import rpc as n_rpc from neutron_lib.services.qos import constants as qos_consts from oslo_log import log import oslo_messaging @@ -30,7 +31,6 @@ from neutron.agent import _topics as n_topics from neutron.api.rpc.handlers import dvr_rpc from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc from neutron.common import constants as c_const -from neutron.common import rpc as n_rpc from neutron.db import l3_hamode_db from neutron.db import provisioning_blocks from neutron.plugins.ml2 import db as ml2_db diff --git a/neutron/service.py b/neutron/service.py index 320b46d4db3..50a859c5475 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -23,6 +23,7 @@ from neutron_lib.callbacks import resources from neutron_lib import context from neutron_lib.db import api as session from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron_lib import worker as neutron_worker from oslo_concurrency import processutils from oslo_config import cfg @@ -35,7 +36,6 @@ from oslo_utils import importutils from neutron.common import config from neutron.common import profiler -from neutron.common import rpc as n_rpc from neutron.conf import service from neutron import wsgi diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py index c6cb74fc13b..c930f3da039 100644 --- a/neutron/services/l3_router/l3_router_plugin.py +++ b/neutron/services/l3_router/l3_router_plugin.py @@ -18,6 +18,7 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib import constants as n_const from neutron_lib.db import resource_extend from neutron_lib.plugins import constants as plugin_constants +from neutron_lib import rpc as n_rpc from neutron_lib.services import base as service_base from oslo_config import cfg from oslo_log import helpers as log_helpers @@ -26,7 +27,6 @@ from oslo_utils import importutils from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.rpc.handlers import l3_rpc -from neutron.common import rpc as n_rpc from neutron.db import common_db_mixin from neutron.db import dns_db from neutron.db import extraroute_db diff --git a/neutron/services/logapi/agent/l3/base.py b/neutron/services/logapi/agent/l3/base.py index a3d3a4125fd..241bab9bbd7 100644 --- a/neutron/services/logapi/agent/l3/base.py +++ b/neutron/services/logapi/agent/l3/base.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import rpc as n_rpc from oslo_concurrency import lockutils from oslo_log import log as logging @@ -20,7 +21,6 @@ from neutron.api.rpc.callbacks.consumer import registry from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.conf.services import logging as log_cfg from neutron import manager diff --git a/neutron/services/logapi/rpc/agent.py b/neutron/services/logapi/rpc/agent.py index 55ef76d911d..f37cf92bcaa 100644 --- a/neutron/services/logapi/rpc/agent.py +++ b/neutron/services/logapi/rpc/agent.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers import oslo_messaging -from neutron.common import rpc as n_rpc from neutron.services.logapi.common import constants as log_const diff --git a/neutron/services/logapi/rpc/server.py b/neutron/services/logapi/rpc/server.py index 520a9b20173..b2d26acfe14 100644 --- a/neutron/services/logapi/rpc/server.py +++ b/neutron/services/logapi/rpc/server.py @@ -14,13 +14,13 @@ # under the License. from neutron_lib.callbacks import resources as r_const +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers from oslo_log import log as logging import oslo_messaging from neutron.api.rpc.callbacks import events from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.services.logapi.common import constants as log_const from neutron.services.logapi.common import db_api diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index 03540f8feb9..456d8c6a8ce 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -17,6 +17,7 @@ import sys from neutron_lib.agent import topics from neutron_lib import constants from neutron_lib import context +from neutron_lib import rpc as n_rpc from neutron_lib.utils import runtime from oslo_config import cfg from oslo_log import log as logging @@ -30,7 +31,6 @@ from neutron._i18n import _ from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron.conf.agent import common as config from neutron.conf.services import metering_agent from neutron import manager diff --git a/neutron/services/metering/metering_plugin.py b/neutron/services/metering/metering_plugin.py index cce6b1bea9a..3ad78b821be 100644 --- a/neutron/services/metering/metering_plugin.py +++ b/neutron/services/metering/metering_plugin.py @@ -14,9 +14,9 @@ from neutron_lib.agent import topics from neutron_lib.api.definitions import metering as metering_apidef +from neutron_lib import rpc as n_rpc from neutron.api.rpc.agentnotifiers import metering_rpc_agent_api -from neutron.common import rpc as n_rpc from neutron.db.metering import metering_db from neutron.db.metering import metering_rpc from neutron import service diff --git a/neutron/services/trunk/rpc/agent.py b/neutron/services/trunk/rpc/agent.py index 950150716e5..579f8f92c0d 100644 --- a/neutron/services/trunk/rpc/agent.py +++ b/neutron/services/trunk/rpc/agent.py @@ -14,13 +14,13 @@ import abc +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers import oslo_messaging from neutron.api.rpc.callbacks.consumer import registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.services.trunk.rpc import constants as trunk_consts # This module contains stub (client-side) and skeleton (server-side) diff --git a/neutron/services/trunk/rpc/server.py b/neutron/services/trunk/rpc/server.py index 677d8b892cf..f717aa4a2dd 100644 --- a/neutron/services/trunk/rpc/server.py +++ b/neutron/services/trunk/rpc/server.py @@ -17,6 +17,7 @@ import collections from neutron_lib.api.definitions import portbindings from neutron_lib.db import api as db_api from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_log import helpers as log_helpers from oslo_log import log as logging import oslo_messaging @@ -25,7 +26,6 @@ from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks.producer import registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.objects import trunk as trunk_objects from neutron.services.trunk import constants as trunk_consts from neutron.services.trunk import exceptions as trunk_exc diff --git a/neutron/tests/unit/agent/l3/extensions/qos/test_fip.py b/neutron/tests/unit/agent/l3/extensions/qos/test_fip.py index 5d08023745b..14b7867229d 100644 --- a/neutron/tests/unit/agent/l3/extensions/qos/test_fip.py +++ b/neutron/tests/unit/agent/l3/extensions/qos/test_fip.py @@ -16,6 +16,7 @@ import mock from neutron_lib import constants as lib_const from neutron_lib import context +from neutron_lib import rpc as n_rpc from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils @@ -26,7 +27,6 @@ from neutron.agent.l3 import router_info as l3router from neutron.api.rpc.callbacks.consumer import registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.objects.qos import policy from neutron.objects.qos import rule from neutron.tests import base diff --git a/neutron/tests/unit/agent/l3/extensions/qos/test_gateway_ip.py b/neutron/tests/unit/agent/l3/extensions/qos/test_gateway_ip.py index 3d68c2a11c8..33872851338 100644 --- a/neutron/tests/unit/agent/l3/extensions/qos/test_gateway_ip.py +++ b/neutron/tests/unit/agent/l3/extensions/qos/test_gateway_ip.py @@ -139,7 +139,7 @@ class RouterGatewayIPQosAgentExtensionInitializeTestCase( @mock.patch.object(registry, 'register') @mock.patch.object(resources_rpc, 'ResourcesPushRpcCallback') def test_initialize_subscribed_to_rpc(self, rpc_mock, subscribe_mock): - call_to_patch = 'neutron.common.rpc.Connection' + call_to_patch = 'neutron_lib.rpc.Connection' with mock.patch(call_to_patch, return_value=self.connection) as create_connection: self.gw_ip_qos_ext.initialize( diff --git a/neutron/tests/unit/agent/l3/extensions/test_port_forwarding.py b/neutron/tests/unit/agent/l3/extensions/test_port_forwarding.py index 368ff694306..4840b85261e 100644 --- a/neutron/tests/unit/agent/l3/extensions/test_port_forwarding.py +++ b/neutron/tests/unit/agent/l3/extensions/test_port_forwarding.py @@ -103,7 +103,7 @@ class FipPortForwardingExtensionInitializeTestCase( @mock.patch.object(registry, 'register') @mock.patch.object(resources_rpc, 'ResourcesPushRpcCallback') def test_initialize_subscribed_to_rpc(self, rpc_mock, subscribe_mock): - call_to_patch = 'neutron.common.rpc.Connection' + call_to_patch = 'neutron_lib.rpc.Connection' with mock.patch(call_to_patch, return_value=self.connection) as create_connection: self.fip_pf_ext.initialize( diff --git a/neutron/tests/unit/agent/l3/extensions/test_snat_log.py b/neutron/tests/unit/agent/l3/extensions/test_snat_log.py index 4f861ac4693..1fc935ad5aa 100644 --- a/neutron/tests/unit/agent/l3/extensions/test_snat_log.py +++ b/neutron/tests/unit/agent/l3/extensions/test_snat_log.py @@ -33,7 +33,7 @@ class SnatLogExtensionInitializeTestCase(test_base.L3LoggingExtBaseTestCase): @mock.patch.object(registry, 'register') @mock.patch.object(resources_rpc, 'ResourcesPushRpcCallback') def test_initialize_subscribed_to_rpc(self, rpc_mock, subscribe_mock): - call_to_patch = 'neutron.common.rpc.Connection' + call_to_patch = 'neutron_lib.rpc.Connection' with mock.patch(call_to_patch, return_value=self.connection) as create_connection: self.snat_log_ext.initialize( diff --git a/neutron/tests/unit/agent/test_rpc.py b/neutron/tests/unit/agent/test_rpc.py index fe31d20d20f..cb50986e154 100644 --- a/neutron/tests/unit/agent/test_rpc.py +++ b/neutron/tests/unit/agent/test_rpc.py @@ -21,12 +21,12 @@ from neutron_lib.agent import topics as lib_topics from neutron_lib.callbacks import events from neutron_lib.callbacks import resources from neutron_lib import constants +from neutron_lib import rpc as n_rpc from oslo_context import context as oslo_context from oslo_utils import uuidutils from neutron.agent import rpc from neutron.common import constants as n_const -from neutron.common import rpc as n_rpc from neutron.objects import network from neutron.objects import ports from neutron.tests import base diff --git a/neutron/tests/unit/agent/test_securitygroups_rpc.py b/neutron/tests/unit/agent/test_securitygroups_rpc.py index 71da3734848..4165a3b0942 100644 --- a/neutron/tests/unit/agent/test_securitygroups_rpc.py +++ b/neutron/tests/unit/agent/test_securitygroups_rpc.py @@ -22,6 +22,7 @@ from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef from neutron_lib import constants as const from neutron_lib import context from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_config import cfg import oslo_messaging from testtools import matchers @@ -32,7 +33,6 @@ from neutron.agent.linux import ip_conntrack from neutron.agent.linux import iptables_manager from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.handlers import securitygroups_rpc -from neutron.common import rpc as n_rpc from neutron.db import securitygroups_rpc_base as sg_db_rpc from neutron.extensions import securitygroup as ext_sg from neutron.tests import base diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/test_l3_rpc_agent_api.py b/neutron/tests/unit/api/rpc/agentnotifiers/test_l3_rpc_agent_api.py index cf83b2374d0..86beae422f5 100644 --- a/neutron/tests/unit/api/rpc/agentnotifiers/test_l3_rpc_agent_api.py +++ b/neutron/tests/unit/api/rpc/agentnotifiers/test_l3_rpc_agent_api.py @@ -15,8 +15,9 @@ import mock +from neutron_lib import rpc + from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api -from neutron.common import rpc from neutron.tests import base diff --git a/neutron/tests/unit/db/test_agentschedulers_db.py b/neutron/tests/unit/db/test_agentschedulers_db.py index 7e957dbec67..7e24ddceda2 100644 --- a/neutron/tests/unit/db/test_agentschedulers_db.py +++ b/neutron/tests/unit/db/test_agentschedulers_db.py @@ -21,6 +21,7 @@ from neutron_lib import constants from neutron_lib import context from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron_lib.tests.unit import fake_notifier from oslo_config import cfg from oslo_db import exception as db_exc @@ -33,7 +34,6 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc from neutron.api.rpc.handlers import l3_rpc -from neutron.common import rpc as n_rpc from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db.models import agent as agent_model diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py index 9262780f0a5..d66e2bdadef 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py @@ -18,6 +18,7 @@ import time import mock from neutron_lib.agent import constants as agent_consts from neutron_lib import constants as n_const +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_log import log import oslo_messaging @@ -30,7 +31,6 @@ from neutron.agent.common import polling from neutron.agent.common import utils from neutron.agent.linux import ip_lib from neutron.common import constants as c_const -from neutron.common import rpc as n_rpc from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent \ diff --git a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py index 9677741cfbf..ef4741f00cd 100644 --- a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py +++ b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py @@ -24,6 +24,7 @@ from neutron_lib import context as n_context from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_utils import importutils from oslo_utils import timeutils @@ -32,7 +33,6 @@ from sqlalchemy import orm import testscenarios import testtools -from neutron.common import rpc as n_rpc from neutron.db import db_base_plugin_v2 as db_v2 from neutron.db import l3_db from neutron.db import l3_dvr_db diff --git a/neutron/tests/unit/services/trunk/rpc/test_agent.py b/neutron/tests/unit/services/trunk/rpc/test_agent.py index 52a07b6bb1d..c74e5991ee2 100644 --- a/neutron/tests/unit/services/trunk/rpc/test_agent.py +++ b/neutron/tests/unit/services/trunk/rpc/test_agent.py @@ -12,12 +12,12 @@ # under the License. import mock +from neutron_lib import rpc from oslo_config import cfg import oslo_messaging from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc from neutron.services.trunk.rpc import agent from neutron.tests import base diff --git a/neutron/tests/unit/services/trunk/rpc/test_server.py b/neutron/tests/unit/services/trunk/rpc/test_server.py index 858c48517fc..b3311201b08 100644 --- a/neutron/tests/unit/services/trunk/rpc/test_server.py +++ b/neutron/tests/unit/services/trunk/rpc/test_server.py @@ -14,11 +14,11 @@ import mock from neutron_lib.api.definitions import portbindings from neutron_lib.plugins import directory +from neutron_lib import rpc as n_rpc from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.common import rpc as n_rpc from neutron.objects import trunk as trunk_obj from neutron.plugins.ml2 import plugin as ml2_plugin from neutron.services.trunk import constants