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

Revert "bug 11604: Assign guest ip for each router" 

This reverts commit 42ab3c94c210d5a29289a5dfd0e44ae99c427f8b.

The commit may not fit for our new network as service framework, because we
would make single router and redundant router as two different service provider,
so the change of network offering should clean up the old network and then setup
new one. Make single router work as redundant router later make no sense in such
condition.
This commit is contained in:
Sheng Yang 2011-10-04 17:56:36 -07:00
parent 36511ab6fd
commit e72d38b15d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,7 +1073,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
List<NetworkVO> publicNetworks = _networkMgr.setupNetwork(_systemAcct, publicOffering, plan, null, null, false, false);
networks.add(new Pair<NetworkVO, NicProfile>(publicNetworks.get(0), defaultNic));
NicProfile gatewayNic = new NicProfile();
gatewayNic.setIp4Address(_networkMgr.acquireGuestIpAddress(guestNetwork, null));
if (isRedundant) {
gatewayNic.setIp4Address(_networkMgr.acquireGuestIpAddress(guestNetwork, null));
} else {
gatewayNic.setIp4Address(guestNetwork.getGateway());
}
gatewayNic.setBroadcastUri(guestNetwork.getBroadcastUri());
gatewayNic.setBroadcastType(guestNetwork.getBroadcastDomainType());
gatewayNic.setIsolationUri(guestNetwork.getBroadcastUri());
@ -1392,12 +1396,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
for (NicProfile nic : profile.getNics()) {
int deviceId = nic.getDeviceId();
Network net = _networkMgr.getNetwork(nic.getNetworkId());
String guestIp = nic.getIp4Address();
if (nic.getTrafficType() == TrafficType.Guest && !router.getIsRedundantRouter()) {
guestIp = net.getGateway();
}
buf.append(" eth").append(deviceId).append("ip=").append(guestIp);
buf.append(" eth").append(deviceId).append("ip=").append(nic.getIp4Address());
buf.append(" eth").append(deviceId).append("mask=").append(nic.getNetmask());
if (nic.isDefaultNic()) {
buf.append(" gateway=").append(nic.getGateway());
@ -1444,6 +1443,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
controlNic = nic;
} else if (nic.getTrafficType() == TrafficType.Guest && isRedundant) {
Network net = _networkMgr.getNetwork(nic.getNetworkId());
buf.append(" guestgw=").append(net.getGateway());
String brd = NetUtils.long2Ip(NetUtils.ip2Long(nic.getIp4Address()) | ~NetUtils.ip2Long(nic.getNetmask()));
buf.append(" guestbrd=").append(brd);