diff options
| author | Zuul <zuul@review.openstack.org> | 2019-04-15 14:33:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-15 14:33:41 +0000 |
| commit | c50d50e9410ed32692bbcf6911c40dd67deabc80 (patch) | |
| tree | ddc01e7c9c5abe61fedbbc72d0cee2bf23ae4ed3 | |
| parent | ca4de142bd40c418d44045f45c283c1ec8195253 (diff) | |
| parent | 0b0030ea2273840bd428070b2f23e755a30d2a35 (diff) | |
| download | nova-c50d50e9410ed32692bbcf6911c40dd67deabc80.tar.gz | |
Merge "Refix disk size during live migration with disk over-commit" into stable/ocata
| -rwxr-xr-x | nova/tests/unit/virt/libvirt/test_driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 7cf98cf830..9b4b8773b1 100755 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -7303,7 +7303,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): instance_ref.vcpu_model = test_vcpu_model.fake_vcpumodel drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) compute_info = {'disk_available_least': -1000, - 'local_gb': 100, + 'free_disk_gb': 50, 'cpu_info': 'asdf', } filename = "file" @@ -7320,7 +7320,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): return_value.is_volume_backed = False self.assertThat({"filename": "file", 'image_type': 'default', - 'disk_available_mb': 102400, + 'disk_available_mb': 51200, "disk_over_commit": True, "block_migration": True, "is_volume_backed": False}, diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 3d526db2e1..613852fd96 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -5844,7 +5844,7 @@ class LibvirtDriver(driver.ComputeDriver): :returns: a LibvirtLiveMigrateData object """ if disk_over_commit: - disk_available_gb = dst_compute_info['local_gb'] + disk_available_gb = dst_compute_info['free_disk_gb'] else: disk_available_gb = dst_compute_info['disk_available_least'] disk_available_mb = ( |