hs-test: support for multiple workers

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

diff --git a/extras/hs-test/suite_nginx_test.go b/extras/hs-test/suite_nginx_test.go
index d950cf8..c250ed7 100644 (file)
--- a/extras/hs-test/suite_nginx_test.go
+++ b/extras/hs-test/suite_nginx_test.go
@@ -14,27 +14,25 @@ type NginxSuite struct {
 }
 
 func (s *NginxSuite) SetupSuite() {
+       s.HstSuite.SetupSuite()
        s.loadNetworkTopology("2taps")
-
        s.loadContainerTopology("nginxProxyAndServer")
 }
 
 func (s *NginxSuite) SetupTest() {
-       s.skipIfUnconfiguring()
-
-       s.SetupVolumes()
-       s.SetupContainers()
+       s.HstSuite.SetupTest()
 
        // Setup test conditions
-       var startupConfig Stanza
-       startupConfig.
-               NewStanza("session").
-               Append("enable").
-               Append("use-app-socket-api").Close()
+       var sessionConfig Stanza
+       sessionConfig.
+               newStanza("session").
+               append("enable").
+               append("use-app-socket-api").close()
 
+       cpus := s.AllocateCpus()
        // ... for proxy
        vppProxyContainer := s.getContainerByName(vppProxyContainerName)
-       proxyVpp, _ := vppProxyContainer.newVppInstance(startupConfig)
+       proxyVpp, _ := vppProxyContainer.newVppInstance(cpus, sessionConfig)
        proxyVpp.start()
 
        clientInterface := s.netInterfaces[mirroringClientInterfaceName]
@@ -45,8 +43,20 @@ func (s *NginxSuite) SetupTest() {
 
        nginxContainer := s.getTransientContainerByName(nginxProxyContainerName)
        nginxContainer.create()
-       nginxContainer.copy("./resources/nginx/nginx_proxy_mirroring.conf", "/nginx.conf")
+
+       values := struct {
+               Proxy  string
+               Server string
+       }{
+               Proxy:  clientInterface.peer.ip4AddressString(),
+               Server: serverInterface.ip4AddressString(),
+       }
+       nginxContainer.createConfig(
+               "/nginx.conf",
+               "./resources/nginx/nginx_proxy_mirroring.conf",
+               values,
+       )
        nginxContainer.start()
 
-       proxyVpp.waitForApp("-app", 5)
+       proxyVpp.waitForApp("nginx-", 5)
 }