Updated Branches: refs/heads/4.3 8581e5816 -> 99e65d051
Fixed issues on HyperV Agent code for shared network VR issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99e65d05 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99e65d05 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99e65d05 Branch: refs/heads/4.3 Commit: 99e65d051dcd0b87fab86b6c65bb3c51c29f037f Parents: 8581e58 Author: Rajesh Battala <[email protected]> Authored: Mon Dec 2 18:03:59 2013 +0530 Committer: Rajesh Battala <[email protected]> Committed: Mon Dec 2 18:09:37 2013 +0530 ---------------------------------------------------------------------- .../DotNet/ServerResource/HypervResource/WmiCallsV2.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99e65d05/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 ca49bd9..e2d4f6c 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs @@ -431,7 +431,15 @@ namespace HypervResource System.Threading.Thread.Sleep(90000); SetState(newVm, RequiredState.Reset); // wait for the second boot and then return with sucesss - pingResource(publicIpAddress); + //if publicIPAddress is empty or null don't ping the ip + if (publicIpAddress.Equals("") == true) + { + System.Threading.Thread.Sleep(90000); + } + else + { + pingResource(publicIpAddress); + } } logger.InfoFormat("Started VM {0}", vmName); return newVm;
