Updated Branches: refs/heads/4.1 696b4ed8e -> 6c37fccc0
CLOUDSTACK-1232: Only support cidr=64 in IPv6 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6c37fccc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6c37fccc Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6c37fccc Branch: refs/heads/4.1 Commit: 6c37fccc0b641a83231e43cdac14cf2be996002e Parents: 696b4ed Author: Sheng Yang <[email protected]> Authored: Tue Feb 26 19:37:45 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Tue Feb 26 19:39:37 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkModelImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c37fccc/server/src/com/cloud/network/NetworkModelImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 189382e..8aa18c1 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -1931,9 +1931,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } int cidrSize = NetUtils.getIp6CidrSize(ip6Cidr); - // Ipv6 cidr limit should be at least /64 - if (cidrSize < 64) { - throw new InvalidParameterValueException("The cidr size of IPv6 network must be no less than 64 bits!"); + // we only support cidr == 64 + if (cidrSize != 64) { + throw new InvalidParameterValueException("The cidr size of IPv6 network must be 64 bits!"); } }
