hs-test: use relative paths for docker volumes

[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 8d81cde..b6249cd
--- a/extras/hs-test/ldp_test.go
+++ b/extras/hs-test/ldp_test.go
@@ -3,19 +3,16 @@ package main
 import (
        "fmt"
        "os"
-       "time"
 )
 
 func (s *VethsSuite) TestLDPreloadIperfVpp() {
        var clnVclConf, srvVclConf Stanza
 
        serverContainer := s.getContainerByName("server-vpp")
-       serverVolume := serverContainer.getVolumeByHostDir("/tmp/server")
-       srvVcl := serverVolume.containerDir + "/vcl_srv.conf"
+       serverVclFileName := serverContainer.getHostWorkDir() + "/vcl_srv.conf"
 
        clientContainer := s.getContainerByName("client-vpp")
-       clientVolume := clientContainer.getVolumeByHostDir("/tmp/client")
-       clnVcl := clientVolume.containerDir + "/vcl_cln.conf"
+       clientVclFileName := clientContainer.getHostWorkDir() + "/vcl_cln.conf"
 
        ldpreload := os.Getenv("HST_LDPRELOAD")
        s.assertNotEqual("", ldpreload)
@@ -28,60 +25,46 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
 
        s.log("starting VPPs")
 
-       originalWorkDir := serverContainer.workDir
-       serverContainer.workDir = serverVolume.containerDir
-       _, err := serverContainer.execAction("Configure2Veths srv")
+       clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/default",
+               clientContainer.getHostWorkDir())
+       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)
-       serverContainer.workDir = originalWorkDir
 
-       originalWorkDir = clientContainer.workDir
-       clientContainer.workDir = clientVolume.containerDir
-       _, err = clientContainer.execAction("Configure2Veths cln")
-       s.assertNil(err)
-       clientContainer.workDir = originalWorkDir
-
-       clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/2",
-               clientVolume.containerDir)
-       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(clnVcl)
-       s.assertNil(err)
-
-       serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/1",
-               serverVolume.containerDir)
+       serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/default",
+               serverContainer.getHostWorkDir())
        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(serverAppSocketApi).Close().
-               SaveToFile(srvVcl)
+               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")
 
-       // FIXME
-       time.Sleep(5 * time.Second)
-
-       srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+srvVcl)
-       go StartServerApp(srvCh, stopServerCh, srvEnv)
+       srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+serverVclFileName)
+       go s.startServerApp(srvCh, stopServerCh, srvEnv)
 
        err = <-srvCh
        s.assertNil(err)
 
        s.log("attaching client to vpp")
        var clnRes = make(chan string, 1)
-       clnEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+clnVcl)
-       go StartClientApp(clnEnv, clnCh, clnRes)
-       s.log(<- clnRes)
+       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