simplify e2e

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>

test/e2e/kubevirt/e2e_test.go

@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"os/exec"
+	"strings"
 	"testing"
 	"time"
 
@@ -183,19 +184,11 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 		framework.ExpectHaveKeyWithValue(pod.Annotations, util.VMAnnotation, vmName)
 		ips := pod.Status.PodIPs
 
-		ginkgo.By("Checking old lsp ExternalIDs contains should contains default subnet " + util.DefaultSubnet)
-		portName := ovs.PodNameToPortName(vmName, namespaceName, util.OvnProvider)
-		conditions := fmt.Sprintf("name=%s", portName)
-		execCmd := "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids find logical-switch-port " + conditions
-		framework.Logf("exec cmd %s", execCmd)
-		output, err := exec.Command("bash", "-c", execCmd).CombinedOutput()
-		framework.ExpectNoError(err)
-		framework.ExpectContainSubstring(string(output), util.DefaultSubnet)
-
 		ginkgo.By("Stopping vm " + vmName)
 		vmClient.StopSync(vmName)
 
 		// the ip is deleted
+		portName := ovs.PodNameToPortName(vmName, namespaceName, util.OvnProvider)
 		err = ipClient.WaitToDisappear(portName, 2*time.Second, 2*time.Minute)
 		framework.ExpectNoError(err)
 
@@ -218,13 +211,12 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 		ginkgo.By("Checking whether pod ips are changed")
 		framework.ExpectNotEqual(ips, pod.Status.PodIPs)
 
-		ginkgo.By("Checking new lsp ExternalIDs should contains new subnet " + subnetName)
-		conditions = fmt.Sprintf("name=%s", portName)
-		execCmd = "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids find logical-switch-port " + conditions
-		framework.Logf("exec cmd %s", execCmd)
-		output, err = exec.Command("bash", "-c", execCmd).CombinedOutput()
+		ginkgo.By("Checking external-ids of LSP " + portName)
+		cmd := "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids list logical-switch-port " + portName
+		framework.Logf("exec cmd %q", cmd)
+		output, err := exec.Command("bash", "-c", cmd).CombinedOutput()
 		framework.ExpectNoError(err)
-		framework.ExpectContainSubstring(string(output), subnetName)
+		framework.ExpectContainElement(strings.Fields(string(output)), "ls="+subnetName)
 	})
 
 	framework.ConformanceIt("should be able to handle vm restart when subnet changes after the vm is stopped", func() {
@@ -243,15 +235,6 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 		framework.ExpectHaveKeyWithValue(pod.Annotations, util.VMAnnotation, vmName)
 		ips := pod.Status.PodIPs
 
-		ginkgo.By("Checking old lsp ExternalIDs contains should contains default subnet " + util.DefaultSubnet)
-		portName := ovs.PodNameToPortName(vmName, namespaceName, util.OvnProvider)
-		conditions := fmt.Sprintf("name=%s", portName)
-		execCmd := "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids find logical-switch-port " + conditions
-		framework.Logf("exec cmd %s", execCmd)
-		output, err := exec.Command("bash", "-c", execCmd).CombinedOutput()
-		framework.ExpectNoError(err)
-		framework.ExpectContainSubstring(string(output), util.DefaultSubnet)
-
 		ginkgo.By("Stopping vm " + vmName)
 		vmClient.StopSync(vmName)
 
@@ -279,13 +262,13 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 		ginkgo.By("Checking whether pod ips are changed")
 		framework.ExpectNotEqual(ips, pod.Status.PodIPs)
 
-		ginkgo.By("Checking new lsp ExternalIDs should contains new subnet " + subnetName)
-		conditions = fmt.Sprintf("name=%s", portName)
-		execCmd = "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids find logical-switch-port " + conditions
-		framework.Logf("exec cmd %s", execCmd)
-		output, err = exec.Command("bash", "-c", execCmd).CombinedOutput()
+		portName := ovs.PodNameToPortName(vmName, namespaceName, util.OvnProvider)
+		ginkgo.By("Checking external-ids of LSP " + portName)
+		cmd := "kubectl ko nbctl --format=list --data=bare --no-heading --columns=external_ids list logical-switch-port " + portName
+		framework.Logf("exec cmd %q", cmd)
+		output, err := exec.Command("bash", "-c", cmd).CombinedOutput()
 		framework.ExpectNoError(err)
-		framework.ExpectContainSubstring(string(output), subnetName)
+		framework.ExpectContainElement(strings.Fields(string(output)), "ls="+subnetName)
 	})
 
 	framework.ConformanceIt("restart vm should be able to change vm subnet after deleting the old ip", func() {