From 21a14acba47efc0f915aaec01dd0d595a880367d Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 28 Apr 2015 20:21:22 +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: I975592f3694be42d52685ebf606f6d3012caf1a8 --- murano/api/middleware/context.py | 2 +- murano/api/middleware/fault.py | 2 +- murano/api/middleware/version_negotiation.py | 2 +- murano/api/v1/catalog.py | 4 ++-- murano/api/v1/environments.py | 2 +- murano/api/v1/templates.py | 2 +- murano/api/versions.py | 4 ++-- murano/cmd/db_manage.py | 4 ++-- murano/cmd/manage.py | 4 ++-- murano/common/auth_utils.py | 4 ++-- murano/common/config.py | 2 +- murano/common/engine.py | 6 +++--- murano/common/messaging/message.py | 2 +- murano/common/messaging/mqclient.py | 2 +- murano/common/policy.py | 2 +- murano/common/rpc.py | 6 +++--- murano/common/server.py | 8 ++++---- murano/common/wsgi.py | 4 ++-- murano/db/catalog/api.py | 4 ++-- .../alembic_migrations/versions/001_inital_version.py | 2 +- murano/db/models.py | 4 ++-- murano/db/services/core_services.py | 2 +- murano/db/services/environment_templates.py | 2 +- murano/db/services/instances.py | 4 ++-- murano/db/session.py | 8 ++++---- murano/db/sqla/types.py | 2 +- murano/engine/client_manager.py | 2 +- murano/engine/package_class_loader.py | 2 +- murano/engine/system/instance_reporter.py | 2 +- murano/engine/system/net_explorer.py | 2 +- murano/engine/system/status_reporter.py | 2 +- murano/openstack/common/_i18n.py | 4 ++-- murano/openstack/common/eventlet_backdoor.py | 2 +- murano/openstack/common/fileutils.py | 2 +- murano/openstack/common/lockutils.py | 2 +- murano/openstack/common/log.py | 6 +++--- murano/openstack/common/policy.py | 4 ++-- murano/openstack/common/processutils.py | 2 +- murano/openstack/common/service.py | 2 +- murano/openstack/common/sslutils.py | 2 +- murano/tests/functional/engine/config.py | 2 +- murano/tests/unit/api/base.py | 2 +- murano/tests/unit/api/v1/test_actions.py | 2 +- murano/tests/unit/api/v1/test_catalog.py | 2 +- murano/tests/unit/api/v1/test_env_templates.py | 4 ++-- murano/tests/unit/api/v1/test_environments.py | 4 ++-- murano/tests/unit/api/v1/test_sessions.py | 2 +- murano/tests/unit/base.py | 2 +- murano/tests/unit/db/migration/test_migrations.py | 6 +++--- murano/tests/unit/db/migration/test_migrations_base.py | 2 +- murano/tests/unit/db/services/test_environments.py | 2 +- murano/tests/unit/db/test_catalog.py | 2 +- 52 files changed, 79 insertions(+), 79 deletions(-) diff --git a/murano/api/middleware/context.py b/murano/api/middleware/context.py index 57c587753..abe78f62c 100644 --- a/murano/api/middleware/context.py +++ b/murano/api/middleware/context.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 murano.common.i18n import _ from murano.common import wsgi diff --git a/murano/api/middleware/fault.py b/murano/api/middleware/fault.py index 278c73fe4..dcdfc173e 100644 --- a/murano/api/middleware/fault.py +++ b/murano/api/middleware/fault.py @@ -17,7 +17,7 @@ Cinder's faultwrapper import sys import traceback -from oslo.config import cfg +from oslo_config import cfg import webob from murano.common import wsgi diff --git a/murano/api/middleware/version_negotiation.py b/murano/api/middleware/version_negotiation.py index 36050537a..ae825e079 100644 --- a/murano/api/middleware/version_negotiation.py +++ b/murano/api/middleware/version_negotiation.py @@ -18,7 +18,7 @@ and/or Accept headers and attempts to negotiate an API controller to return """ -from oslo.config import cfg +from oslo_config import cfg from murano.api import versions from murano.common import wsgi diff --git a/murano/api/v1/catalog.py b/murano/api/v1/catalog.py index 5c7b39022..04c079a2c 100644 --- a/murano/api/v1/catalog.py +++ b/murano/api/v1/catalog.py @@ -18,8 +18,8 @@ import os import tempfile import jsonschema -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc from webob import exc import murano.api.v1 diff --git a/murano/api/v1/environments.py b/murano/api/v1/environments.py index 2ee8cc0f3..57ba93645 100644 --- a/murano/api/v1/environments.py +++ b/murano/api/v1/environments.py @@ -14,7 +14,7 @@ import re -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from sqlalchemy import desc from webob import exc diff --git a/murano/api/v1/templates.py b/murano/api/v1/templates.py index 730719aeb..691a33aff 100644 --- a/murano/api/v1/templates.py +++ b/murano/api/v1/templates.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc from webob import exc from murano.api.v1 import environments as envs_api diff --git a/murano/api/versions.py b/murano/api/versions.py index df94bc543..f602f90ed 100644 --- a/murano/api/versions.py +++ b/murano/api/versions.py @@ -14,8 +14,8 @@ import httplib -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob.dec from murano.common import wsgi diff --git a/murano/cmd/db_manage.py b/murano/cmd/db_manage.py index 4105580b6..aec6c4fdb 100644 --- a/murano/cmd/db_manage.py +++ b/murano/cmd/db_manage.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db import options +from oslo_config import cfg +from oslo_db import options from murano.db.migration import migration from murano.openstack.common import log diff --git a/murano/cmd/manage.py b/murano/cmd/manage.py index 45f3fb6c4..172e3a831 100644 --- a/murano/cmd/manage.py +++ b/murano/cmd/manage.py @@ -21,8 +21,8 @@ import sys import traceback -from oslo.config import cfg -from oslo.db import exception as db_exception +from oslo_config import cfg +from oslo_db import exception as db_exception from murano.common import consts from murano.db.catalog import api as db_catalog_api diff --git a/murano/common/auth_utils.py b/murano/common/auth_utils.py index 90494f200..95224aa1d 100644 --- a/murano/common/auth_utils.py +++ b/murano/common/auth_utils.py @@ -14,8 +14,8 @@ from keystoneclient.v3 import client as ks_client -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils def get_client(token, tenant_id): diff --git a/murano/common/config.py b/murano/common/config.py index df7d13426..2d731827b 100644 --- a/murano/common/config.py +++ b/murano/common/config.py @@ -22,7 +22,7 @@ import logging.handlers import os import sys -from oslo.config import cfg +from oslo_config import cfg from paste import deploy from murano.common.i18n import _ diff --git a/murano/common/engine.py b/murano/common/engine.py index ed8a8adfd..275abaaf1 100755 --- a/murano/common/engine.py +++ b/murano/common/engine.py @@ -17,9 +17,9 @@ import traceback import uuid import eventlet.debug -from oslo import messaging -from oslo.messaging import target -from oslo.serialization import jsonutils +import oslo_messaging as messaging +from oslo_messaging import target +from oslo_serialization import jsonutils from murano.common import auth_utils from murano.common import config diff --git a/murano/common/messaging/message.py b/murano/common/messaging/message.py index 9b026a2b1..b234df384 100644 --- a/murano/common/messaging/message.py +++ b/murano/common/messaging/message.py @@ -15,7 +15,7 @@ import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils log = logging.getLogger("murano-common.messaging") diff --git a/murano/common/messaging/mqclient.py b/murano/common/messaging/mqclient.py index 35473c845..52d7f3095 100644 --- a/murano/common/messaging/mqclient.py +++ b/murano/common/messaging/mqclient.py @@ -18,7 +18,7 @@ import ssl as ssl_module from eventlet import patcher kombu = patcher.import_patched('kombu') -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from subscription import Subscription diff --git a/murano/common/policy.py b/murano/common/policy.py index e246da450..218c4463e 100644 --- a/murano/common/policy.py +++ b/murano/common/policy.py @@ -14,7 +14,7 @@ # Based on designate/policy.py -from oslo.config import cfg +from oslo_config import cfg from webob import exc as exceptions from murano.common.i18n import _ diff --git a/murano/common/rpc.py b/murano/common/rpc.py index 1ade41495..a97dbe7e0 100644 --- a/murano/common/rpc.py +++ b/murano/common/rpc.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging -from oslo.messaging import rpc -from oslo.messaging import target +import oslo_messaging as messaging +from oslo_messaging import rpc +from oslo_messaging import target from murano.common import config diff --git a/murano/common/server.py b/murano/common/server.py index 6776e2fc8..344cc76d4 100644 --- a/murano/common/server.py +++ b/murano/common/server.py @@ -14,10 +14,10 @@ import uuid -from oslo import messaging -from oslo.messaging.notify import dispatcher as oslo_dispatcher -from oslo.messaging import target -from oslo.utils import timeutils +import oslo_messaging as messaging +from oslo_messaging.notify import dispatcher as oslo_dispatcher +from oslo_messaging import target +from oslo_utils import timeutils from sqlalchemy import desc from murano.common import config diff --git a/murano/common/wsgi.py b/murano/common/wsgi.py index b641ba6b2..38e9e15f6 100644 --- a/murano/common/wsgi.py +++ b/murano/common/wsgi.py @@ -28,8 +28,8 @@ import eventlet eventlet.patcher.monkey_patch(all=False, socket=True) import eventlet.wsgi import jsonschema -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import routes import routes.middleware import webob.dec diff --git a/murano/db/catalog/api.py b/murano/db/catalog/api.py index 37488251d..b6589199c 100644 --- a/murano/db/catalog/api.py +++ b/murano/db/catalog/api.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db.sqlalchemy import utils +from oslo_config import cfg +from oslo_db.sqlalchemy import utils import sqlalchemy as sa from sqlalchemy import or_ from sqlalchemy.orm import attributes diff --git a/murano/db/migration/alembic_migrations/versions/001_inital_version.py b/murano/db/migration/alembic_migrations/versions/001_inital_version.py index 33d3dea9e..5f173edcb 100644 --- a/murano/db/migration/alembic_migrations/versions/001_inital_version.py +++ b/murano/db/migration/alembic_migrations/versions/001_inital_version.py @@ -26,7 +26,7 @@ down_revision = None import uuid from alembic import op -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.sql.expression import table as sa_table diff --git a/murano/db/models.py b/murano/db/models.py index a52e36ae8..ed87fc473 100644 --- a/murano/db/models.py +++ b/murano/db/models.py @@ -15,8 +15,8 @@ """ SQLAlchemy models for murano data """ -from oslo.db.sqlalchemy import models -from oslo.utils import timeutils +from oslo_db.sqlalchemy import models +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.ext import declarative from sqlalchemy import orm as sa_orm diff --git a/murano/db/services/core_services.py b/murano/db/services/core_services.py index 87144612b..1fe802de8 100644 --- a/murano/db/services/core_services.py +++ b/murano/db/services/core_services.py @@ -14,7 +14,7 @@ import types -from oslo.utils import timeutils +from oslo_utils import timeutils from webob import exc from murano.common.i18n import _ diff --git a/murano/db/services/environment_templates.py b/murano/db/services/environment_templates.py index fbed3cf4c..4ab88c0d8 100644 --- a/murano/db/services/environment_templates.py +++ b/murano/db/services/environment_templates.py @@ -17,7 +17,7 @@ from murano.db import models from murano.db import session as db_session from murano.openstack.common import log as logging -from oslo.db import exception as db_exc +from oslo_db import exception as db_exc LOG = logging.getLogger(__name__) diff --git a/murano/db/services/instances.py b/murano/db/services/instances.py index caf0830c3..6ed20e90b 100644 --- a/murano/db/services/instances.py +++ b/murano/db/services/instances.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception -from oslo.utils import timeutils +from oslo_db import exception +from oslo_utils import timeutils import sqlalchemy from sqlalchemy.sql import func diff --git a/murano/db/session.py b/murano/db/session.py index 5e2b93021..856d16fd2 100644 --- a/murano/db/session.py +++ b/murano/db/session.py @@ -15,10 +15,10 @@ """Session management functions.""" import threading -from oslo.db import exception -from oslo.db import options -from oslo.db.sqlalchemy import session as db_session -from oslo.utils import timeutils +from oslo_db import exception +from oslo_db import options +from oslo_db.sqlalchemy import session as db_session +from oslo_utils import timeutils from murano.common import config from murano.db.models import Lock diff --git a/murano/db/sqla/types.py b/murano/db/sqla/types.py index e4b96cf1c..77e4e3fd5 100644 --- a/murano/db/sqla/types.py +++ b/murano/db/sqla/types.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import sqlalchemy as sa from sqlalchemy.dialects import mysql diff --git a/murano/engine/client_manager.py b/murano/engine/client_manager.py index fd9bc6ec2..be3dacfd9 100644 --- a/murano/engine/client_manager.py +++ b/murano/engine/client_manager.py @@ -17,7 +17,7 @@ import heatclient.client as hclient import keystoneclient import muranoclient.v1.client as muranoclient import neutronclient.v2_0.client as nclient -from oslo.config import cfg +from oslo_config import cfg from murano.common import auth_utils from murano.common import config diff --git a/murano/engine/package_class_loader.py b/murano/engine/package_class_loader.py index 0ea291e47..40a47ee9c 100644 --- a/murano/engine/package_class_loader.py +++ b/murano/engine/package_class_loader.py @@ -17,7 +17,7 @@ import json import os.path import sys -from oslo.config import cfg +from oslo_config import cfg import yaml from murano.dsl import class_loader diff --git a/murano/engine/system/instance_reporter.py b/murano/engine/system/instance_reporter.py index 0ea76f844..651fa9d52 100644 --- a/murano/engine/system/instance_reporter.py +++ b/murano/engine/system/instance_reporter.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo import messaging +import oslo_messaging as messaging from murano.common import config from murano.common import uuidutils diff --git a/murano/engine/system/net_explorer.py b/murano/engine/system/net_explorer.py index 1a6064df5..2e0d5dea7 100644 --- a/murano/engine/system/net_explorer.py +++ b/murano/engine/system/net_explorer.py @@ -16,7 +16,7 @@ import math import netaddr from netaddr.strategy import ipv4 -from oslo.utils import uuidutils +from oslo_utils import uuidutils import murano.common.config as config import murano.dsl.helpers as helpers diff --git a/murano/engine/system/status_reporter.py b/murano/engine/system/status_reporter.py index 5ccfb4463..fcf5cb855 100644 --- a/murano/engine/system/status_reporter.py +++ b/murano/engine/system/status_reporter.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo import messaging +import oslo_messaging as messaging from murano.common import config from murano.common import uuidutils diff --git a/murano/openstack/common/_i18n.py b/murano/openstack/common/_i18n.py index df0f31f5a..70166eeb7 100644 --- a/murano/openstack/common/_i18n.py +++ b/murano/openstack/common/_i18n.py @@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html """ try: - import oslo.i18n + import oslo_i18n # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the # application name when this module is synced into the separate # repository. It is OK to have more than one translation function # using the same domain, since there will still only be one message # catalog. - _translators = oslo.i18n.TranslatorFactory(domain='murano') + _translators = oslo_i18n.TranslatorFactory(domain='murano') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/murano/openstack/common/eventlet_backdoor.py b/murano/openstack/common/eventlet_backdoor.py index 593565ef2..65d027ef9 100644 --- a/murano/openstack/common/eventlet_backdoor.py +++ b/murano/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 murano.openstack.common._i18n import _LI from murano.openstack.common import log as logging diff --git a/murano/openstack/common/fileutils.py b/murano/openstack/common/fileutils.py index ec26eaf9c..64cee1cea 100644 --- a/murano/openstack/common/fileutils.py +++ b/murano/openstack/common/fileutils.py @@ -19,7 +19,7 @@ import logging import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils LOG = logging.getLogger(__name__) diff --git a/murano/openstack/common/lockutils.py b/murano/openstack/common/lockutils.py index 77050b743..b0838e6c7 100644 --- a/murano/openstack/common/lockutils.py +++ b/murano/openstack/common/lockutils.py @@ -26,7 +26,7 @@ import threading import time import weakref -from oslo.config import cfg +from oslo_config import cfg from murano.openstack.common import fileutils from murano.openstack.common._i18n import _, _LE, _LI diff --git a/murano/openstack/common/log.py b/murano/openstack/common/log.py index b668c2e02..e34775127 100644 --- a/murano/openstack/common/log.py +++ b/murano/openstack/common/log.py @@ -38,9 +38,9 @@ import socket import sys import traceback -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils import six from six import moves diff --git a/murano/openstack/common/policy.py b/murano/openstack/common/policy.py index cd954d57e..7341f1b8d 100644 --- a/murano/openstack/common/policy.py +++ b/murano/openstack/common/policy.py @@ -81,8 +81,8 @@ import copy import os import re -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse import six.moves.urllib.request as urlrequest diff --git a/murano/openstack/common/processutils.py b/murano/openstack/common/processutils.py index 9e9b1b02a..9d1b18efb 100644 --- a/murano/openstack/common/processutils.py +++ b/murano/openstack/common/processutils.py @@ -27,7 +27,7 @@ import signal from eventlet.green import subprocess from eventlet import greenthread -from oslo.utils import strutils +from oslo_utils import strutils import six from murano.openstack.common._i18n import _ diff --git a/murano/openstack/common/service.py b/murano/openstack/common/service.py index 7d8e5d3fe..78585f01e 100644 --- a/murano/openstack/common/service.py +++ b/murano/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 murano.openstack.common import eventlet_backdoor from murano.openstack.common._i18n import _LE, _LI, _LW diff --git a/murano/openstack/common/sslutils.py b/murano/openstack/common/sslutils.py index dc40b82ad..f5493ef15 100644 --- a/murano/openstack/common/sslutils.py +++ b/murano/openstack/common/sslutils.py @@ -16,7 +16,7 @@ import copy import os import ssl -from oslo.config import cfg +from oslo_config import cfg from murano.openstack.common._i18n import _ diff --git a/murano/tests/functional/engine/config.py b/murano/tests/functional/engine/config.py index 7b1efa32a..1884d9faa 100644 --- a/murano/tests/functional/engine/config.py +++ b/murano/tests/functional/engine/config.py @@ -14,7 +14,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg murano_group = cfg.OptGroup(name='murano', title="murano") diff --git a/murano/tests/unit/api/base.py b/murano/tests/unit/api/base.py index 8c09d2ac9..939274815 100644 --- a/murano/tests/unit/api/base.py +++ b/murano/tests/unit/api/base.py @@ -18,7 +18,7 @@ import urllib import fixtures import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import routes import webob diff --git a/murano/tests/unit/api/v1/test_actions.py b/murano/tests/unit/api/v1/test_actions.py index 8a8109d77..78794f5c5 100644 --- a/murano/tests/unit/api/v1/test_actions.py +++ b/murano/tests/unit/api/v1/test_actions.py @@ -15,7 +15,7 @@ import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from murano.api.v1 import actions from murano.common import policy diff --git a/murano/tests/unit/api/v1/test_catalog.py b/murano/tests/unit/api/v1/test_catalog.py index d6dac8be0..d77aefd41 100644 --- a/murano/tests/unit/api/v1/test_catalog.py +++ b/murano/tests/unit/api/v1/test_catalog.py @@ -21,7 +21,7 @@ import os import uuid import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from murano.api.v1 import catalog from murano.common import policy diff --git a/murano/tests/unit/api/v1/test_env_templates.py b/murano/tests/unit/api/v1/test_env_templates.py index 5d8c67e56..2efda0ef3 100644 --- a/murano/tests/unit/api/v1/test_env_templates.py +++ b/murano/tests/unit/api/v1/test_env_templates.py @@ -15,8 +15,8 @@ import json -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from murano.api.v1 import templates from murano.common import config diff --git a/murano/tests/unit/api/v1/test_environments.py b/murano/tests/unit/api/v1/test_environments.py index 293248449..699d4015e 100644 --- a/murano/tests/unit/api/v1/test_environments.py +++ b/murano/tests/unit/api/v1/test_environments.py @@ -15,8 +15,8 @@ import json -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from murano.api.v1 import environments from murano.common import config diff --git a/murano/tests/unit/api/v1/test_sessions.py b/murano/tests/unit/api/v1/test_sessions.py index 3d0421d14..b67ba2cc8 100644 --- a/murano/tests/unit/api/v1/test_sessions.py +++ b/murano/tests/unit/api/v1/test_sessions.py @@ -15,7 +15,7 @@ import json -from oslo.config import cfg +from oslo_config import cfg from murano.api.v1 import environments from murano.api.v1 import sessions diff --git a/murano/tests/unit/base.py b/murano/tests/unit/base.py index 484dedd85..e41a68cc0 100644 --- a/murano/tests/unit/base.py +++ b/murano/tests/unit/base.py @@ -12,7 +12,7 @@ # limitations under the License. import fixtures -from oslo.config import cfg +from oslo_config import cfg import testtools from murano.db import api as db_api diff --git a/murano/tests/unit/db/migration/test_migrations.py b/murano/tests/unit/db/migration/test_migrations.py index 04eefac30..9d8d85c2a 100644 --- a/murano/tests/unit/db/migration/test_migrations.py +++ b/murano/tests/unit/db/migration/test_migrations.py @@ -26,9 +26,9 @@ postgres=# create database openstack_citest with owner openstack_citest; import datetime import uuid -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import test_base -from oslo.db.sqlalchemy import utils as db_utils +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import test_base +from oslo_db.sqlalchemy import utils as db_utils from murano.db.migration import migration from murano.tests.unit.db.migration import test_migrations_base as base diff --git a/murano/tests/unit/db/migration/test_migrations_base.py b/murano/tests/unit/db/migration/test_migrations_base.py index 08164f9fa..0ffe4043e 100644 --- a/murano/tests/unit/db/migration/test_migrations_base.py +++ b/murano/tests/unit/db/migration/test_migrations_base.py @@ -29,7 +29,7 @@ from alembic import command from alembic import config as alembic_config from alembic import migration from alembic import script as alembic_script -from oslo.config import cfg +from oslo_config import cfg from murano.common.i18n import _LE import murano.db.migration diff --git a/murano/tests/unit/db/services/test_environments.py b/murano/tests/unit/db/services/test_environments.py index 5d031b939..acb1fe6ec 100644 --- a/murano/tests/unit/db/services/test_environments.py +++ b/murano/tests/unit/db/services/test_environments.py @@ -13,7 +13,7 @@ # under the License. import datetime as dt -from oslo.utils import timeutils +from oslo_utils import timeutils from murano.db import models from murano.db.services import environments diff --git a/murano/tests/unit/db/test_catalog.py b/murano/tests/unit/db/test_catalog.py index 434ba2d76..0bfe41194 100644 --- a/murano/tests/unit/db/test_catalog.py +++ b/murano/tests/unit/db/test_catalog.py @@ -13,7 +13,7 @@ import uuid -from oslo.db import exception as db_exception +from oslo_db import exception as db_exception from webob import exc from murano.db.catalog import api