Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tanshanshan committed Mar 10, 2017
1 parent 3ce4934 commit 6fd76dc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
1 change: 1 addition & 0 deletions hack/.linted_packages
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ plugin/pkg/admission/securitycontext/scdeny
plugin/pkg/auth
plugin/pkg/auth/authorizer
plugin/pkg/auth/authorizer/rbac/bootstrappolicy
plugin/pkg/scheduler/api/validation
staging/src/k8s.io/apimachinery/pkg/api/equality
staging/src/k8s.io/apimachinery/pkg/api/errors
staging/src/k8s.io/apimachinery/pkg/api/resource
Expand Down
4 changes: 2 additions & 2 deletions plugin/pkg/scheduler/api/validation/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
)

// Validate checks for errors in the Config
// ValidatePolicy checks for errors in the Config
// It does not return early so that it can find as many errors as possible
func ValidatePolicy(policy schedulerapi.Policy) error {
validationErrors := make([]error, 0)
var validationErrors []error

for _, priority := range policy.Priorities {
if priority.Weight <= 0 {
Expand Down
15 changes: 15 additions & 0 deletions plugin/pkg/scheduler/api/validation/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,18 @@ func TestValidatePriorityWithNegativeWeight(t *testing.T) {
t.Errorf("Expected error about priority weight not being positive")
}
}

func TestValidateExtenderWithNonNegativeWeight(t *testing.T) {
extenderPolicy := api.Policy{ExtenderConfigs: []api.ExtenderConfig{{URLPrefix: "http://127.0.0.1:8081/extender", FilterVerb: "filter", Weight: 2}}}
errs := ValidatePolicy(extenderPolicy)
if errs != nil {
t.Errorf("Unexpected errors %v", errs)
}
}

func TestValidateExtenderWithNegativeWeight(t *testing.T) {
extenderPolicy := api.Policy{ExtenderConfigs: []api.ExtenderConfig{{URLPrefix: "http://127.0.0.1:8081/extender", FilterVerb: "filter", Weight: -2}}}
if ValidatePolicy(extenderPolicy) == nil {
t.Errorf("Expected error about priority weight for extender not being positive")
}
}

0 comments on commit 6fd76dc

Please sign in to comment.