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, 32 insertions, 20 deletions

diff --git a/extras/hs-test/topo-containers/nginxProxy.yaml b/extras/hs-test/topo-containers/nginxProxy.yaml
new file mode 100644
index 00000000000..d9ddc14590f
--- /dev/null
+++ b/extras/hs-test/topo-containers/nginxProxy.yaml
@@ -0,0 +1,32 @@
+---
+volumes:
+  - volume: &shared-vol-nginx-proxy
+      host-dir: "$HST_VOLUME_DIR/shared-vol-nginx-proxy"
+
+containers:
+  - name: "vpp"
+    volumes:
+      - <<: *shared-vol-nginx-proxy
+        container-dir: "/tmp/vpp"
+        is-default-work-dir: true
+  - name: "nginx-proxy"
+    volumes:
+      - <<: *shared-vol-nginx-proxy
+        container-dir: "/tmp/nginx"
+        is-default-work-dir: true
+    image: "hs-test/nginx-ldp"
+    is-optional: true
+  - name: "nginx-server"
+    volumes:
+      - <<: *shared-vol-nginx-proxy
+        container-dir: "/tmp/nginx"
+        is-default-work-dir: true
+    image: "hs-test/nginx-server"
+    is-optional: true
+  - name: "curl"
+    vars:
+      - name: LD_LIBRARY_PATH
+        value: "/usr/local/lib"
+    image: "hs-test/curl"
+    is-optional: true
+    run-detached: false
diff --git a/extras/hs-test/topo-containers/nginxProxyAndServer.yaml b/extras/hs-test/topo-containers/nginxProxyAndServer.yaml
deleted file mode 100644
index cc6b780bafc..00000000000
--- a/extras/hs-test/topo-containers/nginxProxyAndServer.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-volumes:
-  - volume: &shared-vol-proxy
-      host-dir: "$HST_VOLUME_DIR/shared-vol-proxy"
-
-containers:
-  - name: "vpp-proxy"
-    volumes:
-      - <<: *shared-vol-proxy
-        container-dir: "/tmp/vpp"
-        is-default-work-dir: true
-  - name: "nginx-proxy"
-    volumes:
-      - <<: *shared-vol-proxy
-        container-dir: "/tmp/nginx"
-        is-default-work-dir: true
-    image: "hs-test/nginx-ldp"
-    is-optional: true
-  - name: "nginx-server"
-    image: "hs-test/nginx-server"