Skip to content

Commit 77a49b7

Browse files
lubronzhanlubronzhan
committed
Get rid of pciSlotNumber field
1 parent c5b74c5 commit 77a49b7

15 files changed

+99
-676
lines changed

‎api/test/v1alpha1/virtualmachine_conversion_test.go‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -207,68 +207,56 @@ func TestVirtualMachineConversion(t *testing.T) {
207207
},
208208
NVMEControllers: []vmopv1.NVMEControllerSpec{
209209
{
210-
BusNumber: 0,
211-
PCISlotNumber: ptrOf(int32(160)),
212-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
210+
BusNumber: 0,
211+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
213212
},
214213
{
215-
BusNumber: 1,
216-
PCISlotNumber: ptrOf(int32(16)),
217-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
214+
BusNumber: 1,
215+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
218216
},
219217
{
220-
BusNumber: 2,
221-
PCISlotNumber: ptrOf(int32(162)),
222-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
218+
BusNumber: 2,
219+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
223220
},
224221
{
225-
BusNumber: 3,
226-
PCISlotNumber: ptrOf(int32(163)),
227-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
222+
BusNumber: 3,
223+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
228224
},
229225
},
230226
SATAControllers: []vmopv1.SATAControllerSpec{
231227
{
232-
BusNumber: 0,
233-
PCISlotNumber: ptrOf(int32(170)),
228+
BusNumber: 0,
234229
},
235230
{
236-
BusNumber: 1,
237-
PCISlotNumber: ptrOf(int32(17)),
231+
BusNumber: 1,
238232
},
239233
{
240-
BusNumber: 2,
241-
PCISlotNumber: ptrOf(int32(172)),
234+
BusNumber: 2,
242235
},
243236
{
244-
BusNumber: 3,
245-
PCISlotNumber: ptrOf(int32(173)),
237+
BusNumber: 3,
246238
},
247239
},
248240
SCSIControllers: []vmopv1.SCSIControllerSpec{
249241
{
250-
BusNumber: 0,
251-
PCISlotNumber: ptrOf(int32(180)),
252-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
253-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
242+
BusNumber: 0,
243+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
244+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
254245
},
255246
{
256-
BusNumber: 1,
257-
PCISlotNumber: ptrOf(int32(18)),
258-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
259-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
247+
BusNumber: 1,
248+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
249+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
260250
},
261251
{
262-
BusNumber: 2,
263-
PCISlotNumber: ptrOf(int32(182)),
264-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
265-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
252+
BusNumber: 2,
253+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
254+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
266255
},
267256
{
268-
BusNumber: 3,
269-
PCISlotNumber: ptrOf(int32(183)),
270-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
271-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
257+
BusNumber: 3,
258+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
259+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
272260
},
273261
},
274262
},

‎api/test/v1alpha2/virtualmachine_conversion_test.go‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -240,68 +240,56 @@ func TestVirtualMachineConversion(t *testing.T) {
240240
},
241241
NVMEControllers: []vmopv1.NVMEControllerSpec{
242242
{
243-
BusNumber: 0,
244-
PCISlotNumber: ptrOf(int32(160)),
245-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
243+
BusNumber: 0,
244+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
246245
},
247246
{
248-
BusNumber: 1,
249-
PCISlotNumber: ptrOf(int32(16)),
250-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
247+
BusNumber: 1,
248+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
251249
},
252250
{
253-
BusNumber: 2,
254-
PCISlotNumber: ptrOf(int32(162)),
255-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
251+
BusNumber: 2,
252+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
256253
},
257254
{
258-
BusNumber: 3,
259-
PCISlotNumber: ptrOf(int32(163)),
260-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
255+
BusNumber: 3,
256+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
261257
},
262258
},
263259
SATAControllers: []vmopv1.SATAControllerSpec{
264260
{
265-
BusNumber: 0,
266-
PCISlotNumber: ptrOf(int32(170)),
261+
BusNumber: 0,
267262
},
268263
{
269-
BusNumber: 1,
270-
PCISlotNumber: ptrOf(int32(17)),
264+
BusNumber: 1,
271265
},
272266
{
273-
BusNumber: 2,
274-
PCISlotNumber: ptrOf(int32(172)),
267+
BusNumber: 2,
275268
},
276269
{
277-
BusNumber: 3,
278-
PCISlotNumber: ptrOf(int32(173)),
270+
BusNumber: 3,
279271
},
280272
},
281273
SCSIControllers: []vmopv1.SCSIControllerSpec{
282274
{
283-
BusNumber: 0,
284-
PCISlotNumber: ptrOf(int32(180)),
285-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
286-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
275+
BusNumber: 0,
276+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
277+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
287278
},
288279
{
289-
BusNumber: 1,
290-
PCISlotNumber: ptrOf(int32(18)),
291-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
292-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
280+
BusNumber: 1,
281+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
282+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
293283
},
294284
{
295-
BusNumber: 2,
296-
PCISlotNumber: ptrOf(int32(182)),
297-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
298-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
285+
BusNumber: 2,
286+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
287+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
299288
},
300289
{
301-
BusNumber: 3,
302-
PCISlotNumber: ptrOf(int32(183)),
303-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
304-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
290+
BusNumber: 3,
291+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
292+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
305293
},
306294
},
307295
},

