add CIDR

Author: sgsullivan

cmd/cloudServerClone.go

@@ -130,7 +130,7 @@ Server is not on a Private Parent.`,
 		if len(cloudServerCloneCmdPool6IpsFlag) > 0 {
 			cloneArgs["pool6_ips"] = cloudServerCloneCmdPool6IpsFlag
 			for _, ip := range cloudServerCloneCmdPool6IpsFlag {
-				validateFields[ip] = "IpOrCidr"
+				validateFields[ip] = "CIDR"
 			}
 		}
 

instance/cloudNetworkPublicAdd.go

@@ -90,7 +90,7 @@ func (self *Client) CloudNetworkPublicAdd(params *CloudNetworkPublicAddParams) (
 		apiArgs["pool6_ips"] = params.Pool6Ips
 		validateFields := map[interface{}]interface{}{}
 		for _, ip := range params.Pool6Ips {
-			validateFields[ip] = "IpOrCidr"
+			validateFields[ip] = "CIDR"
 		}
 		if err = validate.Validate(validateFields); err != nil {
 			return

validate/types.go

@@ -33,6 +33,7 @@ var ValidationFailure = errors.New("validation failed")
 type InputTypes struct {
 	UniqId                          InputTypeUniqId
 	IP                              InputTypeIP
+	CIDR                            InputTypeCIDR
 	IpOrCidr                        InputTypeIpOrCidr
 	PositiveInt64                   InputTypePositiveInt64
 	PositiveInt                     InputTypePositiveInt
@@ -91,6 +92,20 @@ func (x InputTypeIP) Validate() error {
 	return nil
 }
 
+// CIDR
+
+type InputTypeCIDR struct {
+	CIDR string
+}
+
+func (x InputTypeCIDR) Validate() error {
+	if valid := utils.IpRangeIsValid(x.CIDR); !valid {
+		return fmt.Errorf("cidr [%s] is not valid", x.CIDR)
+	}
+
+	return nil
+}
+
 // IpOrCidr
 
 type InputTypeIpOrCidr struct {

validate/validate.go

@@ -109,6 +109,12 @@ func interfaceInputTypeValidate(iface, inputFieldValue interface{}) error {
 		if err := obj.Validate(); err != nil {
 			return err
 		}
+	case InputTypeCIDR:
+		var obj InputTypeCIDR
+		obj.CIDR = cast.ToString(inputFieldValue)
+		if err := obj.Validate(); err != nil {
+			return err
+		}
 	case InputTypeIpOrCidr:
 		var obj InputTypeIpOrCidr
 		obj.IpOrCidr = cast.ToString(inputFieldValue)