simplify

Author: alan-nettica

model/vpn.go

@@ -5,8 +5,6 @@ import (
 	"regexp"
 	"strings"
 	"time"
-
-	"github.com/nettica-com/nettica-admin/util"
 )
 
 // VPN structure
@@ -87,12 +85,6 @@ func (a VPN) IsValid() []error {
 	if len(a.Current.Address) == 0 {
 		errs = append(errs, fmt.Errorf("address field is required"))
 	}
-	// check if the address are valid
-	for _, address := range a.Current.Address {
-		if !util.IsValidCidr(address) {
-			errs = append(errs, fmt.Errorf("address %s is invalid", address))
-		}
-	}
 
 	return errs
 }

ui/src/components/Network.vue

@@ -1119,20 +1119,6 @@ export default {
 				"196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4", "::/1", "8000::/2", "c000::/3", "e000::/4", "f000::/5", "f800::/6", "fe00::/9", "fe80::/10", "ff00::/8")
             }
 
-            // check allowed IPs
-            /* for (let i = 0; i < this.vpn.current.allowedIPs.length; i++) {
-                if (this.$isCidr(this.vpn.current.allowedIPs[i]) === 0) {
-                    this.errorNet('Invalid CIDR detected, please correct before submitting');
-                    return
-                }
-            }
-            // check address
-            for (let i = 0; i < this.vpn.current.address.length; i++) {
-                if (this.$isCidr(this.vpn.current.address[i]) === 0) {
-                    this.errorNet('Invalid CIDR detected, please correct before submitting');
-                    return
-                }
-            }*/
 
             this.inEdit = false;
             this.updatevpn(this.vpn)

util/util.go

@@ -83,13 +83,6 @@ func GetNetworkAddress(cidr string) (string, error) {
 // GetAvailableCidr search for an available ip in cidr against a list of reserved ips
 func GetAvailableCidr(cidr string, reserved []string) (string, error) {
 
-	parts := strings.Split(cidr, "/")
-	if len(parts) != 2 {
-		return "", errors.New("invalid cidr")
-	}
-
-	prefix := parts[1]
-
 	ip, ipnet, err := net.ParseCIDR(cidr)
 	if err != nil {
 		return "", err
@@ -109,7 +102,7 @@ func GetAvailableCidr(cidr string, reserved []string) (string, error) {
 			}
 		}
 		if ok && address != networkAddr && address != broadcastAddr {
-			return address + "/" + prefix, nil
+			return address, nil
 		}
 	}