Merge pull request kubevirt#7418 from EdDev/tests-cleanup

tests: Various helpers cleanups
awanio · Mar 27, 2022 · 1c0f95d · 1c0f95d
2 parents f3c5050 + 566c44a
commit 1c0f95d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 39 deletions.
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
@@ -8,7 +8,6 @@ go_library(
         "job.go",
         "migration.go",
         "pod_servers.go",
-        "test.go",
         "utils.go",
         "vmi_servers.go",
     ],

diff --git a/tests/network/vmi_istio.go b/tests/network/vmi_istio.go
@@ -66,6 +66,8 @@ const (
 	// Istio uses certain ports for it's own purposes, this port server to verify that traffic is not routed
 	// into the VMI for these ports. https://istio.io/latest/docs/ops/deployment/requirements/
 	istioRestrictedPort = istio.EnvoyTunnelPort
+
+	istioInjectNamespaceLabel = "istio-injection"
 )
 
 const (
@@ -133,9 +135,9 @@ var _ = SIGDescribe("[Serial] Istio", func() {
 		})
 		JustBeforeEach(func() {
 			// Enable sidecar injection by setting the namespace label
-			Expect(libnet.AddLabelToNamespace(virtClient, util.NamespaceTestDefault, tests.IstioInjectNamespaceLabel, "enabled")).ShouldNot(HaveOccurred())
+			Expect(libnet.AddLabelToNamespace(virtClient, util.NamespaceTestDefault, istioInjectNamespaceLabel, "enabled")).ShouldNot(HaveOccurred())
 			defer func() {
-				Expect(libnet.RemoveLabelFromNamespace(virtClient, util.NamespaceTestDefault, tests.IstioInjectNamespaceLabel)).ShouldNot(HaveOccurred())
+				Expect(libnet.RemoveLabelFromNamespace(virtClient, util.NamespaceTestDefault, istioInjectNamespaceLabel)).ShouldNot(HaveOccurred())
 			}()
 
 			By("Creating VMI")

diff --git a/tests/network/vmi_lifecycle.go b/tests/network/vmi_lifecycle.go
@@ -22,6 +22,7 @@ package network
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	expect "github.com/google/goexpect"
 
@@ -72,7 +73,7 @@ var _ = SIGDescribe("[crit:high][arm64][vendor:[email protected]][level:componen
 				// Start a VirtualMachineInstance with bridged networking
 				nodeName := tests.WaitForSuccessfulVMIStart(bridgeVMI).Status.NodeName
 
-				tests.VerifyDummyNicForBridgeNetwork(bridgeVMI)
+				verifyDummyNicForBridgeNetwork(bridgeVMI)
 
 				By("restarting kubelet")
 				pod := renderPkillAllPod("kubelet")
@@ -108,7 +109,7 @@ var _ = SIGDescribe("[crit:high][arm64][vendor:[email protected]][level:componen
 				// Start a VirtualMachineInstance with bridged networking
 				By("Waiting the VirtualMachineInstance start")
 				bridgeVMI = tests.WaitUntilVMIReady(bridgeVMI, console.LoginToCirros)
-				tests.VerifyDummyNicForBridgeNetwork(bridgeVMI)
+				verifyDummyNicForBridgeNetwork(bridgeVMI)
 
 				vmIP := libnet.GetVmiPrimaryIpByFamily(bridgeVMI, k8sv1.IPv4Protocol)
 				dadCommand := fmt.Sprintf("sudo /usr/sbin/arping -D -I eth0 -c 2 %s | grep Received | cut -d ' ' -f 2\n", vmIP)
@@ -128,3 +129,11 @@ var _ = SIGDescribe("[crit:high][arm64][vendor:[email protected]][level:componen
 func renderPkillAllPod(processName string) *k8sv1.Pod {
 	return tests.RenderPrivilegedPod("vmi-killer", []string{"pkill"}, []string{"-9", processName})
 }
+
+func verifyDummyNicForBridgeNetwork(vmi *v1.VirtualMachineInstance) {
+	output := tests.RunCommandOnVmiPod(vmi, []string{tests.BinBash, "-c", "/usr/sbin/ip link show|grep DOWN|grep -c eth0"})
+	ExpectWithOffset(1, strings.TrimSpace(output)).To(Equal("1"))
+
+	output = tests.RunCommandOnVmiPod(vmi, []string{tests.BinBash, "-c", "/usr/sbin/ip link show|grep UP|grep -c eth0-nic"})
+	ExpectWithOffset(1, strings.TrimSpace(output)).To(Equal("1"))
+}
diff --git a/tests/test.go b/tests/test.go
diff --git a/tests/utils.go b/tests/utils.go
@@ -217,10 +217,6 @@ const (
 	SecretLabel = "kubevirt.io/secret"
 )
 
-const (
-	IstioInjectNamespaceLabel = "istio-injection"
-)
-
 const (
 	tmpPath = "/var/provision/kubevirt.io/tests"
 )
@@ -1609,16 +1605,6 @@ func DeletePV(os string) {
 	}
 }
 
-func VerifyDummyNicForBridgeNetwork(vmi *v1.VirtualMachineInstance) {
-	output := RunCommandOnVmiPod(vmi, []string{BinBash, "-c", "/usr/sbin/ip link show|grep DOWN|grep -c eth0"})
-	ExpectWithOffset(1, strings.TrimSpace(output)).To(Equal("1"))
-
-	output = RunCommandOnVmiPod(vmi, []string{BinBash, "-c", "/usr/sbin/ip link show|grep UP|grep -c eth0-nic"})
-	ExpectWithOffset(1, strings.TrimSpace(output)).To(Equal("1"))
-
-	return
-}
-
 func RunVMI(vmi *v1.VirtualMachineInstance, timeout int) *v1.VirtualMachineInstance {
 	By(StartingVMInstance)
 	virtCli, err := kubecli.GetKubevirtClient()