cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/master to 216554d
Date Mon, 23 Dec 2013 07:54:39 GMT
Updated Branches:
  refs/heads/master fde14bcc3 -> 216554d57


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/216554d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/216554d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/216554d5

Branch: refs/heads/master
Commit: 216554d574c02d47265d707cf0377c5cec1c0b48
Parents: fde14bc
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Mon Dec 23 20:12:39 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Mon Dec 23 13:25:22 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/216554d5/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 51a27bf..f48a6f0 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);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/216554d5/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/216554d5/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 2248afa..23a5dd3 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++;
            }
         }
         

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/216554d5/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 5de3d70..99e21e4 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


Mime
View raw message