diff --git a/HACKING.rst b/HACKING.rst index 5250e988bd4..217ddc7a894 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -12,6 +12,7 @@ Neutron Specific Commandments - [N320] Validate that LOG messages, except debug ones, have translations - [N321] Validate that jsonutils module is used instead of json - [N322] Detect common errors with assert_called_once_with +- [N323] Enforce namespace-less imports for oslo libraries Creating Unit Tests ------------------- diff --git a/neutron/agent/common/config.py b/neutron/agent/common/config.py index 84c3bdf2d8a..9275f5850d8 100644 --- a/neutron/agent/common/config.py +++ b/neutron/agent/common/config.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from neutron.common import config from neutron.openstack.common import log as logging diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py index 50dcec94dba..ef878f64def 100644 --- a/neutron/agent/dhcp/agent.py +++ b/neutron/agent/dhcp/agent.py @@ -18,9 +18,9 @@ import os import eventlet -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils from neutron.agent.common import config from neutron.agent.linux import dhcp @@ -49,7 +49,7 @@ class DhcpAgent(manager.Manager): client side to execute the methods here. For more information about changing rpc interfaces, see doc/source/devref/rpc_api.rst. """ - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, host=None): super(DhcpAgent, self).__init__(host=host) @@ -125,7 +125,7 @@ class DhcpAgent(manager.Manager): {'net_id': network.id, 'action': action}) except Exception as e: self.schedule_resync(e, network.id) - if (isinstance(e, messaging.RemoteError) + if (isinstance(e, oslo_messaging.RemoteError) and e.exc_type == 'NetworkNotFound' or isinstance(e, exceptions.NetworkNotFound)): LOG.warning(_LW("Network %s has been deleted."), network.id) @@ -400,7 +400,7 @@ class DhcpPluginApi(object): self.context = context self.host = cfg.CONF.host self.use_namespaces = use_namespaces - target = messaging.Target( + target = oslo_messaging.Target( topic=topic, namespace=constants.RPC_NAMESPACE_DHCP_PLUGIN, version='1.0') diff --git a/neutron/agent/dhcp/config.py b/neutron/agent/dhcp/config.py index e8a6c7b7942..134ae728088 100644 --- a/neutron/agent/dhcp/config.py +++ b/neutron/agent/dhcp/config.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg DHCP_AGENT_OPTS = [ cfg.IntOpt('resync_interval', default=5, diff --git a/neutron/agent/dhcp_agent.py b/neutron/agent/dhcp_agent.py index 4f5b98de05d..0e756451106 100644 --- a/neutron/agent/dhcp_agent.py +++ b/neutron/agent/dhcp_agent.py @@ -19,7 +19,7 @@ import sys import eventlet eventlet.monkey_patch() -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.dhcp import config as dhcp_config diff --git a/neutron/agent/l2population_rpc.py b/neutron/agent/l2population_rpc.py index 2ffcd2be407..9e42d9e82b4 100644 --- a/neutron/agent/l2population_rpc.py +++ b/neutron/agent/l2population_rpc.py @@ -15,7 +15,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg import six from neutron.common import constants as n_const diff --git a/neutron/agent/l3/agent.py b/neutron/agent/l3/agent.py index 296b128e123..40c1498e04a 100644 --- a/neutron/agent/l3/agent.py +++ b/neutron/agent/l3/agent.py @@ -15,11 +15,11 @@ import eventlet import netaddr -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils from neutron.agent.common import config from neutron.agent.l3 import dvr @@ -77,7 +77,7 @@ class L3PluginApi(object): def __init__(self, topic, host): self.host = host - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def get_routers(self, context, router_ids=None): @@ -89,9 +89,9 @@ class L3PluginApi(object): def get_external_network_id(self, context): """Make a remote process call to retrieve the external network id. - @raise messaging.RemoteError: with TooManyExternalNetworks as - exc_type if there are more than one - external network + @raise oslo_messaging.RemoteError: with TooManyExternalNetworks as + exc_type if there are more than one + external network """ cctxt = self.client.prepare() return cctxt.call(context, 'get_external_network_id', host=self.host) @@ -138,7 +138,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, - del_arp_entry Needed by the L3 service when dealing with DVR """ - target = messaging.Target(version='1.2') + target = oslo_messaging.Target(version='1.2') def __init__(self, host, conf=None): if conf: @@ -178,7 +178,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, try: self.neutron_service_plugins = ( self.plugin_rpc.get_service_plugin_list(self.context)) - except messaging.RemoteError as e: + except oslo_messaging.RemoteError as e: with excutils.save_and_reraise_exception() as ctx: ctx.reraise = False LOG.warning(_LW('l3-agent cannot check service plugins ' @@ -189,7 +189,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, 'UnsupportedVersion you can ignore this ' 'warning. Detail message: %s'), e) self.neutron_service_plugins = None - except messaging.MessagingTimeout as e: + except oslo_messaging.MessagingTimeout as e: with excutils.save_and_reraise_exception() as ctx: if retry_count > 0: ctx.reraise = False @@ -335,7 +335,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, self.target_ex_net_id = self.plugin_rpc.get_external_network_id( self.context) return self.target_ex_net_id - except messaging.RemoteError as e: + except oslo_messaging.RemoteError as e: with excutils.save_and_reraise_exception() as ctx: if e.exc_type == 'TooManyExternalNetworks': ctx.reraise = False @@ -1172,7 +1172,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, routers = self.plugin_rpc.get_routers(context, [self.conf.router_id]) - except messaging.MessagingException: + except oslo_messaging.MessagingException: LOG.exception(_LE("Failed synchronizing routers due to RPC error")) else: LOG.debug('Processing :%r', routers) diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index 986317ff284..db734168a21 100644 --- a/neutron/agent/l3/config.py +++ b/neutron/agent/l3/config.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg OPTS = [ diff --git a/neutron/agent/l3/ha.py b/neutron/agent/l3/ha.py index a344cd439dd..4a7fe3e47cf 100644 --- a/neutron/agent/l3/ha.py +++ b/neutron/agent/l3/ha.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as l3_constants from neutron.i18n import _LE diff --git a/neutron/agent/l3/router_processing_queue.py b/neutron/agent/l3/router_processing_queue.py index a206437ea6e..1c8ee26b170 100644 --- a/neutron/agent/l3/router_processing_queue.py +++ b/neutron/agent/l3/router_processing_queue.py @@ -16,7 +16,7 @@ import datetime import Queue -from oslo.utils import timeutils +from oslo_utils import timeutils # Lower value is higher priority PRIORITY_RPC = 0 diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index 2bcc4082ab2..8a8f3190486 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -19,7 +19,7 @@ import sys import eventlet eventlet.monkey_patch() -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.l3 import config as l3_config diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index 26284ef7b31..b84e391b9e1 100644 --- a/neutron/agent/linux/dhcp.py +++ b/neutron/agent/linux/dhcp.py @@ -22,8 +22,8 @@ import socket import sys import netaddr -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_serialization import jsonutils +from oslo_utils import importutils import six from neutron.agent.linux import ip_lib diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py index 341a7503d30..f6fc83fd1b8 100644 --- a/neutron/agent/linux/external_process.py +++ b/neutron/agent/linux/external_process.py @@ -16,8 +16,8 @@ import collections import os.path import eventlet -from oslo.config import cfg from oslo_concurrency import lockutils +from oslo_config import cfg from neutron.agent.common import config as agent_cfg from neutron.agent.linux import ip_lib @@ -135,7 +135,7 @@ class ProcessMonitor(object): """Handle multiple process managers and watch over all of them. :param config: oslo config object with the agent configuration. - :type config: oslo.config.ConfigOpts + :type config: oslo_config.ConfigOpts :param root_helper: root helper to be used with new ProcessManagers :type root_helper: str :param resource_type: can be dhcp, router, load_balancer, etc. diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py index eff2cec8cbb..51bb058c4e4 100644 --- a/neutron/agent/linux/interface.py +++ b/neutron/agent/linux/interface.py @@ -16,8 +16,8 @@ import abc import netaddr -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import six from neutron.agent.common import config diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py index 7cb4626548f..c10c60a00da 100644 --- a/neutron/agent/linux/ip_lib.py +++ b/neutron/agent/linux/ip_lib.py @@ -17,7 +17,7 @@ import eventlet import os import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import utils from neutron.common import exceptions diff --git a/neutron/agent/linux/iptables_firewall.py b/neutron/agent/linux/iptables_firewall.py index 9a4d3bd8bcb..691e0a0bb85 100644 --- a/neutron/agent/linux/iptables_firewall.py +++ b/neutron/agent/linux/iptables_firewall.py @@ -14,7 +14,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent import firewall from neutron.agent.linux import ipset_manager diff --git a/neutron/agent/linux/iptables_manager.py b/neutron/agent/linux/iptables_manager.py index 9cef742c9a0..7a7ab627584 100644 --- a/neutron/agent/linux/iptables_manager.py +++ b/neutron/agent/linux/iptables_manager.py @@ -23,9 +23,9 @@ import os import re import sys -from oslo.config import cfg -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.agent.common import config from neutron.agent.linux import iptables_comments as ic diff --git a/neutron/agent/linux/keepalived.py b/neutron/agent/linux/keepalived.py index 215fa991630..269ad70587e 100644 --- a/neutron/agent/linux/keepalived.py +++ b/neutron/agent/linux/keepalived.py @@ -18,7 +18,7 @@ import os import stat import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import external_process from neutron.agent.linux import utils diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py index b73907a6dfa..ac4b1749197 100644 --- a/neutron/agent/linux/ovs_lib.py +++ b/neutron/agent/linux/ovs_lib.py @@ -17,8 +17,8 @@ import collections import itertools import operator -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils import retrying import six diff --git a/neutron/agent/linux/ovsdb_vsctl.py b/neutron/agent/linux/ovsdb_vsctl.py index d19dc53c06f..07bd71d1a58 100644 --- a/neutron/agent/linux/ovsdb_vsctl.py +++ b/neutron/agent/linux/ovsdb_vsctl.py @@ -16,8 +16,8 @@ import collections import itertools import uuid -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.agent.linux import utils from neutron.agent import ovsdb diff --git a/neutron/agent/linux/ra.py b/neutron/agent/linux/ra.py index b4ef6ffd3a0..ef334695892 100644 --- a/neutron/agent/linux/ra.py +++ b/neutron/agent/linux/ra.py @@ -15,7 +15,7 @@ import jinja2 import netaddr -from oslo.config import cfg +from oslo_config import cfg import six from neutron.agent.linux import utils diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 17543acbf67..8fd1945b614 100644 --- a/neutron/agent/linux/utils.py +++ b/neutron/agent/linux/utils.py @@ -23,7 +23,7 @@ import tempfile from eventlet.green import subprocess from eventlet import greenthread -from oslo.utils import excutils +from oslo_utils import excutils from neutron.common import constants from neutron.common import utils diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index 40a97b4be4d..c1ec9ec4191 100644 --- a/neutron/agent/metadata/agent.py +++ b/neutron/agent/metadata/agent.py @@ -20,9 +20,9 @@ import socket import eventlet import httplib2 from neutronclient.v2_0 import client -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import excutils import six.moves.urllib.parse as urlparse import webob @@ -56,9 +56,10 @@ class MetadataPluginAPI(object): """ def __init__(self, topic): - target = messaging.Target(topic=topic, - namespace=n_const.RPC_NAMESPACE_METADATA, - version='1.0') + target = oslo_messaging.Target( + topic=topic, + namespace=n_const.RPC_NAMESPACE_METADATA, + version='1.0') self.client = n_rpc.get_client(target) def get_ports(self, context, filters): @@ -121,7 +122,7 @@ class MetadataProxyHandler(object): if self.use_rpc: try: return self.plugin_rpc.get_ports(self.context, filters) - except (messaging.MessagingException, AttributeError): + except (oslo_messaging.MessagingException, AttributeError): # TODO(obondarev): remove fallback once RPC is proven # to work fine with metadata agent (K or L release at most) LOG.warning(_LW('Server does not support metadata RPC, ' diff --git a/neutron/agent/metadata/config.py b/neutron/agent/metadata/config.py index 88b9bcc7fdb..2ac2642d6c8 100644 --- a/neutron/agent/metadata/config.py +++ b/neutron/agent/metadata/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import utils diff --git a/neutron/agent/metadata/driver.py b/neutron/agent/metadata/driver.py index 3d017244a00..97cf349747c 100644 --- a/neutron/agent/metadata/driver.py +++ b/neutron/agent/metadata/driver.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.linux import external_process diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py index 8fb6c54bf0a..05b34ba6505 100644 --- a/neutron/agent/metadata/namespace_proxy.py +++ b/neutron/agent/metadata/namespace_proxy.py @@ -19,7 +19,7 @@ import eventlet eventlet.monkey_patch() import httplib2 -from oslo.config import cfg +from oslo_config import cfg import six.moves.urllib.parse as urlparse import webob diff --git a/neutron/agent/metadata_agent.py b/neutron/agent/metadata_agent.py index 7afeb78f619..407b157b3b9 100644 --- a/neutron/agent/metadata_agent.py +++ b/neutron/agent/metadata_agent.py @@ -17,7 +17,7 @@ import sys import eventlet eventlet.monkey_patch() -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as agent_conf from neutron.agent.metadata import agent diff --git a/neutron/agent/ovsdb.py b/neutron/agent/ovsdb.py index 288112ca408..3f319fd0b0b 100644 --- a/neutron/agent/ovsdb.py +++ b/neutron/agent/ovsdb.py @@ -14,8 +14,8 @@ import abc -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import six interface_map = { diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py index 98e641a596c..9909856e0f3 100644 --- a/neutron/agent/rpc.py +++ b/neutron/agent/rpc.py @@ -14,8 +14,8 @@ # under the License. import itertools -from oslo import messaging -from oslo.utils import timeutils +import oslo_messaging +from oslo_utils import timeutils from neutron.common import rpc as n_rpc from neutron.common import topics @@ -58,7 +58,7 @@ def create_consumers(endpoints, prefix, topic_details, start_listening=True): class PluginReportStateAPI(object): def __init__(self, topic): - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def report_state(self, context, agent_state, use_call=False): @@ -82,7 +82,7 @@ class PluginApi(object): ''' def __init__(self, topic): - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def get_device_details(self, context, device, agent_id, host=None): @@ -95,7 +95,7 @@ class PluginApi(object): cctxt = self.client.prepare(version='1.3') res = cctxt.call(context, 'get_devices_details_list', devices=devices, agent_id=agent_id, host=host) - except messaging.UnsupportedVersion: + except oslo_messaging.UnsupportedVersion: # If the server has not been upgraded yet, a DVR-enabled agent # may not work correctly, however it can function in 'degraded' # mode, in that DVR routers may not be in the system yet, and diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py index 11f3e41a78b..0b1c5497544 100644 --- a/neutron/agent/securitygroups_rpc.py +++ b/neutron/agent/securitygroups_rpc.py @@ -16,9 +16,9 @@ import functools -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils from neutron.agent import firewall from neutron.common import constants @@ -96,8 +96,9 @@ class SecurityGroupServerRpcApi(object): doc/source/devref/rpc_api.rst. """ def __init__(self, topic): - target = messaging.Target(topic=topic, version='1.0', - namespace=constants.RPC_NAMESPACE_SECGROUP) + target = oslo_messaging.Target( + topic=topic, version='1.0', + namespace=constants.RPC_NAMESPACE_SECGROUP) self.client = n_rpc.get_client(target) def security_group_rules_for_devices(self, context, devices): @@ -199,7 +200,7 @@ class SecurityGroupAgentRpc(object): try: self.plugin_rpc.security_group_info_for_devices( self.context, devices=[]) - except messaging.UnsupportedVersion: + except oslo_messaging.UnsupportedVersion: LOG.warning(_LW('security_group_info_for_devices rpc call not ' 'supported by the server, falling back to old ' 'security_group_rules_for_devices which scales ' diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py index 792254191b5..b34765e3449 100644 --- a/neutron/api/api_common.py +++ b/neutron/api/api_common.py @@ -15,7 +15,7 @@ import urllib -from oslo.config import cfg +from oslo_config import cfg from webob import exc from neutron.common import constants diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index cf273ddcad3..b47bc6149dd 100644 --- a/neutron/api/extensions.py +++ b/neutron/api/extensions.py @@ -20,7 +20,7 @@ import imp import itertools import os -from oslo.config import cfg +from oslo_config import cfg import routes import six import webob.dec diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py index 815444305c5..3f2fbc0e2f6 100644 --- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants from neutron.common import rpc as n_rpc @@ -48,7 +48,7 @@ class DhcpAgentNotifyAPI(object): def __init__(self, topic=topics.DHCP_AGENT, plugin=None): self._plugin = plugin - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) @property diff --git a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py index 76712e332ab..07d95d65d33 100644 --- a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py @@ -15,7 +15,7 @@ import random -from oslo import messaging +import oslo_messaging from neutron.common import constants from neutron.common import rpc as n_rpc @@ -34,7 +34,7 @@ class L3AgentNotifyAPI(object): """API for plugin to notify L3 agent.""" def __init__(self, topic=topics.L3_AGENT): - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def _notification_host(self, context, method, payload, host): diff --git a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py index 5ebcd75d2cc..d3be6b1079c 100644 --- a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants from neutron.common import rpc as n_rpc @@ -30,7 +30,7 @@ class MeteringAgentNotifyAPI(object): def __init__(self, topic=topics.METERING_AGENT): self.topic = topic - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def _agent_notification(self, context, method, routers): diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py index 07dc3c811b3..bbe68f8955e 100644 --- a/neutron/api/rpc/handlers/dhcp_rpc.py +++ b/neutron/api/rpc/handlers/dhcp_rpc.py @@ -16,10 +16,10 @@ import itertools import operator -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo import messaging -from oslo.utils import excutils +from oslo_config import cfg +from oslo_db import exception as db_exc +import oslo_messaging +from oslo_utils import excutils from neutron.api.v2 import attributes from neutron.common import constants @@ -47,8 +47,9 @@ class DhcpRpcCallback(object): # 1.0 - Initial version. # 1.1 - Added get_active_networks_info, create_dhcp_port, # and update_dhcp_port methods. - target = messaging.Target(namespace=constants.RPC_NAMESPACE_DHCP_PLUGIN, - version='1.1') + target = oslo_messaging.Target( + namespace=constants.RPC_NAMESPACE_DHCP_PLUGIN, + version='1.1') def _get_active_networks(self, context, **kwargs): """Retrieve and return a list of the active networks.""" diff --git a/neutron/api/rpc/handlers/dvr_rpc.py b/neutron/api/rpc/handlers/dvr_rpc.py index b15add2734e..c59f37f4ef5 100644 --- a/neutron/api/rpc/handlers/dvr_rpc.py +++ b/neutron/api/rpc/handlers/dvr_rpc.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import log from neutron.common import rpc as n_rpc @@ -28,7 +28,7 @@ class DVRServerRpcApi(object): """Agent-side RPC (stub) for agent-to-plugin interaction.""" def __init__(self, topic): - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) @log.log @@ -59,7 +59,7 @@ class DVRServerRpcCallback(object): # History # 1.0 Initial version - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') @property def plugin(self): diff --git a/neutron/api/rpc/handlers/l3_rpc.py b/neutron/api/rpc/handlers/l3_rpc.py index aebb6702128..7cf1905c748 100644 --- a/neutron/api/rpc/handlers/l3_rpc.py +++ b/neutron/api/rpc/handlers/l3_rpc.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging +from oslo_serialization import jsonutils from neutron.common import constants from neutron.common import exceptions @@ -40,7 +40,7 @@ class L3RpcCallback(object): # 1.2 Added methods for DVR support # 1.3 Added a method that returns the list of activated services # 1.4 Added L3 HA update_router_state - target = messaging.Target(version='1.4') + target = oslo_messaging.Target(version='1.4') @property def plugin(self): diff --git a/neutron/api/rpc/handlers/metadata_rpc.py b/neutron/api/rpc/handlers/metadata_rpc.py index c8533b65271..39034397a98 100644 --- a/neutron/api/rpc/handlers/metadata_rpc.py +++ b/neutron/api/rpc/handlers/metadata_rpc.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants from neutron import manager @@ -30,8 +30,8 @@ class MetadataRpcCallback(object): """ # 1.0 MetadataPluginAPI BASE_RPC_API_VERSION - target = messaging.Target(version='1.0', - namespace=constants.RPC_NAMESPACE_METADATA) + target = oslo_messaging.Target(version='1.0', + namespace=constants.RPC_NAMESPACE_METADATA) @property def plugin(self): diff --git a/neutron/api/rpc/handlers/securitygroups_rpc.py b/neutron/api/rpc/handlers/securitygroups_rpc.py index e894450e845..d1006d0158f 100644 --- a/neutron/api/rpc/handlers/securitygroups_rpc.py +++ b/neutron/api/rpc/handlers/securitygroups_rpc.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants from neutron import manager @@ -37,8 +37,8 @@ class SecurityGroupServerRpcCallback(object): # NOTE: target must not be overridden in subclasses # to keep RPC API version consistent across plugins. - target = messaging.Target(version='1.2', - namespace=constants.RPC_NAMESPACE_SECGROUP) + target = oslo_messaging.Target(version='1.2', + namespace=constants.RPC_NAMESPACE_SECGROUP) @property def plugin(self): diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py index 5e1f6114f65..fdcc04de2fc 100644 --- a/neutron/api/v2/base.py +++ b/neutron/api/v2/base.py @@ -17,8 +17,8 @@ import copy import netaddr import webob.exc -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.api import api_common from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api diff --git a/neutron/api/v2/resource.py b/neutron/api/v2/resource.py index ab5618ab856..34bd428e772 100644 --- a/neutron/api/v2/resource.py +++ b/neutron/api/v2/resource.py @@ -20,7 +20,7 @@ Utility methods for working with WSGI servers redux import sys import netaddr -from oslo import i18n +import oslo_i18n import six import webob.dec import webob.exc @@ -173,7 +173,7 @@ def translate(translatable, locale): :returns: the translated object, or the object as-is if it was not translated """ - localize = i18n.translate + localize = oslo_i18n.translate if isinstance(translatable, exceptions.NeutronException): translatable.msg = localize(translatable.msg, locale) elif isinstance(translatable, webob.exc.HTTPError): diff --git a/neutron/api/v2/resource_helper.py b/neutron/api/v2/resource_helper.py index 4a9510273c9..9d952901b27 100644 --- a/neutron/api/v2/resource_helper.py +++ b/neutron/api/v2/resource_helper.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.api import extensions from neutron.api.v2 import base diff --git a/neutron/api/v2/router.py b/neutron/api/v2/router.py index 39d5b8b7f67..b1522f6096f 100644 --- a/neutron/api/v2/router.py +++ b/neutron/api/v2/router.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg import routes as routes_mapper import six.moves.urllib.parse as urlparse import webob diff --git a/neutron/api/versions.py b/neutron/api/versions.py index 06f565d4c45..d9c1b4d0cbd 100644 --- a/neutron/api/versions.py +++ b/neutron/api/versions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import i18n +import oslo_i18n import webob.dec from neutron.api.views import versions as versions_view @@ -43,7 +43,7 @@ class Versions(object): if req.path != '/': language = req.best_match_language() msg = _('Unknown API version specified') - msg = i18n.translate(msg, language) + msg = oslo_i18n.translate(msg, language) return webob.exc.HTTPNotFound(explanation=msg) builder = versions_view.get_view_builder(req) diff --git a/neutron/auth.py b/neutron/auth.py index a4e301e046f..09ce3d2ebcc 100644 --- a/neutron/auth.py +++ b/neutron/auth.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.middleware import request_id +from oslo_config import cfg +from oslo_middleware import request_id import webob.dec import webob.exc diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py index 0ad95d07011..d0a6bcf97a1 100644 --- a/neutron/cmd/netns_cleanup.py +++ b/neutron/cmd/netns_cleanup.py @@ -18,8 +18,8 @@ import re import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.agent.common import config as agent_config from neutron.agent.dhcp import config as dhcp_config diff --git a/neutron/cmd/ovs_cleanup.py b/neutron/cmd/ovs_cleanup.py index 9af8702ec22..8ba33abd457 100644 --- a/neutron/cmd/ovs_cleanup.py +++ b/neutron/cmd/ovs_cleanup.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as agent_config from neutron.agent.l3 import config as l3_config diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py index fed590376d7..11a6746498a 100644 --- a/neutron/cmd/sanity_check.py +++ b/neutron/cmd/sanity_check.py @@ -20,7 +20,7 @@ from neutron.cmd.sanity import checks from neutron.common import config from neutron.i18n import _LE, _LW from neutron.openstack.common import log as logging -from oslo.config import cfg +from oslo_config import cfg LOG = logging.getLogger(__name__) diff --git a/neutron/common/config.py b/neutron/common/config.py index 5d29cedbe5b..080396b7ca1 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -20,9 +20,9 @@ Routines for configuring Neutron import os import sys -from oslo.config import cfg -from oslo.db import options as db_options -from oslo import messaging +from oslo_config import cfg +from oslo_db import options as db_options +import oslo_messaging from paste import deploy from neutron.api.v2 import attributes @@ -134,7 +134,7 @@ cfg.CONF.register_opts(core_opts) cfg.CONF.register_cli_opts(core_cli_opts) # Ensure that the control exchange is set correctly -messaging.set_transport_defaults(control_exchange='neutron') +oslo_messaging.set_transport_defaults(control_exchange='neutron') _SQL_CONNECTION_DEFAULT = 'sqlite://' # Update the default QueuePool parameters. These can be tweaked by the # configuration variables - max_pool_size, max_overflow and pool_timeout diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py index 2bc509a3637..b65810d1f5a 100644 --- a/neutron/common/exceptions.py +++ b/neutron/common/exceptions.py @@ -17,7 +17,7 @@ Neutron base exception handling. """ -from oslo.utils import excutils +from oslo_utils import excutils class NeutronException(Exception): diff --git a/neutron/common/repos.py b/neutron/common/repos.py index 7ce32175aae..98bb8b2c486 100644 --- a/neutron/common/repos.py +++ b/neutron/common/repos.py @@ -17,7 +17,7 @@ import ConfigParser import importlib import os -from oslo.config import cfg +from oslo_config import cfg from neutron.openstack.common import log as logging @@ -62,7 +62,7 @@ class NeutronModules(object): def alembic_name(self, module): return self.MODULES[module]['alembic-name'] - # Return an INI parser for the child module. oslo.conf is a bit too + # Return an INI parser for the child module. oslo.config is a bit too # magical in its INI loading, and in one notable case, we need to merge # together the [service_providers] section across at least four # repositories. diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py index 0da9e9cac4a..0bdd6c38704 100644 --- a/neutron/common/rpc.py +++ b/neutron/common/rpc.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo import messaging -from oslo.messaging import serializer as om_serializer +from oslo_config import cfg +import oslo_messaging +from oslo_messaging import serializer as om_serializer from neutron.common import exceptions from neutron import context @@ -51,11 +51,11 @@ TRANSPORT_ALIASES = { def init(conf): global TRANSPORT, NOTIFIER exmods = get_allowed_exmods() - TRANSPORT = messaging.get_transport(conf, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + TRANSPORT = oslo_messaging.get_transport(conf, + allowed_remote_exmods=exmods, + aliases=TRANSPORT_ALIASES) serializer = RequestContextSerializer() - NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer) + NOTIFIER = oslo_messaging.Notifier(TRANSPORT, serializer=serializer) def cleanup(): @@ -81,17 +81,17 @@ def get_allowed_exmods(): def get_client(target, version_cap=None, serializer=None): assert TRANSPORT is not None serializer = RequestContextSerializer(serializer) - return messaging.RPCClient(TRANSPORT, - target, - version_cap=version_cap, - serializer=serializer) + return oslo_messaging.RPCClient(TRANSPORT, + target, + version_cap=version_cap, + serializer=serializer) def get_server(target, endpoints, serializer=None): assert TRANSPORT is not None serializer = RequestContextSerializer(serializer) - return messaging.get_rpc_server(TRANSPORT, target, endpoints, - 'eventlet', serializer) + return oslo_messaging.get_rpc_server(TRANSPORT, target, endpoints, + 'eventlet', serializer) def get_notifier(service=None, host=None, publisher_id=None): @@ -185,7 +185,7 @@ class Connection(object): self.servers = [] def create_consumer(self, topic, endpoints, fanout=False): - target = messaging.Target( + target = oslo_messaging.Target( topic=topic, server=cfg.CONF.host, fanout=fanout) server = get_server(target, endpoints) self.servers.append(server) diff --git a/neutron/common/utils.py b/neutron/common/utils.py index b095bf6b5ac..bd75238cc9b 100644 --- a/neutron/common/utils.py +++ b/neutron/common/utils.py @@ -31,9 +31,9 @@ import socket import uuid from eventlet.green import subprocess -from oslo.config import cfg -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.common import constants as q_const from neutron.openstack.common import log as logging diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index e9bc107fbc0..545039ef224 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -15,11 +15,11 @@ from eventlet import greenthread -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +import oslo_messaging +from oslo_serialization import jsonutils +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.orm import exc from sqlalchemy import sql @@ -222,7 +222,7 @@ class AgentDbMixin(ext_agent.AgentPluginBase): class AgentExtRpcCallback(object): """Processes the rpc report in plugin implementations.""" - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') START_TIME = timeutils.utcnow() def __init__(self, plugin=None): diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index 0f011306d32..dd766cc7674 100644 --- a/neutron/db/agentschedulers_db.py +++ b/neutron/db/agentschedulers_db.py @@ -17,8 +17,8 @@ import datetime import random import time -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc diff --git a/neutron/db/api.py b/neutron/db/api.py index 777c2b6eead..8e4fbd89bdc 100644 --- a/neutron/db/api.py +++ b/neutron/db/api.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db.sqlalchemy import session +from oslo_config import cfg +from oslo_db.sqlalchemy import session _FACADE = None diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index 184c1054b69..9f7b5b46fc8 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -14,9 +14,9 @@ # under the License. import netaddr -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.utils import excutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_utils import excutils from sqlalchemy import and_ from sqlalchemy import event from sqlalchemy import orm diff --git a/neutron/db/dvr_mac_db.py b/neutron/db/dvr_mac_db.py index eff249fa529..f849c19f685 100644 --- a/neutron/db/dvr_mac_db.py +++ b/neutron/db/dvr_mac_db.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc import sqlalchemy as sa @@ -26,7 +26,7 @@ from neutron.extensions import portbindings from neutron.i18n import _LE from neutron import manager from neutron.openstack.common import log as logging -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import exc LOG = logging.getLogger(__name__) diff --git a/neutron/db/extraroute_db.py b/neutron/db/extraroute_db.py index c9f95b0bd1c..59027dc2199 100644 --- a/neutron/db/extraroute_db.py +++ b/neutron/db/extraroute_db.py @@ -14,7 +14,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg import sqlalchemy as sa from sqlalchemy import orm diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py index 444a724a697..691869ca5a4 100644 --- a/neutron/db/l3_agentschedulers_db.py +++ b/neutron/db/l3_agentschedulers_db.py @@ -12,9 +12,9 @@ # 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 oslo.config import cfg -from oslo.db import exception as db_exc -from oslo import messaging +from oslo_config import cfg +from oslo_db import exception as db_exc +import oslo_messaging import sqlalchemy as sa from sqlalchemy import func from sqlalchemy import or_ @@ -111,7 +111,7 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase, try: self.reschedule_router(context, binding.router_id) except (l3agentscheduler.RouterReschedulingFailed, - messaging.RemoteError): + oslo_messaging.RemoteError): # Catch individual router rescheduling errors here # so one broken one doesn't stop the iteration. LOG.exception(_LE("Failed to reschedule router %s"), diff --git a/neutron/db/l3_dvr_db.py b/neutron/db/l3_dvr_db.py index 2af353d5fb1..16b2fd828e5 100644 --- a/neutron/db/l3_dvr_db.py +++ b/neutron/db/l3_dvr_db.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.api.v2 import attributes from neutron.common import constants as l3_const diff --git a/neutron/db/l3_dvrscheduler_db.py b/neutron/db/l3_dvrscheduler_db.py index e751c44abc4..aa5f7c2c0d1 100644 --- a/neutron/db/l3_dvrscheduler_db.py +++ b/neutron/db/l3_dvrscheduler_db.py @@ -15,7 +15,7 @@ import random -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py index 4ef9f477361..14547be0e8b 100644 --- a/neutron/db/l3_hamode_db.py +++ b/neutron/db/l3_hamode_db.py @@ -14,9 +14,9 @@ # import netaddr -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.utils import excutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_utils import excutils import sqlalchemy as sa from sqlalchemy import orm diff --git a/neutron/db/metering/metering_rpc.py b/neutron/db/metering/metering_rpc.py index dd3b8ac10d9..96c1eb28ac7 100644 --- a/neutron/db/metering/metering_rpc.py +++ b/neutron/db/metering/metering_rpc.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants as consts from neutron.common import utils @@ -26,7 +26,7 @@ LOG = logging.getLogger(__name__) class MeteringRpcCallbacks(object): - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, meter_plugin): self.meter_plugin = meter_plugin diff --git a/neutron/db/migration/alembic_migrations/env.py b/neutron/db/migration/alembic_migrations/env.py index bd731b96f84..9966f55e797 100644 --- a/neutron/db/migration/alembic_migrations/env.py +++ b/neutron/db/migration/alembic_migrations/env.py @@ -15,8 +15,8 @@ from logging import config as logging_config from alembic import context -from oslo.config import cfg -from oslo.db.sqlalchemy import session +from oslo_config import cfg +from oslo_db.sqlalchemy import session import sqlalchemy as sa from sqlalchemy import event diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index 8312d96e8a6..81b5d5c7233 100644 --- a/neutron/db/migration/cli.py +++ b/neutron/db/migration/cli.py @@ -20,8 +20,8 @@ from alembic import config as alembic_config from alembic import environment from alembic import script as alembic_script from alembic import util as alembic_util -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.common import repos diff --git a/neutron/db/migration/migrate_to_ml2.py b/neutron/db/migration/migrate_to_ml2.py index fc5fa421674..c0bc5f02b28 100755 --- a/neutron/db/migration/migrate_to_ml2.py +++ b/neutron/db/migration/migrate_to_ml2.py @@ -60,7 +60,7 @@ To manually test migration from ovs to ml2 with devstack: import argparse -from oslo.db.sqlalchemy import session +from oslo_db.sqlalchemy import session import sqlalchemy as sa from neutron.extensions import portbindings diff --git a/neutron/db/model_base.py b/neutron/db/model_base.py index ab420dcc8ef..b613447d4a8 100644 --- a/neutron/db/model_base.py +++ b/neutron/db/model_base.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.db.sqlalchemy import models +from oslo_db.sqlalchemy import models from sqlalchemy.ext import declarative from sqlalchemy import orm diff --git a/neutron/debug/debug_agent.py b/neutron/debug/debug_agent.py index 4eef85abc20..bd2d6301877 100644 --- a/neutron/debug/debug_agent.py +++ b/neutron/debug/debug_agent.py @@ -17,7 +17,7 @@ import shlex import socket import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.linux import dhcp diff --git a/neutron/debug/shell.py b/neutron/debug/shell.py index c5f66357da7..3bc8fe1155f 100644 --- a/neutron/debug/shell.py +++ b/neutron/debug/shell.py @@ -15,8 +15,8 @@ import sys -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.agent.common import config from neutron.agent.linux import interface diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py index 6588d5fa739..2e618eef249 100644 --- a/neutron/extensions/allowedaddresspairs.py +++ b/neutron/extensions/allowedaddresspairs.py @@ -16,7 +16,7 @@ import webob.exc from neutron.api.v2 import attributes as attr from neutron.common import exceptions as nexception -from oslo.config import cfg +from oslo_config import cfg allowed_address_pair_opts = [ #TODO(limao): use quota framework when it support quota for attributes diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py index 5f1195c6ad2..6776035f7f0 100644 --- a/neutron/extensions/l3.py +++ b/neutron/extensions/l3.py @@ -15,7 +15,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg from neutron.api import extensions from neutron.api.v2 import attributes as attr diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py index 43d9e214c3e..bddad4fe5b4 100644 --- a/neutron/extensions/quotasv2.py +++ b/neutron/extensions/quotasv2.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import webob from neutron.api import extensions diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index 0934d65370c..39b25d6b76e 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -16,7 +16,7 @@ import abc import netaddr -from oslo.config import cfg +from oslo_config import cfg import six from neutron.api import extensions diff --git a/neutron/hacking/checks.py b/neutron/hacking/checks.py index 03f3ead523f..d2a928d6c99 100644 --- a/neutron/hacking/checks.py +++ b/neutron/hacking/checks.py @@ -53,6 +53,10 @@ log_translation_hint = re.compile( for level, hint in _all_log_levels.iteritems())) +oslo_namespace_imports_dot = re.compile(r"from[\s]*oslo[.]") +oslo_namespace_imports_root = re.compile(r"from[\s]*oslo[\s]*import[\s]*") + + def validate_log_translations(logical_line, physical_line, filename): # Translations are not required in the test directory if "neutron/tests" in filename: @@ -114,8 +118,22 @@ def check_assert_called_once_with(logical_line, filename): yield (0, msg) +def check_oslo_namespace_imports(logical_line, blank_before, filename): + if re.match(oslo_namespace_imports_dot, logical_line): + msg = ("N323: '%s' must be used instead of '%s'.") % ( + logical_line.replace('oslo.', 'oslo_'), + logical_line) + yield(0, msg) + elif re.match(oslo_namespace_imports_root, logical_line): + msg = ("N323: '%s' must be used instead of '%s'.") % ( + logical_line.replace('from oslo import ', 'import oslo_'), + logical_line) + yield(0, msg) + + def factory(register): register(validate_log_translations) register(use_jsonutils) register(check_assert_called_once_with) register(no_translate_debug_logs) + register(check_oslo_namespace_imports) diff --git a/neutron/i18n.py b/neutron/i18n.py index bdfe8bfd392..39047248e1c 100644 --- a/neutron/i18n.py +++ b/neutron/i18n.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import i18n +import oslo_i18n -_translators = i18n.TranslatorFactory(domain='neutron') +_translators = oslo_i18n.TranslatorFactory(domain='neutron') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/neutron/manager.py b/neutron/manager.py index 8cd25ad6af1..cfae3066789 100644 --- a/neutron/manager.py +++ b/neutron/manager.py @@ -15,9 +15,9 @@ import weakref -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils from neutron.common import utils from neutron.i18n import _LE, _LI @@ -36,7 +36,7 @@ CORE_PLUGINS_NAMESPACE = 'neutron.core_plugins' class Manager(periodic_task.PeriodicTasks): # Set RPC API version to 1.0 by default. - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, host=None): if not host: diff --git a/neutron/notifiers/nova.py b/neutron/notifiers/nova.py index 0496195d006..455653d6372 100644 --- a/neutron/notifiers/nova.py +++ b/neutron/notifiers/nova.py @@ -17,7 +17,7 @@ import eventlet from novaclient import exceptions as nova_exceptions import novaclient.v1_1.client as nclient from novaclient.v1_1.contrib import server_external_events -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import attributes as sql_attr from neutron.common import constants diff --git a/neutron/plugins/bigswitch/agent/restproxy_agent.py b/neutron/plugins/bigswitch/agent/restproxy_agent.py index 3591d02d07e..e59e5e4671c 100644 --- a/neutron/plugins/bigswitch/agent/restproxy_agent.py +++ b/neutron/plugins/bigswitch/agent/restproxy_agent.py @@ -22,9 +22,9 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import excutils from neutron.agent.linux import ovs_lib from neutron.agent.linux import utils @@ -73,7 +73,7 @@ class IVSBridge(ovs_lib.OVSBridge): class RestProxyAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, integ_br, polling_interval, root_helper, vs='ovs'): super(RestProxyAgent, self).__init__() diff --git a/neutron/plugins/bigswitch/config.py b/neutron/plugins/bigswitch/config.py index 4206dcc9a8f..422488d60e1 100644 --- a/neutron/plugins/bigswitch/config.py +++ b/neutron/plugins/bigswitch/config.py @@ -17,7 +17,7 @@ This module manages configuration options """ -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as agconfig from neutron.common import utils diff --git a/neutron/plugins/bigswitch/db/consistency_db.py b/neutron/plugins/bigswitch/db/consistency_db.py index 53b8748d5ef..3c9a492f676 100644 --- a/neutron/plugins/bigswitch/db/consistency_db.py +++ b/neutron/plugins/bigswitch/db/consistency_db.py @@ -17,9 +17,9 @@ import re import string import time -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import session +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import session import sqlalchemy as sa from neutron.db import model_base diff --git a/neutron/plugins/bigswitch/l3_router_plugin.py b/neutron/plugins/bigswitch/l3_router_plugin.py index c96bbe5f2c5..245fc3e9ac3 100644 --- a/neutron/plugins/bigswitch/l3_router_plugin.py +++ b/neutron/plugins/bigswitch/l3_router_plugin.py @@ -22,8 +22,8 @@ It is intended to be used in conjunction with the Big Switch ML2 driver or the Big Switch core plugin. """ -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.api import extensions as neutron_extensions from neutron.common import exceptions diff --git a/neutron/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py index 1bd201d69bb..92f88e0d0c0 100644 --- a/neutron/plugins/bigswitch/plugin.py +++ b/neutron/plugins/bigswitch/plugin.py @@ -46,9 +46,9 @@ import httplib import re import eventlet -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils from sqlalchemy.orm import exc as sqlexc from neutron.agent import securitygroups_rpc as sg_rpc @@ -98,7 +98,7 @@ class AgentNotifierApi(sg_rpc.SecurityGroupAgentRpcApiMixin): def __init__(self, topic): self.topic = topic - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def port_update(self, context, port): diff --git a/neutron/plugins/bigswitch/routerrule_db.py b/neutron/plugins/bigswitch/routerrule_db.py index 02239e626ce..df4dbe61034 100644 --- a/neutron/plugins/bigswitch/routerrule_db.py +++ b/neutron/plugins/bigswitch/routerrule_db.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import sqlalchemy as sa from sqlalchemy import orm diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index 474167dc6a5..b624f19b923 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -36,9 +36,9 @@ import weakref import eventlet import eventlet.corolocal -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.common import exceptions from neutron.i18n import _LE, _LI, _LW diff --git a/neutron/plugins/bigswitch/tests/test_server.py b/neutron/plugins/bigswitch/tests/test_server.py index e75a9b2b43c..a8778e13f91 100755 --- a/neutron/plugins/bigswitch/tests/test_server.py +++ b/neutron/plugins/bigswitch/tests/test_server.py @@ -22,7 +22,7 @@ from __future__ import print_function import re -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from six import moves from wsgiref import simple_server diff --git a/neutron/plugins/brocade/NeutronPlugin.py b/neutron/plugins/brocade/NeutronPlugin.py index 1d812401690..b922b03ae00 100644 --- a/neutron/plugins/brocade/NeutronPlugin.py +++ b/neutron/plugins/brocade/NeutronPlugin.py @@ -19,10 +19,10 @@ """Implentation of Brocade Neutron Plugin.""" -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg from oslo_context import context as oslo_context +import oslo_messaging +from oslo_utils import importutils from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api @@ -80,7 +80,7 @@ cfg.CONF.register_opts(PHYSICAL_INTERFACE_OPTS, "PHYSICAL_INTERFACE") class BridgeRpcCallbacks(object): """Agent callback.""" - target = messaging.Target(version='1.2') + target = oslo_messaging.Target(version='1.2') # Device names start with "tap" # history # 1.1 Support Security Group RPC @@ -177,7 +177,7 @@ class AgentNotifierApi(sg_rpc.SecurityGroupAgentRpcApiMixin): def __init__(self, topic): self.topic = topic - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) self.topic_network_delete = topics.get_topic_name(topic, topics.NETWORK, diff --git a/neutron/plugins/brocade/nos/nosdriver.py b/neutron/plugins/brocade/nos/nosdriver.py index c5d86f491f8..64c824eef24 100644 --- a/neutron/plugins/brocade/nos/nosdriver.py +++ b/neutron/plugins/brocade/nos/nosdriver.py @@ -19,7 +19,7 @@ Neutron network life-cycle management. """ from ncclient import manager -from oslo.utils import excutils +from oslo_utils import excutils from neutron.i18n import _LE from neutron.openstack.common import log as logging diff --git a/neutron/plugins/cisco/cfg_agent/cfg_agent.py b/neutron/plugins/cisco/cfg_agent/cfg_agent.py index 3123bed6148..5953e9383dc 100644 --- a/neutron/plugins/cisco/cfg_agent/cfg_agent.py +++ b/neutron/plugins/cisco/cfg_agent/cfg_agent.py @@ -18,11 +18,11 @@ import pprint import sys import time -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils -from oslo.utils import timeutils from oslo_concurrency import lockutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils +from oslo_utils import timeutils from neutron.agent.common import config from neutron.agent.linux import external_process @@ -54,7 +54,7 @@ class CiscoDeviceManagementApi(object): def __init__(self, topic, host): self.host = host - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def report_dead_hosting_devices(self, context, hd_ids=None): @@ -94,7 +94,7 @@ class CiscoCfgAgent(manager.Manager): The main entry points in this class are the `process_services()` and `_backlog_task()` . """ - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') OPTS = [ cfg.IntOpt('rpc_loop_interval', default=10, diff --git a/neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py b/neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py index 6e80b71d263..9e9d83f2829 100644 --- a/neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py +++ b/neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py @@ -21,7 +21,7 @@ import xml.etree.ElementTree as ET import ciscoconfparse from ncclient import manager -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LE, _LI, _LW from neutron.plugins.cisco.cfg_agent import cfg_exceptions as cfg_exc diff --git a/neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py b/neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py index 6d59199a475..36db1316e51 100644 --- a/neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py +++ b/neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from neutron.i18n import _LE from neutron.openstack.common import log as logging diff --git a/neutron/plugins/cisco/cfg_agent/device_drivers/dummy_driver.py b/neutron/plugins/cisco/cfg_agent/device_drivers/dummy_driver.py index d3b71805252..f76481dff4a 100644 --- a/neutron/plugins/cisco/cfg_agent/device_drivers/dummy_driver.py +++ b/neutron/plugins/cisco/cfg_agent/device_drivers/dummy_driver.py @@ -14,7 +14,7 @@ import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.plugins.cisco.cfg_agent.device_drivers import devicedriver_api diff --git a/neutron/plugins/cisco/cfg_agent/device_status.py b/neutron/plugins/cisco/cfg_agent/device_status.py index 2d44908b013..82c5aaafe38 100644 --- a/neutron/plugins/cisco/cfg_agent/device_status.py +++ b/neutron/plugins/cisco/cfg_agent/device_status.py @@ -14,8 +14,8 @@ import datetime -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from neutron.agent.linux import utils as linux_utils from neutron.i18n import _LI, _LW diff --git a/neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py b/neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py index da284804aa9..bf6491a95ca 100644 --- a/neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py +++ b/neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py @@ -16,8 +16,8 @@ import collections import eventlet import netaddr -from oslo import messaging -from oslo.utils import excutils +import oslo_messaging +from oslo_utils import excutils from neutron.common import constants as l3_constants from neutron.common import rpc as n_rpc @@ -90,7 +90,7 @@ class CiscoRoutingPluginApi(object): def __init__(self, topic, host): self.host = host - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def get_routers(self, context, router_ids=None, hd_ids=None): @@ -281,7 +281,7 @@ class RoutingServiceHelper(object): if device_ids: return self.plugin_rpc.get_routers(self.context, hd_ids=device_ids) - except messaging.MessagingException: + except oslo_messaging.MessagingException: LOG.exception(_LE("RPC Error in fetching routers from plugin")) self.fullsync = True diff --git a/neutron/plugins/cisco/common/config.py b/neutron/plugins/cisco/common/config.py index 48388ba0ad0..b2364a50be2 100644 --- a/neutron/plugins/cisco/common/config.py +++ b/neutron/plugins/cisco/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config diff --git a/neutron/plugins/cisco/db/l3/device_handling_db.py b/neutron/plugins/cisco/db/l3/device_handling_db.py index a6fe717e4dd..da5c90ef48d 100644 --- a/neutron/plugins/cisco/db/l3/device_handling_db.py +++ b/neutron/plugins/cisco/db/l3/device_handling_db.py @@ -16,9 +16,9 @@ import random from keystoneclient import exceptions as k_exceptions from keystoneclient.v2_0 import client as k_client -from oslo.config import cfg -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import importutils +from oslo_utils import timeutils from sqlalchemy.orm import exc from sqlalchemy.orm import joinedload diff --git a/neutron/plugins/cisco/db/l3/l3_router_appliance_db.py b/neutron/plugins/cisco/db/l3/l3_router_appliance_db.py index 147e1eba5d6..df48405f7bd 100644 --- a/neutron/plugins/cisco/db/l3/l3_router_appliance_db.py +++ b/neutron/plugins/cisco/db/l3/l3_router_appliance_db.py @@ -14,8 +14,8 @@ import copy -from oslo.config import cfg from oslo_concurrency import lockutils +from oslo_config import cfg from sqlalchemy.orm import exc from sqlalchemy.orm import joinedload from sqlalchemy.sql import expression as expr diff --git a/neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py b/neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py index 5ec76b79f52..cceda5cd290 100644 --- a/neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py +++ b/neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py @@ -14,8 +14,8 @@ import netaddr -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.i18n import _LE from neutron import manager diff --git a/neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py b/neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py index ce727180a13..4a407e9de51 100644 --- a/neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py +++ b/neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py @@ -14,7 +14,7 @@ import eventlet -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import exc from sqlalchemy.sql import expression as expr diff --git a/neutron/plugins/cisco/l3/rpc/l3_router_cfgagent_rpc_cb.py b/neutron/plugins/cisco/l3/rpc/l3_router_cfgagent_rpc_cb.py index d89d6cdc5d2..5c7c3a4e990 100644 --- a/neutron/plugins/cisco/l3/rpc/l3_router_cfgagent_rpc_cb.py +++ b/neutron/plugins/cisco/l3/rpc/l3_router_cfgagent_rpc_cb.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.common import constants from neutron.common import utils diff --git a/neutron/plugins/cisco/l3/rpc/l3_router_rpc_joint_agent_api.py b/neutron/plugins/cisco/l3/rpc/l3_router_rpc_joint_agent_api.py index b3189d7bbb7..15623216402 100644 --- a/neutron/plugins/cisco/l3/rpc/l3_router_rpc_joint_agent_api.py +++ b/neutron/plugins/cisco/l3/rpc/l3_router_rpc_joint_agent_api.py @@ -13,7 +13,7 @@ # under the License. # -from oslo import messaging +import oslo_messaging from neutron.common import rpc as n_rpc from neutron.openstack.common import log as logging @@ -28,7 +28,7 @@ class L3RouterJointAgentNotifyAPI(object): def __init__(self, l3plugin): self._l3plugin = l3plugin self.topic = c_constants.CFG_AGENT_L3_ROUTING - target = messaging.Target(topic=self.topic, version='1.0') + target = oslo_messaging.Target(topic=self.topic, version='1.0') self.client = n_rpc.get_client(target) def _agent_notification(self, context, method, routers, operation, data): diff --git a/neutron/plugins/cisco/l3/service_vm_lib.py b/neutron/plugins/cisco/l3/service_vm_lib.py index 128bf99ee5c..6103db6d5ce 100644 --- a/neutron/plugins/cisco/l3/service_vm_lib.py +++ b/neutron/plugins/cisco/l3/service_vm_lib.py @@ -15,7 +15,7 @@ from novaclient import exceptions as nova_exc from novaclient import utils as n_utils from novaclient.v1_1 import client -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LE from neutron import manager diff --git a/neutron/plugins/cisco/models/virt_phy_sw_v2.py b/neutron/plugins/cisco/models/virt_phy_sw_v2.py index a6d7b47441f..95d0a0a721b 100644 --- a/neutron/plugins/cisco/models/virt_phy_sw_v2.py +++ b/neutron/plugins/cisco/models/virt_phy_sw_v2.py @@ -15,8 +15,8 @@ import inspect -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from neutron.api.v2 import attributes from neutron.extensions import portbindings diff --git a/neutron/plugins/cisco/n1kv/n1kv_client.py b/neutron/plugins/cisco/n1kv/n1kv_client.py index e0b03bbffc6..9df4a4541a1 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_client.py +++ b/neutron/plugins/cisco/n1kv/n1kv_client.py @@ -16,7 +16,7 @@ import base64 import eventlet import netaddr -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from neutron.common import exceptions as n_exc diff --git a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py index 6da8832f3df..cb4b9b907cf 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py +++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py @@ -14,9 +14,9 @@ import eventlet -from oslo.config import cfg as q_conf -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg as q_conf +from oslo_utils import excutils +from oslo_utils import importutils from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc diff --git a/neutron/plugins/cisco/network_plugin.py b/neutron/plugins/cisco/network_plugin.py index 2b07c818771..36ada7bf1f2 100644 --- a/neutron/plugins/cisco/network_plugin.py +++ b/neutron/plugins/cisco/network_plugin.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import importutils +from oslo_utils import importutils import webob.exc as wexc from neutron.api import extensions as neutron_extensions diff --git a/neutron/plugins/cisco/service_plugins/cisco_router_plugin.py b/neutron/plugins/cisco/service_plugins/cisco_router_plugin.py index 60f94ba83fc..0627f81e83d 100644 --- a/neutron/plugins/cisco/service_plugins/cisco_router_plugin.py +++ b/neutron/plugins/cisco/service_plugins/cisco_router_plugin.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import rpc as n_rpc from neutron.common import topics @@ -30,7 +30,7 @@ from neutron.plugins.common import constants class CiscoRouterPluginRpcCallbacks(l3_router_rpc.L3RouterCfgRpcCallbackMixin, devices_rpc.DeviceCfgRpcCallbackMixin): - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, l3plugin): super(CiscoRouterPluginRpcCallbacks, self).__init__() diff --git a/neutron/plugins/embrane/base_plugin.py b/neutron/plugins/embrane/base_plugin.py index 4aa25ffec19..3cf64945e9b 100644 --- a/neutron/plugins/embrane/base_plugin.py +++ b/neutron/plugins/embrane/base_plugin.py @@ -16,7 +16,7 @@ from heleosapi import backend_operations as h_op from heleosapi import constants as h_con from heleosapi import exceptions as h_exc -from oslo.config import cfg +from oslo_config import cfg from sqlalchemy.orm import exc from neutron.common import constants as l3_constants diff --git a/neutron/plugins/embrane/common/config.py b/neutron/plugins/embrane/common/config.py index 8ece1ce3193..c49b091706c 100644 --- a/neutron/plugins/embrane/common/config.py +++ b/neutron/plugins/embrane/common/config.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg heleos_opts = [ diff --git a/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py b/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py index 168878c63e5..3dc69200de8 100644 --- a/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py +++ b/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py @@ -22,8 +22,8 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.agent.common import config from neutron.agent import rpc as agent_rpc @@ -100,7 +100,7 @@ class HyperVSecurityAgent(sg_rpc.SecurityGroupAgentRpc): class HyperVSecurityCallbackMixin(sg_rpc.SecurityGroupAgentRpcCallbackMixin): - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, sg_agent): super(HyperVSecurityCallbackMixin, self).__init__() @@ -109,7 +109,7 @@ class HyperVSecurityCallbackMixin(sg_rpc.SecurityGroupAgentRpcCallbackMixin): class HyperVNeutronAgent(object): # Set RPC API version to 1.1 by default. - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self): super(HyperVNeutronAgent, self).__init__() diff --git a/neutron/plugins/hyperv/agent/utils.py b/neutron/plugins/hyperv/agent/utils.py index 0fb79b5534c..320b3b9185b 100644 --- a/neutron/plugins/hyperv/agent/utils.py +++ b/neutron/plugins/hyperv/agent/utils.py @@ -17,7 +17,7 @@ import sys import time -from oslo.config import cfg +from oslo_config import cfg from neutron.common import exceptions as n_exc from neutron.openstack.common import log as logging diff --git a/neutron/plugins/hyperv/agent/utilsfactory.py b/neutron/plugins/hyperv/agent/utilsfactory.py index 555862478ce..89aa109d159 100644 --- a/neutron/plugins/hyperv/agent/utilsfactory.py +++ b/neutron/plugins/hyperv/agent/utilsfactory.py @@ -15,7 +15,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LW from neutron.openstack.common import log as logging diff --git a/neutron/plugins/hyperv/agent_notifier_api.py b/neutron/plugins/hyperv/agent_notifier_api.py index dbfa230a895..7ce109caeae 100644 --- a/neutron/plugins/hyperv/agent_notifier_api.py +++ b/neutron/plugins/hyperv/agent_notifier_api.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import rpc as n_rpc from neutron.common import topics @@ -42,7 +42,7 @@ class AgentNotifierApi(object): self.topic_tunnel_update = topics.get_topic_name(topic, constants.TUNNEL, topics.UPDATE) - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def network_delete(self, context, network_id): diff --git a/neutron/plugins/hyperv/hyperv_neutron_plugin.py b/neutron/plugins/hyperv/hyperv_neutron_plugin.py index c22115680a0..285f84c7010 100644 --- a/neutron/plugins/hyperv/hyperv_neutron_plugin.py +++ b/neutron/plugins/hyperv/hyperv_neutron_plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.api.rpc.handlers import dhcp_rpc from neutron.api.rpc.handlers import l3_rpc diff --git a/neutron/plugins/hyperv/rpc_callbacks.py b/neutron/plugins/hyperv/rpc_callbacks.py index a4771351f3f..851f5532746 100644 --- a/neutron/plugins/hyperv/rpc_callbacks.py +++ b/neutron/plugins/hyperv/rpc_callbacks.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from neutron.common import constants as q_const from neutron.openstack.common import log as logging @@ -28,7 +28,7 @@ class HyperVRpcCallbacks(object): # history # 1.1 Support Security Group RPC # 1.2 Support get_devices_details_list - target = messaging.Target(version='1.2') + target = oslo_messaging.Target(version='1.2') def __init__(self, notifier): super(HyperVRpcCallbacks, self).__init__() diff --git a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py index d6f559dbed8..03be7ccf3f2 100644 --- a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py +++ b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py @@ -22,8 +22,8 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.agent.linux import ip_lib from neutron.agent.linux import ovs_lib @@ -53,7 +53,7 @@ class SdnvePluginApi(agent_rpc.PluginApi): class SdnveNeutronAgent(object): - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, integ_br, interface_mappings, info, root_helper, polling_interval, diff --git a/neutron/plugins/ibm/common/config.py b/neutron/plugins/ibm/common/config.py index f05a995a6c8..45b27f89b99 100644 --- a/neutron/plugins/ibm/common/config.py +++ b/neutron/plugins/ibm/common/config.py @@ -15,7 +15,7 @@ # under the License. -from oslo.config import cfg +from oslo_config import cfg DEFAULT_INTERFACE_MAPPINGS = [] diff --git a/neutron/plugins/ibm/sdnve_api.py b/neutron/plugins/ibm/sdnve_api.py index 470cb47df79..e992d8dc539 100644 --- a/neutron/plugins/ibm/sdnve_api.py +++ b/neutron/plugins/ibm/sdnve_api.py @@ -20,7 +20,7 @@ import urllib import httplib2 from keystoneclient.v2_0 import client as keyclient -from oslo.config import cfg +from oslo_config import cfg from neutron.api.v2 import attributes from neutron.common import utils diff --git a/neutron/plugins/ibm/sdnve_neutron_plugin.py b/neutron/plugins/ibm/sdnve_neutron_plugin.py index a24f027a68a..92b5c4047fb 100644 --- a/neutron/plugins/ibm/sdnve_neutron_plugin.py +++ b/neutron/plugins/ibm/sdnve_neutron_plugin.py @@ -17,9 +17,9 @@ import functools -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import excutils from neutron.common import constants as n_const from neutron.common import exceptions as n_exc @@ -60,7 +60,7 @@ class AgentNotifierApi(object): '''Agent side of the SDN-VE rpc API.''' def __init__(self, topic): - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) self.topic_info_update = topics.get_topic_name(topic, constants.INFO, diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index 66cea96bd3a..2ae3a7abc17 100755 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -26,8 +26,8 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from six import moves from neutron.agent import l2population_rpc as l2pop_rpc @@ -638,7 +638,7 @@ class LinuxBridgeRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin, # Set RPC API version to 1.0 by default. # history # 1.1 Support Security Group RPC - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, context, agent, sg_agent): super(LinuxBridgeRpcCallbacks, self).__init__() diff --git a/neutron/plugins/linuxbridge/common/config.py b/neutron/plugins/linuxbridge/common/config.py index 74942a17f6c..db5b605e297 100644 --- a/neutron/plugins/linuxbridge/common/config.py +++ b/neutron/plugins/linuxbridge/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config diff --git a/neutron/plugins/metaplugin/common/config.py b/neutron/plugins/metaplugin/common/config.py index a973e243edd..dfcbfe12080 100644 --- a/neutron/plugins/metaplugin/common/config.py +++ b/neutron/plugins/metaplugin/common/config.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg meta_plugin_opts = [ diff --git a/neutron/plugins/metaplugin/meta_neutron_plugin.py b/neutron/plugins/metaplugin/meta_neutron_plugin.py index feff7e2f034..35233f88934 100644 --- a/neutron/plugins/metaplugin/meta_neutron_plugin.py +++ b/neutron/plugins/metaplugin/meta_neutron_plugin.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.common import exceptions as exc from neutron.common import topics diff --git a/neutron/plugins/metaplugin/proxy_neutron_plugin.py b/neutron/plugins/metaplugin/proxy_neutron_plugin.py index 35d4b4a5795..3b9dca39e10 100644 --- a/neutron/plugins/metaplugin/proxy_neutron_plugin.py +++ b/neutron/plugins/metaplugin/proxy_neutron_plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.db import db_base_plugin_v2 from neutron.db import external_net_db diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py index 67d46d01924..43a0b77b53a 100644 --- a/neutron/plugins/midonet/plugin.py +++ b/neutron/plugins/midonet/plugin.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from midonet.neutron import plugin diff --git a/neutron/plugins/ml2/config.py b/neutron/plugins/ml2/config.py index 9591e6b19e2..a5c05658851 100644 --- a/neutron/plugins/ml2/config.py +++ b/neutron/plugins/ml2/config.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg ml2_opts = [ diff --git a/neutron/plugins/ml2/db.py b/neutron/plugins/ml2/db.py index 1cf2b18e46a..56c2f189ca4 100644 --- a/neutron/plugins/ml2/db.py +++ b/neutron/plugins/ml2/db.py @@ -16,7 +16,7 @@ from sqlalchemy import or_ from sqlalchemy.orm import exc -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from neutron.common import constants as n_const from neutron.db import api as db_api diff --git a/neutron/plugins/ml2/driver_context.py b/neutron/plugins/ml2/driver_context.py index c0795e01a66..123896a3702 100644 --- a/neutron/plugins/ml2/driver_context.py +++ b/neutron/plugins/ml2/driver_context.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.common import constants from neutron.common import exceptions as exc diff --git a/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py b/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py index 98dfe74458a..baffd600942 100644 --- a/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py +++ b/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py @@ -17,7 +17,7 @@ import socket import struct import jsonrpclib -from oslo.config import cfg +from oslo_config import cfg from neutron import context as nctx from neutron.db import db_base_plugin_v2 diff --git a/neutron/plugins/ml2/drivers/arista/config.py b/neutron/plugins/ml2/drivers/arista/config.py index 2f38989c9b1..0f53f3afa1f 100644 --- a/neutron/plugins/ml2/drivers/arista/config.py +++ b/neutron/plugins/ml2/drivers/arista/config.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg # Arista ML2 Mechanism driver specific configuration knobs. diff --git a/neutron/plugins/ml2/drivers/arista/mechanism_arista.py b/neutron/plugins/ml2/drivers/arista/mechanism_arista.py index cab8cc756dd..446c174fd4d 100644 --- a/neutron/plugins/ml2/drivers/arista/mechanism_arista.py +++ b/neutron/plugins/ml2/drivers/arista/mechanism_arista.py @@ -17,7 +17,7 @@ import threading from networking_arista.common import db_lib from networking_arista.ml2 import arista_ml2 -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_const from neutron.i18n import _LI diff --git a/neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py b/neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py index b2f98c7bdf1..a0592b3cc85 100644 --- a/neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py +++ b/neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py @@ -16,9 +16,9 @@ """Implentation of Brocade ML2 Mechanism driver for ML2 Plugin.""" -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils from neutron.i18n import _LE, _LI from neutron.openstack.common import log as logging diff --git a/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py b/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py index c028eeb3be3..a0a607ca3fb 100644 --- a/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py +++ b/neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py @@ -19,7 +19,7 @@ Neutron network life-cycle management. """ from ncclient import manager -from oslo.utils import excutils +from oslo_utils import excutils from xml.etree import ElementTree from neutron.i18n import _LE diff --git a/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py b/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py index 78e1be790a4..3487d5e070c 100644 --- a/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py +++ b/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py @@ -20,9 +20,9 @@ import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging from oslo_concurrency import lockutils +from oslo_config import cfg +import oslo_messaging from neutron.agent.common import config from neutron.agent.linux import ip_lib @@ -58,7 +58,7 @@ LOG = logging.getLogger(__name__) class ApicTopologyService(manager.Manager): - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, host=None): if host is None: @@ -142,7 +142,7 @@ class ApicTopologyService(manager.Manager): class ApicTopologyServiceNotifierApi(object): def __init__(self): - target = messaging.Target(topic=TOPIC_APIC_SERVICE, version='1.0') + target = oslo_messaging.Target(topic=TOPIC_APIC_SERVICE, version='1.0') self.client = rpc.get_client(target) def update_link(self, context, host, interface, mac, switch, module, port): diff --git a/neutron/plugins/ml2/drivers/cisco/apic/config.py b/neutron/plugins/ml2/drivers/cisco/apic/config.py index e8801041b76..0c55625eeaa 100644 --- a/neutron/plugins/ml2/drivers/cisco/apic/config.py +++ b/neutron/plugins/ml2/drivers/cisco/apic/config.py @@ -13,14 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg DEFAULT_ROOT_HELPER = ('sudo /usr/local/bin/neutron-rootwrap ' '/etc/neutron/rootwrap.conf') -# oslo.config limits ${var} expansion to global variables +# oslo_config limits ${var} expansion to global variables # That is why apic_system_id as a global variable global_opts = [ cfg.StrOpt('apic_system_id', diff --git a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py index ea13fcffd7e..f6fa93b098c 100644 --- a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py +++ b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py @@ -16,8 +16,8 @@ from apicapi import apic_manager from keystoneclient.v2_0 import client as keyclient import netaddr -from oslo.config import cfg from oslo_concurrency import lockutils +from oslo_config import cfg from neutron.common import constants as n_constants from neutron.openstack.common import log diff --git a/neutron/plugins/ml2/drivers/cisco/nexus/config.py b/neutron/plugins/ml2/drivers/cisco/nexus/config.py index 3be443088d7..ceeb60cf5a6 100644 --- a/neutron/plugins/ml2/drivers/cisco/nexus/config.py +++ b/neutron/plugins/ml2/drivers/cisco/nexus/config.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg ml2_cisco_opts = [ diff --git a/neutron/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py b/neutron/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py index 5219a0f909d..35c86040d07 100644 --- a/neutron/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py +++ b/neutron/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py @@ -17,7 +17,7 @@ ML2 Mechanism Driver for Cisco Nexus platforms. """ -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_const from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/cisco/nexus/nexus_network_driver.py b/neutron/plugins/ml2/drivers/cisco/nexus/nexus_network_driver.py index 826b4460bb0..68b2a26f4db 100644 --- a/neutron/plugins/ml2/drivers/cisco/nexus/nexus_network_driver.py +++ b/neutron/plugins/ml2/drivers/cisco/nexus/nexus_network_driver.py @@ -17,8 +17,8 @@ Implements a Nexus-OS NETCONF over SSHv2 API Client """ -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from neutron.openstack.common import log as logging from neutron.plugins.ml2.drivers.cisco.nexus import config as conf diff --git a/neutron/plugins/ml2/drivers/freescale/config.py b/neutron/plugins/ml2/drivers/freescale/config.py index e1e11e14275..71641203ba0 100644 --- a/neutron/plugins/ml2/drivers/freescale/config.py +++ b/neutron/plugins/ml2/drivers/freescale/config.py @@ -14,7 +14,7 @@ # limitations under the License. from neutronclient.v2_0 import client -from oslo.config import cfg +from oslo_config import cfg # Freescale CRD Server Configuration used by ML2 Mechanism Driver. # diff --git a/neutron/plugins/ml2/drivers/helpers.py b/neutron/plugins/ml2/drivers/helpers.py index 5730053bba9..e39b53a7d08 100644 --- a/neutron/plugins/ml2/drivers/helpers.py +++ b/neutron/plugins/ml2/drivers/helpers.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from neutron.common import exceptions as exc from neutron.i18n import _LW diff --git a/neutron/plugins/ml2/drivers/l2pop/config.py b/neutron/plugins/ml2/drivers/l2pop/config.py index 403b66269fe..3e88a72f85a 100644 --- a/neutron/plugins/ml2/drivers/l2pop/config.py +++ b/neutron/plugins/ml2/drivers/l2pop/config.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg l2_population_options = [ diff --git a/neutron/plugins/ml2/drivers/l2pop/db.py b/neutron/plugins/ml2/drivers/l2pop/db.py index 11f185b104d..65faa7ce04c 100644 --- a/neutron/plugins/ml2/drivers/l2pop/db.py +++ b/neutron/plugins/ml2/drivers/l2pop/db.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from sqlalchemy import sql from neutron.common import constants as const diff --git a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py index b0ef8c17fcd..a93c0c76aed 100644 --- a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py +++ b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as const from neutron import context as n_context diff --git a/neutron/plugins/ml2/drivers/l2pop/rpc.py b/neutron/plugins/ml2/drivers/l2pop/rpc.py index f56abd5ce7a..5dd7378bfaa 100644 --- a/neutron/plugins/ml2/drivers/l2pop/rpc.py +++ b/neutron/plugins/ml2/drivers/l2pop/rpc.py @@ -16,7 +16,7 @@ import collections import copy -from oslo import messaging +import oslo_messaging from neutron.common import rpc as n_rpc from neutron.common import topics @@ -36,7 +36,7 @@ class L2populationAgentNotifyAPI(object): self.topic_l2pop_update = topics.get_topic_name(topic, topics.L2POPULATION, topics.UPDATE) - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def _notification_fanout(self, context, method, fdb_entries): diff --git a/neutron/plugins/ml2/drivers/mech_bigswitch/driver.py b/neutron/plugins/ml2/drivers/mech_bigswitch/driver.py index fc5a016ea56..dbee04c519e 100644 --- a/neutron/plugins/ml2/drivers/mech_bigswitch/driver.py +++ b/neutron/plugins/ml2/drivers/mech_bigswitch/driver.py @@ -17,9 +17,9 @@ import datetime import httplib import eventlet -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import timeutils from neutron import context as ctx from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/mech_nuage/driver.py b/neutron/plugins/ml2/drivers/mech_nuage/driver.py index 97d12cd4f21..0b9ddefdca2 100644 --- a/neutron/plugins/ml2/drivers/mech_nuage/driver.py +++ b/neutron/plugins/ml2/drivers/mech_nuage/driver.py @@ -13,7 +13,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_consts from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py index b50e26bd172..2d365f13a8e 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/mechanism_ncs.py b/neutron/plugins/ml2/drivers/mechanism_ncs.py index 99a5efa21dc..06370423190 100644 --- a/neutron/plugins/ml2/drivers/mechanism_ncs.py +++ b/neutron/plugins/ml2/drivers/mechanism_ncs.py @@ -15,8 +15,8 @@ import re -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import requests from neutron.openstack.common import log diff --git a/neutron/plugins/ml2/drivers/mlnx/config.py b/neutron/plugins/ml2/drivers/mlnx/config.py index eac221b7611..731190953b6 100644 --- a/neutron/plugins/ml2/drivers/mlnx/config.py +++ b/neutron/plugins/ml2/drivers/mlnx/config.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/mlnx/mech_mlnx.py b/neutron/plugins/ml2/drivers/mlnx/mech_mlnx.py index c754c5890ad..84c5ae9ad10 100644 --- a/neutron/plugins/ml2/drivers/mlnx/mech_mlnx.py +++ b/neutron/plugins/ml2/drivers/mlnx/mech_mlnx.py @@ -15,7 +15,7 @@ # limitations under the License. from networking_mlnx.plugins.ml2.drivers.mlnx import constants -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_const from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/opendaylight/driver.py b/neutron/plugins/ml2/drivers/opendaylight/driver.py index 8ebe0da7182..3c6f89ee003 100644 --- a/neutron/plugins/ml2/drivers/opendaylight/driver.py +++ b/neutron/plugins/ml2/drivers/opendaylight/driver.py @@ -15,7 +15,7 @@ from networking_odl.common import constants as odl_const from networking_odl.ml2 import mech_driver -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_const from neutron.extensions import portbindings diff --git a/neutron/plugins/ml2/drivers/type_flat.py b/neutron/plugins/ml2/drivers/type_flat.py index bb675971352..21aaa5731cb 100644 --- a/neutron/plugins/ml2/drivers/type_flat.py +++ b/neutron/plugins/ml2/drivers/type_flat.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc import sqlalchemy as sa from neutron.common import exceptions as exc diff --git a/neutron/plugins/ml2/drivers/type_gre.py b/neutron/plugins/ml2/drivers/type_gre.py index df9e8916d58..1d17b66f287 100644 --- a/neutron/plugins/ml2/drivers/type_gre.py +++ b/neutron/plugins/ml2/drivers/type_gre.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from six import moves import sqlalchemy as sa from sqlalchemy import sql diff --git a/neutron/plugins/ml2/drivers/type_vlan.py b/neutron/plugins/ml2/drivers/type_vlan.py index ac06e89e3d1..a2bf98a1fea 100644 --- a/neutron/plugins/ml2/drivers/type_vlan.py +++ b/neutron/plugins/ml2/drivers/type_vlan.py @@ -15,7 +15,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from six import moves import sqlalchemy as sa diff --git a/neutron/plugins/ml2/drivers/type_vxlan.py b/neutron/plugins/ml2/drivers/type_vxlan.py index 7959f6cbaeb..97701f13571 100644 --- a/neutron/plugins/ml2/drivers/type_vxlan.py +++ b/neutron/plugins/ml2/drivers/type_vxlan.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from six import moves import sqlalchemy as sa from sqlalchemy import sql diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index 84142f87799..885562270c8 100644 --- a/neutron/plugins/ml2/managers.py +++ b/neutron/plugins/ml2/managers.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import stevedore from neutron.api.v2 import attributes diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index a303fac3569..411002dc7b3 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -16,12 +16,12 @@ import contextlib from eventlet import greenthread -from oslo.config import cfg -from oslo.db import exception as os_db_exception -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import importutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_db import exception as os_db_exception +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import importutils from sqlalchemy import exc as sql_exc from sqlalchemy.orm import exc as sa_exc diff --git a/neutron/plugins/ml2/rpc.py b/neutron/plugins/ml2/rpc.py index 36cfc3fcaf9..b08d06be169 100644 --- a/neutron/plugins/ml2/rpc.py +++ b/neutron/plugins/ml2/rpc.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging +import oslo_messaging from sqlalchemy.orm import exc from neutron.agent import securitygroups_rpc as sg_rpc @@ -45,7 +45,7 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin): # 1.3 get_device_details rpc signature upgrade to obtain 'host' and # return value to include fixed_ips and device_owner for # the device port - target = messaging.Target(version='1.3') + target = oslo_messaging.Target(version='1.3') def __init__(self, notifier, type_manager): self.setup_tunnel_callback_mixin(notifier, type_manager) @@ -198,7 +198,7 @@ class AgentNotifierApi(dvr_rpc.DVRAgentRpcApiMixin, self.topic_port_update = topics.get_topic_name(topic, topics.PORT, topics.UPDATE) - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def network_delete(self, context, network_id): diff --git a/neutron/plugins/mlnx/agent/config.py b/neutron/plugins/mlnx/agent/config.py index 1776ae37655..dbbba93b64f 100644 --- a/neutron/plugins/mlnx/agent/config.py +++ b/neutron/plugins/mlnx/agent/config.py @@ -14,7 +14,7 @@ # limitations under the License. from networking_mlnx.plugins.mlnx.agent import constants -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config diff --git a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py index 05b689db6fd..36e3226d72b 100644 --- a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py +++ b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py @@ -17,7 +17,7 @@ import sys from networking_mlnx.plugins.mlnx.agent import mlnx_eswitch_neutron_agent -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LE, _LI from neutron.common import config as common_config diff --git a/neutron/plugins/nec/agent/nec_neutron_agent.py b/neutron/plugins/nec/agent/nec_neutron_agent.py index 90fa800c57b..816e66f8829 100755 --- a/neutron/plugins/nec/agent/nec_neutron_agent.py +++ b/neutron/plugins/nec/agent/nec_neutron_agent.py @@ -25,7 +25,7 @@ import time import eventlet eventlet.monkey_patch() -from oslo import messaging +import oslo_messaging from neutron.agent.linux import ovs_lib from neutron.agent import rpc as agent_rpc @@ -62,7 +62,7 @@ class NECPluginApi(agent_rpc.PluginApi): class NECAgentRpcCallback(object): - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, context, agent, sg_agent): super(NECAgentRpcCallback, self).__init__() @@ -84,7 +84,7 @@ class NECAgentRpcCallback(object): class SecurityGroupAgentRpcCallback(sg_rpc.SecurityGroupAgentRpcCallbackMixin): - target = messaging.Target(version=sg_rpc.SG_RPC_VERSION) + target = oslo_messaging.Target(version=sg_rpc.SG_RPC_VERSION) def __init__(self, context, sg_agent): super(SecurityGroupAgentRpcCallback, self).__init__() diff --git a/neutron/plugins/nec/common/config.py b/neutron/plugins/nec/common/config.py index f673b9e1167..55f093ebddc 100644 --- a/neutron/plugins/nec/common/config.py +++ b/neutron/plugins/nec/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.plugins.nec.common import constants as nconst diff --git a/neutron/plugins/nec/common/ofc_client.py b/neutron/plugins/nec/common/ofc_client.py index d3daf3db977..a738019f74a 100644 --- a/neutron/plugins/nec/common/ofc_client.py +++ b/neutron/plugins/nec/common/ofc_client.py @@ -14,8 +14,8 @@ import time -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils import requests from neutron.i18n import _LI, _LW diff --git a/neutron/plugins/nec/drivers/__init__.py b/neutron/plugins/nec/drivers/__init__.py index d4fdda4420a..7ed4b9b7a37 100644 --- a/neutron/plugins/nec/drivers/__init__.py +++ b/neutron/plugins/nec/drivers/__init__.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import importutils +from oslo_utils import importutils from neutron.i18n import _LI from neutron.openstack.common import log as logging diff --git a/neutron/plugins/nec/extensions/packetfilter.py b/neutron/plugins/nec/extensions/packetfilter.py index f534e619dfd..e6384f478c0 100644 --- a/neutron/plugins/nec/extensions/packetfilter.py +++ b/neutron/plugins/nec/extensions/packetfilter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.api import extensions from neutron.api.v2 import attributes diff --git a/neutron/plugins/nec/nec_plugin.py b/neutron/plugins/nec/nec_plugin.py index 088f699909e..f37670f45db 100644 --- a/neutron/plugins/nec/nec_plugin.py +++ b/neutron/plugins/nec/nec_plugin.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils +import oslo_messaging +from oslo_utils import excutils +from oslo_utils import importutils from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api import extensions as neutron_extensions @@ -679,7 +679,7 @@ class NECPluginV2AgentNotifierApi(sg_rpc.SecurityGroupAgentRpcApiMixin): self.topic = topic self.topic_port_update = topics.get_topic_name( topic, topics.PORT, topics.UPDATE) - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def port_update(self, context, port): @@ -689,7 +689,7 @@ class NECPluginV2AgentNotifierApi(sg_rpc.SecurityGroupAgentRpcApiMixin): class NECPluginV2RPCCallbacks(object): - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, plugin): super(NECPluginV2RPCCallbacks, self).__init__() diff --git a/neutron/plugins/nec/nec_router.py b/neutron/plugins/nec/nec_router.py index 3475d01910e..1eec439b2e7 100644 --- a/neutron/plugins/nec/nec_router.py +++ b/neutron/plugins/nec/nec_router.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes as attr diff --git a/neutron/plugins/nec/packet_filter.py b/neutron/plugins/nec/packet_filter.py index 9cb156537cc..87a94a5b96c 100644 --- a/neutron/plugins/nec/packet_filter.py +++ b/neutron/plugins/nec/packet_filter.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import excutils +from oslo_utils import excutils from neutron.i18n import _LE from neutron.openstack.common import log as logging diff --git a/neutron/plugins/nec/router_drivers.py b/neutron/plugins/nec/router_drivers.py index a9a6b7ae5c7..cb647d11e9d 100644 --- a/neutron/plugins/nec/router_drivers.py +++ b/neutron/plugins/nec/router_drivers.py @@ -15,7 +15,7 @@ import abc import httplib -from oslo.utils import excutils +from oslo_utils import excutils import six from neutron.common import log as call_log diff --git a/neutron/plugins/nuage/common/config.py b/neutron/plugins/nuage/common/config.py index 5d125c8c8df..cfd2fb92439 100644 --- a/neutron/plugins/nuage/common/config.py +++ b/neutron/plugins/nuage/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg restproxy_opts = [ diff --git a/neutron/plugins/nuage/plugin.py b/neutron/plugins/nuage/plugin.py index 22457856502..d47a54d8a61 100644 --- a/neutron/plugins/nuage/plugin.py +++ b/neutron/plugins/nuage/plugin.py @@ -16,10 +16,10 @@ import copy import re import netaddr -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils from sqlalchemy.orm import exc from neutron.api import extensions as neutron_extensions diff --git a/neutron/plugins/nuage/syncmanager.py b/neutron/plugins/nuage/syncmanager.py index 37e51bffbb1..6768fe018ce 100644 --- a/neutron/plugins/nuage/syncmanager.py +++ b/neutron/plugins/nuage/syncmanager.py @@ -13,9 +13,9 @@ # under the License. # -from oslo.config import cfg -from oslo.utils import importutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import importutils import sqlalchemy.orm.exc as db_exc from neutron import context as ncontext diff --git a/neutron/plugins/ofagent/agent/main.py b/neutron/plugins/ofagent/agent/main.py index 04a265da110..ea81a160db6 100755 --- a/neutron/plugins/ofagent/agent/main.py +++ b/neutron/plugins/ofagent/agent/main.py @@ -20,7 +20,7 @@ hub.patch() import sys -from oslo.config import cfg +from oslo_config import cfg from ryu.base.app_manager import AppManager from ryu import cfg as ryu_cfg diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py index dc1a5256ffe..6525df0af18 100644 --- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py +++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py @@ -23,8 +23,8 @@ import time import netaddr -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from ryu.app.ofctl import api as ryu_api from ryu.base import app_manager from ryu.controller import handler @@ -177,7 +177,7 @@ class OFANeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, # history # 1.0 Initial version # 1.1 Support Security Group RPC - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, ryuapp, integ_br, local_ip, bridge_mappings, interface_mappings, root_helper, diff --git a/neutron/plugins/ofagent/common/config.py b/neutron/plugins/ofagent/common/config.py index 8f77269e61b..149ffb83426 100644 --- a/neutron/plugins/ofagent/common/config.py +++ b/neutron/plugins/ofagent/common/config.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.plugins.openvswitch.common import config as ovs_config diff --git a/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py b/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py index 128f0eb1583..c4996e63087 100644 --- a/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py +++ b/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py @@ -21,7 +21,7 @@ import time import eventlet eventlet.monkey_patch() -from oslo import messaging +import oslo_messaging from neutron.agent.linux import ovs_lib from neutron.agent import rpc as agent_rpc @@ -39,7 +39,7 @@ LOG = logging.getLogger(__name__) class NVSDAgentRpcCallback(object): - target = messaging.Target(version='1.0') + target = oslo_messaging.Target(version='1.0') def __init__(self, context, agent, sg_agent): super(NVSDAgentRpcCallback, self).__init__() @@ -61,7 +61,7 @@ class NVSDAgentRpcCallback(object): class SecurityGroupAgentRpcCallback(sg_rpc.SecurityGroupAgentRpcCallbackMixin): - target = messaging.Target(version=sg_rpc.SG_RPC_VERSION) + target = oslo_messaging.Target(version=sg_rpc.SG_RPC_VERSION) def __init__(self, context, sg_agent): super(SecurityGroupAgentRpcCallback, self).__init__() @@ -73,7 +73,7 @@ class NVSDNeutronAgent(object): # history # 1.0 Initial version # 1.1 Support Security Group RPC - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, integ_br, root_helper, polling_interval): super(NVSDNeutronAgent, self).__init__() diff --git a/neutron/plugins/oneconvergence/lib/config.py b/neutron/plugins/oneconvergence/lib/config.py index 2bbf086a37c..1baf8d307fb 100644 --- a/neutron/plugins/oneconvergence/lib/config.py +++ b/neutron/plugins/oneconvergence/lib/config.py @@ -15,7 +15,7 @@ """ Register the configuration options""" -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config diff --git a/neutron/plugins/oneconvergence/lib/nvsdlib.py b/neutron/plugins/oneconvergence/lib/nvsdlib.py index 1b7b243fe22..ba6033a4154 100644 --- a/neutron/plugins/oneconvergence/lib/nvsdlib.py +++ b/neutron/plugins/oneconvergence/lib/nvsdlib.py @@ -14,8 +14,8 @@ """Intermidiate NVSD Library.""" -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.openstack.common import log as logging import neutron.plugins.oneconvergence.lib.exception as nvsdexception diff --git a/neutron/plugins/oneconvergence/lib/plugin_helper.py b/neutron/plugins/oneconvergence/lib/plugin_helper.py index 9506f89b1f4..7b5ef69f7b7 100644 --- a/neutron/plugins/oneconvergence/lib/plugin_helper.py +++ b/neutron/plugins/oneconvergence/lib/plugin_helper.py @@ -17,8 +17,8 @@ import httplib import time -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import requests from six.moves.urllib import parse diff --git a/neutron/plugins/oneconvergence/plugin.py b/neutron/plugins/oneconvergence/plugin.py index 21c5666b037..8d7c9fb2675 100644 --- a/neutron/plugins/oneconvergence/plugin.py +++ b/neutron/plugins/oneconvergence/plugin.py @@ -14,10 +14,10 @@ """Implementation of OneConvergence Neutron Plugin.""" -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import excutils +from oslo_utils import importutils from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api @@ -69,7 +69,7 @@ class NVSDPluginV2AgentNotifierApi(sg_rpc.SecurityGroupAgentRpcApiMixin): self.topic = topic self.topic_port_update = topics.get_topic_name(topic, topics.PORT, topics.UPDATE) - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def port_update(self, context, port): diff --git a/neutron/plugins/opencontrail/contrail_plugin.py b/neutron/plugins/opencontrail/contrail_plugin.py index 80717fcc012..36fb9d016b2 100644 --- a/neutron/plugins/opencontrail/contrail_plugin.py +++ b/neutron/plugins/opencontrail/contrail_plugin.py @@ -13,8 +13,8 @@ # under the License. # -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import requests from neutron.api.v2 import attributes as attr diff --git a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py index 4eeeb04fd0f..f58c4a56339 100644 --- a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py @@ -14,8 +14,8 @@ # under the License. -from oslo import messaging -from oslo.utils import excutils +import oslo_messaging +from oslo_utils import excutils from neutron.api.rpc.handlers import dvr_rpc from neutron.common import constants as n_const @@ -155,12 +155,12 @@ class OVSDVRNeutronAgent(dvr_rpc.DVRAgentRpcApiMixin): def get_dvr_mac_address(self): try: self.get_dvr_mac_address_with_retry() - except messaging.RemoteError as e: + except oslo_messaging.RemoteError as e: LOG.warning(_LW('L2 agent could not get DVR MAC address at ' 'startup due to RPC error. It happens when the ' 'server does not support this RPC API. Detailed ' 'message: %s'), e) - except messaging.MessagingTimeout: + except oslo_messaging.MessagingTimeout: LOG.error(_LE('DVR: Failed to obtain a valid local ' 'DVR MAC address - L2 Agent operating ' 'in Non-DVR Mode')) @@ -178,7 +178,7 @@ class OVSDVRNeutronAgent(dvr_rpc.DVRAgentRpcApiMixin): try: details = self.plugin_rpc.get_dvr_mac_address_by_host( self.context, self.host) - except messaging.MessagingTimeout as e: + except oslo_messaging.MessagingTimeout as e: with excutils.save_and_reraise_exception() as ctx: if retry_count > 0: ctx.reraise = False diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index 45cc1c1cbeb..b1a3565bb7c 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -24,8 +24,8 @@ eventlet.monkey_patch() import netaddr from neutron.plugins.openvswitch.agent import ovs_dvr_neutron_agent -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from six import moves from neutron.agent import l2population_rpc @@ -119,7 +119,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, # 1.0 Initial version # 1.1 Support Security Group RPC # 1.2 Support DVR (Distributed Virtual Router) RPC - target = messaging.Target(version='1.2') + target = oslo_messaging.Target(version='1.2') def __init__(self, integ_br, tun_br, local_ip, bridge_mappings, root_helper, diff --git a/neutron/plugins/openvswitch/common/config.py b/neutron/plugins/openvswitch/common/config.py index a46309518e8..5266b3c3dc8 100644 --- a/neutron/plugins/openvswitch/common/config.py +++ b/neutron/plugins/openvswitch/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py index d46ae750e3b..c625bad5cf8 100644 --- a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py +++ b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py @@ -19,8 +19,8 @@ to the PLUMgrid Network Management System called Director """ import netaddr -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from sqlalchemy.orm import exc as sa_exc from neutron.api.v2 import attributes diff --git a/neutron/plugins/sriovnicagent/common/config.py b/neutron/plugins/sriovnicagent/common/config.py index 9d8c6a41cd3..ff18d4d1ba3 100644 --- a/neutron/plugins/sriovnicagent/common/config.py +++ b/neutron/plugins/sriovnicagent/common/config.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config diff --git a/neutron/plugins/sriovnicagent/sriov_nic_agent.py b/neutron/plugins/sriovnicagent/sriov_nic_agent.py index e9b42c064f5..ad4bfb7c33c 100644 --- a/neutron/plugins/sriovnicagent/sriov_nic_agent.py +++ b/neutron/plugins/sriovnicagent/sriov_nic_agent.py @@ -21,8 +21,8 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc @@ -47,7 +47,7 @@ class SriovNicSwitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin): # Set RPC API version to 1.0 by default. # history # 1.1 Support Security Group RPC - target = messaging.Target(version='1.1') + target = oslo_messaging.Target(version='1.1') def __init__(self, context, agent, sg_agent): super(SriovNicSwitchRpcCallbacks, self).__init__() diff --git a/neutron/plugins/vmware/api_client/base.py b/neutron/plugins/vmware/api_client/base.py index d7e2f768d07..4178355544c 100644 --- a/neutron/plugins/vmware/api_client/base.py +++ b/neutron/plugins/vmware/api_client/base.py @@ -19,7 +19,7 @@ import httplib import six import time -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LE, _LI, _LW from neutron.openstack.common import log as logging diff --git a/neutron/plugins/vmware/api_client/eventlet_request.py b/neutron/plugins/vmware/api_client/eventlet_request.py index 3402e4f9080..dfa9348352a 100644 --- a/neutron/plugins/vmware/api_client/eventlet_request.py +++ b/neutron/plugins/vmware/api_client/eventlet_request.py @@ -18,7 +18,7 @@ import httplib import urllib import eventlet -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.i18n import _LI, _LW from neutron.openstack.common import log as logging diff --git a/neutron/plugins/vmware/api_client/request.py b/neutron/plugins/vmware/api_client/request.py index a488d7637fc..2575a7a3dd7 100644 --- a/neutron/plugins/vmware/api_client/request.py +++ b/neutron/plugins/vmware/api_client/request.py @@ -21,7 +21,7 @@ import httplib import time import eventlet -from oslo.utils import excutils +from oslo_utils import excutils import six import six.moves.urllib.parse as urlparse diff --git a/neutron/plugins/vmware/check_nsx_config.py b/neutron/plugins/vmware/check_nsx_config.py index 81368ecee5d..8d9d3d06736 100644 --- a/neutron/plugins/vmware/check_nsx_config.py +++ b/neutron/plugins/vmware/check_nsx_config.py @@ -17,7 +17,7 @@ from __future__ import print_function import sys -from oslo.config import cfg +from oslo_config import cfg from neutron.common import config from neutron.plugins.vmware.common import config as nsx_config # noqa diff --git a/neutron/plugins/vmware/common/config.py b/neutron/plugins/vmware/common/config.py index df144f3d706..281bac55731 100644 --- a/neutron/plugins/vmware/common/config.py +++ b/neutron/plugins/vmware/common/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.vmware.common import exceptions as nsx_exc diff --git a/neutron/plugins/vmware/common/sync.py b/neutron/plugins/vmware/common/sync.py index 29326db190a..e60ddd468c0 100644 --- a/neutron/plugins/vmware/common/sync.py +++ b/neutron/plugins/vmware/common/sync.py @@ -15,8 +15,8 @@ import random -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from neutron.common import constants from neutron.common import exceptions diff --git a/neutron/plugins/vmware/dbexts/db.py b/neutron/plugins/vmware/dbexts/db.py index 602e09d86cf..187a8c12cea 100644 --- a/neutron/plugins/vmware/dbexts/db.py +++ b/neutron/plugins/vmware/dbexts/db.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc -from oslo.utils import excutils +from oslo_db import exception as db_exc +from oslo_utils import excutils from sqlalchemy.orm import exc import neutron.db.api as db diff --git a/neutron/plugins/vmware/dbexts/lsn_db.py b/neutron/plugins/vmware/dbexts/lsn_db.py index fd601971341..82e93b30e24 100644 --- a/neutron/plugins/vmware/dbexts/lsn_db.py +++ b/neutron/plugins/vmware/dbexts/lsn_db.py @@ -15,7 +15,7 @@ # under the License. # -from oslo.db import exception as d_exc +from oslo_db import exception as d_exc from sqlalchemy import orm from neutron.openstack.common import log as logging diff --git a/neutron/plugins/vmware/dhcp_meta/lsnmanager.py b/neutron/plugins/vmware/dhcp_meta/lsnmanager.py index df6ffc3aac3..65fdb3c35e5 100644 --- a/neutron/plugins/vmware/dhcp_meta/lsnmanager.py +++ b/neutron/plugins/vmware/dhcp_meta/lsnmanager.py @@ -15,9 +15,9 @@ # under the License. # -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.utils import excutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_utils import excutils from neutron.common import exceptions as n_exc from neutron.i18n import _LE, _LW diff --git a/neutron/plugins/vmware/dhcp_meta/nsx.py b/neutron/plugins/vmware/dhcp_meta/nsx.py index 817a1e163de..a4d0857d57d 100644 --- a/neutron/plugins/vmware/dhcp_meta/nsx.py +++ b/neutron/plugins/vmware/dhcp_meta/nsx.py @@ -15,8 +15,8 @@ # under the License. # -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.api.v2 import attributes as attr from neutron.common import constants as const diff --git a/neutron/plugins/vmware/dhcp_meta/rpc.py b/neutron/plugins/vmware/dhcp_meta/rpc.py index dec1a17c7d0..2479bf44a94 100644 --- a/neutron/plugins/vmware/dhcp_meta/rpc.py +++ b/neutron/plugins/vmware/dhcp_meta/rpc.py @@ -16,7 +16,7 @@ from eventlet import greenthread import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.v2 import attributes diff --git a/neutron/plugins/vmware/dhcpmeta_modes.py b/neutron/plugins/vmware/dhcpmeta_modes.py index 78820235b82..e6c7b08b3dd 100644 --- a/neutron/plugins/vmware/dhcpmeta_modes.py +++ b/neutron/plugins/vmware/dhcpmeta_modes.py @@ -15,8 +15,8 @@ # under the License. # -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc diff --git a/neutron/plugins/vmware/extensions/networkgw.py b/neutron/plugins/vmware/extensions/networkgw.py index 28df908907b..1be3809b5db 100644 --- a/neutron/plugins/vmware/extensions/networkgw.py +++ b/neutron/plugins/vmware/extensions/networkgw.py @@ -15,7 +15,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg from neutron.api.v2 import attributes from neutron.api.v2 import resource_helper diff --git a/neutron/plugins/vmware/nsx_cluster.py b/neutron/plugins/vmware/nsx_cluster.py index a4ce61cddb6..bf0cf37d26b 100644 --- a/neutron/plugins/vmware/nsx_cluster.py +++ b/neutron/plugins/vmware/nsx_cluster.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.i18n import _LI from neutron.openstack.common import log as logging diff --git a/neutron/plugins/vmware/nsxlib/__init__.py b/neutron/plugins/vmware/nsxlib/__init__.py index 93dfdf590a7..6e41c79a805 100644 --- a/neutron/plugins/vmware/nsxlib/__init__.py +++ b/neutron/plugins/vmware/nsxlib/__init__.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.common import exceptions as exception from neutron.openstack.common import log diff --git a/neutron/plugins/vmware/nsxlib/l2gateway.py b/neutron/plugins/vmware/nsxlib/l2gateway.py index 170ea355387..5e20d2d51c3 100644 --- a/neutron/plugins/vmware/nsxlib/l2gateway.py +++ b/neutron/plugins/vmware/nsxlib/l2gateway.py @@ -14,7 +14,7 @@ # under the License. # -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.openstack.common import log from neutron.plugins.vmware.api_client import exception as api_exc diff --git a/neutron/plugins/vmware/nsxlib/lsn.py b/neutron/plugins/vmware/nsxlib/lsn.py index fda319a698f..2efd2e3182f 100644 --- a/neutron/plugins/vmware/nsxlib/lsn.py +++ b/neutron/plugins/vmware/nsxlib/lsn.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.common import exceptions as exception from neutron.openstack.common import log diff --git a/neutron/plugins/vmware/nsxlib/queue.py b/neutron/plugins/vmware/nsxlib/queue.py index ac2f4df4d6b..0a291e45e77 100644 --- a/neutron/plugins/vmware/nsxlib/queue.py +++ b/neutron/plugins/vmware/nsxlib/queue.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.api.v2 import attributes as attr from neutron.common import exceptions as exception diff --git a/neutron/plugins/vmware/nsxlib/router.py b/neutron/plugins/vmware/nsxlib/router.py index 89fee557b26..0a39e7ab0a2 100644 --- a/neutron/plugins/vmware/nsxlib/router.py +++ b/neutron/plugins/vmware/nsxlib/router.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.common import exceptions as exception from neutron.i18n import _LE, _LI, _LW diff --git a/neutron/plugins/vmware/nsxlib/secgroup.py b/neutron/plugins/vmware/nsxlib/secgroup.py index 5c0dd5c92db..7c3c3ba86c8 100644 --- a/neutron/plugins/vmware/nsxlib/secgroup.py +++ b/neutron/plugins/vmware/nsxlib/secgroup.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.common import constants from neutron.common import exceptions diff --git a/neutron/plugins/vmware/nsxlib/switch.py b/neutron/plugins/vmware/nsxlib/switch.py index 566c645e15c..e2eb75894c4 100644 --- a/neutron/plugins/vmware/nsxlib/switch.py +++ b/neutron/plugins/vmware/nsxlib/switch.py @@ -14,8 +14,8 @@ # under the License. # -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from neutron.common import constants from neutron.common import exceptions as exception diff --git a/neutron/plugins/vmware/plugins/base.py b/neutron/plugins/vmware/plugins/base.py index caa5a5d970b..853f1bba503 100644 --- a/neutron/plugins/vmware/plugins/base.py +++ b/neutron/plugins/vmware/plugins/base.py @@ -15,10 +15,10 @@ import uuid -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_utils import excutils from sqlalchemy import exc as sql_exc from sqlalchemy.orm import exc as sa_exc import webob.exc diff --git a/neutron/plugins/vmware/vshield/common/VcnsApiClient.py b/neutron/plugins/vmware/vshield/common/VcnsApiClient.py index 1ad688804b2..e064310f372 100644 --- a/neutron/plugins/vmware/vshield/common/VcnsApiClient.py +++ b/neutron/plugins/vmware/vshield/common/VcnsApiClient.py @@ -15,7 +15,7 @@ import base64 import eventlet -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.plugins.vmware.vshield.common import exceptions diff --git a/neutron/plugins/vmware/vshield/edge_appliance_driver.py b/neutron/plugins/vmware/vshield/edge_appliance_driver.py index 26c62620400..2bdd22dee88 100644 --- a/neutron/plugins/vmware/vshield/edge_appliance_driver.py +++ b/neutron/plugins/vmware/vshield/edge_appliance_driver.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from neutron.i18n import _LE from neutron.openstack.common import log as logging diff --git a/neutron/plugins/vmware/vshield/vcns.py b/neutron/plugins/vmware/vshield/vcns.py index 68ad9c7b7bf..e9323aa00f0 100644 --- a/neutron/plugins/vmware/vshield/vcns.py +++ b/neutron/plugins/vmware/vshield/vcns.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.openstack.common import log as logging from neutron.plugins.vmware.vshield.common import VcnsApiClient diff --git a/neutron/plugins/vmware/vshield/vcns_driver.py b/neutron/plugins/vmware/vshield/vcns_driver.py index 224fd0e5d02..42829127d9e 100644 --- a/neutron/plugins/vmware/vshield/vcns_driver.py +++ b/neutron/plugins/vmware/vshield/vcns_driver.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.openstack.common import log as logging from neutron.plugins.vmware.common import config # noqa diff --git a/neutron/policy.py b/neutron/policy.py index 11e4bf45b23..d1c7b42d269 100644 --- a/neutron/policy.py +++ b/neutron/policy.py @@ -22,9 +22,9 @@ import itertools import logging import re -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils from neutron.api.v2 import attributes from neutron.common import constants as const diff --git a/neutron/quota.py b/neutron/quota.py index e2187ad19e6..f390629ff34 100644 --- a/neutron/quota.py +++ b/neutron/quota.py @@ -16,8 +16,8 @@ import sys -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import webob from neutron.common import exceptions diff --git a/neutron/scheduler/dhcp_agent_scheduler.py b/neutron/scheduler/dhcp_agent_scheduler.py index 251512e8570..00c25aa8012 100644 --- a/neutron/scheduler/dhcp_agent_scheduler.py +++ b/neutron/scheduler/dhcp_agent_scheduler.py @@ -15,8 +15,8 @@ import random -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from sqlalchemy import sql from neutron.common import constants diff --git a/neutron/scheduler/l3_agent_scheduler.py b/neutron/scheduler/l3_agent_scheduler.py index 14aae7c114e..1304be0fc8b 100644 --- a/neutron/scheduler/l3_agent_scheduler.py +++ b/neutron/scheduler/l3_agent_scheduler.py @@ -17,8 +17,8 @@ import abc import itertools import random -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc import six from sqlalchemy import sql diff --git a/neutron/server/__init__.py b/neutron/server/__init__.py index fb6584ba676..81f430310c1 100755 --- a/neutron/server/__init__.py +++ b/neutron/server/__init__.py @@ -23,7 +23,7 @@ import sys import eventlet eventlet.monkey_patch() -from oslo.config import cfg +from oslo_config import cfg from neutron.common import config from neutron.i18n import _LI diff --git a/neutron/service.py b/neutron/service.py index 36aab725fe3..be7254a817d 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -18,10 +18,10 @@ import logging as std_logging import os import random -from oslo.config import cfg -from oslo.messaging import server as rpc_server -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_messaging import server as rpc_server +from oslo_utils import excutils +from oslo_utils import importutils from neutron.common import config from neutron.common import rpc as n_rpc diff --git a/neutron/services/firewall/agents/firewall_agent_api.py b/neutron/services/firewall/agents/firewall_agent_api.py index 85be6e6a416..e9ed05af280 100644 --- a/neutron/services/firewall/agents/firewall_agent_api.py +++ b/neutron/services/firewall/agents/firewall_agent_api.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.common import rpc as n_rpc from neutron.openstack.common import log as logging @@ -39,7 +39,7 @@ class FWaaSPluginApiMixin(object): def __init__(self, topic, host): self.host = host - target = messaging.Target(topic=topic, version='1.0') + target = oslo_messaging.Target(topic=topic, version='1.0') self.client = n_rpc.get_client(target) def set_firewall_status(self, context, firewall_id, status): diff --git a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py index 12248db667c..411bd892b0a 100644 --- a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py +++ b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.agent.common import config from neutron.agent.linux import ip_lib diff --git a/neutron/services/l3_router/brocade/l3_router_plugin.py b/neutron/services/l3_router/brocade/l3_router_plugin.py index e3d09658f28..b13d50a36cf 100644 --- a/neutron/services/l3_router/brocade/l3_router_plugin.py +++ b/neutron/services/l3_router/brocade/l3_router_plugin.py @@ -17,8 +17,8 @@ """Implentation of Brocade SVI service Plugin.""" -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.common import constants as l3_constants from neutron.i18n import _LE, _LI diff --git a/neutron/services/l3_router/l3_apic.py b/neutron/services/l3_router/l3_apic.py index 82ecb706cc7..651fac23986 100644 --- a/neutron/services/l3_router/l3_apic.py +++ b/neutron/services/l3_router/l3_apic.py @@ -14,7 +14,7 @@ # under the License. from apicapi import apic_mapper -from oslo.utils import excutils +from oslo_utils import excutils from neutron.db import db_base_plugin_v2 from neutron.db import extraroute_db diff --git a/neutron/services/l3_router/l3_arista.py b/neutron/services/l3_router/l3_arista.py index ea6852b64e0..3b5b6a42874 100644 --- a/neutron/services/l3_router/l3_arista.py +++ b/neutron/services/l3_router/l3_arista.py @@ -15,8 +15,8 @@ import copy import threading -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.rpc.handlers import l3_rpc diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py index bfa3824e568..57faf6028c2 100644 --- a/neutron/services/l3_router/l3_router_plugin.py +++ b/neutron/services/l3_router/l3_router_plugin.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.rpc.handlers import l3_rpc diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index 8bbda5fed7f..c24606211b6 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -18,9 +18,9 @@ import time import eventlet eventlet.monkey_patch() -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils from neutron.agent.common import config from neutron.agent import rpc as agent_rpc @@ -50,7 +50,8 @@ class MeteringPluginRpc(object): # it's actually necessary to initialize parent classes of # manager.Manager correctly. super(MeteringPluginRpc, self).__init__() - target = messaging.Target(topic=topics.METERING_PLUGIN, version='1.0') + target = oslo_messaging.Target(topic=topics.METERING_PLUGIN, + version='1.0') self.client = n_rpc.get_client(target) def _get_sync_data_metering(self, context): diff --git a/neutron/services/metering/drivers/iptables/iptables_driver.py b/neutron/services/metering/drivers/iptables/iptables_driver.py index 4a200d28494..afacc46ab7a 100644 --- a/neutron/services/metering/drivers/iptables/iptables_driver.py +++ b/neutron/services/metering/drivers/iptables/iptables_driver.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import six from neutron.agent.common import config diff --git a/neutron/services/provider_configuration.py b/neutron/services/provider_configuration.py index 0d43d001846..2d9b456e861 100644 --- a/neutron/services/provider_configuration.py +++ b/neutron/services/provider_configuration.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import stevedore from neutron.common import exceptions as n_exc diff --git a/neutron/services/service_base.py b/neutron/services/service_base.py index 23abd6f4c88..2a6225a0033 100644 --- a/neutron/services/service_base.py +++ b/neutron/services/service_base.py @@ -15,8 +15,8 @@ import abc -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_utils import excutils +from oslo_utils import importutils import six from neutron.api import extensions diff --git a/neutron/tests/base.py b/neutron/tests/base.py index 6be0780502e..5edb7384572 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -27,9 +27,9 @@ import logging as std_logging import os.path import fixtures -from oslo.config import cfg -from oslo.messaging import conffixture as messaging_conffixture from oslo_concurrency.fixture import lockutils +from oslo_config import cfg +from oslo_messaging import conffixture as messaging_conffixture from neutron.common import config from neutron.common import rpc as n_rpc @@ -142,7 +142,7 @@ class BaseTestCase(sub_base.SubBaseTestCase): fake_consume_in_threads)) self.useFixture(fixtures.MonkeyPatch( - 'oslo.messaging.Notifier', fake_notifier.FakeNotifier)) + 'oslo_messaging.Notifier', fake_notifier.FakeNotifier)) self.messaging_conf = messaging_conffixture.ConfFixture(CONF) self.messaging_conf.transport_driver = 'fake' diff --git a/neutron/tests/functional/agent/linux/base.py b/neutron/tests/functional/agent/linux/base.py index e15e7246aaf..40364c3f02d 100644 --- a/neutron/tests/functional/agent/linux/base.py +++ b/neutron/tests/functional/agent/linux/base.py @@ -13,7 +13,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.linux import ip_lib diff --git a/neutron/tests/functional/agent/linux/simple_daemon.py b/neutron/tests/functional/agent/linux/simple_daemon.py index a627d485764..77fba81d497 100644 --- a/neutron/tests/functional/agent/linux/simple_daemon.py +++ b/neutron/tests/functional/agent/linux/simple_daemon.py @@ -13,7 +13,7 @@ # under the License. import eventlet -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import daemon diff --git a/neutron/tests/functional/agent/linux/test_ip_lib.py b/neutron/tests/functional/agent/linux/test_ip_lib.py index ed8580437bf..00c61a2e6a1 100644 --- a/neutron/tests/functional/agent/linux/test_ip_lib.py +++ b/neutron/tests/functional/agent/linux/test_ip_lib.py @@ -16,8 +16,8 @@ import collections import netaddr -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.agent.common import config from neutron.agent.linux import interface diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index fbccfe7cfc0..f4a62779acb 100644 --- a/neutron/tests/functional/agent/linux/test_keepalived.py +++ b/neutron/tests/functional/agent/linux/test_keepalived.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.linux import external_process diff --git a/neutron/tests/functional/agent/linux/test_process_monitor.py b/neutron/tests/functional/agent/linux/test_process_monitor.py index 5521f17c9a4..139683d232f 100644 --- a/neutron/tests/functional/agent/linux/test_process_monitor.py +++ b/neutron/tests/functional/agent/linux/test_process_monitor.py @@ -13,7 +13,7 @@ # under the License. import eventlet -from oslo.config import cfg +from oslo_config import cfg from six import moves from neutron.agent.linux import external_process diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py index 837bb57a4b8..5b45cd887e5 100755 --- a/neutron/tests/functional/agent/test_l3_agent.py +++ b/neutron/tests/functional/agent/test_l3_agent.py @@ -18,7 +18,7 @@ import functools import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import webob import webob.dec import webob.exc diff --git a/neutron/tests/functional/base.py b/neutron/tests/functional/base.py index cb2fc376ff7..83a6e3e75e1 100644 --- a/neutron/tests/functional/base.py +++ b/neutron/tests/functional/base.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.tests import base diff --git a/neutron/tests/functional/db/test_ipam.py b/neutron/tests/functional/db/test_ipam.py index 95bb927b5f9..8886947ee05 100644 --- a/neutron/tests/functional/db/test_ipam.py +++ b/neutron/tests/functional/db/test_ipam.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db.sqlalchemy import session -from oslo.db.sqlalchemy import test_base +from oslo_config import cfg +from oslo_db.sqlalchemy import session +from oslo_db.sqlalchemy import test_base import testtools from neutron.api.v2 import attributes diff --git a/neutron/tests/functional/db/test_migrations.py b/neutron/tests/functional/db/test_migrations.py index 78582ac6cfe..8c831230a71 100644 --- a/neutron/tests/functional/db/test_migrations.py +++ b/neutron/tests/functional/db/test_migrations.py @@ -20,10 +20,10 @@ import alembic.autogenerate import alembic.migration from alembic import script as alembic_script import mock -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.db.sqlalchemy import test_base -from oslo.db.sqlalchemy import test_migrations +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_db.sqlalchemy import test_base +from oslo_db.sqlalchemy import test_migrations import sqlalchemy from neutron.db.migration import cli as migration diff --git a/neutron/tests/sub_base.py b/neutron/tests/sub_base.py index 2a4d7cffb8f..47db4977a69 100644 --- a/neutron/tests/sub_base.py +++ b/neutron/tests/sub_base.py @@ -33,7 +33,7 @@ import traceback import eventlet.timeout import fixtures import mock -from oslo.utils import strutils +from oslo_utils import strutils import testtools from neutron.tests import post_mortem_debug diff --git a/neutron/tests/unit/__init__.py b/neutron/tests/unit/__init__.py index 3e3c66c01f6..faed26a532b 100644 --- a/neutron/tests/unit/__init__.py +++ b/neutron/tests/unit/__init__.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg cfg.CONF.use_stderr = False diff --git a/neutron/tests/unit/_test_extension_portbindings.py b/neutron/tests/unit/_test_extension_portbindings.py index 54e4c67d71c..39150cde588 100644 --- a/neutron/tests/unit/_test_extension_portbindings.py +++ b/neutron/tests/unit/_test_extension_portbindings.py @@ -16,7 +16,7 @@ import contextlib import httplib -from oslo.config import cfg +from oslo_config import cfg from webob import exc from neutron import context diff --git a/neutron/tests/unit/agent/linux/test_ovs_lib.py b/neutron/tests/unit/agent/linux/test_ovs_lib.py index 46538982533..6df0c304476 100644 --- a/neutron/tests/unit/agent/linux/test_ovs_lib.py +++ b/neutron/tests/unit/agent/linux/test_ovs_lib.py @@ -14,7 +14,7 @@ import collections import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import testtools from neutron.agent.linux import ovs_lib diff --git a/neutron/tests/unit/agent/metadata/test_driver.py b/neutron/tests/unit/agent/metadata/test_driver.py index 0ce344d333c..afc860373c8 100644 --- a/neutron/tests/unit/agent/metadata/test_driver.py +++ b/neutron/tests/unit/agent/metadata/test_driver.py @@ -17,7 +17,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as agent_config from neutron.agent.l3 import config as l3_config diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py index df6198c8fd5..0f0ff8c0349 100644 --- a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py +++ b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py @@ -16,7 +16,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.common import utils diff --git a/neutron/tests/unit/bigswitch/fake_server.py b/neutron/tests/unit/bigswitch/fake_server.py index 5a5994b141f..40a7de846c1 100644 --- a/neutron/tests/unit/bigswitch/fake_server.py +++ b/neutron/tests/unit/bigswitch/fake_server.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.openstack.common import log as logging from neutron.plugins.bigswitch import servermanager diff --git a/neutron/tests/unit/bigswitch/test_base.py b/neutron/tests/unit/bigswitch/test_base.py index da877f1175a..a1afb97fc18 100644 --- a/neutron/tests/unit/bigswitch/test_base.py +++ b/neutron/tests/unit/bigswitch/test_base.py @@ -17,7 +17,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg import neutron.common.test_lib as test_lib from neutron.plugins.bigswitch import config diff --git a/neutron/tests/unit/bigswitch/test_restproxy_agent.py b/neutron/tests/unit/bigswitch/test_restproxy_agent.py index 383ad6faf41..e9e8f77eec7 100644 --- a/neutron/tests/unit/bigswitch/test_restproxy_agent.py +++ b/neutron/tests/unit/bigswitch/test_restproxy_agent.py @@ -16,7 +16,7 @@ import contextlib import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron.tests import base diff --git a/neutron/tests/unit/bigswitch/test_restproxy_plugin.py b/neutron/tests/unit/bigswitch/test_restproxy_plugin.py index 52514ead6b2..70c745f1584 100644 --- a/neutron/tests/unit/bigswitch/test_restproxy_plugin.py +++ b/neutron/tests/unit/bigswitch/test_restproxy_plugin.py @@ -16,7 +16,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg import webob.exc from neutron.common import constants diff --git a/neutron/tests/unit/bigswitch/test_router_db.py b/neutron/tests/unit/bigswitch/test_router_db.py index 1202b463899..4ec9419df65 100644 --- a/neutron/tests/unit/bigswitch/test_router_db.py +++ b/neutron/tests/unit/bigswitch/test_router_db.py @@ -18,7 +18,7 @@ import contextlib import copy import mock -from oslo.config import cfg +from oslo_config import cfg from six import moves from webob import exc diff --git a/neutron/tests/unit/bigswitch/test_servermanager.py b/neutron/tests/unit/bigswitch/test_servermanager.py index 51de12ef74f..3b562f164b1 100644 --- a/neutron/tests/unit/bigswitch/test_servermanager.py +++ b/neutron/tests/unit/bigswitch/test_servermanager.py @@ -17,10 +17,10 @@ import socket import ssl import mock -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_serialization import jsonutils +from oslo_utils import importutils from neutron import context from neutron import manager diff --git a/neutron/tests/unit/bigswitch/test_ssl.py b/neutron/tests/unit/bigswitch/test_ssl.py index 665ddbc254e..f8c51b1fe50 100644 --- a/neutron/tests/unit/bigswitch/test_ssl.py +++ b/neutron/tests/unit/bigswitch/test_ssl.py @@ -16,7 +16,7 @@ import os import ssl import mock -from oslo.config import cfg +from oslo_config import cfg import webob.exc from neutron.openstack.common import log as logging diff --git a/neutron/tests/unit/brocade/test_brocade_plugin.py b/neutron/tests/unit/brocade/test_brocade_plugin.py index b93e996854a..ea2f0f83d43 100644 --- a/neutron/tests/unit/brocade/test_brocade_plugin.py +++ b/neutron/tests/unit/brocade/test_brocade_plugin.py @@ -15,7 +15,7 @@ import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron.extensions import portbindings from neutron.plugins.brocade import NeutronPlugin as brocade_plugin diff --git a/neutron/tests/unit/cisco/cfg_agent/test_cfg_agent.py b/neutron/tests/unit/cisco/cfg_agent/test_cfg_agent.py index f3db1313d87..85c7bd89571 100644 --- a/neutron/tests/unit/cisco/cfg_agent/test_cfg_agent.py +++ b/neutron/tests/unit/cisco/cfg_agent/test_cfg_agent.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from neutron.agent.common import config diff --git a/neutron/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py b/neutron/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py index 9aae29b1a2f..62535de417f 100644 --- a/neutron/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py +++ b/neutron/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py @@ -14,8 +14,8 @@ import copy import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.common import config as base_config from neutron.common import constants as l3_constants @@ -580,12 +580,13 @@ class TestBasicRoutingOperations(base.BaseTestCase): @mock.patch("eventlet.GreenPool.spawn_n") def test_process_services_with_rpc_error(self, mock_spawn): router, port = prepare_router_data() - self.plugin_api.get_routers.side_effect = messaging.MessagingException + get_routers = self.plugin_api.get_routers + get_routers.side_effect = oslo_messaging.MessagingException self.routing_helper.fullsync = False self.routing_helper.updated_routers.add(router['id']) self.routing_helper.process_service() - self.assertEqual(1, self.plugin_api.get_routers.call_count) - self.plugin_api.get_routers.assert_called_with( + self.assertEqual(1, get_routers.call_count) + get_routers.assert_called_with( self.routing_helper.context, router_ids=[router['id']]) self.assertFalse(mock_spawn.called) diff --git a/neutron/tests/unit/cisco/l3/device_handling_test_support.py b/neutron/tests/unit/cisco/l3/device_handling_test_support.py index 59ef3f92adc..c27f07ffdc6 100644 --- a/neutron/tests/unit/cisco/l3/device_handling_test_support.py +++ b/neutron/tests/unit/cisco/l3/device_handling_test_support.py @@ -14,8 +14,8 @@ import mock from novaclient import exceptions as nova_exc -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from neutron import context as n_context from neutron.i18n import _LE diff --git a/neutron/tests/unit/cisco/l3/test_l3_router_appliance_plugin.py b/neutron/tests/unit/cisco/l3/test_l3_router_appliance_plugin.py index 229dfc24d61..897f8830c42 100644 --- a/neutron/tests/unit/cisco/l3/test_l3_router_appliance_plugin.py +++ b/neutron/tests/unit/cisco/l3/test_l3_router_appliance_plugin.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from webob import exc import neutron diff --git a/neutron/tests/unit/db/test_agent_db.py b/neutron/tests/unit/db/test_agent_db.py index 14e88275b2f..cda8cd33b71 100644 --- a/neutron/tests/unit/db/test_agent_db.py +++ b/neutron/tests/unit/db/test_agent_db.py @@ -16,8 +16,8 @@ import datetime import mock -from oslo.db import exception as exc -from oslo.utils import timeutils +from oslo_db import exception as exc +from oslo_utils import timeutils import testscenarios from neutron.common import constants diff --git a/neutron/tests/unit/db/test_dvr_mac_db.py b/neutron/tests/unit/db/test_dvr_mac_db.py index f949959cc79..d819bf193c8 100644 --- a/neutron/tests/unit/db/test_dvr_mac_db.py +++ b/neutron/tests/unit/db/test_dvr_mac_db.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron import context from neutron.db import dvr_mac_db diff --git a/neutron/tests/unit/db/test_l3_ha_db.py b/neutron/tests/unit/db/test_l3_ha_db.py index 692ec5659ce..ab293661d22 100644 --- a/neutron/tests/unit/db/test_l3_ha_db.py +++ b/neutron/tests/unit/db/test_l3_ha_db.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron import context diff --git a/neutron/tests/unit/embrane/test_embrane_l3_plugin.py b/neutron/tests/unit/embrane/test_embrane_l3_plugin.py index 3aa1773b844..83495afac2f 100644 --- a/neutron/tests/unit/embrane/test_embrane_l3_plugin.py +++ b/neutron/tests/unit/embrane/test_embrane_l3_plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.embrane.common import config # noqa from neutron.tests.unit import test_extension_extraroute as extraroute_test diff --git a/neutron/tests/unit/embrane/test_embrane_neutron_plugin.py b/neutron/tests/unit/embrane/test_embrane_neutron_plugin.py index 2979a0e82b9..cf68c5fd75d 100644 --- a/neutron/tests/unit/embrane/test_embrane_neutron_plugin.py +++ b/neutron/tests/unit/embrane/test_embrane_neutron_plugin.py @@ -15,7 +15,7 @@ import sys import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.embrane.common import config # noqa from neutron.tests.unit import test_db_plugin as test_plugin diff --git a/neutron/tests/unit/extensions/foxinsocks.py b/neutron/tests/unit/extensions/foxinsocks.py index a2ff789889e..4c8fc387c50 100644 --- a/neutron/tests/unit/extensions/foxinsocks.py +++ b/neutron/tests/unit/extensions/foxinsocks.py @@ -15,7 +15,7 @@ import abc -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.api import extensions from neutron import wsgi diff --git a/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py b/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py index 1de90d12fec..12a5d837718 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py +++ b/neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py @@ -19,7 +19,7 @@ Unit tests for Windows Hyper-V virtual switch neutron driver """ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.hyperv.agent import hyperv_neutron_agent from neutron.plugins.hyperv.agent import utilsfactory diff --git a/neutron/tests/unit/hyperv/test_hyperv_neutron_plugin.py b/neutron/tests/unit/hyperv/test_hyperv_neutron_plugin.py index 90f17d1f185..8a8a9fdff98 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_neutron_plugin.py +++ b/neutron/tests/unit/hyperv/test_hyperv_neutron_plugin.py @@ -16,7 +16,7 @@ import contextlib -from oslo.config import cfg +from oslo_config import cfg from neutron import context from neutron.extensions import portbindings diff --git a/neutron/tests/unit/hyperv/test_hyperv_security_groups_driver.py b/neutron/tests/unit/hyperv/test_hyperv_security_groups_driver.py index e0e41ce5589..ab5d4a13370 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_security_groups_driver.py +++ b/neutron/tests/unit/hyperv/test_hyperv_security_groups_driver.py @@ -18,7 +18,7 @@ Unit tests for the Hyper-V Security Groups Driver. """ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.hyperv.agent import security_groups_driver as sg_driver from neutron.plugins.hyperv.agent import utilsfactory diff --git a/neutron/tests/unit/hyperv/test_hyperv_utilsfactory.py b/neutron/tests/unit/hyperv/test_hyperv_utilsfactory.py index aa4ad94ea62..5ded54d1147 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_utilsfactory.py +++ b/neutron/tests/unit/hyperv/test_hyperv_utilsfactory.py @@ -19,7 +19,7 @@ Unit tests for the Hyper-V utils factory. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.hyperv.agent import utils from neutron.plugins.hyperv.agent import utilsfactory diff --git a/neutron/tests/unit/ibm/test_sdnve_agent.py b/neutron/tests/unit/ibm/test_sdnve_agent.py index 83fcb9ab42e..a1e017fd460 100644 --- a/neutron/tests/unit/ibm/test_sdnve_agent.py +++ b/neutron/tests/unit/ibm/test_sdnve_agent.py @@ -17,7 +17,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import ip_lib from neutron.plugins.ibm.agent import sdnve_neutron_agent diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py index bba566c987f..2de6cee9e52 100644 --- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py +++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py @@ -16,7 +16,7 @@ import contextlib import os import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import ip_lib from neutron.agent.linux import utils diff --git a/neutron/tests/unit/metaplugin/test_metaplugin.py b/neutron/tests/unit/metaplugin/test_metaplugin.py index eefb4545c61..682864b9a54 100644 --- a/neutron/tests/unit/metaplugin/test_metaplugin.py +++ b/neutron/tests/unit/metaplugin/test_metaplugin.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from neutron.common import exceptions as exc diff --git a/neutron/tests/unit/ml2/drivers/arista/test_arista_l3_driver.py b/neutron/tests/unit/ml2/drivers/arista/test_arista_l3_driver.py index dc3f29a3c9d..d2467ecf107 100644 --- a/neutron/tests/unit/ml2/drivers/arista/test_arista_l3_driver.py +++ b/neutron/tests/unit/ml2/drivers/arista/test_arista_l3_driver.py @@ -15,7 +15,7 @@ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.ml2.drivers.arista import arista_l3_driver as arista from neutron.tests import base diff --git a/neutron/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py b/neutron/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py index 81cffc2fa53..b939663bc21 100644 --- a/neutron/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py +++ b/neutron/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py @@ -16,9 +16,9 @@ # import mock -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg from oslo_context import context as oslo_context +from oslo_utils import importutils from neutron.db import api as db from neutron.openstack.common import log as logging diff --git a/neutron/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py b/neutron/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py index b8cbb5ff550..b2969ab4cd0 100644 --- a/neutron/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py +++ b/neutron/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron.openstack.common import log as logging from neutron.plugins.ml2 import config as ml2_config diff --git a/neutron/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_common.py b/neutron/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_common.py index bbb342c4dde..b4bc05e413f 100644 --- a/neutron/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_common.py +++ b/neutron/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_common.py @@ -17,7 +17,7 @@ import contextlib import requests import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.tests import base diff --git a/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_config.py b/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_config.py index 6dd4873bea6..01f249517d4 100644 --- a/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_config.py +++ b/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_config.py @@ -15,7 +15,7 @@ # limitations under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.ml2.drivers.cisco.nexus import config as cisco_config from neutron.tests import base diff --git a/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_nexus.py b/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_nexus.py index 4f9cefdcfe9..e8be98c6e83 100644 --- a/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_nexus.py +++ b/neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_nexus.py @@ -15,7 +15,7 @@ import collections import mock -from oslo.utils import importutils +from oslo_utils import importutils import testtools from neutron.common import constants as n_const diff --git a/neutron/tests/unit/ml2/drivers/freescale/test_mechanism_fslsdn.py b/neutron/tests/unit/ml2/drivers/freescale/test_mechanism_fslsdn.py index 3a4326ff55f..40c881488c2 100644 --- a/neutron/tests/unit/ml2/drivers/freescale/test_mechanism_fslsdn.py +++ b/neutron/tests/unit/ml2/drivers/freescale/test_mechanism_fslsdn.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.extensions import portbindings from neutron.plugins.ml2.drivers.freescale import mechanism_fslsdn diff --git a/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py b/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py index 9aac29b79da..14dffd4d333 100644 --- a/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py +++ b/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from neutron.common import constants diff --git a/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py b/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py index 83e1a36837e..fe49b81e115 100644 --- a/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py +++ b/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py @@ -18,7 +18,7 @@ import contextlib import functools import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron import context as neutron_context from neutron.extensions import portbindings diff --git a/neutron/tests/unit/ml2/drivers/test_l2population.py b/neutron/tests/unit/ml2/drivers/test_l2population.py index 4ca8cd6f0f9..0c51de404c9 100644 --- a/neutron/tests/unit/ml2/drivers/test_l2population.py +++ b/neutron/tests/unit/ml2/drivers/test_l2population.py @@ -16,7 +16,7 @@ import contextlib import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from neutron.agent import l2population_rpc from neutron.common import constants diff --git a/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py b/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py index 6bb8659d03d..a409f021ceb 100644 --- a/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py +++ b/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.extensions import portbindings diff --git a/neutron/tests/unit/ml2/test_mech_openvswitch.py b/neutron/tests/unit/ml2/test_mech_openvswitch.py index fd709fb87ac..b7b3be8e604 100644 --- a/neutron/tests/unit/ml2/test_mech_openvswitch.py +++ b/neutron/tests/unit/ml2/test_mech_openvswitch.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.extensions import portbindings diff --git a/neutron/tests/unit/ml2/test_type_flat.py b/neutron/tests/unit/ml2/test_type_flat.py index 1620edfdc2f..4f65f17e26b 100644 --- a/neutron/tests/unit/ml2/test_type_flat.py +++ b/neutron/tests/unit/ml2/test_type_flat.py @@ -19,7 +19,7 @@ from neutron.plugins.common import constants as p_const from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers import type_flat from neutron.tests.unit import testlib_api -from oslo.config import cfg +from oslo_config import cfg FLAT_NETWORKS = ['flat_net1', 'flat_net2'] diff --git a/neutron/tests/unit/ml2/test_type_vlan.py b/neutron/tests/unit/ml2/test_type_vlan.py index 4bf73e688a1..c5586ad952c 100644 --- a/neutron/tests/unit/ml2/test_type_vlan.py +++ b/neutron/tests/unit/ml2/test_type_vlan.py @@ -23,7 +23,7 @@ from neutron.plugins.common import utils as plugin_utils from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers import type_vlan from neutron.tests.unit import testlib_api -from oslo.config import cfg +from oslo_config import cfg PROVIDER_NET = 'phys_net1' TENANT_NET = 'phys_net2' diff --git a/neutron/tests/unit/nec/test_nec_agent.py b/neutron/tests/unit/nec/test_nec_agent.py index 27db851a231..bf8d0173ba4 100644 --- a/neutron/tests/unit/nec/test_nec_agent.py +++ b/neutron/tests/unit/nec/test_nec_agent.py @@ -18,7 +18,7 @@ import itertools import time import mock -from oslo.config import cfg +from oslo_config import cfg from six import moves import testtools diff --git a/neutron/tests/unit/nec/test_ofc_client.py b/neutron/tests/unit/nec/test_ofc_client.py index 658c1389190..416ba2c2de3 100644 --- a/neutron/tests/unit/nec/test_ofc_client.py +++ b/neutron/tests/unit/nec/test_ofc_client.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import requests from neutron.plugins.nec.common import config diff --git a/neutron/tests/unit/nec/test_pfc_driver.py b/neutron/tests/unit/nec/test_pfc_driver.py index e14a6d2c9e3..d18b4499967 100644 --- a/neutron/tests/unit/nec/test_pfc_driver.py +++ b/neutron/tests/unit/nec/test_pfc_driver.py @@ -18,7 +18,7 @@ import uuid import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.openstack.common import uuidutils diff --git a/neutron/tests/unit/nec/test_portbindings.py b/neutron/tests/unit/nec/test_portbindings.py index a2ceb321b3a..c2975ca21a8 100644 --- a/neutron/tests/unit/nec/test_portbindings.py +++ b/neutron/tests/unit/nec/test_portbindings.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from testtools import matchers from webob import exc diff --git a/neutron/tests/unit/notifiers/test_notifiers_nova.py b/neutron/tests/unit/notifiers/test_notifiers_nova.py index db9bc79c31d..afae75ec3c5 100644 --- a/neutron/tests/unit/notifiers/test_notifiers_nova.py +++ b/neutron/tests/unit/notifiers/test_notifiers_nova.py @@ -18,7 +18,7 @@ import mock from novaclient import exceptions as nova_exceptions from sqlalchemy.orm import attributes as sql_attr -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.db import models_v2 diff --git a/neutron/tests/unit/nuage/test_nuage_plugin.py b/neutron/tests/unit/nuage/test_nuage_plugin.py index 9587f4794c5..bc2e3422e56 100644 --- a/neutron/tests/unit/nuage/test_nuage_plugin.py +++ b/neutron/tests/unit/nuage/test_nuage_plugin.py @@ -19,7 +19,7 @@ import os import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg from webob import exc from neutron.common import constants diff --git a/neutron/tests/unit/ofagent/ofa_test_base.py b/neutron/tests/unit/ofagent/ofa_test_base.py index 0ff9c43356d..3b2e07f2a20 100644 --- a/neutron/tests/unit/ofagent/ofa_test_base.py +++ b/neutron/tests/unit/ofagent/ofa_test_base.py @@ -16,8 +16,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from neutron.tests import base from neutron.tests.unit.ofagent import fake_oflib diff --git a/neutron/tests/unit/ofagent/test_arp_lib.py b/neutron/tests/unit/ofagent/test_arp_lib.py index 883abaff8bd..490fe34da40 100644 --- a/neutron/tests/unit/ofagent/test_arp_lib.py +++ b/neutron/tests/unit/ofagent/test_arp_lib.py @@ -19,7 +19,7 @@ import contextlib import copy import mock -from oslo.utils import importutils +from oslo_utils import importutils import neutron.plugins.ofagent.agent.metadata as meta from neutron.tests.unit.ofagent import ofa_test_base diff --git a/neutron/tests/unit/ofagent/test_ofa_flows.py b/neutron/tests/unit/ofagent/test_ofa_flows.py index 5c8b4c6926d..ab2ce7e3b12 100644 --- a/neutron/tests/unit/ofagent/test_ofa_flows.py +++ b/neutron/tests/unit/ofagent/test_ofa_flows.py @@ -16,7 +16,7 @@ import mock -from oslo.utils import importutils +from oslo_utils import importutils import neutron.plugins.ofagent.agent.metadata as meta from neutron.tests.unit.ofagent import ofa_test_base diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py index 24cc2893cfb..8398a2394b1 100644 --- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py +++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py @@ -25,8 +25,8 @@ import copy import mock import netaddr -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import testtools from neutron.agent.linux import ovs_lib diff --git a/neutron/tests/unit/ofagent/test_ofswitch.py b/neutron/tests/unit/ofagent/test_ofswitch.py index ecf4a661843..3ce31ea60bf 100644 --- a/neutron/tests/unit/ofagent/test_ofswitch.py +++ b/neutron/tests/unit/ofagent/test_ofswitch.py @@ -16,7 +16,7 @@ import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron.tests.unit.ofagent import ofa_test_base diff --git a/neutron/tests/unit/oneconvergence/test_nvsd_agent.py b/neutron/tests/unit/oneconvergence/test_nvsd_agent.py index fe238c721b0..cb49f98654c 100644 --- a/neutron/tests/unit/oneconvergence/test_nvsd_agent.py +++ b/neutron/tests/unit/oneconvergence/test_nvsd_agent.py @@ -16,7 +16,7 @@ import contextlib import time import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from neutron.agent.linux import ovs_lib diff --git a/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py b/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py index decc7d1867a..c902cee6425 100644 --- a/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py +++ b/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py @@ -19,7 +19,7 @@ import contextlib import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from neutron import context from neutron.extensions import portbindings diff --git a/neutron/tests/unit/oneconvergence/test_nvsdlib.py b/neutron/tests/unit/oneconvergence/test_nvsdlib.py index 65df031aca6..649b1dc4664 100644 --- a/neutron/tests/unit/oneconvergence/test_nvsdlib.py +++ b/neutron/tests/unit/oneconvergence/test_nvsdlib.py @@ -14,7 +14,7 @@ # import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.plugins.oneconvergence.lib import nvsdlib from neutron.tests import base diff --git a/neutron/tests/unit/oneconvergence/test_plugin_helper.py b/neutron/tests/unit/oneconvergence/test_plugin_helper.py index de4e4d2616f..7ae09e8b310 100644 --- a/neutron/tests/unit/oneconvergence/test_plugin_helper.py +++ b/neutron/tests/unit/oneconvergence/test_plugin_helper.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from neutron.plugins.oneconvergence.lib import config # noqa diff --git a/neutron/tests/unit/opencontrail/test_contrail_plugin.py b/neutron/tests/unit/opencontrail/test_contrail_plugin.py index c336d0523e1..974fb7b4627 100644 --- a/neutron/tests/unit/opencontrail/test_contrail_plugin.py +++ b/neutron/tests/unit/opencontrail/test_contrail_plugin.py @@ -19,8 +19,8 @@ import uuid import mock import netaddr -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from testtools import matchers import webob.exc diff --git a/neutron/tests/unit/openvswitch/test_agent_scheduler.py b/neutron/tests/unit/openvswitch/test_agent_scheduler.py index 2e1fd47952c..3d8266bdba0 100644 --- a/neutron/tests/unit/openvswitch/test_agent_scheduler.py +++ b/neutron/tests/unit/openvswitch/test_agent_scheduler.py @@ -18,10 +18,10 @@ import copy import datetime import mock -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo import messaging -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +import oslo_messaging +from oslo_utils import timeutils from webob import exc from neutron.api import extensions @@ -663,7 +663,7 @@ class OvsAgentSchedulerTestCase(OvsAgentSchedulerTestCaseBase): mock.patch.object( plugin, 'reschedule_router', side_effect=[ - db_exc.DBError(), messaging.RemoteError(), + db_exc.DBError(), oslo_messaging.RemoteError(), l3agentscheduler.RouterReschedulingFailed(router_id='f', agent_id='f'), ValueError('this raises') diff --git a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py index dbef8aa2476..d6049de3beb 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py @@ -15,8 +15,8 @@ import contextlib import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from neutron.agent.linux import utils from neutron.common import constants as n_const @@ -703,7 +703,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase): with contextlib.nested( mock.patch.object(self.agent.dvr_agent.plugin_rpc, 'get_dvr_mac_address_by_host', - side_effect=messaging.RemoteError), + side_effect=oslo_messaging.RemoteError), mock.patch.object(self.agent.dvr_agent.int_br, 'add_flow')) as (gd_mac, add_int_flow_fn): @@ -714,7 +714,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase): def test_get_dvr_mac_address_retried(self): valid_entry = {'host': 'cn1', 'mac_address': 'aa:22:33:44:55:66'} - raise_timeout = messaging.MessagingTimeout() + raise_timeout = oslo_messaging.MessagingTimeout() # Raise a timeout the first 2 times it calls get_dvr_mac_address() self._setup_for_dvr_test() self.agent.dvr_agent.dvr_mac_address = None @@ -730,7 +730,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase): get_dvr_mac_address_by_host.call_count, 3) def test_get_dvr_mac_address_retried_max(self): - raise_timeout = messaging.MessagingTimeout() + raise_timeout = oslo_messaging.MessagingTimeout() # Raise a timeout every time until we give up, currently 5 tries self._setup_for_dvr_test() self.agent.dvr_agent.dvr_mac_address = None diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py index cafff39625c..3e124fbf69a 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py @@ -18,7 +18,7 @@ import time import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import testtools from neutron.agent.linux import async_process diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py index ec6a1d9f05d..53595cbd6b8 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py +++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py @@ -18,7 +18,7 @@ import contextlib import time import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.linux import ip_lib from neutron.agent.linux import ovs_lib diff --git a/neutron/tests/unit/plumgrid/extensions/test_securitygroups.py b/neutron/tests/unit/plumgrid/extensions/test_securitygroups.py index a98bd773d7a..ff5497266e9 100644 --- a/neutron/tests/unit/plumgrid/extensions/test_securitygroups.py +++ b/neutron/tests/unit/plumgrid/extensions/test_securitygroups.py @@ -18,7 +18,7 @@ PLUMgrid plugin security group extension unit tests """ import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron.plugins.plumgrid.plumgrid_plugin import plumgrid_plugin from neutron.tests.unit import test_extension_security_group as ext_sg diff --git a/neutron/tests/unit/plumgrid/test_plumgrid_plugin.py b/neutron/tests/unit/plumgrid/test_plumgrid_plugin.py index 27750471ac1..3e7abb002f4 100644 --- a/neutron/tests/unit/plumgrid/test_plumgrid_plugin.py +++ b/neutron/tests/unit/plumgrid/test_plumgrid_plugin.py @@ -17,7 +17,7 @@ Test cases for Neutron PLUMgrid Plug-in """ import mock -from oslo.utils import importutils +from oslo_utils import importutils from neutron import context from neutron.extensions import portbindings diff --git a/neutron/tests/unit/services/l3_router/test_l3_apic_plugin.py b/neutron/tests/unit/services/l3_router/test_l3_apic_plugin.py index 89e1f6cf1ff..12b8c808a39 100644 --- a/neutron/tests/unit/services/l3_router/test_l3_apic_plugin.py +++ b/neutron/tests/unit/services/l3_router/test_l3_apic_plugin.py @@ -105,7 +105,7 @@ class TestCiscoApicL3Plugin(testlib_api.SqlTestCase, 'add_router_interface').start() mock.patch('neutron.db.l3_dvr_db.L3_NAT_with_dvr_db_mixin.' 'remove_router_interface').start() - mock.patch('oslo.utils.excutils.save_and_reraise_exception').start() + mock.patch('oslo_utils.excutils.save_and_reraise_exception').start() def _test_add_router_interface(self, interface_info): mgr = self.plugin.manager diff --git a/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py b/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py index 57a833b99d3..5a6202fd4e6 100644 --- a/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py +++ b/neutron/tests/unit/services/metering/drivers/test_iptables_driver.py @@ -15,7 +15,7 @@ import copy import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.services.metering.drivers.iptables import iptables_driver from neutron.tests import base diff --git a/neutron/tests/unit/services/metering/test_metering_agent.py b/neutron/tests/unit/services/metering/test_metering_agent.py index 74bdfbac968..24756d1e4ec 100644 --- a/neutron/tests/unit/services/metering/test_metering_agent.py +++ b/neutron/tests/unit/services/metering/test_metering_agent.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.openstack.common import uuidutils diff --git a/neutron/tests/unit/services/metering/test_metering_plugin.py b/neutron/tests/unit/services/metering/test_metering_plugin.py index 7748332b5d0..8f7cd5b109f 100644 --- a/neutron/tests/unit/services/metering/test_metering_plugin.py +++ b/neutron/tests/unit/services/metering/test_metering_plugin.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from neutron.api.v2 import attributes as attr from neutron.common import constants as n_constants diff --git a/neutron/tests/unit/sriovnicagent/test_sriov_agent_config.py b/neutron/tests/unit/sriovnicagent/test_sriov_agent_config.py index d77a9f3224a..10210213abb 100644 --- a/neutron/tests/unit/sriovnicagent/test_sriov_agent_config.py +++ b/neutron/tests/unit/sriovnicagent/test_sriov_agent_config.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import utils as q_utils from neutron.plugins.sriovnicagent.common import config diff --git a/neutron/tests/unit/sriovnicagent/test_sriov_neutron_agent.py b/neutron/tests/unit/sriovnicagent/test_sriov_neutron_agent.py index f492f444029..fa96dda5429 100644 --- a/neutron/tests/unit/sriovnicagent/test_sriov_neutron_agent.py +++ b/neutron/tests/unit/sriovnicagent/test_sriov_neutron_agent.py @@ -15,7 +15,7 @@ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.plugins.sriovnicagent.common import config # noqa from neutron.plugins.sriovnicagent import sriov_nic_agent diff --git a/neutron/tests/unit/test_agent_ext_plugin.py b/neutron/tests/unit/test_agent_ext_plugin.py index 850430c1640..b56af9e1896 100644 --- a/neutron/tests/unit/test_agent_ext_plugin.py +++ b/neutron/tests/unit/test_agent_ext_plugin.py @@ -16,8 +16,8 @@ import copy import time -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from webob import exc from neutron.api.v2 import attributes diff --git a/neutron/tests/unit/test_agent_rpc.py b/neutron/tests/unit/test_agent_rpc.py index 525afbf1221..e0cedaf6d54 100644 --- a/neutron/tests/unit/test_agent_rpc.py +++ b/neutron/tests/unit/test_agent_rpc.py @@ -16,8 +16,8 @@ import contextlib import mock -from oslo import messaging from oslo_context import context as oslo_context +import oslo_messaging from neutron.agent import rpc from neutron.tests import base @@ -61,7 +61,7 @@ class AgentRPCPluginApi(base.BaseTestCase): mock_call, mock_prepare ): mock_prepare.return_value = agent.client - mock_call.side_effect = [messaging.UnsupportedVersion('1.2'), + mock_call.side_effect = [oslo_messaging.UnsupportedVersion('1.2'), expect_val_get_device_details] func_obj = getattr(agent, 'get_devices_details_list') actual_val = func_obj(ctxt, ['fake_device'], 'fake_agent_id') diff --git a/neutron/tests/unit/test_api_v2.py b/neutron/tests/unit/test_api_v2.py index df7328eedeb..ecbbbcc975d 100644 --- a/neutron/tests/unit/test_api_v2.py +++ b/neutron/tests/unit/test_api_v2.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg import six.moves.urllib.parse as urlparse import webob from webob import exc diff --git a/neutron/tests/unit/test_api_v2_extension.py b/neutron/tests/unit/test_api_v2_extension.py index a0047c02946..2f221013d54 100644 --- a/neutron/tests/unit/test_api_v2_extension.py +++ b/neutron/tests/unit/test_api_v2_extension.py @@ -19,7 +19,7 @@ import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from webob import exc import webtest diff --git a/neutron/tests/unit/test_api_v2_resource.py b/neutron/tests/unit/test_api_v2_resource.py index 16612a28a5a..6d728ec13a5 100644 --- a/neutron/tests/unit/test_api_v2_resource.py +++ b/neutron/tests/unit/test_api_v2_resource.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo import i18n +import oslo_i18n from webob import exc import webtest @@ -102,9 +102,9 @@ class RequestTestCase(base.BaseTestCase): def test_best_match_language(self): # Test that we are actually invoking language negotiation by webop request = wsgi.Request.blank('/') - i18n.get_available_languages = mock.MagicMock() - i18n.get_available_languages.return_value = ['known-language', - 'es', 'zh'] + oslo_i18n.get_available_languages = mock.MagicMock() + oslo_i18n.get_available_languages.return_value = ['known-language', + 'es', 'zh'] request.headers['Accept-Language'] = 'known-language' language = request.best_match_language() self.assertEqual(language, 'known-language') @@ -150,7 +150,7 @@ class ResourceTestCase(base.BaseTestCase): self.assertEqual(wsgi.JSONDeserializer().deserialize(res.body), expected_res) - @mock.patch('oslo.i18n.translate') + @mock.patch('oslo_i18n.translate') def test_unmapped_neutron_error_localized(self, mock_translation): msg_translation = 'Translated error' mock_translation.return_value = msg_translation @@ -195,7 +195,7 @@ class ResourceTestCase(base.BaseTestCase): self.assertEqual(wsgi.JSONDeserializer().deserialize(res.body), expected_res) - @mock.patch('oslo.i18n.translate') + @mock.patch('oslo_i18n.translate') def test_mapped_neutron_error_localized(self, mock_translation): msg_translation = 'Translated error' mock_translation.return_value = msg_translation diff --git a/neutron/tests/unit/test_auth.py b/neutron/tests/unit/test_auth.py index 8375c22a352..74323f071b1 100644 --- a/neutron/tests/unit/test_auth.py +++ b/neutron/tests/unit/test_auth.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.middleware import request_id +from oslo_middleware import request_id import webob from neutron import auth diff --git a/neutron/tests/unit/test_config.py b/neutron/tests/unit/test_config.py index f09edacc876..ec58a25224b 100644 --- a/neutron/tests/unit/test_config.py +++ b/neutron/tests/unit/test_config.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.common import config from neutron.tests import base diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py index cd9985ecebf..ac11bc3b016 100644 --- a/neutron/tests/unit/test_db_plugin.py +++ b/neutron/tests/unit/test_db_plugin.py @@ -18,8 +18,8 @@ import copy import itertools import mock -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from testtools import matchers import webob.exc diff --git a/neutron/tests/unit/test_debug_commands.py b/neutron/tests/unit/test_debug_commands.py index 9440277f94d..ae2c781f9ee 100644 --- a/neutron/tests/unit/test_debug_commands.py +++ b/neutron/tests/unit/test_debug_commands.py @@ -16,7 +16,7 @@ import socket import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.linux import interface diff --git a/neutron/tests/unit/test_dhcp_agent.py b/neutron/tests/unit/test_dhcp_agent.py index dc84df2fc02..98ec92717b7 100644 --- a/neutron/tests/unit/test_dhcp_agent.py +++ b/neutron/tests/unit/test_dhcp_agent.py @@ -20,8 +20,8 @@ import uuid import eventlet import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging import testtools from neutron.agent.common import config @@ -306,7 +306,7 @@ class TestDhcpAgent(base.BaseTestCase): def test_call_driver_remote_error_net_not_found(self): self._test_call_driver_failure( - exc=messaging.RemoteError(exc_type='NetworkNotFound'), + exc=oslo_messaging.RemoteError(exc_type='NetworkNotFound'), trace_level='warning') def test_call_driver_network_not_found(self): diff --git a/neutron/tests/unit/test_dhcp_rpc.py b/neutron/tests/unit/test_dhcp_rpc.py index e0ebe65e782..758cfd11fde 100644 --- a/neutron/tests/unit/test_dhcp_rpc.py +++ b/neutron/tests/unit/test_dhcp_rpc.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from neutron.api.rpc.handlers import dhcp_rpc from neutron.common import constants diff --git a/neutron/tests/unit/test_dhcp_scheduler.py b/neutron/tests/unit/test_dhcp_scheduler.py index 4518f764cae..0ad47e2d5a2 100644 --- a/neutron/tests/unit/test_dhcp_scheduler.py +++ b/neutron/tests/unit/test_dhcp_scheduler.py @@ -17,10 +17,9 @@ import contextlib import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import testscenarios - from neutron.common import constants from neutron.common import topics from neutron import context diff --git a/neutron/tests/unit/test_extension_allowedaddresspairs.py b/neutron/tests/unit/test_extension_allowedaddresspairs.py index 753523ad6b8..4f740b64474 100644 --- a/neutron/tests/unit/test_extension_allowedaddresspairs.py +++ b/neutron/tests/unit/test_extension_allowedaddresspairs.py @@ -23,7 +23,7 @@ from neutron.extensions import portsecurity as psec from neutron.extensions import securitygroup as secgroup from neutron import manager from neutron.tests.unit import test_db_plugin -from oslo.config import cfg +from oslo_config import cfg DB_PLUGIN_KLASS = ('neutron.tests.unit.test_extension_allowedaddresspairs.' diff --git a/neutron/tests/unit/test_extension_ext_gw_mode.py b/neutron/tests/unit/test_extension_ext_gw_mode.py index 502fd1c0f9f..38d4587764b 100644 --- a/neutron/tests/unit/test_extension_ext_gw_mode.py +++ b/neutron/tests/unit/test_extension_ext_gw_mode.py @@ -15,7 +15,7 @@ # import mock -from oslo.config import cfg +from oslo_config import cfg from webob import exc from neutron.common import constants diff --git a/neutron/tests/unit/test_extension_extended_attribute.py b/neutron/tests/unit/test_extension_extended_attribute.py index 5b008c346c8..2e1ffe149d7 100644 --- a/neutron/tests/unit/test_extension_extended_attribute.py +++ b/neutron/tests/unit/test_extension_extended_attribute.py @@ -17,7 +17,7 @@ Unit tests for extension extended attribute """ -from oslo.config import cfg +from oslo_config import cfg import webob.exc as webexc import neutron diff --git a/neutron/tests/unit/test_extension_extraroute.py b/neutron/tests/unit/test_extension_extraroute.py index d921f65d96d..b3daa19323f 100644 --- a/neutron/tests/unit/test_extension_extraroute.py +++ b/neutron/tests/unit/test_extension_extraroute.py @@ -14,7 +14,7 @@ # under the License. import contextlib -from oslo.config import cfg +from oslo_config import cfg from webob import exc from neutron.common import constants diff --git a/neutron/tests/unit/test_extension_pnet.py b/neutron/tests/unit/test_extension_pnet.py index 5455e08b409..420745986fa 100644 --- a/neutron/tests/unit/test_extension_pnet.py +++ b/neutron/tests/unit/test_extension_pnet.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from webob import exc as web_exc import webtest diff --git a/neutron/tests/unit/test_extensions.py b/neutron/tests/unit/test_extensions.py index 0dd279e5b0f..8cef68933af 100644 --- a/neutron/tests/unit/test_extensions.py +++ b/neutron/tests/unit/test_extensions.py @@ -16,7 +16,7 @@ import abc import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import routes import webob import webtest diff --git a/neutron/tests/unit/test_iptables_firewall.py b/neutron/tests/unit/test_iptables_firewall.py index addcb72e5d6..eab5881532e 100644 --- a/neutron/tests/unit/test_iptables_firewall.py +++ b/neutron/tests/unit/test_iptables_firewall.py @@ -16,7 +16,7 @@ import copy import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as a_cfg from neutron.agent.linux import ipset_manager diff --git a/neutron/tests/unit/test_iptables_manager.py b/neutron/tests/unit/test_iptables_manager.py index b4664ad6923..727c1ebcd91 100644 --- a/neutron/tests/unit/test_iptables_manager.py +++ b/neutron/tests/unit/test_iptables_manager.py @@ -17,7 +17,7 @@ import os import sys import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config as a_cfg from neutron.agent.linux import iptables_comments as ic diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py index ffffae77cd7..dbf7f6f1f0a 100644 --- a/neutron/tests/unit/test_l3_agent.py +++ b/neutron/tests/unit/test_l3_agent.py @@ -19,7 +19,7 @@ import eventlet import mock import netaddr -from oslo import messaging +import oslo_messaging from testtools import matchers from neutron.agent.common import config as agent_config @@ -1940,14 +1940,14 @@ class TestBasicRouterOperations(base.BaseTestCase): self.assertTrue(self.plugin_api.get_service_plugin_list.called) def test_get_service_plugin_list_failed(self): - raise_rpc = messaging.RemoteError() + raise_rpc = oslo_messaging.RemoteError() self.plugin_api.get_service_plugin_list.side_effect = raise_rpc agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) self.assertIsNone(agent.neutron_service_plugins) self.assertTrue(self.plugin_api.get_service_plugin_list.called) def test_get_service_plugin_list_retried(self): - raise_timeout = messaging.MessagingTimeout() + raise_timeout = oslo_messaging.MessagingTimeout() # Raise a timeout the first 2 times it calls # get_service_plugin_list then return a empty tuple self.plugin_api.get_service_plugin_list.side_effect = ( @@ -1958,12 +1958,12 @@ class TestBasicRouterOperations(base.BaseTestCase): self.assertEqual(agent.neutron_service_plugins, tuple()) def test_get_service_plugin_list_retried_max(self): - raise_timeout = messaging.MessagingTimeout() + raise_timeout = oslo_messaging.MessagingTimeout() # Raise a timeout 5 times self.plugin_api.get_service_plugin_list.side_effect = ( (raise_timeout, ) * 5 ) - self.assertRaises(messaging.MessagingTimeout, l3_agent.L3NATAgent, + self.assertRaises(oslo_messaging.MessagingTimeout, l3_agent.L3NATAgent, HOSTNAME, self.conf) def test_external_gateway_removed_ext_gw_port_and_fip(self): diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py index 2f74c87bdb8..f9afd4d8ef7 100644 --- a/neutron/tests/unit/test_l3_plugin.py +++ b/neutron/tests/unit/test_l3_plugin.py @@ -19,8 +19,8 @@ import copy import mock import netaddr -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from webob import exc from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api diff --git a/neutron/tests/unit/test_l3_schedulers.py b/neutron/tests/unit/test_l3_schedulers.py index 9e603425111..f8c7ac9c595 100644 --- a/neutron/tests/unit/test_l3_schedulers.py +++ b/neutron/tests/unit/test_l3_schedulers.py @@ -20,10 +20,10 @@ import uuid import mock import testscenarios -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_utils import importutils +from oslo_utils import timeutils from sqlalchemy.orm import query from neutron.common import constants diff --git a/neutron/tests/unit/test_linux_dhcp.py b/neutron/tests/unit/test_linux_dhcp.py index 9795a2b27ad..6730900f499 100644 --- a/neutron/tests/unit/test_linux_dhcp.py +++ b/neutron/tests/unit/test_linux_dhcp.py @@ -17,7 +17,7 @@ import os import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg from neutron.agent.common import config from neutron.agent.dhcp import config as dhcp_config diff --git a/neutron/tests/unit/test_metadata_agent.py b/neutron/tests/unit/test_metadata_agent.py index 916988485ba..fa691712049 100644 --- a/neutron/tests/unit/test_metadata_agent.py +++ b/neutron/tests/unit/test_metadata_agent.py @@ -163,7 +163,7 @@ class TestMetadataProxyHandlerCache(TestMetadataProxyHandlerBase): 'not_used': [1, 2, 3]} expected_networks = ('network_id1',) with mock.patch( - 'oslo.utils.timeutils.utcnow_ts', return_value=0): + 'oslo_utils.timeutils.utcnow_ts', return_value=0): mock_list_ports = self.qclient.return_value.list_ports mock_list_ports.return_value = ports networks = self.handler._get_router_networks(router_id) diff --git a/neutron/tests/unit/test_netns_cleanup.py b/neutron/tests/unit/test_netns_cleanup.py index 9107ebad2d3..1417ea3af13 100644 --- a/neutron/tests/unit/test_netns_cleanup.py +++ b/neutron/tests/unit/test_netns_cleanup.py @@ -36,7 +36,7 @@ class TestNetnsCleanup(base.BaseTestCase): conf.AGENT.root_helper = 'sudo', conf.dhcp_driver = 'driver' - method_to_patch = 'oslo.utils.importutils.import_object' + method_to_patch = 'oslo_utils.importutils.import_object' with mock.patch(method_to_patch) as import_object: driver = mock.Mock() diff --git a/neutron/tests/unit/test_neutron_manager.py b/neutron/tests/unit/test_neutron_manager.py index 46944512b1f..69f13eb68ea 100644 --- a/neutron/tests/unit/test_neutron_manager.py +++ b/neutron/tests/unit/test_neutron_manager.py @@ -17,7 +17,7 @@ import types import fixtures -from oslo.config import cfg +from oslo_config import cfg from neutron import manager from neutron.openstack.common import log as logging diff --git a/neutron/tests/unit/test_policy.py b/neutron/tests/unit/test_policy.py index 35d983ee161..17af7c44e8b 100644 --- a/neutron/tests/unit/test_policy.py +++ b/neutron/tests/unit/test_policy.py @@ -20,9 +20,9 @@ import StringIO import urllib2 import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils import six import six.moves.urllib.request as urlrequest diff --git a/neutron/tests/unit/test_provider_configuration.py b/neutron/tests/unit/test_provider_configuration.py index 89233b9f1d7..c5a5a3eb336 100644 --- a/neutron/tests/unit/test_provider_configuration.py +++ b/neutron/tests/unit/test_provider_configuration.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from neutron.common import exceptions as n_exc from neutron import manager diff --git a/neutron/tests/unit/test_quota_ext.py b/neutron/tests/unit/test_quota_ext.py index b709221c73a..88df8946fc9 100644 --- a/neutron/tests/unit/test_quota_ext.py +++ b/neutron/tests/unit/test_quota_ext.py @@ -16,7 +16,7 @@ import sys import mock -from oslo.config import cfg +from oslo_config import cfg import testtools from webob import exc import webtest diff --git a/neutron/tests/unit/test_rpc_service.py b/neutron/tests/unit/test_rpc_service.py index 9c6ecb658d5..afd71969683 100644 --- a/neutron/tests/unit/test_rpc_service.py +++ b/neutron/tests/unit/test_rpc_service.py @@ -14,8 +14,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.messaging import conffixture as messaging_conffixture +from oslo_config import cfg +from oslo_messaging import conffixture as messaging_conffixture from neutron.common import rpc from neutron.tests import sub_base @@ -33,7 +33,7 @@ class ServiceTestCase(sub_base.SubBaseTestCase): self.host = 'foo' self.topic = 'neutron-agent' - self.target_mock = mock.patch('oslo.messaging.Target') + self.target_mock = mock.patch('oslo_messaging.Target') self.target_mock.start() self.messaging_conf = messaging_conffixture.ConfFixture(CONF) @@ -45,7 +45,7 @@ class ServiceTestCase(sub_base.SubBaseTestCase): rpc.init(CONF) def test_operations(self): - with mock.patch('oslo.messaging.get_rpc_server') as get_rpc_server: + with mock.patch('oslo_messaging.get_rpc_server') as get_rpc_server: rpc_server = get_rpc_server.return_value service = rpc.Service(self.host, self.topic) diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py index 457b467d774..c1ffc4073d8 100644 --- a/neutron/tests/unit/test_security_groups_rpc.py +++ b/neutron/tests/unit/test_security_groups_rpc.py @@ -17,8 +17,8 @@ import contextlib import collections import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging from testtools import matchers import webob.exc @@ -1147,7 +1147,7 @@ class SecurityGroupAgentRpcTestCase(BaseSecurityGroupAgentRpcTestCase): defer_refresh_firewall) rpc = self.agent.plugin_rpc rpc.security_group_info_for_devices.side_effect = ( - messaging.UnsupportedVersion('1.2')) + oslo_messaging.UnsupportedVersion('1.2')) rpc.security_group_rules_for_devices.return_value = ( self.firewall.ports) @@ -1621,7 +1621,7 @@ class SecurityGroupServerRpcApiTestCase(base.BaseTestCase): class FakeSGNotifierAPI(sg_rpc.SecurityGroupAgentRpcApiMixin): def __init__(self): self.topic = 'fake' - target = messaging.Target(topic=self.topic, version='1.0') + target = oslo_messaging.Target(topic=self.topic, version='1.0') self.client = n_rpc.get_client(target) @@ -2517,7 +2517,7 @@ class TestSecurityGroupAgentWithIptables(base.BaseTestCase): if test_rpc_v1_1: self.rpc.security_group_info_for_devices.side_effect = ( - messaging.UnsupportedVersion('1.2')) + oslo_messaging.UnsupportedVersion('1.2')) self.iptables = self.agent.firewall.iptables # TODO(jlibosva) Get rid of mocking iptables execute and mock out diff --git a/neutron/tests/unit/test_servicetype.py b/neutron/tests/unit/test_servicetype.py index 6b126acb80a..89f7f52ef6a 100644 --- a/neutron/tests/unit/test_servicetype.py +++ b/neutron/tests/unit/test_servicetype.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import webob.exc as webexc import webtest diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py index ffb3fa106bb..e936289cb93 100644 --- a/neutron/tests/unit/test_wsgi.py +++ b/neutron/tests/unit/test_wsgi.py @@ -19,7 +19,7 @@ import ssl import urllib2 import mock -from oslo.config import cfg +from oslo_config import cfg import testtools import webob import webob.exc diff --git a/neutron/tests/unit/testlib_plugin.py b/neutron/tests/unit/testlib_plugin.py index 5b3150c8183..3f07e61f575 100644 --- a/neutron/tests/unit/testlib_plugin.py +++ b/neutron/tests/unit/testlib_plugin.py @@ -17,7 +17,7 @@ import gc import weakref import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.db import agentschedulers_db from neutron import manager diff --git a/neutron/tests/unit/vmware/apiclient/fake.py b/neutron/tests/unit/vmware/apiclient/fake.py index 0dbb69c6dc5..b0b6cfa2c49 100644 --- a/neutron/tests/unit/vmware/apiclient/fake.py +++ b/neutron/tests/unit/vmware/apiclient/fake.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six.moves.urllib.parse as urlparse from neutron.openstack.common import log as logging diff --git a/neutron/tests/unit/vmware/db/test_nsx_db.py b/neutron/tests/unit/vmware/db/test_nsx_db.py index f4078a46948..330b90ca621 100644 --- a/neutron/tests/unit/vmware/db/test_nsx_db.py +++ b/neutron/tests/unit/vmware/db/test_nsx_db.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.db import exception as d_exc +from oslo_db import exception as d_exc from neutron import context from neutron.db import models_v2 diff --git a/neutron/tests/unit/vmware/extensions/test_maclearning.py b/neutron/tests/unit/vmware/extensions/test_maclearning.py index 7b934321996..e2688aab982 100644 --- a/neutron/tests/unit/vmware/extensions/test_maclearning.py +++ b/neutron/tests/unit/vmware/extensions/test_maclearning.py @@ -16,7 +16,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.api.v2 import attributes from neutron.common import test_lib diff --git a/neutron/tests/unit/vmware/extensions/test_networkgw.py b/neutron/tests/unit/vmware/extensions/test_networkgw.py index 993b8cb6eab..bc2c58057d3 100644 --- a/neutron/tests/unit/vmware/extensions/test_networkgw.py +++ b/neutron/tests/unit/vmware/extensions/test_networkgw.py @@ -15,7 +15,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from webob import exc import webtest diff --git a/neutron/tests/unit/vmware/extensions/test_providernet.py b/neutron/tests/unit/vmware/extensions/test_providernet.py index aaaf1d176b6..e26e9f40252 100644 --- a/neutron/tests/unit/vmware/extensions/test_providernet.py +++ b/neutron/tests/unit/vmware/extensions/test_providernet.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import webob.exc from neutron.extensions import multiprovidernet as mpnet diff --git a/neutron/tests/unit/vmware/extensions/test_qosqueues.py b/neutron/tests/unit/vmware/extensions/test_qosqueues.py index 729fbb9e763..80104ea3a7b 100644 --- a/neutron/tests/unit/vmware/extensions/test_qosqueues.py +++ b/neutron/tests/unit/vmware/extensions/test_qosqueues.py @@ -16,7 +16,7 @@ import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg import webob.exc from neutron import context diff --git a/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py b/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py index 2a2311c0104..ba45f0810e9 100644 --- a/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py +++ b/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py @@ -15,7 +15,7 @@ # import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.plugins.vmware.api_client import exception from neutron.plugins.vmware.common import utils as nsx_utils diff --git a/neutron/tests/unit/vmware/nsxlib/test_lsn.py b/neutron/tests/unit/vmware/nsxlib/test_lsn.py index c1b2c714666..4945a5d9f5e 100644 --- a/neutron/tests/unit/vmware/nsxlib/test_lsn.py +++ b/neutron/tests/unit/vmware/nsxlib/test_lsn.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.common import exceptions from neutron.plugins.vmware.api_client import exception as api_exc diff --git a/neutron/tests/unit/vmware/nsxlib/test_router.py b/neutron/tests/unit/vmware/nsxlib/test_router.py index 39aa2e4a29f..9aeb28cba26 100644 --- a/neutron/tests/unit/vmware/nsxlib/test_router.py +++ b/neutron/tests/unit/vmware/nsxlib/test_router.py @@ -16,7 +16,7 @@ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.common import exceptions from neutron.openstack.common import uuidutils diff --git a/neutron/tests/unit/vmware/test_agent_scheduler.py b/neutron/tests/unit/vmware/test_agent_scheduler.py index 6d1193454f4..e84639a9834 100644 --- a/neutron/tests/unit/vmware/test_agent_scheduler.py +++ b/neutron/tests/unit/vmware/test_agent_scheduler.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants from neutron.common import test_lib diff --git a/neutron/tests/unit/vmware/test_dhcpmeta.py b/neutron/tests/unit/vmware/test_dhcpmeta.py index d6c519218da..77367ddec7a 100644 --- a/neutron/tests/unit/vmware/test_dhcpmeta.py +++ b/neutron/tests/unit/vmware/test_dhcpmeta.py @@ -15,7 +15,7 @@ import mock -from oslo.config import cfg +from oslo_config import cfg from neutron.common import constants as n_consts from neutron.common import exceptions as n_exc diff --git a/neutron/tests/unit/vmware/test_nsx_opts.py b/neutron/tests/unit/vmware/test_nsx_opts.py index 8d6b03ab0f7..0ea2b97b183 100644 --- a/neutron/tests/unit/vmware/test_nsx_opts.py +++ b/neutron/tests/unit/vmware/test_nsx_opts.py @@ -16,7 +16,7 @@ import fixtures import mock -from oslo.config import cfg +from oslo_config import cfg from neutron import manager from neutron.openstack.common import uuidutils diff --git a/neutron/tests/unit/vmware/test_nsx_plugin.py b/neutron/tests/unit/vmware/test_nsx_plugin.py index 4dd422ba14d..eacb00f640b 100644 --- a/neutron/tests/unit/vmware/test_nsx_plugin.py +++ b/neutron/tests/unit/vmware/test_nsx_plugin.py @@ -18,8 +18,8 @@ import uuid import mock import netaddr -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from sqlalchemy import exc as sql_exc import webob.exc diff --git a/neutron/tests/unit/vmware/test_nsx_sync.py b/neutron/tests/unit/vmware/test_nsx_sync.py index 95abd689c6a..5388f137ae0 100644 --- a/neutron/tests/unit/vmware/test_nsx_sync.py +++ b/neutron/tests/unit/vmware/test_nsx_sync.py @@ -18,8 +18,8 @@ import contextlib import time import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from neutron.api.v2 import attributes as attr from neutron.common import constants diff --git a/neutron/tests/unit/vmware/vshield/fake_vcns.py b/neutron/tests/unit/vmware/vshield/fake_vcns.py index 4b0aed49528..db64e2f6755 100644 --- a/neutron/tests/unit/vmware/vshield/fake_vcns.py +++ b/neutron/tests/unit/vmware/vshield/fake_vcns.py @@ -14,7 +14,7 @@ import copy -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from neutron.openstack.common import uuidutils from neutron.plugins.vmware.vshield.common import exceptions diff --git a/neutron/wsgi.py b/neutron/wsgi.py index 48933b927d0..d8440f103bc 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -27,10 +27,10 @@ import time import eventlet.wsgi eventlet.patcher.monkey_patch(all=False, socket=True, thread=True) -from oslo.config import cfg -from oslo import i18n -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_config import cfg +import oslo_i18n +from oslo_serialization import jsonutils +from oslo_utils import excutils import routes.middleware import webob.dec import webob.exc @@ -367,7 +367,7 @@ class Request(webob.Request): """ if not self.accept_language: return None - all_languages = i18n.get_available_languages('neutron') + all_languages = oslo_i18n.get_available_languages('neutron') return self.accept_language.best_match(all_languages) @property @@ -735,7 +735,7 @@ class Router(object): if not match: language = req.best_match_language() msg = _('The resource could not be found.') - msg = i18n.translate(msg, language) + msg = oslo_i18n.translate(msg, language) return webob.exc.HTTPNotFound(explanation=msg) app = match['controller'] return app diff --git a/setup.cfg b/setup.cfg index 57b5c3cd14e..da01f948266 100644 --- a/setup.cfg +++ b/setup.cfg @@ -187,11 +187,11 @@ neutron.openstack.common.cache.backends = memory = neutron.openstack.common.cache._backends.memory:MemoryBackend # These are for backwards compat with Icehouse notification_driver configuration values oslo.messaging.notify.drivers = - neutron.openstack.common.notifier.log_notifier = oslo.messaging.notify._impl_log:LogDriver - neutron.openstack.common.notifier.no_op_notifier = oslo.messaging.notify._impl_noop:NoOpDriver - neutron.openstack.common.notifier.rpc_notifier2 = oslo.messaging.notify._impl_messaging:MessagingV2Driver - neutron.openstack.common.notifier.rpc_notifier = oslo.messaging.notify._impl_messaging:MessagingDriver - neutron.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver + neutron.openstack.common.notifier.log_notifier = oslo_messaging.notify._impl_log:LogDriver + neutron.openstack.common.notifier.no_op_notifier = oslo_messaging.notify._impl_noop:NoOpDriver + neutron.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify._impl_messaging:MessagingV2Driver + neutron.openstack.common.notifier.rpc_notifier = oslo_messaging.notify._impl_messaging:MessagingDriver + neutron.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver [build_sphinx] all_files = 1