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

Move test case "Two providers, 1 with 2 hints, 1 with single

Browse Source 
non-preferred hint matching" into specific policy tests
This commit is contained in:
nolancon
2019-12-20 07:45:28 +00:00
parent 681c42bfc2
commit 8b3f6e61a2
1 changed files with 66 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
pkg/kubelet/cm/topologymanager/policy_test.go
View File

@@ -194,39 +194,6 @@ func commonPolicyMergeTestCases(numaNodes []int) []policyMergeTestCase {
Preferred: true, Preferred: true,
}, },
}, },
{
name: "Two providers, 1 with 2 hints, 1 with single non-preferred hint matching",
hp: []HintProvider{
&mockHintProvider{
map[string][]TopologyHint{
"resource1": {
{
NUMANodeAffinity: NewTestBitMask(0),
Preferred: true,
},
{
NUMANodeAffinity: NewTestBitMask(1),
Preferred: true,
},
},
},
},
&mockHintProvider{
map[string][]TopologyHint{
"resource2": {
{
NUMANodeAffinity: NewTestBitMask(0, 1),
Preferred: false,
},
},
},
},
},
expected: TopologyHint{
NUMANodeAffinity: NewTestBitMask(0),
Preferred: false,
},
},
{ {
name: "Two providers, both with 2 hints, matching narrower preferred hint from both", name: "Two providers, both with 2 hints, matching narrower preferred hint from both",
hp: []HintProvider{ hp: []HintProvider{
@@ -548,6 +515,39 @@ func (p *bestEffortPolicy) mergeTestCases(numaNodes []int) []policyMergeTestCase
Preferred: true, Preferred: true,
}, },
}, },
{
name: "Two providers, 1 with 2 hints, 1 with single non-preferred hint matching",
hp: []HintProvider{
&mockHintProvider{
map[string][]TopologyHint{
"resource1": {
{
NUMANodeAffinity: NewTestBitMask(0),
Preferred: true,
},
{
NUMANodeAffinity: NewTestBitMask(1),
Preferred: true,
},
},
},
},
&mockHintProvider{
map[string][]TopologyHint{
"resource2": {
{
NUMANodeAffinity: NewTestBitMask(0, 1),
Preferred: false,
},
},
},
},
},
expected: TopologyHint{
NUMANodeAffinity: NewTestBitMask(0),
Preferred: false,
},
},
{ {
name: "Two providers, 1 hint each, 1 wider mask, both preferred 1/2", name: "Two providers, 1 hint each, 1 wider mask, both preferred 1/2",
hp: []HintProvider{ hp: []HintProvider{
@@ -754,6 +754,39 @@ func (p *singleNumaNodePolicy) mergeTestCases(numaNodes []int) []policyMergeTest
Preferred: false, Preferred: false,
}, },
}, },
{
name: "Two providers, 1 with 2 hints, 1 with single non-preferred hint matching",
hp: []HintProvider{
&mockHintProvider{
map[string][]TopologyHint{
"resource1": {
{
NUMANodeAffinity: NewTestBitMask(0),
Preferred: true,
},
{
NUMANodeAffinity: NewTestBitMask(1),
Preferred: true,
},
},
},
},
&mockHintProvider{
map[string][]TopologyHint{
"resource2": {
{
NUMANodeAffinity: NewTestBitMask(0, 1),
Preferred: false,
},
},
},
},
},
expected: TopologyHint{
NUMANodeAffinity: nil,
Preferred: false,
},
},
{ {
name: "Single NUMA hint generation", name: "Single NUMA hint generation",
hp: []HintProvider{ hp: []HintProvider{