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("use-mq-eventfd").
append(clientAppSocketApi).close().
saveToFile(clientVclFileName)
- s.assertNil(err)
+ s.assertNil(err, err)
- serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/1",
- serverContainer.getContainerWorkDir())
+ 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("use-mq-eventfd").
append(serverAppSocketApi).close().
saveToFile(serverVclFileName)
- s.assertNil(err)
+ 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{}{}