You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/12/06 20:11:33 UTC
[05/11] git commit: updated refs/heads/master to afe1130
CID-1116483 cidr to netmask bitshifts guarded with casts
and simple test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9d5c691
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9d5c691
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9d5c691
Branch: refs/heads/master
Commit: f9d5c6918cf5f0b7c5524b4c2d421c84f3eb55ab
Parents: 2fadfe9
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Nov 10 14:54:52 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 16 18:25:32 2015 +0100
----------------------------------------------------------------------
utils/src/main/java/com/cloud/utils/net/NetUtils.java | 2 +-
utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9d5c691/utils/src/main/java/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
index 6da867d..b0eb2f2 100644
--- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -921,7 +921,7 @@ public class NetUtils {
}
public static String getCidrNetmask(final long cidrSize) {
- final long numericNetmask = 0xffffffff >> MAX_CIDR - cidrSize << MAX_CIDR - cidrSize;
+ final long numericNetmask = (long)0xffffffff >> MAX_CIDR - cidrSize << MAX_CIDR - cidrSize;
return long2Ip(numericNetmask);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9d5c691/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
index 1f948d2..76fc4fa 100644
--- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
@@ -420,6 +420,13 @@ public class NetUtilsTest {
}
@Test
+ public void testGetCidrNetMask() {
+ final String cidr = "10.10.0.0/16";
+ String netmask = NetUtils.getCidrNetmask("10.10.10.10/16");
+ assertTrue(cidr + " does not generate valid netmask " + netmask,NetUtils.isValidNetmask(netmask));
+ }
+
+ @Test
public void testGetCidrSubNet() {
final String cidr = "10.10.0.0/16";
String subnet = NetUtils.getCidrSubNet("10.10.10.10/16");
@@ -430,6 +437,6 @@ public class NetUtilsTest {
public void testGetCidrSubNetWithWidth() {
final String cidr = "10.10.0.0/16";
String subnet = NetUtils.getCidrSubNet("10.10.10.10", 16);
- assertTrue(NetUtils.isIpWithtInCidrRange(subnet, cidr));
+ assertTrue(cidr + " does not contain " + subnet,NetUtils.isIpWithtInCidrRange(subnet, cidr));
}
}
\ No newline at end of file