making gateway optional attribute

abhi · abhi · commit a6666e0c10a1 · 2016-03-13T13:54:31.000-07:00
diff --git a/contivModel.go b/contivModel.go
@@ -1834,11 +1834,6 @@ func ValidateNetwork(obj *Network) error {
 		return errors.New("encap string invalid format")
 	}
 
-	gatewayMatch := regexp.MustCompile("^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?)$")
-	if gatewayMatch.MatchString(obj.Gateway) == false {
-		return errors.New("gateway string invalid format")
-	}
-
 	if len(obj.NetworkName) > 64 {
 		return errors.New("networkName string too long")
 	}
diff --git a/network.json b/network.json
@@ -36,7 +36,6 @@
 				},
 				"gateway": {
 					"type": "string",
-					"format": "^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?)$",
 					"title": "Gateway",
 					"showSummary": true
 				}

Original file line number	Diff line number	Diff line change
`@@ -1834,11 +1834,6 @@ func ValidateNetwork(obj *Network) error {`
`1834`	`1834`	`return errors.New("encap string invalid format")`
`1835`	`1835`	`}`
`1836`	`1836`
`1837`		`- gatewayMatch := regexp.MustCompile("^([0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?.[0-9]{1,3}?)$")`
`1838`		`- if gatewayMatch.MatchString(obj.Gateway) == false {`
`1839`		`- return errors.New("gateway string invalid format")`
`1840`		`- }`
`1841`		`-`
`1842`	`1837`	`if len(obj.NetworkName) > 64 {`
`1843`	`1838`	`return errors.New("networkName string too long")`
`1844`	`1839`	`}`