From 31285a54d3d37336517c167c84597d451b9c6ecf Mon Sep 17 00:00:00 2001
From: pmikus <peter.mikus@protonmail.ch>
Date: Tue, 30 May 2023 13:46:24 +0000
Subject: [PATCH] fix(tests): Hoststack compatibility

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I198fe62ddba8910c6bd8256739cc2503b87dfc75
---
 .../roles/docker_images/files/base/Dockerfile          |  2 +-
 .../docker_images/templates/docker-compose-sut.yaml.j2 | 18 ++++++++++++++++++
 .../docker_images/templates/docker-compose-tg.yaml.j2  | 18 ++++++++++++++++++
 resources/libraries/robot/hoststack/hoststack.robot    |  2 ++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index 18cf8b3a3a..cdb23e9d44 100644
--- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
@@ -30,7 +30,6 @@ RUN apt-get -q update \
         ethtool \
         gdb \
         gfortran \
-        iperf3 \
         libapr1 \
         libblas-dev \
         libffi-dev \
@@ -61,6 +60,7 @@ RUN apt-get -q update \
         screen \
         socat \
         software-properties-common \
+        strace \
         strongswan \
         ssh \
         sshpass \
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
index be0ffcd9f4..d24ea0236e 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
@@ -28,6 +28,15 @@ services:
       - type: "bind"
         source: "/opt/boot/"
         target: "/opt/boot/"
+      - type: "bind"
+        source: "/usr/bin/iperf3"
+        target: "/usr/bin/iperf3"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
       - type: "bind"
         source: "/var/run/docker.sock"
         target: "/var/run/docker.sock"
@@ -62,6 +71,15 @@ services:
       - type: "bind"
         source: "/opt/boot/"
         target: "/opt/boot/"
+      - type: "bind"
+        source: "/usr/bin/iperf3"
+        target: "/usr/bin/iperf3"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
       - type: "bind"
         source: "/var/run/docker.sock"
         target: "/var/run/docker.sock"
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
index 6dcbc9f871..20ac905c5a 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
@@ -28,6 +28,15 @@ services:
       - type: "bind"
         source: "/opt/"
         target: "/opt/"
+      - type: "bind"
+        source: "/usr/bin/iperf3"
+        target: "/usr/bin/iperf3"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
       - type: "bind"
         source: "/usr/lib/firmware/"
         target: "/usr/lib/firmware/"
@@ -59,6 +68,15 @@ services:
       - type: "bind"
         source: "/opt/"
         target: "/opt/"
+      - type: "bind"
+        source: "/usr/bin/iperf3"
+        target: "/usr/bin/iperf3"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
+      - type: "bind"
+        source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
+        target: "/usr/lib/x86_64-linux-gnu/libiperf.so.0.0.0"
       - type: "bind"
         source: "/usr/lib/firmware/"
         target: "/usr/lib/firmware/"
diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot
index 9dd3987048..9c6e07ef73 100644
--- a/resources/libraries/robot/hoststack/hoststack.robot
+++ b/resources/libraries/robot/hoststack/hoststack.robot
@@ -473,6 +473,8 @@
 | | | ... | ${vpp_hoststack_attr}[sess_lendpt_mem]
 | | END
 | | Apply startup configuration on all VPP DUTs
+| | Initialize layer driver | ${nic_driver}
+| | Initialize layer interface
 
 | Get Test Results From Hoststack VPP Echo Test
 | | [Documentation]
-- 
2.16.6