X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fldp_test.go;h=8d9168d3d5d9e8026839ac1824182ee8cea715a0;hb=a4df00f65107d3b34c579c603fb0019d1514d839;hp=59d31e13890d33c6524b2ab4f5c42554646ce803;hpb=7550dd268f80334cbb9127feefe35319b9c7e572;p=vpp.git

diff --git a/extras/hs-test/ldp_test.go b/extras/hs-test/ldp_test.go
index 59d31e13890..8d9168d3d5d 100644
--- a/extras/hs-test/ldp_test.go
+++ b/extras/hs-test/ldp_test.go
@@ -9,10 +9,10 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
 	var clnVclConf, srvVclConf Stanza
 
 	serverContainer := s.getContainerByName("server-vpp")
-	serverVclFileName := serverContainer.GetHostWorkDir() + "/vcl_srv.conf"
+	serverVclFileName := serverContainer.getHostWorkDir() + "/vcl_srv.conf"
 
 	clientContainer := s.getContainerByName("client-vpp")
-	clientVclFileName := clientContainer.GetHostWorkDir() + "/vcl_cln.conf"
+	clientVclFileName := clientContainer.getHostWorkDir() + "/vcl_cln.conf"
 
 	ldpreload := os.Getenv("HST_LDPRELOAD")
 	s.assertNotEqual("", ldpreload)
@@ -25,50 +25,50 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
 
 	s.log("starting VPPs")
 
-	clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/2",
-		clientContainer.GetContainerWorkDir())
+	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)
-
-	serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/1",
-		serverContainer.GetContainerWorkDir())
+		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, err)
+
+	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(serverVclFileName)
-	s.assertNil(err)
+		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, err)
 
 	s.log("attaching server to vpp")
 
 	srvEnv := append(os.Environ(), ldpreload, "VCL_CONFIG="+serverVclFileName)
-	go StartServerApp(srvCh, stopServerCh, srvEnv)
+	go s.startServerApp(srvCh, stopServerCh, srvEnv)
 
 	err = <-srvCh
-	s.assertNil(err)
+	s.assertNil(err, err)
 
 	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)
+	serverVethAddress := s.getInterfaceByName(serverInterfaceName).ip4AddressString()
+	go s.startClientApp(serverVethAddress, clnEnv, clnCh, clnRes)
 	s.log(<-clnRes)
 
 	// wait for client's result
 	err = <-clnCh
-	s.assertNil(err)
+	s.assertNil(err, err)
 
 	// stop server
 	stopServerCh <- struct{}{}