mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Move test case "Two providers, 1 hint each, same mask, 1 preferred, 1
not 1/2" into specific policy test.
This commit is contained in:
parent
f639da7637
commit
a38a2562b2
@ -88,35 +88,6 @@ func commonPolicyMergeTestCases(numaNodes []int) []policyMergeTestCase {
|
|||||||
Preferred: true,
|
Preferred: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "Two providers, 1 hint each, same mask, 1 preferred, 1 not 1/2",
|
|
||||||
hp: []HintProvider{
|
|
||||||
&mockHintProvider{
|
|
||||||
map[string][]TopologyHint{
|
|
||||||
"resource1": {
|
|
||||||
{
|
|
||||||
NUMANodeAffinity: NewTestBitMask(0),
|
|
||||||
Preferred: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
&mockHintProvider{
|
|
||||||
map[string][]TopologyHint{
|
|
||||||
"resource2": {
|
|
||||||
{
|
|
||||||
NUMANodeAffinity: NewTestBitMask(0),
|
|
||||||
Preferred: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
expected: TopologyHint{
|
|
||||||
NUMANodeAffinity: NewTestBitMask(0),
|
|
||||||
Preferred: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: "Two providers, 1 hint each, same mask, 1 preferred, 1 not 2/2",
|
name: "Two providers, 1 hint each, same mask, 1 preferred, 1 not 2/2",
|
||||||
hp: []HintProvider{
|
hp: []HintProvider{
|
||||||
@ -519,6 +490,35 @@ func (p *bestEffortPolicy) mergeTestCases(numaNodes []int) []policyMergeTestCase
|
|||||||
Preferred: false,
|
Preferred: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Two providers, 1 hint each, same mask, 1 preferred, 1 not 1/2",
|
||||||
|
hp: []HintProvider{
|
||||||
|
&mockHintProvider{
|
||||||
|
map[string][]TopologyHint{
|
||||||
|
"resource1": {
|
||||||
|
{
|
||||||
|
NUMANodeAffinity: NewTestBitMask(0),
|
||||||
|
Preferred: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&mockHintProvider{
|
||||||
|
map[string][]TopologyHint{
|
||||||
|
"resource2": {
|
||||||
|
{
|
||||||
|
NUMANodeAffinity: NewTestBitMask(0),
|
||||||
|
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{
|
||||||
@ -696,6 +696,35 @@ func (p *singleNumaNodePolicy) mergeTestCases(numaNodes []int) []policyMergeTest
|
|||||||
Preferred: false,
|
Preferred: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Two providers, 1 hint each, same mask, 1 preferred, 1 not 1/2",
|
||||||
|
hp: []HintProvider{
|
||||||
|
&mockHintProvider{
|
||||||
|
map[string][]TopologyHint{
|
||||||
|
"resource1": {
|
||||||
|
{
|
||||||
|
NUMANodeAffinity: NewTestBitMask(0),
|
||||||
|
Preferred: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&mockHintProvider{
|
||||||
|
map[string][]TopologyHint{
|
||||||
|
"resource2": {
|
||||||
|
{
|
||||||
|
NUMANodeAffinity: NewTestBitMask(0),
|
||||||
|
Preferred: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
expected: TopologyHint{
|
||||||
|
NUMANodeAffinity: nil,
|
||||||
|
Preferred: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "Single NUMA hint generation",
|
name: "Single NUMA hint generation",
|
||||||
hp: []HintProvider{
|
hp: []HintProvider{
|
||||||
|
Loading…
Reference in New Issue
Block a user