x/gantt
Code Issues Proposed changes

pre trunk merge

Browse Source
This commit is contained in:
Sandy Walsh
2011-07-11 07:49:34 -07:00
parent 51484a6a97
commit 6e4dda5226
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/exception.py
View File

@@ -377,6 +377,10 @@ class FixedIpNotFoundForInstance(FixedIpNotFound):
message = _("Instance %(instance_id)s has zero fixed ips.") message = _("Instance %(instance_id)s has zero fixed ips.")
class FixedIpNotFoundForSpecificInstance(FixedIpNotFound):
message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.")
class FixedIpNotFoundForVirtualInterface(FixedIpNotFound): class FixedIpNotFoundForVirtualInterface(FixedIpNotFound):
message = _("Virtual interface %(vif_id)s has zero associated fixed ips.") message = _("Virtual interface %(vif_id)s has zero associated fixed ips.")

2
nova/tests/test_network.py
View File

@@ -268,6 +268,6 @@ class CommonNetworkTestCase(test.TestCase):
def test_remove_fixed_ip_from_instance_bad_input(self): def test_remove_fixed_ip_from_instance_bad_input(self):
manager = self.FakeNetworkManager() manager = self.FakeNetworkManager()
self.assertRaises(exception.FixedIpNotFound, self.assertRaises(exception.FixedIpNotFoundForSpecificInstance,
manager.remove_fixed_ip_from_instance, manager.remove_fixed_ip_from_instance,
None, 99, 'bad input') None, 99, 'bad input')