Skip to content

Commit a1b2a77

Browse files
chendavechendave
committed
Change the node name from "machine" to "node"
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 <[email protected]>
1 parent dd649bb commit a1b2a77

File tree

3 files changed

+88
-88
lines changed

3 files changed

+88
-88
lines changed

‎pkg/scheduler/core/extender_test.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
6363
Predicates: []st.FitPredicate{st.ErrorPredicateExtender},
6464
},
6565
},
66-
nodes: []string{"machine1", "machine2"},
66+
nodes: []string{"node1", "node2"},
6767
expectsErr: true,
6868
name: "test 1",
6969
},
@@ -81,7 +81,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
8181
Predicates: []st.FitPredicate{st.FalsePredicateExtender},
8282
},
8383
},
84-
nodes: []string{"machine1", "machine2"},
84+
nodes: []string{"node1", "node2"},
8585
expectsErr: true,
8686
name: "test 2",
8787
},
@@ -96,12 +96,12 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
9696
Predicates: []st.FitPredicate{st.TruePredicateExtender},
9797
},
9898
{
99-
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
99+
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
100100
},
101101
},
102-
nodes: []string{"machine1", "machine2"},
102+
nodes: []string{"node1", "node2"},
103103
expectedResult: ScheduleResult{
104-
SuggestedHost: "machine1",
104+
SuggestedHost: "node1",
105105
EvaluatedNodes: 2,
106106
FeasibleNodes: 1,
107107
},
@@ -115,13 +115,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
115115
},
116116
extenders: []st.FakeExtender{
117117
{
118-
Predicates: []st.FitPredicate{st.Machine2PredicateExtender},
118+
Predicates: []st.FitPredicate{st.Node2PredicateExtender},
119119
},
120120
{
121-
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
121+
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
122122
},
123123
},
124-
nodes: []string{"machine1", "machine2"},
124+
nodes: []string{"node1", "node2"},
125125
expectsErr: true,
126126
name: "test 4",
127127
},
@@ -138,9 +138,9 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
138138
Weight: 1,
139139
},
140140
},
141-
nodes: []string{"machine1"},
141+
nodes: []string{"node1"},
142142
expectedResult: ScheduleResult{
143-
SuggestedHost: "machine1",
143+
SuggestedHost: "node1",
144144
EvaluatedNodes: 1,
145145
FeasibleNodes: 1,
146146
},
@@ -155,18 +155,18 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
155155
extenders: []st.FakeExtender{
156156
{
157157
Predicates: []st.FitPredicate{st.TruePredicateExtender},
158-
Prioritizers: []st.PriorityConfig{{Function: st.Machine1PrioritizerExtender, Weight: 10}},
158+
Prioritizers: []st.PriorityConfig{{Function: st.Node1PrioritizerExtender, Weight: 10}},
159159
Weight: 1,
160160
},
161161
{
162162
Predicates: []st.FitPredicate{st.TruePredicateExtender},
163-
Prioritizers: []st.PriorityConfig{{Function: st.Machine2PrioritizerExtender, Weight: 10}},
163+
Prioritizers: []st.PriorityConfig{{Function: st.Node2PrioritizerExtender, Weight: 10}},
164164
Weight: 5,
165165
},
166166
},
167-
nodes: []string{"machine1", "machine2"},
167+
nodes: []string{"node1", "node2"},
168168
expectedResult: ScheduleResult{
169-
SuggestedHost: "machine2",
169+
SuggestedHost: "node2",
170170
EvaluatedNodes: 2,
171171
FeasibleNodes: 2,
172172
},
@@ -175,23 +175,23 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
175175
{
176176
registerPlugins: []st.RegisterPluginFunc{
177177
st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin),
178-
st.RegisterScorePlugin("Machine2Prioritizer", st.NewMachine2PrioritizerPlugin(), 20),
178+
st.RegisterScorePlugin("Node2Prioritizer", st.NewNode2PrioritizerPlugin(), 20),
179179
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
180180
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
181181
},
182182
extenders: []st.FakeExtender{
183183
{
184184
Predicates: []st.FitPredicate{st.TruePredicateExtender},
185-
Prioritizers: []st.PriorityConfig{{Function: st.Machine1PrioritizerExtender, Weight: 10}},
185+
Prioritizers: []st.PriorityConfig{{Function: st.Node1PrioritizerExtender, Weight: 10}},
186186
Weight: 1,
187187
},
188188
},
189-
nodes: []string{"machine1", "machine2"},
189+
nodes: []string{"node1", "node2"},
190190
expectedResult: ScheduleResult{
191-
SuggestedHost: "machine2",
191+
SuggestedHost: "node2",
192192
EvaluatedNodes: 2,
193193
FeasibleNodes: 2,
194-
}, // machine2 has higher score
194+
}, // node2 has higher score
195195
name: "test 7",
196196
},
197197
{
@@ -204,7 +204,7 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
204204
// errorPrioritizerExtender.
205205
registerPlugins: []st.RegisterPluginFunc{
206206
st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin),
207-
st.RegisterScorePlugin("Machine2Prioritizer", st.NewMachine2PrioritizerPlugin(), 1),
207+
st.RegisterScorePlugin("Node2Prioritizer", st.NewNode2PrioritizerPlugin(), 1),
208208
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
209209
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
210210
},
@@ -215,13 +215,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
215215
UnInterested: true,
216216
},
217217
},
218-
nodes: []string{"machine1", "machine2"},
218+
nodes: []string{"node1", "node2"},
219219
expectsErr: false,
220220
expectedResult: ScheduleResult{
221-
SuggestedHost: "machine2",
221+
SuggestedHost: "node2",
222222
EvaluatedNodes: 2,
223223
FeasibleNodes: 2,
224-
}, // machine2 has higher score
224+
}, // node2 has higher score
225225
name: "test 8",
226226
},
227227
{
@@ -241,13 +241,13 @@ func TestGenericSchedulerWithExtenders(t *testing.T) {
241241
Ignorable: true,
242242
},
243243
{
244-
Predicates: []st.FitPredicate{st.Machine1PredicateExtender},
244+
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
245245
},
246246
},
247-
nodes: []string{"machine1", "machine2"},
247+
nodes: []string{"node1", "node2"},
248248
expectsErr: false,
249249
expectedResult: ScheduleResult{
250-
SuggestedHost: "machine1",
250+
SuggestedHost: "node1",
251251
EvaluatedNodes: 2,
252252
FeasibleNodes: 1,
253253
},

