From a2f9e4be5ca400b407fbb8aa11dd0888aad21aa1 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 17 Jun 2011 16:54:08 -0500 Subject: renamed VirtualInterface exception and extend NovaException --- nova/exception.py | 5 +++-- nova/network/manager.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nova/exception.py b/nova/exception.py index 6346c8931..5eec4b0cc 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -118,8 +118,9 @@ class NovaException(Exception): return self._error_string -class VirtualInterface(Exception): - message = _("Attempt to create virtual interface failed") +class VirtualInterfaceMacAddressException(NovaException): + message = _("5 attempts to create virtual interface" + "with unique mac address failed") class NotAuthorized(NovaException): diff --git a/nova/network/manager.py b/nova/network/manager.py index fd592c3e3..583ea3f8d 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -456,7 +456,7 @@ class NetworkManager(manager.SchedulerDependentManager): else: self.db.virtual_interface_delete_by_instance(context, instance_id) - raise exception.VirtualInterface(_("5 create attempts failed")) + raise exception.VirtualInterfaceMacAddressException() def generate_mac_address(self): """Generate a mac address for a vif on an instance.""" -- cgit