summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-01 11:08:41 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-01 11:08:41 -0400
commit9b3a6c8cda99290f0b7aff740faec0e8544aafe0 (patch)
tree394ba57ffeca1f07303b1a0f261ca0742864524e /nova/exception.py
parent1c6d74a08dbb5b472e85e3d3a1fe2b3b8b9b89e3 (diff)
parent17de95f0c2b6431a4ae5bf39beb4d3cee2f843b2 (diff)
downloadnova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.tar.gz
nova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.tar.xz
nova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.zip
merging trunk
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 32981f4d5..fca4586c3 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
@@ -533,6 +533,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.")