summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-08-02 18:43:30 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-08-02 18:43:30 +0900
commitc75e2ee89f5510cab8d6da886cbcbbe850ccfd31 (patch)
tree8ddba4d2e1c2703d70e2921746acd32e7d101dd0 /nova/exception.py
parent79283cbb13d91e3c25e42af765f9da627813a6d8 (diff)
parentbdcfaa5b927a096f507fb0f7e2d81989173957f8 (diff)
downloadnova-c75e2ee89f5510cab8d6da886cbcbbe850ccfd31.tar.gz
nova-c75e2ee89f5510cab8d6da886cbcbbe850ccfd31.tar.xz
nova-c75e2ee89f5510cab8d6da886cbcbbe850ccfd31.zip
merged trunk rev1348
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py
index a911ae8d5..db994ac0a 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -116,7 +116,8 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None,
notifier.notify(publisher_id, temp_type, temp_level,
payload)
- if not isinstance(e, Error):
+ if (not isinstance(e, Error) and
+ not isinstance(e, NovaException)):
#exc_type, exc_value, exc_traceback = sys.exc_info()
LOG.exception(_('Uncaught exception'))
#logging.error(traceback.extract_stack(exc_traceback))
@@ -377,6 +378,10 @@ class StorageRepositoryNotFound(NotFound):
message = _("Cannot find SR to read/write VDI.")
+class NetworkNotCreated(NovaException):
+ message = _("%(req)s is required to create a network.")
+
+
class NetworkNotFound(NotFound):
message = _("Network %(network_id)s could not be found.")