Move oslo.db references to oslo_db

The oslo team is recommending changing to non-namespaced references.

Implements: blueprint drop-namespace-packages
Change-Id: Iefe0a771dc8328bc92e13dd6d66fdd3853d5bba6

ironic/conductor/manager.py

@@ -49,10 +49,10 @@ import threading
 import eventlet
 from eventlet import greenpool
 from oslo.config import cfg
-from oslo.db import exception as db_exception
 from oslo import messaging
 from oslo.utils import excutils
 from oslo_concurrency import lockutils
+from oslo_db import exception as db_exception
 
 from ironic.common import dhcp_factory
 from ironic.common import driver_factory

ironic/db/api.py

@@ -20,7 +20,7 @@ Base classes for storage engines
 import abc
 
 from oslo.config import cfg
-from oslo.db import api as db_api
+from oslo_db import api as db_api
 import six
 
 

ironic/db/migration.py

@@ -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("ironic.database.migration_backend",
                                      cfg.CONF.database.backend).driver
     return _IMPL

ironic/db/sqlalchemy/api.py

@@ -20,10 +20,10 @@ import collections
 import datetime
 
 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_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 sqlalchemy.orm.exc import NoResultFound
 
 from ironic.common import exception

ironic/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 ironic.db.sqlalchemy import api as sqla_api
 from ironic.db.sqlalchemy import models

ironic/db/sqlalchemy/models.py

@@ -21,8 +21,8 @@ SQLAlchemy models for baremetal data.
 import json
 
 from oslo.config import cfg
-from oslo.db import options as db_options
-from oslo.db.sqlalchemy import models
+from oslo_db import options as db_options
+from oslo_db.sqlalchemy import models
 import six.moves.urllib.parse as urlparse
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, Integer

ironic/tests/conductor/test_manager.py

@@ -23,8 +23,8 @@ import datetime
 import eventlet
 import mock
 from oslo.config import cfg
-from oslo.db import exception as db_exception
 from oslo import messaging
+from oslo_db import exception as db_exception
 
 from ironic.common import boot_devices
 from ironic.common import driver_factory

ironic/tests/db/sqlalchemy/test_migrations.py

@@ -44,10 +44,10 @@ import contextlib
 
 from alembic import script
 import mock
-from oslo.db import exception as db_exc
-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_db import exception as db_exc
+from oslo_db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import test_migrations
+from oslo_db.sqlalchemy import utils as db_utils
 import sqlalchemy
 import sqlalchemy.exc
 
@@ -315,7 +315,7 @@ class MigrationCheckersMixin(object):
         nodes.insert().values(data).execute()
         data['uuid'] = utils.generate_uuid()
         # TODO(viktors): Remove check on sqlalchemy.exc.IntegrityError, when
-        #                Ironic will use oslo.db 0.4.0 or higher.
+        #                Ironic will use oslo_db 0.4.0 or higher.
         #                See bug #1214341 for details.
         self.assertRaises(
             (sqlalchemy.exc.IntegrityError, db_exc.DBDuplicateEntry),

ironic/tests/db/sqlalchemy/test_types.py

@@ -12,7 +12,7 @@
 
 """Tests for custom SQLAlchemy types via Ironic DB."""
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 
 from ironic.common import utils as ironic_utils
 import ironic.db.sqlalchemy.api as sa_api