etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New hypervisor type

This commit is contained in:
Frank 2011-05-04 18:58:57 -07:00
parent 948df86f5d
commit 3b0fb655a9
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/hypervisor/Hypervisor.java
View File

@ -30,6 +30,7 @@ public class Hypervisor {
Parralels,
BareMetal,
Simulator,
Ovm,
Any; /*If you don't care about the hypervisor type*/
@ -56,6 +57,8 @@ public class Hypervisor {
return HypervisorType.BareMetal;
} else if (hypervisor.equalsIgnoreCase("Simulator")) {
return HypervisorType.Simulator;
} else if (hypervisor.equalsIgnoreCase("Ovm")) {
return HypervisorType.Ovm;
} else if (hypervisor.equalsIgnoreCase("Any")) {
return HypervisorType.Any;
} else {

2
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -2766,7 +2766,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
// If this command is from a KVM agent, or from an agent that has a
// null hypervisor type, don't do the CIDR check
if (hypervisorType == null || hypervisorType == HypervisorType.KVM || hypervisorType == HypervisorType.VMware || hypervisorType == HypervisorType.BareMetal
|| hypervisorType == HypervisorType.Simulator) {
|| hypervisorType == HypervisorType.Simulator || hypervisorType == HypervisorType.Ovm) {
doCidrCheck = false;
}

1
utils/src/com/cloud/utils/SerialVersionUID.java
View File

@ -63,4 +63,5 @@ public interface SerialVersionUID {
public static final long HttpCallException = Base | 0x23;
public static final long VirtualMachineMigrationException = Base | 0x24;
public static final long DiscoveredWithErrorException = Base | 0x25;
public static final long CallFailedException = Base | 0x26;
}