Skip to content

Commit

Permalink
tests: rename libstorage.NewRandomDataVolume*
Browse files Browse the repository at this point in the history 
The renamed functions create a new DataVolume object. The fact that the
name of the DataVolume is chosen randomly is not important to the user
of the functions. We could have implemented them with a monotonously
rising index and no functionality would have been hurt.

Besides, the new names are shorter and easier to read.

Signed-off-by: Dan Kenigsberg <[email protected]>
  • Loading branch information
@dankenigsberg
dankenigsberg committed Jul 18, 2022
1 parent 6bf6ca9 commit 41bf06e
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 50 deletions.
18 changes: 9 additions & 9 deletions tests/libstorage/datavolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@ 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()
}
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()
}
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 {
Expand Down Expand Up @@ -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{
Expand All @@ -101,25 +101,25 @@ 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()
}
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,
Expand Down
10 changes: 5 additions & 5 deletions tests/migration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][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{})
Expand Down Expand Up @@ -1615,7 +1615,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][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())
Expand Down Expand Up @@ -1668,7 +1668,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][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{})
Expand Down Expand Up @@ -2067,7 +2067,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][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())
Expand Down Expand Up @@ -2596,7 +2596,7 @@ var _ = Describe("[rfe_id:393][crit:high][vendor:[email protected]][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{})
Expand Down
24 changes: 12 additions & 12 deletions tests/storage/datavolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
Expand Down Expand Up @@ -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{})
Expand Down Expand Up @@ -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")

Expand All @@ -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{})
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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())

Expand Down Expand Up @@ -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())

Expand Down Expand Up @@ -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{
{
Expand All @@ -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
Expand Down Expand Up @@ -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,
)
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -920,7 +920,7 @@ var _ = SIGDescribe("DataVolume Integration", func() {
return dv
}
DescribeTable("[rfe_id:5070][crit:medium][vendor:[email protected]][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
Expand Down
4 changes: 2 additions & 2 deletions tests/storage/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 41bf06e

Please sign in to comment.