diff --git a/tests/libstorage/datavolume.go b/tests/libstorage/datavolume.go index a6e4132062ad..a18523c3ffd7 100644 --- a/tests/libstorage/datavolume.go +++ b/tests/libstorage/datavolume.go @@ -37,7 +37,7 @@ import ( "kubevirt.io/kubevirt/tests/util" ) -func NewRandomBlockDataVolumeWithRegistryImport(imageUrl, namespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { +func NewBlockDataVolumeWithRegistryImport(imageUrl, namespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { sc, exists := GetRWOBlockStorageClass() if accessMode == v1.ReadWriteMany { sc, exists = GetRWXBlockStorageClass() @@ -45,10 +45,10 @@ func NewRandomBlockDataVolumeWithRegistryImport(imageUrl, namespace string, acce if !exists { ginkgo.Skip("Skip test when Block storage is not present") } - return NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, v1.PersistentVolumeBlock) + return NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, v1.PersistentVolumeBlock) } -func NewRandomDataVolumeWithRegistryImport(imageUrl, namespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { +func NewDataVolumeWithRegistryImport(imageUrl, namespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { sc, exists := GetRWOFileSystemStorageClass() if accessMode == v1.ReadWriteMany { sc, exists = GetRWXFileSystemStorageClass() @@ -56,7 +56,7 @@ func NewRandomDataVolumeWithRegistryImport(imageUrl, namespace string, accessMod if !exists { ginkgo.Skip("Skip test when Filesystem storage is not present") } - return NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, v1.PersistentVolumeFilesystem) + return NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, v1.PersistentVolumeFilesystem) } func newDataVolume(namespace, storageClass string, size string, accessMode v1.PersistentVolumeAccessMode, volumeMode v1.PersistentVolumeMode, dataVolumeSource v1beta1.DataVolumeSource) *v1beta1.DataVolume { @@ -91,7 +91,7 @@ func newDataVolume(namespace, storageClass string, size string, accessMode v1.Pe return dataVolume } -func NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass string, accessMode v1.PersistentVolumeAccessMode, volumeMode v1.PersistentVolumeMode) *v1beta1.DataVolume { +func NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass string, accessMode v1.PersistentVolumeAccessMode, volumeMode v1.PersistentVolumeMode) *v1beta1.DataVolume { size := "512Mi" dataVolumeSource := v1beta1.DataVolumeSource{ Registry: &v1beta1.DataVolumeSourceRegistry{ @@ -101,14 +101,14 @@ func NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, st return newDataVolume(namespace, storageClass, size, accessMode, volumeMode, dataVolumeSource) } -func NewRandomBlankDataVolume(namespace, storageClass, size string, accessMode v1.PersistentVolumeAccessMode, volumeMode v1.PersistentVolumeMode) *v1beta1.DataVolume { +func NewBlankDataVolume(namespace, storageClass, size string, accessMode v1.PersistentVolumeAccessMode, volumeMode v1.PersistentVolumeMode) *v1beta1.DataVolume { dataVolumeSource := v1beta1.DataVolumeSource{ Blank: &v1beta1.DataVolumeBlankImage{}, } return newDataVolume(namespace, storageClass, size, accessMode, volumeMode, dataVolumeSource) } -func NewRandomDataVolumeWithPVCSource(sourceNamespace, sourceName, targetNamespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { +func NewDataVolumeWithPVCSource(sourceNamespace, sourceName, targetNamespace string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { sc, exists := GetRWOFileSystemStorageClass() if accessMode == v1.ReadWriteMany { sc, exists = GetRWXFileSystemStorageClass() @@ -116,10 +116,10 @@ func NewRandomDataVolumeWithPVCSource(sourceNamespace, sourceName, targetNamespa if !exists { ginkgo.Skip("Skip test when Filesystem storage is not present") } - return newRandomDataVolumeWithPVCSourceWithStorageClass(sourceNamespace, sourceName, targetNamespace, sc, "1Gi", accessMode) + return newDataVolumeWithPVCSourceWithStorageClass(sourceNamespace, sourceName, targetNamespace, sc, "1Gi", accessMode) } -func newRandomDataVolumeWithPVCSourceWithStorageClass(sourceNamespace, sourceName, targetNamespace, storageClass, size string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { +func newDataVolumeWithPVCSourceWithStorageClass(sourceNamespace, sourceName, targetNamespace, storageClass, size string, accessMode v1.PersistentVolumeAccessMode) *v1beta1.DataVolume { dataVolumeSource := v1beta1.DataVolumeSource{ PVC: &v1beta1.DataVolumeSourcePVC{ Namespace: sourceNamespace, diff --git a/tests/migration_test.go b/tests/migration_test.go index 891e53565eaf..bcc0903439da 100644 --- a/tests/migration_test.go +++ b/tests/migration_test.go @@ -1412,7 +1412,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:cnv-qe@redhat.com][level:system } }) It("[test_id:3239]should reject a migration of a vmi with a non-shared data volume", func() { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) vmi := tests.NewRandomVMIWithDataVolume(dataVolume.Name) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) @@ -1615,7 +1615,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:cnv-qe@redhat.com][level:system quantity, err := resource.ParseQuantity(cd.FedoraVolumeSize) Expect(err).ToNot(HaveOccurred()) url := "docker://" + cd.ContainerDiskFor(cd.ContainerDiskFedoraTestTooling) - dv = libstorage.NewRandomDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) + dv = libstorage.NewDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) dv.Spec.PVC.Resources.Requests["storage"] = quantity _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -1668,7 +1668,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:cnv-qe@redhat.com][level:system var dv *cdiv1.DataVolume // Create DV and alter permission of disk.img url := "docker://" + cd.ContainerDiskFor(cd.ContainerDiskAlpine) - dv = libstorage.NewRandomDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) + dv = libstorage.NewDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) tests.SetDataVolumeForceBindAnnotation(dv) dv.Spec.PVC.Resources.Requests["storage"] = resource.MustParse(size) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) @@ -2067,7 +2067,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:cnv-qe@redhat.com][level:system quantity, err := resource.ParseQuantity(cd.FedoraVolumeSize) Expect(err).ToNot(HaveOccurred()) url := "docker://" + cd.ContainerDiskFor(cd.ContainerDiskFedoraTestTooling) - dv := libstorage.NewRandomDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) + dv := libstorage.NewDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) dv.Spec.PVC.Resources.Requests["storage"] = quantity _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -2596,7 +2596,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:cnv-qe@redhat.com][level:system Expect(err).ToNot(HaveOccurred()) url := "docker://" + cd.ContainerDiskFor(cd.ContainerDiskFedoraTestTooling) - dv := libstorage.NewRandomBlockDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) + dv := libstorage.NewBlockDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) dv.Spec.PVC.Resources.Requests["storage"] = quantity _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) diff --git a/tests/storage/datavolume.go b/tests/storage/datavolume.go index 00937d6a41a1..a88b1e38b499 100644 --- a/tests/storage/datavolume.go +++ b/tests/storage/datavolume.go @@ -159,7 +159,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { It("should succesfully start", func() { // Create DV and alter permission of disk.img url := "docker://" + cd.ContainerDiskFor(cd.ContainerDiskAlpine) - dv := libstorage.NewRandomDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) + dv := libstorage.NewDataVolumeWithRegistryImport(url, util.NamespaceTestDefault, k8sv1.ReadWriteMany) tests.SetDataVolumeForceBindAnnotation(dv) dv.Spec.PVC.Resources.Requests["storage"] = resource.MustParse(size) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) @@ -205,7 +205,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { It("[test_id:3189]should be successfully started and stopped multiple times", func() { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) vmi := tests.NewRandomVMIWithDataVolume(dataVolume.Name) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) @@ -241,7 +241,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { dvs := make([]*cdiv1.DataVolume, 0, numVmis) for idx := 0; idx < numVmis; idx++ { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) vmi := tests.NewRandomVMIWithDataVolume(dataVolume.Name) vmi.Spec.Domain.Resources.Requests[k8sv1.ResourceMemory] = resource.MustParse("128Mi") @@ -266,7 +266,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { }) It("[test_id:5252]should be successfully started when using a PVC volume owned by a DataVolume", func() { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) vmi := tests.NewRandomVMIWithPVC(dataVolume.Name) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) @@ -296,7 +296,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { Skip("no snapshot storage class configured") } - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass( + dataVolume := libstorage.NewDataVolumeWithRegistryImportInStorageClass( cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, sc, @@ -357,7 +357,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { It("[test_id:4643]should NOT be rejected when VM template lists a DataVolume, but VM lists PVC VolumeSource", func() { - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, storageClass.Name, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, storageClass.Name, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) @@ -402,7 +402,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { Expect(err).ToNot(HaveOccurred()) }) It("[Serial][test_id:4644]should fail to start when a volume is backed by PVC created by DataVolume instead of the DataVolume itself", func() { - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, storageClass.Name, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, storageClass.Name, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) @@ -459,7 +459,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { } It("shold be possible to stop VM if datavolume is crashing", func() { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(InvalidDataVolumeUrl, util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(InvalidDataVolumeUrl, util.NamespaceTestDefault, k8sv1.ReadWriteOnce) vm := tests.NewRandomVirtualMachine(tests.NewRandomVMIWithDataVolume(dataVolume.Name), true) vm.Spec.DataVolumeTemplates = []v1.DataVolumeTemplateSpec{ { @@ -481,7 +481,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { It("[test_id:3190]should correctly handle invalid DataVolumes", func() { // Don't actually create the DataVolume since it's invalid. - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(InvalidDataVolumeUrl, util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(InvalidDataVolumeUrl, util.NamespaceTestDefault, k8sv1.ReadWriteOnce) // Add the invalid DataVolume to a VMI vmi := tests.NewRandomVMIWithDataVolume(dataVolume.Name) // Create a VM for this VMI @@ -511,7 +511,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { fakeRegistryWithPort = fmt.Sprintf("%s:%s", fakeRegistryName, realRegistryPort) } - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlFromRegistryForContainerDisk(fakeRegistryWithPort, cd.ContainerDiskCirros), + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlFromRegistryForContainerDisk(fakeRegistryWithPort, cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce, ) @@ -738,7 +738,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { Skip("Skip test when RWOFileSystem storage class is not present") } var err error - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), testsuite.NamespaceTestAlternative, storageClass, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), testsuite.NamespaceTestAlternative, storageClass, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) tests.SetDataVolumeForceBindAnnotation(dv) dataVolume, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -920,7 +920,7 @@ var _ = SIGDescribe("DataVolume Integration", func() { return dv } DescribeTable("[rfe_id:5070][crit:medium][vendor:cnv-qe@redhat.com][level:component]fstrim from the VM influences disk.img", func(dvChange func(*cdiv1.DataVolume) *cdiv1.DataVolume, expectSmaller bool) { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskFedoraTestTooling), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskFedoraTestTooling), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) dataVolume.Spec.PVC.Resources.Requests[k8sv1.ResourceStorage] = resource.MustParse(cd.FedoraVolumeSize) dataVolume = dvChange(dataVolume) preallocated := dataVolume.Spec.Preallocation != nil && *dataVolume.Spec.Preallocation diff --git a/tests/storage/export.go b/tests/storage/export.go index 88a5a12b3a33..786eb874cc52 100644 --- a/tests/storage/export.go +++ b/tests/storage/export.go @@ -312,7 +312,7 @@ var _ = SIGDescribe("Export", func() { populateKubeVirtContent := func(sc string, volumeMode k8sv1.PersistentVolumeMode) (*k8sv1.PersistentVolumeClaim, string) { By("Creating source volume") - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, sc, k8sv1.ReadWriteOnce, volumeMode) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, sc, k8sv1.ReadWriteOnce, volumeMode) dv, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) var pvc *k8sv1.PersistentVolumeClaim Eventually(func() error { @@ -722,7 +722,7 @@ var _ = SIGDescribe("Export", func() { if !exists { Skip("Skip test when Filesystem storage is not present") } - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, sc, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, sc, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) name := dv.Name namespace := dv.Namespace token := createExportTokenSecret(name, namespace) diff --git a/tests/storage/hotplug.go b/tests/storage/hotplug.go index 5c50607c5349..1e33b3b1faf7 100644 --- a/tests/storage/hotplug.go +++ b/tests/storage/hotplug.go @@ -465,7 +465,7 @@ var _ = SIGDescribe("Hotplug", func() { accessMode = corev1.ReadWriteMany } By("Creating DataVolume") - dvBlock := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", accessMode, volumeMode) + dvBlock := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", accessMode, volumeMode) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dvBlock.Namespace).Create(context.Background(), dvBlock, metav1.CreateOptions{}) Expect(err).To(BeNil()) Eventually(ThisDV(dvBlock), 240).Should(HaveSucceeded()) @@ -531,7 +531,7 @@ var _ = SIGDescribe("Hotplug", func() { tests.WaitForSuccessfulVMIStartWithTimeout(vmi, 240) dvNames := make([]string, 0) for i := 0; i < numPVs; i++ { - dv := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.TODO(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) dvNames = append(dvNames, dv.Name) @@ -1087,7 +1087,7 @@ var _ = SIGDescribe("Hotplug", func() { if !exists { Skip("Skip no filesystem storage class available") } - dv := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.TODO(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) @@ -1134,7 +1134,7 @@ var _ = SIGDescribe("Hotplug", func() { }) It("should attach a hostpath based volume to running VM", func() { - dv := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, libstorage.StorageClassHostPathSeparateDevice, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, libstorage.StorageClassHostPathSeparateDevice, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.TODO(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) @@ -1180,7 +1180,7 @@ var _ = SIGDescribe("Hotplug", func() { vmi, err := virtClient.VirtualMachineInstance(vm.Namespace).Get(vm.Name, &metav1.GetOptions{}) Expect(err).ToNot(HaveOccurred()) tests.WaitForSuccessfulVMIStartWithTimeout(vmi, 240) - dv := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.TODO(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) Eventually(func() error { @@ -1209,7 +1209,7 @@ var _ = SIGDescribe("Hotplug", func() { vmi, err := virtClient.VirtualMachineInstance(vm.Namespace).Get(vm.Name, &metav1.GetOptions{}) Expect(err).ToNot(HaveOccurred()) tests.WaitForSuccessfulVMIStartWithTimeout(vmi, 240) - dv := libstorage.NewRandomBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(util.NamespaceTestDefault, sc, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.TODO(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) Eventually(func() error { diff --git a/tests/storage/restore.go b/tests/storage/restore.go index 30673821f76f..53772679fb94 100644 --- a/tests/storage/restore.go +++ b/tests/storage/restore.go @@ -1508,7 +1508,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() { Skip("Two storageclasses required for this test") } - source := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass( + source := libstorage.NewDataVolumeWithRegistryImportInStorageClass( cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), testsuite.NamespaceTestAlternative, sourceSC, @@ -1568,7 +1568,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() { } createVMFromSource := func() *v1.VirtualMachine { - dataVolume := libstorage.NewRandomDataVolumeWithPVCSource( + dataVolume := libstorage.NewDataVolumeWithPVCSource( sourceDV.Namespace, sourceDV.Name, util.NamespaceTestDefault, diff --git a/tests/storage/snapshot.go b/tests/storage/snapshot.go index bbbd3ec969b3..1c0336f3f957 100644 --- a/tests/storage/snapshot.go +++ b/tests/storage/snapshot.go @@ -1200,7 +1200,7 @@ var _ = SIGDescribe("VirtualMachineSnapshot Tests", func() { }) DescribeTable("should accurately report DataVolume provisioning", func(vmif func(string) *v1.VirtualMachineInstance) { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass( + dataVolume := libstorage.NewDataVolumeWithRegistryImportInStorageClass( cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, snapshotStorageClass, @@ -1296,7 +1296,7 @@ func getSnapshotStorageClass(client kubecli.KubevirtClient) (string, error) { } func AddVolumeAndVerify(virtClient kubecli.KubevirtClient, storageClass string, vm *v1.VirtualMachine, addVMIOnly bool) string { - dv := libstorage.NewRandomBlankDataVolume(vm.Namespace, storageClass, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) + dv := libstorage.NewBlankDataVolume(vm.Namespace, storageClass, "64Mi", corev1.ReadWriteOnce, corev1.PersistentVolumeFilesystem) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) Eventually(ThisDV(dv), 240).Should(HaveSucceeded()) diff --git a/tests/storage/storage.go b/tests/storage/storage.go index e794a0dd7f2c..4d2479db713a 100644 --- a/tests/storage/storage.go +++ b/tests/storage/storage.go @@ -469,7 +469,7 @@ var _ = SIGDescribe("Storage", func() { if !libstorage.HasCDI() { Skip("Skip DataVolume tests when CDI is not present") } - dataVolume = libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume = libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskAlpine), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) }) AfterEach(func() { err = virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Delete(context.Background(), dataVolume.Name, metav1.DeleteOptions{}) @@ -1044,7 +1044,7 @@ var _ = SIGDescribe("Storage", func() { BeforeEach(func() { // create a new PV and PVC (PVs can't be reused) - dataVolume = libstorage.NewRandomBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume = libstorage.NewBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -1191,7 +1191,7 @@ var _ = SIGDescribe("Storage", func() { var dataVolume *cdiv1.DataVolume BeforeEach(func() { - dataVolume = libstorage.NewRandomBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume = libstorage.NewBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -1241,7 +1241,7 @@ var _ = SIGDescribe("Storage", func() { vmi1, vmi2 *virtv1.VirtualMachineInstance ) BeforeEach(func() { - dv = libstorage.NewRandomDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dv = libstorage.NewDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(util.NamespaceTestDefault).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).To(BeNil()) labelKey := "testshareablekey" diff --git a/tests/utils.go b/tests/utils.go index aa84c7514319..fd1ee1328040 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -452,7 +452,7 @@ func NewRandomVirtualMachineInstanceWithDisk(imageUrl, namespace, sc string, acc virtCli, err := kubecli.GetKubevirtClient() util2.PanicOnError(err) - dv := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, volMode) + dv := libstorage.NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, sc, accessMode, volMode) _, err = virtCli.CdiClient().CdiV1beta1().DataVolumes(dv.Namespace).Create(context.Background(), dv, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) Eventually(ThisDV(dv), 240).Should(Or(HaveSucceeded(), BeInPhase(cdiv1.WaitForFirstConsumer))) @@ -529,7 +529,7 @@ func NewRandomVMWithEphemeralDisk(containerImage string) *v1.VirtualMachine { } func NewRandomVMWithDataVolumeWithRegistryImport(imageUrl, namespace, storageClass string, accessMode k8sv1.PersistentVolumeAccessMode) *v1.VirtualMachine { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass, accessMode, k8sv1.PersistentVolumeFilesystem) + dataVolume := libstorage.NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass, accessMode, k8sv1.PersistentVolumeFilesystem) dataVolume.Spec.PVC.Resources.Requests[k8sv1.ResourceStorage] = resource.MustParse("6Gi") vmi := NewRandomVMIWithDataVolume(dataVolume.Name) vm := NewRandomVirtualMachine(vmi, false) @@ -539,7 +539,7 @@ func NewRandomVMWithDataVolumeWithRegistryImport(imageUrl, namespace, storageCla } func NewRandomVMWithDataVolume(imageUrl string, namespace string) *v1.VirtualMachine { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImport(imageUrl, namespace, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithRegistryImport(imageUrl, namespace, k8sv1.ReadWriteOnce) vmi := NewRandomVMIWithDataVolume(dataVolume.Name) vm := NewRandomVirtualMachine(vmi, false) @@ -557,12 +557,12 @@ func NewRandomVMWithDataVolumeAndUserData(dataVolume *cdiv1.DataVolume, userData } func NewRandomVMWithDataVolumeAndUserDataInStorageClass(imageUrl, namespace, userData, storageClass string) *v1.VirtualMachine { - dataVolume := libstorage.NewRandomDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) + dataVolume := libstorage.NewDataVolumeWithRegistryImportInStorageClass(imageUrl, namespace, storageClass, k8sv1.ReadWriteOnce, k8sv1.PersistentVolumeFilesystem) return NewRandomVMWithDataVolumeAndUserData(dataVolume, userData) } func NewRandomVMWithCloneDataVolume(sourceNamespace, sourceName, targetNamespace string) *v1.VirtualMachine { - dataVolume := libstorage.NewRandomDataVolumeWithPVCSource(sourceNamespace, sourceName, targetNamespace, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewDataVolumeWithPVCSource(sourceNamespace, sourceName, targetNamespace, k8sv1.ReadWriteOnce) vmi := NewRandomVMIWithDataVolume(dataVolume.Name) vmi.Namespace = targetNamespace vm := NewRandomVirtualMachine(vmi, false) diff --git a/tests/vmi_configuration_test.go b/tests/vmi_configuration_test.go index 4bddb3814adf..19fa8cd67023 100644 --- a/tests/vmi_configuration_test.go +++ b/tests/vmi_configuration_test.go @@ -1925,7 +1925,7 @@ var _ = Describe("[sig-compute]Configurations", func() { Skip("Cluster has the HostDisk featuregate disabled, skipping the tests") } // create a new PV and PVC (PVs can't be reused) - dataVolume = libstorage.NewRandomBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume = libstorage.NewBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -2057,7 +2057,7 @@ var _ = Describe("[sig-compute]Configurations", func() { It("[test_id:6965][storage-req]Should set BlockIO when using custom block sizes", func() { By("creating a block volume") - dataVolume := libstorage.NewRandomBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred()) @@ -2094,7 +2094,7 @@ var _ = Describe("[sig-compute]Configurations", func() { It("[test_id:6966][storage-req]Should set BlockIO when set to match volume block sizes on block devices", func() { By("creating a block volume") - dataVolume := libstorage.NewRandomBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) + dataVolume := libstorage.NewBlockDataVolumeWithRegistryImport(cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros), util.NamespaceTestDefault, k8sv1.ReadWriteOnce) _, err := virtClient.CdiClient().CdiV1beta1().DataVolumes(dataVolume.Namespace).Create(context.Background(), dataVolume, metav1.CreateOptions{}) Expect(err).ToNot(HaveOccurred())