CLOUDSTACK-6159 Fixed creating volumes(Root, DataDisk) with uuid in primary store

rajesh-battala · rajesh-battala · commit f960ada36e48 · 2014-02-23T09:21:30.000+05:30
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -173,11 +173,11 @@ public string FullFileName
                     PrimaryDataStoreTO store = this.primaryDataStore;
                     if (store.isLocal)
                     {
-                        fileName = Path.Combine(store.Path, this.name);
+                        fileName = Path.Combine(store.Path, this.uuid);
                     }
                     else
                     {
-                        fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;
+                        fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.uuid;
                         fileName = Utils.NormalizePath(fileName);
                     }
                 }
@@ -198,7 +198,7 @@ public string FullFileName
                         fileName = Utils.NormalizePath(fileName);
                         if (Directory.Exists(fileName))
                         {
-                            fileName = Utils.NormalizePath(fileName + @"\" + this.name);
+                            fileName = Utils.NormalizePath(fileName + @"\" + this.uuid);
                         }
                     }
                 }
@@ -300,11 +300,11 @@ private static void GuessFileExtension(VolumeObjectTO volInfo)
                 path = Utils.NormalizePath(path);
                 if (Directory.Exists(path))
                 {
-                    string[] choices = choices = Directory.GetFiles(path, volInfo.name + ".vhd*");
+                    string[] choices = choices = Directory.GetFiles(path, volInfo.uuid + ".vhd*");
                     if (choices.Length != 1)
                     {
                         String errMsg = "Tried to guess file extension, but cannot find file corresponding to " +
-                            Path.Combine(volInfo.primaryDataStore.Path, volInfo.name);
+                            Path.Combine(volInfo.primaryDataStore.Path, volInfo.uuid);
                         logger.Debug(errMsg);
                     }
                     else
@@ -334,18 +334,18 @@ public string FullFileName
                     PrimaryDataStoreTO store = this.primaryDataStore;
                     if (store.isLocal)
                     {
-                        fileName = Path.Combine(store.Path, this.name);
+                        fileName = Path.Combine(store.Path, this.uuid);
                     }
                     else
                     {
-                        fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;
+                        fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.uuid;
                     }
                     fileName = fileName + '.' + this.format.ToLowerInvariant();
                 }
                 else if (this.nfsDataStoreTO != null)
                 {
                     NFSTO store = this.nfsDataStoreTO;
-                    fileName = store.UncPath + @"\" + this.path + @"\" + this.name;
+                    fileName = store.UncPath + @"\" + this.path + @"\" + this.uuid;
                     if (!this.format.Equals("RAW"))
                     {
                         fileName = fileName + '.' + this.format.ToLowerInvariant();
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1168,13 +1168,13 @@ public JContainer CreateObjectCommand([FromBody]dynamic cmd)
 
                 bool result = false;
                 string details = null;
-
+                object newData = null;
                 try
                 {
                     VolumeObjectTO volume = VolumeObjectTO.ParseJson(cmd.data);
                     PrimaryDataStoreTO primary = volume.primaryDataStore;
                     ulong volumeSize = volume.size;
-                    string volumeName = volume.name + ".vhd";
+                    string volumeName = volume.uuid + ".vhd";
                     string volumePath = null;
 
                     if (primary.isLocal)
@@ -1187,11 +1187,13 @@ public JContainer CreateObjectCommand([FromBody]dynamic cmd)
                         volumePath = Utils.NormalizePath(volumePath);
                         Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
                     }
-
+                    volume.path = volumePath;
                     wmiCallsV2.CreateDynamicVirtualHardDisk(volumeSize, volumePath);
                     if (File.Exists(volumePath))
                     {
                         result = true;
+                        JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.VolumeObjectTO, volume);
+                        newData = ansObj;
                     }
                     else
                     {
@@ -1209,7 +1211,7 @@ public JContainer CreateObjectCommand([FromBody]dynamic cmd)
                 {
                     result = result,
                     details = details,
-                    data = cmd.data,
+                    data = newData,
                     contextMap = contextMap
                 };
 

Original file line number	Diff line number	Diff line change
`@@ -173,11 +173,11 @@ public string FullFileName`
`173`	`173`	`PrimaryDataStoreTO store = this.primaryDataStore;`
`174`	`174`	`if (store.isLocal)`
`175`	`175`	`{`
`176`		`- fileName = Path.Combine(store.Path, this.name);`
	`176`	`+ fileName = Path.Combine(store.Path, this.uuid);`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
`180`		`- fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;`
	`180`	`+ fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.uuid;`
`181`	`181`	`fileName = Utils.NormalizePath(fileName);`
`182`	`182`	`}`
`183`	`183`	`}`
`@@ -198,7 +198,7 @@ public string FullFileName`
`198`	`198`	`fileName = Utils.NormalizePath(fileName);`
`199`	`199`	`if (Directory.Exists(fileName))`
`200`	`200`	`{`
`201`		`- fileName = Utils.NormalizePath(fileName + @"\" + this.name);`
	`201`	`+ fileName = Utils.NormalizePath(fileName + @"\" + this.uuid);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`	`}`
`@@ -300,11 +300,11 @@ private static void GuessFileExtension(VolumeObjectTO volInfo)`
`300`	`300`	`path = Utils.NormalizePath(path);`
`301`	`301`	`if (Directory.Exists(path))`
`302`	`302`	`{`
`303`		`- string[] choices = choices = Directory.GetFiles(path, volInfo.name + ".vhd*");`
	`303`	`+ string[] choices = choices = Directory.GetFiles(path, volInfo.uuid + ".vhd*");`
`304`	`304`	`if (choices.Length != 1)`
`305`	`305`	`{`
`306`	`306`	`String errMsg = "Tried to guess file extension, but cannot find file corresponding to " +`
`307`		`- Path.Combine(volInfo.primaryDataStore.Path, volInfo.name);`
	`307`	`+ Path.Combine(volInfo.primaryDataStore.Path, volInfo.uuid);`
`308`	`308`	`logger.Debug(errMsg);`
`309`	`309`	`}`
`310`	`310`	`else`
`@@ -334,18 +334,18 @@ public string FullFileName`
`334`	`334`	`PrimaryDataStoreTO store = this.primaryDataStore;`
`335`	`335`	`if (store.isLocal)`
`336`	`336`	`{`
`337`		`- fileName = Path.Combine(store.Path, this.name);`
	`337`	`+ fileName = Path.Combine(store.Path, this.uuid);`
`338`	`338`	`}`
`339`	`339`	`else`
`340`	`340`	`{`
`341`		`- fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;`
	`341`	`+ fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.uuid;`
`342`	`342`	`}`
`343`	`343`	`fileName = fileName + '.' + this.format.ToLowerInvariant();`
`344`	`344`	`}`
`345`	`345`	`else if (this.nfsDataStoreTO != null)`
`346`	`346`	`{`
`347`	`347`	`NFSTO store = this.nfsDataStoreTO;`
`348`		`- fileName = store.UncPath + @"\" + this.path + @"\" + this.name;`
	`348`	`+ fileName = store.UncPath + @"\" + this.path + @"\" + this.uuid;`
`349`	`349`	`if (!this.format.Equals("RAW"))`
`350`	`350`	`{`
`351`	`351`	`fileName = fileName + '.' + this.format.ToLowerInvariant();`