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

IPv6: Fix generate random ip in range. 

Ported from ipv6 branch.
This commit is contained in:
Sheng Yang 2013-01-31 17:16:53 -08:00
parent 2ca8af3191
commit bec030fda8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -302,11 +302,20 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
s_logger.debug("Cannot find related vlan or too many vlan attached to network " + networkId);
return null;
}
String ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
//Check for duplicate IP
if (_ipv6Dao.findByDcIdAndIp(dcId, ip) != null) {
//TODO regenerate ip
throw new CloudRuntimeException("Fail to get unique ipv6 address");
String ip = null;
int count = 0;
while (ip == null || count >= 10) {
ip = NetUtils.getIp6FromRange(vlan.getIp6Range());
//Check for duplicate IP
if (_ipv6Dao.findByDcIdAndIp(dcId, ip) == null) {
break;
} else {
ip = null;
}
count ++;
}
if (ip == null) {
throw new CloudRuntimeException("Fail to get unique ipv6 address after 10 times trying!");
}
DataCenterVO dc = _dcDao.findById(dcId);
Long mac = dc.getMacAddress();