summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-09-16 14:07:41 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-09-30 15:39:02 -0500
commit15b2a3b85b157e4a032d1fbb68bd3d7a509ed765 (patch)
tree6a4fde9971a746d4903e0dbf3d1e9023a36ff93a /nova/exception.py
parent070e60d21776ea2b32ac557a0661d2025ef111d8 (diff)
downloadnova-15b2a3b85b157e4a032d1fbb68bd3d7a509ed765.tar.gz
nova-15b2a3b85b157e4a032d1fbb68bd3d7a509ed765.tar.xz
nova-15b2a3b85b157e4a032d1fbb68bd3d7a509ed765.zip
moved floating ip db access and sanity checking from network api into network manager
added floating ip get by fixed address added fixed_ip_get moved floating ip testing from osapi into the network tests where they belong Change-Id: I3ee53971206e37405a2adc2491412f7896e1af87
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/exception.py b/nova/exception.py
index e4d3b16f8..ca9453172 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -539,8 +539,12 @@ class NoMoreFloatingIps(FloatingIpNotFound):
message = _("Zero floating ips available.")
-class FloatingIpAlreadyInUse(NovaException):
- message = _("Floating ip %(address)s already in use by %(fixed_ip)s.")
+class FloatingIpAssociated(NovaException):
+ message = _("Floating ip %(address)s is associated.")
+
+
+class FloatingIpNotAssociated(NovaException):
+ message = _("Floating ip %(address)s is not associated.")
class NoFloatingIpsDefined(NotFound):