contivmodel changes w.r.t making bandwidth format flexible. (#33)

contiv · Jul 20, 2016 · 8e88827 · 8e88827
1 parent cc05737
commit 8e88827
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contivModel.go b/contivModel.go
@@ -2570,7 +2570,7 @@ func ValidateNetprofile(obj *Netprofile) error {
 		return errors.New("bandwidth string too long")
 	}
 
-	bandwidthMatch := regexp.MustCompile("^((([1-9][0-9]*((k|K|m|M|g|G)(bps|BPS)))|(K|k|M|m|G|g)|(K|k|M|m|G|g)(b))|(([1-9][0-9]* ((k|K|m|M|g|G)(bps|BPS)))|(K|k|M|m|G|g)|(K|k|M|m|G|g)(b)))?$")
+	bandwidthMatch := regexp.MustCompile("^([1-9][0-9]* (([kmgKMG{1}]bps)|[kmgKMG{1}]|(kb|Kb|Gb|gb|Mb|mb)))?$|^([1-9][0-9]*(((k|m|g|K|G|M)bps)|(k|m|g|K|M|G)|(kb|Kb|Gb|gb|Mb|mb)))?$")
 	if bandwidthMatch.MatchString(obj.Bandwidth) == false {
 		return errors.New("bandwidth string invalid format")
 	}

diff --git a/netProfile.json b/netProfile.json
@@ -22,7 +22,7 @@
                       "bandwidth":  {
                               "type": "string",
                               "length": 64,
-                              "format": "^((([1-9][0-9]*((k|K|m|M|g|G)(bps|BPS)))|(K|k|M|m|G|g)|(K|k|M|m|G|g)(b))|(([1-9][0-9]* ((k|K|m|M|g|G)(bps|BPS)))|(K|k|M|m|G|g)|(K|k|M|m|G|g)(b)))?$",
+                              "format": "^([1-9][0-9]* (([kmgKMG{1}]bps)|[kmgKMG{1}]|(kb|Kb|Gb|gb|Mb|mb)))?$|^([1-9][0-9]*(((k|m|g|K|G|M)bps)|(k|m|g|K|M|G)|(kb|Kb|Gb|gb|Mb|mb)))?$",
                               "title":  "Allocated bandwidth",
                               "description":  "Amount of allocated outbound bandwidth",
                               "ShowSummary":  true