hs-test: nginx proxy/mirroring test cleanup

- test moved to proxy_test.go
- topology and suite updated to be vpp/envoy proxy compliant

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

2 files changed, 10 insertions, 8 deletions

diff --git a/extras/hs-test/resources/nginx/nginx_proxy_mirroring.conf b/extras/hs-test/resources/nginx/nginx_proxy_mirroring.conf
index 56debf5c290..7f6b09c6050 100644
--- a/extras/hs-test/resources/nginx/nginx_proxy_mirroring.conf
+++ b/extras/hs-test/resources/nginx/nginx_proxy_mirroring.conf
@@ -3,7 +3,7 @@ worker_processes 4;
 worker_rlimit_nofile 102400;
 daemon off;
 
-error_log /tmp/nginx/error.log;
+error_log /tmp/nginx/{{.LogPrefix}}-error.log info;
 
 events {
   use epoll;
@@ -44,7 +44,8 @@ http {
   }
 
   server {
-    listen 80;
+    access_log /tmp/nginx/{{.LogPrefix}}-access.log;
+    listen {{.Port}};
     server_name {{.Proxy}};
 
     server_tokens off;
diff --git a/extras/hs-test/resources/nginx/nginx_server_mirroring.conf b/extras/hs-test/resources/nginx/nginx_server_mirroring.conf
index 4056801ea13..921eb2eefd5 100644
--- a/extras/hs-test/resources/nginx/nginx_server_mirroring.conf
+++ b/extras/hs-test/resources/nginx/nginx_server_mirroring.conf
@@ -3,6 +3,8 @@ worker_rlimit_nofile 10240;
 worker_processes 2;
 daemon off;
 
+error_log /tmp/nginx/{{.LogPrefix}}-error.log info;
+
 events {
   use epoll;
   worker_connections  10240;
@@ -15,18 +17,17 @@ http {
   keepalive_requests 1000000;
   sendfile on;
   server {
+    access_log /tmp/nginx/{{.LogPrefix}}-access.log;
     listen 8091;
     listen 8092;
     listen 8093;
     root /usr/share/nginx;
     index index.html index.htm;
-    location /return_ok
-    {
-      return 200 '';
-    }
-    location /64B.json
-    {
+    location /64B {
       return 200 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
     }
+    location / {
+      sendfile on;
+    }
   }
 }