summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-07-25 14:53:42 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-07-25 14:53:42 -0400
commit00a17d33e206f3b2e7dd5f913f43641da3b8aa02 (patch)
treeb25bf4681c1d6f81f0c85f014fba4968e71b3078 /nova/exception.py
parent9356ab2c970543baa243c270414b51e966f231b6 (diff)
parentf3db3c1178cb918194b65a96eea01eeb289ad3e3 (diff)
downloadnova-00a17d33e206f3b2e7dd5f913f43641da3b8aa02.tar.gz
nova-00a17d33e206f3b2e7dd5f913f43641da3b8aa02.tar.xz
nova-00a17d33e206f3b2e7dd5f913f43641da3b8aa02.zip
merged trunk
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 ad6c005f8..38e705417 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -78,8 +78,8 @@ def wrap_db_error(f):
except Exception, e:
LOG.exception(_('DB exception wrapped.'))
raise DBError(e)
- return _wrap
_wrap.func_name = f.func_name
+ return _wrap
def wrap_exception(notifier=None, publisher_id=None, event_type=None,
@@ -408,6 +408,11 @@ class FixedIpNotFoundForInstance(FixedIpNotFound):
message = _("Instance %(instance_id)s has zero fixed ips.")
+class FixedIpNotFoundForNetworkHost(FixedIpNotFound):
+ message = _("Network host %(host)s has zero fixed ips "
+ "in network %(network_id)s.")
+
+
class FixedIpNotFoundForSpecificInstance(FixedIpNotFound):
message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.")