mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-6020 ipv4 address can be a larger number then
Interger.MAX_VALUE
This commit is contained in:
parent
3989d6c481
commit
b3829e54d6
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue