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

bug 7865: Changed ip allocation for guest network to happen during allocation and not reserve time so ip address won't keep changing

Browse Source
This commit is contained in:
Alex Huang 2011-01-04 15:01:19 -08:00
parent 4eba6d10d7
commit 61dd3b3bf9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/src/com/cloud/network/guru/GuestNetworkGuru.java
View File

@ -36,6 +36,7 @@ import com.cloud.network.Network;
import com.cloud.network.Network.State;
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkVO;
import com.cloud.network.Networks.AddressFormat;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
@ -162,18 +163,25 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
@Override
public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm)
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException {
if (network.getTrafficType() != TrafficType.Guest) {
return null;
}
assert (network.getTrafficType() == TrafficType.Guest) : "Look at my name! Why are you calling me when the traffic type is : " + network.getTrafficType();
if (nic == null) {
nic = new NicProfile(ReservationStrategy.Start, null, null, null, null);
} else if (nic.getIp4Address() != null){
nic.setStrategy(ReservationStrategy.Create);
} else {
nic.setStrategy(ReservationStrategy.Start);
}
if (nic.getIp4Address() == null){
nic.setBroadcastUri(network.getBroadcastUri());
nic.setIsolationUri(network.getBroadcastUri());
nic.setGateway(network.getGateway());
nic.setIp4Address(acquireGuestIpAddress(network));
nic.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
nic.setDns1(network.getDns1());
nic.setDns2(network.getDns2());
nic.setFormat(AddressFormat.Ip4);
}
nic.setStrategy(ReservationStrategy.Start);
if (nic.getMacAddress() == null) {
nic.setMacAddress(_networkMgr.getNextAvailableMacAddressInNetwork(network.getId()));
if (nic.getMacAddress() == null) {
@ -210,11 +218,6 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
nic.setBroadcastUri(network.getBroadcastUri());
nic.setIsolationUri(network.getBroadcastUri());
nic.setGateway(network.getGateway());
nic.setIp4Address(acquireGuestIpAddress(network));
nic.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
nic.setDns1(network.getDns1());
nic.setDns2(network.getDns2());
}
@Override