Updated Branches: refs/heads/network-refactor 57f084fe5 -> 3b9901d56
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/3b9901d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b9901d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b9901d5 Branch: refs/heads/network-refactor Commit: 3b9901d56da2035b4146dd2e979ac719590c9b7c Parents: 57f084f Author: Sheng Yang <[email protected]> Authored: Tue Feb 26 19:37:45 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Tue Feb 26 19:37:45 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/3b9901d5/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 e66099b..f34f906 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -1902,9 +1902,9 @@ public class NetworkModelImpl implements NetworkModel, Manager{ } 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!"); } }
