pre trunk merge
This commit is contained in:
@@ -377,6 +377,10 @@ class FixedIpNotFoundForInstance(FixedIpNotFound):
|
||||
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):
|
||||
message = _("Virtual interface %(vif_id)s has zero associated fixed ips.")
|
||||
|
||||
|
@@ -268,6 +268,6 @@ class CommonNetworkTestCase(test.TestCase):
|
||||
|
||||
def test_remove_fixed_ip_from_instance_bad_input(self):
|
||||
manager = self.FakeNetworkManager()
|
||||
self.assertRaises(exception.FixedIpNotFound,
|
||||
self.assertRaises(exception.FixedIpNotFoundForSpecificInstance,
|
||||
manager.remove_fixed_ip_from_instance,
|
||||
None, 99, 'bad input')
|
||||
|
Reference in New Issue
Block a user