http: fix http server in response

App name is used in HTTP response Server header.

Type: fix

Change-Id: Ie3b2d985dd7d554a0352f7e602891f878bebd031
Signed-off-by: Matus Fabian <matfabia@cisco.com>

3 files changed, 18 insertions, 3 deletions

diff --git a/extras/hs-test/hst_suite.go b/extras/hs-test/hst_suite.go
index 4c6d5b2664b..bb499246bf9 100644
--- a/extras/hs-test/hst_suite.go
+++ b/extras/hs-test/hst_suite.go
@@ -149,7 +149,7 @@ func (s *HstSuite) hstFail() {
 		out, err := container.log(20)
 		if err != nil {
 			fmt.Printf("An error occured while obtaining '%s' container logs: %s\n", container.name, fmt.Sprint(err))
-			break
+			continue
 		}
 		fmt.Printf("\nvvvvvvvvvvvvvvv " +
 			container.name + ":\n" +
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index acd026d484f..fe12f5a2f65 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -13,7 +13,7 @@ func init() {
 	registerNsTests(HttpTpsTest)
 	registerVethTests(HttpCliTest)
 	registerNoTopoTests(NginxHttp3Test, NginxAsServerTest,
-		NginxPerfCpsTest, NginxPerfRpsTest, NginxPerfWrkTest)
+		NginxPerfCpsTest, NginxPerfRpsTest, NginxPerfWrkTest, HeaderServerTest)
 	registerNoTopoSoloTests(HttpStaticPromTest)
 }
 
@@ -91,6 +91,21 @@ func HttpStaticPromTest(s *NoTopoSuite) {
 	s.assertNil(err)
 }
 
+func HeaderServerTest(s *NoTopoSuite) {
+	query := "show/version"
+	vpp := s.getContainerByName("vpp").vppInstance
+	serverAddress := s.getInterfaceByName(tapInterfaceName).peer.ip4AddressString()
+	vpp.vppctl("http cli server")
+
+	curlCont := s.getContainerByName("curl")
+	args := fmt.Sprintf("curl -i -s http://%s:80/%s", serverAddress, query)
+	curlCont.extraRunningArgs = args
+	o, err := curlCont.combinedOutput()
+	s.assertNil(err, fmt.Sprint(err))
+	s.log(o)
+	s.assertContains(o, "Server: http_cli_server")
+}
+
 func NginxAsServerTest(s *NoTopoSuite) {
 	query := "return_ok"
 	finished := make(chan error, 1)
diff --git a/extras/hs-test/script/build_hst.sh b/extras/hs-test/script/build_hst.sh
index cc2d00b6cbd..33a8393b8b5 100755
--- a/extras/hs-test/script/build_hst.sh
+++ b/extras/hs-test/script/build_hst.sh
@@ -67,9 +67,9 @@ docker_build hs-test/vpp vpp
 docker_build hs-test/nginx-ldp nginx
 docker_build hs-test/nginx-server nginx-server
 docker_build hs-test/build build
+docker_build hs-test/curl curl
 if [ "$HST_EXTENDED_TESTS" = true ] ; then
     docker_build hs-test/nginx-http3 nginx-http3
-    docker_build hs-test/curl curl
 fi
 
 # cleanup detached images