hs-test: small improvements

[vpp.git] / extras / hs-test / proxy_test.go

diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index 797de52..70fb526 100755 (executable)
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -1,48 +1,24 @@
 package main
 
 import (
-       "context"
        "fmt"
        "os"
-       "testing"
 
        "github.com/edwarnicke/exechelper"
 )
 
-func testProxyHttpTcp(t *testing.T, dockerInstance string, proxySetup func() error) error {
+func testProxyHttpTcp(s *NsSuite) error {
        const outputFile = "test.data"
        const srcFile = "10M"
        stopServer := make(chan struct{}, 1)
        serverRunning := make(chan struct{}, 1)
 
-       volumeArgs := fmt.Sprintf("-v shared-vol:/tmp/%s", dockerInstance)
-       err := dockerRun(dockerInstance, volumeArgs)
-       if err != nil {
-               return fmt.Errorf("failed to start container: %v", err)
-       }
-       defer func() { exechelper.Run("docker stop " + dockerInstance) }()
-
-       // start & configure vpp in the container
-       _, err = hstExec(dockerInstance, dockerInstance)
-       if err != nil {
-               return fmt.Errorf("error starting vpp in container: %v", err)
-       }
-
-       fmt.Println("VPP running and configured...")
-
-       if err := proxySetup(); err != nil {
-               return fmt.Errorf("failed to setup proxy: %v", err)
-       }
-       fmt.Println("Proxy configured...")
-
        // create test file
-       err = exechelper.Run(fmt.Sprintf("ip netns exec server truncate -s %s %s", srcFile, srcFile))
-       if err != nil {
-               return fmt.Errorf("failed to run truncate command")
-       }
+       err := exechelper.Run(fmt.Sprintf("ip netns exec server truncate -s %s %s", srcFile, srcFile))
+       s.assertNil(err, "failed to run truncate command")
        defer func() { os.Remove(srcFile) }()
 
-       fmt.Println("Test file created...")
+       s.log("Test file created...")
 
        go startHttpServer(serverRunning, stopServer, ":666", "server")
        // TODO better error handling and recovery
@@ -52,47 +28,53 @@ func testProxyHttpTcp(t *testing.T, dockerInstance string, proxySetup func() err
                stopServer <- struct{}{}
        }(stopServer)
 
-       fmt.Println("http server started...")
+       s.log("http server started...")
 
        c := fmt.Sprintf("ip netns exec client wget --retry-connrefused --retry-on-http-error=503 --tries=10 -O %s 10.0.0.2:555/%s", outputFile, srcFile)
        _, err = exechelper.CombinedOutput(c)
-       if err != nil {
-               return fmt.Errorf("failed to run wget: %v", err)
-       }
+       s.assertNil(err, "failed to run wget")
        stopServer <- struct{}{}
 
        defer func() { os.Remove(outputFile) }()
 
-       if err = assertFileSize(outputFile, srcFile); err != nil {
-               return err
-       }
+       s.assertNil(assertFileSize(outputFile, srcFile))
        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 (s *NsSuite) TestVppProxyHttpTcp() {
-       t := s.T()
-       dockerInstance := "vpp-proxy"
-       err := testProxyHttpTcp(t, dockerInstance, configureVppProxy)
-       if err != nil {
-               t.Errorf("%v", err)
-       }
+       err := configureVppProxy(s)
+       s.assertNil(err)
+       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")
+
+       envoyContainer := s.getContainerByName("envoy")
+       return envoyContainer.run()
 }
 
 func (s *NsSuite) TestEnvoyProxyHttpTcp() {
-       t := s.T()
-       exechelper.Run("docker volume create --name=shared-vol")
-       defer func() {
-               exechelper.Run("docker stop envoy")
-       }()
-
-       ctx, cancel := context.WithCancel(context.Background())
-
-       dockerInstance := "vpp-envoy"
-       err := testProxyHttpTcp(t, dockerInstance, func() error {
-               return setupEnvoy(t, ctx, dockerInstance)
-       })
-       if err != nil {
-               t.Errorf("%v", err)
-       }
-       cancel()
+       err := configureEnvoyProxy(s)
+       s.assertNil(err)
+       err = testProxyHttpTcp(s)
+       s.assertNil(err)
 }