Test support for Mellanox interfaces

Author: ramperher

grout-container-app/cnfapp/Dockerfile

@@ -1,7 +1,7 @@
 ## Image to build webserver
-FROM docker.io/library/golang:1.23 as build
+FROM registry.access.redhat.com/ubi9/go-toolset:1.23 as build
 
-WORKDIR /utils
+WORKDIR /opt/app-root/src
 COPY utils/webserver.go .
 RUN go mod init webserver.go
 RUN GOOS=linux CGO_ENABLED=0 go build -a -o webserver .
@@ -53,7 +53,7 @@ RUN chmod 750 /var/log/grout
 RUN chown example-cnf /var/log/grout
 
 # Copy scripts
-COPY --chmod=550 --from=build /utils/webserver /usr/local/bin/webserver
+COPY --chmod=550 --from=build /opt/app-root/src/webserver /usr/local/bin/webserver
 COPY --chmod=550 scripts/grout-wrapper /usr/local/bin/example-cnf/grout-wrapper
 COPY --chmod=550 scripts/retrieve-grout-ip-addresses /usr/local/bin/example-cnf/retrieve-grout-ip-addresses
 

testpmd-container-app/cnfapp/Dockerfile

@@ -2,9 +2,9 @@
 FROM quay.io/rh-nfv-int/dpdk:v0.0.1 as build
 
 ## Image to build webserver
-FROM docker.io/library/golang:1.23 as build2
+FROM registry.access.redhat.com/ubi9/go-toolset:1.23 as build2
 
-WORKDIR /utils
+WORKDIR /opt/app-root/src
 COPY utils/webserver.go .
 RUN go mod init webserver.go
 RUN GOOS=linux CGO_ENABLED=0 go build -a -o webserver .
@@ -43,7 +43,7 @@ RUN chmod 750 /var/log/testpmd
 RUN chown example-cnf /var/log/testpmd
 
 # Copy scripts
-COPY --chmod=550 --from=build2 /utils/webserver /usr/local/bin/webserver
+COPY --chmod=550 --from=build2 /opt/app-root/src/webserver /usr/local/bin/webserver
 COPY --chmod=550 --from=build /usr/local/bin/dpdk-testpmd /usr/local/bin/example-cnf/testpmd
 COPY --chmod=550 scripts/testpmd-wrapper /usr/local/bin/example-cnf/testpmd-wrapper
 

testpmd-container-app/cnfapp/scripts/testpmd-wrapper

@@ -45,13 +45,17 @@ if [ -f /sys/fs/cgroup/cpuset/cpuset.cpus ]; then
 elif [ -f /sys/fs/cgroup/cpuset.cpus ]; then
     # Applied to latest OCP 4.16 nightlies starting from 4.16.0 ec.5
     LCORES=$(cat /sys/fs/cgroup/cpuset.cpus)
+elif [ -f /proc/1/status ]; then
+    # Applied when using a privileged pod, since /sys/fs/cgroup directory is overriden with host configuration
+    # Extract the list of CPUs from /proc/1/status file
+    LCORES=$(cat /proc/1/status | grep Cpus_allowed_list |  awk '{print $2}')
 else
-    echo "Could not find file to extract cores, existing.."
+    echo "Could not find file to extract cores, exiting..."
     exit 1
 fi
 
 if [ -z $LCORES ]; then
-    echo "Could not find cores, existing.."
+    echo "Could not find cores, exiting..."
     exit 1
 fi
 

trex-container-app/app/Dockerfile

@@ -1,6 +1,6 @@
-FROM docker.io/library/golang:1.23 as build
+FROM registry.access.redhat.com/ubi9/go-toolset:1.23 as build
 
-WORKDIR /utils
+WORKDIR /opt/app-root/src
 COPY utils/webserver.go .
 RUN go mod init webserver.go
 RUN GOOS=linux CGO_ENABLED=0 go build -a -o webserver .
@@ -45,7 +45,7 @@ RUN chown example-cnf:example-cnf /var/log/trex
 
 # Copy scripts
 COPY --chmod=550 scripts /usr/local/bin/
-COPY --chmod=550 --from=build /utils/webserver /usr/local/bin/webserver
+COPY --chmod=550 --from=build /opt/app-root/src/webserver /usr/local/bin/webserver
 COPY --chmod=550 pyfiles /opt/pyfiles/
 
 # Move to the custom user

trex-container-app/server/Dockerfile

@@ -1,12 +1,12 @@
-FROM docker.io/library/golang:1.23 as build
+FROM registry.access.redhat.com/ubi9/go-toolset:1.23 as build
 
-WORKDIR /utils
+WORKDIR /opt/app-root/src
 COPY utils/webserver.go .
 RUN go mod init webserver.go
 RUN GOOS=linux CGO_ENABLED=0 go build -a -o webserver .
 
 ## trex image
-FROM quay.io/rh-nfv-int/ubi8-base-trex:v0.0.1
+FROM quay.io/rh-nfv-int/ubi8-base-trex:v0.0.2
 
 LABEL name="NFV Example TRexServer Application" \
       maintainer="telcoci" \
@@ -44,11 +44,13 @@ RUN dnf install -y \
     zlib-devel \
     binutils \
     vim \
+    hostname \
     && dnf clean all
 
+# Install TRex
 RUN mkdir -p /opt/trex && cd /opt/trex && git clone --branch ${TREX_VER} ${TREX_REPO}
 RUN cd /opt/trex/trex-core/linux_dpdk && \
-    ./b configure --no-mlx --no-bxnt --new-memory && \
+    ./b configure --no-bnxt --new-memory && \
     ./b build
 
 RUN cd /opt && git clone ${TRAFFICGEN_REPO} && mv bench-trafficgen/trafficgen . && rm -rf bench-trafficgen
@@ -79,7 +81,8 @@ RUN chmod 664 /usr/local/bin/example-cnf/trex_cfg.yaml
 
 # Copy scripts
 COPY --chmod=550 scripts /usr/local/bin
-COPY --chmod=550 --from=build /utils/webserver /usr/local/bin/webserver
+COPY --chmod=550 --from=build /opt/app-root/src/webserver /usr/local/bin/webserver
 
 # Move to the custom user
 USER example-cnf
+

utils/support-images/ubi8-base-trex/Dockerfile

@@ -8,4 +8,21 @@ RUN dnf install -y \
     perf \
     tcpdump \
     sudo \
+    bison \
+    wget \
     && dnf clean all
+
+# Install doca-ofed for Mellanox support
+# Check https://trex-tgn.cisco.com/trex/doc/trex_appendix_mellanox.html
+# Installation steps: https://docs.nvidia.com/doca/sdk/doca-host+installation+and+upgrade/index.html
+# (Check "Installing Software on Host" section)
+ENV DOCA_OFED_MAJOR_VERSION 2.10.0
+ENV DOCA_OFED_RPM doca-host-${DOCA_OFED_MAJOR_VERSION}-093000_25.01_rhel82.x86_64.rpm
+RUN cd /opt && \
+    wget https://www.mellanox.com/downloads/DOCA/DOCA_v${DOCA_OFED_MAJOR_VERSION}/host/${DOCA_OFED_RPM} && \
+    rpm -i ${DOCA_OFED_RPM} && \
+    dnf clean all
+
+RUN dnf install -y \
+    doca-ofed \
+    mlnx-fw-updater