hs-test: support for multiple workers

[vpp.git] / extras / hs-test / utils.go

diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go
index f3b7ffa..4261f4d 100644 (file)
--- a/extras/hs-test/utils.go
+++ b/extras/hs-test/utils.go
@@ -1,57 +1,17 @@
 package main
 
 import (
-       "encoding/json"
        "errors"
        "fmt"
        "io"
-       "io/ioutil"
        "os"
        "os/exec"
        "strings"
        "time"
 )
 
-// TODO remove `configTemplate` once its usage has been replaced everywhere with VppConfig
-const configTemplate = `unix {
-  nodaemon
-  log %[1]s/var/log/vpp/vpp.log
-  full-coredump
-  cli-listen %[1]s/var/run/vpp/cli.sock
-  runtime-dir %[1]s/var/run
-  gid vpp
-}
-
-api-trace {
-  on
-}
-
-api-segment {
-  gid vpp
-}
-
-socksvr {
-  socket-name %[1]s/var/run/vpp/api.sock
-}
-
-statseg {
-  socket-name %[1]s/var/run/vpp/stats.sock
-}
-
-plugins {
-  plugin default { disable }
-
-  plugin unittest_plugin.so { enable }
-  plugin quic_plugin.so { enable }
-  plugin af_packet_plugin.so { enable }
-  plugin hs_apps_plugin.so { enable }
-  plugin http_plugin.so { enable }
-}
-
-`
-
 const vclTemplate = `vcl {
-  app-socket-api %[1]s
+  app-socket-api %[1]s/var/run/app_ns_sockets/%[2]s
   app-scope-global
   app-scope-local
   namespace-id %[2]s
@@ -60,8 +20,8 @@ const vclTemplate = `vcl {
 }
 `
 
-const NetworkTopologyDir string = "topo-network/"
-const ContainerTopologyDir string = "topo-containers/"
+const networkTopologyDir string = "topo-network/"
+const containerTopologyDir string = "topo-containers/"
 
 type Stanza struct {
        content string
@@ -82,7 +42,7 @@ type JsonResult struct {
        StdOutput string
 }
 
-func StartServerApp(running chan error, done chan struct{}, env []string) {
+func startServerApp(running chan error, done chan struct{}, env []string) {
        cmd := exec.Command("iperf3", "-4", "-s")
        if env != nil {
                cmd.Env = env
@@ -98,7 +58,7 @@ func StartServerApp(running chan error, done chan struct{}, env []string) {
        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 +66,7 @@ func StartClientApp(env []string, clnCh chan error, clnRes chan string) {
        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
                }
@@ -126,29 +86,6 @@ func StartClientApp(env []string, clnCh chan error, clnRes chan string) {
        }
 }
 
-func waitForSyncFile(fname string) (*JsonResult, error) {
-       var res JsonResult
-
-       for i := 0; i < 360; i++ {
-               f, err := os.Open(fname)
-               if err == nil {
-                       defer f.Close()
-
-                       data, err := ioutil.ReadFile(fname)
-                       if err != nil {
-                               return nil, fmt.Errorf("read error: %v", err)
-                       }
-                       err = json.Unmarshal(data, &res)
-                       if err != nil {
-                               return nil, fmt.Errorf("json unmarshal error: %v", err)
-                       }
-                       return &res, nil
-               }
-               time.Sleep(1 * time.Second)
-       }
-       return nil, fmt.Errorf("no sync file found")
-}
-
 func assertFileSize(f1, f2 string) error {
        fi1, err := os.Stat(f1)
        if err != nil {
@@ -167,7 +104,7 @@ func assertFileSize(f1, f2 string) error {
 }
 
 func startHttpServer(running chan struct{}, done chan struct{}, addressPort, netNs string) {
-       cmd := NewCommand([]string{"./http_server", addressPort}, netNs)
+       cmd := newCommand([]string{"./http_server", addressPort}, netNs)
        err := cmd.Start()
        if err != nil {
                fmt.Println("Failed to start http server")
@@ -183,39 +120,42 @@ func startWget(finished chan error, server_ip, port, query, netNs string) {
                finished <- errors.New("wget error")
        }()
 
-       cmd := NewCommand([]string{"wget", "--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") {
+               finished <- fmt.Errorf("wget error: response not 200 OK")
+               return
        }
        finished <- nil
 }
 
-func (c *Stanza) NewStanza(name string) *Stanza {
-       c.Append("\n" + name + " {")
+func (c *Stanza) newStanza(name string) *Stanza {
+       c.append("\n" + name + " {")
        c.pad += 2
        return c
 }
 
-func (c *Stanza) Append(name string) *Stanza {
+func (c *Stanza) append(name string) *Stanza {
        c.content += strings.Repeat(" ", c.pad)
        c.content += name + "\n"
        return c
 }
 
-func (c *Stanza) Close() *Stanza {
+func (c *Stanza) close() *Stanza {
        c.content += "}\n"
        c.pad -= 2
        return c
 }
 
-func (s *Stanza) ToString() string {
+func (s *Stanza) toString() string {
        return s.content
 }
 
-func (s *Stanza) SaveToFile(fileName string) error {
+func (s *Stanza) saveToFile(fileName string) error {
        fo, err := os.Create(fileName)
        if err != nil {
                return err