Commit f9c55abb authored by Doug Hellmann's avatar Doug Hellmann

Drop use of 'oslo' namespace package

The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages

Change-Id: Ia21c15e8eca6bf456f7cfe13f815f5ce068601e7
parent c09a295c
......@@ -17,9 +17,9 @@ import pprint
import time
import requests
from oslo.config import cfg
from oslo_config import cfg
from oslo_log import log as logging
from oslo.serialization import jsonutils as json
from oslo_serialization import jsonutils as json
from oslo_utils import importutils
from designate import exceptions
......
......@@ -16,7 +16,7 @@
import logging
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from designate import backend
......
......@@ -19,7 +19,7 @@ import socket
import ssl
import eventlet
from oslo.config import cfg
from oslo_config import cfg
from oslo_log import log as logging
from designate import exceptions
......
......@@ -13,7 +13,7 @@
# 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_config import cfg
from oslo_log import log as logging
from designate.objects import Record
......
......@@ -22,7 +22,7 @@ import json
import copy
import requests
from oslo.config import cfg
from oslo_config import cfg
from designate.backend import impl_ipa
from designate.i18n import _LI
......
......@@ -18,7 +18,7 @@ from __future__ import print_function
import logging as std_logging
import os
from oslo.config import cfg
from oslo_config import cfg
from tempest.openstack.common import log as logging
......
......@@ -23,7 +23,7 @@ import socket
from oslo_config import cfg
from oslo_log import log
from oslo_concurrency import lockutils
from oslo import messaging
import oslo_messaging as messaging
cfg.CONF.register_opts([
......
......@@ -16,7 +16,7 @@
import flask
import webob.dec
from oslo_config import cfg
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from oslo_middleware import base
from oslo_middleware import request_id
......
......@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import flask
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from designate import rpc
......
......@@ -15,7 +15,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import log as logging
from oslo import messaging
import oslo_messaging as messaging
from designate.i18n import _LI
from designate import rpc
......
......@@ -25,7 +25,7 @@ import random
import time
from oslo_config import cfg
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from oslo_utils import excutils
from oslo_concurrency import lockutils
......
......@@ -13,7 +13,7 @@
# 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 import i18n
import oslo_i18n as i18n
_translators = i18n.TranslatorFactory(domain='designate')
......
......@@ -13,7 +13,7 @@
# 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 import messaging
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_log import log as logging
......
......@@ -14,7 +14,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import log as logging
from oslo import messaging
import oslo_messaging as messaging
from designate.i18n import _LI
from designate import rpc
......
......@@ -15,7 +15,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import log as logging
from oslo import messaging
import oslo_messaging as messaging
from designate.i18n import _LI
from designate import rpc
......
......@@ -17,7 +17,7 @@ from contextlib import contextmanager
from decimal import Decimal
from oslo_config import cfg
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from oslo_concurrency import lockutils
......
......@@ -27,7 +27,7 @@ __all__ = [
]
from oslo_config import cfg
from oslo import messaging
import oslo_messaging as messaging
from oslo_messaging import server as msg_server
from oslo_messaging.rpc import dispatcher as rpc_dispatcher
from oslo_serialization import jsonutils
......
......@@ -25,7 +25,7 @@ import time
import six
import eventlet.wsgi
from oslo import messaging
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_log import log as logging
from oslo_log import loggers
......
......@@ -16,7 +16,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import log as logging
from oslo import messaging
import oslo_messaging as messaging
from designate.i18n import _LW
from designate import notification_handler
......
......@@ -17,7 +17,7 @@
import datetime
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_log import log as logging
......
......@@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from designate.central import service as central_service
......
......@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_log import log as logging
......
......@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from designate import exceptions
......
......@@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from designate import exceptions
......
......@@ -15,7 +15,7 @@
# under the License.
from mock import patch
from oslo_config import cfg
from oslo import messaging
import oslo_messaging as messaging
from oslo_log import log as logging
from designate import exceptions
......
......@@ -15,7 +15,7 @@
# under the License.
import mock
from mock import patch
from oslo import messaging
import oslo_messaging as messaging
from designate import objects
from designate.pool_manager.rpcapi import PoolManagerAPI
......
......@@ -13,7 +13,7 @@
# 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 import messaging
import oslo_messaging as messaging
from oslo_config import cfg
from mock import call
from mock import patch
......
......@@ -16,7 +16,7 @@ limitations under the License.
import os
from oslo.config import cfg
from oslo_config import cfg
cfg.CONF.register_group(cfg.OptGroup(
name='identity', title="Configuration for Keystone auth"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment