Add validation routines

Splitting out new orchestration validation routines
from other patch for ncm which uses them - so these
changes can go in first.  Should fix build issues.

Issue-ID: MULTICLOUD-1029
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I89c4163e1204d444e48a4786acececa20fce1844

1 files changed, 20 insertions, 4 deletions

diff --git a/src/orchestrator/pkg/infra/validation/validation.go b/src/orchestrator/pkg/infra/validation/validation.go
index d744dc3d..03b37fa1 100644
--- a/src/orchestrator/pkg/infra/validation/validation.go
+++ b/src/orchestrator/pkg/infra/validation/validation.go
@@ -70,21 +70,37 @@ func IsTarGz(r io.Reader) error {
 }
 
 func IsIpv4Cidr(cidr string) error {
-	_, _, err := net.ParseCIDR(cidr)
-	if err != nil {
-		return pkgerrors.Wrapf(err, "could not parse subnet %v", cidr)
+	ip, _, err := net.ParseCIDR(cidr)
+	if err != nil || ip.To4() == nil {
+		return pkgerrors.Wrapf(err, "could not parse ipv4 cidr %v", cidr)
 	}
 	return nil
 }
 
-func IsIpv4(ip string) error {
+func IsIp(ip string) error {
 	addr := net.ParseIP(ip)
 	if addr == nil {
+		return pkgerrors.Errorf("invalid ip address %v", ip)
+	}
+	return nil
+}
+
+func IsIpv4(ip string) error {
+	addr := net.ParseIP(ip)
+	if addr == nil || addr.To4() == nil {
 		return pkgerrors.Errorf("invalid ipv4 address %v", ip)
 	}
 	return nil
 }
 
+func IsMac(mac string) error {
+	_, err := net.ParseMAC(mac)
+	if err != nil {
+		return pkgerrors.Errorf("invalid MAC address %v", mac)
+	}
+	return nil
+}
+
 // default name check - matches valid label value with addtion that length > 0
 func IsValidName(name string) []string {
 	var errs []string