etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Nicolas Vazquez 2020-06-07 22:35:29 -03:00 committed by GitHub
parent 220448aa94
commit b8ceb88ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/src/main/java/com/cloud/utils/UriUtils.java
View File

@ -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"))

5
utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
View File

@ -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;