From 24fa14845b69dd1e56b9da6a5b713051f088f049 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 7 Sep 2012 14:35:31 -0700 Subject: [PATCH] Add KVM to hypervisor types allowed in VPC RB: https://reviews.apache.org/r/6926/ Send-by: Marcus Sorensen --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index d24009ddbe8..08a03b1a181 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 hTypes = new ArrayList(); hTypes.add(HypervisorType.XenServer); hTypes.add(HypervisorType.VMware); + hTypes.add(HypervisorType.KVM); return hTypes; } } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 183617667cc..cc48b2f9c12 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);