diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-07-26 13:27:15 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-07-26 18:46:32 -0400 |
| commit | 9374157d27f5df34cdc5e78bc384f97382243013 (patch) | |
| tree | 7612fd16c40d45b38471d2c5ac50b65d0c814c60 | |
| parent | 6106973d2fdf57be67d6de4bd5924321ed7e5772 (diff) | |
Remove get_instance_disk_info from compute rpcapi.
This method is no longer used in any current code, so remove it from the
client side code for the rpcapi. The server-side code remains (the
compute manager) for backwards compatibility with older versions.
This method was previously used by the scheduler, but was removed by
some refactoring done in cac332c39645286a11c009094a86f62d02752183.
Change-Id: Icb11001ac0880ca8df67b4dd9f0fe1eaca7fa3bb
| -rw-r--r-- | nova/compute/manager.py | 3 | ||||
| -rw-r--r-- | nova/compute/rpcapi.py | 5 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index aeebc577a..7168fdf3a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2079,6 +2079,9 @@ class ComputeManager(manager.SchedulerDependentManager): def get_instance_disk_info(self, context, instance_name): """Getting infomation of instance's current disk. + DEPRECATED: This method is no longer used by any current code, but it + is left here to provide backwards compatibility in the rpcapi. + Implementation nova.virt.libvirt.connection. :param context: security context diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 95f7f0d23..86bad50e2 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -188,11 +188,6 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): topic=_compute_topic(self.topic, ctxt, None, instance), version='1.16') - def get_instance_disk_info(self, ctxt, instance): - return self.call(ctxt, self.make_msg('get_instance_disk_info', - instance_name=instance['name']), - topic=_compute_topic(self.topic, ctxt, None, instance)) - def get_vnc_console(self, ctxt, instance, console_type): return self.call(ctxt, self.make_msg('get_vnc_console', instance_uuid=instance['uuid'], console_type=console_type), diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index bec10009c..e1b33210c 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -86,8 +86,6 @@ class ComputeRpcAPITestCase(test.TestCase): 'check_can_live_migrate_destination', 'check_can_live_migrate_source']: expected_msg['args']['instance_id'] = instance['id'] - elif method == 'get_instance_disk_info': - expected_msg['args']['instance_name'] = instance['name'] else: expected_msg['args']['instance_uuid'] = instance['uuid'] expected_msg['version'] = expected_version @@ -185,10 +183,6 @@ class ComputeRpcAPITestCase(test.TestCase): self._test_compute_api('get_diagnostics', 'call', instance=self.fake_instance, version='1.16') - def test_get_instance_disk_info(self): - self._test_compute_api('get_instance_disk_info', 'call', - instance=self.fake_instance) - def test_get_vnc_console(self): self._test_compute_api('get_vnc_console', 'call', instance=self.fake_instance, console_type='type') |