From 1ff8469ef7d01e10f4b5ee9b6dea0e410d0f85d2 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 28 Apr 2015 15:18:00 +0000 Subject: [PATCH] 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 | 2 +- designate/agent/__init__.py | 2 +- designate/agent/handler.py | 2 +- designate/agent/service.py | 2 +- designate/api/__init__.py | 2 +- designate/api/admin/__init__.py | 2 +- designate/api/admin/app.py | 2 +- designate/api/admin/controllers/extensions/import_.py | 2 +- designate/api/admin/controllers/root.py | 2 +- designate/api/admin/views/base.py | 2 +- designate/api/middleware.py | 4 ++-- designate/api/service.py | 2 +- designate/api/v1/__init__.py | 4 ++-- designate/api/v1/servers.py | 2 +- designate/api/v1/tsigkeys.py | 2 +- designate/api/v2/__init__.py | 2 +- designate/api/v2/app.py | 2 +- designate/api/v2/controllers/root.py | 2 +- designate/api/v2/controllers/zones/__init__.py | 2 +- designate/api/v2/controllers/zones/nameservers.py | 2 +- designate/api/v2/patches.py | 2 +- designate/api/versions.py | 2 +- designate/backend/agent.py | 2 +- designate/backend/agent_backend/impl_bind9.py | 4 ++-- designate/backend/base.py | 2 +- designate/backend/impl_dynect.py | 2 +- designate/backend/impl_powerdns/tables.py | 2 +- designate/central/__init__.py | 2 +- designate/central/rpcapi.py | 2 +- designate/central/service.py | 2 +- designate/cmd/agent.py | 2 +- designate/cmd/api.py | 2 +- designate/cmd/central.py | 2 +- designate/cmd/manage.py | 2 +- designate/cmd/mdns.py | 2 +- designate/cmd/pool_manager.py | 2 +- designate/cmd/sink.py | 2 +- designate/dnsutils.py | 2 +- designate/manage/database.py | 2 +- designate/manage/pool.py | 2 +- designate/manage/pool_manager_cache.py | 2 +- designate/manage/powerdns.py | 2 +- designate/manage/tlds.py | 2 +- designate/mdns/__init__.py | 2 +- designate/mdns/base.py | 2 +- designate/mdns/handler.py | 2 +- designate/mdns/notify.py | 2 +- designate/mdns/rpcapi.py | 2 +- designate/mdns/service.py | 2 +- designate/mdns/xfr.py | 2 +- designate/network_api/__init__.py | 2 +- designate/network_api/base.py | 2 +- designate/network_api/neutron.py | 2 +- designate/notification_handler/base.py | 2 +- designate/notification_handler/neutron.py | 2 +- designate/notification_handler/nova.py | 2 +- designate/notifications.py | 2 +- designate/objects/adapters/api_v2/base.py | 2 +- designate/plugin.py | 2 +- designate/policy.py | 2 +- designate/pool_manager/__init__.py | 2 +- designate/pool_manager/cache/impl_memcache/__init__.py | 2 +- designate/pool_manager/cache/impl_sqlalchemy/__init__.py | 2 +- designate/pool_manager/rpcapi.py | 2 +- designate/pool_manager/service.py | 2 +- designate/quota/__init__.py | 2 +- designate/quota/base.py | 2 +- designate/quota/impl_storage.py | 2 +- designate/rpc.py | 8 ++++---- designate/service.py | 2 +- designate/sink/__init__.py | 2 +- designate/sink/service.py | 2 +- designate/sqlalchemy/session.py | 2 +- designate/storage/impl_sqlalchemy/__init__.py | 2 +- .../migrate_repo/versions/041_server_pools_storage.py | 2 +- .../migrate_repo/versions/044_add_pool_id_to_domains.py | 2 +- .../migrate_repo/versions/049_migrate_servers.py | 2 +- .../migrate_repo/versions/051_scoped_tsig.py | 2 +- .../migrate_repo/versions/052_secondary_zones.py | 2 +- .../migrate_repo/versions/053_pool_nameservers.py | 2 +- designate/storage/impl_sqlalchemy/tables.py | 2 +- designate/tests/__init__.py | 6 +++--- designate/tests/fixtures.py | 2 +- designate/tests/test_agent/test_backends/__init__.py | 2 +- .../tests/test_api/test_admin/extensions/test_quotas.py | 2 +- .../tests/test_api/test_admin/extensions/test_reports.py | 2 +- .../tests/test_api/test_admin/extensions/test_zones.py | 2 +- designate/tests/test_api/test_middleware.py | 2 +- designate/tests/test_api/test_v1/__init__.py | 2 +- designate/tests/test_api/test_v1/test_domains.py | 2 +- designate/tests/test_api/test_v2/test_limits.py | 2 +- designate/tests/test_api/test_v2/test_pools.py | 2 +- designate/tests/test_api/test_v2/test_zones.py | 2 +- designate/tests/test_central/test_service.py | 2 +- designate/tests/test_mdns/test_handler.py | 2 +- designate/tests/test_network_api/test_neutron.py | 2 +- designate/tests/test_pool_manager/test_service.py | 2 +- designate/tests/test_quota/test_quota.py | 2 +- designate/tests/test_storage/__init__.py | 2 +- designate/utils.py | 2 +- 100 files changed, 108 insertions(+), 108 deletions(-) diff --git a/designate/__init__.py b/designate/__init__.py index 8fffbcdf..90b46cf6 100644 --- a/designate/__init__.py +++ b/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 diff --git a/designate/agent/__init__.py b/designate/agent/__init__.py index 57e74a77..030a8c09 100644 --- a/designate/agent/__init__.py +++ b/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" diff --git a/designate/agent/handler.py b/designate/agent/handler.py index 9ff8b8fa..e9b08c7e 100644 --- a/designate/agent/handler.py +++ b/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 diff --git a/designate/agent/service.py b/designate/agent/service.py index 18a34f5b..62f35693 100644 --- a/designate/agent/service.py +++ b/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 diff --git a/designate/api/__init__.py b/designate/api/__init__.py index abdc82fe..7bbec834 100644 --- a/designate/api/__init__.py +++ b/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( diff --git a/designate/api/admin/__init__.py b/designate/api/admin/__init__.py index b3f8a5cc..988807e2 100644 --- a/designate/api/admin/__init__.py +++ b/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__) diff --git a/designate/api/admin/app.py b/designate/api/admin/app.py index bd8d5dc6..275176ad 100644 --- a/designate/api/admin/app.py +++ b/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 diff --git a/designate/api/admin/controllers/extensions/import_.py b/designate/api/admin/controllers/extensions/import_.py index 48649ba3..3c37f6d8 100644 --- a/designate/api/admin/controllers/extensions/import_.py +++ b/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 diff --git a/designate/api/admin/controllers/root.py b/designate/api/admin/controllers/root.py index 07e8d51b..178c9af9 100644 --- a/designate/api/admin/controllers/root.py +++ b/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 diff --git a/designate/api/admin/views/base.py b/designate/api/admin/views/base.py index 246a6538..12710b33 100644 --- a/designate/api/admin/views/base.py +++ b/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 diff --git a/designate/api/middleware.py b/designate/api/middleware.py index 0bd232a6..329f6c83 100644 --- a/designate/api/middleware.py +++ b/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 diff --git a/designate/api/service.py b/designate/api/service.py index c51aa817..2140fe1a 100644 --- a/designate/api/service.py +++ b/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 diff --git a/designate/api/v1/__init__.py b/designate/api/v1/__init__.py index c915d72b..e1580e17 100644 --- a/designate/api/v1/__init__.py +++ b/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 diff --git a/designate/api/v1/servers.py b/designate/api/v1/servers.py index 432fdf69..78e0332d 100644 --- a/designate/api/v1/servers.py +++ b/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 diff --git a/designate/api/v1/tsigkeys.py b/designate/api/v1/tsigkeys.py index 742d883e..e2714a2e 100644 --- a/designate/api/v1/tsigkeys.py +++ b/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 diff --git a/designate/api/v2/__init__.py b/designate/api/v2/__init__.py index faeacf42..dda97d2a 100644 --- a/designate/api/v2/__init__.py +++ b/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 diff --git a/designate/api/v2/app.py b/designate/api/v2/app.py index bd8d5dc6..275176ad 100644 --- a/designate/api/v2/app.py +++ b/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 diff --git a/designate/api/v2/controllers/root.py b/designate/api/v2/controllers/root.py index 6d161370..c54de6d1 100644 --- a/designate/api/v2/controllers/root.py +++ b/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 diff --git a/designate/api/v2/controllers/zones/__init__.py b/designate/api/v2/controllers/zones/__init__.py index 5469e1a5..81f63af8 100644 --- a/designate/api/v2/controllers/zones/__init__.py +++ b/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 diff --git a/designate/api/v2/controllers/zones/nameservers.py b/designate/api/v2/controllers/zones/nameservers.py index 9144f916..0ecd530b 100644 --- a/designate/api/v2/controllers/zones/nameservers.py +++ b/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 diff --git a/designate/api/v2/patches.py b/designate/api/v2/patches.py index 79eee1e3..d0f2f7e4 100644 --- a/designate/api/v2/patches.py +++ b/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 diff --git a/designate/api/versions.py b/designate/api/versions.py index 8afba5c6..c1e68763 100644 --- a/designate/api/versions.py +++ b/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): diff --git a/designate/backend/agent.py b/designate/backend/agent.py index 7ea0b964..47c0acdc 100644 --- a/designate/backend/agent.py +++ b/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 diff --git a/designate/backend/agent_backend/impl_bind9.py b/designate/backend/agent_backend/impl_bind9.py index 51a7c386..d9e756d4 100644 --- a/designate/backend/agent_backend/impl_bind9.py +++ b/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 diff --git a/designate/backend/base.py b/designate/backend/base.py index 400ed680..f2886529 100644 --- a/designate/backend/base.py +++ b/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 diff --git a/designate/backend/impl_dynect.py b/designate/backend/impl_dynect.py index 2968ea53..119af167 100644 --- a/designate/backend/impl_dynect.py +++ b/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 diff --git a/designate/backend/impl_powerdns/tables.py b/designate/backend/impl_powerdns/tables.py index 069087bc..41d05552 100644 --- a/designate/backend/impl_powerdns/tables.py +++ b/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 diff --git a/designate/central/__init__.py b/designate/central/__init__.py index 33810fbf..f654eb16 100644 --- a/designate/central/__init__.py +++ b/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" diff --git a/designate/central/rpcapi.py b/designate/central/rpcapi.py index a424116f..1b1cc205 100644 --- a/designate/central/rpcapi.py +++ b/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 diff --git a/designate/central/service.py b/designate/central/service.py index 1852362a..fa071a12 100644 --- a/designate/central/service.py +++ b/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 diff --git a/designate/cmd/agent.py b/designate/cmd/agent.py index e6ca129c..04bff672 100644 --- a/designate/cmd/agent.py +++ b/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 diff --git a/designate/cmd/api.py b/designate/cmd/api.py index dedf2b5b..4aba55a1 100644 --- a/designate/cmd/api.py +++ b/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 diff --git a/designate/cmd/central.py b/designate/cmd/central.py index 8e1300ee..ced37461 100644 --- a/designate/cmd/central.py +++ b/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 diff --git a/designate/cmd/manage.py b/designate/cmd/manage.py index adbc4e33..66e13f56 100644 --- a/designate/cmd/manage.py +++ b/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 diff --git a/designate/cmd/mdns.py b/designate/cmd/mdns.py index 9b5a4a9f..605a838f 100644 --- a/designate/cmd/mdns.py +++ b/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 diff --git a/designate/cmd/pool_manager.py b/designate/cmd/pool_manager.py index 58ac0e9d..716dcf25 100644 --- a/designate/cmd/pool_manager.py +++ b/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 diff --git a/designate/cmd/sink.py b/designate/cmd/sink.py index bf8959fb..f97b59f7 100644 --- a/designate/cmd/sink.py +++ b/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 diff --git a/designate/dnsutils.py b/designate/dnsutils.py index a2c0b0ae..f3c0fbbb 100644 --- a/designate/dnsutils.py +++ b/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 diff --git a/designate/manage/database.py b/designate/manage/database.py index 07b35e32..a8da400d 100644 --- a/designate/manage/database.py +++ b/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 diff --git a/designate/manage/pool.py b/designate/manage/pool.py index 279e37ba..47bd1899 100644 --- a/designate/manage/pool.py +++ b/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 diff --git a/designate/manage/pool_manager_cache.py b/designate/manage/pool_manager_cache.py index 7b1dbec1..8f28255c 100644 --- a/designate/manage/pool_manager_cache.py +++ b/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 diff --git a/designate/manage/powerdns.py b/designate/manage/powerdns.py index 187ccc15..5b0c4563 100644 --- a/designate/manage/powerdns.py +++ b/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 diff --git a/designate/manage/tlds.py b/designate/manage/tlds.py index 77ae008a..2927cc74 100644 --- a/designate/manage/tlds.py +++ b/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 diff --git a/designate/mdns/__init__.py b/designate/mdns/__init__.py index dcbac5c6..1022ec09 100644 --- a/designate/mdns/__init__.py +++ b/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 diff --git a/designate/mdns/base.py b/designate/mdns/base.py index 7259b24c..17206b30 100644 --- a/designate/mdns/base.py +++ b/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 diff --git a/designate/mdns/handler.py b/designate/mdns/handler.py index a05f36fc..55487394 100644 --- a/designate/mdns/handler.py +++ b/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 diff --git a/designate/mdns/notify.py b/designate/mdns/notify.py index 149057df..f7a2a504 100644 --- a/designate/mdns/notify.py +++ b/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 diff --git a/designate/mdns/rpcapi.py b/designate/mdns/rpcapi.py index a6d69522..40261149 100644 --- a/designate/mdns/rpcapi.py +++ b/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 diff --git a/designate/mdns/service.py b/designate/mdns/service.py index 5c702421..cbe229bb 100644 --- a/designate/mdns/service.py +++ b/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 diff --git a/designate/mdns/xfr.py b/designate/mdns/xfr.py index b140cf9a..d0445b0f 100644 --- a/designate/mdns/xfr.py +++ b/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 diff --git a/designate/network_api/__init__.py b/designate/network_api/__init__.py index bac81cee..7cb10592 100644 --- a/designate/network_api/__init__.py +++ b/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 diff --git a/designate/network_api/base.py b/designate/network_api/base.py index e54faa96..6279e66d 100644 --- a/designate/network_api/base.py +++ b/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 diff --git a/designate/network_api/neutron.py b/designate/network_api/neutron.py index 99026207..47d2380c 100644 --- a/designate/network_api/neutron.py +++ b/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 diff --git a/designate/notification_handler/base.py b/designate/notification_handler/base.py index 421551fe..e78cbf1b 100644 --- a/designate/notification_handler/base.py +++ b/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 diff --git a/designate/notification_handler/neutron.py b/designate/notification_handler/neutron.py index 8830236d..3690a0b5 100644 --- a/designate/notification_handler/neutron.py +++ b/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 diff --git a/designate/notification_handler/nova.py b/designate/notification_handler/nova.py index be8e9e2c..4bcae5e1 100644 --- a/designate/notification_handler/nova.py +++ b/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 diff --git a/designate/notifications.py b/designate/notifications.py index 93bd3621..817c30e1 100644 --- a/designate/notifications.py +++ b/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 diff --git a/designate/objects/adapters/api_v2/base.py b/designate/objects/adapters/api_v2/base.py index 72ad87dd..accf2b8d 100644 --- a/designate/objects/adapters/api_v2/base.py +++ b/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 diff --git a/designate/plugin.py b/designate/plugin.py index b4ec786a..3e7ecd46 100644 --- a/designate/plugin.py +++ b/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 diff --git a/designate/policy.py b/designate/policy.py index 1275fbb3..af992151 100644 --- a/designate/policy.py +++ b/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 diff --git a/designate/pool_manager/__init__.py b/designate/pool_manager/__init__.py index d40f1e93..ca1c7570 100644 --- a/designate/pool_manager/__init__.py +++ b/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 diff --git a/designate/pool_manager/cache/impl_memcache/__init__.py b/designate/pool_manager/cache/impl_memcache/__init__.py index 19c9f10b..8f587e2b 100644 --- a/designate/pool_manager/cache/impl_memcache/__init__.py +++ b/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 diff --git a/designate/pool_manager/cache/impl_sqlalchemy/__init__.py b/designate/pool_manager/cache/impl_sqlalchemy/__init__.py index 81e673bd..d23a3cfd 100644 --- a/designate/pool_manager/cache/impl_sqlalchemy/__init__.py +++ b/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 diff --git a/designate/pool_manager/rpcapi.py b/designate/pool_manager/rpcapi.py index 999c1d21..b867678e 100644 --- a/designate/pool_manager/rpcapi.py +++ b/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 diff --git a/designate/pool_manager/service.py b/designate/pool_manager/service.py index 27026f16..c28cd879 100644 --- a/designate/pool_manager/service.py +++ b/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 diff --git a/designate/quota/__init__.py b/designate/quota/__init__.py index 0fe1a1f4..ee6e0408 100644 --- a/designate/quota/__init__.py +++ b/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 diff --git a/designate/quota/base.py b/designate/quota/base.py index 74da46c3..5347629f 100644 --- a/designate/quota/base.py +++ b/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 diff --git a/designate/quota/impl_storage.py b/designate/quota/impl_storage.py index a41d2b11..6e67d18c 100644 --- a/designate/quota/impl_storage.py +++ b/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 diff --git a/designate/rpc.py b/designate/rpc.py index 7116958a..d2f8641c 100644 --- a/designate/rpc.py +++ b/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 diff --git a/designate/service.py b/designate/service.py index 335c7d86..56a7ed6d 100644 --- a/designate/service.py +++ b/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 diff --git a/designate/sink/__init__.py b/designate/sink/__init__.py index 4ad8dc33..2663666f 100644 --- a/designate/sink/__init__.py +++ b/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" diff --git a/designate/sink/service.py b/designate/sink/service.py index 8cb59911..e111f6cf 100644 --- a/designate/sink/service.py +++ b/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 diff --git a/designate/sqlalchemy/session.py b/designate/sqlalchemy/session.py index 961f198b..49729f57 100644 --- a/designate/sqlalchemy/session.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py index cd505aed..eea8adb3 100644 --- a/designate/storage/impl_sqlalchemy/__init__.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/041_server_pools_storage.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/041_server_pools_storage.py index d6b0fece..e6b213e5 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/041_server_pools_storage.py +++ b/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, \ diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/044_add_pool_id_to_domains.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/044_add_pool_id_to_domains.py index d10bbabe..684bbd80 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/044_add_pool_id_to_domains.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/049_migrate_servers.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/049_migrate_servers.py index 9f0f6e71..2f78d681 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/049_migrate_servers.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/051_scoped_tsig.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/051_scoped_tsig.py index 5c62601a..e1be426b 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/051_scoped_tsig.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/052_secondary_zones.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/052_secondary_zones.py index 5ea53b41..4bd844e0 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/052_secondary_zones.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/053_pool_nameservers.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/053_pool_nameservers.py index 6c3269a1..11240846 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/053_pool_nameservers.py +++ b/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 diff --git a/designate/storage/impl_sqlalchemy/tables.py b/designate/storage/impl_sqlalchemy/tables.py index 189f0146..e6c98f21 100644 --- a/designate/storage/impl_sqlalchemy/tables.py +++ b/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 diff --git a/designate/tests/__init__.py b/designate/tests/__init__.py index 88dd83b6..c5b5fbf6 100644 --- a/designate/tests/__init__.py +++ b/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 diff --git a/designate/tests/fixtures.py b/designate/tests/fixtures.py index 96cd67a4..a02c571d 100644 --- a/designate/tests/fixtures.py +++ b/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 diff --git a/designate/tests/test_agent/test_backends/__init__.py b/designate/tests/test_agent/test_backends/__init__.py index aaa1573a..30cb63e5 100644 --- a/designate/tests/test_agent/test_backends/__init__.py +++ b/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 diff --git a/designate/tests/test_api/test_admin/extensions/test_quotas.py b/designate/tests/test_api/test_admin/extensions/test_quotas.py index ac463423..fcb34cdc 100644 --- a/designate/tests/test_api/test_admin/extensions/test_quotas.py +++ b/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 diff --git a/designate/tests/test_api/test_admin/extensions/test_reports.py b/designate/tests/test_api/test_admin/extensions/test_reports.py index 4a7ada84..2258159d 100644 --- a/designate/tests/test_api/test_admin/extensions/test_reports.py +++ b/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 diff --git a/designate/tests/test_api/test_admin/extensions/test_zones.py b/designate/tests/test_api/test_admin/extensions/test_zones.py index 8917349e..b028878b 100644 --- a/designate/tests/test_api/test_admin/extensions/test_zones.py +++ b/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 diff --git a/designate/tests/test_api/test_middleware.py b/designate/tests/test_api/test_middleware.py index 990e8519..d04429a0 100644 --- a/designate/tests/test_api/test_middleware.py +++ b/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 diff --git a/designate/tests/test_api/test_v1/__init__.py b/designate/tests/test_api/test_v1/__init__.py index bad246ec..97d9c27e 100644 --- a/designate/tests/test_api/test_v1/__init__.py +++ b/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 diff --git a/designate/tests/test_api/test_v1/test_domains.py b/designate/tests/test_api/test_v1/test_domains.py index b6517d50..b9c582cc 100644 --- a/designate/tests/test_api/test_v1/test_domains.py +++ b/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 diff --git a/designate/tests/test_api/test_v2/test_limits.py b/designate/tests/test_api/test_v2/test_limits.py index 53d024bd..9bb75cbf 100644 --- a/designate/tests/test_api/test_v2/test_limits.py +++ b/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 diff --git a/designate/tests/test_api/test_v2/test_pools.py b/designate/tests/test_api/test_v2/test_pools.py index 06c5f68c..bcc10cbd 100644 --- a/designate/tests/test_api/test_v2/test_pools.py +++ b/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 diff --git a/designate/tests/test_api/test_v2/test_zones.py b/designate/tests/test_api/test_v2/test_zones.py index a12523c1..9622d1ba 100644 --- a/designate/tests/test_api/test_v2/test_zones.py +++ b/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 diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py index 70959c6b..ab673925 100644 --- a/designate/tests/test_central/test_service.py +++ b/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 diff --git a/designate/tests/test_mdns/test_handler.py b/designate/tests/test_mdns/test_handler.py index 2feed3c2..334fcade 100644 --- a/designate/tests/test_mdns/test_handler.py +++ b/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 diff --git a/designate/tests/test_network_api/test_neutron.py b/designate/tests/test_network_api/test_neutron.py index df93a8a0..246b3828 100644 --- a/designate/tests/test_network_api/test_neutron.py +++ b/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 diff --git a/designate/tests/test_pool_manager/test_service.py b/designate/tests/test_pool_manager/test_service.py index bfc3c304..dedf1fe3 100644 --- a/designate/tests/test_pool_manager/test_service.py +++ b/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 diff --git a/designate/tests/test_quota/test_quota.py b/designate/tests/test_quota/test_quota.py index e6e895fa..5d83e2fb 100644 --- a/designate/tests/test_quota/test_quota.py +++ b/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 diff --git a/designate/tests/test_storage/__init__.py b/designate/tests/test_storage/__init__.py index 59cbb07b..b7021bfc 100644 --- a/designate/tests/test_storage/__init__.py +++ b/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 diff --git a/designate/utils.py b/designate/utils.py index e8671879..3f644e12 100644 --- a/designate/utils.py +++ b/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