Merge "Calculate stopped instance's disk sizes for disk_available_least" into stable/ocata
This commit is contained in:
commit
fe32902926
|
@ -12350,7 +12350,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
|
|||
|
||||
result = drvr._get_disk_over_committed_size_total()
|
||||
self.assertEqual(result, 10653532160)
|
||||
mock_list.assert_called_once_with()
|
||||
mock_list.assert_called_once_with(only_running=False)
|
||||
self.assertEqual(2, mock_info.call_count)
|
||||
|
||||
filters = {'uuid': instance_uuids}
|
||||
|
@ -12461,7 +12461,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
|
|||
|
||||
result = drvr._get_disk_over_committed_size_total()
|
||||
self.assertEqual(42949672960, result)
|
||||
mock_list.assert_called_once_with()
|
||||
mock_list.assert_called_once_with(only_running=False)
|
||||
self.assertEqual(5, get_disk_info.call_count)
|
||||
filters = {'uuid': instance_uuids}
|
||||
mock_get.assert_called_once_with(mock.ANY, filters, use_slave=True)
|
||||
|
|
|
@ -7071,7 +7071,7 @@ class LibvirtDriver(driver.ComputeDriver):
|
|||
"""Return total over committed disk size for all instances."""
|
||||
# Disk size that all instance uses : virtual_size - disk_size
|
||||
disk_over_committed_size = 0
|
||||
instance_domains = self._host.list_instance_domains()
|
||||
instance_domains = self._host.list_instance_domains(only_running=False)
|
||||
if not instance_domains:
|
||||
return disk_over_committed_size
|
||||
|
||||
|
|
Loading…
Reference in New Issue