Skip to content

test: do not skip the vmop restore test if sdn is disabled #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eofff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test: do not skip the vmop restore test if sdn is disabled #1837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions test/e2e/vmop/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ var _ = Describe("VirtualMachineOperationRestore", label.Slow(), func() {
DeferCleanup(f.After)
f.Before()

if !util.IsSdnModuleEnabled(f) {
Skip("SDN module is not enabled")
if util.IsSdnModuleEnabled(f) {
Expect(util.IsClusterNetworkExists(f)).To(BeTrue(), fmt.Sprintf("The cluster network does not exist. Please apply the cluster network first using the command: %s", util.ClusterNetworkCreateCommand))
}

Expect(util.IsClusterNetworkExists(f)).To(BeTrue(), fmt.Sprintf("The cluster network does not exist. Please apply the cluster network first using the command: %s", util.ClusterNetworkCreateCommand))

t := newRestoreTest(f)
if !t.IsStorageClassAvailableForTest(t.VM) {
Skip("Storage class is not available for test")
Skip("Snapshots are not working on SDS-replicated volumes with replicas. Remove this skip once snapshot support is fixed.")
}

By("Environment preparation", func() {
Expand Down Expand Up @@ -115,7 +115,9 @@ var _ = Describe("VirtualMachineOperationRestore", label.Slow(), func() {
util.UnmountBlockDevice(f, t.VM, mountPoint)
t.BlockDeviceHash = util.GetBlockDeviceHash(f, t.VM, v1alpha2.DiskDevice, t.VDBlankWithNoFstabEntry.Name)

t.CheckAdditionalNetworkInterface(t.VM, additionalNetworkIP)
if util.IsSdnModuleEnabled(t.Framework) {
t.CheckAdditionalNetworkInterface(t.VM, additionalNetworkIP)
}

err = f.CreateWithDeferredDeletion(context.Background(), t.VMSnapshot)
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -356,15 +358,20 @@ runcmd:
vmbuilder.WithRestartApprovalMode(restartApprovalMode),
vmbuilder.WithRunPolicy(runPolicy),
vmbuilder.WithProvisioningUserData(cloudInit),
vmbuilder.WithNetwork(v1alpha2.NetworksSpec{
Type: v1alpha2.NetworksTypeMain,
}),
vmbuilder.WithNetwork(v1alpha2.NetworksSpec{
Type: v1alpha2.NetworksTypeClusterNetwork,
Name: util.ClusterNetworkName,
}),
)

if util.IsSdnModuleEnabled(t.Framework) {
t.VM.Spec.Networks = []v1alpha2.NetworksSpec{
{
Type: v1alpha2.NetworksTypeMain,
},
{
Type: v1alpha2.NetworksTypeClusterNetwork,
Name: util.ClusterNetworkName,
},
}
}

t.VMBDA = vmbdabuilder.New(
vmbdabuilder.WithName("vmbda"),
vmbdabuilder.WithNamespace(t.VDBlank.Namespace),
Expand Down Expand Up @@ -496,7 +503,9 @@ func (t *restoreModeTest) CheckVMAfterRestore(
Fail("Invalid restore mode")
}

t.CheckAdditionalNetworkInterface(vm, additionalNetworkIP)
if util.IsSdnModuleEnabled(t.Framework) {
t.CheckAdditionalNetworkInterface(vm, additionalNetworkIP)
}
}

func (t *restoreModeTest) CheckResourceReadyForRestore(vmopRestore *v1alpha2.VirtualMachineOperation, kind, name string) {
Expand Down
Loading