X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fldp_test.go;h=c2d6f33b7147af4387442f2881b62df6164be353;hb=refs%2Fchanges%2F44%2F39344%2F4;hp=683c6a3752574ce411b0b573505b924c28829d81;hpb=98a91e82608e6e30d4516b52556cdaaa9837ee24;p=vpp.git

diff --git a/extras/hs-test/ldp_test.go b/extras/hs-test/ldp_test.go
old mode 100755
new mode 100644
index 683c6a37525..c2d6f33b714
--- a/extras/hs-test/ldp_test.go
+++ b/extras/hs-test/ldp_test.go
@@ -3,23 +3,16 @@ package main
 import (
 	"fmt"
 	"os"
-	"time"
-
-	"github.com/edwarnicke/exechelper"
 )
 
 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.assertNotEqual("", ldpreload)
@@ -30,56 +23,48 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
 	srvCh := make(chan error, 1)
 	clnCh := make(chan error)
 
-	fmt.Println("starting VPPs")
-
-	s.assertNil(dockerRun(srvInstance, fmt.Sprintf("-v /tmp/%s:/tmp", srvInstance)), "failed to start docker (srv)")
-	defer func() { exechelper.Run("docker stop " + srvInstance) }()
-
-	s.assertNil(dockerRun(clnInstance, fmt.Sprintf("-v /tmp/%s:/tmp", clnInstance)), "failed to start docker (cln)")
-	defer func() { exechelper.Run("docker stop " + clnInstance) }()
-
-	_, err := hstExec("Configure2Veths srv", srvInstance)
-	s.assertNil(err)
-
-	_, err = hstExec("Configure2Veths cln", clnInstance)
-	s.assertNil(err)
-
-	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/Configure2Veths/var/run/app_ns_sockets/2", clnInstance)).Close().
-		SaveToFile(clnVcl)
+	s.log("starting VPPs")
+
+	clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/2",
+		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/1",
+		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/Configure2Veths/var/run/app_ns_sockets/1", srvInstance)).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)
 
-	fmt.Printf("attaching server to vpp")
-
-	// FIXME
-	time.Sleep(5 * time.Second)
+	s.log("attaching server to vpp")
 
-	srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+srvVcl)
-	go StartServerApp(srvCh, stopServerCh, srvEnv)
+	srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+serverVclFileName)
+	go startServerApp(srvCh, stopServerCh, srvEnv)
 
 	err = <-srvCh
 	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 startClientApp(serverVethAddress, clnEnv, clnCh, clnRes)
+	s.log(<-clnRes)
 
 	// wait for client's result
 	err = <-clnCh