github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the node name from "machine" to "node"

Browse Source 
Latest change on master rename the node name from "machine" to "node"
but haven't update all the affected code, which causes some of testcases
invalid.

Signed-off-by: Dave Chen <dave.chen@arm.com>
This commit is contained in:
Dave Chen
2020-07-06 17:04:02 +08:00
parent dd649bb7ef
commit a1b2a7765d
3 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/scheduler/core/extender_test.go
View File

@@ -63,7 +63,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
Predicates: []st.FitPredicate{st.ErrorPredicateExtender},
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectsErr: true,
name: "test 1",
},
@@ -81,7 +81,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
Predicates: []st.FitPredicate{st.FalsePredicateExtender},
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectsErr: true,
name: "test 2",
},
@@ -96,12 +96,12 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
Predicates: []st.FitPredicate{st.TruePredicateExtender},
},
{
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectedResult: ScheduleResult{
SuggestedHost: "machine1",
SuggestedHost: "node1",
EvaluatedNodes: 2,
FeasibleNodes: 1,
},
@@ -115,13 +115,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
},
extenders: []st.FakeExtender{
{
Predicates: []st.FitPredicate{st.Machine2PredicateExtender},
Predicates: []st.FitPredicate{st.Node2PredicateExtender},
},
{
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectsErr: true,
name: "test 4",
},
@@ -138,9 +138,9 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
Weight: 1,
},
},
nodes: []string{"machine1"},
nodes: []string{"node1"},
expectedResult: ScheduleResult{
SuggestedHost: "machine1",
SuggestedHost: "node1",
EvaluatedNodes: 1,
FeasibleNodes: 1,
},
@@ -155,18 +155,18 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
extenders: []st.FakeExtender{
{
Predicates: []st.FitPredicate{st.TruePredicateExtender},
Prioritizers: []st.PriorityConfig{{Function: st.Machine1PrioritizerExtender, Weight: 10}},
Prioritizers: []st.PriorityConfig{{Function: st.Node1PrioritizerExtender, Weight: 10}},
Weight: 1,
},
{
Predicates: []st.FitPredicate{st.TruePredicateExtender},
Prioritizers: []st.PriorityConfig{{Function: st.Machine2PrioritizerExtender, Weight: 10}},
Prioritizers: []st.PriorityConfig{{Function: st.Node2PrioritizerExtender, Weight: 10}},
Weight: 5,
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectedResult: ScheduleResult{
SuggestedHost: "machine2",
SuggestedHost: "node2",
EvaluatedNodes: 2,
FeasibleNodes: 2,
},
@@ -175,23 +175,23 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
{
registerPlugins: []st.RegisterPluginFunc{
st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin),
st.RegisterScorePlugin("Machine2Prioritizer", st.NewMachine2PrioritizerPlugin(), 20),
st.RegisterScorePlugin("Node2Prioritizer", st.NewNode2PrioritizerPlugin(), 20),
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
extenders: []st.FakeExtender{
{
Predicates: []st.FitPredicate{st.TruePredicateExtender},
Prioritizers: []st.PriorityConfig{{Function: st.Machine1PrioritizerExtender, Weight: 10}},
Prioritizers: []st.PriorityConfig{{Function: st.Node1PrioritizerExtender, Weight: 10}},
Weight: 1,
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectedResult: ScheduleResult{
SuggestedHost: "machine2",
SuggestedHost: "node2",
EvaluatedNodes: 2,
FeasibleNodes: 2,
}, // machine2 has higher score
}, // node2 has higher score
name: "test 7",
},
{
@@ -204,7 +204,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
// errorPrioritizerExtender.
registerPlugins: []st.RegisterPluginFunc{
st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin),
st.RegisterScorePlugin("Machine2Prioritizer", st.NewMachine2PrioritizerPlugin(), 1),
st.RegisterScorePlugin("Node2Prioritizer", st.NewNode2PrioritizerPlugin(), 1),
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
},
@@ -215,13 +215,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
UnInterested: true,
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectsErr: false,
expectedResult: ScheduleResult{
SuggestedHost: "machine2",
SuggestedHost: "node2",
EvaluatedNodes: 2,
FeasibleNodes: 2,
}, // machine2 has higher score
}, // node2 has higher score
name: "test 8",
},
{
@@ -241,13 +241,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
Ignorable: true,
},
{
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
},
},
nodes: []string{"machine1", "machine2"},
nodes: []string{"node1", "node2"},
expectsErr: false,
expectedResult: ScheduleResult{
SuggestedHost: "machine1",
SuggestedHost: "node1",
EvaluatedNodes: 2,
FeasibleNodes: 1,
},