1 files changed, 45 insertions, 12 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 6e277b68d..8b68700f6 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -149,6 +149,15 @@ class NovaException(Exception):
         return self._error_string
 
 
+class VirtualInterfaceCreateException(NovaException):
+    message = _("Virtual Interface creation failed")
+
+
+class VirtualInterfaceMacAddressException(NovaException):
+    message = _("5 attempts to create virtual interface"
+                "with unique mac address failed")
+
+
 class NotAuthorized(NovaException):
     message = _("Not authorized.")
 
@@ -387,34 +396,58 @@ class DatastoreNotFound(NotFound):
     message = _("Could not find the datastore reference(s) which the VM uses.")
 
 
-class NoFixedIpsFoundForInstance(NotFound):
+class FixedIpNotFound(NotFound):
+    message = _("No fixed IP associated with id %(id)s.")
+
+
+class FixedIpNotFoundForAddress(FixedIpNotFound):
+    message = _("Fixed ip not found for address %(address)s.")
+
+
+class FixedIpNotFoundForInstance(FixedIpNotFound):
     message = _("Instance %(instance_id)s has zero fixed ips.")
 
 
-class FloatingIpNotFound(NotFound):
-    message = _("Floating ip %(floating_ip)s not found")
+class FixedIpNotFoundForVirtualInterface(FixedIpNotFound):
+    message = _("Virtual interface %(vif_id)s has zero associated fixed ips.")
 
 
-class FloatingIpNotFoundForFixedAddress(NotFound):
-    message = _("Floating ip not found for fixed address %(fixed_ip)s.")
+class FixedIpNotFoundForHost(FixedIpNotFound):
+    message = _("Host %(host)s has zero fixed ips.")
 
 
-class NoFloatingIpsDefined(NotFound):
-    message = _("Zero floating ips could be found.")
+class NoMoreFixedIps(Error):
+    message = _("Zero fixed ips available.")
 
 
-class NoFloatingIpsDefinedForHost(NoFloatingIpsDefined):
-    message = _("Zero floating ips defined for host %(host)s.")
+class NoFixedIpsDefined(NotFound):
+    message = _("Zero fixed ips could be found.")
 
 
-class NoFloatingIpsDefinedForInstance(NoFloatingIpsDefined):
-    message = _("Zero floating ips defined for instance %(instance_id)s.")
+class FloatingIpNotFound(NotFound):
+    message = _("Floating ip not found for id %(id)s.")
+
+
+class FloatingIpNotFoundForAddress(FloatingIpNotFound):
+    message = _("Floating ip not found for address %(address)s.")
+
+
+class FloatingIpNotFoundForProject(FloatingIpNotFound):
+    message = _("Floating ip not found for project %(project_id)s.")
 
 
-class NoMoreFloatingIps(NotFound):
+class FloatingIpNotFoundForHost(FloatingIpNotFound):
+    message = _("Floating ip not found for host %(host)s.")
+
+
+class NoMoreFloatingIps(FloatingIpNotFound):
     message = _("Zero floating ips available.")
 
 
+class NoFloatingIpsDefined(NotFound):
+    message = _("Zero floating ips exist.")
+
+
 class KeypairNotFound(NotFound):
     message = _("Keypair %(keypair_name)s not found for user %(user_id)s")