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
This commit is contained in:
parent
96db2bf956
commit
21a14acba4
@ -12,7 +12,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.common.i18n import _
|
from murano.common.i18n import _
|
||||||
from murano.common import wsgi
|
from murano.common import wsgi
|
||||||
|
@ -17,7 +17,7 @@ Cinder's faultwrapper
|
|||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
from murano.common import wsgi
|
from murano.common import wsgi
|
||||||
|
@ -18,7 +18,7 @@ and/or Accept headers and attempts to negotiate an API controller to
|
|||||||
return
|
return
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.api import versions
|
from murano.api import versions
|
||||||
from murano.common import wsgi
|
from murano.common import wsgi
|
||||||
|
@ -18,8 +18,8 @@ import os
|
|||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
import jsonschema
|
import jsonschema
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
import murano.api.v1
|
import murano.api.v1
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
from sqlalchemy import desc
|
from sqlalchemy import desc
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from murano.api.v1 import environments as envs_api
|
from murano.api.v1 import environments as envs_api
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
import httplib
|
import httplib
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import webob.dec
|
import webob.dec
|
||||||
|
|
||||||
from murano.common import wsgi
|
from murano.common import wsgi
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import options
|
from oslo_db import options
|
||||||
|
|
||||||
from murano.db.migration import migration
|
from murano.db.migration import migration
|
||||||
from murano.openstack.common import log
|
from murano.openstack.common import log
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db import exception as db_exception
|
from oslo_db import exception as db_exception
|
||||||
|
|
||||||
from murano.common import consts
|
from murano.common import consts
|
||||||
from murano.db.catalog import api as db_catalog_api
|
from murano.db.catalog import api as db_catalog_api
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
|
|
||||||
from keystoneclient.v3 import client as ks_client
|
from keystoneclient.v3 import client as ks_client
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
|
|
||||||
|
|
||||||
def get_client(token, tenant_id):
|
def get_client(token, tenant_id):
|
||||||
|
@ -22,7 +22,7 @@ import logging.handlers
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from paste import deploy
|
from paste import deploy
|
||||||
|
|
||||||
from murano.common.i18n import _
|
from murano.common.i18n import _
|
||||||
|
@ -17,9 +17,9 @@ import traceback
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import eventlet.debug
|
import eventlet.debug
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
from oslo.messaging import target
|
from oslo_messaging import target
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from murano.common import auth_utils
|
from murano.common import auth_utils
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
log = logging.getLogger("murano-common.messaging")
|
log = logging.getLogger("murano-common.messaging")
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import ssl as ssl_module
|
|||||||
|
|
||||||
from eventlet import patcher
|
from eventlet import patcher
|
||||||
kombu = patcher.import_patched('kombu')
|
kombu = patcher.import_patched('kombu')
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from subscription import Subscription
|
from subscription import Subscription
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
# Based on designate/policy.py
|
# Based on designate/policy.py
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from webob import exc as exceptions
|
from webob import exc as exceptions
|
||||||
|
|
||||||
from murano.common.i18n import _
|
from murano.common.i18n import _
|
||||||
|
@ -12,9 +12,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
from oslo.messaging import rpc
|
from oslo_messaging import rpc
|
||||||
from oslo.messaging import target
|
from oslo_messaging import target
|
||||||
|
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
|
||||||
|
@ -14,10 +14,10 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
from oslo.messaging.notify import dispatcher as oslo_dispatcher
|
from oslo_messaging.notify import dispatcher as oslo_dispatcher
|
||||||
from oslo.messaging import target
|
from oslo_messaging import target
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from sqlalchemy import desc
|
from sqlalchemy import desc
|
||||||
|
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
@ -28,8 +28,8 @@ import eventlet
|
|||||||
eventlet.patcher.monkey_patch(all=False, socket=True)
|
eventlet.patcher.monkey_patch(all=False, socket=True)
|
||||||
import eventlet.wsgi
|
import eventlet.wsgi
|
||||||
import jsonschema
|
import jsonschema
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import routes
|
import routes
|
||||||
import routes.middleware
|
import routes.middleware
|
||||||
import webob.dec
|
import webob.dec
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.db.sqlalchemy import utils
|
from oslo_db.sqlalchemy import utils
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
from sqlalchemy.orm import attributes
|
from sqlalchemy.orm import attributes
|
||||||
|
@ -26,7 +26,7 @@ down_revision = None
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.sql.expression import table as sa_table
|
from sqlalchemy.sql.expression import table as sa_table
|
||||||
|
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
"""
|
"""
|
||||||
SQLAlchemy models for murano data
|
SQLAlchemy models for murano data
|
||||||
"""
|
"""
|
||||||
from oslo.db.sqlalchemy import models
|
from oslo_db.sqlalchemy import models
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.ext import declarative
|
from sqlalchemy.ext import declarative
|
||||||
from sqlalchemy import orm as sa_orm
|
from sqlalchemy import orm as sa_orm
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import types
|
import types
|
||||||
|
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from murano.common.i18n import _
|
from murano.common.i18n import _
|
||||||
|
@ -17,7 +17,7 @@ from murano.db import models
|
|||||||
from murano.db import session as db_session
|
from murano.db import session as db_session
|
||||||
from murano.openstack.common import log as logging
|
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__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.db import exception
|
from oslo_db import exception
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
"""Session management functions."""
|
"""Session management functions."""
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from oslo.db import exception
|
from oslo_db import exception
|
||||||
from oslo.db import options
|
from oslo_db import options
|
||||||
from oslo.db.sqlalchemy import session as db_session
|
from oslo_db.sqlalchemy import session as db_session
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
from murano.db.models import Lock
|
from murano.db.models import Lock
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.dialects import mysql
|
from sqlalchemy.dialects import mysql
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ import heatclient.client as hclient
|
|||||||
import keystoneclient
|
import keystoneclient
|
||||||
import muranoclient.v1.client as muranoclient
|
import muranoclient.v1.client as muranoclient
|
||||||
import neutronclient.v2_0.client as nclient
|
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 auth_utils
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
@ -17,7 +17,7 @@ import json
|
|||||||
import os.path
|
import os.path
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from murano.dsl import class_loader
|
from murano.dsl import class_loader
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
from murano.common import uuidutils
|
from murano.common import uuidutils
|
||||||
|
@ -16,7 +16,7 @@ import math
|
|||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
from netaddr.strategy import ipv4
|
from netaddr.strategy import ipv4
|
||||||
from oslo.utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
|
|
||||||
import murano.common.config as config
|
import murano.common.config as config
|
||||||
import murano.dsl.helpers as helpers
|
import murano.dsl.helpers as helpers
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from oslo import messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
from murano.common import uuidutils
|
from murano.common import uuidutils
|
||||||
|
@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import oslo.i18n
|
import oslo_i18n
|
||||||
|
|
||||||
# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
|
# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
|
||||||
# application name when this module is synced into the separate
|
# application name when this module is synced into the separate
|
||||||
# repository. It is OK to have more than one translation function
|
# repository. It is OK to have more than one translation function
|
||||||
# using the same domain, since there will still only be one message
|
# using the same domain, since there will still only be one message
|
||||||
# catalog.
|
# catalog.
|
||||||
_translators = oslo.i18n.TranslatorFactory(domain='murano')
|
_translators = oslo_i18n.TranslatorFactory(domain='murano')
|
||||||
|
|
||||||
# The primary translation function using the well-known name "_"
|
# The primary translation function using the well-known name "_"
|
||||||
_ = _translators.primary
|
_ = _translators.primary
|
||||||
|
@ -28,7 +28,7 @@ import traceback
|
|||||||
import eventlet
|
import eventlet
|
||||||
import eventlet.backdoor
|
import eventlet.backdoor
|
||||||
import greenlet
|
import greenlet
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.openstack.common._i18n import _LI
|
from murano.openstack.common._i18n import _LI
|
||||||
from murano.openstack.common import log as logging
|
from murano.openstack.common import log as logging
|
||||||
|
@ -19,7 +19,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from oslo.utils import excutils
|
from oslo_utils import excutils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ import threading
|
|||||||
import time
|
import time
|
||||||
import weakref
|
import weakref
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.openstack.common import fileutils
|
from murano.openstack.common import fileutils
|
||||||
from murano.openstack.common._i18n import _, _LE, _LI
|
from murano.openstack.common._i18n import _, _LE, _LI
|
||||||
|
@ -38,9 +38,9 @@ import socket
|
|||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import six
|
import six
|
||||||
from six import moves
|
from six import moves
|
||||||
|
|
||||||
|
@ -81,8 +81,8 @@ import copy
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
import six.moves.urllib.request as urlrequest
|
import six.moves.urllib.request as urlrequest
|
||||||
|
@ -27,7 +27,7 @@ import signal
|
|||||||
|
|
||||||
from eventlet.green import subprocess
|
from eventlet.green import subprocess
|
||||||
from eventlet import greenthread
|
from eventlet import greenthread
|
||||||
from oslo.utils import strutils
|
from oslo_utils import strutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from murano.openstack.common._i18n import _
|
from murano.openstack.common._i18n import _
|
||||||
|
@ -35,7 +35,7 @@ except ImportError:
|
|||||||
|
|
||||||
import eventlet
|
import eventlet
|
||||||
from eventlet import event
|
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 import eventlet_backdoor
|
||||||
from murano.openstack.common._i18n import _LE, _LI, _LW
|
from murano.openstack.common._i18n import _LE, _LI, _LW
|
||||||
|
@ -16,7 +16,7 @@ import copy
|
|||||||
import os
|
import os
|
||||||
import ssl
|
import ssl
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.openstack.common._i18n import _
|
from murano.openstack.common._i18n import _
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
|
||||||
murano_group = cfg.OptGroup(name='murano', title="murano")
|
murano_group = cfg.OptGroup(name='murano', title="murano")
|
||||||
|
@ -18,7 +18,7 @@ import urllib
|
|||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
import mock
|
import mock
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import routes
|
import routes
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.api.v1 import actions
|
from murano.api.v1 import actions
|
||||||
from murano.common import policy
|
from murano.common import policy
|
||||||
|
@ -21,7 +21,7 @@ import os
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.api.v1 import catalog
|
from murano.api.v1 import catalog
|
||||||
from murano.common import policy
|
from murano.common import policy
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.api.v1 import templates
|
from murano.api.v1 import templates
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.api.v1 import environments
|
from murano.api.v1 import environments
|
||||||
from murano.common import config
|
from murano.common import config
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.api.v1 import environments
|
from murano.api.v1 import environments
|
||||||
from murano.api.v1 import sessions
|
from murano.api.v1 import sessions
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from murano.db import api as db_api
|
from murano.db import api as db_api
|
||||||
|
@ -26,9 +26,9 @@ postgres=# create database openstack_citest with owner openstack_citest;
|
|||||||
import datetime
|
import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from oslo.db import exception as db_exc
|
from oslo_db import exception as db_exc
|
||||||
from oslo.db.sqlalchemy import test_base
|
from oslo_db.sqlalchemy import test_base
|
||||||
from oslo.db.sqlalchemy import utils as db_utils
|
from oslo_db.sqlalchemy import utils as db_utils
|
||||||
|
|
||||||
from murano.db.migration import migration
|
from murano.db.migration import migration
|
||||||
from murano.tests.unit.db.migration import test_migrations_base as base
|
from murano.tests.unit.db.migration import test_migrations_base as base
|
||||||
|
@ -29,7 +29,7 @@ from alembic import command
|
|||||||
from alembic import config as alembic_config
|
from alembic import config as alembic_config
|
||||||
from alembic import migration
|
from alembic import migration
|
||||||
from alembic import script as alembic_script
|
from alembic import script as alembic_script
|
||||||
from oslo.config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from murano.common.i18n import _LE
|
from murano.common.i18n import _LE
|
||||||
import murano.db.migration
|
import murano.db.migration
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
import datetime as dt
|
import datetime as dt
|
||||||
|
|
||||||
from oslo.utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
|
||||||
from murano.db import models
|
from murano.db import models
|
||||||
from murano.db.services import environments
|
from murano.db.services import environments
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from oslo.db import exception as db_exception
|
from oslo_db import exception as db_exception
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from murano.db.catalog import api
|
from murano.db.catalog import api
|
||||||
|
Loading…
Reference in New Issue
Block a user