Skip to content

Commit

Permalink
add wait until (#2569)
Browse files Browse the repository at this point in the history
  • Loading branch information
changluyi committed Mar 30, 2023
1 parent c0e843f commit 1d1f5fa
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions test/e2e/kube-ovn/underlay/underlay.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package underlay

import (
"fmt"
"k8s.io/apimachinery/pkg/util/wait"
"net"
"os/exec"
"strconv"
Expand Down Expand Up @@ -713,15 +714,17 @@ func checkReachable(podName, podNamespace, sourceIP, targetIP, targetPort string

func checkPolicy(hitPolicyStr string, expectPolicyExist bool) {
policyExist := false
output, _ := exec.Command("bash", "-c", "kubectl ko nbctl lr-policy-list ovn-cluster").CombinedOutput()
outputStr := string(output)
lines := strings.Split(outputStr, "\n")
for _, line := range lines {
if strings.Contains(strings.Join(strings.Fields(line), " "), hitPolicyStr) {
policyExist = true
break
_ = wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) {
output, _ := exec.Command("bash", "-c", "kubectl ko nbctl lr-policy-list ovn-cluster").CombinedOutput()
outputStr := string(output)
lines := strings.Split(outputStr, "\n")
for _, line := range lines {
if strings.Contains(strings.Join(strings.Fields(line), " "), hitPolicyStr) {
policyExist = true
return true, nil
}
}

}
return false, nil
})
framework.ExpectEqual(policyExist, expectPolicyExist)
}

0 comments on commit 1d1f5fa

Please sign in to comment.