track node usage.

Author: sivakami

test/integration/swiftv2/longRunningCluster/datapath.go

@@ -114,8 +114,8 @@ type TestScenarios struct {
 	BuildID           string
 	PodImage          string
 	Scenarios         []PodScenario
-	VnetSubnetCache   map[string]VnetSubnetInfo // Cache for vnet/subnet info
-	NodeUsageTracker  map[string]map[string]bool // Tracks which nodes are used per vnet/subnet: "vnet/subnet" -> map[nodeName]bool
+	VnetSubnetCache   map[string]VnetSubnetInfo  // Cache for vnet/subnet info
+	UsedNodes         map[string]bool            // Tracks which nodes are already used (one pod per node for low-NIC)
 }
 
 // VnetSubnetInfo holds network information for a vnet/subnet combination
@@ -337,31 +337,27 @@ func CreateScenarioResources(scenario PodScenario, testScenarios TestScenarios)
 
 	// Step 5: Select appropriate node based on scenario
 	var targetNode string
-	vnetSubnetKey := fmt.Sprintf("%s/%s", scenario.VnetName, scenario.SubnetName)
 
-	// Initialize node usage tracker for this vnet/subnet if not exists
-	if testScenarios.NodeUsageTracker == nil {
-		testScenarios.NodeUsageTracker = make(map[string]map[string]bool)
-	}
-	if testScenarios.NodeUsageTracker[vnetSubnetKey] == nil {
-		testScenarios.NodeUsageTracker[vnetSubnetKey] = make(map[string]bool)
+	// Initialize used nodes tracker if not exists
+	if testScenarios.UsedNodes == nil {
+		testScenarios.UsedNodes = make(map[string]bool)
 	}
 
 	if scenario.NodeSelector == "low-nic" {
 		if len(nodeInfo.LowNicNodes) == 0 {
 			return fmt.Errorf("scenario %s: no low-NIC nodes available", scenario.Name)
 		}
-		// Find first unused node in the pool
+		// Find first unused node in the pool (low-NIC nodes can only handle one pod)
 		targetNode = ""
 		for _, node := range nodeInfo.LowNicNodes {
-			if !testScenarios.NodeUsageTracker[vnetSubnetKey][node] {
+			if !testScenarios.UsedNodes[node] {
 				targetNode = node
-				testScenarios.NodeUsageTracker[vnetSubnetKey][node] = true
+				testScenarios.UsedNodes[node] = true
 				break
 			}
 		}
 		if targetNode == "" {
-			return fmt.Errorf("scenario %s: all low-NIC nodes already used for %s", scenario.Name, vnetSubnetKey)
+			return fmt.Errorf("scenario %s: all low-NIC nodes already in use", scenario.Name)
 		}
 	} else { // "high-nic"
 		if len(nodeInfo.HighNicNodes) == 0 {
@@ -370,14 +366,14 @@ func CreateScenarioResources(scenario PodScenario, testScenarios TestScenarios)
 		// Find first unused node in the pool
 		targetNode = ""
 		for _, node := range nodeInfo.HighNicNodes {
-			if !testScenarios.NodeUsageTracker[vnetSubnetKey][node] {
+			if !testScenarios.UsedNodes[node] {
 				targetNode = node
-				testScenarios.NodeUsageTracker[vnetSubnetKey][node] = true
+				testScenarios.UsedNodes[node] = true
 				break
 			}
 		}
 		if targetNode == "" {
-			return fmt.Errorf("scenario %s: all high-NIC nodes already used for %s", scenario.Name, vnetSubnetKey)
+			return fmt.Errorf("scenario %s: all high-NIC nodes already in use", scenario.Name)
 		}
 	}
 

test/integration/swiftv2/longRunningCluster/datapath_test.go

@@ -99,12 +99,12 @@ var _ = ginkgo.Describe("Datapath Tests", func() {
 
 		// Initialize test scenarios with cache
 		testScenarios := TestScenarios{
-			ResourceGroup:    rg,
-			BuildID:          buildId,
-			PodImage:         "weibeld/ubuntu-networking",
-			Scenarios:        scenarios,
-			VnetSubnetCache:  make(map[string]VnetSubnetInfo),
-			NodeUsageTracker: make(map[string]map[string]bool),
+			ResourceGroup:   rg,
+			BuildID:         buildId,
+			PodImage:        "weibeld/ubuntu-networking",
+			Scenarios:       scenarios,
+			VnetSubnetCache: make(map[string]VnetSubnetInfo),
+			UsedNodes:       make(map[string]bool),
 		}
 
 		// Run indefinitely until test is cancelled
@@ -127,8 +127,8 @@ var _ = ginkgo.Describe("Datapath Tests", func() {
 			err = DeleteAllScenarios(testScenarios)
 			gomega.Expect(err).To(gomega.BeNil(), "Failed to delete test scenarios")
 
-			// Clear node usage tracker for next iteration
-			testScenarios.NodeUsageTracker = make(map[string]map[string]bool)
+			// Clear used nodes tracker for next iteration
+			testScenarios.UsedNodes = make(map[string]bool)
 
 			ginkgo.By(fmt.Sprintf("Completed iteration %d at %s", iteration, time.Now().Format(time.RFC3339)))