github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 21:13:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix existing unit test (add no op scoring plugin)

Browse Source
This commit is contained in:
Aleksandra Malinowska 2023-11-27 09:51:30 +01:00
parent e19be41f58
commit 7abba24231
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/extender_test.go
View File

@ -93,6 +93,7 @@ func TestSchedulerWithExtenders(t *testing.T) {
registerPlugins: []tf.RegisterPluginFunc{
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
extenders: []tf.FakeExtender{
@ -245,6 +246,7 @@ func TestSchedulerWithExtenders(t *testing.T) {
// because of the errors from errorPredicateExtender.
registerPlugins: []tf.RegisterPluginFunc{
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},

6
pkg/scheduler/schedule_one_test.go
View File

@ -1814,6 +1814,7 @@ func TestSchedulerSchedulePod(t *testing.T) {
registerPlugins: []tf.RegisterPluginFunc{
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
nodes: []string{"node1", "node2"},
@ -1931,6 +1932,7 @@ func TestSchedulerSchedulePod(t *testing.T) {
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
tf.RegisterPreFilterPlugin(volumebinding.Name, frameworkruntime.FactoryAdapter(fts, volumebinding.New)),
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
nodes: []string{"node1", "node2"},
@ -2044,6 +2046,7 @@ func TestSchedulerSchedulePod(t *testing.T) {
"PreFilter",
"Filter",
),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
nodes: []string{"node1", "node2", "node3"},
@ -2317,6 +2320,7 @@ func TestSchedulerSchedulePod(t *testing.T) {
},
}, nil
}, "PreFilter", "Filter"),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
nodes: []string{"node1", "node2", "node3"},
@ -3211,6 +3215,7 @@ func TestFairEvaluationForNodes(t *testing.T) {
[]tf.RegisterPluginFunc{
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
"",
@ -3289,6 +3294,7 @@ func TestPreferNominatedNodeFilterCallCounts(t *testing.T) {
registerPlugins := []tf.RegisterPluginFunc{
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
registerFakeFilterFunc,
tf.RegisterScorePlugin("EqualPrioritizerPlugin", tf.NewEqualPrioritizerPlugin(), 20),
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
}
fwk, err := tf.NewFramework(

24
pkg/scheduler/testing/framework/fake_extender.go
View File

@ -137,6 +137,30 @@ func (pl *node2PrioritizerPlugin) ScoreExtensions() framework.ScoreExtensions {
return nil
}
type equalPrioritizerPlugin struct{}
// NewEqualPrioritizerPlugin returns a factory function to build equalPrioritizerPlugin.
func NewEqualPrioritizerPlugin() frameworkruntime.PluginFactory {
return func(_ context.Context, _ runtime.Object, _ framework.Handle) (framework.Plugin, error) {
return &equalPrioritizerPlugin{}, nil
}
}
// Name returns the name of the plugin.
func (pl *equalPrioritizerPlugin) Name() string {
return "EqualPrioritizerPlugin"
}
// Score returns score 1 for each node.
func (pl *equalPrioritizerPlugin) Score(_ context.Context, _ *framework.CycleState, _ *v1.Pod, _ string) (int64, *framework.Status) {
return int64(1), nil
}
// ScoreExtensions returns nil.
func (pl *equalPrioritizerPlugin) ScoreExtensions() framework.ScoreExtensions {
return nil
}
// FakeExtender is a data struct which implements the Extender interface.
type FakeExtender struct {
// ExtenderName indicates this fake extender's name.