diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-15 13:54:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-15 13:54:07 +0000 |
| commit | a76af123072bcd16b183df7e87ab172a9e43dda0 (patch) | |
| tree | 2d68b9b758225ff770e8d5275b648fdfa363fef3 | |
| parent | daad84bec14a6937d66eaaa4b78ddab8402e89eb (diff) | |
| parent | 1985b176adff8252886c09f36c075af4144cb95f (diff) | |
| download | nova-a76af123072bcd16b183df7e87ab172a9e43dda0.tar.gz nova-a76af123072bcd16b183df7e87ab172a9e43dda0.tar.xz nova-a76af123072bcd16b183df7e87ab172a9e43dda0.zip | |
Merge "Fix VMwareVCdriver reporting incorrect stats"
| -rw-r--r-- | nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py | 7 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/fake.py | 5 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/host.py | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py index eda2c25f9..123a314c1 100644 --- a/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py +++ b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py @@ -1,5 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# + +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Canonical Corp. # All Rights Reserved. # @@ -41,8 +42,8 @@ class VMwareVMUtilTestCase(test.TestCase): fake_session([fake.Datastore()])) self.assertEquals(result[1], "fake-ds") - self.assertEquals(result[2], 1024 * 1024 * 1024) - self.assertEquals(result[3], 1024 * 1024 * 500) + self.assertEquals(result[2], 1024 * 1024 * 1024 * 1024) + self.assertEquals(result[3], 1024 * 1024 * 500 * 1024) def test_get_datastore_ref_and_name_without_datastore(self): diff --git a/nova/virt/vmwareapi/fake.py b/nova/virt/vmwareapi/fake.py index 07eef5d2f..83c53e5cb 100644 --- a/nova/virt/vmwareapi/fake.py +++ b/nova/virt/vmwareapi/fake.py @@ -1,5 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # Copyright (c) 2011 Citrix Systems, Inc. # Copyright 2011 OpenStack Foundation @@ -256,8 +257,8 @@ class Datastore(ManagedObject): super(Datastore, self).__init__("Datastore") self.set("summary.type", "VMFS") self.set("summary.name", "fake-ds") - self.set("summary.capacity", 1024 * 1024 * 1024) - self.set("summary.freeSpace", 500 * 1024 * 1024) + self.set("summary.capacity", 1024 * 1024 * 1024 * 1024) + self.set("summary.freeSpace", 500 * 1024 * 1024 * 1024) class HostNetworkSystem(ManagedObject): diff --git a/nova/virt/vmwareapi/host.py b/nova/virt/vmwareapi/host.py index f95321715..6fb8a8ff8 100644 --- a/nova/virt/vmwareapi/host.py +++ b/nova/virt/vmwareapi/host.py @@ -127,8 +127,8 @@ class HostState(object): "sockets": summary.hardware.numCpuPkgs, "threads": summary.hardware.numCpuThreads} } - data["disk_total"] = ds[2] / (1024 * 1024) - data["disk_available"] = ds[3] / (1024 * 1024) + data["disk_total"] = ds[2] / (1024 * 1024 * 1024) + data["disk_available"] = ds[3] / (1024 * 1024 * 1024) data["disk_used"] = data["disk_total"] - data["disk_available"] data["host_memory_total"] = summary.hardware.memorySize / (1024 * 1024) data["host_memory_free"] = data["host_memory_total"] - \ @@ -194,8 +194,8 @@ class VCState(object): "sockets": summary.hardware.numCpuPkgs, "threads": summary.hardware.numCpuThreads} } - data["disk_total"] = ds[2] / (1024 * 1024) - data["disk_available"] = ds[3] / (1024 * 1024) + data["disk_total"] = ds[2] / (1024 * 1024 * 1024) + data["disk_available"] = ds[3] / (1024 * 1024 * 1024) data["disk_used"] = data["disk_total"] - data["disk_available"] data["host_memory_total"] = summary.hardware.memorySize / (1024 * 1024) data["host_memory_free"] = data["host_memory_total"] -\ |