test: delete legacy complex test (#2329)

Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>

Author: yaroslavborbat

images/virtualization-artifact/pkg/builder/vm/option.go

@@ -161,3 +161,9 @@ func WithUSBDevices(usbDevices []v1alpha2.USBDeviceSpecRef) Option {
 		vm.Spec.USBDevices = usbDevices
 	}
 }
+
+func WithIpAddress(ipAddress string) Option {
+	return func(vm *v1alpha2.VirtualMachine) {
+		vm.Spec.VirtualMachineIPAddress = ipAddress
+	}
+}

test/e2e/README.md

@@ -94,9 +94,9 @@ task runp
 - Set LABELS to run tests with specific label(https://onsi.github.io/ginkgo/#spec-labels).
 - Manage timeouts for new e2e tests (not for legacy tests) using env variables `E2E_SHORT_TIMEOUT`, `E2E_MIDDLE_TIMEOUT`, `E2E_LONG_TIMEOUT` and `E2E_MAX_TIMEOUT`.
 
-For example, to run only the "ComplexTest" and leave all created resources in the cluster, use the following command: 
+For example, to run only one test and leave all created resources in the cluster, use the following command:
 ```bash
-FOCUS="ComplexTest" POST_CLEANUP=no task run
+FOCUS="VirtualMachineConnectivity" POST_CLEANUP=no task run
 ```
 
 ### PostCleanUp option

test/e2e/blockdevice/virtual_disk_provisioning.go

@@ -47,8 +47,6 @@ var _ = Describe("VirtualDiskProvisioning", Label(precheck.NoPrecheck), func() {
 		DeferCleanup(f.After)
 	})
 
-	// Other cases are currently covered in ComplexTest
-	// After splitting ComplexTest, the remaining disk provisioning checks will also be located here
 	It("verifies that a VirtualDisk is provisioned successfully from a VirtualImage on a PVC", func() {
 		var (
 			vi *v1alpha2.VirtualImage
@@ -90,4 +88,91 @@ var _ = Describe("VirtualDiskProvisioning", Label(precheck.NoPrecheck), func() {
 			util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, vd)
 		})
 	})
+
+	It("verifies that a VirtualDisk is provisioned successfully from a VirtualImage on dvcr", func() {
+		var (
+			vi *v1alpha2.VirtualImage
+			vd *v1alpha2.VirtualDisk
+		)
+		By("Creating VirtualImage", func() {
+			vi = object.NewGeneratedVIFromCVI("vi-", f.Namespace().Name, object.PrecreatedCVIAlpineUEFI)
+			err := f.CreateWithDeferredDeletion(context.Background(), vi)
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		By("Waiting for VirtualImage to be ready", func() {
+			util.UntilObjectPhase(string(v1alpha2.ImageReady), framework.LongTimeout, vi)
+		})
+
+		By("Creating VirtualDisk", func() {
+			vd = object.NewVDFromVI("vd", f.Namespace().Name, vi, vdbuilder.WithSize(ptr.To(resource.MustParse("350Mi"))))
+			err := f.CreateWithDeferredDeletion(context.Background(), vd)
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		By("Waiting for VirtualDisk to be ready", func() {
+			util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, vd)
+		})
+
+		By("Creating VirtualMachine and waiting for VirtualMachine to be ready", func() {
+			vm := object.NewMinimalVM("vm-", f.Namespace().Name, vmbuilder.WithBlockDeviceRefs(v1alpha2.BlockDeviceSpecRef{
+				Kind: v1alpha2.VirtualDiskKind,
+				Name: vd.Name,
+			}))
+			err := f.CreateWithDeferredDeletion(context.Background(), vm)
+			Expect(err).NotTo(HaveOccurred())
+
+			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, vm)
+		})
+	})
+
+	It("verifies that a VirtualDisk is provisioned successfully from a ClusterVirtualImage", func() {
+		var vd *v1alpha2.VirtualDisk
+
+		By("Creating VirtualDisk", func() {
+			vd = object.NewVDFromCVI("vd", f.Namespace().Name, object.PrecreatedCVIAlpineBIOS, vdbuilder.WithSize(ptr.To(resource.MustParse("350Mi"))))
+			err := f.CreateWithDeferredDeletion(context.Background(), vd)
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		By("Waiting for VirtualDisk to be ready", func() {
+			util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, vd)
+		})
+
+		By("Creating VirtualMachine and waiting for VirtualMachine to be ready", func() {
+			vm := object.NewMinimalVM("vm-", f.Namespace().Name, vmbuilder.WithBlockDeviceRefs(v1alpha2.BlockDeviceSpecRef{
+				Kind: v1alpha2.VirtualDiskKind,
+				Name: vd.Name,
+			}))
+			err := f.CreateWithDeferredDeletion(context.Background(), vm)
+			Expect(err).NotTo(HaveOccurred())
+
+			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, vm)
+		})
+	})
+
+	It("verifies that a VirtualDisk is provisioned successfully from a http", func() {
+		var vd *v1alpha2.VirtualDisk
+
+		By("Creating VirtualDisk", func() {
+			vd = object.NewHTTPVDAlpineBIOS("vd", f.Namespace().Name, vdbuilder.WithSize(ptr.To(resource.MustParse("350Mi"))))
+			err := f.CreateWithDeferredDeletion(context.Background(), vd)
+			Expect(err).NotTo(HaveOccurred())
+		})
+
+		By("Waiting for VirtualDisk to be ready", func() {
+			util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, vd)
+		})
+
+		By("Creating VirtualMachine and waiting for VirtualMachine to be ready", func() {
+			vm := object.NewMinimalVM("vm-", f.Namespace().Name, vmbuilder.WithBlockDeviceRefs(v1alpha2.BlockDeviceSpecRef{
+				Kind: v1alpha2.VirtualDiskKind,
+				Name: vd.Name,
+			}))
+			err := f.CreateWithDeferredDeletion(context.Background(), vm)
+			Expect(err).NotTo(HaveOccurred())
+
+			util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, vm)
+		})
+	})
 })

test/e2e/default_config.yaml

@@ -12,7 +12,6 @@ clusterTransport:
 helperImages:
   curlImage: "curlimages/curl"
 testData:
-  complexTest: "/tmp/testdata/complex-test"
   diskResizing: "/tmp/testdata/disk-resizing"
   imageHotplug: "/tmp/testdata/image-hotplug"
   sizingPolicy: "/tmp/testdata/sizing-policy"

test/e2e/internal/config/config.go

@@ -82,7 +82,6 @@ type Config struct {
 }
 
 type TestData struct {
-	ComplexTest       string `yaml:"complexTest"`
 	DiskResizing      string `yaml:"diskResizing"`
 	ImageHotplug      string `yaml:"imageHotplug"`
 	VMMigration       string `yaml:"vmMigration"`