hs-test: add more asserts

[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 cd67efb..4fc0626 100644 (file)
--- a/extras/hs-test/suite_nginx_test.go
+++ b/extras/hs-test/suite_nginx_test.go
@@ -14,37 +14,49 @@ type NginxSuite struct {
 }
 
 func (s *NginxSuite) SetupSuite() {
+       s.HstSuite.SetupSuite()
        s.loadNetworkTopology("2taps")
-
        s.loadContainerTopology("nginxProxyAndServer")
 }
 
 func (s *NginxSuite) SetupTest() {
-       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.start()
+       proxyVpp, _ := vppProxyContainer.newVppInstance(cpus, sessionConfig)
+       s.assertNil(proxyVpp.start())
 
        clientInterface := s.netInterfaces[mirroringClientInterfaceName]
-       proxyVpp.createTap(clientInterface, 1)
+       s.assertNil(proxyVpp.createTap(clientInterface, 1))
 
        serverInterface := s.netInterfaces[mirroringServerInterfaceName]
-       proxyVpp.createTap(serverInterface, 2)
+       s.assertNil(proxyVpp.createTap(serverInterface, 2))
 
        nginxContainer := s.getTransientContainerByName(nginxProxyContainerName)
        nginxContainer.create()
-       nginxContainer.copy("./resources/nginx/nginx_proxy_mirroring.conf", "/nginx.conf")
-       nginxContainer.start()
 
-       proxyVpp.waitForApp("-app", 5)
+       values := struct {
+               Proxy  string
+               Server string
+       }{
+               Proxy:  clientInterface.peer.ip4AddressString(),
+               Server: serverInterface.ip4AddressString(),
+       }
+       nginxContainer.createConfig(
+               "/nginx.conf",
+               "./resources/nginx/nginx_proxy_mirroring.conf",
+               values,
+       )
+       s.assertNil(nginxContainer.start())
+
+       proxyVpp.waitForApp("nginx-", 5)
 }