test: wip refactor test utils for building pods and nodes

cluster-autoscaler/cloudprovider/cherryservers/cherry_manager_rest_test.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"testing"
 
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	test_utils "k8s.io/autoscaler/cluster-autoscaler/utils/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -91,7 +91,8 @@ func newTestCherryManagerRest(t *testing.T, serverUrl string) *cherryManagerRest
 	return manager
 }
 func TestListCherryServers(t *testing.T) {
-	server := NewHttpServerMock(MockFieldContentType, MockFieldResponse)
+	server := test_utils.NewHttpServerMock(test_utils.MockFieldContentType,
+		test_utils.MockFieldResponse)
 	defer server.Close()
 
 	var m *cherryManagerRest

cluster-autoscaler/cloudprovider/cherryservers/cherry_node_group_test.go

@@ -29,7 +29,7 @@ import (
 	"time"
 
 	apiv1 "k8s.io/api/core/v1"
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	no "k8s.io/autoscaler/cluster-autoscaler/utils/test/node"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -231,14 +231,14 @@ func TestIncreaseDecreaseSize(t *testing.T) {
 	nodesPool3 := []*apiv1.Node{}
 	for i, node := range n2Pool2 {
 		if _, ok := existingNodesPool2[node]; !ok {
-			testNode := BuildTestNode(node, 1000, 1000)
+			testNode := no.BuildTestNode(node, 1000, 1000)
 			testNode.Spec.ProviderID = n2Pool2providers[i]
 			nodesPool2 = append(nodesPool2, testNode)
 		}
 	}
 	for i, node := range n2Pool3 {
 		if _, ok := existingNodesPool3[node]; !ok {
-			testNode := BuildTestNode(node, 1000, 1000)
+			testNode := no.BuildTestNode(node, 1000, 1000)
 			testNode.Spec.ProviderID = n2Pool3providers[i]
 			nodesPool3 = append(nodesPool3, testNode)
 		}

cluster-autoscaler/cloudprovider/gce/gce_cloud_provider_test.go

@@ -25,7 +25,8 @@ import (
 
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	"k8s.io/autoscaler/cluster-autoscaler/config"
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	test_utils "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	no "k8s.io/autoscaler/cluster-autoscaler/utils/test/node"
 
 	apiv1 "k8s.io/api/core/v1"
 
@@ -137,7 +138,7 @@ func TestNodeGroupForNode(t *testing.T) {
 	gce := &GceCloudProvider{
 		gceManager: gceManagerMock,
 	}
-	n := BuildTestNode("n1", 1000, 1000)
+	n := no.BuildTestNode("n1", 1000, 1000)
 	n.Spec.ProviderID = "gce://project1/us-central1-b/n1"
 	mig := gceMig{gceRef: GceRef{Name: "ng1"}}
 	gceManagerMock.On("GetMigForInstance", mock.AnythingOfType("gce.GceRef")).Return(&mig, nil).Once()
@@ -254,7 +255,7 @@ var gceInstanceTemplate = &gcev1.InstanceTemplate{
 }
 
 func TestMig(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	gceManagerMock := &gceManagerMock{}
 	client := &http.Client{}
@@ -345,7 +346,7 @@ func TestMig(t *testing.T) {
 
 	// Test Belongs - true.
 	gceManagerMock.On("GetMigForInstance", mock.AnythingOfType("gce.GceRef")).Return(mig1, nil).Once()
-	node := BuildTestNode("gke-cluster-1-default-pool-f7607aac-dck1", 1000, 1000)
+	node := no.BuildTestNode("gke-cluster-1-default-pool-f7607aac-dck1", 1000, 1000)
 	node.Spec.ProviderID = "gce://project1/us-central1-b/gke-cluster-1-default-pool-f7607aac-dck1"
 
 	belongs, err := mig1.Belongs(node)
@@ -372,10 +373,10 @@ func TestMig(t *testing.T) {
 	mock.AssertExpectationsForObjects(t, gceManagerMock)
 
 	// Test DeleteNodes.
-	n1 := BuildTestNode("gke-cluster-1-default-pool-f7607aac-9j4g", 1000, 1000)
+	n1 := no.BuildTestNode("gke-cluster-1-default-pool-f7607aac-9j4g", 1000, 1000)
 	n1.Spec.ProviderID = "gce://project1/us-central1-b/gke-cluster-1-default-pool-f7607aac-9j4g"
 	n1ref := GceRef{"project1", "us-central1-b", "gke-cluster-1-default-pool-f7607aac-9j4g"}
-	n2 := BuildTestNode("gke-cluster-1-default-pool-f7607aac-dck1", 1000, 1000)
+	n2 := no.BuildTestNode("gke-cluster-1-default-pool-f7607aac-dck1", 1000, 1000)
 	n2.Spec.ProviderID = "gce://project1/us-central1-b/gke-cluster-1-default-pool-f7607aac-dck1"
 	n2ref := GceRef{"project1", "us-central1-b", "gke-cluster-1-default-pool-f7607aac-dck1"}
 	gceManagerMock.On("GetMigSize", mock.AnythingOfType("*gce.gceMig")).Return(int64(2), nil).Once()

cluster-autoscaler/cloudprovider/gce/gce_manager_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	"k8s.io/autoscaler/cluster-autoscaler/config"
 
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	test_utils "k8s.io/autoscaler/cluster-autoscaler/utils/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -459,7 +459,7 @@ func setupTestExtraPool2(manager *gceManagerImpl, setupBaseName bool) *gceMig {
 }
 
 func TestDeleteInstances(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -552,7 +552,7 @@ const setMigSizeOperationResponse = `{
 }`
 
 func TestGetAndSetMigSize(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -642,7 +642,7 @@ func TestGetAndSetMigSize(t *testing.T) {
 }
 
 func TestGetMigSizeListCallFails(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -678,7 +678,7 @@ func TestGetMigSizeListCallFails(t *testing.T) {
 }
 
 func TestGetMigForInstance(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -717,7 +717,7 @@ func TestGetMigForInstance(t *testing.T) {
 }
 
 func TestGetMigNodesBasic(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -892,7 +892,7 @@ func buildManagedInstanceWithCurrentActionAndTwoErrorsResponsePart(zone string,
 }
 
 func TestGetMigNodesComplex(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 
@@ -1145,7 +1145,7 @@ const getRegionResponse = `{
 }`
 
 func TestFetchAutoMigsZonal(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 
 	server.On("handle", "/projects/project1/zones/"+zoneB+"/instanceGroups").Return(buildListInstanceGroupsResponse(zoneB, gceMigA, gceMigB)).Once()
@@ -1176,7 +1176,7 @@ func TestFetchAutoMigsZonal(t *testing.T) {
 }
 
 func TestFetchAutoMigsUnregistersMissingMigs(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 
 	// Register explicit instance group
@@ -1217,7 +1217,7 @@ func TestFetchAutoMigsUnregistersMissingMigs(t *testing.T) {
 }
 
 func TestFetchAutoMigsRegional(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 
 	server.On("handle", "/projects/project1/regions/us-central1").Return(getRegionResponse).Once()
@@ -1249,7 +1249,7 @@ func TestFetchAutoMigsRegional(t *testing.T) {
 }
 
 func TestFetchExplicitMigs(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 
 	server.On("handle", "/projects/project1/zones/"+zoneB+"/instanceGroupManagers/"+gceMigA).Return(buildInstanceGroupManagerResponse(zoneB, gceMigA, 3)).Once()
@@ -1319,7 +1319,7 @@ const listMachineTypesResponse = `{
 }`
 
 func TestGetMigTemplateNode(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 
 	server.On("handle", "/projects/project1/zones/us-central1-b/instanceGroupManagers/default-pool").Return(getInstanceGroupManagerResponse).Once()
@@ -1502,7 +1502,7 @@ const createInstancesOperationResponse = `{
 }`
 
 func TestAppendInstances(t *testing.T) {
-	server := NewHttpServerMock()
+	server := test_utils.NewHttpServerMock()
 	defer server.Close()
 	g := newTestGceManager(t, server.URL, false)
 

cluster-autoscaler/cloudprovider/gce/gce_price_model_test.go

@@ -25,14 +25,15 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/gpu"
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	no "k8s.io/autoscaler/cluster-autoscaler/utils/test/node"
+	po "k8s.io/autoscaler/cluster-autoscaler/utils/test/pod"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/units"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func testNode(t *testing.T, nodeName string, instanceType string, millicpu int64, mem int64, gpuType string, gpuCount int64, isPreemptible bool, isSpot bool) *apiv1.Node {
-	node := BuildTestNode(nodeName, millicpu, mem)
+	node := no.BuildTestNode(nodeName, millicpu, mem)
 	labels, err := BuildGenericLabels(GceRef{
 		Name:    "kubernetes-minion-group",
 		Project: "mwielgus-proj",
@@ -63,9 +64,9 @@ func testNode(t *testing.T, nodeName string, instanceType string, millicpu int64
 func testNodeEphemeralStorage(t *testing.T, nodeName string, isEphemeralStorageLocalSsd bool, localSsdCount int, bootDiskType string, bootDiskSize int, isSpot bool) *apiv1.Node {
 	node := testNode(t, nodeName, "", 8000, 30*units.GiB, "", 0, false, isSpot)
 	if isEphemeralStorageLocalSsd {
-		AddEphemeralStorageToNode(node, int64(localSsdCount)*LocalSSDDiskSizeInGiB)
+		no.AddEphemeralStorageToNode(node, int64(localSsdCount)*LocalSSDDiskSizeInGiB)
 	} else {
-		AddEphemeralStorageToNode(node, int64(bootDiskSize))
+		no.AddEphemeralStorageToNode(node, int64(bootDiskSize))
 	}
 	if isEphemeralStorageLocalSsd {
 		node.Labels[ephemeralStorageLocalSsdLabel] = "true"
@@ -238,9 +239,9 @@ func TestGetNodePrice(t *testing.T) {
 }
 
 func TestGetPodPrice(t *testing.T) {
-	pod1 := BuildTestPodWithEphemeralStorage("a1", 100, 500*units.MiB, 100*units.GiB)
-	pod2 := BuildTestPodWithEphemeralStorage("a2", 2*100, 2*500*units.MiB, 2*100*units.GiB)
-	pod3 := BuildTestPodWithEphemeralStorage("a2", 2*100, 2*500*units.MiB, 100*units.GiB)
+	pod1 := po.BuildTestPodWithEphemeralStorage("a1", 100, 500*units.MiB, 100*units.GiB)
+	pod2 := po.BuildTestPodWithEphemeralStorage("a2", 2*100, 2*500*units.MiB, 2*100*units.GiB)
+	pod3 := po.BuildTestPodWithEphemeralStorage("a2", 2*100, 2*500*units.MiB, 100*units.GiB)
 
 	model := NewGcePriceModel(NewGcePriceInfo(), true)
 	now := time.Now()

cluster-autoscaler/cloudprovider/kamatera/kamatera_api_client_rest_test.go

@@ -19,11 +19,12 @@ package kamatera
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
-	"testing"
 )
 
 const (

cluster-autoscaler/cloudprovider/kamatera/kamatera_cloud_provider_test.go

@@ -18,10 +18,11 @@ package kamatera
 
 import (
 	"fmt"
-	apiv1 "k8s.io/api/core/v1"
 	"strings"
 	"testing"
 
+	apiv1 "k8s.io/api/core/v1"
+
 	"github.com/stretchr/testify/assert"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"

cluster-autoscaler/cloudprovider/packet/packet_manager_rest_test.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	test_utils "k8s.io/autoscaler/cluster-autoscaler/utils/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -77,7 +77,7 @@ func newTestPacketManagerRest(t *testing.T, url string) *packetManagerRest {
 }
 func TestListPacketDevices(t *testing.T) {
 	var m *packetManagerRest
-	server := NewHttpServerMock(MockFieldContentType, MockFieldResponse)
+	server := test_utils.NewHttpServerMock(test_utils.MockFieldContentType, test_utils.MockFieldResponse)
 	defer server.Close()
 	if len(os.Getenv("PACKET_AUTH_TOKEN")) > 0 {
 		// If auth token set in env, hit the actual Packet API

cluster-autoscaler/cloudprovider/packet/packet_node_group_test.go

@@ -23,7 +23,8 @@ import (
 	"time"
 
 	apiv1 "k8s.io/api/core/v1"
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	test_utils "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	no "k8s.io/autoscaler/cluster-autoscaler/utils/test/node"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -37,7 +38,8 @@ const deletePacketDeviceResponsePool3 = ``
 
 func TestIncreaseDecreaseSize(t *testing.T) {
 	var m *packetManagerRest
-	server := NewHttpServerMock(MockFieldContentType, MockFieldResponse)
+	server := test_utils.NewHttpServerMock(test_utils.MockFieldContentType,
+		test_utils.MockFieldResponse)
 	defer server.Close()
 	assert.Equal(t, true, true)
 	if len(os.Getenv("PACKET_AUTH_TOKEN")) > 0 {
@@ -135,12 +137,12 @@ func TestIncreaseDecreaseSize(t *testing.T) {
 	nodesPool3 := []*apiv1.Node{}
 	for _, node := range n2Pool2 {
 		if _, ok := existingNodesPool2[node]; !ok {
-			nodesPool2 = append(nodesPool2, BuildTestNode(node, 1000, 1000))
+			nodesPool2 = append(nodesPool2, no.BuildTestNode(node, 1000, 1000))
 		}
 	}
 	for _, node := range n2Pool3 {
 		if _, ok := existingNodesPool3[node]; !ok {
-			nodesPool3 = append(nodesPool3, BuildTestNode(node, 1000, 1000))
+			nodesPool3 = append(nodesPool3, no.BuildTestNode(node, 1000, 1000))
 		}
 	}
 

cluster-autoscaler/cloudprovider/packet/packet_price_model_test.go

@@ -21,7 +21,8 @@ import (
 	"testing"
 	"time"
 
-	. "k8s.io/autoscaler/cluster-autoscaler/utils/test"
+	no "k8s.io/autoscaler/cluster-autoscaler/utils/test/node"
+	po "k8s.io/autoscaler/cluster-autoscaler/utils/test/pod"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/units"
 
 	"github.com/stretchr/testify/assert"
@@ -37,12 +38,12 @@ func TestGetNodePrice(t *testing.T) {
 	model := &PacketPriceModel{}
 	now := time.Now()
 
-	node1 := BuildTestNode("node1", plan1.CPU*1000, plan1.MemoryMb*1024*1024)
+	node1 := no.BuildTestNode("node1", plan1.CPU*1000, plan1.MemoryMb*1024*1024)
 	node1.Labels = labelsPool1
 	price1, err := model.NodePrice(node1, now, now.Add(time.Hour))
 	assert.NoError(t, err)
 
-	node2 := BuildTestNode("node2", plan2.CPU*1000, plan2.MemoryMb*1024*1024)
+	node2 := no.BuildTestNode("node2", plan2.CPU*1000, plan2.MemoryMb*1024*1024)
 	node2.Labels = labelsPool2
 	price2, err := model.NodePrice(node2, now, now.Add(time.Hour))
 	assert.NoError(t, err)
@@ -52,8 +53,8 @@ func TestGetNodePrice(t *testing.T) {
 }
 
 func TestGetPodPrice(t *testing.T) {
-	pod1 := BuildTestPod("pod1", 100, 500*units.MiB)
-	pod2 := BuildTestPod("pod2", 2*100, 2*500*units.MiB)
+	pod1 := po.BuildTestPod("pod1", 100, 500*units.MiB)
+	pod2 := po.BuildTestPod("pod2", 2*100, 2*500*units.MiB)
 
 	model := &PacketPriceModel{}
 	now := time.Now()