From 2f552e957fddcd9e042a09a2d32d32fa564c18e7 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 3 May 2012 14:29:50 -0400
Subject: Replaces exceptions.Error with NovaException

Fixes bug 817107

Change-Id: I6253e6bbcc44676c587b315fa32afba6459e676a
---
 nova/db/api.py                  | 4 ++--
 nova/db/sqlalchemy/migration.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/db')

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