From 4599f7aeaf202011b95731bd532de4e683f968dd Mon Sep 17 00:00:00 2001
From: Lior Avramov <73036155+liorghub@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:47:39 +0200
Subject: [PATCH] [Nvidia] Update syncd docker to use python version 3 (#17735)

* Remove python2 from compilation of python-sdk-api

* Upgrade Python version in syncd RPC docker image to Python3
---
 .../docker-syncd-mlnx-rpc/Dockerfile.j2       | 48 +++++++++----------
 .../docker-syncd-mlnx-rpc/ptf_nn_agent.conf   |  2 +-
 .../mellanox/docker-syncd-mlnx/Dockerfile.j2  |  2 +-
 .../mellanox/sdk-src/python-sdk-api/Makefile  |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
index d10d560110c6..511e360cb5a5 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -1,5 +1,5 @@
 ##
-## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
+## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
 ## Apache-2.0
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,23 +25,27 @@ RUN mkdir -p /var/run/sx_sdk
 RUN apt-get purge -y syncd
 
 ## Pre-install the fundamental packages
-RUN apt-get update \
- && apt-get -y install  \
-    net-tools           \
-    python-setuptools   \
-    build-essential     \
-    libssl-dev          \
-    libffi-dev          \
-    python-dev          \
-    wget                \
-    cmake               \
-    libqt5core5a        \
-    libqt5network5      \
-    libboost-atomic1.74.0
+RUN apt-get update        \
+ && apt-get -y install    \
+    net-tools             \
+    build-essential       \
+    libssl-dev            \
+    libffi-dev            \
+    wget                  \
+    cmake                 \
+    libqt5core5a          \
+    libqt5network5        \
+    libboost-atomic1.74.0 \
+    python3-pip           \
+    python3-dev           \
+    python-is-python3     \
+    python3-setuptools
+
+RUN pip3 install --upgrade pip
 
 # Build and install python-scapy
-RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_all.deb --output python-scapy_2.4.0-2_all.deb \
- && dpkg -i python-scapy_2.4.0-2_all.deb \
+RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python3-scapy_2.4.0-2_all.deb --output python3-scapy_2.4.0-2_all.deb \
+ && dpkg -i python3-scapy_2.4.0-2_all.deb \
  && apt install -f
 
 {% if docker_syncd_mlnx_rpc_debs.strip() -%}
@@ -64,10 +68,6 @@ RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_
 {{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
 {% endif %}
 
-# Install pip2 since it is no longer in the APT upstream
-RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
- && python2 get-pip.py
-
 RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
@@ -78,10 +78,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip2 install cffi==1.7.0    \
- && pip2 install --upgrade cffi==1.7.0 \
- && pip2 install wheel  \
- && pip2 install nnpy    \
+ && pip3 install cffi==1.16.0    \
+ && pip3 install wheel  \
+ && pip3 install nnpy   \
+ && pip3 install ptf    \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf b/platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
index 80812464a19e..1b91d3efbeba 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
@@ -1,5 +1,5 @@
 [program:ptf_nn_agent]
-command=/usr/bin/python2 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400
+command=/usr/bin/python3 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400
 process_name=ptf_nn_agent
 stdout_logfile=/tmp/ptf_nn_agent.out.log
 stderr_logfile=/tmp/ptf_nn_agent.err.log
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index 3d68ba4bc9f7..dbd51e2782ea 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -1,5 +1,5 @@
 ##
-## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
+## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
 ## Apache-2.0
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/platform/mellanox/sdk-src/python-sdk-api/Makefile b/platform/mellanox/sdk-src/python-sdk-api/Makefile
index 5ac3e8504968..2d27e367e825 100644
--- a/platform/mellanox/sdk-src/python-sdk-api/Makefile
+++ b/platform/mellanox/sdk-src/python-sdk-api/Makefile
@@ -18,7 +18,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 		./autogen.sh
 	fi
 
-	debuild -e PYTHON_INTERPRETERS="\"python2 python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	debuild -e PYTHON_INTERPRETERS="\"python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 
 	popd