x/vmware-nsx
Code Issues Proposed changes

Merge "Update default base database to be V2"

Browse Source
This commit is contained in:
Jenkins 2012-10-23 20:18:48 +00:00 committed by Gerrit Code Review
commit a5c1c89aa1
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/db/api.py
View File

@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__)
_ENGINE = None _ENGINE = None
_MAKER = None _MAKER = None
BASE = model_base.BASE BASE = model_base.BASEV2
class MySQLPingListener(object): class MySQLPingListener(object):

1
quantum/db/model_base.py
View File

@ -60,5 +60,4 @@ class QuantumBaseV2(QuantumBase):
return cls.__name__.lower() + 's' return cls.__name__.lower() + 's'
BASE = declarative.declarative_base(cls=QuantumBase)
BASEV2 = declarative.declarative_base(cls=QuantumBaseV2) BASEV2 = declarative.declarative_base(cls=QuantumBaseV2)

1
quantum/tests/unit/test_db_plugin.py
View File

@ -114,6 +114,7 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase):
super(QuantumDbPluginV2TestCase, self).tearDown() super(QuantumDbPluginV2TestCase, self).tearDown()
# NOTE(jkoelker) for a 'pluggable' framework, Quantum sure # NOTE(jkoelker) for a 'pluggable' framework, Quantum sure
# doesn't like when the plugin changes ;) # doesn't like when the plugin changes ;)
db.clear_db()
db._ENGINE = None db._ENGINE = None
db._MAKER = None db._MAKER = None
cfg.CONF.reset() cfg.CONF.reset()