From d4d7831236271e146d8c62cd1cc3275118985ed1 Mon Sep 17 00:00:00 2001 From: zhufl Date: Wed, 28 Aug 2019 09:44:27 +0800 Subject: [PATCH] [Trivial]Remove unused helper get_allocated_disk_size Helper get_allocated_disk_size is no longer used after d41ea9d87894111051b591d513cd046e5e357124, this is to remove it. Change-Id: Ib7a347b4fdb49fce893e227c72bdfbee4cea00ef --- nova/tests/unit/virt/libvirt/test_driver.py | 3 +-- nova/virt/disk/api.py | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 31aef2ebd380..f3f76095d275 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -4932,8 +4932,7 @@ class LibvirtConnTestCase(test.NoDBTestCase, @mock.patch.object(dmcrypt, 'delete_volume') @mock.patch.object(conn._host, '_get_domain', return_value=dom) - @mock.patch.object(libvirt_driver.disk_api, 'get_allocated_disk_size') - def detach_encrypted_volumes(block_device_info, mock_get_alloc_size, + def detach_encrypted_volumes(block_device_info, mock_get_domain, mock_delete_volume): conn._detach_encrypted_volumes(instance, block_device_info) diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index eed4cdd4d814..c79ae77371a0 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -107,16 +107,6 @@ def get_disk_size(path): return images.qemu_img_info(path).virtual_size -def get_allocated_disk_size(path): - """Get the allocated size of a disk image - - :param path: Path to the disk image - :returns: Size (in bytes) of the given disk image as allocated on the - filesystem - """ - return images.qemu_img_info(path).disk_size - - def extend(image, size): """Increase image to size.