diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 22:41:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 22:41:53 +0000 |
| commit | 13c82f931f8220ebdcf561933bdd53799a4d8bb5 (patch) | |
| tree | f86c3b8c184a90e077f246e60f8a1dcef8b2dceb /nova/tests | |
| parent | b85641e1bc8d5dd6472d1ba4d450b7babe516a49 (diff) | |
| parent | 14129b4af8795a28a62b69897dc5cd6602353cc9 (diff) | |
Merge "Send a full instance in change_instance_metadata."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 3 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index d8bf703ea..5cee6f94d 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3382,7 +3382,8 @@ class ComputeAPITestCase(BaseTestCase): def test_instance_metadata(self): meta_changes = [None] - def fake_change_instance_metadata(inst, ctxt, instance, diff): + def fake_change_instance_metadata(inst, ctxt, diff, instance=None, + instance_uuid=None): meta_changes[0] = diff self.stubs.Set(compute_rpcapi.ComputeAPI, 'change_instance_metadata', fake_change_instance_metadata) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 3c9806b57..e099a776c 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -50,7 +50,7 @@ class ComputeRpcAPITestCase(test.TestCase): methods_with_instance = [ 'add_fixed_ip_to_instance', 'attach_volume', - 'check_can_live_migrate_destination', + 'change_instance_metadata', 'check_can_live_migrate_destination', 'check_can_live_migrate_source', 'confirm_resize', 'detach_volume', 'finish_resize', 'finish_revert_resize', 'get_console_output', 'get_diagnostics', 'get_vnc_console', @@ -132,6 +132,11 @@ class ComputeRpcAPITestCase(test.TestCase): instance=self.fake_instance, volume_id='id', mountpoint='mp', version='1.9') + def test_change_instance_metadata(self): + self._test_compute_api('change_instance_metadata', 'cast', + instance=self.fake_instance, diff={}, + version='1.36') + def test_check_can_live_migrate_destination(self): self._test_compute_api('check_can_live_migrate_destination', 'call', version='1.10', instance=self.fake_instance, @@ -337,8 +342,3 @@ class ComputeRpcAPITestCase(test.TestCase): def test_unrescue_instance(self): self._test_compute_api('unrescue_instance', 'cast', instance=self.fake_instance, version='1.35') - - def test_change_instance_metadata(self): - self._test_compute_api('change_instance_metadata', 'cast', - instance=self.fake_instance, diff={}, - version='1.3') |