Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/801#discussion_r39902902
--- Diff:
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
---
@@ -358,19 +441,22 @@ private String getVirtualRouterIP(Network network,
Collection<String> addressRan
Set<Long> allIPsInCidr = NetUtils.getAllIpsFromCidr(subnet,
cidrSize, new HashSet<Long>());
if (allIPsInCidr.size() > 3) {
+ //get the second IP and see if it the networks GatewayIP
Iterator<Long> ipIterator = allIPsInCidr.iterator();
long vip = ipIterator.next();
if (NetUtils.ip2Long(network.getGateway()) == vip) {
- s_logger.debug("Gateway of the Network(" +
network.getUuid() + ") has the first IP " + NetUtils.long2Ip(vip));
+ s_logger.debug("Gateway of the Network(" +
network.getName() + ") has the first IP " + NetUtils.long2Ip(vip));
vip = ipIterator.next();
virtualRouterIp = NetUtils.long2Ip(vip);
- s_logger.debug("So, reserving the 2nd IP " +
virtualRouterIp + " for the Virtual Router IP in Network(" + network.getUuid()
+ ")");
+ s_logger.debug("So, reserving the 2nd IP " +
virtualRouterIp + " for the Virtual Router IP in Network(" + network.getName()
+ ")");
} else {
virtualRouterIp = NetUtils.long2Ip(vip);
- s_logger.debug("1nd IP is not used as the gateway IP. So,
reserving" + virtualRouterIp + " for the Virtual Router IP for " + "Network(" +
network.getUuid() + ")");
+ s_logger.debug("1nd IP is not used as the gateway IP. So,
reserving" + virtualRouterIp + " for the Virtual Router IP for " + "Network(" +
network.getName() + ")");
}
- addressRange.add(NetUtils.long2Ip(ipIterator.next()));
-
addressRange.add(NetUtils.long2Ip((Long)allIPsInCidr.toArray()[allIPsInCidr.size()
- 1]));
+ String[] ipAddressRange = new String[2];
+ ipAddressRange[0] = NetUtils.long2Ip(ipIterator.next());
+ ipAddressRange[1] = NetUtils.getIpRangeEndIpFromCidr(subnet,
cidrSize);
+ ipAddressRanges.add(ipAddressRange);
--- End diff --
Shorten these lines into the following in-line declaration:
```
ipAddressRanges.add(new String[] {
NetUtils.long2Ip(ipIterator.next()),
NetUtils.getIpRangeEndIpFromCidr(subnet, cidrSize)
});
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
