diff --git a/magnum/api/app.py b/magnum/api/app.py index f0241a5bf6..ad52173828 100644 --- a/magnum/api/app.py +++ b/magnum/api/app.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg import pecan from magnum.api import auth diff --git a/magnum/api/auth.py b/magnum/api/auth.py index 0dbef6cc11..f7c85a3c57 100644 --- a/magnum/api/auth.py +++ b/magnum/api/auth.py @@ -15,7 +15,7 @@ # under the License. """Access Control Lists (ACL's) control access the API server.""" -from oslo.config import cfg +from oslo_config import cfg from magnum.api.middleware import auth_token diff --git a/magnum/api/controllers/v1/types.py b/magnum/api/controllers/v1/types.py index 479488cb1a..263e5366d9 100644 --- a/magnum/api/controllers/v1/types.py +++ b/magnum/api/controllers/v1/types.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils import wsme from wsme import types as wtypes diff --git a/magnum/api/controllers/v1/utils.py b/magnum/api/controllers/v1/utils.py index 711fac5282..e009a4f0b5 100644 --- a/magnum/api/controllers/v1/utils.py +++ b/magnum/api/controllers/v1/utils.py @@ -14,7 +14,7 @@ # under the License. import jsonpatch -from oslo.config import cfg +from oslo_config import cfg import wsme from magnum.openstack.common._i18n import _ diff --git a/magnum/api/hooks.py b/magnum/api/hooks.py index b4f5bb2cf0..65081f1f4b 100644 --- a/magnum/api/hooks.py +++ b/magnum/api/hooks.py @@ -15,8 +15,8 @@ # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from pecan import hooks from magnum.common import context diff --git a/magnum/cmd/api.py b/magnum/cmd/api.py index d340b625cf..40325bf1ab 100644 --- a/magnum/cmd/api.py +++ b/magnum/cmd/api.py @@ -19,7 +19,7 @@ import os import sys from wsgiref import simple_server -from oslo.config import cfg +from oslo_config import cfg from magnum.api import app as api_app from magnum.common import service diff --git a/magnum/cmd/conductor.py b/magnum/cmd/conductor.py index 211ba96601..80815c18e2 100644 --- a/magnum/cmd/conductor.py +++ b/magnum/cmd/conductor.py @@ -18,7 +18,7 @@ import logging as std_logging import os import sys -from oslo.config import cfg +from oslo_config import cfg from magnum.common import rpc_service as service from magnum.conductor.handlers import bay_k8s_heat diff --git a/magnum/cmd/db_manage.py b/magnum/cmd/db_manage.py index 5bfb30d1cd..2c114fa7da 100644 --- a/magnum/cmd/db_manage.py +++ b/magnum/cmd/db_manage.py @@ -15,9 +15,9 @@ import os -from oslo.config import cfg -from oslo.db import options -from oslo.db.sqlalchemy.migration_cli import manager +from oslo_config import cfg +from oslo_db import options +from oslo_db.sqlalchemy.migration_cli import manager from magnum.openstack.common import log as logging diff --git a/magnum/common/clients.py b/magnum/common/clients.py index 5d5937d7ae..3bfad1f204 100644 --- a/magnum/common/clients.py +++ b/magnum/common/clients.py @@ -13,7 +13,7 @@ # under the License. from heatclient.v1 import client as heatclient -from oslo.config import cfg +from oslo_config import cfg from magnum.common import exception from magnum.common import magnum_keystoneclient diff --git a/magnum/common/config.py b/magnum/common/config.py index 86c2ab6a06..cd0ca61a05 100644 --- a/magnum/common/config.py +++ b/magnum/common/config.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from magnum.common import rpc from magnum import version diff --git a/magnum/common/exception.py b/magnum/common/exception.py index bfbaa155cb..9a02487f05 100644 --- a/magnum/common/exception.py +++ b/magnum/common/exception.py @@ -23,8 +23,8 @@ import sys import uuid from keystoneclient import exceptions as keystone_exceptions -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils import pecan import six import wsme diff --git a/magnum/common/magnum_keystoneclient.py b/magnum/common/magnum_keystoneclient.py index 833964f169..22eb34b5f0 100644 --- a/magnum/common/magnum_keystoneclient.py +++ b/magnum/common/magnum_keystoneclient.py @@ -16,8 +16,8 @@ import copy import keystoneclient.exceptions as kc_exception from keystoneclient.v3 import client as kc_v3 -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from magnum.common import context from magnum.common import exception diff --git a/magnum/common/paths.py b/magnum/common/paths.py index 47d9854771..fdd2a95d71 100644 --- a/magnum/common/paths.py +++ b/magnum/common/paths.py @@ -17,7 +17,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg PATH_OPTS = [ cfg.StrOpt('pybasedir', diff --git a/magnum/common/rpc.py b/magnum/common/rpc.py index f3ff4a7988..39a27b97c2 100644 --- a/magnum/common/rpc.py +++ b/magnum/common/rpc.py @@ -27,8 +27,8 @@ __all__ = [ 'TRANSPORT_ALIASES', ] -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from oslo_serialization import jsonutils from magnum.common import context as magnum_context diff --git a/magnum/common/rpc_service.py b/magnum/common/rpc_service.py index 855d4e0064..28be501ee0 100644 --- a/magnum/common/rpc_service.py +++ b/magnum/common/rpc_service.py @@ -15,8 +15,8 @@ """Common RPC service and API tools for Magnum.""" import eventlet -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging import magnum.common.context from magnum.objects import base as objects_base diff --git a/magnum/common/service.py b/magnum/common/service.py index c7eaeee155..d9f9b6cf78 100644 --- a/magnum/common/service.py +++ b/magnum/common/service.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from magnum.openstack.common import log as logging diff --git a/magnum/common/urlfetch.py b/magnum/common/urlfetch.py index 12fc99391d..2db12aba2f 100644 --- a/magnum/common/urlfetch.py +++ b/magnum/common/urlfetch.py @@ -13,7 +13,7 @@ """Utility for fetching a resource (e.g. a manifest) from a URL.""" -from oslo.config import cfg +from oslo_config import cfg import requests from requests import exceptions from six.moves import urllib diff --git a/magnum/common/utils.py b/magnum/common/utils.py index 134568e2cc..6e3e6f3122 100644 --- a/magnum/common/utils.py +++ b/magnum/common/utils.py @@ -29,9 +29,9 @@ import tempfile import uuid import netaddr -from oslo.config import cfg -from oslo.utils import excutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import excutils import paramiko import six diff --git a/magnum/conductor/api.py b/magnum/conductor/api.py index c20f5e0aea..275cc8c059 100644 --- a/magnum/conductor/api.py +++ b/magnum/conductor/api.py @@ -11,7 +11,7 @@ # limitations under the License. """API for interfacing with Magnum Backend.""" -from oslo.config import cfg +from oslo_config import cfg from magnum.common import rpc_service from magnum import objects diff --git a/magnum/conductor/config.py b/magnum/conductor/config.py index 205521b42a..06ed1dba9d 100644 --- a/magnum/conductor/config.py +++ b/magnum/conductor/config.py @@ -15,7 +15,7 @@ """Config options for Magnum Backend service.""" -from oslo.config import cfg +from oslo_config import cfg SERVICE_OPTS = [ cfg.StrOpt('topic', diff --git a/magnum/conductor/handlers/bay_k8s_heat.py b/magnum/conductor/handlers/bay_k8s_heat.py index 7fa172a8eb..5458156aa0 100644 --- a/magnum/conductor/handlers/bay_k8s_heat.py +++ b/magnum/conductor/handlers/bay_k8s_heat.py @@ -14,7 +14,7 @@ from heatclient.common import template_utils from heatclient import exc -from oslo.config import cfg +from oslo_config import cfg from magnum.common import clients from magnum.common import short_id diff --git a/magnum/conductor/handlers/common/docker_client.py b/magnum/conductor/handlers/common/docker_client.py index 97bff04638..bc3c9b1aec 100644 --- a/magnum/conductor/handlers/common/docker_client.py +++ b/magnum/conductor/handlers/common/docker_client.py @@ -14,7 +14,7 @@ from docker import client from docker import tls -from oslo.config import cfg +from oslo_config import cfg from magnum.openstack.common import log as logging diff --git a/magnum/conductor/handlers/docker_conductor.py b/magnum/conductor/handlers/docker_conductor.py index 49a1ca3dd4..08b3f4b529 100644 --- a/magnum/conductor/handlers/docker_conductor.py +++ b/magnum/conductor/handlers/docker_conductor.py @@ -13,7 +13,7 @@ """Magnum Docker RPC handler.""" from docker import errors -from oslo.config import cfg +from oslo_config import cfg from magnum.common import docker_utils from magnum.conductor.handlers.common import docker_client diff --git a/magnum/conductor/handlers/kube.py b/magnum/conductor/handlers/kube.py index 1d97e93801..f78a3867a0 100644 --- a/magnum/conductor/handlers/kube.py +++ b/magnum/conductor/handlers/kube.py @@ -12,7 +12,7 @@ """Magnum Kubernetes RPC handler.""" -from oslo.config import cfg +from oslo_config import cfg from magnum.common import clients from magnum.conductor.handlers.common import kube_utils diff --git a/magnum/config.py b/magnum/config.py index 4d2a5e9f4a..7c82101cdb 100644 --- a/magnum/config.py +++ b/magnum/config.py @@ -14,7 +14,7 @@ """Magnum specific config handling.""" -from oslo.config import cfg +from oslo_config import cfg from magnum import version diff --git a/magnum/db/api.py b/magnum/db/api.py index 49fb73488e..3f15480ac4 100644 --- a/magnum/db/api.py +++ b/magnum/db/api.py @@ -19,8 +19,8 @@ Base classes for storage engines import abc -from oslo.config import cfg -from oslo.db import api as db_api +from oslo_config import cfg +from oslo_db import api as db_api import six diff --git a/magnum/db/migration.py b/magnum/db/migration.py index ba294c1cc3..2e8df27847 100644 --- a/magnum/db/migration.py +++ b/magnum/db/migration.py @@ -16,7 +16,7 @@ """Database setup and migration commands.""" -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver _IMPL = None @@ -25,7 +25,7 @@ _IMPL = None def get_backend(): global _IMPL if not _IMPL: - cfg.CONF.import_opt('backend', 'oslo.db.options', group='database') + cfg.CONF.import_opt('backend', 'oslo_db.options', group='database') _IMPL = driver.DriverManager("magnum.database.migration_backend", cfg.CONF.database.backend).driver return _IMPL diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py index 83ea22acd8..752a6b29dc 100644 --- a/magnum/db/sqlalchemy/api.py +++ b/magnum/db/sqlalchemy/api.py @@ -16,11 +16,11 @@ """SQLAlchemy storage backend.""" -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import session as db_session -from oslo.db.sqlalchemy import utils as db_utils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import session as db_session +from oslo_db.sqlalchemy import utils as db_utils +from oslo_utils import timeutils from sqlalchemy.orm.exc import NoResultFound from magnum.common import exception diff --git a/magnum/db/sqlalchemy/migration.py b/magnum/db/sqlalchemy/migration.py index f2bb1e97b5..5f605ab9dc 100644 --- a/magnum/db/sqlalchemy/migration.py +++ b/magnum/db/sqlalchemy/migration.py @@ -19,7 +19,7 @@ import os import alembic from alembic import config as alembic_config import alembic.migration as alembic_migration -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from magnum.db.sqlalchemy import api as sqla_api from magnum.db.sqlalchemy import models diff --git a/magnum/db/sqlalchemy/models.py b/magnum/db/sqlalchemy/models.py index 9b134a5702..90b1ee9b75 100644 --- a/magnum/db/sqlalchemy/models.py +++ b/magnum/db/sqlalchemy/models.py @@ -20,9 +20,9 @@ SQLAlchemy models for container service import json -from oslo.config import cfg -from oslo.db import options as db_options -from oslo.db.sqlalchemy import models +from oslo_config import cfg +from oslo_db import options as db_options +from oslo_db.sqlalchemy import models import six.moves.urllib.parse as urlparse from sqlalchemy import Column from sqlalchemy.ext.declarative import declarative_base diff --git a/magnum/objects/base.py b/magnum/objects/base.py index d198e6cae7..a71193b40d 100644 --- a/magnum/objects/base.py +++ b/magnum/objects/base.py @@ -17,8 +17,8 @@ import collections import copy -from oslo import messaging from oslo_context import context +import oslo_messaging as messaging import six from magnum.common import exception diff --git a/magnum/objects/utils.py b/magnum/objects/utils.py index 46a7e3611b..f42734a174 100644 --- a/magnum/objects/utils.py +++ b/magnum/objects/utils.py @@ -19,7 +19,7 @@ import datetime import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import six from magnum.openstack.common._i18n import _ diff --git a/magnum/openstack/common/eventlet_backdoor.py b/magnum/openstack/common/eventlet_backdoor.py index 9ce48d344b..033e442025 100644 --- a/magnum/openstack/common/eventlet_backdoor.py +++ b/magnum/openstack/common/eventlet_backdoor.py @@ -28,7 +28,7 @@ import traceback import eventlet import eventlet.backdoor import greenlet -from oslo.config import cfg +from oslo_config import cfg from magnum.openstack.common._i18n import _LI from magnum.openstack.common import log as logging diff --git a/magnum/openstack/common/log.py b/magnum/openstack/common/log.py index eb24aaca6e..c41d55e479 100644 --- a/magnum/openstack/common/log.py +++ b/magnum/openstack/common/log.py @@ -38,9 +38,9 @@ import socket import sys import traceback -from oslo.config import cfg +from oslo_config import cfg from oslo_serialization import jsonutils -from oslo.utils import importutils +from oslo_utils import importutils import six from six import moves diff --git a/magnum/openstack/common/periodic_task.py b/magnum/openstack/common/periodic_task.py index 32a1d424d9..cec3482fcc 100644 --- a/magnum/openstack/common/periodic_task.py +++ b/magnum/openstack/common/periodic_task.py @@ -15,7 +15,7 @@ import copy import random import time -from oslo.config import cfg +from oslo_config import cfg import six from magnum.openstack.common._i18n import _, _LE, _LI diff --git a/magnum/openstack/common/service.py b/magnum/openstack/common/service.py index 6c5c6fad82..2d0a71c80b 100644 --- a/magnum/openstack/common/service.py +++ b/magnum/openstack/common/service.py @@ -35,7 +35,7 @@ except ImportError: import eventlet from eventlet import event -from oslo.config import cfg +from oslo_config import cfg from magnum.openstack.common import eventlet_backdoor from magnum.openstack.common._i18n import _LE, _LI, _LW diff --git a/magnum/tests/__init__.py b/magnum/tests/__init__.py index df75ccae5c..d39e171312 100644 --- a/magnum/tests/__init__.py +++ b/magnum/tests/__init__.py @@ -13,7 +13,7 @@ import os import unittest -from oslo.config import cfg +from oslo_config import cfg import pecan from pecan import testing diff --git a/magnum/tests/api/base.py b/magnum/tests/api/base.py index d371d496c9..d3b126570c 100644 --- a/magnum/tests/api/base.py +++ b/magnum/tests/api/base.py @@ -22,7 +22,7 @@ # NOTE(deva): import auth_token so we can override a config option from keystonemiddleware import auth_token # noqa -from oslo.config import cfg +from oslo_config import cfg import pecan import pecan.testing from six.moves.urllib import parse as urlparse diff --git a/magnum/tests/api/controllers/v1/test_bay.py b/magnum/tests/api/controllers/v1/test_bay.py index 64337c6cf4..c26a650aa7 100644 --- a/magnum/tests/api/controllers/v1/test_bay.py +++ b/magnum/tests/api/controllers/v1/test_bay.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -130,7 +130,7 @@ class TestPatch(api_base.FunctionalTest): name='bay_example_A', node_count=3) - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_replace_ok(self, mock_utcnow): name = 'bay_example_B' test_time = datetime.datetime(2000, 1, 1, 0, 0) @@ -293,7 +293,7 @@ class TestPost(api_base.FunctionalTest): bay.create() return bay - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_bay(self, mock_utcnow): bdict = apiutils.bay_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_baymodel.py b/magnum/tests/api/controllers/v1/test_baymodel.py index 4e65c59f12..58e1ae6544 100644 --- a/magnum/tests/api/controllers/v1/test_baymodel.py +++ b/magnum/tests/api/controllers/v1/test_baymodel.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -138,7 +138,7 @@ class TestPatch(api_base.FunctionalTest): self.assertEqual('application/json', response.content_type) self.assertTrue(response.json['error_message']) - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_replace_singular(self, mock_utcnow): name = 'bay_model_example_B' test_time = datetime.datetime(2000, 1, 1, 0, 0) @@ -249,7 +249,7 @@ class TestPost(api_base.FunctionalTest): def setUp(self): super(TestPost, self).setUp() - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_baymodel(self, mock_utcnow): cdict = apiutils.baymodel_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_node.py b/magnum/tests/api/controllers/v1/test_node.py index 377952d9f5..27cf2a81a9 100644 --- a/magnum/tests/api/controllers/v1/test_node.py +++ b/magnum/tests/api/controllers/v1/test_node.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -120,7 +120,7 @@ class TestPatch(api_base.FunctionalTest): super(TestPatch, self).setUp() self.node = obj_utils.create_test_node(self.context, image_id='Fedora') - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_replace_ok(self, mock_utcnow): test_time = datetime.datetime(2000, 1, 1, 0, 0) mock_utcnow.return_value = test_time @@ -199,7 +199,7 @@ class TestPatch(api_base.FunctionalTest): class TestPost(api_base.FunctionalTest): - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_node(self, mock_utcnow): node_dict = apiutils.node_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_pod.py b/magnum/tests/api/controllers/v1/test_pod.py index 1ffba8ad89..fe379671f8 100644 --- a/magnum/tests/api/controllers/v1/test_pod.py +++ b/magnum/tests/api/controllers/v1/test_pod.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -129,7 +129,7 @@ class TestPatch(api_base.FunctionalTest): desc='pod_example_A_desc', status='Running') - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_replace_ok(self, mock_utcnow): test_time = datetime.datetime(2000, 1, 1, 0, 0) mock_utcnow.return_value = test_time @@ -293,7 +293,7 @@ class TestPost(api_base.FunctionalTest): pod.create() return pod - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_pod(self, mock_utcnow): pdict = apiutils.pod_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_replicationcontroller.py b/magnum/tests/api/controllers/v1/test_replicationcontroller.py index c757231333..6110371883 100644 --- a/magnum/tests/api/controllers/v1/test_replicationcontroller.py +++ b/magnum/tests/api/controllers/v1/test_replicationcontroller.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -129,7 +129,7 @@ class TestPatch(api_base.FunctionalTest): self.rc = obj_utils.create_test_rc(self.context, images=['rc_example_A_image']) - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_replace_ok(self, mock_utcnow): test_time = datetime.datetime(2000, 1, 1, 0, 0) mock_utcnow.return_value = test_time @@ -269,7 +269,7 @@ class TestPost(api_base.FunctionalTest): rc.create(self.context) return rc - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_rc(self, mock_utcnow): rc_dict = apiutils.rc_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_service.py b/magnum/tests/api/controllers/v1/test_service.py index 99970d2f66..b1cd253336 100644 --- a/magnum/tests/api/controllers/v1/test_service.py +++ b/magnum/tests/api/controllers/v1/test_service.py @@ -13,8 +13,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from wsme import types as wtypes @@ -225,7 +225,7 @@ class TestPost(api_base.FunctionalTest): service.create() return service - @mock.patch.object(timeutils, 'utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_create_service(self, mock_utcnow): sdict = apiutils.service_post_data() test_time = datetime.datetime(2000, 1, 1, 0, 0) diff --git a/magnum/tests/api/controllers/v1/test_utils.py b/magnum/tests/api/controllers/v1/test_utils.py index 9cedb8cd34..029a95c3bc 100644 --- a/magnum/tests/api/controllers/v1/test_utils.py +++ b/magnum/tests/api/controllers/v1/test_utils.py @@ -18,7 +18,7 @@ import wsme from magnum.api.controllers.v1 import utils from magnum.tests.api import base -from oslo.config import cfg +from oslo_config import cfg CONF = cfg.CONF diff --git a/magnum/tests/api/test_auth.py b/magnum/tests/api/test_auth.py index 775714b1a7..168b091dbb 100644 --- a/magnum/tests/api/test_auth.py +++ b/magnum/tests/api/test_auth.py @@ -14,7 +14,7 @@ # limitations under the License. import mock -from oslo.config import fixture +from oslo_config import fixture from magnum.api import auth from magnum.tests import base diff --git a/magnum/tests/api/test_hooks.py b/magnum/tests/api/test_hooks.py index 1e51a14372..7c21860b48 100644 --- a/magnum/tests/api/test_hooks.py +++ b/magnum/tests/api/test_hooks.py @@ -16,8 +16,8 @@ import json import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from magnum.api.controllers import root from magnum.api import hooks diff --git a/magnum/tests/base.py b/magnum/tests/base.py index 3862d77dd5..8a93d067a1 100644 --- a/magnum/tests/base.py +++ b/magnum/tests/base.py @@ -19,7 +19,7 @@ import copy import os import mock -from oslo.config import cfg +from oslo_config import cfg from oslotest import base import pecan from pecan import testing diff --git a/magnum/tests/common/test_magnum_keystoneclient.py b/magnum/tests/common/test_magnum_keystoneclient.py index c6960201ad..f24d29ff58 100644 --- a/magnum/tests/common/test_magnum_keystoneclient.py +++ b/magnum/tests/common/test_magnum_keystoneclient.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg cfg.CONF.import_group('keystone_authtoken', 'keystonemiddleware.auth_token') diff --git a/magnum/tests/common/test_urlfetch.py b/magnum/tests/common/test_urlfetch.py index ca7eed4417..b035a1bb7e 100644 --- a/magnum/tests/common/test_urlfetch.py +++ b/magnum/tests/common/test_urlfetch.py @@ -12,7 +12,7 @@ import mock from mock import patch -from oslo.config import cfg +from oslo_config import cfg from magnum.common import urlfetch from magnum.tests import base diff --git a/magnum/tests/common/test_utils.py b/magnum/tests/common/test_utils.py index 1932128135..e29eaac053 100644 --- a/magnum/tests/common/test_utils.py +++ b/magnum/tests/common/test_utils.py @@ -23,8 +23,8 @@ import uuid import mock import netaddr -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg import six import six.moves.builtins as __builtin__ diff --git a/magnum/tests/conductor/handlers/test_kube.py b/magnum/tests/conductor/handlers/test_kube.py index 4aebfd10c8..c40d695eb8 100644 --- a/magnum/tests/conductor/handlers/test_kube.py +++ b/magnum/tests/conductor/handlers/test_kube.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from magnum.conductor.handlers import kube from magnum import objects diff --git a/magnum/tests/conf_fixture.py b/magnum/tests/conf_fixture.py index 10312140c5..9d7f0b1066 100644 --- a/magnum/tests/conf_fixture.py +++ b/magnum/tests/conf_fixture.py @@ -15,7 +15,7 @@ # under the License. import fixtures -from oslo.config import cfg +from oslo_config import cfg from magnum.common import config diff --git a/magnum/tests/db/base.py b/magnum/tests/db/base.py index b1c7b1029c..23e8873c18 100644 --- a/magnum/tests/db/base.py +++ b/magnum/tests/db/base.py @@ -19,7 +19,7 @@ import os import shutil import fixtures -from oslo.config import cfg +from oslo_config import cfg from magnum.common import paths from magnum.db import api as dbapi diff --git a/magnum/tests/db/sqlalchemy/test_types.py b/magnum/tests/db/sqlalchemy/test_types.py index 82dd9452d9..193154a849 100644 --- a/magnum/tests/db/sqlalchemy/test_types.py +++ b/magnum/tests/db/sqlalchemy/test_types.py @@ -12,7 +12,7 @@ """Tests for custom SQLAlchemy types via Magnum DB.""" -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from magnum.common import utils as magnum_utils from magnum.db import api as dbapi diff --git a/magnum/tests/objects/test_objects.py b/magnum/tests/objects/test_objects.py index 2f9432e940..fb84252728 100644 --- a/magnum/tests/objects/test_objects.py +++ b/magnum/tests/objects/test_objects.py @@ -17,7 +17,7 @@ import gettext import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import six from magnum.common import context diff --git a/magnum/tests/utils.py b/magnum/tests/utils.py index d6ee982388..b9a56f1eb1 100644 --- a/magnum/tests/utils.py +++ b/magnum/tests/utils.py @@ -15,8 +15,8 @@ import tempfile import fixtures -from oslo.config import cfg -from oslo.db import options +from oslo_config import cfg +from oslo_db import options from magnum.common import context from magnum.db import api as db_api