Merge pull request #783 from funnydreamwinz/dev/fix-ut

fix(sysadvisor): fix unit test failed of get headroom
kubewharf · Feb 13, 2025 · cdf8732 · cdf8732
2 parents 3c1d4db + 6980bb5
commit cdf8732
Showing 1 changed file with 95 additions and 0 deletions.
diff --git a/...advisor/plugin/qosaware/resource/cpu/assembler/headroomassembler/assembler_common_test.go b/...advisor/plugin/qosaware/resource/cpu/assembler/headroomassembler/assembler_common_test.go
@@ -137,6 +137,23 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 								consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
 							},
 						},
+						TopologyZone: []*v1alpha1.TopologyZone{
+							{
+								Type: "Socket",
+								Name: "0",
+								Children: []*v1alpha1.TopologyZone{
+									{
+										Type: "Numa",
+										Name: "0",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 				reclaimedResourceConfiguration: &reclaimedresource.ReclaimedResourceConfiguration{
@@ -154,6 +171,7 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 					for i := 0; i < 10; i++ {
 						store.SetCPUMetric(i, pkgconsts.MetricCPUUsageRatio, utilmetric.MetricData{Value: 0.3, Time: &now})
 					}
+					store.SetCgroupMetric("/kubepods/besteffort-0", pkgconsts.MetricCPUUsageCgroup, utilmetric.MetricData{Value: 3, Time: &now})
 					store.SetCgroupMetric("/kubepods/besteffort", pkgconsts.MetricCPUUsageCgroup, utilmetric.MetricData{Value: 3, Time: &now})
 				},
 				setMetaCache: func(cache *metacache.MetaCacheImp) {
@@ -190,6 +208,23 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 								consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
 							},
 						},
+						TopologyZone: []*v1alpha1.TopologyZone{
+							{
+								Type: "Socket",
+								Name: "0",
+								Children: []*v1alpha1.TopologyZone{
+									{
+										Type: "Numa",
+										Name: "0",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 				reclaimedResourceConfiguration: &reclaimedresource.ReclaimedResourceConfiguration{
@@ -296,6 +331,23 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 								consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
 							},
 						},
+						TopologyZone: []*v1alpha1.TopologyZone{
+							{
+								Type: "Socket",
+								Name: "0",
+								Children: []*v1alpha1.TopologyZone{
+									{
+										Type: "Numa",
+										Name: "0",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("10000"),
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 				reclaimedResourceConfiguration: &reclaimedresource.ReclaimedResourceConfiguration{
@@ -344,6 +396,23 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 								consts.ReclaimedResourceMilliCPU: resource.MustParse("15000"),
 							},
 						},
+						TopologyZone: []*v1alpha1.TopologyZone{
+							{
+								Type: "Socket",
+								Name: "0",
+								Children: []*v1alpha1.TopologyZone{
+									{
+										Type: "Numa",
+										Name: "0",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("15000"),
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 				reclaimedResourceConfiguration: &reclaimedresource.ReclaimedResourceConfiguration{
@@ -392,6 +461,32 @@ func TestHeadroomAssemblerCommon_GetHeadroom(t *testing.T) {
 								consts.ReclaimedResourceMilliCPU: resource.MustParse("86000"),
 							},
 						},
+						TopologyZone: []*v1alpha1.TopologyZone{
+							{
+								Type: "Socket",
+								Name: "0",
+								Children: []*v1alpha1.TopologyZone{
+									{
+										Type: "Numa",
+										Name: "0",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("43000"),
+											},
+										},
+									},
+									{
+										Type: "Numa",
+										Name: "1",
+										Resources: v1alpha1.Resources{
+											Allocatable: &v1.ResourceList{
+												consts.ReclaimedResourceMilliCPU: resource.MustParse("43000"),
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 				reclaimedResourceConfiguration: &reclaimedresource.ReclaimedResourceConfiguration{