test: migrate VirtualDiskResizing e2e test to new framework

test/e2e/default_config.yaml

@@ -18,7 +18,6 @@ clusterTransport:
 helperImages:
   curlImage: "curlimages/curl"
 testData:
-  diskResizing: "/tmp/testdata/disk-resizing"
   imageHotplug: "/tmp/testdata/image-hotplug"
   sizingPolicy: "/tmp/testdata/sizing-policy"
   vmConfiguration: "/tmp/testdata/vm-configuration"

test/e2e/internal/config/config.go

@@ -88,7 +88,6 @@ type Config struct {
 }
 
 type TestData struct {
-	DiskResizing      string `yaml:"diskResizing"`
 	ImageHotplug      string `yaml:"imageHotplug"`
 	VMMigration       string `yaml:"vmMigration"`
 	VMMigrationCancel string `yaml:"vmMigrationCancel"`

test/e2e/internal/util/block_device.go

@@ -26,6 +26,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	storagev1 "k8s.io/api/storage/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -105,6 +106,26 @@ func GetBlockDeviceHash(ctx context.Context, f *framework.Framework, vm *v1alpha
 	return strings.TrimSpace(cmdOut)
 }
 
+func GetBlockDeviceLsblkSize(ctx context.Context, f *framework.Framework, vm *v1alpha2.VirtualMachine, bdKind v1alpha2.BlockDeviceKind, bdName string) resource.Quantity {
+	GinkgoHelper()
+
+	serial, ok := GetBlockDeviceSerialNumber(ctx, vm, bdKind, bdName)
+	Expect(ok).To(BeTrue(), "failed to get block device serial number")
+
+	devicePath, err := GetBlockDeviceBySerial(f, vm, serial)
+	Expect(err).NotTo(HaveOccurred(), "failed to get device by serial")
+
+	cmdOut, err := f.SSHCommand(vm.Name, vm.Namespace, fmt.Sprintf("sudo lsblk --json -o SIZE %s", devicePath))
+	Expect(err).NotTo(HaveOccurred())
+
+	var disks Disks
+	err = json.Unmarshal([]byte(cmdOut), &disks)
+	Expect(err).NotTo(HaveOccurred(), "failed to parse lsblk output")
+	Expect(disks.BlockDevices).NotTo(BeEmpty(), "lsblk output does not contain block devices")
+
+	return resource.MustParse(strings.TrimSpace(disks.BlockDevices[0].Size))
+}
+
 func GetBlockDeviceBySerial(f *framework.Framework, vm *v1alpha2.VirtualMachine, serial string) (string, error) {
 	cmdOut, err := f.SSHCommand(vm.Name, vm.Namespace, fmt.Sprintf("sudo lsblk -o PATH,SERIAL | grep %s | awk \"{print \\$1, \\$2}\"", serial))
 	if err != nil {

test/e2e/legacy/image_hotplug.go

@@ -38,7 +38,11 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/util"
 )
 
-const unacceptableCount = -1000
+const (
+	DiskIDPrefix      = "scsi-0QEMU_QEMU_HARDDISK"
+	CdRomIDPrefix     = "scsi-0QEMU_QEMU_CD-ROM_drive-ua"
+	unacceptableCount = -1000
+)
 
 var APIVersion = v1alpha2.SchemeGroupVersion.String()
 
@@ -416,3 +420,22 @@ func GetDisksMetadata(vmNamespace, vmName string, disks *Disks) error {
 	}
 	return nil
 }
+
+func WaitBlockDeviceRefsAttached(namespace string, vms ...string) {
+	GinkgoHelper()
+	Eventually(func() error {
+		for _, vmName := range vms {
+			vm := v1alpha2.VirtualMachine{}
+			err := GetObject(v1alpha2.VirtualMachineResource, vmName, &vm, kc.GetOptions{Namespace: namespace})
+			if err != nil {
+				return fmt.Errorf("virtualMachine: %s\nstderr: %w", vmName, err)
+			}
+			for _, bd := range vm.Status.BlockDeviceRefs {
+				if !bd.Attached {
+					return fmt.Errorf("virtualMachine: %s\nblockDeviceRefs: %#v", vmName, bd)
+				}
+			}
+		}
+		return nil
+	}).WithTimeout(Timeout).WithPolling(Interval).Should(Succeed())
+}