diff options
| author | Thuleau Édouard <thuleau@gmail.com> | 2011-09-02 15:58:20 +0200 |
|---|---|---|
| committer | Thuleau Édouard <thuleau@gmail.com> | 2011-09-02 15:58:20 +0200 |
| commit | 5a4f9b949ecabc385de66a20714c3a13de424ea4 (patch) | |
| tree | 101f35084dbb7902589d2cd90a66c00b6d42f73c /nova/exception.py | |
| parent | 1081b9d52026afb84128c15a1df0998f80810ce9 (diff) | |
| parent | d80dc5bbbd1781bd33d9f69b608014e9cc2e41a3 (diff) | |
| download | nova-5a4f9b949ecabc385de66a20714c3a13de424ea4.tar.gz nova-5a4f9b949ecabc385de66a20714c3a13de424ea4.tar.xz nova-5a4f9b949ecabc385de66a20714c3a13de424ea4.zip | |
Merged trunk.
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 aa3407480..95d8229b5 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -61,7 +61,7 @@ class ApiError(Error): super(ApiError, self).__init__(outstr) -class BuildInProgress(Error): +class RebuildRequiresActiveInstance(Error): pass @@ -146,6 +146,7 @@ class NovaException(Exception): message = _("An unknown exception occurred.") def __init__(self, **kwargs): + self.kwargs = kwargs try: self._error_string = self.message % kwargs @@ -529,6 +530,10 @@ class NoMoreFloatingIps(FloatingIpNotFound): message = _("Zero floating ips available.") +class FloatingIpAlreadyInUse(NovaException): + message = _("Floating ip %(address)s already in use by %(fixed_ip)s.") + + class NoFloatingIpsDefined(NotFound): message = _("Zero floating ips exist.") |