diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-11-22 16:50:29 -0500 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-11-28 13:56:32 -0500 |
| commit | dd44abb728e592fbd020af7fa362886b1436b968 (patch) | |
| tree | 035077345750fe94d5209e1d2d84165bd6d09c67 /nova/tests | |
| parent | c873d2a27891ab9863e7fd64bbc8a6fe7e31bfdf (diff) | |
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
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 16 |
1 files changed, 9 insertions, 7 deletions
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) |