networkconfig: support switching config expectations on kernel version

Add min_kernel_version and max_kernel_version to SystemConfig in config_expectations.proto to allow switching expectations based on the kernel version of the VM under test.
Update expectedConfigForMachine to compare the VM's kernel version against any specified min_kernel_version and max_kernel_version bounds.
Add an expectation for n2-highcpu-32 with single GVNIC on kernels >= 6.8 where the GVE driver includes NUMA-locality awareness in default IRQ affinity assignment.

PiperOrigin-RevId: 954709834

Author: Guest OS Images

test_suites/networkconfig/config_expectations/config_expectations.proto

@@ -35,9 +35,17 @@ message SystemConfig {
   // The GCE machine type e.g. "n2d-standard-2".
   string machine_type = 2;
 
+  // The minimum kernel version (inclusive) required for this expectation to
+  // apply, e.g. "6.8.0" or "6.8".
+  string min_kernel_version = 3;
+
   // NICs in the VM. This includes any device expected to be created by the
   // GCE stack, but not any created by the user (e.g. not `lo` or `docker0`).
   repeated NicExpectation nics = 4;
+
+  // The maximum kernel version (exclusive) required for this expectation to
+  // apply, e.g. "6.8.0" or "6.8".
+  string max_kernel_version = 5;
 }
 
 message NicExpectation {

test_suites/networkconfig/config_expectations/config_expectations.textproto

@@ -630,8 +630,9 @@ config_expectations: {
   }
 }
 config_expectations: {
-  description: "n2-32 with single GVNIC"
+  description: "n2-32 with single GVNIC (kernel < 6.8)"
   machine_type: "n2-highcpu-32"
+  max_kernel_version: "6.8"
   nics: {
     type: "GVNIC"
     tx_queues: { index: 0 irq_cpulist: "0" xps_cpulist: "0" }
@@ -668,6 +669,46 @@ config_expectations: {
     rx_queues: { index: 15 irq_cpulist: "15" }
   }
 }
+config_expectations: {
+  description: "n2-32 with single GVNIC (kernel >= 6.8)"
+  machine_type: "n2-highcpu-32"
+  min_kernel_version: "6.8"
+  nics: {
+    type: "GVNIC"
+    tx_queues: { index: 0 irq_cpulist: "0" xps_cpulist: "0" }
+    tx_queues: { index: 1 irq_cpulist: "1" xps_cpulist: "1" }
+    tx_queues: { index: 2 irq_cpulist: "2" xps_cpulist: "2" }
+    tx_queues: { index: 3 irq_cpulist: "3" xps_cpulist: "3" }
+    tx_queues: { index: 4 irq_cpulist: "4" xps_cpulist: "4" }
+    tx_queues: { index: 5 irq_cpulist: "5" xps_cpulist: "5" }
+    tx_queues: { index: 6 irq_cpulist: "6" xps_cpulist: "6" }
+    tx_queues: { index: 7 irq_cpulist: "7" xps_cpulist: "7" }
+    tx_queues: { index: 8 irq_cpulist: "16" xps_cpulist: "8" }
+    tx_queues: { index: 9 irq_cpulist: "17" xps_cpulist: "9" }
+    tx_queues: { index: 10 irq_cpulist: "18" xps_cpulist: "10" }
+    tx_queues: { index: 11 irq_cpulist: "19" xps_cpulist: "11" }
+    tx_queues: { index: 12 irq_cpulist: "20" xps_cpulist: "12" }
+    tx_queues: { index: 13 irq_cpulist: "21" xps_cpulist: "13" }
+    tx_queues: { index: 14 irq_cpulist: "22" xps_cpulist: "14" }
+    tx_queues: { index: 15 irq_cpulist: "23" xps_cpulist: "15" }
+    rx_queues: { index: 0 irq_cpulist: "0" }
+    rx_queues: { index: 1 irq_cpulist: "1" }
+    rx_queues: { index: 2 irq_cpulist: "2" }
+    rx_queues: { index: 3 irq_cpulist: "3" }
+    rx_queues: { index: 4 irq_cpulist: "4" }
+    rx_queues: { index: 5 irq_cpulist: "5" }
+    rx_queues: { index: 6 irq_cpulist: "6" }
+    rx_queues: { index: 7 irq_cpulist: "7" }
+    rx_queues: { index: 8 irq_cpulist: "16" }
+    rx_queues: { index: 9 irq_cpulist: "17" }
+    rx_queues: { index: 10 irq_cpulist: "18" }
+    rx_queues: { index: 11 irq_cpulist: "19" }
+    rx_queues: { index: 12 irq_cpulist: "20" }
+    rx_queues: { index: 13 irq_cpulist: "21" }
+    rx_queues: { index: 14 irq_cpulist: "22" }
+    rx_queues: { index: 15 irq_cpulist: "23" }
+  }
+}
 config_expectations: {
   description: "n2-32 with two GVNICs"
   machine_type: "n2-highcpu-32"

test_suites/networkconfig/config_expectations/config_expectations_test.go

@@ -5,6 +5,8 @@ import (
 	_ "embed"
 	"fmt"
 	"sort"
+	"strconv"
+	"strings"
 	"testing"
 
 	pb "github.com/GoogleCloudPlatform/cloud-image-tests/test_suites/networkconfig/config_expectations_proto"
@@ -146,3 +148,87 @@ func TestRingSizes(t *testing.T) {
 		})
 	}
 }
