strip GAS struct from functions that don't need it

In order to help with concurrency evaluations, drop GAS from
functions which don't access it.

Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>

Author: uniemimu

gpu-aware-scheduling/pkg/gpuscheduler/scheduler.go

@@ -658,7 +658,7 @@ func (m *GASExtender) checkForSpaceResourceRequests(perGPUCapacity resourceMap,
 	containerCards := [][]string{}
 	preferred := false
 
-	samegpuNamesMap, err := m.containersRequestingSamegpu(pod)
+	samegpuNamesMap, err := containersRequestingSamegpu(pod)
 	if err != nil {
 		return containerCards, preferred, err
 	}
@@ -702,7 +702,7 @@ func (m *GASExtender) checkForSpaceResourceRequests(perGPUCapacity resourceMap,
 func (m *GASExtender) getCardForSamegpu(samegpuIndexMap map[int]bool, allContainerRequests []resourceMap,
 	perGPUCapacity resourceMap, node *v1.Node, pod *v1.Pod, nodeResourcesUsed nodeResources,
 	gpuMap map[string]bool) ([]string, bool, error) {
-	if err := m.sanitizeSamegpuResourcesRequest(samegpuIndexMap, allContainerRequests); err != nil {
+	if err := sanitizeSamegpuResourcesRequest(samegpuIndexMap, allContainerRequests); err != nil {
 		return []string{}, false, err
 	}
 
@@ -1129,7 +1129,7 @@ func (m *GASExtender) readNodeResources(nodeName string) (nodeResources, error)
 
 // return search map of container names that should have same GPU based on samegpuAnnotationName.
 // Return empty map if either there are duplicates or absent containers listed.
-func (m *GASExtender) containersRequestingSamegpu(pod *v1.Pod) (map[string]bool, error) {
+func containersRequestingSamegpu(pod *v1.Pod) (map[string]bool, error) {
 	csvSamegpulist, ok := pod.Annotations[samegpuAnnotationName]
 	if !ok {
 		return map[string]bool{}, nil
@@ -1172,7 +1172,7 @@ func (m *GASExtender) containersRequestingSamegpu(pod *v1.Pod) (map[string]bool,
 	return samegpuMap, nil
 }
 
-func (m *GASExtender) sanitizeSamegpuResourcesRequest(
+func sanitizeSamegpuResourcesRequest(
 	samegpuIndexMap map[int]bool, allResourceRequests []resourceMap) error {
 	if len(samegpuIndexMap) == 0 {
 		return nil

gpu-aware-scheduling/pkg/gpuscheduler/scheduler_test.go

@@ -1179,8 +1179,6 @@ func TestSanitizeSamegpulist(t *testing.T) {
 		},
 		Spec: *getMockPodSpecMultiContSamegpu(),
 	}
-	clientset := fake.NewSimpleClientset(pod)
-	gas := NewGASExtender(clientset, false, false, "")
 
 	wrongValueReason := map[string]string{
 		"container1,container5":            "Listing absent containers makes gas-same-gpu ignored",
@@ -1191,7 +1189,7 @@ func TestSanitizeSamegpulist(t *testing.T) {
 
 	Convey("Ensure no gas-same-gpu annotation returns blank list with no error",
 		t, func() {
-			containerNames, err := gas.containersRequestingSamegpu(pod)
+			containerNames, err := containersRequestingSamegpu(pod)
 			So(len(containerNames), ShouldEqual, 0)
 			So(err, ShouldEqual, nil)
 		})
@@ -1201,7 +1199,7 @@ func TestSanitizeSamegpulist(t *testing.T) {
 
 		Convey(reason,
 			t, func() {
-				containerNames, err := gas.containersRequestingSamegpu(pod)
+				containerNames, err := containersRequestingSamegpu(pod)
 				So(len(containerNames), ShouldEqual, 0)
 				So("malformed annotation", ShouldEqual, err.Error())
 			})
@@ -1211,33 +1209,29 @@ func TestSanitizeSamegpulist(t *testing.T) {
 
 	Convey("Ensure correct annotation returns all listed container names with no error",
 		t, func() {
-			containerNames, err := gas.containersRequestingSamegpu(pod)
+			containerNames, err := containersRequestingSamegpu(pod)
 			So(containerNames, ShouldResemble, map[string]bool{"container2": true, "container3": true})
 			So(err, ShouldEqual, nil)
 		})
 }
 
 func TestSanitizeSamegpuResourcesRequest(t *testing.T) {
-	pod := getFakePod()
-	clientset := fake.NewSimpleClientset(pod)
-	gas := NewGASExtender(clientset, false, false, "")
-
 	Convey("Tiles and monitoring resources are not allowed in same-gpu resourceRequests",
 		t, func() {
 			// fail because of tiles
 			samegpuIndexes := map[int]bool{0: true}
 			resourceRequests := []resourceMap{
 				{"gpu.intel.com/i915": 1, "gpu.intel.com/tiles": 2},
 			}
-			err := gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err := sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err.Error(), ShouldEqual, "resources conflict")
 
 			// fail because of monitoring
 			samegpuIndexes = map[int]bool{0: true}
 			resourceRequests = []resourceMap{
 				{"gpu.intel.com/i915": 1, "gpu.intel.com/i915_monitoring": 1},
 			}
-			err = gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err = sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err.Error(), ShouldEqual, "resources conflict")
 
 			// success
@@ -1248,7 +1242,7 @@ func TestSanitizeSamegpuResourcesRequest(t *testing.T) {
 					"gpu.intel.com/memory.max": 8589934592,
 				},
 			}
-			err = gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err = sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err, ShouldEqual, nil)
 		})
 
@@ -1260,7 +1254,7 @@ func TestSanitizeSamegpuResourcesRequest(t *testing.T) {
 				{"gpu.intel.com/i915": 1, "gpu.intel.com/millicores": 200},
 				{"gpu.intel.com/i915": 2, "gpu.intel.com/millicores": 200},
 			}
-			err := gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err := sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err.Error(), ShouldEqual, "resources conflict")
 
 			// Failure homogeneous
@@ -1269,7 +1263,7 @@ func TestSanitizeSamegpuResourcesRequest(t *testing.T) {
 				{"gpu.intel.com/i915": 2, "gpu.intel.com/millicores": 200},
 				{"gpu.intel.com/i915": 2, "gpu.intel.com/millicores": 200},
 			}
-			err = gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err = sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err.Error(), ShouldEqual, "resources conflict")
 
 			// Success
@@ -1278,7 +1272,7 @@ func TestSanitizeSamegpuResourcesRequest(t *testing.T) {
 				{"gpu.intel.com/i915": 1, "gpu.intel.com/millicores": 200},
 				{"gpu.intel.com/i915": 1, "gpu.intel.com/millicores": 300},
 			}
-			err = gas.sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
+			err = sanitizeSamegpuResourcesRequest(samegpuIndexes, resourceRequests)
 			So(err, ShouldEqual, nil)
 		})
 }