6 files changed, 95 insertions, 13 deletions
diff --git a/extras/hs-test/topo-containers/2containers.yaml b/extras/hs-test/topo-containers/2containers.yaml
new file mode 100644
index 00000000000..1217c27d3ed
--- /dev/null
+++ b/extras/hs-test/topo-containers/2containers.yaml
@@ -0,0 +1,4 @@
+---
+containers:
+  - name: "server"
+  - name: "client"
+\ No newline at end of file
diff --git a/extras/hs-test/topo-containers/2peerVethLdp.yaml b/extras/hs-test/topo-containers/2peerVethLdp.yaml
new file mode 100644
index 00000000000..bd6e63a945d
--- /dev/null
+++ b/extras/hs-test/topo-containers/2peerVethLdp.yaml
@@ -0,0 +1,18 @@
+---
+volumes:
+  - volume: &server-vol
+      host-dir: "$HST_VOLUME_DIR/server-share"
+      container-dir: "/tmp/server-share"
+      is-default-work-dir: true
+  - volume: &client-vol
+      host-dir: "$HST_VOLUME_DIR/client-share"
+      container-dir: "/tmp/client-share"
+      is-default-work-dir: true
+
+containers:
+  - name: "server-vpp"
+    volumes:
+      - <<: *server-vol
+  - name: "client-vpp"
+    volumes:
+      - <<: *client-vol
diff --git a/extras/hs-test/topo-containers/ns.yaml b/extras/hs-test/topo-containers/envoyProxy.yaml
index 2298ad232c2..cbb00d868db 100644
--- a/extras/hs-test/topo-containers/ns.yaml
+++ b/extras/hs-test/topo-containers/envoyProxy.yaml
@@ -3,14 +3,13 @@ volumes:
   - volume: &shared-vol
       host-dir: "$HST_VOLUME_DIR/shared-vol"
 
-# $HST_DIR will be replaced during runtime by path to hs-test directory
 containers:
   - name: "vpp"
     volumes:
       - <<: *shared-vol
         container-dir: "/tmp/vpp"
         is-default-work-dir: true
-  - name: "envoy"
+  - name: "envoy-vcl"
     volumes:
       - <<: *shared-vol
         container-dir: "/tmp/vpp-envoy"
@@ -21,7 +20,20 @@ containers:
       - name: "ENVOY_UID"
         value: "0"
       - name: "VCL_CONFIG"
-        value: "/tmp/vcl.conf"
-    image: "envoyproxy/envoy-contrib:v1.21-latest"
-    extra-args: "--concurrency 2 -c /etc/envoy/envoy.yaml"
+        value: /tmp/vcl.conf
+    image: "hs-test/envoy"
     is-optional: true
+  - name: "nginx-server"
+    volumes:
+      - <<: *shared-vol
+        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/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/singleCpuPinning.yaml b/extras/hs-test/topo-containers/singleCpuPinning.yaml
new file mode 100644
index 00000000000..6e673aa85bf
--- /dev/null
+++ b/extras/hs-test/topo-containers/singleCpuPinning.yaml
@@ -0,0 +1,11 @@
+---
+volumes:
+  - volume: &shared-vol
+      host-dir: "$HST_VOLUME_DIR/shared-vol"
+
+containers:
+  - name: "vpp"
+    volumes:
+      - <<: *shared-vol
+        container-dir: "/tmp/vpp"
+        is-default-work-dir: true
diff --git a/extras/hs-test/topo-containers/nginxProxyAndServer.yaml b/extras/hs-test/topo-containers/vppProxy.yaml
index cc6b780bafc..a1f24bbc187 100644
--- a/extras/hs-test/topo-containers/nginxProxyAndServer.yaml
+++ b/extras/hs-test/topo-containers/vppProxy.yaml
@@ -1,20 +1,25 @@
 ---
 volumes:
-  - volume: &shared-vol-proxy
-      host-dir: "$HST_VOLUME_DIR/shared-vol-proxy"
+  - volume: &shared-vol
+      host-dir: "$HST_VOLUME_DIR/shared-vol"
 
 containers:
   - name: "vpp-proxy"
     volumes:
-      - <<: *shared-vol-proxy
+      - <<: *shared-vol
         container-dir: "/tmp/vpp"
         is-default-work-dir: true
-  - name: "nginx-proxy"
+  - name: "nginx-server"
     volumes:
-      - <<: *shared-vol-proxy
+      - <<: *shared-vol
         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"
+    is-optional: true
+  - name: "curl"
+    vars:
+      - name: LD_LIBRARY_PATH
+        value: "/usr/local/lib"
+    image: "hs-test/curl"
+    is-optional: true
+    run-detached: false