+
+func TestKernelVersionFormat(t *testing.T) {
+	c := proto()
+	for _, config := range c.GetConfigExpectations() {
+		t.Run(config.GetDescription(), func(t *testing.T) {
+			if minVer := config.GetMinKernelVersion(); minVer != "" {
+				if len(minVer) == 0 {
+					t.Errorf("Empty min_kernel_version string")
+				}
+			}
+			if maxVer := config.GetMaxKernelVersion(); maxVer != "" {
+				if len(maxVer) == 0 {
+					t.Errorf("Empty max_kernel_version string")
+				}
+			}
+		})
+	}
+}
+
+func parseKernelVersion(v string) []int {
+	var nums []int
+	for _, part := range strings.FieldsFunc(v, func(r rune) bool {
+		return r < '0' || r > '9'
+	}) {
+		if part == "" {
+			continue
+		}
+		n, err := strconv.Atoi(part)
+		if err == nil {
+			nums = append(nums, n)
+		}
+	}
+	return nums
+}
+
+func compareKernelVersion(v1, v2 string) int {
+	n1 := parseKernelVersion(v1)
+	n2 := parseKernelVersion(v2)
+	maxLen := len(n1)
+	if len(n2) > maxLen {
+		maxLen = len(n2)
+	}
+	for i := 0; i < maxLen; i++ {
+		var x1, x2 int
+		if i < len(n1) {
+			x1 = n1[i]
+		}
+		if i < len(n2) {
+			x2 = n2[i]
+		}
+		if x1 < x2 {
+			return -1
+		}
+		if x1 > x2 {
+			return 1
+		}
+	}
+	return 0
+}
+
+func TestCompareKernelVersion(t *testing.T) {
+	tests := []struct {
+		v1   string
+		v2   string
+		want int
+	}{
+		{"6.8.0-1006-gcp", "6.8.0", 1},
+		{"6.8.0-1006-gcp", "6.8", 1},
+		{"6.8.0", "6.8.0", 0},
+		{"6.8", "6.8.0", 0},
+		{"6.6.0-1006-gcp", "6.8.0", -1},
+		{"6.6.0-1006-gcp", "6.8", -1},
+		{"6.8.1-gcp", "6.8.0", 1},
+		{"6.8.0", "6.8.1", -1},
+		{"5.15.0-1040-gcp", "6.8", -1},
+	}
+
+	for _, tc := range tests {
+		got := compareKernelVersion(tc.v1, tc.v2)
+		if got != tc.want {
+			t.Errorf("compareKernelVersion(%q, %q) = %d, want %d", tc.v1, tc.v2, got, tc.want)
+		}
+	}
+}