Squashed 'k8smain/' content from commit 719158d

git-subtree-dir: k8smain
git-subtree-split: 719158d2c8788c30cc9e1c51bbebb53c5801524e

plugin/pkg/scheduler/api/validation/validation.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"fmt"
+
+	utilerrors "k8s.io/kubernetes/pkg/util/errors"
+	schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
+)
+
+// Validate 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)
+
+	for _, priority := range policy.Priorities {
+		if priority.Weight <= 0 {
+			validationErrors = append(validationErrors, fmt.Errorf("Priority %s should have a positive weight applied to it", priority.Name))
+		}
+	}
+
+	for _, extender := range policy.ExtenderConfigs {
+		if extender.Weight < 0 {
+			validationErrors = append(validationErrors, fmt.Errorf("Priority for extender %s should have a non negative weight applied to it", extender.URLPrefix))
+		}
+	}
+	return utilerrors.NewAggregate(validationErrors)
+}

plugin/pkg/scheduler/api/validation/validation_test.go

@@ -0,0 +1,52 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/plugin/pkg/scheduler/api"
+)
+
+func TestValidatePriorityWithNoWeight(t *testing.T) {
+	policy := api.Policy{Priorities: []api.PriorityPolicy{{Name: "NoWeightPriority"}}}
+	if ValidatePolicy(policy) == nil {
+		t.Errorf("Expected error about priority weight not being positive")
+	}
+}
+
+func TestValidatePriorityWithZeroWeight(t *testing.T) {
+	policy := api.Policy{Priorities: []api.PriorityPolicy{{Name: "NoWeightPriority", Weight: 0}}}
+	if ValidatePolicy(policy) == nil {
+		t.Errorf("Expected error about priority weight not being positive")
+	}
+}
+
+func TestValidatePriorityWithNonZeroWeight(t *testing.T) {
+	policy := api.Policy{Priorities: []api.PriorityPolicy{{Name: "WeightPriority", Weight: 2}}}
+	errs := ValidatePolicy(policy)
+	if errs != nil {
+		t.Errorf("Unexpected errors %v", errs)
+	}
+}
+
+func TestValidatePriorityWithNegativeWeight(t *testing.T) {
+	policy := api.Policy{Priorities: []api.PriorityPolicy{{Name: "WeightPriority", Weight: -2}}}
+	if ValidatePolicy(policy) == nil {
+		t.Errorf("Expected error about priority weight not being positive")
+	}
+}