cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/4.3 to 5551724
Date Mon, 30 Dec 2013 06:28:15 GMT
Updated Branches:
  refs/heads/4.3 278b2b1b6 -> 5551724a2


CLOUDSTACK-5659: Creation of vm from iso failing with wrong file format.
The agent was always creating a disk with image format vhdx, but the
cloudstack management server defaults to image format vhd for hyperv.
Updated the agent code to be consistent with what cs expects. All disks
are now created with image format vhd.


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

Branch: refs/heads/4.3
Commit: 5551724a2efce0cc4893f375bae469fe051f3f44
Parents: 278b2b1
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Mon Dec 30 18:57:26 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Mon Dec 30 11:58:45 2013 +0530

----------------------------------------------------------------------
 .../ServerResource/HypervResource/HypervResourceController.cs | 7 +++++--
 .../hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5551724a/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 905a741..c885598 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -229,7 +229,10 @@ namespace HypervResource
                     {
                         VolumeObjectTO volume = disk.volumeObjectTO;
                         PrimaryDataStoreTO primary = volume.primaryDataStore;
-                        Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User,
primary.Password);
+                        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;
@@ -1144,7 +1147,7 @@ namespace HypervResource
                     VolumeObjectTO volume = VolumeObjectTO.ParseJson(cmd.data);
                     PrimaryDataStoreTO primary = volume.primaryDataStore;
                     ulong volumeSize = volume.size;
-                    string volumeName = volume.name + ".vhdx";
+                    string volumeName = volume.name + ".vhd";
                     string volumePath = null;
 
                     if (primary.isLocal)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5551724a/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 06730e0..6830fe3 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -1553,7 +1553,7 @@ namespace HypervResource
             // Is there a template we can use to fill in the settings?
             var newVirtHDSettings = VirtualHardDiskSettingData.CreateInstance();
             newVirtHDSettings.LateBoundObject["Type"] = 3; // Dynamic
-            newVirtHDSettings.LateBoundObject["Format"] = 3; // VHDX
+            newVirtHDSettings.LateBoundObject["Format"] = 2; // VHD
             newVirtHDSettings.LateBoundObject["Path"] = Path;
             newVirtHDSettings.LateBoundObject["MaxInternalSize"] = MaxInternalSize;
             newVirtHDSettings.LateBoundObject["BlockSize"] = 0; // Use defaults


Mime
View raw message