You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/12/23 08:53:36 UTC
git commit: updated refs/heads/4.3 to 105e27b
Updated Branches:
refs/heads/4.3 58aaf6780 -> 105e27b73
CLOUDSTACK-5210: Fix the sockets reported by the hyperv agent.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/105e27b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/105e27b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/105e27b7
Branch: refs/heads/4.3
Commit: 105e27b73de823de58ac6f62d1503b497c6c9f81
Parents: 58aaf67
Author: Devdeep Singh <de...@gmail.com>
Authored: Mon Dec 23 20:12:39 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Dec 23 13:23:55 2013 +0530
----------------------------------------------------------------------
.../ServerResource/HypervResource/HypervResourceController.cs | 4 +++-
.../hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs | 2 +-
.../hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs | 4 +++-
.../hypervisor/hyperv/resource/HypervDirectConnectResource.java | 3 +--
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/105e27b7/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index e560113..34eebfd 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1689,9 +1689,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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/105e27b7/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
index 35cdec0..5f814c5 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/105e27b7/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index 6eb8353..f0f7f7b 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -1715,16 +1715,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++;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/105e27b7/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
----------------------------------------------------------------------
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 7047685..a2475a9 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
@@ -191,8 +191,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