[cloudstack] branch master updated: utils: Allow IMG extension for QCOW2 format (#4013)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new b8ceb88  utils: Allow IMG extension for QCOW2 format (#4013)
b8ceb88 is described below

commit b8ceb88ed9a4198121910078ae9dbfecedc40223
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Sun Jun 7 22:35:29 2020 -0300

    utils: Allow IMG extension for QCOW2 format (#4013)
    
    Attempts to register QCOW2 template with .img extension fails fast.
    This fix allows registering a QCOW2 template with .img extension
---
 utils/src/main/java/com/cloud/utils/UriUtils.java                 | 2 +-
 utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java 
b/utils/src/main/java/com/cloud/utils/UriUtils.java
index 3796296..5b0b06e 100644
--- a/utils/src/main/java/com/cloud/utils/UriUtils.java
+++ b/utils/src/main/java/com/cloud/utils/UriUtils.java
@@ -512,7 +512,7 @@ public class UriUtils {
             ImmutableMap.<String, Set<String>>builder()
                         .put("vhd", buildExtensionSet(false, "vhd"))
                         .put("vhdx", buildExtensionSet(false, "vhdx"))
-                        .put("qcow2", buildExtensionSet(true, "qcow2"))
+                        .put("qcow2", buildExtensionSet(true, "qcow2", "img"))
                         .put("ova", buildExtensionSet(true, "ova"))
                         .put("tar", buildExtensionSet(false, "tar"))
                         .put("raw", buildExtensionSet(false, "img", "raw"))
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java 
b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
index 9b29c86..6f104f4 100644
--- a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
+++ b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
@@ -102,7 +102,10 @@ public class UriUtilsParametrizedTest {
             final String realFormat = format;
 
             for (String extension : FORMATS) {
-                final boolean expectSuccess = 
format.equals(extension.replace("img", "raw"));
+                boolean expectSuccess = format.equals(extension.replace("img", 
"raw"));
+                if (format.equals("qcow2") && extension.equals("img")) {
+                    expectSuccess = true;
+                }
 
                 for (String commpressionFormat : COMMPRESSION_FORMATS) {
                     final String url = validBaseUri + extension + 
commpressionFormat;