Updated Branches: refs/heads/master a4cea4ebf -> 4c0053fb2
CLOUDSTACK-3909: deployVM API - validate hypervisorType parameter when the vm is being deployed from ISO Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c0053fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c0053fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c0053fb Branch: refs/heads/master Commit: 4c0053fb2ddf9636f482393a0a58781e5fe35729 Parents: a4cea4e Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Mon Jul 29 11:13:52 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Mon Jul 29 11:16:39 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c0053fb/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 2def783..6eb510c 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2361,16 +2361,14 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir "Can't create vm from template with hypervisor " + template.getHypervisorType() + " in vpc network " + network); - } - - // Only XenServer, KVM, and VMware hypervisors are supported - // for vpc networks - if (!vpcSupportedHTypes.contains(hypervisor)) { + } else if (template.getFormat() == ImageFormat.ISO && !vpcSupportedHTypes.contains(hypervisor)) { + // Only XenServer, KVM, and VMware hypervisors are supported + // for vpc networks throw new InvalidParameterValueException( "Can't create vm of hypervisor type " + hypervisor + " in vpc network"); + } - } _networkModel.checkNetworkPermissions(owner, network);