‎pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,20 @@ func TestPostFilter(t *testing.T) {
176176
name: "preemption result filtered out by extenders",
177177
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Obj(),
178178
pods: []*v1.Pod{
179-
st.MakePod().Name("p1").UID("p1").Node("machine1").Obj(),
180-
st.MakePod().Name("p2").UID("p2").Node("machine2").Obj(),
179+
st.MakePod().Name("p1").UID("p1").Node("node1").Obj(),
180+
st.MakePod().Name("p2").UID("p2").Node("node2").Obj(),
181181
},
182182
nodes: []*v1.Node{
183-
st.MakeNode().Name("machine1").Capacity(onePodRes).Obj(),
184-
st.MakeNode().Name("machine2").Capacity(onePodRes).Obj(),
183+
st.MakeNode().Name("node1").Capacity(onePodRes).Obj(),
184+
st.MakeNode().Name("node2").Capacity(onePodRes).Obj(),
185185
},
186186
filteredNodesStatuses: framework.NodeToStatusMap{
187-
"machine1": framework.NewStatus(framework.Unschedulable),
188-
"machine2": framework.NewStatus(framework.Unschedulable),
187+
"node1": framework.NewStatus(framework.Unschedulable),
188+
"node2": framework.NewStatus(framework.Unschedulable),
189189
},
190-
extender: &st.FakeExtender{Predicates: []st.FitPredicate{st.Machine1PredicateExtender}},
190+
extender: &st.FakeExtender{Predicates: []st.FitPredicate{st.Node1PredicateExtender}},
191191
wantResult: &framework.PostFilterResult{
192-
NominatedNodeName: "machine1",
192+
NominatedNodeName: "node1",
193193
},
194194
wantStatus: framework.NewStatus(framework.Success),
195195
},
@@ -255,7 +255,7 @@ func TestSelectNodesForPreemption(t *testing.T) {
255255
expectedNumFilterCalled int32
256256
}{
257257
{
258-
name: "a pod that does not fit on any machine",
258+
name: "a pod that does not fit on any node",
259259
registerPlugins: []st.RegisterPluginFunc{
260260
st.RegisterFilterPlugin("FalseFilter", st.NewFalseFilterPlugin),
261261
},
@@ -286,7 +286,7 @@ func TestSelectNodesForPreemption(t *testing.T) {
286286
expectedNumFilterCalled: 4,
287287
},
288288
{
289-
name: "a pod that fits on one machine with no preemption",
289+
name: "a pod that fits on one node with no preemption",
290290
registerPlugins: []st.RegisterPluginFunc{
291291
st.RegisterFilterPlugin("MatchFilter", st.NewMatchFilterPlugin),
292292
},
@@ -302,7 +302,7 @@ func TestSelectNodesForPreemption(t *testing.T) {
302302
expectedNumFilterCalled: 3,
303303
},
304304
{
305-
name: "a pod that fits on both machines when lower priority pods are preempted",
305+
name: "a pod that fits on both nodes when lower priority pods are preempted",
306306
registerPlugins: []st.RegisterPluginFunc{
307307
st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
308308
},
@@ -323,7 +323,7 @@ func TestSelectNodesForPreemption(t *testing.T) {
323323
expectedNumFilterCalled: 4,
324324
},
325325
{
326-
name: "a pod that would fit on the machines, but other pods running are higher priority, no preemption would happen",
326+
name: "a pod that would fit on the nodes, but other pods running are higher priority, no preemption would happen",
327327
registerPlugins: []st.RegisterPluginFunc{
328328
st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
329329
},
@@ -696,7 +696,7 @@ func TestPickOneNodeForPreemption(t *testing.T) {
696696
expected: []string{"node1", "node2"},
697697
},
698698
{
699-
name: "machine with min highest priority pod is picked",
699+
name: "node with min highest priority pod is picked",
700700
registerPlugin: st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
701701
nodeNames: []string{"node1", "node2", "node3"},
702702
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
@@ -784,7 +784,7 @@ func TestPickOneNodeForPreemption(t *testing.T) {
784784
expected: []string{"node1"},
785785
},
786786
{
787-
name: "same priority, same number of victims, different start time for each machine's pod",
787+
name: "same priority, same number of victims, different start time for each node's pod",
788788
registerPlugin: st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
789789
nodeNames: []string{"node1", "node2", "node3"},
790790
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
@@ -1095,20 +1095,20 @@ func TestPreempt(t *testing.T) {
10951095
expectedPods: []string{"p-b1"},
10961096
},
10971097
{
1098-
name: "Scheduler extenders allow only machine1, otherwise machine3 would have been chosen",
1098+
name: "Scheduler extenders allow only node1, otherwise node3 would have been chosen",
10991099
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).PreemptionPolicy(v1.PreemptLowerPriority).Obj(),
11001100
pods: []*v1.Pod{
1101-
st.MakePod().Name("p1.1").UID("p1.1").Node("machine1").Priority(midPriority).Req(smallRes).Obj(),
1102-
st.MakePod().Name("p1.2").UID("p1.2").Node("machine1").Priority(lowPriority).Req(smallRes).Obj(),
1103-
st.MakePod().Name("p2.1").UID("p2.1").Node("machine3").Priority(midPriority).Req(largeRes).Obj(),
1101+
st.MakePod().Name("p1.1").UID("p1.1").Node("node1").Priority(midPriority).Req(smallRes).Obj(),
1102+
st.MakePod().Name("p1.2").UID("p1.2").Node("node1").Priority(lowPriority).Req(smallRes).Obj(),
1103+
st.MakePod().Name("p2.1").UID("p2.1").Node("node3").Priority(midPriority).Req(largeRes).Obj(),
11041104
},
1105-
nodeNames: []string{"machine1", "machine2", "machine3"},
1105+
nodeNames: []string{"node1", "node2", "node3"},
11061106
extenders: []*st.FakeExtender{
11071107
{Predicates: []st.FitPredicate{st.TruePredicateExtender}},
1108-
{Predicates: []st.FitPredicate{st.Machine1PredicateExtender}},
1108+
{Predicates: []st.FitPredicate{st.Node1PredicateExtender}},
11091109
},
11101110
registerPlugin: st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
1111-
expectedNode: "machine1",
1111+
expectedNode: "node1",
11121112
expectedPods: []string{"p1.1", "p1.2"},
11131113
},
11141114
{
@@ -1128,38 +1128,38 @@ func TestPreempt(t *testing.T) {
11281128
expectedPods: []string{},
11291129
},
11301130
{
1131-
name: "One scheduler extender allows only machine1, the other returns error but ignorable. Only machine1 would be chosen",
1131+
name: "One scheduler extender allows only node1, the other returns error but ignorable. Only node1 would be chosen",
11321132
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).PreemptionPolicy(v1.PreemptLowerPriority).Obj(),
11331133
pods: []*v1.Pod{
1134-
st.MakePod().Name("p1.1").UID("p1.1").Node("machine1").Priority(midPriority).Req(smallRes).Obj(),
1135-
st.MakePod().Name("p1.2").UID("p1.2").Node("machine1").Priority(lowPriority).Req(smallRes).Obj(),
1136-
st.MakePod().Name("p2.1").UID("p2.1").Node("machine2").Priority(midPriority).Req(largeRes).Obj(),
1134+
st.MakePod().Name("p1.1").UID("p1.1").Node("node1").Priority(midPriority).Req(smallRes).Obj(),
1135+
st.MakePod().Name("p1.2").UID("p1.2").Node("node1").Priority(lowPriority).Req(smallRes).Obj(),
1136+
st.MakePod().Name("p2.1").UID("p2.1").Node("node2").Priority(midPriority).Req(largeRes).Obj(),
11371137
},
1138-
nodeNames: []string{"machine1", "machine2", "machine3"},
1138+
nodeNames: []string{"node1", "node2", "node3"},
11391139
extenders: []*st.FakeExtender{
11401140
{Predicates: []st.FitPredicate{st.ErrorPredicateExtender}, Ignorable: true},
1141-
{Predicates: []st.FitPredicate{st.Machine1PredicateExtender}},
1141+
{Predicates: []st.FitPredicate{st.Node1PredicateExtender}},
11421142
},
11431143
registerPlugin: st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
1144-
expectedNode: "machine1",
1144+
expectedNode: "node1",
11451145
expectedPods: []string{"p1.1", "p1.2"},
11461146
},
11471147
{
1148-
name: "One scheduler extender allows only machine1, but it is not interested in given pod, otherwise machine1 would have been chosen",
1148+
name: "One scheduler extender allows only node1, but it is not interested in given pod, otherwise node1 would have been chosen",
11491149
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).PreemptionPolicy(v1.PreemptLowerPriority).Obj(),
11501150
pods: []*v1.Pod{
1151-
st.MakePod().Name("p1.1").UID("p1.1").Node("machine1").Priority(midPriority).Req(smallRes).Obj(),
1152-
st.MakePod().Name("p1.2").UID("p1.2").Node("machine1").Priority(lowPriority).Req(smallRes).Obj(),
1153-
st.MakePod().Name("p2.1").UID("p2.1").Node("machine2").Priority(midPriority).Req(largeRes).Obj(),
1151+
st.MakePod().Name("p1.1").UID("p1.1").Node("node1").Priority(midPriority).Req(smallRes).Obj(),
1152+
st.MakePod().Name("p1.2").UID("p1.2").Node("node1").Priority(lowPriority).Req(smallRes).Obj(),
1153+
st.MakePod().Name("p2.1").UID("p2.1").Node("node2").Priority(midPriority).Req(largeRes).Obj(),
11541154
},
1155-
nodeNames: []string{"machine1", "machine2"},
1155+
nodeNames: []string{"node1", "node2"},
11561156
extenders: []*st.FakeExtender{
1157-
{Predicates: []st.FitPredicate{st.Machine1PredicateExtender}, UnInterested: true},
1157+
{Predicates: []st.FitPredicate{st.Node1PredicateExtender}, UnInterested: true},
11581158
{Predicates: []st.FitPredicate{st.TruePredicateExtender}},
11591159
},
11601160
registerPlugin: st.RegisterPluginAsExtensions(noderesources.FitName, noderesources.NewFit, "Filter", "PreFilter"),
1161-
// sum of priorities of all victims on machine1 is larger than machine2, machine2 is chosen.
1162-
expectedNode: "machine2",
1161+
//sum of priorities of all victims on node1 is larger than node2, node2 is chosen.
1162+
expectedNode: "node2",
11631163
expectedPods: []string{"p2.1"},
11641164
},
11651165
{

0 commit comments

Comments
 (0)