apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6278

Browse Source 
Baremetal Advanced Networking support
This commit is contained in:
Frank Zhang 2014-09-10 13:58:43 -07:00
parent 90287cc60a
commit e06fa18ed2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
View File

@ -21,7 +21,6 @@ package com.cloud.baremetal.networkservice;
import com.cloud.baremetal.database.BaremetalPxeVO; import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.baremetal.manager.BaremetalVlanManager; import com.cloud.baremetal.manager.BaremetalVlanManager;
import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.Pod; import com.cloud.dc.Pod;
import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterDao;
import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeployDestination;
@ -140,9 +139,11 @@ public class BaremetalPxeElement extends AdapterBase implements NetworkElement {
} }
} }
/*
if (dest.getDataCenter().getNetworkType() == DataCenter.NetworkType.Advanced){ if (dest.getDataCenter().getNetworkType() == DataCenter.NetworkType.Advanced){
prepareVlan(network, dest); prepareVlan(network, dest);
} }
*/
return true; return true;
} }
@ -154,10 +155,16 @@ public class BaremetalPxeElement extends AdapterBase implements NetworkElement {
@Override @Override
public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException { ResourceUnavailableException {
if (vm.getType() != Type.User || vm.getHypervisorType() != HypervisorType.BareMetal) {
return false;
}
/*
DataCenterVO dc = zoneDao.findById(vm.getVirtualMachine().getDataCenterId()); DataCenterVO dc = zoneDao.findById(vm.getVirtualMachine().getDataCenterId());
if (dc.getNetworkType() == DataCenter.NetworkType.Advanced) { if (dc.getNetworkType() == DataCenter.NetworkType.Advanced) {
releaseVlan(network, vm); releaseVlan(network, vm);
} }
*/
return true; return true;
} }

4
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -1761,6 +1761,7 @@ VirtualMachineGuru, Listener, Configurable, StateListener<State, VirtualMachine.
templateName = RouterTemplateLxc.valueIn(dest.getDataCenter().getId()); templateName = RouterTemplateLxc.valueIn(dest.getDataCenter().getId());
break; break;
case BareMetal: case BareMetal:
/*
String peerHvType = _configDao.getValue(Config.BaremetalPeerHypervisorType.key()); String peerHvType = _configDao.getValue(Config.BaremetalPeerHypervisorType.key());
if (peerHvType == null) { if (peerHvType == null) {
throw new CloudRuntimeException(String.format("To use baremetal in advanced networking, you must set %s to type of hypervisor(e.g XenServer)" + throw new CloudRuntimeException(String.format("To use baremetal in advanced networking, you must set %s to type of hypervisor(e.g XenServer)" +
@ -1777,6 +1778,9 @@ VirtualMachineGuru, Listener, Configurable, StateListener<State, VirtualMachine.
} else { } else {
throw new CloudRuntimeException(String.format("Baremetal only supports peer hypervisor(XenServer/KVM/VMWare) right now, you specified %s", peerHvType)); throw new CloudRuntimeException(String.format("Baremetal only supports peer hypervisor(XenServer/KVM/VMWare) right now, you specified %s", peerHvType));
} }
*/
hType = HypervisorType.VMware;
templateName = RouterTemplateVmware.valueIn(dest.getDataCenter().getId());
break; break;
default: default:
break; break;