nrt: move utility code outside plugin.go

plugin.go should contain only entry point and
orchestration code. Let's move all the utilties and logic
to other source code files.

Trivial code movement with minimal renames.

Signed-off-by: Francesco Romani <[email protected]>

Author: ffromani

pkg/noderesourcetopology/numaresources.go

@@ -21,9 +21,11 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
+
 	"sigs.k8s.io/scheduler-plugins/pkg/noderesourcetopology/stringify"
 )
 
@@ -178,3 +180,36 @@ func subtractResourcesFromNUMANodeList(lh logr.Logger, nodes NUMANodeList, numaI
 	}
 	return nil
 }
+
+func subtractFromNUMAs(resources corev1.ResourceList, numaNodes NUMANodeList, nodes ...int) {
+	for resName, quantity := range resources {
+		for _, node := range nodes {
+			// quantity is zero no need to iterate through another NUMA node, go to another resource
+			if quantity.IsZero() {
+				break
+			}
+
+			nRes := numaNodes[node].Resources
+			if available, ok := nRes[resName]; ok {
+				switch quantity.Cmp(available) {
+				case 0: // the same
+					// basically zero container resources
+					quantity.Sub(available)
+					// zero NUMA quantity
+					nRes[resName] = resource.Quantity{}
+				case 1: // container wants more resources than available in this NUMA zone
+					// substract NUMA resources from container request, to calculate how much is missing
+					quantity.Sub(available)
+					// zero NUMA quantity
+					nRes[resName] = resource.Quantity{}
+				case -1: // there are more resources available in this NUMA zone than container requests
+					// substract container resources from resources available in this NUMA node
+					available.Sub(quantity)
+					// zero container quantity
+					quantity = resource.Quantity{}
+					nRes[resName] = available
+				}
+			}
+		}
+	}
+}

pkg/noderesourcetopology/numaresources_test.go

@@ -372,6 +372,96 @@ func TestSubtractResourcesFromNUMANodeList(t *testing.T) {
 	}
 }
 
+func TestSubstractNUMA(t *testing.T) {
+	tcases := []struct {
+		description string
+		numaNodes   NUMANodeList
+		nodes       []int
+		resources   corev1.ResourceList
+		expected    NUMANodeList
+	}{
+		{
+			description: "simple",
+			numaNodes: NUMANodeList{
+				{
+					NUMAID: 0,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(8, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("10Gi"),
+					},
+				},
+			},
+			resources: corev1.ResourceList{
+				corev1.ResourceCPU:    *resource.NewQuantity(2, resource.DecimalSI),
+				corev1.ResourceMemory: resource.MustParse("2Gi"),
+			},
+			nodes: []int{0},
+			expected: NUMANodeList{
+				{
+					NUMAID: 0,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(6, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("8Gi"),
+					},
+				},
+			},
+		},
+		{
+			description: "substract resources from 2 NUMA nodes",
+			numaNodes: NUMANodeList{
+				{
+					NUMAID: 0,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(8, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("10Gi"),
+					},
+				},
+				{
+					NUMAID: 1,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(8, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("10Gi"),
+					},
+				},
+			},
+			resources: corev1.ResourceList{
+				corev1.ResourceCPU:    *resource.NewQuantity(12, resource.DecimalSI),
+				corev1.ResourceMemory: resource.MustParse("2Gi"),
+			},
+			nodes: []int{0, 1},
+			expected: NUMANodeList{
+				{
+					NUMAID: 0,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(0, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("8Gi"),
+					},
+				},
+				{
+					NUMAID: 1,
+					Resources: corev1.ResourceList{
+						corev1.ResourceCPU:    *resource.NewQuantity(4, resource.DecimalSI),
+						corev1.ResourceMemory: resource.MustParse("10Gi"),
+					},
+				},
+			},
+		},
+	}
+
+	for _, tcase := range tcases {
+		t.Run(tcase.description, func(t *testing.T) {
+			subtractFromNUMAs(tcase.resources, tcase.numaNodes, tcase.nodes...)
+			for i, node := range tcase.numaNodes {
+				for resName, quantity := range node.Resources {
+					if !tcase.expected[i].Resources[resName].Equal(quantity) {
+						t.Errorf("Expected %s to equal %v instead of %v", resName, tcase.expected[i].Resources[resName], quantity)
+					}
+				}
+			}
+		})
+	}
+}
+
 func mustParseQuantity(t *testing.T, str string) resource.Quantity {
 	qty, err := resource.ParseQuantity(str)
 	if err != nil {

pkg/noderesourcetopology/plugin.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -49,39 +48,6 @@ func init() {
 	utilruntime.Must(topologyv1alpha2.AddToScheme(scheme))
 }
 
-func subtractFromNUMAs(resources v1.ResourceList, numaNodes NUMANodeList, nodes ...int) {
-	for resName, quantity := range resources {
-		for _, node := range nodes {
-			// quantity is zero no need to iterate through another NUMA node, go to another resource
-			if quantity.IsZero() {
-				break
-			}
-
-			nRes := numaNodes[node].Resources
-			if available, ok := nRes[resName]; ok {
-				switch quantity.Cmp(available) {
-				case 0: // the same
-					// basically zero container resources
-					quantity.Sub(available)
-					// zero NUMA quantity
-					nRes[resName] = resource.Quantity{}
-				case 1: // container wants more resources than available in this NUMA zone
-					// substract NUMA resources from container request, to calculate how much is missing
-					quantity.Sub(available)
-					// zero NUMA quantity
-					nRes[resName] = resource.Quantity{}
-				case -1: // there are more resources available in this NUMA zone than container requests
-					// substract container resources from resources available in this NUMA node
-					available.Sub(quantity)
-					// zero container quantity
-					quantity = resource.Quantity{}
-					nRes[resName] = available
-				}
-			}
-		}
-	}
-}
-
 type filterFn func(lh logr.Logger, pod *v1.Pod, zones topologyv1alpha2.ZoneList, nodeInfo *framework.NodeInfo) *framework.Status
 type scoringFn func(logr.Logger, *v1.Pod, topologyv1alpha2.ZoneList) (int64, *framework.Status)