Move from oslo.db to oslo_db

oslo_db was moved out of the oslo namespace in
oslo.db>=1.4.0.

Change-Id: I13620d26ff12c55b2294b3b051669e0e98513a10
Related-to: blueprint drop-namespace-packages

glance/cmd/manage.py

@@ -38,8 +38,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from oslo.db.sqlalchemy import migration
 from oslo_config import cfg
+from oslo_db.sqlalchemy import migration
 from oslo_utils import encodeutils
 
 from glance.common import config

glance/db/metadata.py

@@ -21,8 +21,8 @@
 
 import threading
 
-from oslo.db import options as db_options
 from oslo_config import cfg
+from oslo_db import options as db_options
 from stevedore import driver
 
 from glance.db.sqlalchemy import api as db_api

glance/db/migration.py

@@ -22,8 +22,8 @@
 import os
 import threading
 
-from oslo.db import options as db_options
 from oslo_config import cfg
+from oslo_db import options as db_options
 from stevedore import driver
 
 from glance.db.sqlalchemy import api as db_api

glance/db/sqlalchemy/api.py

@@ -22,9 +22,9 @@
 
 import threading
 
-from oslo.db import exception as db_exception
-from oslo.db.sqlalchemy import session
 from oslo_config import cfg
+from oslo_db import exception as db_exception
+from oslo_db.sqlalchemy import session
 from oslo_utils import timeutils
 import osprofiler.sqlalchemy
 from retrying import retry

glance/db/sqlalchemy/metadef_api/namespace.py

@@ -12,8 +12,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.utils import paginate_query
+from oslo_db import exception as db_exc
+from oslo_db.sqlalchemy.utils import paginate_query
 import sqlalchemy.exc as sa_exc
 from sqlalchemy import or_
 import sqlalchemy.orm as sa_orm

glance/db/sqlalchemy/metadef_api/object.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 from sqlalchemy import func
 import sqlalchemy.orm as sa_orm
 

glance/db/sqlalchemy/metadef_api/property.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 from sqlalchemy import func
 import sqlalchemy.orm as sa_orm
 

glance/db/sqlalchemy/metadef_api/resource_type.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 import sqlalchemy.exc as sa_exc
 import sqlalchemy.orm as sa_orm
 

glance/db/sqlalchemy/metadef_api/resource_type_association.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 import sqlalchemy.orm as sa_orm
 
 from glance.common import exception as exc

glance/db/sqlalchemy/metadef_api/tag.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 
-from oslo.db import exception as db_exc
-from oslo.db.sqlalchemy.utils import paginate_query
+from oslo_db import exception as db_exc
+from oslo_db.sqlalchemy.utils import paginate_query
 from sqlalchemy import func
 import sqlalchemy.orm as sa_orm
 

glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py

@@ -16,7 +16,7 @@
 import re
 
 from migrate.changeset import UniqueConstraint
-from oslo.db import exception as db_exception
+from oslo_db import exception as db_exception
 from sqlalchemy import and_, func, orm
 from sqlalchemy import MetaData, Table
 from sqlalchemy.exc import OperationalError, ProgrammingError

glance/db/sqlalchemy/models.py

@@ -20,8 +20,8 @@ SQLAlchemy models for glance data
 
 import uuid
 
-from oslo.db.sqlalchemy import models
 from oslo.serialization import jsonutils
+from oslo_db.sqlalchemy import models
 from oslo_utils import timeutils
 from sqlalchemy import BigInteger
 from sqlalchemy import Boolean

glance/db/sqlalchemy/models_metadef.py

@@ -16,7 +16,7 @@
 SQLAlchemy models for glance metadata schema
 """
 
-from oslo.db.sqlalchemy import models
+from oslo_db.sqlalchemy import models
 from oslo_utils import timeutils
 from sqlalchemy import Boolean
 from sqlalchemy import Column

glance/tests/functional/db/test_registry.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.db import options
 from oslo_config import cfg
+from oslo_db import options
 
 import glance.db
 import glance.tests.functional.db as db_tests

glance/tests/functional/db/test_sqlalchemy.py

@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.db import options
 from oslo_config import cfg
+from oslo_db import options
 
 from glance.common import exception
 import glance.db.sqlalchemy.api

glance/tests/integration/legacy_functional/base.py

@@ -16,8 +16,8 @@ import tempfile
 
 import fixtures
 import glance_store
-from oslo.db import options
 from oslo_config import cfg
+from oslo_db import options
 
 import glance.common.client
 from glance.common import config

glance/tests/integration/v2/base.py

@@ -19,8 +19,8 @@ import tempfile
 
 import fixtures
 import glance_store
-from oslo.db import options
 from oslo_config import cfg
+from oslo_db import options
 
 import glance.common.client
 from glance.common import config

glance/tests/unit/base.py

@@ -17,10 +17,10 @@ import os
 
 import glance_store as store
 from glance_store import location
-from oslo.db import options
 from oslo.serialization import jsonutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_db import options
 
 from glance.openstack.common import local
 from glance.tests import stubs

glance/tests/unit/test_db.py

@@ -17,8 +17,8 @@
 import uuid
 
 import mock
-from oslo.db import exception as db_exc
 from oslo_config import cfg
+from oslo_db import exception as db_exc
 
 from glance.common import crypt
 from glance.common import exception

glance/tests/unit/test_manage.py

@@ -15,7 +15,7 @@
 
 import fixtures
 import mock
-from oslo.db.sqlalchemy import migration
+from oslo_db.sqlalchemy import migration
 import testtools
 
 from glance.cmd import manage

glance/tests/unit/test_migrations.py

@@ -33,11 +33,11 @@ import uuid
 
 from migrate.versioning import api as migration_api
 from migrate.versioning.repository import Repository
-from oslo.db.sqlalchemy import test_base
-from oslo.db.sqlalchemy import test_migrations
-from oslo.db.sqlalchemy import utils as db_utils
 from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import test_migrations
+from oslo_db.sqlalchemy import utils as db_utils
 from oslo_utils import timeutils
 import sqlalchemy