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: Iae62b48993eef3b31420f8cc245a55f5e303c4fc

designate/__init__.py

@@ -20,7 +20,7 @@ eventlet.monkey_patch()
 import os
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from oslo_concurrency import lockutils
 from oslo import messaging

designate/agent/__init__.py

@@ -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
 
 cfg.CONF.register_group(cfg.OptGroup(
     name='service:agent', title="Configuration for the Agent Service"

designate/agent/handler.py

@@ -19,7 +19,7 @@ import dns.rcode
 import dns.message
 import dns.flags
 import dns.opcode
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import utils

designate/agent/service.py

@@ -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 import utils

designate/api/__init__.py

@@ -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
 
 
 cfg.CONF.register_group(cfg.OptGroup(

designate/api/admin/__init__.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import pecan.deploy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)

designate/api/admin/app.py

@@ -15,7 +15,7 @@
 # under the License.
 import pecan
 import pecan.deploy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.api.v2 import patches

designate/api/admin/controllers/extensions/import_.py

@@ -15,7 +15,7 @@ from dns import zone as dnszone
 from dns import exception as dnsexception
 import pecan
 from oslo_log import log as logging
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.api.v2.controllers import rest
 from designate import dnsutils

designate/api/admin/controllers/root.py

@@ -12,7 +12,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 stevedore import named
 

designate/api/admin/views/base.py

@@ -15,7 +15,7 @@
 # under the License.
 import urllib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/api/middleware.py

@@ -15,12 +15,12 @@
 # under the License.
 import flask
 import webob.dec
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo import messaging
 from oslo_log import log as logging
 from oslo_middleware import base
 from oslo_middleware import request_id
-from oslo.serialization import jsonutils as json
+from oslo_serialization import jsonutils as json
 from oslo_utils import strutils
 
 from designate import exceptions

designate/api/service.py

@@ -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 paste import deploy
 

designate/api/v1/__init__.py

@@ -20,9 +20,9 @@ from werkzeug import exceptions as wexceptions
 from werkzeug import wrappers
 from werkzeug.routing import BaseConverter
 from werkzeug.routing import ValidationError
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from designate import exceptions
 from designate import utils

designate/api/v1/servers.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/api/v1/tsigkeys.py

@@ -15,7 +15,7 @@
 # under the License.
 import flask
 from oslo_log import log as logging
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import schema
 from designate.central import rpcapi as central_rpcapi

designate/api/v2/__init__.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan.deploy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.api.v2 import patches  # flake8: noqa

designate/api/v2/app.py

@@ -15,7 +15,7 @@
 # under the License.
 import pecan
 import pecan.deploy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.api.v2 import patches

designate/api/v2/controllers/root.py

@@ -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 stevedore import named
 

designate/api/v2/controllers/zones/__init__.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import exceptions
 from designate import utils

designate/api/v2/controllers/zones/nameservers.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.api.v2.controllers import rest
 from designate.objects.adapters import DesignateAdapter

designate/api/v2/patches.py

@@ -16,7 +16,7 @@
 from inspect import ismethod
 from inspect import getargspec
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import pecan.core
 
 from designate import exceptions

designate/api/versions.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 def factory(global_config, **local_conf):

designate/backend/agent.py

@@ -22,7 +22,7 @@ import dns.flags
 import dns.rcode
 import dns.message
 import dns.opcode
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.i18n import _LI

designate/backend/agent_backend/impl_bind9.py

@@ -17,8 +17,8 @@ import os
 
 import dns
 import dns.resolver
-from oslo.config import cfg
-from oslo.concurrency import lockutils
+from oslo_concurrency import lockutils
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.backend.agent_backend import base

designate/backend/base.py

@@ -15,7 +15,7 @@
 # under the License.
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.i18n import _LI

designate/backend/impl_dynect.py

@@ -17,7 +17,7 @@ import json
 import time
 
 from eventlet import Timeout
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import requests
 from requests.adapters import HTTPAdapter

designate/backend/impl_powerdns/tables.py

@@ -15,7 +15,7 @@
 # under the License.
 from sqlalchemy import MetaData, Table, Column, String, Integer
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.sqlalchemy.types import UUID
 

designate/central/__init__.py

@@ -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
 
 cfg.CONF.register_group(cfg.OptGroup(
     name='service:central', title="Configuration for Central Service"

designate/central/rpcapi.py

@@ -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 oslo import messaging
 

designate/central/service.py

@@ -24,7 +24,7 @@ import string
 import random
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo import messaging
 from oslo_log import log as logging
 from oslo_utils import excutils

designate/cmd/agent.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import service

designate/cmd/api.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.openstack.common import service

designate/cmd/central.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import service

designate/cmd/manage.py

@@ -19,7 +19,7 @@ import os
 import sys
 
 import eventlet
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from stevedore.extension import ExtensionManager
 

designate/cmd/mdns.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import service

designate/cmd/pool_manager.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import service

designate/cmd/sink.py

@@ -15,7 +15,7 @@
 # under the License.
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import service

designate/dnsutils.py

@@ -23,7 +23,7 @@ import dns.zone
 import eventlet
 from dns import rdatatype
 from oslo_log import log as logging
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import context
 from designate import exceptions

designate/manage/database.py

@@ -16,7 +16,7 @@
 import os
 
 from migrate.versioning import api as versioning_api
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.manage import base

designate/manage/pool.py

@@ -15,7 +15,7 @@
 # under the License.
 import pprint
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.manage import base

designate/manage/pool_manager_cache.py

@@ -16,7 +16,7 @@
 import os
 
 from migrate.versioning import api as versioning_api
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.manage import base

designate/manage/powerdns.py

@@ -16,7 +16,7 @@
 import os
 
 from migrate.versioning import api as versioning_api
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy.migration_cli import manager as migration_manager
 from oslo_log import log as logging
 

designate/manage/tlds.py

@@ -15,7 +15,7 @@
 import csv
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/mdns/__init__.py

@@ -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 designate import dnsutils
 

designate/mdns/base.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from oslo import messaging
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.pool_manager import rpcapi as pool_mngr_api

designate/mdns/handler.py

@@ -20,7 +20,7 @@ import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
 import dns.message
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/mdns/notify.py

@@ -23,7 +23,7 @@ import dns.flags
 import dns.rcode
 import dns.message
 import dns.opcode
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate.mdns import base

designate/mdns/rpcapi.py

@@ -12,7 +12,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 oslo import messaging
 

designate/mdns/service.py

@@ -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 import utils

designate/mdns/xfr.py

@@ -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_utils import timeutils
 from oslo_log import log as logging
 

designate/network_api/__init__.py

@@ -15,7 +15,7 @@
 # under the License.
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.network_api.base import NetworkAPI
 

designate/network_api/base.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import eventlet.patcher
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/network_api/neutron.py

@@ -19,7 +19,7 @@
 
 from neutronclient.v2_0 import client as clientv20
 from neutronclient.common import exceptions as neutron_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/notification_handler/base.py

@@ -16,7 +16,7 @@
 # under the License.
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/notification_handler/neutron.py

@@ -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.notification_handler.base import BaseAddressHandler

designate/notification_handler/nova.py

@@ -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.notification_handler.base import BaseAddressHandler

designate/notifications.py

@@ -16,7 +16,7 @@
 #
 # Copied: nova.notifications
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import rpc

designate/objects/adapters/api_v2/base.py

@@ -14,7 +14,7 @@
 import urllib
 
 from oslo_log import log as logging
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.objects.adapters import base
 from designate.objects import base as obj_base

designate/plugin.py

@@ -19,7 +19,7 @@ import six
 from stevedore import driver
 from stevedore import enabled
 from stevedore import extension
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 

designate/policy.py

@@ -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 oslo_policy import policy
 from oslo_policy import opts

designate/pool_manager/__init__.py

@@ -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
 
 CONF = cfg.CONF
 

designate/pool_manager/cache/impl_memcache/__init__.py

@@ -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 designate import exceptions
 from designate import objects

designate/pool_manager/cache/impl_sqlalchemy/__init__.py

@@ -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_db import options
 from oslo_log import log as logging
 

designate/pool_manager/rpcapi.py

@@ -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 oslo import messaging
 

designate/pool_manager/service.py

@@ -16,7 +16,7 @@
 from contextlib import contextmanager
 from decimal import Decimal
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo import messaging
 from oslo_log import log as logging
 from oslo_concurrency import lockutils

designate/quota/__init__.py

@@ -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.quota.base import Quota

designate/quota/base.py

@@ -16,7 +16,7 @@
 import abc
 
 import six
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import exceptions
 from designate.plugin import DriverPlugin

designate/quota/impl_storage.py

@@ -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 import exceptions

designate/rpc.py

@@ -26,11 +26,11 @@ __all__ = [
     'TRANSPORT_ALIASES',
 ]
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo import messaging
-from oslo.messaging import server as msg_server
-from oslo.messaging.rpc import dispatcher as rpc_dispatcher
-from oslo.serialization import jsonutils
+from oslo_messaging import server as msg_server
+from oslo_messaging.rpc import dispatcher as rpc_dispatcher
+from oslo_serialization import jsonutils
 
 import designate.context
 import designate.exceptions

designate/service.py

@@ -26,7 +26,7 @@ import time
 import six
 import eventlet.wsgi
 from oslo import messaging
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_log import loggers
 

designate/sink/__init__.py

@@ -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
 
 cfg.CONF.register_group(cfg.OptGroup(
     name='service:sink', title="Configuration for Sink Service"

designate/sink/service.py

@@ -14,7 +14,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 oslo import messaging
 

designate/sqlalchemy/session.py

@@ -16,7 +16,7 @@
 
 """Session Handling for SQLAlchemy backend."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy import session
 from oslo_log import log as logging
 

designate/storage/impl_sqlalchemy/__init__.py

@@ -16,7 +16,7 @@
 import time
 import hashlib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_db import options
 from sqlalchemy import select, distinct, func

designate/storage/impl_sqlalchemy/migrate_repo/versions/041_server_pools_storage.py

@@ -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_utils import timeutils
 
 from sqlalchemy import Integer, String, DateTime, Unicode, UniqueConstraint, \

designate/storage/impl_sqlalchemy/migrate_repo/versions/044_add_pool_id_to_domains.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 sqlalchemy.schema import Table, Column, MetaData
 from migrate.changeset.constraint import UniqueConstraint

designate/storage/impl_sqlalchemy/migrate_repo/versions/049_migrate_servers.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 sqlalchemy.schema import Table, MetaData
 from sqlalchemy.sql import select

designate/storage/impl_sqlalchemy/migrate_repo/versions/051_scoped_tsig.py

@@ -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 sqlalchemy import Enum
 from sqlalchemy.schema import Table, MetaData, Column
 from migrate.changeset.constraint import UniqueConstraint

designate/storage/impl_sqlalchemy/migrate_repo/versions/052_secondary_zones.py

@@ -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.utils import timeutils
+from oslo_utils import timeutils
 
 from sqlalchemy import DateTime, Enum, Integer, String, ForeignKeyConstraint
 from sqlalchemy.schema import Column, MetaData, Table

designate/storage/impl_sqlalchemy/migrate_repo/versions/053_pool_nameservers.py

@@ -18,7 +18,7 @@
 from sqlalchemy import Integer, String, DateTime, ForeignKeyConstraint
 from sqlalchemy.schema import Table, Column, MetaData
 from sqlalchemy.sql import select
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import utils
 from designate.sqlalchemy.types import UUID

designate/storage/impl_sqlalchemy/tables.py

@@ -17,7 +17,7 @@ from sqlalchemy import (Table, MetaData, Column, String, Text, Integer, CHAR,
                         DateTime, Enum, Boolean, Unicode, UniqueConstraint,
                         ForeignKeyConstraint)
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from designate import utils

designate/tests/__init__.py

@@ -21,9 +21,9 @@ import inspect
 from testtools import testcase
 from oslotest import base
 from oslo_log import log as logging
-from oslo.config import cfg
-from oslo.config import fixture as cfg_fixture
-from oslo.messaging import conffixture as messaging_fixture
+from oslo_config import cfg
+from oslo_config import fixture as cfg_fixture
+from oslo_messaging import conffixture as messaging_fixture
 
 from designate import policy
 from designate import utils

designate/tests/fixtures.py

@@ -21,7 +21,7 @@ import tempfile
 import fixtures
 from oslo_log import log as logging
 from oslo_utils import importutils
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import policy
 from designate import network_api

designate/tests/test_agent/test_backends/__init__.py

@@ -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 designate.backend import agent_backend
 from designate.agent import service

designate/tests/test_api/test_admin/extensions/test_quotas.py

@@ -14,7 +14,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 designate.tests.test_api.test_admin import AdminApiTestCase
 

designate/tests/test_api/test_admin/extensions/test_reports.py

@@ -14,7 +14,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 designate.tests.test_api.test_admin import AdminApiTestCase
 

designate/tests/test_api/test_admin/extensions/test_zones.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from dns import zone as dnszone
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate.tests.test_api.test_admin import AdminApiTestCase
 

designate/tests/test_api/test_middleware.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_messaging.notify import notifier
 
 from designate.tests.test_api import ApiTestCase

designate/tests/test_api/test_v1/__init__.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo_log import log as logging
-from oslo.serialization import jsonutils as json
+from oslo_serialization import jsonutils as json
 
 from designate.api import v1 as api_v1
 from designate.api import middleware

designate/tests/test_api/test_v1/test_domains.py

@@ -18,7 +18,7 @@ import datetime
 
 from mock import patch
 from oslo import messaging
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/tests/test_api/test_v2/test_limits.py

@@ -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 designate.tests.test_api.test_v2 import ApiV2TestCase
 

designate/tests/test_api/test_v2/test_pools.py

@@ -12,7 +12,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.tests.test_api.test_v2 import ApiV2TestCase

designate/tests/test_api/test_v2/test_zones.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from mock import patch
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo import messaging
 from oslo_log import log as logging
 

designate/tests/test_central/test_service.py

@@ -20,7 +20,7 @@ import random
 import mock
 import testtools
 from testtools.matchers import GreaterThan
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_db import exception as db_exception
 from oslo_messaging.notify import notifier

designate/tests/test_mdns/test_handler.py

@@ -21,7 +21,7 @@ import dns.rdatatype
 import dns.resolver
 import dns.rrset
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from designate import context
 from designate import objects

designate/tests/test_network_api/test_neutron.py

@@ -15,7 +15,7 @@
 # under the License.
 from neutronclient.v2_0 import client as clientv20
 from neutronclient.common import exceptions as neutron_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from mock import patch
 import testtools
 

designate/tests/test_pool_manager/test_service.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo import messaging
-from oslo.config import cfg
+from oslo_config import cfg
 from mock import call
 from mock import patch
 

designate/tests/test_quota/test_quota.py

@@ -15,7 +15,7 @@
 # under the License.
 from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
 import testtools
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import quota

designate/tests/test_storage/__init__.py

@@ -18,7 +18,7 @@ import math
 
 import mock
 import testtools
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from designate import exceptions

designate/utils.py

@@ -23,7 +23,7 @@ import uuid
 import six
 import pkg_resources
 from jinja2 import Template
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_concurrency import processutils
 from oslo_log import log as logging
 from oslo_utils import timeutils