From dd44abb728e592fbd020af7fa362886b1436b968 Mon Sep 17 00:00:00 2001 From: Naveed Massjouni Date: Tue, 22 Nov 2011 16:50:29 -0500 Subject: Updating {add,remove}_fixed_ip_from_instance in compute.api and compute.manager to use instance uuid instead of instance id. blueprint internal-uuids Change-Id: I0db18fcbfce24d0cf1b8b9e7c8d10f657ceded0f --- nova/tests/test_compute.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index a67d16e40..26adae2e3 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -422,12 +422,12 @@ class ComputeTestCase(BaseTestCase): self.stubs.Set(nova.compute.manager.ComputeManager, 'reset_network', dummy) - instance_id = self._create_instance() + instance = self._create_fake_instance() + instance_id = instance['id'] + instance_uuid = instance['uuid'] self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) - self.compute.add_fixed_ip_to_instance(self.context, - instance_id, - 1) + self.compute.add_fixed_ip_to_instance(self.context, instance_uuid, 1) self.assertEquals(len(test_notifier.NOTIFICATIONS), 1) self.compute.terminate_instance(self.context, instance_id) @@ -443,12 +443,14 @@ class ComputeTestCase(BaseTestCase): self.stubs.Set(nova.compute.manager.ComputeManager, 'reset_network', dummy) - instance_id = self._create_instance() + instance = self._create_fake_instance() + instance_id = instance['id'] + instance_uuid = instance['uuid'] self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) self.compute.remove_fixed_ip_from_instance(self.context, - instance_id, - 1) + instance_uuid, + 1) self.assertEquals(len(test_notifier.NOTIFICATIONS), 1) self.compute.terminate_instance(self.context, instance_id) -- cgit