CLOUDSTACK-5308, CLOUDSTACK-5542: Copy command didn't handle the scenario

devdeep · devdeep · commit 1a033eddae37 · 2013-12-26T15:32:41.000+05:30
when a volume is copied to secondary storage for template creation.
Updated the command to handle it.
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -301,20 +301,34 @@ public string FullFileName
         {
             get
             {
-                if (String.IsNullOrEmpty(this.path))
+                string fileName = null;
+                if (this.primaryDataStore != null)
                 {
-                    string fileName = null;
-                    if (this.primaryDataStore.isLocal)
+                    PrimaryDataStoreTO store = this.primaryDataStore;
+                    if (store.isLocal)
                     {
-                        fileName = Path.Combine(this.primaryDataStore.Path, this.name);
+                        fileName = Path.Combine(store.Path, this.name);
                     }
                     else
                     {
-                        fileName = @"\\" + this.primaryDataStore.uri.Host + this.primaryDataStore.uri.LocalPath + @"\" + this.name;
+                        fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;
                     }
-                    return fileName +'.' + this.format.ToLowerInvariant();
+                    fileName = fileName + '.' + this.format.ToLowerInvariant();
+                }
+                else if (this.nfsDataStoreTO != null)
+                {
+                    NFSTO store = this.nfsDataStoreTO;
+                    fileName = store.UncPath + @"\" + this.path + @"\" + this.name;
+                    if (!this.format.Equals("RAW"))
+                    {
+                        fileName = fileName + '.' + this.format.ToLowerInvariant();
+                    }
+                }
+                else
+                {
+                    fileName = this.path;
                 }
-                return this.path;
+                return Utils.NormalizePath(fileName);
             }
         }
 
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1262,13 +1262,22 @@ public JContainer CopyCommand(dynamic cmd)
                     VolumeObjectTO destVolumeObjectTO = VolumeObjectTO.ParseJson(cmd.destTO);
 
                     string destFile = null;
-                    if (destTemplateObjectTO != null && destTemplateObjectTO.primaryDataStore != null)
+                    if (destTemplateObjectTO != null)
                     {
-                        destFile = destTemplateObjectTO.FullFileName;
-                        if (!destTemplateObjectTO.primaryDataStore.isLocal)
+                        if (destTemplateObjectTO.primaryDataStore != null)
                         {
-                            PrimaryDataStoreTO primary = destTemplateObjectTO.primaryDataStore;
-                            Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
+                            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);
                         }
                     }
 
@@ -1428,6 +1437,38 @@ public JContainer CopyCommand(dynamic cmd)
                                 result = true;
                             }
                         }
+                        else if (srcVolumeObjectTO != null && destTemplateObjectTO != null)
+                        {
+                            var guessedDestFile = destTemplateObjectTO.FullFileName;
+                            if (File.Exists(guessedDestFile))
+                            {
+                                logger.Info("Deleting existing file " + guessedDestFile);
+                                File.Delete(guessedDestFile);
+                            }
+
+                            destTemplateObjectTO.format = srcVolumeObjectTO.format;
+                            destFile = destTemplateObjectTO.FullFileName;
+                            if (File.Exists(destFile))
+                            {
+                                logger.Info("Deleting existing file " + destFile);
+                                File.Delete(destFile);
+                            }
+
+                            string srcFile = srcVolumeObjectTO.FullFileName;
+                            if (!File.Exists(srcFile))
+                            {
+                                details = "Local template file missing from " + srcFile;
+                            }
+                            else
+                            {
+                                // Create the directory before copying the files. CreateDirectory
+                                // doesn't do anything if the directory is already present.
+                                Directory.CreateDirectory(Path.GetDirectoryName(destFile));
+                                File.Copy(srcFile, destFile);
+                                newData = cmd.destTO;
+                                result = true;
+                            }
+                        }
                         else
                         {
                             details = "Data store combination not supported";

Original file line number	Diff line number	Diff line change
`@@ -301,20 +301,34 @@ public string FullFileName`
`301`	`301`	`{`
`302`	`302`	`get`
`303`	`303`	`{`
`304`		`- if (String.IsNullOrEmpty(this.path))`
	`304`	`+ string fileName = null;`
	`305`	`+ if (this.primaryDataStore != null)`
`305`	`306`	`{`
`306`		`- string fileName = null;`
`307`		`- if (this.primaryDataStore.isLocal)`
	`307`	`+ PrimaryDataStoreTO store = this.primaryDataStore;`
	`308`	`+ if (store.isLocal)`
`308`	`309`	`{`
`309`		`- fileName = Path.Combine(this.primaryDataStore.Path, this.name);`
	`310`	`+ fileName = Path.Combine(store.Path, this.name);`
`310`	`311`	`}`
`311`	`312`	`else`
`312`	`313`	`{`
`313`		`- fileName = @"\\" + this.primaryDataStore.uri.Host + this.primaryDataStore.uri.LocalPath + @"\" + this.name;`
	`314`	`+ fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.name;`
`314`	`315`	`}`
`315`		`- return fileName +'.' + this.format.ToLowerInvariant();`
	`316`	`+ fileName = fileName + '.' + this.format.ToLowerInvariant();`
	`317`	`+ }`
	`318`	`+ else if (this.nfsDataStoreTO != null)`
	`319`	`+ {`
	`320`	`+ NFSTO store = this.nfsDataStoreTO;`
	`321`	`+ fileName = store.UncPath + @"\" + this.path + @"\" + this.name;`
	`322`	`+ if (!this.format.Equals("RAW"))`
	`323`	`+ {`
	`324`	`+ fileName = fileName + '.' + this.format.ToLowerInvariant();`
	`325`	`+ }`
	`326`	`+ }`
	`327`	`+ else`
	`328`	`+ {`
	`329`	`+ fileName = this.path;`
`316`	`330`	`}`
`317`		`- return this.path;`
	`331`	`+ return Utils.NormalizePath(fileName);`
`318`	`332`	`}`
`319`	`333`	`}`
`320`	`334`