github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary field from TestTopologyAlignedAllocation() test cases

Browse Source
This commit is contained in:
Kevin Klues 2020-07-02 15:16:01 +00:00
parent bb08fd1135
commit 83f18d9975
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/kubelet/cm/devicemanager/topology_hints_test.go
View File

@ -431,14 +431,13 @@ func TestGetTopologyHints(t *testing.T) {
func TestTopologyAlignedAllocation(t *testing.T) { func TestTopologyAlignedAllocation(t *testing.T) {
tcases := []struct { tcases := []struct {
description string description string
resource string resource string
request int request int
devices []pluginapi.Device devices []pluginapi.Device
allocatedDevices []string allocatedDevices []string
hint topologymanager.TopologyHint hint topologymanager.TopologyHint
expectedAllocation int expectedAlignment map[int]int
expectedAlignment map[int]int
}{ }{
{ {
description: "Single Request, no alignment", description: "Single Request, no alignment",
@ -452,8 +451,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(0, 1), NUMANodeAffinity: makeSocketMask(0, 1),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 1, expectedAlignment: map[int]int{},
expectedAlignment: map[int]int{},
}, },
{ {
description: "Request for 1, partial alignment", description: "Request for 1, partial alignment",
@ -467,8 +465,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(1), NUMANodeAffinity: makeSocketMask(1),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 1, expectedAlignment: map[int]int{1: 1},
expectedAlignment: map[int]int{1: 1},
}, },
{ {
description: "Single Request, socket 0", description: "Single Request, socket 0",
@ -482,8 +479,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(0), NUMANodeAffinity: makeSocketMask(0),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 1, expectedAlignment: map[int]int{0: 1},
expectedAlignment: map[int]int{0: 1},
}, },
{ {
description: "Single Request, socket 1", description: "Single Request, socket 1",
@ -497,8 +493,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(1), NUMANodeAffinity: makeSocketMask(1),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 1, expectedAlignment: map[int]int{1: 1},
expectedAlignment: map[int]int{1: 1},
}, },
{ {
description: "Request for 2, socket 0", description: "Request for 2, socket 0",
@ -514,8 +509,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(0), NUMANodeAffinity: makeSocketMask(0),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 2, expectedAlignment: map[int]int{0: 2},
expectedAlignment: map[int]int{0: 2},
}, },
{ {
description: "Request for 2, socket 1", description: "Request for 2, socket 1",
@ -531,8 +525,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(1), NUMANodeAffinity: makeSocketMask(1),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 2, expectedAlignment: map[int]int{1: 2},
expectedAlignment: map[int]int{1: 2},
}, },
{ {
description: "Request for 4, unsatisfiable, prefer socket 0", description: "Request for 4, unsatisfiable, prefer socket 0",
@ -550,8 +543,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(0), NUMANodeAffinity: makeSocketMask(0),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 4, expectedAlignment: map[int]int{0: 3, 1: 1},
expectedAlignment: map[int]int{0: 3, 1: 1},
}, },
{ {
description: "Request for 4, unsatisfiable, prefer socket 1", description: "Request for 4, unsatisfiable, prefer socket 1",
@ -569,8 +561,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(1), NUMANodeAffinity: makeSocketMask(1),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 4, expectedAlignment: map[int]int{0: 1, 1: 3},
expectedAlignment: map[int]int{0: 1, 1: 3},
}, },
{ {
description: "Request for 4, multisocket", description: "Request for 4, multisocket",
@ -590,8 +581,7 @@ func TestTopologyAlignedAllocation(t *testing.T) {
NUMANodeAffinity: makeSocketMask(1, 3), NUMANodeAffinity: makeSocketMask(1, 3),
Preferred: true, Preferred: true,
}, },
expectedAllocation: 4, expectedAlignment: map[int]int{1: 2, 3: 2},
expectedAlignment: map[int]int{1: 2, 3: 2},
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -621,8 +611,8 @@ func TestTopologyAlignedAllocation(t *testing.T) {
continue continue
} }
if len(allocated) != tc.expectedAllocation { if len(allocated) != tc.request {
t.Errorf("%v. expected allocation: %v but got: %v", tc.description, tc.expectedAllocation, len(allocated)) t.Errorf("%v. expected allocation size: %v but got: %v", tc.description, tc.request, len(allocated))
} }
alignment := make(map[int]int) alignment := make(map[int]int)