s.assertNil(err, "failed to run truncate command")
defer func() { os.Remove(srcFile) }()
- s.log("Test file created...")
+ s.log("test file created...")
go startHttpServer(serverRunning, stopServer, ":666", "server")
// TODO better error handling and recovery
s.log("http server started...")
- c := fmt.Sprintf("ip netns exec client wget --no-proxy --retry-connrefused --retry-on-http-error=503 --tries=10 -O %s 10.0.0.2:555/%s", outputFile, srcFile)
+ clientVeth := s.netInterfaces[clientInterface]
+ c := fmt.Sprintf("ip netns exec client wget --no-proxy --retry-connrefused"+
+ " --retry-on-http-error=503 --tries=10"+
+ " -O %s %s:555/%s",
+ outputFile,
+ clientVeth.IP4AddressString(),
+ srcFile,
+ )
+ s.log(c)
_, err = exechelper.CombinedOutput(c)
s.assertNil(err, "failed to run wget")
stopServer <- struct{}{}
return nil
}
-func configureVppProxy(s *NsSuite) error {
- container := s.getContainerByName("vpp")
- testVppProxy := NewVppInstance(container)
- testVppProxy.setVppProxy()
- err := testVppProxy.start()
- s.assertNil(err, "failed to start and configure VPP")
- s.log("VPP running and configured...")
-
- output, err := testVppProxy.vppctl("test proxy server server-uri tcp://10.0.0.2/555 client-uri tcp://10.0.1.1/666")
- s.log("Proxy configured...", string(output))
- return err
+func configureVppProxy(s *NsSuite) {
+ serverVeth := s.netInterfaces[serverInterface]
+ clientVeth := s.netInterfaces[clientInterface]
+
+ testVppProxy := s.getContainerByName("vpp").vppInstance
+ output := testVppProxy.vppctl(
+ "test proxy server server-uri tcp://%s/555 client-uri tcp://%s/666",
+ clientVeth.IP4AddressString(),
+ serverVeth.Peer().IP4AddressString(),
+ )
+ s.log("proxy configured...", output)
}
func (s *NsSuite) TestVppProxyHttpTcp() {
- err := configureVppProxy(s)
- s.assertNil(err)
- err = testProxyHttpTcp(s)
+ configureVppProxy(s)
+ err := testProxyHttpTcp(s)
s.assertNil(err)
}
-func configureEnvoyProxy(s *NsSuite) error {
- vppContainer := s.getContainerByName("vpp")
- testVppForEnvoyProxy := NewVppInstance(vppContainer)
- testVppForEnvoyProxy.setEnvoyProxy()
- err := testVppForEnvoyProxy.start()
- s.assertNil(err, "failed to start and configure VPP")
-
+func configureEnvoyProxy(s *NsSuite) {
envoyContainer := s.getContainerByName("envoy")
- return envoyContainer.run()
+ envoyContainer.create()
+
+ serverVeth := s.netInterfaces[serverInterface]
+ address := struct {
+ Server string
+ }{
+ Server: serverVeth.Peer().IP4AddressString(),
+ }
+ envoyContainer.createConfig(
+ "/etc/envoy/envoy.yaml",
+ "resources/envoy/proxy.yaml",
+ address,
+ )
+ s.assertNil(envoyContainer.start())
}
func (s *NsSuite) TestEnvoyProxyHttpTcp() {
- err := configureEnvoyProxy(s)
- s.assertNil(err)
- err = testProxyHttpTcp(s)
+ configureEnvoyProxy(s)
+ err := testProxyHttpTcp(s)
s.assertNil(err)
}