Repository: cloudstack Updated Branches: refs/heads/master d1d722f9b -> 737f76df8
CLOUDSTACK-7312:ISOs cannot be downloaded from URLs without matching file extensions. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/737f76df Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/737f76df Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/737f76df Branch: refs/heads/master Commit: 737f76df8c86666b47ba347ae46fc10d73b1fee6 Parents: d1d722f Author: Min Chen <min.c...@citrix.com> Authored: Mon Aug 11 14:53:02 2014 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Mon Aug 11 15:00:32 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/template/HypervisorTemplateAdapter.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/737f76df/server/src/com/cloud/template/HypervisorTemplateAdapter.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index 20309d6..9b17c30 100755 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -111,12 +111,6 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { public TemplateProfile prepare(RegisterIsoCmd cmd) throws ResourceAllocationException { TemplateProfile profile = super.prepare(cmd); String url = profile.getUrl(); - - if ((!url.toLowerCase().endsWith("iso")) && (!url.toLowerCase().endsWith("iso.zip")) && (!url.toLowerCase().endsWith("iso.bz2")) && - (!url.toLowerCase().endsWith("iso.gz"))) { - throw new InvalidParameterValueException("Please specify a valid iso"); - } - UriUtils.validateUrl(url); profile.setUrl(url); // Check that the resource limit for secondary storage won't be exceeded
