You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 17:31:16 UTC
[3/3] git commit: updated refs/heads/4.4 to 8fb89cd
CLOUDSTACK-6504: removed warnings coming in building hyper-v agent code
(cherry picked from commit 66f8e0e1b5c81cbfde926c0c65c4d5969767cab9)
Conflicts:
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8fb89cdc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8fb89cdc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8fb89cdc
Branch: refs/heads/4.4
Commit: 8fb89cdc8e2dff60d49fecd3e51a9bf997061035
Parents: 48f9453
Author: Anshul Gangwar <an...@citrix.com>
Authored: Thu Apr 24 22:30:12 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 17:31:03 2014 +0200
----------------------------------------------------------------------
.../HypervResource/CloudStackTypes.cs | 8 +-
.../HypervResource/HypervResourceController.cs | 3558 +++++++++---------
.../ServerResource/HypervResource/Utils.cs | 4 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 1483 +++++---
4 files changed, 2740 insertions(+), 2313 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8fb89cdc/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
index ef24c79..4516191 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -302,7 +302,7 @@ namespace HypervResource
path = Utils.NormalizePath(path);
if (Directory.Exists(path))
{
- string[] choices = choices = Directory.GetFiles(path, volInfo.uuid + ".vhd*");
+ string[] choices = Directory.GetFiles(path, volInfo.uuid + ".vhd*");
if (choices.Length != 1)
{
String errMsg = "Tried to guess file extension, but cannot find file corresponding to " +
@@ -609,6 +609,7 @@ namespace HypervResource
public struct VolumeInfo
{
+#pragma warning disable 0414
public long id;
public string type;
public string storagePoolType;
@@ -618,6 +619,7 @@ namespace HypervResource
public string path;
long size;
string chainInfo;
+#pragma warning restore 0414
public VolumeInfo(long id, string type, string poolType, String poolUuid, String name, String mountPoint, String path, long size, String chainInfo)
{
@@ -635,10 +637,12 @@ namespace HypervResource
public class VmState
{
+#pragma warning disable 0414
[JsonProperty("state")]
public String state;
[JsonProperty("host")]
String host;
+#pragma warning restore 0414
public VmState() { }
public VmState(String vmState, String host)
{
@@ -649,6 +653,7 @@ namespace HypervResource
public struct StoragePoolInfo
{
+#pragma warning disable 0414
[JsonProperty("uuid")]
public String uuid;
[JsonProperty("host")]
@@ -667,6 +672,7 @@ namespace HypervResource
long availableBytes;
[JsonProperty("details")]
Dictionary<String, String> details;
+#pragma warning restore 0414
public StoragePoolInfo(String uuid, String host, String hostPath,
String localPath, string poolType, long capacityBytes,