Skip to content

Commit 830a2e5

Browse files
a-r-ncopybara-github
a-r-n
authored and
copybara-github
committed
networkconfig: add support for gvnic and mrdma nics; add a3-ultra expectations
PiperOrigin-RevId: 934473918
1 parent 84a69bb commit 830a2e5

3 files changed

Lines changed: 375 additions & 51 deletions

File tree

‎test_suites/networkconfig/config_expectations.textproto‎

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,193 @@
11
# proto-file: third_party/golang/github_com/GoogleCloudPlatform/cloud_image_tests/test_suites/networkconfig/config_expectations.proto
22
# proto-message: ConfigExpectations
33

4+
# go/keep-sorted start block=yes by_regex=machine_type.*
5+
config_expectations: {
6+
description: "A3 Ultra machine with all NICs present"
7+
machine_type: "a3-ultragpu-8g"
8+
nics: {
9+
type: "GVNIC"
10+
tx_queues: { index: 0 irq_cpulist: "1" xps_cpulist: "0-13" }
11+
tx_queues: { index: 1 irq_cpulist: "2" xps_cpulist: "14-27" }
12+
tx_queues: { index: 2 irq_cpulist: "3" xps_cpulist: "28-41" }
13+
tx_queues: { index: 3 irq_cpulist: "4" xps_cpulist: "42-55" }
14+
tx_queues: { index: 4 irq_cpulist: "5" xps_cpulist: "112-125" }
15+
tx_queues: { index: 5 irq_cpulist: "6" xps_cpulist: "126-139" }
16+
tx_queues: { index: 6 irq_cpulist: "7" xps_cpulist: "140-153" }
17+
tx_queues: { index: 7 irq_cpulist: "8" xps_cpulist: "154-167" }
18+
tx_queues: { index: 8 irq_cpulist: "9" xps_cpulist: "56-69" }
19+
tx_queues: { index: 9 irq_cpulist: "10" xps_cpulist: "70-83" }
20+
tx_queues: { index: 10 irq_cpulist: "11" xps_cpulist: "84-97" }
21+
tx_queues: { index: 11 irq_cpulist: "12" xps_cpulist: "98-111" }
22+
tx_queues: { index: 12 irq_cpulist: "13" xps_cpulist: "168-181" }
23+
tx_queues: { index: 13 irq_cpulist: "14" xps_cpulist: "182-195" }
24+
tx_queues: { index: 14 irq_cpulist: "15" xps_cpulist: "196-209" }
25+
tx_queues: { index: 15 irq_cpulist: "16" xps_cpulist: "210-223" }
26+
rx_queues: { index: 0 irq_cpulist: "1" }
27+
rx_queues: { index: 1 irq_cpulist: "2" }
28+
rx_queues: { index: 2 irq_cpulist: "3" }
29+
rx_queues: { index: 3 irq_cpulist: "4" }
30+
rx_queues: { index: 4 irq_cpulist: "5" }
31+
rx_queues: { index: 5 irq_cpulist: "6" }
32+
rx_queues: { index: 6 irq_cpulist: "7" }
33+
rx_queues: { index: 7 irq_cpulist: "8" }
34+
rx_queues: { index: 8 irq_cpulist: "9" }
35+
rx_queues: { index: 9 irq_cpulist: "10" }
36+
rx_queues: { index: 10 irq_cpulist: "11" }
37+
rx_queues: { index: 11 irq_cpulist: "12" }
38+
rx_queues: { index: 12 irq_cpulist: "13" }
39+
rx_queues: { index: 13 irq_cpulist: "14" }
40+
rx_queues: { index: 14 irq_cpulist: "15" }
41+
rx_queues: { index: 15 irq_cpulist: "16" }
42+
}
43+
nics: {
44+
type: "GVNIC"
45+
tx_queues: { index: 0 irq_cpulist: "56" xps_cpulist: "0-13" }
46+
tx_queues: { index: 1 irq_cpulist: "57" xps_cpulist: "14-27" }
47+
tx_queues: { index: 2 irq_cpulist: "58" xps_cpulist: "28-41" }
48+
tx_queues: { index: 3 irq_cpulist: "59" xps_cpulist: "42-55" }
49+
tx_queues: { index: 4 irq_cpulist: "60" xps_cpulist: "112-125" }
50+
tx_queues: { index: 5 irq_cpulist: "61" xps_cpulist: "126-139" }
51+
tx_queues: { index: 6 irq_cpulist: "62" xps_cpulist: "140-153" }
52+
tx_queues: { index: 7 irq_cpulist: "63" xps_cpulist: "154-167" }
53+
tx_queues: { index: 8 irq_cpulist: "64" xps_cpulist: "56-69" }
54+
tx_queues: { index: 9 irq_cpulist: "65" xps_cpulist: "70-83" }
55+
tx_queues: { index: 10 irq_cpulist: "66" xps_cpulist: "84-97" }
56+
tx_queues: { index: 11 irq_cpulist: "67" xps_cpulist: "98-111" }
57+
tx_queues: { index: 12 irq_cpulist: "68" xps_cpulist: "168-181" }
58+
tx_queues: { index: 13 irq_cpulist: "69" xps_cpulist: "182-195" }
59+
tx_queues: { index: 14 irq_cpulist: "70" xps_cpulist: "196-209" }
60+
tx_queues: { index: 15 irq_cpulist: "71" xps_cpulist: "210-223" }
61+
rx_queues: { index: 0 irq_cpulist: "56" }
62+
rx_queues: { index: 1 irq_cpulist: "57" }
63+
rx_queues: { index: 2 irq_cpulist: "58" }
64+
rx_queues: { index: 3 irq_cpulist: "59" }
65+
rx_queues: { index: 4 irq_cpulist: "60" }
66+
rx_queues: { index: 5 irq_cpulist: "61" }
67+
rx_queues: { index: 6 irq_cpulist: "62" }
68+
rx_queues: { index: 7 irq_cpulist: "63" }
69+
rx_queues: { index: 8 irq_cpulist: "64" }
70+
rx_queues: { index: 9 irq_cpulist: "65" }
71+
rx_queues: { index: 10 irq_cpulist: "66" }
72+
rx_queues: { index: 11 irq_cpulist: "67" }
73+
rx_queues: { index: 12 irq_cpulist: "68" }
74+
rx_queues: { index: 13 irq_cpulist: "69" }
75+
rx_queues: { index: 14 irq_cpulist: "70" }
76+
rx_queues: { index: 15 irq_cpulist: "71" }
77+
}
78+
nics: {
79+
type: "MRDMA"
80+
tx_queues: { index: 0 xps_cpulist: "0-21" }
81+
tx_queues: { index: 1 xps_cpulist: "22-43" }
82+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
83+
tx_queues: { index: 3 xps_cpulist: "122-143" }
84+
tx_queues: { index: 4 xps_cpulist: "144-167" }
85+
tx_queues: { index: 5 xps_cpulist: "56-77" }
86+
tx_queues: { index: 6 xps_cpulist: "78-99" }
87+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
88+
tx_queues: { index: 8 xps_cpulist: "178-199" }
89+
tx_queues: { index: 9 xps_cpulist: "200-223" }
90+
tx_queues: { index: 10 xps_cpulist: "10" }
91+
}
92+
nics: {
93+
type: "MRDMA"
94+
tx_queues: { index: 0 xps_cpulist: "0-21" }
95+
tx_queues: { index: 1 xps_cpulist: "22-43" }
96+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
97+
tx_queues: { index: 3 xps_cpulist: "122-143" }
98+
tx_queues: { index: 4 xps_cpulist: "144-167" }
99+
tx_queues: { index: 5 xps_cpulist: "56-77" }
100+
tx_queues: { index: 6 xps_cpulist: "78-99" }
101+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
102+
tx_queues: { index: 8 xps_cpulist: "178-199" }
103+
tx_queues: { index: 9 xps_cpulist: "200-223" }
104+
tx_queues: { index: 10 xps_cpulist: "10" }
105+
}
106+
nics: {
107+
type: "MRDMA"
108+
tx_queues: { index: 0 xps_cpulist: "0-21" }
109+
tx_queues: { index: 1 xps_cpulist: "22-43" }
110+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
111+
tx_queues: { index: 3 xps_cpulist: "122-143" }
112+
tx_queues: { index: 4 xps_cpulist: "144-167" }
113+
tx_queues: { index: 5 xps_cpulist: "56-77" }
114+
tx_queues: { index: 6 xps_cpulist: "78-99" }
115+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
116+
tx_queues: { index: 8 xps_cpulist: "178-199" }
117+
tx_queues: { index: 9 xps_cpulist: "200-223" }
118+
tx_queues: { index: 10 xps_cpulist: "10" }
119+
}
120+
nics: {
121+
type: "MRDMA"
122+
tx_queues: { index: 0 xps_cpulist: "0-21" }
123+
tx_queues: { index: 1 xps_cpulist: "22-43" }
124+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
125+
tx_queues: { index: 3 xps_cpulist: "122-143" }
126+
tx_queues: { index: 4 xps_cpulist: "144-167" }
127+
tx_queues: { index: 5 xps_cpulist: "56-77" }
128+
tx_queues: { index: 6 xps_cpulist: "78-99" }
129+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
130+
tx_queues: { index: 8 xps_cpulist: "178-199" }
131+
tx_queues: { index: 9 xps_cpulist: "200-223" }
132+
tx_queues: { index: 10 xps_cpulist: "10" }
133+
}
134+
nics: {
135+
type: "MRDMA"
136+
tx_queues: { index: 0 xps_cpulist: "0-21" }
137+
tx_queues: { index: 1 xps_cpulist: "22-43" }
138+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
139+
tx_queues: { index: 3 xps_cpulist: "122-143" }
140+
tx_queues: { index: 4 xps_cpulist: "144-167" }
141+
tx_queues: { index: 5 xps_cpulist: "56-77" }
142+
tx_queues: { index: 6 xps_cpulist: "78-99" }
143+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
144+
tx_queues: { index: 8 xps_cpulist: "178-199" }
145+
tx_queues: { index: 9 xps_cpulist: "200-223" }
146+
tx_queues: { index: 10 xps_cpulist: "66" }
147+
}
148+
nics: {
149+
type: "MRDMA"
150+
tx_queues: { index: 0 xps_cpulist: "0-21" }
151+
tx_queues: { index: 1 xps_cpulist: "22-43" }
152+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
153+
tx_queues: { index: 3 xps_cpulist: "122-143" }
154+
tx_queues: { index: 4 xps_cpulist: "144-167" }
155+
tx_queues: { index: 5 xps_cpulist: "56-77" }
156+
tx_queues: { index: 6 xps_cpulist: "78-99" }
157+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
158+
tx_queues: { index: 8 xps_cpulist: "178-199" }
159+
tx_queues: { index: 9 xps_cpulist: "200-223" }
160+
tx_queues: { index: 10 xps_cpulist: "66" }
161+
}
162+
nics: {
163+
type: "MRDMA"
164+
tx_queues: { index: 0 xps_cpulist: "0-21" }
165+
tx_queues: { index: 1 xps_cpulist: "22-43" }
166+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
167+
tx_queues: { index: 3 xps_cpulist: "122-143" }
168+
tx_queues: { index: 4 xps_cpulist: "144-167" }
169+
tx_queues: { index: 5 xps_cpulist: "56-77" }
170+
tx_queues: { index: 6 xps_cpulist: "78-99" }
171+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
172+
tx_queues: { index: 8 xps_cpulist: "178-199" }
173+
tx_queues: { index: 9 xps_cpulist: "200-223" }
174+
tx_queues: { index: 10 xps_cpulist: "66" }
175+
}
176+
nics: {
177+
type: "MRDMA"
178+
tx_queues: { index: 0 xps_cpulist: "0-21" }
179+
tx_queues: { index: 1 xps_cpulist: "22-43" }
180+
tx_queues: { index: 2 xps_cpulist: "44-55,112-121" }
181+
tx_queues: { index: 3 xps_cpulist: "122-143" }
182+
tx_queues: { index: 4 xps_cpulist: "144-167" }
183+
tx_queues: { index: 5 xps_cpulist: "56-77" }
184+
tx_queues: { index: 6 xps_cpulist: "78-99" }
185+
tx_queues: { index: 7 xps_cpulist: "100-111,168-177" }
186+
tx_queues: { index: 8 xps_cpulist: "178-199" }
187+
tx_queues: { index: 9 xps_cpulist: "200-223" }
188+
tx_queues: { index: 10 xps_cpulist: "66" }
189+
}
190+
}
4191
config_expectations: {
5192
description: "Simple n2-32 machine, single VIRTIO"
6193
machine_type: "n2-highcpu-32"
@@ -72,3 +259,4 @@ config_expectations: {
72259
rx_queues: { index: 31 irq_cpulist: "31" }
73260
}
74261
}
262+
# go/keep-sorted end

0 commit comments

Comments
 (0)