You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/10/29 11:16:26 UTC

[2/3] git commit: updated refs/heads/hyperv to ee0788b

Fixed the issues for ssvm and cpvm to wait until it gets configured and then return the status. Made checksum method to return true.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/279793e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/279793e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/279793e5

Branch: refs/heads/hyperv
Commit: 279793e530dd200201ca2795656d95091a09adf0
Parents: 7ac1ac9
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Oct 29 15:43:28 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Oct 29 15:43:28 2013 +0530

----------------------------------------------------------------------
 .../ServerResource/HypervResource/HypervResourceController.cs      | 2 +-
 .../hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/279793e5/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 e1c75e3..4278d70 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1193,7 +1193,7 @@ namespace HypervResource
             {
                 return true;
             }
-            return false;
+            return true;
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/279793e5/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
index 2540e92..985ceba 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCalls.cs
@@ -348,7 +348,7 @@ namespace HypervResource
             SetState(newVm, RequiredState.Enabled);
 
             // we need to reboot to get the hv kvp daemon get started vr gets configured.
-            if (vmName.StartsWith("r-"))
+            if (vmName.StartsWith("r-") || vmName.StartsWith("s-") || vmName.StartsWith("v-"))
             {
                 System.Threading.Thread.Sleep(90000);
                 SetState(newVm, RequiredState.Reboot);