internal: reslist: rename functions for clarity

AddCoreResources -> AddInPlace
SubCoreResources -> SubInPlace

the new names are both more concise and more expressive.
trivial rename only.

Signed-off-by: Francesco Romani <fromani@redhat.com>

Author: ffromani

internal/baseload/baseload.go

@@ -89,13 +89,13 @@ func (nl Load) String() string {
 // Apply adjust the given ResourceList with the current node load by mutating
 // the parameter in place
 func (nl Load) Apply(res corev1.ResourceList) {
-	resourcelist.AddCoreResources(res, nl.Resources)
+	resourcelist.AddInPlace(res, nl.Resources)
 }
 
 // Deduct subtract the current node load from the given ResourceList by mutating
 // the parameter in place
 func (nl Load) Deduct(res corev1.ResourceList) error {
-	return resourcelist.SubCoreResources(res, nl.Resources)
+	return resourcelist.SubInPlace(res, nl.Resources)
 }
 
 func (nl Load) CPU() resource.Quantity {

internal/resourcelist/resourcelist.go

@@ -88,15 +88,15 @@ func FromContainerRequests(containers []corev1.Container) corev1.ResourceList {
 	return res
 }
 
-func AddCoreResources(res, resToAdd corev1.ResourceList) {
+func AddInPlace(res, resToAdd corev1.ResourceList) {
 	for resName, resQty := range resToAdd {
 		qty := res[resName]
 		qty.Add(resQty)
 		res[resName] = qty
 	}
 }
 
-func SubCoreResources(res, resToSub corev1.ResourceList) error {
+func SubInPlace(res, resToSub corev1.ResourceList) error {
 	for resName, resQty := range resToSub {
 		if resQty.Cmp(res[resName]) > 0 {
 			return fmt.Errorf("cannot subtract resource %q because it is not found in the current resources", resName)

internal/resourcelist/resourcelist_test.go

@@ -76,7 +76,7 @@ func TestToString(t *testing.T) {
 	}
 }
 
-func TestAddCoreResources(t *testing.T) {
+func TestAddInPlace(t *testing.T) {
 	type testCase struct {
 		res      corev1.ResourceList
 		resToAdd corev1.ResourceList
@@ -108,7 +108,7 @@ func TestAddCoreResources(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(ToString(tc.expected), func(t *testing.T) {
 			res := tc.res.DeepCopy()
-			AddCoreResources(res, tc.resToAdd)
+			AddInPlace(res, tc.resToAdd)
 			// comparing strings it just easier
 			got := ToString(res)
 			expected := ToString(tc.expected)
@@ -119,7 +119,7 @@ func TestAddCoreResources(t *testing.T) {
 	}
 }
 
-func TestSubCoreResources(t *testing.T) {
+func TestSubInPlace(t *testing.T) {
 	type testCase struct {
 		res      corev1.ResourceList
 		resToSub corev1.ResourceList
@@ -168,7 +168,7 @@ func TestSubCoreResources(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(ToString(tc.expected), func(t *testing.T) {
 			res := tc.res.DeepCopy()
-			err := SubCoreResources(res, tc.resToSub)
+			err := SubInPlace(res, tc.resToSub)
 			if err != nil {
 				t.Errorf("Error while calculating resources: %s", err.Error())
 			}

test/e2e/serial/tests/non_regression.go

@@ -390,7 +390,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 				corev1.ResourceCPU:    resource.MustParse("1"),
 				corev1.ResourceMemory: resource.MustParse("100Mi"),
 			}
-			e2ereslist.AddCoreResources(requiredRes, minRes)
+			e2ereslist.AddInPlace(requiredRes, minRes)
 
 			pod := objects.NewTestPodPause(fxt.Namespace.Name, "testpod")
 			pod.Spec.SchedulerName = serialconfig.Config.SchedulerName

test/e2e/serial/tests/workload_overhead.go

@@ -164,8 +164,8 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload overhea
 				klog.Infof("kubernetes pod fixed overhead rounded to: %s", resourcelist.ToString(podFixedOverhead))
 
 				zoneRequiredResources := podResources.DeepCopy()
-				resourcelist.AddCoreResources(zoneRequiredResources, podFixedOverhead)
-				resourcelist.AddCoreResources(zoneRequiredResources, minRes)
+				resourcelist.AddInPlace(zoneRequiredResources, podFixedOverhead)
+				resourcelist.AddInPlace(zoneRequiredResources, minRes)
 
 				resStr := resourcelist.ToString(zoneRequiredResources)
 				klog.Infof("kubernetes final zone required resources: %s", resStr)
@@ -251,7 +251,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload overhea
 				Expect(pods).ToNot(BeEmpty(), "cannot find any pods for DP %s/%s", deployment.Namespace, deployment.Name)
 
 				podResourcesWithOverhead := podResources.DeepCopy()
-				resourcelist.AddCoreResources(podResourcesWithOverhead, podFixedOverhead)
+				resourcelist.AddInPlace(podResourcesWithOverhead, podFixedOverhead)
 
 				for _, pod := range pods {
 					Expect(pod.Spec.NodeName).To(Equal(targetNodeName))
@@ -328,8 +328,8 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload overhea
 				klog.Infof("kubernetes pod fixed overhead rounded to: %s", resourcelist.ToString(podFixedOverhead))
 
 				zoneRequiredResources := podResources.DeepCopy()
-				resourcelist.AddCoreResources(zoneRequiredResources, podFixedOverhead)
-				resourcelist.AddCoreResources(zoneRequiredResources, minRes)
+				resourcelist.AddInPlace(zoneRequiredResources, podFixedOverhead)
+				resourcelist.AddInPlace(zoneRequiredResources, minRes)
 
 				resStr := resourcelist.ToString(zoneRequiredResources)
 				klog.Infof("kubernetes final zone required resources: %s", resStr)

test/e2e/serial/tests/workload_placement.go

@@ -635,7 +635,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 			dataAfter, err := yaml.Marshal(nrtPostCreate)
 			Expect(err).ToNot(HaveOccurred())
 			// Adding resources of both the replicas
-			e2ereslist.AddCoreResources(rl0, rl1)
+			e2ereslist.AddInPlace(rl0, rl1)
 
 			match, err := checkConsumedRes(*nrtInitial, *nrtPostCreate, rl0, corev1qos.GetPodQOS(&updatedPod0))
 			Expect(err).ToNot(HaveOccurred())
@@ -649,7 +649,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 				corev1.ResourceMemory: resource.MustParse("100Mi"),
 			}
 
-			err = e2ereslist.SubCoreResources(reqResources, resourceDiff)
+			err = e2ereslist.SubInPlace(reqResources, resourceDiff)
 			Expect(err).ToNot(HaveOccurred())
 
 			updatedDp.Spec.Template.Spec.Containers[0].Resources.Requests = reqResources
@@ -701,7 +701,7 @@ var _ = Describe("[serial][disruptive][scheduler] numaresources workload placeme
 			dataAfterUpdate, err := yaml.Marshal(nrtPostUpdate)
 			Expect(err).ToNot(HaveOccurred())
 			// Adding resources of both the replicas
-			e2ereslist.AddCoreResources(rl0, rl1)
+			e2ereslist.AddInPlace(rl0, rl1)
 			match, err = checkConsumedRes(*nrtInitial, *nrtPostUpdate, rl0, corev1qos.GetPodQOS(&updatedPod0))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(match).ToNot(BeEmpty(), "inconsistent accounting: no resources consumed by the running pod,\nNRT before test's pod: %s \nNRT after: %s \n total required resources: %s", dataBefore, dataAfterUpdate, e2ereslist.ToString(rl0))