diff --git a/contrib/archive/backends/impl_ipa/__init__.py b/contrib/archive/backends/impl_ipa/__init__.py index c1576c413..208ee4269 100644 --- a/contrib/archive/backends/impl_ipa/__init__.py +++ b/contrib/archive/backends/impl_ipa/__init__.py @@ -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 diff --git a/contrib/archive/backends/impl_multi.py b/contrib/archive/backends/impl_multi.py index 38654a014..3a65a9327 100644 --- a/contrib/archive/backends/impl_multi.py +++ b/contrib/archive/backends/impl_multi.py @@ -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 diff --git a/contrib/archive/backends/impl_nsd4slave.py b/contrib/archive/backends/impl_nsd4slave.py index 15e98839b..e48e780ca 100644 --- a/contrib/archive/backends/impl_nsd4slave.py +++ b/contrib/archive/backends/impl_nsd4slave.py @@ -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 diff --git a/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py b/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py index 5099646a8..666c62cf0 100644 --- a/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py +++ b/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.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.objects import Record diff --git a/contrib/ipaextractor.py b/contrib/ipaextractor.py index 806a13474..0658d74d4 100644 --- a/contrib/ipaextractor.py +++ b/contrib/ipaextractor.py @@ -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 diff --git a/contrib/tempest/config.py b/contrib/tempest/config.py index cc8399aa8..9de08926c 100644 --- a/contrib/tempest/config.py +++ b/contrib/tempest/config.py @@ -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 diff --git a/designate/__init__.py b/designate/__init__.py index 90b46cf66..6a6e50fd0 100644 --- a/designate/__init__.py +++ b/designate/__init__.py @@ -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([ diff --git a/designate/api/middleware.py b/designate/api/middleware.py index 329f6c83b..99dbd6568 100644 --- a/designate/api/middleware.py +++ b/designate/api/middleware.py @@ -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 diff --git a/designate/api/v1/extensions/diagnostics.py b/designate/api/v1/extensions/diagnostics.py index e886e0a7c..a2c280075 100644 --- a/designate/api/v1/extensions/diagnostics.py +++ b/designate/api/v1/extensions/diagnostics.py @@ -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 diff --git a/designate/central/rpcapi.py b/designate/central/rpcapi.py index 1b1cc205f..03b94688d 100644 --- a/designate/central/rpcapi.py +++ b/designate/central/rpcapi.py @@ -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 diff --git a/designate/central/service.py b/designate/central/service.py index fa071a123..8d263db07 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -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 diff --git a/designate/i18n.py b/designate/i18n.py index 4004c4f69..46cb015ac 100644 --- a/designate/i18n.py +++ b/designate/i18n.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 import i18n +import oslo_i18n as i18n _translators = i18n.TranslatorFactory(domain='designate') diff --git a/designate/mdns/base.py b/designate/mdns/base.py index 17206b30c..2e6354be6 100644 --- a/designate/mdns/base.py +++ b/designate/mdns/base.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 import messaging +import oslo_messaging as messaging from oslo_config import cfg from oslo_log import log as logging diff --git a/designate/mdns/rpcapi.py b/designate/mdns/rpcapi.py index 40261149a..a8f31eaa6 100644 --- a/designate/mdns/rpcapi.py +++ b/designate/mdns/rpcapi.py @@ -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 diff --git a/designate/pool_manager/rpcapi.py b/designate/pool_manager/rpcapi.py index b867678ef..01f866dad 100644 --- a/designate/pool_manager/rpcapi.py +++ b/designate/pool_manager/rpcapi.py @@ -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 diff --git a/designate/pool_manager/service.py b/designate/pool_manager/service.py index c28cd8794..8d44b974d 100644 --- a/designate/pool_manager/service.py +++ b/designate/pool_manager/service.py @@ -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 diff --git a/designate/rpc.py b/designate/rpc.py index d2f8641c7..b13c30b64 100644 --- a/designate/rpc.py +++ b/designate/rpc.py @@ -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 diff --git a/designate/service.py b/designate/service.py index 56a7ed6db..6b02f306b 100644 --- a/designate/service.py +++ b/designate/service.py @@ -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 diff --git a/designate/sink/service.py b/designate/sink/service.py index e111f6cf8..8c21ec3cd 100644 --- a/designate/sink/service.py +++ b/designate/sink/service.py @@ -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 diff --git a/designate/tests/test_api/test_v1/test_domains.py b/designate/tests/test_api/test_v1/test_domains.py index b9c582cc1..087172788 100644 --- a/designate/tests/test_api/test_v1/test_domains.py +++ b/designate/tests/test_api/test_v1/test_domains.py @@ -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 diff --git a/designate/tests/test_api/test_v1/test_records.py b/designate/tests/test_api/test_v1/test_records.py index 2248a2840..d14699471 100644 --- a/designate/tests/test_api/test_v1/test_records.py +++ b/designate/tests/test_api/test_v1/test_records.py @@ -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 diff --git a/designate/tests/test_api/test_v1/test_servers.py b/designate/tests/test_api/test_v1/test_servers.py index 88455c0ad..9e6e3a717 100644 --- a/designate/tests/test_api/test_v1/test_servers.py +++ b/designate/tests/test_api/test_v1/test_servers.py @@ -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 diff --git a/designate/tests/test_api/test_v2/test_recordsets.py b/designate/tests/test_api/test_v2/test_recordsets.py index 84f2476e2..4b751754d 100644 --- a/designate/tests/test_api/test_v2/test_recordsets.py +++ b/designate/tests/test_api/test_v2/test_recordsets.py @@ -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 diff --git a/designate/tests/test_api/test_v2/test_tsigkeys.py b/designate/tests/test_api/test_v2/test_tsigkeys.py index 96347bd0c..750e1dbf3 100644 --- a/designate/tests/test_api/test_v2/test_tsigkeys.py +++ b/designate/tests/test_api/test_v2/test_tsigkeys.py @@ -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 diff --git a/designate/tests/test_api/test_v2/test_zones.py b/designate/tests/test_api/test_v2/test_zones.py index 9622d1bae..6fb0cccb1 100644 --- a/designate/tests/test_api/test_v2/test_zones.py +++ b/designate/tests/test_api/test_v2/test_zones.py @@ -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 diff --git a/designate/tests/test_pool_manager/test_rpcapi.py b/designate/tests/test_pool_manager/test_rpcapi.py index 626d007ce..c0205c1bb 100644 --- a/designate/tests/test_pool_manager/test_rpcapi.py +++ b/designate/tests/test_pool_manager/test_rpcapi.py @@ -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 diff --git a/designate/tests/test_pool_manager/test_service.py b/designate/tests/test_pool_manager/test_service.py index dedf1fe32..8426e68bd 100644 --- a/designate/tests/test_pool_manager/test_service.py +++ b/designate/tests/test_pool_manager/test_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 import messaging +import oslo_messaging as messaging from oslo_config import cfg from mock import call from mock import patch diff --git a/functionaltests/common/config.py b/functionaltests/common/config.py index 0519f13a8..9723c7ac2 100644 --- a/functionaltests/common/config.py +++ b/functionaltests/common/config.py @@ -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"