Support xz format for template registration

sudo87 · sudo87 · commit 3eb963105f98 · 2025-10-03T16:13:17.000+05:30
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -178,7 +178,8 @@ public KVMPhysicalDisk createDiskFromTemplateBacking(KVMPhysicalDisk template, S
      */
     public static boolean isTemplateExtractable(String templatePath) {
         String type = Script.runSimpleBashScript("file " + templatePath + " | awk -F' ' '{print $2}'");
-        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
+        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip")
+                || type.equalsIgnoreCase("zip") || type.equalsIgnoreCase("xz");
     }
 
     /**
@@ -193,6 +194,8 @@ public static String getExtractCommandForDownloadedFile(String downloadedTemplat
             return "bunzip2 -c " + downloadedTemplateFile + " > " + templateUuid;
         } else if (downloadedTemplateFile.endsWith(".gz")) {
             return "gunzip -c " + downloadedTemplateFile + " > " + templateUuid;
+        } else if (downloadedTemplateFile.endsWith(".xz")) {
+            return "xz -d -c " + downloadedTemplateFile + " > " + templateUuid;
         } else {
             throw new CloudRuntimeException("Unable to extract template " + downloadedTemplateFile);
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
@@ -426,7 +426,8 @@ public KVMPhysicalDisk createPhysicalDisk(String name, KVMStoragePool pool,
     boolean isTemplateExtractable(String templatePath) {
         ScriptResult result = runScript("file", 5000L, templatePath, "| awk -F' ' '{print $2}'");
         String type = result.getResult();
-        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
+        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip")
+                || type.equalsIgnoreCase("zip") || type.equalsIgnoreCase("xz");
     }
 
     String getExtractCommandForDownloadedFile(String downloadedTemplateFile, String templateFile) {
@@ -436,6 +437,8 @@ String getExtractCommandForDownloadedFile(String downloadedTemplateFile, String
             return "bunzip2 -c " + downloadedTemplateFile + " > " + templateFile;
         } else if (downloadedTemplateFile.endsWith(".gz")) {
             return "gunzip -c " + downloadedTemplateFile + " > " + templateFile;
+        } else if (downloadedTemplateFile.endsWith(".xz")) {
+            return "xz -d -c " + downloadedTemplateFile + " > " + templateFile;
         } else {
             throw new CloudRuntimeException("Unable to extract template " + downloadedTemplateFile);
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
@@ -613,7 +613,8 @@ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFileP
 
     private boolean isTemplateExtractable(String templatePath) {
         String type = Script.runSimpleBashScript("file " + templatePath + " | awk -F' ' '{print $2}'");
-        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
+        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip")
+                || type.equalsIgnoreCase("zip") || type.equalsIgnoreCase("xz");
     }
 
     private String getExtractCommandForDownloadedFile(String downloadedTemplateFile, String templateFile) {
@@ -623,6 +624,8 @@ private String getExtractCommandForDownloadedFile(String downloadedTemplateFile,
             return "bunzip2 -c " + downloadedTemplateFile + " > " + templateFile;
         } else if (downloadedTemplateFile.endsWith(".gz")) {
             return "gunzip -c " + downloadedTemplateFile + " > " + templateFile;
+        } else if (downloadedTemplateFile.endsWith(".xz")) {
+            return "xz -d -c " + downloadedTemplateFile + " > " + templateFile;
         } else {
             throw new CloudRuntimeException("Unable to extract template " + downloadedTemplateFile);
         }
diff --git a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java
@@ -539,7 +539,8 @@ private String extractTemplate(String templateFilePath, File sourceFile, String
 
     private boolean isTemplateExtractable(String templatePath) {
         String type = Script.runSimpleBashScript("file " + templatePath + " | awk -F' ' '{print $2}'");
-        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
+        return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip")
+                || type.equalsIgnoreCase("zip") || type.equalsIgnoreCase("xz");
     }
 
     private String getExtractCommandForDownloadedFile(String downloadedTemplateFile, String templateFile) {
@@ -549,6 +550,8 @@ private String getExtractCommandForDownloadedFile(String downloadedTemplateFile,
             return "bunzip2 -c " + downloadedTemplateFile + " > " + templateFile;
         } else if (downloadedTemplateFile.endsWith(".gz")) {
             return "gunzip -c " + downloadedTemplateFile + " > " + templateFile;
+        } else if (downloadedTemplateFile.endsWith(".xz")) {
+            return "xz -d -c " + downloadedTemplateFile + " > " + templateFile;
         } else {
             throw new CloudRuntimeException("Unable to extract template " + downloadedTemplateFile);
         }
diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
@@ -431,7 +431,7 @@ public static List<String> getMetalinkUrls(String metalinkUrl) {
         return urls;
     }
 
-    public static final Set<String> COMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz");
+    public static final Set<String> COMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz", "xz");
 
     public static final Set<String> buildExtensionSet(boolean metalink, String... baseExtensions) {
         final ImmutableSet.Builder<String> builder = ImmutableSet.builder();
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
@@ -44,7 +44,7 @@ public interface ThrowingBlock<E extends Exception> {
     }
 
     private static final Set<String> COMMPRESSION_FORMATS = ImmutableSet.of("",".zip", ".bz2", ".gz");
-    private static final Set<String> ILLEGAL_COMMPRESSION_FORMATS = ImmutableSet.of(".7z", ".xz");
+    private static final Set<String> ILLEGAL_COMMPRESSION_FORMATS = ImmutableSet.of(".7z");
     private final static Set<String> FORMATS = ImmutableSet.of(
             "vhd",
             "vhdx",
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsTest.java
@@ -271,6 +271,7 @@ public void testIsUrlForCompressedFile() {
         Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.bz2"));
         Assert.assertTrue(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.zip"));
         Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.gz"));
+        Assert.assertTrue(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.xz"));
         Assert.assertFalse(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.qcow2"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ public static List<String> getMetalinkUrls(String metalinkUrl) {`
`431`	`431`	`return urls;`
`432`	`432`	`}`
`433`	`433`
`434`		`- public static final Set<String> COMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz");`
	`434`	`+ public static final Set<String> COMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz", "xz");`
`435`	`435`
`436`	`436`	`public static final Set<String> buildExtensionSet(boolean metalink, String... baseExtensions) {`
`437`	`437`	`final ImmutableSet.Builder<String> builder = ImmutableSet.builder();`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public interface ThrowingBlock<E extends Exception> {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private static final Set<String> COMMPRESSION_FORMATS = ImmutableSet.of("",".zip", ".bz2", ".gz");`
`47`		`- private static final Set<String> ILLEGAL_COMMPRESSION_FORMATS = ImmutableSet.of(".7z", ".xz");`
	`47`	`+ private static final Set<String> ILLEGAL_COMMPRESSION_FORMATS = ImmutableSet.of(".7z");`
`48`	`48`	`private final static Set<String> FORMATS = ImmutableSet.of(`
`49`	`49`	`"vhd",`
`50`	`50`	`"vhdx",`
Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ public void testIsUrlForCompressedFile() {`
`271`	`271`	`Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.bz2"));`
`272`	`272`	`Assert.assertTrue(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.zip"));`
`273`	`273`	`Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.gz"));`
	`274`	`+ Assert.assertTrue(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.xz"));`
`274`	`275`	`Assert.assertFalse(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.qcow2"));`
`275`	`276`	`}`
`276`	`277`