cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: Add KVM to hypervisor types allowed in VPC RB: https://reviews.apache.org/r/6926/ Send-by: Marcus Sorensen
Date Fri, 07 Sep 2012 22:39:36 GMT
Updated Branches:
  refs/heads/master a19d7ab00 -> 24fa14845


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/24fa1484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/24fa1484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/24fa1484

Branch: refs/heads/master
Commit: 24fa14845b69dd1e56b9da6a5b713051f088f049
Parents: a19d7ab
Author: Edison Su <sudison@gmail.com>
Authored: Fri Sep 7 14:35:31 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Sep 7 15:39:23 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/24fa1484/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/24fa1484/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);


Mime
View raw message