hs-test: remove unnecessary app ns configs

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

diff --git a/extras/hs-test/ldp_test.go b/extras/hs-test/ldp_test.go
old mode 100755 (executable)
new mode 100644 (file)
index 0783b18..90a6182
--- a/extras/hs-test/ldp_test.go
+++ b/extras/hs-test/ldp_test.go
@@ -3,27 +3,19 @@ package main
 import (
        "fmt"
        "os"
-       "time"
-
-       "github.com/edwarnicke/exechelper"
 )
 
-func (s *Veths2Suite) TestLDPreloadIperfVpp() {
-       t := s.T()
+func (s *VethsSuite) TestLDPreloadIperfVpp() {
        var clnVclConf, srvVclConf Stanza
 
-       srvInstance := "vpp-ldp-srv"
-       clnInstance := "vpp-ldp-cln"
-       srvPath := "/tmp/" + srvInstance
-       clnPath := "/tmp/" + clnInstance
-       srvVcl := srvPath + "/vcl_srv.conf"
-       clnVcl := clnPath + "/vcl_cln.conf"
+       serverContainer := s.getContainerByName("server-vpp")
+       serverVclFileName := serverContainer.getHostWorkDir() + "/vcl_srv.conf"
 
-       exechelper.Run("mkdir " + srvPath)
-       exechelper.Run("mkdir " + clnPath)
+       clientContainer := s.getContainerByName("client-vpp")
+       clientVclFileName := clientContainer.getHostWorkDir() + "/vcl_cln.conf"
 
        ldpreload := os.Getenv("HST_LDPRELOAD")
-       s.Assert().NotEqual("", ldpreload)
+       s.assertNotEqual("", ldpreload)
 
        ldpreload = "LD_PRELOAD=" + ldpreload
 
@@ -31,83 +23,52 @@ func (s *Veths2Suite) TestLDPreloadIperfVpp() {
        srvCh := make(chan error, 1)
        clnCh := make(chan error)
 
-       fmt.Println("starting VPPs")
-
-       err := dockerRun(srvInstance, fmt.Sprintf("-v /tmp/%s:/tmp", srvInstance))
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-       defer func() { exechelper.Run("docker stop " + srvInstance) }()
-
-       err = dockerRun(clnInstance, fmt.Sprintf("-v /tmp/%s:/tmp", clnInstance))
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-       defer func() { exechelper.Run("docker stop " + clnInstance) }()
-
-       _, err = hstExec("2veths srv", srvInstance)
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-
-       _, err = hstExec("2veths cln", clnInstance)
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-
-       err = clnVclConf.
-               NewStanza("vcl").
-               Append("rx-fifo-size 4000000").
-               Append("tx-fifo-size 4000000").
-               Append("app-scope-local").
-               Append("app-scope-global").
-               Append("use-mq-eventfd").
-               Append(fmt.Sprintf("app-socket-api /tmp/%s/2veths/var/run/app_ns_sockets/2", clnInstance)).Close().
-               SaveToFile(clnVcl)
-       if err != nil {
-               t.Errorf("%v", err)
-               t.FailNow()
-       }
-
+       s.log("starting VPPs")
+
+       clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/default",
+               clientContainer.getContainerWorkDir())
+       err := clnVclConf.
+               newStanza("vcl").
+               append("rx-fifo-size 4000000").
+               append("tx-fifo-size 4000000").
+               append("app-scope-local").
+               append("app-scope-global").
+               append("use-mq-eventfd").
+               append(clientAppSocketApi).close().
+               saveToFile(clientVclFileName)
+       s.assertNil(err)
+
+       serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/default",
+               serverContainer.getContainerWorkDir())
        err = srvVclConf.
-               NewStanza("vcl").
-               Append("rx-fifo-size 4000000").
-               Append("tx-fifo-size 4000000").
-               Append("app-scope-local").
-               Append("app-scope-global").
-               Append("use-mq-eventfd").
-               Append(fmt.Sprintf("app-socket-api /tmp/%s/2veths/var/run/app_ns_sockets/1", srvInstance)).Close().
-               SaveToFile(srvVcl)
-       if err != nil {
-               t.Errorf("%v", err)
-               t.FailNow()
-       }
-       fmt.Printf("attaching server to vpp")
-
-       // FIXME
-       time.Sleep(5 * time.Second)
-
-       srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+srvVcl)
-       go StartServerApp(srvCh, stopServerCh, srvEnv)
+               newStanza("vcl").
+               append("rx-fifo-size 4000000").
+               append("tx-fifo-size 4000000").
+               append("app-scope-local").
+               append("app-scope-global").
+               append("use-mq-eventfd").
+               append(serverAppSocketApi).close().
+               saveToFile(serverVclFileName)
+       s.assertNil(err)
+
+       s.log("attaching server to vpp")
+
+       srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+serverVclFileName)
+       go s.startServerApp(srvCh, stopServerCh, srvEnv)
 
        err = <-srvCh
-       if err != nil {
-               s.FailNow("vcl server", "%v", err)
-       }
+       s.assertNil(err)
 
-       fmt.Println("attaching client to vpp")
-       clnEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+clnVcl)
-       go StartClientApp(clnEnv, clnCh)
+       s.log("attaching client to vpp")
+       var clnRes = make(chan string, 1)
+       clnEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+clientVclFileName)
+       serverVethAddress := s.netInterfaces[serverInterfaceName].ip4AddressString()
+       go s.startClientApp(serverVethAddress, clnEnv, clnCh, clnRes)
+       s.log(<-clnRes)
 
        // wait for client's result
        err = <-clnCh
-       if err != nil {
-               s.Failf("client", "%v", err)
-       }
+       s.assertNil(err)
 
        // stop server
        stopServerCh <- struct{}{}