test: migrate vdsnapshots e2e to new framefork#2350
Open
eofff wants to merge 4 commits into
Open
Conversation
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
added 3 commits
May 15, 2026 07:54
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
eofff
changed the title
hardcoretime
requested changes
May 15, 2026
| "github.com/deckhouse/virtualization/test/e2e/internal/framework" | ||
| ) | ||
|
|
||
| // GetDefaultStorageClass loads cluster StorageClasses and returns the current default one. |
Contributor
There was a problem hiding this comment.
Use the DefaultStorageClass config field. The default storage class is checked in the common pre-check.
| }).WithTimeout(timeout).WithPolling(time.Second).Should(Succeed()) | ||
| } | ||
|
|
||
| func IsDiskAttachedToVM(vm *v1alpha2.VirtualMachine, vd *v1alpha2.VirtualDisk) bool { |
Comment on lines
+83
to
+95
| ctxVMWatch, cancelVMWatch := context.WithCancel(ctx) | ||
| defer cancelVMWatch() | ||
| vmWatchErrCh := make(chan error, 1) | ||
| var vmWasFrozen atomic.Bool | ||
| go func() { | ||
| wasFrozen, err := ensureVMWasFrozenInProgress( | ||
| ctxVMWatch, | ||
| f.VirtClient().VirtualMachines(f.Namespace().Name), | ||
| vm, | ||
| ) | ||
| vmWasFrozen.Store(wasFrozen) | ||
| vmWatchErrCh <- err | ||
| }() |
| defer cancelVMWatch() | ||
| vmWatchErrCh := make(chan error, 1) | ||
| var vmWasFrozen atomic.Bool | ||
| go func() { |
Contributor
There was a problem hiding this comment.
Use Ginkgo Recovery when working with goroutines.
Comment on lines
+277
to
+289
| volumeSnapshot := &unstructured.Unstructured{} | ||
| volumeSnapshot.SetAPIVersion("snapshot.storage.k8s.io/v1") | ||
| volumeSnapshot.SetKind("VolumeSnapshot") | ||
| err = f.GenericClient().Get(ctx, crclient.ObjectKey{ | ||
| Namespace: actualVDSnapshot.Namespace, | ||
| Name: actualVDSnapshot.Status.VolumeSnapshotName, | ||
| }, volumeSnapshot) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| readyToUse, found, err := unstructured.NestedBool(volumeSnapshot.Object, "status", "readyToUse") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(found).To(BeTrue(), "VolumeSnapshot status.readyToUse must be present") | ||
| Expect(readyToUse).To(BeTrue(), "VolumeSnapshot status.readyToUse must be true") |
Contributor
There was a problem hiding this comment.
Is this required in the test?
| It("validates snapshots for a disk with no consumer", func() { | ||
| By("Environment preparation") | ||
| defaultSC, scList := util.GetDefaultStorageClass(ctx, f) | ||
| immediateSC := config.FindImmediateStorageClass(defaultSC, scList) |
Contributor
There was a problem hiding this comment.
Use the ImmediateStorageClass config field. The immediate storage class is checked in the immediate sc pre-check.
| vmWatchErrCh <- err | ||
| }() | ||
|
|
||
| vdSnapshots := burstVDSnapshotsCreation(ctx, f, []*v1alpha2.VirtualDisk{vdRoot, vdAttach}, 5) |
| vmWatchErrCh := make(chan error, 1) | ||
| var vmWasFrozen atomic.Bool | ||
| go func() { | ||
| wasFrozen, err := ensureVMWasFrozenInProgress( |
Contributor
There was a problem hiding this comment.
It seems that Eventually is sufficient for this test case.
|
|
||
| const vdSnapshotNSPrefix = "virtual-disk-snapshots" | ||
|
|
||
| var _ = Describe("VirtualDiskSnapshots", Label(precheck.PrecheckImmediateStorageClass, precheck.PrecheckSnapshot), func() { |
Contributor
There was a problem hiding this comment.
Without ordering, all It containers will run simultaneously when Ginkgo runs in parallel. If you want to run it in parallel, split it.
| "github.com/deckhouse/virtualization/test/e2e/internal/util" | ||
| ) | ||
|
|
||
| const vdSnapshotNSPrefix = "virtual-disk-snapshots" |
Contributor
There was a problem hiding this comment.
Move it under Describe or delete it if the test cases will be split.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Migrate vdsnapshots e2e to new framefork.
Why do we need it, and what problem does it solve?
What is the expected result?
Checklist
Changelog entries