‎api/test/v1alpha3/virtualmachine_conversion_test.go‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -230,68 +230,56 @@ func TestVirtualMachineConversion(t *testing.T) {
230230
},
231231
NVMEControllers: []vmopv1.NVMEControllerSpec{
232232
{
233-
BusNumber: 0,
234-
PCISlotNumber: ptrOf(int32(160)),
235-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
233+
BusNumber: 0,
234+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
236235
},
237236
{
238-
BusNumber: 1,
239-
PCISlotNumber: ptrOf(int32(16)),
240-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
237+
BusNumber: 1,
238+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
241239
},
242240
{
243-
BusNumber: 2,
244-
PCISlotNumber: ptrOf(int32(162)),
245-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
241+
BusNumber: 2,
242+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
246243
},
247244
{
248-
BusNumber: 3,
249-
PCISlotNumber: ptrOf(int32(163)),
250-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
245+
BusNumber: 3,
246+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
251247
},
252248
},
253249
SATAControllers: []vmopv1.SATAControllerSpec{
254250
{
255-
BusNumber: 0,
256-
PCISlotNumber: ptrOf(int32(170)),
251+
BusNumber: 0,
257252
},
258253
{
259-
BusNumber: 1,
260-
PCISlotNumber: ptrOf(int32(17)),
254+
BusNumber: 1,
261255
},
262256
{
263-
BusNumber: 2,
264-
PCISlotNumber: ptrOf(int32(172)),
257+
BusNumber: 2,
265258
},
266259
{
267-
BusNumber: 3,
268-
PCISlotNumber: ptrOf(int32(173)),
260+
BusNumber: 3,
269261
},
270262
},
271263
SCSIControllers: []vmopv1.SCSIControllerSpec{
272264
{
273-
BusNumber: 0,
274-
PCISlotNumber: ptrOf(int32(180)),
275-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
276-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
265+
BusNumber: 0,
266+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
267+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
277268
},
278269
{
279-
BusNumber: 1,
280-
PCISlotNumber: ptrOf(int32(18)),
281-
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
282-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
270+
BusNumber: 1,
271+
SharingMode: vmopv1.VirtualControllerSharingModePhysical,
272+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
283273
},
284274
{
285-
BusNumber: 2,
286-
PCISlotNumber: ptrOf(int32(182)),
287-
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
288-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
275+
BusNumber: 2,
276+
SharingMode: vmopv1.VirtualControllerSharingModeVirtual,
277+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
289278
},
290279
{
291-
BusNumber: 3,
292-
PCISlotNumber: ptrOf(int32(183)),
293-
SharingMode: vmopv1.VirtualControllerSharingModeNone,
294-
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
280+
BusNumber: 3,
281+
SharingMode: vmopv1.VirtualControllerSharingModeNone,
282+
Type: vmopv1.SCSIControllerTypeParaVirtualSCSI,
295283
},
296284
},
297285
},

‎api/v1alpha5/virtualmachine_hardware_types.go‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ type NVMEControllerSpec struct {
9090
// BusNumber describes the desired bus number of the controller.
9191
BusNumber int32 `json:"busNumber"`
9292

93-
// +optional
94-
95-
// PCISlotNumber describes the desired PCI slot number to use for this
96-
// controller.
97-
//
98-
// Please note, most of the time this field should be empty so the system
99-
// can pick an available slot.
100-
PCISlotNumber *int32 `json:"pciSlotNumber,omitempty"`
101-
10293
// +optional
10394
// +kubebuilder:default=None
10495
// +kubebuilder:validation:Enum=None;Physical
@@ -131,15 +122,6 @@ type SATAControllerSpec struct {
131122

132123
// BusNumber describes the desired bus number of the controller.
133124
BusNumber int32 `json:"busNumber"`
134-
135-
// +optional
136-
137-
// PCISlotNumber describes the desired PCI slot number to use for this
138-
// controller.
139-
//
140-
// Please note, most of the time this field should be empty so the system
141-
// can pick an available slot.
142-
PCISlotNumber *int32 `json:"pciSlotNumber,omitempty"`
143125
}
144126

145127
// MaxSlots returns the maximum number of slots per SATA controller.
@@ -165,15 +147,6 @@ type SCSIControllerSpec struct {
165147
// BusNumber describes the desired bus number of the controller.
166148
BusNumber int32 `json:"busNumber"`
167149

168-
// +optional
169-
170-
// PCISlotNumber describes the desired PCI slot number to use for this
171-
// controller.
172-
//
173-
// Please note, most of the time this field should be empty so the system
174-
// can pick an available slot.
175-
PCISlotNumber *int32 `json:"pciSlotNumber,omitempty"`
176-
177150
// +optional
178151
// +kubebuilder:default=None
179152
// +kubebuilder:validation:Enum=None;Physical;Virtual

‎api/v1alpha5/zz_generated.deepcopy.go‎

Lines changed: 3 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)