rename 'accept' action to 'allow'

shaleman · shaleman · commit cfbecf95ff5c · 2016-02-01T12:05:38.000-08:00
diff --git a/contivModel.go b/contivModel.go
@@ -2318,7 +2318,7 @@ func ValidateRule(obj *Rule) error {
 
 	// Validate each field
 
-	actionMatch := regexp.MustCompile("^(accept|deny)$")
+	actionMatch := regexp.MustCompile("^(allow|deny)$")
 	if actionMatch.MatchString(obj.Action) == false {
 		return errors.New("action string invalid format")
 	}
diff --git a/rule.json b/rule.json
@@ -95,7 +95,7 @@
 				},
 				"action": {
 					"type": "string",
-					"format": "^(accept|deny)$",
+					"format": "^(allow|deny)$",
 					"title": "Action",
 					"showSummary": true
 				}

Original file line number	Diff line number	Diff line change
`@@ -2318,7 +2318,7 @@ func ValidateRule(obj *Rule) error {`
`2318`	`2318`
`2319`	`2319`	`// Validate each field`
`2320`	`2320`
`2321`		`- actionMatch := regexp.MustCompile("^(accept\|deny)$")`
	`2321`	`+ actionMatch := regexp.MustCompile("^(allow\|deny)$")`
`2322`	`2322`	`if actionMatch.MatchString(obj.Action) == false {`
`2323`	`2323`	`return errors.New("action string invalid format")`
`2324`	`2324`	`}`