openstack/trove
Code Issues Proposed changes

Merge "fix traceback when default_version is not in the database"

Browse Source
This commit is contained in:
Jenkins 2014-02-25 12:15:48 +00:00 committed by Gerrit Code Review
commit 7691175fcf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trove/datastore/models.py
View File

@ -187,19 +187,18 @@ def update_datastore(name, default_version):
db_api.configure_db(CONF)
try:
datastore = DBDatastore.find_by(name=name)
if default_version:
version = DatastoreVersion.load(datastore, default_version)
if not version.active:
raise exception.DatastoreVersionInactive(version=
version.name)
datastore.default_version_id = version.id
except exception.ModelNotFoundError:
# Create a new one
datastore = DBDatastore()
datastore.id = utils.generate_uuid()
datastore.name = name
if default_version:
version = DatastoreVersion.load(datastore, default_version)
if not version.active:
raise exception.DatastoreVersionInactive(version=version.name)
datastore.default_version_id = version.id
db_api.save(datastore)