[scheduler] interface for configuration factory, configurator.

plugin/pkg/scheduler/factory/factory_test.go

@@ -25,7 +25,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
@@ -38,6 +37,7 @@ import (
 	schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
 	latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
+	"k8s.io/kubernetes/plugin/pkg/scheduler/util"
 )
 
 func TestCreate(t *testing.T) {
@@ -152,13 +152,8 @@ func TestDefaultErrorFunc(t *testing.T) {
 	defer server.Close()
 	factory := NewConfigFactory(clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}), v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains)
 	queue := cache.NewFIFO(cache.MetaNamespaceKeyFunc)
-	podBackoff := podBackoff{
-		perPodBackoff:   map[types.NamespacedName]*backoffEntry{},
-		clock:           &fakeClock{},
-		defaultDuration: 1 * time.Millisecond,
-		maxDuration:     1 * time.Second,
-	}
-	errFunc := factory.makeDefaultErrorFunc(&podBackoff, queue)
+	podBackoff := util.CreatePodBackoff(1*time.Millisecond, 1*time.Second)
+	errFunc := factory.MakeDefaultErrorFunc(podBackoff, queue)
 
 	errFunc(testPod, nil)
 	for {
@@ -202,14 +197,6 @@ func TestNodeEnumerator(t *testing.T) {
 	}
 }
 
-type fakeClock struct {
-	t time.Time
-}
-
-func (f *fakeClock) Now() time.Time {
-	return f.t
-}
-
 func TestBind(t *testing.T) {
 	table := []struct {
 		binding *v1.Binding
@@ -245,66 +232,6 @@ func TestBind(t *testing.T) {
 	}
 }
 
-func TestBackoff(t *testing.T) {
-	clock := fakeClock{}
-	backoff := podBackoff{
-		perPodBackoff:   map[types.NamespacedName]*backoffEntry{},
-		clock:           &clock,
-		defaultDuration: 1 * time.Second,
-		maxDuration:     60 * time.Second,
-	}
-
-	tests := []struct {
-		podID            types.NamespacedName
-		expectedDuration time.Duration
-		advanceClock     time.Duration
-	}{
-		{
-			podID:            types.NamespacedName{Namespace: "default", Name: "foo"},
-			expectedDuration: 1 * time.Second,
-		},
-		{
-			podID:            types.NamespacedName{Namespace: "default", Name: "foo"},
-			expectedDuration: 2 * time.Second,
-		},
-		{
-			podID:            types.NamespacedName{Namespace: "default", Name: "foo"},
-			expectedDuration: 4 * time.Second,
-		},
-		{
-			podID:            types.NamespacedName{Namespace: "default", Name: "bar"},
-			expectedDuration: 1 * time.Second,
-			advanceClock:     120 * time.Second,
-		},
-		// 'foo' should have been gc'd here.
-		{
-			podID:            types.NamespacedName{Namespace: "default", Name: "foo"},
-			expectedDuration: 1 * time.Second,
-		},
-	}
-
-	for _, test := range tests {
-		duration := backoff.getEntry(test.podID).getBackoff(backoff.maxDuration)
-		if duration != test.expectedDuration {
-			t.Errorf("expected: %s, got %s for %s", test.expectedDuration.String(), duration.String(), test.podID)
-		}
-		clock.t = clock.t.Add(test.advanceClock)
-		backoff.gc()
-	}
-	fooID := types.NamespacedName{Namespace: "default", Name: "foo"}
-	backoff.perPodBackoff[fooID].backoff = 60 * time.Second
-	duration := backoff.getEntry(fooID).getBackoff(backoff.maxDuration)
-	if duration != 60*time.Second {
-		t.Errorf("expected: 60, got %s", duration.String())
-	}
-	// Verify that we split on namespaces correctly, same name, different namespace
-	fooID.Namespace = "other"
-	duration = backoff.getEntry(fooID).getBackoff(backoff.maxDuration)
-	if duration != 1*time.Second {
-		t.Errorf("expected: 1, got %s", duration.String())
-	}
-}
-
 // TestResponsibleForPod tests if a pod with an annotation that should cause it to
 // be picked up by the default scheduler, is in fact picked by the default scheduler
 // Two schedulers are made in the test: one is default scheduler and other scheduler
@@ -363,8 +290,8 @@ func TestResponsibleForPod(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		podOfDefault := factoryDefaultScheduler.responsibleForPod(test.pod)
-		podOfFoo := factoryFooScheduler.responsibleForPod(test.pod)
+		podOfDefault := factoryDefaultScheduler.ResponsibleForPod(test.pod)
+		podOfFoo := factoryFooScheduler.ResponsibleForPod(test.pod)
 		results := []bool{podOfDefault, podOfFoo}
 		expected := []bool{test.pickedByDefault, test.pickedByFoo}
 		if !reflect.DeepEqual(results, expected) {