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

Cloudstack-2736 [Multiple_IP_Ranges] Failed to deploy vm with IP address from new CIDR 

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
This commit is contained in:
Bharat Kumar 2013-06-04 12:37:06 +05:30 committed by Abhinandan Prateek
parent ba2687c238
commit d58c0c4d11
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2796,7 +2796,13 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
for (VlanVO vlan : vlanList) {
vlanDbIdList.add(vlan.getId());
}
routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(), null, false);
if (dc.getNetworkType() == NetworkType.Basic) {
routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(), null, false);
}
else {
routerPublicIP = _networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), null, caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(), null, false);
}
routerAliasIp = routerPublicIP.getAddress().addr();
}
}