diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-30 21:59:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-30 21:59:56 +0000 |
| commit | d56b5fc3ad6dbfc56e0729174925fb146cef87fa (patch) | |
| tree | de2fa52c66683f2d360c3e747588a010696da272 /nova/tests | |
| parent | 16b7e07066446bdafc778ccb6c723783f80c0452 (diff) | |
| parent | 96134f9e34faf7e4be1776b24c8d8d661a23342a (diff) | |
Merge "Send a full instance in remove_fixed_ip_from_instance."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 7 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 701205417..fc2b183d9 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -888,13 +888,12 @@ class ComputeTestCase(BaseTestCase): self.stubs.Set(nova.compute.manager.ComputeManager, 'reset_network', dummy) - instance = self._create_fake_instance() + instance = jsonutils.to_primitive(self._create_fake_instance()) instance_uuid = instance['uuid'] self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) - self.compute.remove_fixed_ip_from_instance(self.context, - instance_uuid, - 1) + self.compute.remove_fixed_ip_from_instance(self.context, 1, + instance=instance) self.assertEquals(len(test_notifier.NOTIFICATIONS), 2) self.compute.terminate_instance(self.context, instance_uuid) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 79b33f25d..e081c1455 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -57,7 +57,8 @@ class ComputeRpcAPITestCase(test.TestCase): 'inject_file', 'inject_network_info', 'pause_instance', 'post_live_migration_at_destination', 'power_off_instance', 'power_on_instance', 'pre_live_migration', 'reboot_instance', - 'rebuild_instance', 'start_instance', 'stop_instance', + 'rebuild_instance', 'remove_fixed_ip_from_instance', + 'start_instance', 'stop_instance', 'suspend_instance', 'unpause_instance' ] @@ -257,7 +258,7 @@ class ComputeRpcAPITestCase(test.TestCase): def test_remove_fixed_ip_from_instance(self): self._test_compute_api('remove_fixed_ip_from_instance', 'cast', - instance=self.fake_instance, address='addr') + instance=self.fake_instance, address='addr', version='1.25') def test_remove_volume_connection(self): self._test_compute_api('remove_volume_connection', 'call', |