diff --git a/nova/db/api.py b/nova/db/api.py index c5d5083b7..d0f495619 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -27,8 +27,8 @@ these objects be simple dictionaries. """ -from oslo.config import cfg -from oslo.db import concurrency +from oslo_config import cfg +from oslo_db import concurrency from nova.cells import rpcapi as cells_rpcapi from nova.i18n import _LE diff --git a/nova/db/base.py b/nova/db/base.py index 2bbea94a2..28fdda0ca 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -16,8 +16,8 @@ """Base class for classes that need modular database access.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils db_driver_opt = cfg.StrOpt('db_driver', default='nova.db', diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ca72ba661..58aa1f901 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -26,12 +26,12 @@ import threading import time import uuid -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 sqlalchemyutils -from oslo.utils import excutils -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 sqlalchemyutils +from oslo_utils import excutils +from oslo_utils import timeutils import retrying import six from sqlalchemy import and_ diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index e3d66f16f..b0965a5f2 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -19,7 +19,7 @@ import os from migrate import exceptions as versioning_exceptions from migrate.versioning import api as versioning_api from migrate.versioning.repository import Repository -from oslo.db.sqlalchemy import utils as db_utils +from oslo_db.sqlalchemy import utils as db_utils import sqlalchemy from sqlalchemy.sql import null diff --git a/nova/db/sqlalchemy/types.py b/nova/db/sqlalchemy/types.py index 87408c33f..b216abbae 100644 --- a/nova/db/sqlalchemy/types.py +++ b/nova/db/sqlalchemy/types.py @@ -16,7 +16,7 @@ """Custom SQLAlchemy types.""" import netaddr -from oslo.utils import netutils +from oslo_utils import netutils from sqlalchemy.dialects import postgresql from sqlalchemy import types diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py index 0e4b335f9..a8dda6631 100644 --- a/nova/db/sqlalchemy/utils.py +++ b/nova/db/sqlalchemy/utils.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import utils as oslodbutils +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import utils as oslodbutils from sqlalchemy.exc import OperationalError from sqlalchemy.ext.compiler import compiles from sqlalchemy import MetaData diff --git a/nova/i18n.py b/nova/i18n.py index 9057911d9..05378e80c 100644 --- a/nova/i18n.py +++ b/nova/i18n.py @@ -18,11 +18,11 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html . """ -from oslo import i18n +import oslo_i18n DOMAIN = 'nova' -_translators = i18n.TranslatorFactory(domain=DOMAIN) +_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) # The primary translation function using the well-known name "_" _ = _translators.primary @@ -39,8 +39,8 @@ _LC = _translators.log_critical def translate(value, user_locale): - return i18n.translate(value, user_locale) + return oslo_i18n.translate(value, user_locale) def get_available_languages(): - return i18n.get_available_languages(DOMAIN) + return oslo_i18n.get_available_languages(DOMAIN) diff --git a/nova/scheduler/filters/aggregate_image_properties_isolation.py b/nova/scheduler/filters/aggregate_image_properties_isolation.py index 7ff9e4ff0..4fad37bd2 100644 --- a/nova/scheduler/filters/aggregate_image_properties_isolation.py +++ b/nova/scheduler/filters/aggregate_image_properties_isolation.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/test.py b/nova/test.py index 673e953ab..cb0a17b1e 100644 --- a/nova/test.py +++ b/nova/test.py @@ -31,10 +31,10 @@ import mock import os import fixtures -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.utils import timeutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_utils import timeutils from oslotest import moxstubout import six import testtools diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index 3e97c5279..eca825a6c 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -24,8 +24,8 @@ import uuid import warnings import fixtures -from oslo.config import cfg -from oslo.messaging import conffixture as messaging_conffixture +from oslo_config import cfg +from oslo_messaging import conffixture as messaging_conffixture from nova.db import migration from nova.db.sqlalchemy import api as session diff --git a/nova/tests/unit/objects/test_aggregate.py b/nova/tests/unit/objects/test_aggregate.py index f930b4481..476955aa2 100644 --- a/nova/tests/unit/objects/test_aggregate.py +++ b/nova/tests/unit/objects/test_aggregate.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/tests/unit/policy_fixture.py b/nova/tests/unit/policy_fixture.py index 29a808416..9883e1abd 100644 --- a/nova/tests/unit/policy_fixture.py +++ b/nova/tests/unit/policy_fixture.py @@ -15,8 +15,8 @@ import os import fixtures -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.openstack.common import policy as common_policy import nova.policy diff --git a/nova/utils.py b/nova/utils.py index 967f3b452..622f5a21d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -36,13 +36,13 @@ from xml.sax import saxutils import eventlet import netaddr -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils from oslo_concurrency import lockutils from oslo_concurrency import processutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova import exception