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

CID-1116484 cast to long and use long as cidrsize type

Browse Source 
and simpel test
This commit is contained in:
Daan Hoogland 2015-11-10 14:40:24 +01:00
parent 637afb9b67
commit 2fadfe93dc
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/src/main/java/com/cloud/utils/net/NetUtils.java
View File

@ -47,6 +47,7 @@ import org.apache.log4j.Logger;
import com.cloud.utils.IteratorUtil; import com.cloud.utils.IteratorUtil;
import com.cloud.utils.Pair; import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script; import com.cloud.utils.script.Script;
import com.googlecode.ipv6.IPv6Address; import com.googlecode.ipv6.IPv6Address;
import com.googlecode.ipv6.IPv6AddressRange; import com.googlecode.ipv6.IPv6AddressRange;
@ -907,14 +908,14 @@ public class NetUtils {
if (!isValidIp(cidrAddress)) { if (!isValidIp(cidrAddress)) {
return null; return null;
} }
int cidrSizeNum = -1; long cidrSizeNum = -1;
try { try {
cidrSizeNum = Integer.parseInt(cidrSize); cidrSizeNum = Integer.parseInt(cidrSize);
} catch (final Exception e) { } catch (final NumberFormatException e) {
return null; throw new CloudRuntimeException("cidrsize is not valid", e);
} }
final long numericNetmask = 0xffffffff >> MAX_CIDR - cidrSizeNum << MAX_CIDR - cidrSizeNum; final long numericNetmask = (long)0xffffffff >> MAX_CIDR - cidrSizeNum << MAX_CIDR - cidrSizeNum;
final String netmask = NetUtils.long2Ip(numericNetmask); final String netmask = NetUtils.long2Ip(numericNetmask);
return getSubNet(cidrAddress, netmask); return getSubNet(cidrAddress, netmask);
} }

8
utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
View File

@ -418,8 +418,16 @@ public class NetUtilsTest {
assertTrue("It should pass! 31 bit prefix.", is31PrefixCidr); assertTrue("It should pass! 31 bit prefix.", is31PrefixCidr);
} }
@Test @Test
public void testGetCidrSubNet() { public void testGetCidrSubNet() {
final String cidr = "10.10.0.0/16";
String subnet = NetUtils.getCidrSubNet("10.10.10.10/16");
assertTrue(cidr + " does not contain " + subnet,NetUtils.isIpWithtInCidrRange(subnet, cidr));
}
@Test
public void testGetCidrSubNetWithWidth() {
final String cidr = "10.10.0.0/16"; final String cidr = "10.10.0.0/16";
String subnet = NetUtils.getCidrSubNet("10.10.10.10", 16); String subnet = NetUtils.getCidrSubNet("10.10.10.10", 16);
assertTrue(NetUtils.isIpWithtInCidrRange(subnet, cidr)); assertTrue(NetUtils.isIpWithtInCidrRange(subnet, cidr));