You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/26 14:21:28 UTC
[8/8] git commit: updated refs/heads/4.3 to 2b264e6
CLOUDSTACK-6020 ipv4 address can be a larger number then
Interger.MAX_VALUE
(cherry picked from commit b3829e54d6b7af426f797ffb9fa54b4cd2abffc0)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b264e6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b264e6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b264e6b
Branch: refs/heads/4.3
Commit: 2b264e6b57b90d6eb5d202c4fe72e64d867b3f9b
Parents: 11eab3d
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Feb 4 18:40:18 2014 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 26 18:37:18 2014 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/Ip.java | 2 +-
utils/test/com/cloud/utils/net/IpTest.java | 43 +++++++++++++++++++++++++
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b264e6b/utils/src/com/cloud/utils/net/Ip.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/Ip.java b/utils/src/com/cloud/utils/net/Ip.java
index 2cdfd9c..93972e7 100644
--- a/utils/src/com/cloud/utils/net/Ip.java
+++ b/utils/src/com/cloud/utils/net/Ip.java
@@ -56,7 +56,7 @@ public class Ip implements Serializable, Comparable<Ip> {
}
public boolean isIp4() {
- return ip < Integer.MAX_VALUE;
+ return ip <= 2L * Integer.MAX_VALUE + 1;
}
public boolean isIp6() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b264e6b/utils/test/com/cloud/utils/net/IpTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/net/IpTest.java b/utils/test/com/cloud/utils/net/IpTest.java
new file mode 100644
index 0000000..48615d7
--- /dev/null
+++ b/utils/test/com/cloud/utils/net/IpTest.java
@@ -0,0 +1,43 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.utils.net;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class IpTest {
+
+ @Test
+ public void testUltimate() {
+ Ip max = new Ip(2L * Integer.MAX_VALUE +1 );
+ assertEquals("Maximal address not created", "255.255.255.255", max.addr());
+ }
+ @Test
+ public void testTurningOfTheCentury() {
+ Ip eve = new Ip(Integer.MAX_VALUE);
+ assertEquals("Minimal address not created", "127.255.255.255", eve.addr());
+ Ip dawn = new Ip(Integer.MAX_VALUE + 1L);
+ assertEquals("Minimal address not created", "128.0.0.0", dawn.addr());
+ }
+ @Test
+ public void testStart() {
+ Ip min = new Ip(0);
+ assertEquals("Minimal address not created", "0.0.0.0", min.addr());
+ }
+
+}