feat(vmrestore): fix merge conflicts and update e2e test case

Signed-off-by: Roman Sysoev <roman.sysoev@flant.com>

Author: Roman Sysoev

tests/e2e/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
 	github.com/onsi/ginkgo/v2 v2.21.0
 	github.com/onsi/gomega v1.35.1
-	golang.org/x/sync v0.8.0
+	golang.org/x/sync v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.32.3
 	k8s.io/apimachinery v0.32.3
@@ -65,7 +65,6 @@ require (
 	github.com/xlab/treeprint v1.2.0 // indirect
 	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/term v0.32.0 // indirect
 	golang.org/x/text v0.25.0 // indirect

tests/e2e/vm_restore_force_test.go

@@ -35,11 +35,10 @@ import (
 
 var _ = Describe("VirtualMachineRestoreForce", SIGRestoration(), ginkgoutil.CommonE2ETestDecorators(), func() {
 	const (
-		viCount                = 2
-		vmCount                = 1
-		vdCount                = 3
-		vmbdaCount             = 2
-		hasNoConsumerDiskCount = 1
+		viCount    = 2
+		vmCount    = 1
+		vdCount    = 2
+		vmbdaCount = 2
 	)
 
 	var (
@@ -49,7 +48,7 @@ var _ = Describe("VirtualMachineRestoreForce", SIGRestoration(), ginkgoutil.Comm
 		volumeSnapshotClass string
 		namespace           string
 		testCaseLabel       = map[string]string{"testcase": "vm-restore-force"}
-		hasNoConsumerLabel  = map[string]string{"hasNoConsumer": "vm-restore-force"}
+		additionalDiskLabel = map[string]string{"additionalDisk": "vm-restore-force"}
 	)
 	BeforeEach(func() {
 		ctx, cancel = context.WithCancel(context.Background())
@@ -68,7 +67,6 @@ var _ = Describe("VirtualMachineRestoreForce", SIGRestoration(), ginkgoutil.Comm
 		var err error
 		namespace, err = kustomize.GetNamespace(kustomization)
 		Expect(err).NotTo(HaveOccurred(), "%w", err)
-		conf.SetNamespace(namespace)
 
 		storageClass, err = GetDefaultStorageClass()
 		Expect(err).NotTo(HaveOccurred(), "failed to get the `DefaultStorageClass`")
@@ -162,9 +160,9 @@ var _ = Describe("VirtualMachineRestoreForce", SIGRestoration(), ginkgoutil.Comm
 			By("Attaching `VirtualDisk` after `VirtualMachine` snapshotting", func() {
 				for i, vm := range vms.Items {
 					vdName := fmt.Sprintf("%s-%d", "vd-attached-after-vm-snapshotting", i)
-					newDisk := NewVirtualDisk(vdName, vm.Namespace, hasNoConsumerLabel, resource.NewQuantity(1*1024*1024, resource.BinarySI))
+					newDisk := NewVirtualDisk(vdName, vm.Namespace, additionalDiskLabel, resource.NewQuantity(1*1024*1024, resource.BinarySI))
 					CreateResource(ctx, newDisk)
-					newVmbda := NewVirtualMachineBlockDeviceAttachment(vm.Name, vm.Namespace, newDisk.Name, virtv2.VMBDAObjectRefKindVirtualDisk, testCaseLabel)
+					newVmbda := NewVirtualMachineBlockDeviceAttachment(vm.Name, vm.Namespace, newDisk.Name, virtv2.VMBDAObjectRefKindVirtualDisk, additionalDiskLabel)
 					CreateResource(ctx, newVmbda)
 
 					WaitPhaseByLabel(
@@ -255,14 +253,22 @@ var _ = Describe("VirtualMachineRestoreForce", SIGRestoration(), ginkgoutil.Comm
 						Resource: virtv2.VirtualMachineRestoreResource,
 						Labels:   testCaseLabel,
 					},
+					{
+						Resource: virtv2.VirtualDiskResource,
+						Labels:   additionalDiskLabel,
+					},
+					{
+						Resource: virtv2.VirtualMachineBlockDeviceAttachmentResource,
+						Labels:   additionalDiskLabel,
+					},
 				},
 			}
 
 			if config.IsCleanUpNeeded() {
 				resourcesToDelete.KustomizationDir = conf.TestData.VMRestoreForce
 			}
 
-			DeleteTestCaseResources(resourcesToDelete)
+			DeleteTestCaseResources(namespace, resourcesToDelete)
 		})
 	})
 })