diff options
| author | Eric Windisch <eric@cloudscaling.com> | 2013-01-17 15:38:02 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-05 10:13:04 +0000 |
| commit | cd0c765ced2823c05b16126d6ba6a823bb66fe7d (patch) | |
| tree | 31b3e5535d39db7afaefa12a89d74b68b7885ced /nova/test.py | |
| parent | 47bbf12a6c9705e5abca29a1d44b753c8506505d (diff) | |
| download | nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.tar.gz nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.tar.xz nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.zip | |
Use oslo database code
Bring in the new database code from oslo.
Uses get_session() from oslo as well as changing NovaBase to derive from
a common class.
Remove test_sqlalchemy.py now that this code is test in oslo.
Implements blueprint db-common.
Change-Id: I090754981c871250dd981cbbe1a08e7181440120
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/test.py b/nova/test.py index b3f851dc4..e5c11081c 100644 --- a/nova/test.py +++ b/nova/test.py @@ -37,9 +37,9 @@ import testtools from nova import context from nova import db from nova.db import migration -from nova.db.sqlalchemy import session from nova.network import manager as network_manager from nova.openstack.common import cfg +from nova.openstack.common.db.sqlalchemy import session from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import paths @@ -56,8 +56,9 @@ test_opts = [ CONF = cfg.CONF CONF.register_opts(test_opts) -CONF.import_opt('sql_connection', 'nova.db.sqlalchemy.session') -CONF.import_opt('sqlite_db', 'nova.db.sqlalchemy.session') +CONF.import_opt('sql_connection', + 'nova.openstack.common.db.sqlalchemy.session') +CONF.import_opt('sqlite_db', 'nova.openstack.common.db.sqlalchemy.session') CONF.set_override('use_stderr', False) logging.setup('nova') |