Skip to content

Commit 0927e53

Browse files
akutzakutz
committed
Remove UnmanagedVolumeClaim API type
This patch removes the UnmanagedVolumeClaim API as it is no longer necessary due to the promotion of the disk fields directly into the VirtualMachineVolume spec.
1 parent e610341 commit 0927e53

File tree

42 files changed

+568
-1091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+568
-1091
lines changed

‎api/test/v1alpha1/virtualmachine_conversion_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,13 @@ func TestVirtualMachineConversion(t *testing.T) {
282282
},
283283
}),
284284
},
285+
ImageDiskName: "my-disk",
285286
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
287+
ControllerBusNumber: &[]int32{1}[0],
286288
ControllerType: vmopv1.VirtualControllerTypeSCSI,
287-
ControllerBusNumber: ptrOf(int32(0)),
288-
DiskMode: vmopv1.VolumeDiskModePersistent,
289-
UnitNumber: ptrOf(int32(0)),
289+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
290+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
291+
UnitNumber: &[]int32{2}[0],
290292
},
291293
{
292294
Name: "my-volume-2",

‎api/test/v1alpha2/virtualmachine_conversion_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,13 @@ func TestVirtualMachineConversion(t *testing.T) {
315315
},
316316
}),
317317
},
318+
ImageDiskName: "my-disk",
318319
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
320+
ControllerBusNumber: &[]int32{1}[0],
319321
ControllerType: vmopv1.VirtualControllerTypeSCSI,
320-
ControllerBusNumber: ptrOf(int32(0)),
321-
DiskMode: vmopv1.VolumeDiskModePersistent,
322-
UnitNumber: ptrOf(int32(0)),
322+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
323+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
324+
UnitNumber: &[]int32{2}[0],
323325
},
324326
{
325327
Name: "my-volume-2",

‎api/test/v1alpha3/virtualmachine_conversion_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,13 @@ func TestVirtualMachineConversion(t *testing.T) {
305305
},
306306
}),
307307
},
308+
ImageDiskName: "my-disk",
308309
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
310+
ControllerBusNumber: &[]int32{1}[0],
309311
ControllerType: vmopv1.VirtualControllerTypeSCSI,
310-
ControllerBusNumber: ptrOf(int32(0)),
311-
DiskMode: vmopv1.VolumeDiskModePersistent,
312-
UnitNumber: ptrOf(int32(0)),
312+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
313+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
314+
UnitNumber: &[]int32{2}[0],
313315
},
314316
{
315317
Name: "my-volume-2",

‎api/test/v1alpha4/virtualmachine_conversion_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,13 @@ func TestVirtualMachineConversion(t *testing.T) {
219219
},
220220
}),
221221
},
222+
ImageDiskName: "my-disk",
223+
ApplicationType: vmopv1.VolumeApplicationTypeOracleRAC,
224+
ControllerBusNumber: &[]int32{1}[0],
225+
ControllerType: vmopv1.VirtualControllerTypeSCSI,
226+
DiskMode: vmopv1.VolumeDiskModeIndependentPersistent,
227+
SharingMode: vmopv1.VolumeSharingModeMultiWriter,
228+
UnitNumber: &[]int32{2}[0],
222229
},
223230
{
224231
Name: "my-volume-2",

‎api/v1alpha1/virtualmachine_conversion.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,16 +1035,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
10351035
for i := range dst.Spec.Volumes {
10361036
dstVol := &dst.Spec.Volumes[i]
10371037
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
1038-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
1039-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
1040-
dstVol.ApplicationType = srcVol.ApplicationType
1041-
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
1042-
dstVol.ControllerType = srcVol.ControllerType
1043-
dstVol.DiskMode = srcVol.DiskMode
1044-
dstVol.SharingMode = srcVol.SharingMode
1045-
dstVol.UnitNumber = srcVol.UnitNumber
1046-
}
1047-
}
1038+
dstVol.ApplicationType = srcVol.ApplicationType
1039+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
1040+
dstVol.ControllerType = srcVol.ControllerType
1041+
dstVol.ImageDiskName = srcVol.ImageDiskName
1042+
dstVol.DiskMode = srcVol.DiskMode
1043+
dstVol.SharingMode = srcVol.SharingMode
1044+
dstVol.UnitNumber = srcVol.UnitNumber
10481045
}
10491046
}
10501047
}

‎api/v1alpha1/zz_generated.conversion.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha2/virtualmachine_conversion.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
368368
for i := range dst.Spec.Volumes {
369369
dstVol := &dst.Spec.Volumes[i]
370370
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
371-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
372-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
373-
dstVol.ApplicationType = srcVol.ApplicationType
374-
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
375-
dstVol.ControllerType = srcVol.ControllerType
376-
dstVol.DiskMode = srcVol.DiskMode
377-
dstVol.SharingMode = srcVol.SharingMode
378-
dstVol.UnitNumber = srcVol.UnitNumber
379-
}
380-
}
371+
dstVol.ApplicationType = srcVol.ApplicationType
372+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
373+
dstVol.ControllerType = srcVol.ControllerType
374+
dstVol.ImageDiskName = srcVol.ImageDiskName
375+
dstVol.DiskMode = srcVol.DiskMode
376+
dstVol.SharingMode = srcVol.SharingMode
377+
dstVol.UnitNumber = srcVol.UnitNumber
381378
}
382379
}
383380
}

‎api/v1alpha2/zz_generated.conversion.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha3/virtualmachine_conversion.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,13 @@ func restore_v1alpha5_VirtualMachineVolumes(dst, src *vmopv1.VirtualMachine) {
240240
for i := range dst.Spec.Volumes {
241241
dstVol := &dst.Spec.Volumes[i]
242242
if srcVol, ok := srcVolMap[dstVol.Name]; ok {
243-
if dstPvc := dstVol.PersistentVolumeClaim; dstPvc != nil {
244-
if srcPvc := srcVol.PersistentVolumeClaim; srcPvc != nil {
245-
dstVol.ApplicationType = srcVol.ApplicationType
246-
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
247-
dstVol.ControllerType = srcVol.ControllerType
248-
dstVol.DiskMode = srcVol.DiskMode
249-
dstVol.SharingMode = srcVol.SharingMode
250-
dstVol.UnitNumber = srcVol.UnitNumber
251-
}
252-
}
243+
dstVol.ApplicationType = srcVol.ApplicationType
244+
dstVol.ControllerBusNumber = srcVol.ControllerBusNumber
245+
dstVol.ControllerType = srcVol.ControllerType
246+
dstVol.ImageDiskName = srcVol.ImageDiskName
247+
dstVol.DiskMode = srcVol.DiskMode
248+
dstVol.SharingMode = srcVol.SharingMode
249+
dstVol.UnitNumber = srcVol.UnitNumber
253250
}
254251
}
255252
}

‎api/v1alpha3/zz_generated.conversion.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)