CLOUDSTACK-6636: [Windows] Can not create Template from ROOT snapshot on Windows management server with Xen/NFS storage type. This change is only for XenServer with NFS Storage Server. Will fix remaining when we touch them.

Damodar Reddy · koushik-das · commit 5cbb182c6d28 · 2014-06-19T09:35:26.000+05:30
Signed-off-by: Koushik Das &lt;koushik@apache.org&gt;
diff --git a/api/src/com/cloud/agent/api/to/DataStoreTO.java b/api/src/com/cloud/agent/api/to/DataStoreTO.java
@@ -26,4 +26,6 @@ public interface DataStoreTO {
     String getUuid();
 
     String getUrl();
+
+    String getPathSeparator();
 }
diff --git a/api/src/com/cloud/agent/api/to/NfsTO.java b/api/src/com/cloud/agent/api/to/NfsTO.java
@@ -23,6 +23,7 @@ public class NfsTO implements DataStoreTO {
     private String _url;
     private DataStoreRole _role;
     private String uuid;
+    private static final String pathSeparator = "/";
 
     public NfsTO() {
 
@@ -65,4 +66,9 @@ public String getUuid() {
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
+
+    @Override
+    public String getPathSeparator() {
+        return pathSeparator;
+    }
 }
diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/com/cloud/agent/api/to/S3TO.java
@@ -40,6 +40,7 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO {
     private Date created;
     private boolean enableRRS;
     private long maxSingleUploadSizeInBytes;
+    private static final String pathSeparator = "/";
 
     public S3TO() {
 
@@ -289,4 +290,9 @@ public boolean getSingleUpload(long objSize) {
             }
         }
     }
+
+    @Override
+    public String getPathSeparator() {
+        return pathSeparator;
+    }
 }
diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/com/cloud/agent/api/to/SwiftTO.java
@@ -26,6 +26,7 @@ public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
 
     String userName;
     String key;
+    private static final String pathSeparator = "/";
 
     public SwiftTO() {
     }
@@ -76,4 +77,9 @@ public String getEndPoint() {
     public String getUuid() {
         return null;
     }
+
+    @Override
+    public String getPathSeparator() {
+        return pathSeparator;
+    }
 }
diff --git a/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java b/core/src/org/apache/cloudstack/storage/to/ImageStoreTO.java
@@ -27,6 +27,7 @@ public class ImageStoreTO implements DataStoreTO {
     private String providerName;
     private DataStoreRole role;
     private String uuid;
+    private static final String pathSeparator = "/";
 
     public ImageStoreTO() {
 
@@ -98,4 +99,9 @@ public String getUrl() {
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
+
+    @Override
+    public String getPathSeparator() {
+        return pathSeparator;
+    }
 }
diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
@@ -46,6 +46,7 @@ public class PrimaryDataStoreTO implements DataStoreTO {
     private int port;
     private final String url;
     private Map<String, String> details;
+    private static final String pathSeparator = "/";
 
     public PrimaryDataStoreTO(PrimaryDataStore dataStore) {
         this.uuid = dataStore.getUuid();
@@ -122,6 +123,11 @@ public void setPort(int port) {
         this.port = port;
     }
 
+    @Override
+    public String getPathSeparator() {
+        return pathSeparator;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("PrimaryDataStoreTO[uuid=").append(uuid)
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -109,7 +109,7 @@ public AttachAnswer attachIso(AttachCommand cmd) {
                 return new AttachAnswer("Can't attach a iso which is not created on nfs: ");
             }
             NfsTO nfsStore = (NfsTO) store;
-            isoURL = nfsStore.getUrl() + File.separator + data.getPath();
+            isoURL = nfsStore.getUrl() + nfsStore.getPathSeparator() + data.getPath();
         }
 
         String vmName = cmd.getVmName();
@@ -290,7 +290,7 @@ public Answer dettachIso(DettachCommand cmd) {
                 return new AttachAnswer("Can't attach a iso which is not created on nfs: ");
             }
             NfsTO nfsStore = (NfsTO) store;
-            isoURL = nfsStore.getUrl() + File.separator + data.getPath();
+            isoURL = nfsStore.getUrl() + nfsStore.getPathSeparator() + data.getPath();
         }
 
         try {
@@ -933,7 +933,7 @@ public Answer copyVolumeFromImageCacheToPrimary(CopyCommand cmd) {
                 SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, destVolume.getDataStore().getUuid());
                 String srUuid = primaryStoragePool.getUuid(conn);
                 URI uri = new URI(nfsStore.getUrl());
-                String volumePath = uri.getHost() + ":" + uri.getPath() + File.separator + srcVolume.getPath();
+                String volumePath = uri.getHost() + ":" + uri.getPath() + nfsStore.getPathSeparator() + srcVolume.getPath();
                 String uuid = copy_vhd_from_secondarystorage(conn, volumePath, srUuid, wait);
                 VolumeObjectTO newVol = new VolumeObjectTO();
                 newVol.setPath(uuid);
@@ -970,15 +970,15 @@ public Answer copyVolumeFromPrimaryToSecondary(CopyCommand cmd) {
                 }
 
                 // Create a SR for the volume UUID folder
-                secondaryStorage = hypervisorResource.createNfsSRbyURI(conn, new URI(nfsStore.getUrl() + File.separator + destVolume.getPath()), false);
+                secondaryStorage = hypervisorResource.createNfsSRbyURI(conn, new URI(nfsStore.getUrl() + nfsStore.getPathSeparator() + destVolume.getPath()), false);
                 // Look up the volume on the source primary storage pool
                 VDI srcVdi = getVDIbyUuid(conn, srcVolume.getPath());
                 // Copy the volume to secondary storage
                 VDI destVdi = hypervisorResource.cloudVDIcopy(conn, srcVdi, secondaryStorage, wait);
                 String destVolumeUUID = destVdi.getUuid(conn);
 
                 VolumeObjectTO newVol = new VolumeObjectTO();
-                newVol.setPath(destVolume.getPath() + File.separator + destVolumeUUID + ".vhd");
+                newVol.setPath(destVolume.getPath() + nfsStore.getPathSeparator() + destVolumeUUID + ".vhd");
                 newVol.setSize(srcVolume.getSize());
                 return new CopyCmdAnswer(newVol);
             } catch (Exception e) {
@@ -1282,7 +1282,7 @@ public Answer backupSnapshot(CopyCommand cmd) {
                         }
                         // finalPath = folder + File.separator + snapshotBackupUuid;
                     } else {
-                        finalPath = folder + File.separator + snapshotBackupUuid;
+                        finalPath = folder + cacheStore.getPathSeparator() + snapshotBackupUuid;
                     }
 
                 } finally {
@@ -1310,7 +1310,7 @@ public Answer backupSnapshot(CopyCommand cmd) {
                     String[] tmp = results.split("#");
                     snapshotBackupUuid = tmp[1];
                     physicalSize = Long.parseLong(tmp[2]);
-                    finalPath = folder + File.separator + snapshotBackupUuid;
+                    finalPath = folder + cacheStore.getPathSeparator() + snapshotBackupUuid;
                 }
             }
             // delete primary snapshots with only the last one left
@@ -1461,13 +1461,13 @@ public Answer createVolumeFromSnapshot(CopyCommand cmd) {
             }
             // Get the absolute path of the snapshot on the secondary storage.
             String snapshotInstallPath = snapshot.getPath();
-            int index = snapshotInstallPath.lastIndexOf(File.separator);
+            int index = snapshotInstallPath.lastIndexOf(nfsImageStore.getPathSeparator());
             String snapshotName = snapshotInstallPath.substring(index + 1);
 
             if (!snapshotName.startsWith("VHD-") && !snapshotName.endsWith(".vhd")) {
                 snapshotInstallPath = snapshotInstallPath + ".vhd";
             }
-            URI snapshotURI = new URI(secondaryStorageUrl + File.separator + snapshotInstallPath);
+            URI snapshotURI = new URI(secondaryStorageUrl + nfsImageStore.getPathSeparator() + snapshotInstallPath);
             String snapshotPath = snapshotURI.getHost() + ":" + snapshotURI.getPath();
             String srUuid = primaryStorageSR.getUuid(conn);
             volumeUUID = copy_vhd_from_secondarystorage(conn, snapshotPath, srUuid, wait);

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@ public interface DataStoreTO {`
`26`	`26`	`String getUuid();`
`27`	`27`
`28`	`28`	`String getUrl();`
	`29`	`+`
	`30`	`+ String getPathSeparator();`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO {`
`40`	`40`	`private Date created;`
`41`	`41`	`private boolean enableRRS;`
`42`	`42`	`private long maxSingleUploadSizeInBytes;`
	`43`	`+ private static final String pathSeparator = "/";`
`43`	`44`
`44`	`45`	`public S3TO() {`
`45`	`46`
`@@ -289,4 +290,9 @@ public boolean getSingleUpload(long objSize) {`
`289`	`290`	`}`
`290`	`291`	`}`
`291`	`292`	`}`
	`293`	`+`
	`294`	`+ @Override`
	`295`	`+ public String getPathSeparator() {`
	`296`	`+ return pathSeparator;`
	`297`	`+ }`
`292`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {`
`26`	`26`
`27`	`27`	`String userName;`
`28`	`28`	`String key;`
	`29`	`+ private static final String pathSeparator = "/";`
`29`	`30`
`30`	`31`	`public SwiftTO() {`
`31`	`32`	`}`
`@@ -76,4 +77,9 @@ public String getEndPoint() {`
`76`	`77`	`public String getUuid() {`
`77`	`78`	`return null;`
`78`	`79`	`}`
	`80`	`+`
	`81`	`+ @Override`
	`82`	`+ public String getPathSeparator() {`
	`83`	`+ return pathSeparator;`
	`84`	`+ }`
`79`	`85`	`}`