pkg/scheduler/framework/fake -> pkg/scheduler/testing/framework

Huang-Wei · Huang-Wei · commit e2dc31bcd62f · 2024-04-18T14:17:50.000-07:00
diff --git a/pkg/noderesources/allocatable_test.go b/pkg/noderesources/allocatable_test.go
@@ -28,11 +28,11 @@ import (
 	clientsetfake "k8s.io/client-go/kubernetes/fake"
 	schedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/framework"
-	fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"
 	frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
 	st "k8s.io/kubernetes/pkg/scheduler/testing"
+	tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"
 
 	"sigs.k8s.io/scheduler-plugins/apis/config"
 )
@@ -351,5 +351,5 @@ func (f *fakeSharedLister) StorageInfos() framework.StorageInfoLister {
 }
 
 func (f *fakeSharedLister) NodeInfos() framework.NodeInfoLister {
-	return fakeframework.NodeInfoLister(f.nodes)
+	return tf.NodeInfoLister(f.nodes)
 }
diff --git a/pkg/podstate/pod_state_test.go b/pkg/podstate/pod_state_test.go
@@ -31,11 +31,11 @@ import (
 	"k8s.io/klog/v2/ktesting"
 
 	"k8s.io/kubernetes/pkg/scheduler/framework"
-	fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"
 	frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
 	st "k8s.io/kubernetes/pkg/scheduler/testing"
+	tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"
 	testutil "sigs.k8s.io/scheduler-plugins/test/util"
 )
 
@@ -203,5 +203,5 @@ func (f *fakeSharedLister) StorageInfos() framework.StorageInfoLister {
 }
 
 func (f *fakeSharedLister) NodeInfos() framework.NodeInfoLister {
-	return fakeframework.NodeInfoLister(f.nodes)
+	return tf.NodeInfoLister(f.nodes)
 }

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ import (`
`28`	`28`	`clientsetfake "k8s.io/client-go/kubernetes/fake"`
`29`	`29`	`schedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"`
`30`	`30`	`"k8s.io/kubernetes/pkg/scheduler/framework"`
`31`		`- fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"`
`32`	`31`	`"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"`
`33`	`32`	`"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"`
`34`	`33`	`frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"`
`35`	`34`	`st "k8s.io/kubernetes/pkg/scheduler/testing"`
	`35`	`+ tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"`
`36`	`36`
`37`	`37`	`"sigs.k8s.io/scheduler-plugins/apis/config"`
`38`	`38`	`)`
`@@ -351,5 +351,5 @@ func (f *fakeSharedLister) StorageInfos() framework.StorageInfoLister {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`func (f *fakeSharedLister) NodeInfos() framework.NodeInfoLister {`
`354`		`- return fakeframework.NodeInfoLister(f.nodes)`
	`354`	`+ return tf.NodeInfoLister(f.nodes)`
`355`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ import (`
`31`	`31`	`"k8s.io/klog/v2/ktesting"`
`32`	`32`
`33`	`33`	`"k8s.io/kubernetes/pkg/scheduler/framework"`
`34`		`- fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"`
`35`	`34`	`"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"`
`36`	`35`	`"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"`
`37`	`36`	`frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"`
`38`	`37`	`st "k8s.io/kubernetes/pkg/scheduler/testing"`
	`38`	`+ tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"`
`39`	`39`	`testutil "sigs.k8s.io/scheduler-plugins/test/util"`
`40`	`40`	`)`
`41`	`41`
`@@ -203,5 +203,5 @@ func (f *fakeSharedLister) StorageInfos() framework.StorageInfoLister {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`func (f *fakeSharedLister) NodeInfos() framework.NodeInfoLister {`
`206`		`- return fakeframework.NodeInfoLister(f.nodes)`
	`206`	`+ return tf.NodeInfoLister(f.nodes)`
`207`	`207`	`}`