test(vm): check TCP connection during VM migration (#1436)

Signed-off-by: Roman Sysoev <[email protected]>
(cherry picked from commit 6557959)

Author: hardcoretime

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

@@ -42,15 +42,11 @@ func WithDatasource(datasource *v1alpha2.VirtualDiskDataSource) func(vd *v1alpha
 	}
 }
 
-func WithDataSourceHTTP(url string, checksum *v1alpha2.Checksum, caBundle []byte) Option {
+func WithDataSourceHTTP(dataSourceHTTP *v1alpha2.DataSourceHTTP) Option {
 	return func(vd *v1alpha2.VirtualDisk) {
 		vd.Spec.DataSource = &v1alpha2.VirtualDiskDataSource{
 			Type: v1alpha2.DataSourceTypeHTTP,
-			HTTP: &v1alpha2.DataSourceHTTP{
-				URL:      url,
-				Checksum: checksum,
-				CABundle: caBundle,
-			},
+			HTTP: dataSourceHTTP,
 		}
 	}
 }

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

@@ -35,6 +35,12 @@ var (
 	WithAnnotations  = meta.WithAnnotations[*v1alpha2.VirtualMachine]
 )
 
+func WithBootloader(bootloader v1alpha2.BootloaderType) Option {
+	return func(vm *v1alpha2.VirtualMachine) {
+		vm.Spec.Bootloader = bootloader
+	}
+}
+
 func WithCPU(cores int, coreFraction *string) Option {
 	return func(vm *v1alpha2.VirtualMachine) {
 		vm.Spec.CPU.Cores = cores

tests/e2e/framework/framework.go

@@ -81,7 +81,7 @@ func (f *Framework) Before() {
 	if !f.skipNsCreation {
 		ns, err := f.CreateNamespace(f.namespacePrefix, nil)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		ginkgo.By(fmt.Sprintf("Created namespace %s", ns.Name))
+		ginkgo.By(fmt.Sprintf("Create namespace %s", ns.Name))
 		f.namespace = ns
 		f.DeferNamespaceDelete(ns.Name)
 	}

tests/e2e/object/vd.go

@@ -67,10 +67,8 @@ func NewGeneratedHTTPVDUbuntu(prefix, namespace string) *v1alpha2.VirtualDisk {
 	return vd.New(
 		vd.WithGenerateName(prefix),
 		vd.WithNamespace(namespace),
-		vd.WithDataSourceHTTP(
-			UbuntuHTTP,
-			nil,
-			nil,
-		),
+		vd.WithDataSourceHTTP(&v1alpha2.DataSourceHTTP{
+			URL: UbuntuHTTP,
+		}),
 	)
 }

tests/e2e/util_test.go

@@ -830,7 +830,7 @@ type Watcher interface {
 }
 
 type Resource interface {
-	*v1alpha2.VirtualMachineIPAddress | *v1alpha2.VirtualMachineIPAddressLease
+	*v1alpha2.VirtualMachineIPAddress | *v1alpha2.VirtualMachineIPAddressLease | *v1alpha2.VirtualMachine | *v1alpha2.VirtualDisk
 }
 
 type EventHandler[R Resource] func(eventType watch.EventType, r R) (bool, error)