diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-26 13:13:41 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-26 13:13:41 -0400 |
| commit | d4803039c19a01087964c499c7e9ef9abfa82f74 (patch) | |
| tree | 6e8ac36399f6a7863eecca88ff6255af1cf46a59 /nova/exception.py | |
| parent | 8501cc95aa60a0a5759cf911e8adaf624fa9e547 (diff) | |
| parent | 48a6bf42b3af5323d35f9a31bd4233712165b276 (diff) | |
| download | nova-d4803039c19a01087964c499c7e9ef9abfa82f74.tar.gz nova-d4803039c19a01087964c499c7e9ef9abfa82f74.tar.xz nova-d4803039c19a01087964c499c7e9ef9abfa82f74.zip | |
merging trunk; resolving conflicts
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 7 |
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'.") |