Merge "Update default base database to be V2"

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):

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)

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()