diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 51a27bfdcd2..f48a6f021f8 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -1683,9 +1683,11 @@ namespace HypervResource // Detect CPUs, speed, memory uint cores; uint mhz; - wmiCallsV2.GetProcessorResources(out cores, out mhz); + uint sockets; + wmiCallsV2.GetProcessorResources(out sockets, out cores, out mhz); strtRouteCmd.cpus = cores; strtRouteCmd.speed = mhz; + strtRouteCmd.cpuSockets = sockets; ulong memoryKBs; ulong freeMemoryKBs; wmiCallsV2.GetMemoryResources(out memoryKBs, out freeMemoryKBs); diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs index 35cdec00373..5f814c59535 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs @@ -52,7 +52,7 @@ namespace HypervResource KvpExchangeComponentSettingData GetKvpSettings(VirtualSystemSettingData vmSettings); void GetMemoryResources(out ulong physicalRamKBs, out ulong freeMemoryKBs); MemorySettingData GetMemSettings(VirtualSystemSettingData vmSettings); - void GetProcessorResources(out uint cores, out uint mhz); + void GetProcessorResources(out uint sockets, out uint cores, out uint mhz); void GetProcessorUsageInfo(out double cpuUtilization); ProcessorSettingData GetProcSettings(VirtualSystemSettingData vmSettings); ResourceAllocationSettingData.ResourceAllocationSettingDataCollection GetResourceAllocationSettings(VirtualSystemSettingData vmSettings); diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs index 2248afa05e0..23a5dd3b958 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs @@ -1723,16 +1723,18 @@ namespace HypervResource } } - public void GetProcessorResources(out uint cores, out uint mhz) + public void GetProcessorResources(out uint sockets, out uint cores, out uint mhz) { // Processor processors cores = 0; mhz = 0; + sockets = 0; Processor.ProcessorCollection procCol = Processor.GetInstances(); foreach (Processor procInfo in procCol) { cores += procInfo.NumberOfCores; mhz = procInfo.MaxClockSpeed; + sockets++; } } diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java index 5de3d7012fd..99e21e48574 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java @@ -183,8 +183,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S s_logger.debug("Generated StartupRoutingCommand for _agentIp \"" + _agentIp + "\""); - // TODO: does version need to be hard coded. - defaultStartRoutCmd.setVersion("4.2.0"); + defaultStartRoutCmd.setVersion(this.getClass().getPackage().getImplementationVersion()); // Specifics of the host's resource capacity and network configuration // comes from the host itself. CloudStack sanity checks network