Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/e2e/default_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ testData:
sizingPolicy: "/tmp/testdata/sizing-policy"
vmConfiguration: "/tmp/testdata/vm-configuration"
vmMigration: "/tmp/testdata/vm-migration"
vmMigrationCancel: "/tmp/testdata/vm-migration-cancel"
vmEvacuation: "/tmp/testdata/vm-evacuation"
vdSnapshots: "/tmp/testdata/vd-snapshots"
sshKey: "/tmp/testdata/sshkeys/id_ed"
Expand Down
15 changes: 7 additions & 8 deletions test/e2e/internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,13 @@ type Config struct {
}

type TestData struct {
DiskResizing string `yaml:"diskResizing"`
ImageHotplug string `yaml:"imageHotplug"`
VMMigration string `yaml:"vmMigration"`
VMMigrationCancel string `yaml:"vmMigrationCancel"`
VMEvacuation string `yaml:"vmEvacuation"`
VdSnapshots string `yaml:"vdSnapshots"`
Sshkey string `yaml:"sshKey"`
SSHUser string `yaml:"sshUser"`
DiskResizing string `yaml:"diskResizing"`
ImageHotplug string `yaml:"imageHotplug"`
VMMigration string `yaml:"vmMigration"`
VMEvacuation string `yaml:"vmEvacuation"`
VdSnapshots string `yaml:"vdSnapshots"`
Sshkey string `yaml:"sshKey"`
SSHUser string `yaml:"sshUser"`
}

type StorageClass struct {
Expand Down
18 changes: 18 additions & 0 deletions test/e2e/internal/util/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
virtv1 "kubevirt.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -333,6 +334,23 @@ func getActivePodName(vm *v1alpha2.VirtualMachine) (string, error) {
return "", fmt.Errorf("no active pod found for virtual machine %s", vm.Name)
}

func GetKVVMI(ctx context.Context, f *framework.Framework, name, namespace string) (*virtv1.VirtualMachineInstance, error) {
unstructuredKVVMI, err := f.DynamicClient().Resource(rewrite.VirtualMachineInstance{}.GVR()).
Namespace(namespace).
Get(ctx, name, metav1.GetOptions{})
if err != nil {
return nil, err
}

var kvvmi virtv1.VirtualMachineInstance
err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredKVVMI.Object, &kvvmi)
if err != nil {
return nil, err
}

return &kvvmi, nil
}

func UntilVirtualMachineRebooted(key client.ObjectKey, previousRunningTime time.Time, timeout time.Duration) {
GinkgoHelper()

Expand Down
14 changes: 0 additions & 14 deletions test/e2e/legacy/testdata/vm-migration-cancel/kustomization.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions test/e2e/legacy/testdata/vm-migration-cancel/ns.yaml

This file was deleted.

52 changes: 0 additions & 52 deletions test/e2e/legacy/testdata/vm-migration-cancel/transformer.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions test/e2e/legacy/testdata/vm-migration-cancel/vm/base/vm.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading