hs-test: add tls proxy test

[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 f121866..7b7321e 100644 (file)
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -7,7 +7,7 @@ import (
        "github.com/edwarnicke/exechelper"
 )
 
-func testProxyHttpTcp(s *NsSuite) error {
+func testProxyHttpTcp(s *NsSuite, proto string) error {
        const outputFile = "test.data"
        const srcFile = "10M"
        stopServer := make(chan struct{}, 1)
@@ -20,7 +20,7 @@ func testProxyHttpTcp(s *NsSuite) error {
 
        s.log("test file created...")
 
-       go startHttpServer(serverRunning, stopServer, ":666", "server")
+       go s.startHttpServer(serverRunning, stopServer, ":666", "server")
        // TODO better error handling and recovery
        <-serverRunning
 
@@ -32,12 +32,11 @@ func testProxyHttpTcp(s *NsSuite) error {
 
        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,
-       )
+               " --retry-on-http-error=503 --tries=10 -O %s ", outputFile)
+       if proto == "tls" {
+               c += " --secure-protocol=TLSv1_3 --no-check-certificate https://"
+       }
+       c += fmt.Sprintf("%s:555/%s", clientVeth.ip4AddressString(), srcFile)
        s.log(c)
        _, err = exechelper.CombinedOutput(c)
        s.assertNil(err, "failed to run wget")
@@ -49,35 +48,54 @@ func testProxyHttpTcp(s *NsSuite) error {
        return nil
 }
 
-func configureVppProxy(s *NsSuite) error {
+func configureVppProxy(s *NsSuite, proto string) {
        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(),
+               "test proxy server server-uri %s://%s/555 client-uri tcp://%s/666",
+               proto,
+               clientVeth.ip4AddressString(),
+               serverVeth.peer.ip4AddressString(),
        )
        s.log("proxy configured...", output)
-       return nil
 }
 
 func (s *NsSuite) TestVppProxyHttpTcp() {
-       err := configureVppProxy(s)
+       proto := "tcp"
+       configureVppProxy(s, proto)
+       err := testProxyHttpTcp(s, proto)
        s.assertNil(err)
-       err = testProxyHttpTcp(s)
+}
+
+func (s *NsSuite) TestVppProxyHttpTls() {
+       proto := "tls"
+       configureVppProxy(s, proto)
+       err := testProxyHttpTcp(s, proto)
        s.assertNil(err)
 }
 
-func configureEnvoyProxy(s *NsSuite) error {
+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, "tcp")
        s.assertNil(err)
 }