From 9caf56c37aff9999b9ffdb3c880178f252ba3237 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Fri, 19 Oct 2012 04:16:23 +0000 Subject: [PATCH] Update default base database to be V2 Fixes bug 1070353 Change-Id: Ie9271dd1ef2597ba74a0fea51ecf151ae2e8f7dd --- quantum/db/api.py | 2 +- quantum/db/model_base.py | 1 - quantum/tests/unit/test_db_plugin.py | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/db/api.py b/quantum/db/api.py index e10c7d4b4a2..d2bc0bd2173 100644 --- a/quantum/db/api.py +++ b/quantum/db/api.py @@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__) _ENGINE = None _MAKER = None -BASE = model_base.BASE +BASE = model_base.BASEV2 class MySQLPingListener(object): diff --git a/quantum/db/model_base.py b/quantum/db/model_base.py index a04863a362f..e3ffa682c7f 100644 --- a/quantum/db/model_base.py +++ b/quantum/db/model_base.py @@ -60,5 +60,4 @@ class QuantumBaseV2(QuantumBase): return cls.__name__.lower() + 's' -BASE = declarative.declarative_base(cls=QuantumBase) BASEV2 = declarative.declarative_base(cls=QuantumBaseV2) diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index 8c9377387eb..f63c4a90112 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -114,6 +114,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase): super(QuantumDbPluginV2TestCase, self).tearDown() # NOTE(jkoelker) for a 'pluggable' framework, Quantum sure # doesn't like when the plugin changes ;) + db.clear_db() db._ENGINE = None db._MAKER = None cfg.CONF.reset()