Updated Branches: refs/heads/4.0 ef65557e2 -> 9cc12287e
Add KVM to hypervisor types allowed in VPC RB: https://reviews.apache.org/r/6926/ Send-by: Marcus Sorensen Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9cc12287 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9cc12287 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9cc12287 Branch: refs/heads/4.0 Commit: 9cc12287e0a66d996b58324ac64e3f85b89ca9dd Parents: ef65557 Author: Edison Su <[email protected]> Authored: Fri Sep 7 14:35:31 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Sep 7 14:35:31 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9cc12287/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index d24009d..08a03b1 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1963,6 +1963,7 @@ public class VpcManagerImpl implements VpcManager, Manager{ List<HypervisorType> hTypes = new ArrayList<HypervisorType>(); hTypes.add(HypervisorType.XenServer); hTypes.add(HypervisorType.VMware); + hTypes.add(HypervisorType.KVM); return hTypes; } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9cc12287/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 1836176..cc48b2f 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2240,7 +2240,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager throw new InvalidParameterValueException("Unable to find network by id " + networkIdList.get(0).longValue()); } if (network.getVpcId() != null) { - //Only XenServer and VmWare hypervisors are supported for vpc networks + //Only XenServer, KVM, and VmWare hypervisors are supported for vpc networks if (!vpcSupportedHTypes.contains(template.getHypervisorType())) { throw new InvalidParameterValueException("Can't create vm from template with hypervisor " + template.getHypervisorType() + " in vpc network " + network);
