Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1371#discussion_r62788718
--- Diff: utils/src/main/java/com/cloud/utils/net/cidr/CIDRFactory.java ---
@@ -0,0 +1,79 @@
+//
+// 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
+// with 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.cidr;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import com.cloud.utils.net.NetUtils;
+
+public class CIDRFactory {
+
+ public static CIDR getCIDR(InetAddress baseAddress, int cidrMask)
throws BadCIDRException {
+ if (cidrMask < 0) {
+ throw new BadCIDRException("Invalid mask length used: " +
cidrMask);
+ }
+ if (baseAddress instanceof Inet4Address) {
+ if (cidrMask > 32) {
+ throw new BadCIDRException("Invalid mask length used: " +
cidrMask);
+ }
+ return new CIDR4((Inet4Address)baseAddress, cidrMask);
+ }
+ // IPv6.
+ if (cidrMask > 128) {
+ throw new BadCIDRException("Invalid mask length used: " +
cidrMask);
+ }
+ return new CIDR6((Inet6Address)baseAddress, cidrMask);
+ }
+
+ public static CIDR getCIDR(String cidr) throws BadCIDRException {
+ int p = cidr.indexOf('/');
+ if (p < 0) {
+ throw new BadCIDRException("Invalid CIDR notation used: " +
cidr);
+ }
+ String addrString = cidr.substring(0, p);
+ String maskString = cidr.substring(p + 1);
+ InetAddress addr = addressStringToInet(addrString);
+ int mask;
+ if (maskString.indexOf('.') < 0) {
+ mask = Integer.decode(maskString);
+ } else {
+ mask = NetUtils.getNetMask(maskString);
+ if (addr instanceof Inet6Address) {
+ mask += 96;
+ }
+ }
+ if (mask < 0) {
+ throw new BadCIDRException("Invalid mask length used: " +
maskString);
+ }
+ return getCIDR(addr, mask);
+ }
--- End diff --
Consider renaming ``getCIDR`` to ``create`` since the ``get`` verb is
generally in Java for methods that access attributes.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
