Fixed minor CR comments

Signed-off-by: itsomri <omric@nvidia.com>

Author: itsomri

pkg/scheduler/api/node_info/numa_topology.go

@@ -4,6 +4,7 @@
 package node_info
 
 import (
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -220,7 +221,9 @@ func allocatablePrefixSums(zones []*NumaZone, indices []int) map[int][]float64 {
 // vendor variants) collapse to one entry; the reported name preserved is the last seen.
 func awareIndices(resources sets.Set[v1.ResourceName], vectorMap *resource_info.ResourceVectorMap) ([]int, map[int]v1.ResourceName) {
 	names := map[int]v1.ResourceName{}
-	for name := range resources {
+	resourceNames := sets.List(resources)
+	slices.Sort(resourceNames)
+	for _, name := range resourceNames {
 		if idx := vectorMap.GetIndex(name); idx >= 0 {
 			names[idx] = name
 		}

pkg/scheduler/api/node_info/numa_topology_test.go

@@ -16,13 +16,13 @@ import (
 
 // zoneAmount reads a zone vector's amount for a resource in its natural unit (cpu in cores, others
 // by count), translating from the vector's milli-cpu storage.
-func zoneAmount(vec resource_info.ResourceVector, vm *resource_info.ResourceVectorMap, name v1.ResourceName) int64 {
+func zoneAmount(vec resource_info.ResourceVector, vm *resource_info.ResourceVectorMap, name v1.ResourceName) float64 {
 	idx := vm.GetIndex(name)
 	val := vec.Get(idx)
 	if idx == resource_info.CPUIndex {
-		return int64(val) / 1000
+		return val / 1000
 	}
-	return int64(val)
+	return val
 }
 
 func numaNodeZone(name string, available map[string]string) nrtv1alpha2.Zone {
@@ -159,8 +159,8 @@ func TestBuildNumaTopology(t *testing.T) {
 		assert.Equal(t, TopologyPolicySingleNUMANode, nt.Policy)
 		assert.Len(t, nt.Zones, 2, "only NUMA-node zones are kept")
 
-		assert.Equal(t, int64(2), zoneAmount(nt.Zones[0].Available, nt.VectorMap, "nvidia.com/gpu"))
-		assert.Equal(t, int64(2), zoneAmount(nt.Zones[0].Allocatable, nt.VectorMap, "nvidia.com/gpu"), "allocatable is populated")
+		assert.Equal(t, float64(2), zoneAmount(nt.Zones[0].Available, nt.VectorMap, "nvidia.com/gpu"))
+		assert.Equal(t, float64(2), zoneAmount(nt.Zones[0].Allocatable, nt.VectorMap, "nvidia.com/gpu"), "allocatable is populated")
 
 		assert.True(t, nt.Resources.HasAll("cpu", "memory", "nvidia.com/gpu"))
 		assert.Equal(t, 3, nt.Resources.Len())
@@ -178,8 +178,8 @@ func TestBuildNumaTopology(t *testing.T) {
 
 		nt := BuildNumaTopology(nrt, resource_info.NewResourceVectorMap())
 
-		assert.Equal(t, int64(4), zoneAmount(nt.Zones[0].Available, nt.VectorMap, "cpu"), "available reflects free capacity")
-		assert.Equal(t, int64(8), zoneAmount(nt.Zones[0].Allocatable, nt.VectorMap, "cpu"), "allocatable reflects total capacity")
+		assert.Equal(t, float64(4), zoneAmount(nt.Zones[0].Available, nt.VectorMap, "cpu"), "available reflects free capacity")
+		assert.Equal(t, float64(8), zoneAmount(nt.Zones[0].Allocatable, nt.VectorMap, "cpu"), "allocatable reflects total capacity")
 	})
 }
 
@@ -210,8 +210,8 @@ func TestNumaTopologyClone(t *testing.T) {
 	clone.Zones[0].Available[cpuIdx] -= 1000
 	clone.Zones[0].Allocatable[cpuIdx] -= 2000
 
-	assert.Equal(t, int64(4), zoneAmount(orig.Zones[0].Available, orig.VectorMap, "cpu"), "original available ledger unchanged")
-	assert.Equal(t, int64(4), zoneAmount(orig.Zones[0].Allocatable, orig.VectorMap, "cpu"), "original allocatable ledger unchanged")
+	assert.Equal(t, float64(4), zoneAmount(orig.Zones[0].Available, orig.VectorMap, "cpu"), "original available ledger unchanged")
+	assert.Equal(t, float64(4), zoneAmount(orig.Zones[0].Allocatable, orig.VectorMap, "cpu"), "original allocatable ledger unchanged")
 	assert.Nil(t, (*NumaTopology)(nil).Clone())
 }
 

pkg/scheduler/plugins/numa/restricted_evaluator_test.go

@@ -61,7 +61,7 @@ func assertPlacement(t *testing.T, placement pod_info.NUMAPlacement, want map[in
 		assert.Lenf(t, got, len(amounts), "resource count on zone %d", z)
 		for name, wantQty := range amounts {
 			gotQty := got[name]
-			assert.Equalf(t, wantQty.Value(), gotQty.Value(), "zone %d resource %s", z, name)
+			assert.Equalf(t, 0, gotQty.Cmp(wantQty), "zone %d resource %s", z, name)
 		}
 	}
 }

pkg/scheduler/test_utils/test_utils.go

@@ -365,6 +365,10 @@ func matchNUMAZonesAvailable(
 		for name, want := range resources {
 			expected := resource_info.NewResourceVectorFromResourceList(v1.ResourceList{name: resource.MustParse(want)}, vectorMap)
 			idx := vectorMap.GetIndex(name)
+			if idx < 0 {
+				t.Errorf("Test number: %d, name: %v, has failed. Node %v zone %d resource %v missing from vector map", testNumber, testName, nodeName, zoneIndex, name)
+				continue
+			}
 			if zone.Available.Get(idx) != expected.Get(idx) {
 				t.Errorf("Test number: %d, name: %v, has failed. Node %v zone %d resource %v: actual Available %v, was expecting %v", testNumber, testName, nodeName, zoneIndex, name, zone.Available.Get(idx), want)
 			}