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/06/13 12:41:44 UTC
[2/4] git commit: updated refs/heads/4.4 to a951b51
CLOUDSTACK-6872: [hyperv] removed the redundant connectToRemote, DisconnectRemote methods which in turn fixes this bug. connectToRemote was used to connect to share, but once the share is domain joined we don't need this method as we already have required permissions
(cherry picked from commit cef29948a708fbbae1261dbd8b6a13e4da19c703)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef0cec93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef0cec93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef0cec93
Branch: refs/heads/4.4
Commit: ef0cec938165fdf3531f92dc8f4c2930ff95fa5e
Parents: 117c8fe
Author: Anshul Gangwar <an...@citrix.com>
Authored: Wed Jun 11 11:04:35 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 13 12:39:27 2014 +0200
----------------------------------------------------------------------
.../HypervResource/HypervResourceController.cs | 15 ---------
.../ServerResource/HypervResource/Utils.cs | 33 --------------------
.../ServerResource/HypervResource/WmiCallsV2.cs | 3 +-
3 files changed, 1 insertion(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef0cec93/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 b6f9a01..1a46b50 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -236,7 +236,6 @@ namespace HypervResource
{
TemplateObjectTO dataStore = disk.templateObjectTO;
NFSTO share = dataStore.nfsDataStoreTO;
- Utils.ConnectToRemote(share.UncPath, share.Domain, share.User, share.Password);
string diskPath = Utils.NormalizePath(Path.Combine(share.UncPath, dataStore.path));
wmiCallsV2.AttachIso(vmName, diskPath);
result = true;
@@ -244,11 +243,6 @@ namespace HypervResource
else if (disk.type.Equals("DATADISK"))
{
VolumeObjectTO volume = disk.volumeObjectTO;
- PrimaryDataStoreTO primary = volume.primaryDataStore;
- if (!primary.isLocal)
- {
- Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
- }
string diskPath = Utils.NormalizePath(volume.FullFileName);
wmiCallsV2.AttachDisk(vmName, diskPath, disk.diskSequence);
result = true;
@@ -991,7 +985,6 @@ namespace HypervResource
hostPath = Utils.NormalizePath(share.UncPath);
// Check access to share.
- Utils.ConnectToRemote(share.UncPath, share.Domain, share.User, share.Password);
Utils.GetShareDetails(share.UncPath, out capacityBytes, out availableBytes);
config.setPrimaryStorage((string)cmd.pool.uuid, hostPath);
}
@@ -1283,7 +1276,6 @@ namespace HypervResource
{
volumePath = @"\\" + primary.uri.Host + primary.uri.LocalPath + @"\" + volumeName;
volumePath = Utils.NormalizePath(volumePath);
- Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
}
volume.path = volume.uuid;
wmiCallsV2.CreateDynamicVirtualHardDisk(volumeSize, volumePath);
@@ -1558,17 +1550,10 @@ namespace HypervResource
if (destTemplateObjectTO.primaryDataStore != null)
{
destFile = destTemplateObjectTO.FullFileName;
- if (!destTemplateObjectTO.primaryDataStore.isLocal)
- {
- PrimaryDataStoreTO primary = destTemplateObjectTO.primaryDataStore;
- Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
- }
}
else if (destTemplateObjectTO.nfsDataStoreTO != null)
{
destFile = destTemplateObjectTO.FullFileName;
- NFSTO store = destTemplateObjectTO.nfsDataStoreTO;
- Utils.ConnectToRemote(store.UncPath, store.Domain, store.User, store.Password);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef0cec93/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 d0d3d83..07dd78b 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs
@@ -128,32 +128,6 @@ namespace HypervResource
}
}
- public static void ConnectToRemote(string remoteUNC, string domain, string username, string password)
- {
- NETRESOURCE nr = new NETRESOURCE();
- nr.dwType = RESOURCETYPE_DISK;
- nr.lpRemoteName = Utils.NormalizePath(remoteUNC);
- if (domain != null)
- {
- username = domain + @"\" + username;
- }
-
- int ret = WNetUseConnection(IntPtr.Zero, nr, password, username, 0, null, null, null);
- if (ret != NO_ERROR)
- {
- throw new ArgumentException("net use of share " + remoteUNC + "failed with "+ getErrorForNumber(ret));
- }
- }
-
- public static void DisconnectRemote(string remoteUNC)
- {
- int ret = WNetCancelConnection2(remoteUNC, CONNECT_UPDATE_PROFILE, false);
- if (ret != NO_ERROR)
- {
- throw new ArgumentException("net disconnect of share " + remoteUNC + "failed with " + getErrorForNumber(ret));
- }
- }
-
public static void GetShareDetails(string remoteUNC, out long capacity, out long available)
{
ulong freeBytesAvailable;
@@ -228,13 +202,6 @@ namespace HypervResource
[DllImport("advapi32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public extern static bool DuplicateToken(IntPtr existingTokenHandle, int SECURITY_IMPERSONATION_LEVEL, ref IntPtr duplicateTokenHandle);
- [DllImport("Mpr.dll")]
- private static extern int WNetUseConnection(IntPtr hwndOwner, NETRESOURCE lpNetResource, string lpPassword, string lpUserID, int dwFlags,
- string lpAccessName, string lpBufferSize, string lpResult);
-
- [DllImport("Mpr.dll")]
- private static extern int WNetCancelConnection2(string lpName, int dwFlags, bool fForce);
-
[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
private static extern bool GetDiskFreeSpaceEx(string lpDirectoryName,
out ulong lpFreeBytesAvailable,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef0cec93/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 d8dd3bb..c1f6bcf 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -1,4 +1,4 @@
-// Licensed to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
@@ -333,7 +333,6 @@ namespace HypervResource
else if (templateInfo != null && templateInfo.nfsDataStoreTO != null)
{
NFSTO share = templateInfo.nfsDataStoreTO;
- Utils.ConnectToRemote(share.UncPath, share.Domain, share.User, share.Password);
// The share is mapped, now attach the iso
isoPath = Utils.NormalizePath(Path.Combine(share.UncPath, templateInfo.path));
}