Fixing subnet regex to take range

dvavili · dvavili · commit 9ac4bb676dbe · 2016-03-25T11:45:39.000-07:00
diff --git a/contivModel.go b/contivModel.go
@@ -1868,7 +1868,7 @@ func ValidateNetwork(obj *Network) error {
 		return errors.New("networkName string too long")
 	}
 
-	subnetMatch := regexp.MustCompile("^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?/[0-9]{1,2}?)$")
+	subnetMatch := regexp.MustCompile("^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\-(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$")
 	if subnetMatch.MatchString(obj.Subnet) == false {
 		return errors.New("subnet string invalid format")
 	}
diff --git a/network.json b/network.json
@@ -30,7 +30,7 @@
 				},
 				"subnet": {
 					"type": "string",
-					"format": "^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?/[0-9]{1,2}?)$",
+					"format": "^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\\\-(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$",
 					"title": "Subnet",
 					"showSummary": true
 				},

Original file line number	Diff line number	Diff line change
`@@ -1868,7 +1868,7 @@ func ValidateNetwork(obj *Network) error {`
`1868`	`1868`	`return errors.New("networkName string too long")`
`1869`	`1869`	`}`
`1870`	`1870`
`1871`		`- subnetMatch := regexp.MustCompile("^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?/[0-9]{1,2}?)$")`
	`1871`	`+ subnetMatch := regexp.MustCompile("^((25[0-5]\|2[0-4][0-9]\|1[0-9][0-9]\|[1-9]?[0-9])(\\.(25[0-5]\|2[0-4][0-9]\|1[0-9][0-9]\|[1-9]?[0-9])){3})(\\-(25[0-5]\|2[0-4][0-9]\|1[0-9][0-9]\|[1-9]?[0-9]))?/(3[0-1]\|2[0-9]\|1[0-9]\|[1-9])$")`
`1872`	`1872`	`if subnetMatch.MatchString(obj.Subnet) == false {`
`1873`	`1873`	`return errors.New("subnet string invalid format")`
`1874`	`1874`	`}`