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:25 UTC
[1/3] git commit: updated refs/heads/hyperv to ee0788b
Updated Branches:
refs/heads/hyperv 8f508a023 -> ee0788bff
Fixed the UNC path for copying the files from CIFS, and from seeded template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ac1ac9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ac1ac9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ac1ac9f
Branch: refs/heads/hyperv
Commit: 7ac1ac9faf32c46680d9c9ec52071161febd5d89
Parents: 8f508a0
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Oct 29 15:41:17 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Oct 29 15:41:17 2013 +0530
----------------------------------------------------------------------
.../ServerResource/HypervResource/Utils.cs | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ac1ac9f/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
index 3baab5b..e55f2ad 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
@@ -66,29 +66,28 @@ namespace HypervResource
bool isSuccess = LogonUser(cifsShareDetails.User, cifsShareDetails.Domain, cifsShareDetails.Password, LOGON32_LOGON_NEW_CREDENTIALS, LOGON32_PROVIDER_DEFAULT, ref token);
using (WindowsImpersonationContext remoteIdentity = new WindowsIdentity(token).Impersonate())
{
-
+ String dest = "";
+ if (filePathRelativeToShare.EndsWith(".iso") || filePathRelativeToShare.EndsWith(".vhd") || filePathRelativeToShare.EndsWith(".vhdx"))
+ {
+ dest = Path.Combine(cifsShareDetails.UncPath, filePathRelativeToShare);
+ dest = dest.Replace('/', Path.DirectorySeparatorChar);
+ }
// if the filePathRelativeToShare string don't have filename and only a dir point then find the vhd files in that folder and use
// In the clean setup, first copy command wont be having the filename it contains onlyu dir path.
// we need to scan the folder point and then copy the file to destination.
- String dest = "";
- if (!filePathRelativeToShare.Contains(".vhd"))
+ else if (!filePathRelativeToShare.EndsWith(".vhd") || !filePathRelativeToShare.EndsWith(".vhdx"))
{
// scan the folder and get the vhd filename.
- String uncPath = cifsShareDetails.UncPath + "\\" + filePathRelativeToShare;
- uncPath = uncPath.Replace("/", "\\");
+ String uncPath = Path.Combine(cifsShareDetails.UncPath, Path.Combine(filePathRelativeToShare.Split('/')));
+ //uncPath = uncPath.Replace("/", "\\");
DirectoryInfo dir = new DirectoryInfo(uncPath);
- FileInfo[] vhdFiles = dir.GetFiles("*.vhd");
+ FileInfo[] vhdFiles = dir.GetFiles("*.vhd*");
if (vhdFiles.Length > 0)
{
FileInfo file = vhdFiles[0];
dest = file.FullName;
}
}
- else
- {
- dest = Path.Combine(cifsShareDetails.UncPath, filePathRelativeToShare);
- dest = dest.Replace("/", "\\");
- }
s_logger.Info(CloudStackTypes.CopyCommand + ": copy " + Path.Combine(cifsShareDetails.UncPath, filePathRelativeToShare) + " to " + destFile);
File.Copy(dest, destFile, true);
[2/3] git commit: updated refs/heads/hyperv to ee0788b
Posted by ra...@apache.org.
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);
[3/3] git commit: updated refs/heads/hyperv to ee0788b
Posted by ra...@apache.org.
Fixed HypervDirectConnect resource to figure out the status of systemvms, Need to fix this issue by connecting to public/control ip instead of local ip
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee0788bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee0788bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee0788bf
Branch: refs/heads/hyperv
Commit: ee0788bff8eb46bafa713e15b1ba057a57217a9e
Parents: 279793e
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Oct 29 15:44:59 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Oct 29 15:44:59 2013 +0530
----------------------------------------------------------------------
.../hypervisor/hyperv/resource/HypervDirectConnectResource.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee0788bf/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 7069748..a8a09f6 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
@@ -1706,9 +1706,10 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
sch = SocketChannel.open();
sch.configureBlocking(true);
sch.socket().setSoTimeout(5000);
-
+ // we need to connect to the public ip address to check the status of the VM
+/*
InetSocketAddress addr = new InetSocketAddress(ipAddress, port);
- sch.connect(addr);
+ sch.connect(addr);*/
return null;
} catch (IOException e) {
s_logger.info("Could not connect to " + ipAddress + " due to " + e.toString());