use testutils.GenerateTestNodeName everywhere possible

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

fault-quarantine/pkg/reconciler/reconciler_e2e_test.go

@@ -3672,7 +3672,7 @@ func TestE2E_ManualUncordonWithCancellation(t *testing.T) {
 	ctx, cancel := context.WithTimeout(e2eTestContext, 30*time.Second)
 	defer cancel()
 
-	nodeName := "e2e-manual-uncordon-" + generateShortTestID()
+	nodeName := testutils.GenerateTestNodeName("e2e-manual-uncordon")
 	createE2ETestNode(ctx, t, nodeName, nil, nil, nil, false)
 	defer func() {
 		_ = e2eTestClient.CoreV1().Nodes().Delete(ctx, nodeName, metav1.DeleteOptions{})
@@ -3757,7 +3757,7 @@ func TestE2E_ManualUncordonMultipleEvents(t *testing.T) {
 	ctx, cancel := context.WithTimeout(e2eTestContext, 30*time.Second)
 	defer cancel()
 
-	nodeName := "e2e-manual-multi-" + generateShortTestID()
+	nodeName := testutils.GenerateTestNodeName("e2e-manual-multi")
 	createE2ETestNode(ctx, t, nodeName, nil, nil, nil, false)
 	defer func() {
 		_ = e2eTestClient.CoreV1().Nodes().Delete(ctx, nodeName, metav1.DeleteOptions{})

fault-remediation/pkg/reconciler/reconciler_e2e_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
 	"github.com/nvidia/nvsentinel/fault-remediation/pkg/crstatus"
 	"github.com/nvidia/nvsentinel/store-client/pkg/datastore"
+	"github.com/nvidia/nvsentinel/store-client/pkg/testutils"
 
 	"github.com/nvidia/nvsentinel/commons/pkg/statemanager"
 	"github.com/prometheus/client_golang/prometheus"
@@ -934,7 +935,7 @@ func TestReconciler_CancelledEventCleansAnnotation(t *testing.T) {
 	ctx, cancel := context.WithTimeout(testContext, 30*time.Second)
 	defer cancel()
 
-	nodeName := "test-cancelled-clean-" + "test-node-123"
+	nodeName := testutils.GenerateTestNodeName("test-cancelled-clean")
 	createTestNode(ctx, nodeName, nil, map[string]string{"test": "label"})
 	defer func() {
 		_ = testClient.CoreV1().Nodes().Delete(ctx, nodeName, metav1.DeleteOptions{})
@@ -1039,7 +1040,7 @@ func TestReconciler_CancelledEventClearsAllGroups(t *testing.T) {
 	ctx, cancel := context.WithTimeout(testContext, 30*time.Second)
 	defer cancel()
 
-	nodeName := "test-cancelled-all-" + "test-node-123"
+	nodeName := testutils.GenerateTestNodeName("test-cancelled-all")
 	createTestNode(ctx, nodeName, nil, map[string]string{"test": "label"})
 	defer func() {
 		_ = testClient.CoreV1().Nodes().Delete(ctx, nodeName, metav1.DeleteOptions{})
@@ -1148,7 +1149,7 @@ func TestReconciler_CancelledAndUnQuarantinedClearAllState(t *testing.T) {
 	ctx, cancel := context.WithTimeout(testContext, 30*time.Second)
 	defer cancel()
 
-	nodeName := "test-cancelled-unquarantine-" + "test-node-123"
+	nodeName := testutils.GenerateTestNodeName("test-cancelled-unquarantine")
 	createTestNode(ctx, nodeName, nil, map[string]string{"test": "label"})
 	defer func() {
 		_ = testClient.CoreV1().Nodes().Delete(ctx, nodeName, metav1.DeleteOptions{})

node-drainer/pkg/reconciler/reconciler_integration_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/nvidia/nvsentinel/node-drainer/pkg/reconciler"
 	sdkclient "github.com/nvidia/nvsentinel/store-client/pkg/client"
 	sdkconfig "github.com/nvidia/nvsentinel/store-client/pkg/config"
+	"github.com/nvidia/nvsentinel/store-client/pkg/testutils"
 
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
@@ -1043,7 +1044,7 @@ func TestReconciler_CancelledEventWithOngoingDrain(t *testing.T) {
 		{Name: "timeout-*", Mode: config.ModeDeleteAfterTimeout},
 	})
 
-	nodeName := "cancel-during-drain-node"
+	nodeName := testutils.GenerateTestNodeName("cancel-during-drain-node")
 	createNode(setup.ctx, t, setup.client, nodeName)
 
 	createNamespace(setup.ctx, t, setup.client, "timeout-test")
@@ -1091,7 +1092,7 @@ func TestReconciler_UnQuarantinedEventCancelsOngoingDrain(t *testing.T) {
 		{Name: "timeout-*", Mode: config.ModeDeleteAfterTimeout},
 	})
 
-	nodeName := "unquarantine-cancel-node"
+	nodeName := testutils.GenerateTestNodeName("unquarantine-cancel-node")
 	createNode(setup.ctx, t, setup.client, nodeName)
 
 	createNamespace(setup.ctx, t, setup.client, "timeout-test")
@@ -1140,7 +1141,7 @@ func TestReconciler_MultipleEventsOnNodeCancelledByUnQuarantine(t *testing.T) {
 		{Name: "timeout-*", Mode: config.ModeDeleteAfterTimeout},
 	})
 
-	nodeName := "multi-event-cancel-node"
+	nodeName := testutils.GenerateTestNodeName("multi-event-cancel-node")
 	createNode(setup.ctx, t, setup.client, nodeName)
 
 	createNamespace(setup.ctx, t, setup.client, "timeout-test")