From d0ec6c5443eb3b4a621e0fe720f795ad19169147 Mon Sep 17 00:00:00 2001
From: Roman Podoliaka <rpodolyaka@mirantis.com>
Date: Mon, 30 Jun 2014 11:20:35 +0300
Subject: [PATCH] Switch to using of oslo.db

oslo.db first stable release has been cut and we can start using it
instead of openstack/common/db/* code which is now marked obsolete.

Change-Id: I1ccf896922a5a762d37a1a3b93c56c8b8ae8c085
---
 neutron/db/loadbalancer/loadbalancer_db.py                      | 2 +-
 .../services/loadbalancer/drivers/embrane/test_plugin_driver.py | 2 +-
 openstack-common.conf                                           | 2 --
 requirements.txt                                                | 1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/neutron/db/loadbalancer/loadbalancer_db.py b/neutron/db/loadbalancer/loadbalancer_db.py
index 1c1931b43..0940a945f 100644
--- a/neutron/db/loadbalancer/loadbalancer_db.py
+++ b/neutron/db/loadbalancer/loadbalancer_db.py
@@ -13,6 +13,7 @@
 #    under the License.
 #
 
+from oslo.db import exception
 import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
@@ -26,7 +27,6 @@ from neutron.db import models_v2
 from neutron.db import servicetype_db as st_db
 from neutron.extensions import loadbalancer
 from neutron import manager
-from neutron.openstack.common.db import exception
 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import uuidutils
diff --git a/neutron/tests/unit/services/loadbalancer/drivers/embrane/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/embrane/test_plugin_driver.py
index 19f2d1dae..7838a1517 100644
--- a/neutron/tests/unit/services/loadbalancer/drivers/embrane/test_plugin_driver.py
+++ b/neutron/tests/unit/services/loadbalancer/drivers/embrane/test_plugin_driver.py
@@ -19,9 +19,9 @@ import sys
 
 import mock
 from oslo.config import cfg
+from oslo.db import exception as n_exc
 
 from neutron import context
-from neutron.openstack.common.db import exception as n_exc
 from neutron.tests.unit.db.loadbalancer import test_db_loadbalancer
 
 HELEOSAPIMOCK = mock.Mock()
diff --git a/openstack-common.conf b/openstack-common.conf
index d15422adc..6e6c64e9e 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -2,8 +2,6 @@
 # The list of modules to copy from oslo-incubator.git
 module=cache
 module=context
-module=db
-module=db.sqlalchemy
 module=eventlet_backdoor
 module=excutils
 module=fileutils
diff --git a/requirements.txt b/requirements.txt
index 24f7c2c9b..a665bb3f1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,6 +23,7 @@ alembic>=0.4.1
 six>=1.7.0
 stevedore>=0.14
 oslo.config>=1.2.1
+oslo.db>=0.2.0
 oslo.messaging>=1.3.0
 oslo.rootwrap