summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-05-03 14:29:50 -0400
committerAlex Meade <alex.meade@rackspace.com>2012-05-07 10:38:28 -0400
commit2f552e957fddcd9e042a09a2d32d32fa564c18e7 (patch)
treeba2914fb539f0143e90cb3fbb921cb67623f4762 /nova/db
parenteb9e54c1129080ad0f5b569b39dfa09c539f2f11 (diff)
downloadnova-2f552e957fddcd9e042a09a2d32d32fa564c18e7.tar.gz
nova-2f552e957fddcd9e042a09a2d32d32fa564c18e7.tar.xz
nova-2f552e957fddcd9e042a09a2d32d32fa564c18e7.zip
Replaces exceptions.Error with NovaException
Fixes bug 817107 Change-Id: I6253e6bbcc44676c587b315fa32afba6459e676a
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/api.py4
-rw-r--r--nova/db/sqlalchemy/migration.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index 687e7b91b..44fbe599c 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -74,12 +74,12 @@ IMPL = utils.LazyPluggable('db_backend',
sqlalchemy='nova.db.sqlalchemy.api')
-class NoMoreNetworks(exception.Error):
+class NoMoreNetworks(exception.NovaException):
"""No more available networks."""
pass
-class NoMoreTargets(exception.Error):
+class NoMoreTargets(exception.NovaException):
"""No more available targets"""
pass
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index befb4cbec..698e7875a 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -72,7 +72,7 @@ def db_sync(version=None):
try:
version = int(version)
except ValueError:
- raise exception.Error(_("version should be an integer"))
+ raise exception.NovaException(_("version should be an integer"))
current_version = db_version()
repository = _find_migrate_repo()