diff options
Diffstat (limited to 'extras/hs-test/proxy_test.go')
| -rw-r--r-- | extras/hs-test/proxy_test.go | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go index f592426cf47..4c183517c37 100644 --- a/extras/hs-test/proxy_test.go +++ b/extras/hs-test/proxy_test.go @@ -18,7 +18,7 @@ func testProxyHttpTcp(s *NsSuite) error { 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 @@ -30,7 +30,15 @@ func testProxyHttpTcp(s *NsSuite) error { 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{}{} @@ -42,16 +50,17 @@ func testProxyHttpTcp(s *NsSuite) error { } 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 + serverVeth := s.netInterfaces[serverInterface].(*NetworkInterfaceVeth) + 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.PeerIp4AddressString(), + ) + s.log("proxy configured...", output) + return nil } func (s *NsSuite) TestVppProxyHttpTcp() { @@ -62,12 +71,6 @@ func (s *NsSuite) TestVppProxyHttpTcp() { } 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") - envoyContainer := s.getContainerByName("envoy") return envoyContainer.run() } |