CLOUDSTACK-605: Host physical CPU is incorrectly calculated for Vmware hosts Fixed logic to compute Vmware host cpu

Koushik Das · jzb · commit 3dfd81fd6bcc · 2013-01-09T14:03:04.000-06:00
Signed-off-by: Koushik Das &lt;koushik.das@citrix.com&gt;
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -840,11 +840,9 @@ public VmwareHypervisorHostResourceSummary getHyperHostResourceSummary() throws
 		
 		VmwareHypervisorHostResourceSummary summary = new VmwareHypervisorHostResourceSummary();
 		
-		HostConnectInfo hostInfo = _context.getService().queryHostConnectionInfo(_mor);
-		HostHardwareSummary hardwareSummary = hostInfo.getHost().getHardware();
-		
+        HostHardwareSummary hardwareSummary = getHostHardwareSummary();
 		// TODO: not sure how hyper-thread is counted in VMware resource pool
-		summary.setCpuCount(hardwareSummary.getNumCpuCores()*hardwareSummary.getNumCpuPkgs());
+        summary.setCpuCount(hardwareSummary.getNumCpuCores());
 		summary.setMemoryBytes(hardwareSummary.getMemorySize());
 		summary.setCpuSpeed(hardwareSummary.getCpuMhz());
 
@@ -922,14 +920,13 @@ public ComputeResourceSummary getHyperHostHardwareSummary() throws Exception {
 		ComputeResourceSummary resourceSummary = new ComputeResourceSummary();
 		
 		// TODO: not sure how hyper-threading is counted in VMware
-		short totalCores = (short)(hardwareSummary.getNumCpuCores()*hardwareSummary.getNumCpuPkgs());
-		resourceSummary.setNumCpuCores(totalCores);
+        resourceSummary.setNumCpuCores(hardwareSummary.getNumCpuCores());
 		
 		// Note: memory here is in Byte unit
 		resourceSummary.setTotalMemory(hardwareSummary.getMemorySize());
 		
-		// Total CPU is based on socket x core x Mhz
-		int totalCpu = hardwareSummary.getCpuMhz() * totalCores;
+        // Total CPU is based on (# of cores) x Mhz
+        int totalCpu = hardwareSummary.getCpuMhz() * hardwareSummary.getNumCpuCores();
 		resourceSummary.setTotalCpu(totalCpu);
 
 		HostListSummaryQuickStats stats = getHostQuickStats();
