hs-test: refactor test cases from ns suite
This converts more tests to configure VPP from test context.
Type: test
Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
Change-Id: Idf26b0c16f87e87c97b198412af39b99d947ced6
diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go
index cf30ece..c588903 100644
--- a/extras/hs-test/utils.go
+++ b/extras/hs-test/utils.go
@@ -98,7 +98,7 @@
cmd.Process.Kill()
}
-func StartClientApp(env []string, clnCh chan error, clnRes chan string) {
+func StartClientApp(ipAddress string, env []string, clnCh chan error, clnRes chan string) {
defer func() {
clnCh <- nil
}()
@@ -106,7 +106,7 @@
nTries := 0
for {
- cmd := exec.Command("iperf3", "-c", "10.10.10.1", "-u", "-l", "1460", "-b", "10g")
+ cmd := exec.Command("iperf3", "-c", ipAddress, "-u", "-l", "1460", "-b", "10g")
if env != nil {
cmd.Env = env
}
@@ -183,12 +183,15 @@
finished <- errors.New("wget error")
}()
- cmd := NewCommand([]string{"wget", "--no-proxy", "--tries=5", "-q", "-O", "/dev/null", server_ip + ":" + port + "/" + query},
+ cmd := NewCommand([]string{"wget", "--timeout=10", "--no-proxy", "--tries=5", "-O", "/dev/null", server_ip + ":" + port + "/" + query},
netNs)
o, err := cmd.CombinedOutput()
if err != nil {
finished <- fmt.Errorf("wget error: '%v\n\n%s'", err, o)
return
+ } else if strings.Contains(string(o), "200 OK") == false {
+ finished <- fmt.Errorf("wget error: response not 200 OK")
+ return
}
finished <- nil
}