[SAI-PTF][202012]Fix sai ptf 202012 (#12724)

* fix sai-ptf docker build error

Signed-off-by: richardyu-ms <[email protected]>

* correct the docker image version

Signed-off-by: richardyu-ms <[email protected]>

* update thrift package

Signed-off-by: richardyu-ms <[email protected]>

* fix version upgrade issue in 202012

Signed-off-by: richardyu-ms <[email protected]>

* remove useless file

Signed-off-by: richardyu-ms <[email protected]>

Signed-off-by: richardyu-ms <[email protected]>

Author: richardyu-ms

dockers/docker-ptf-sai/Dockerfile.j2

@@ -16,7 +16,6 @@ RUN pip3 install crc16          \
         getmac                  \
         packet_helper           \
         psutil                  \
-        scapy==2.4.4            \
         scapy_helper            \
         pysubnettree
 
@@ -34,7 +33,7 @@ debs/{{ deb }}{{' '}}
 # Remove old ptf package
 RUN dpkg -r python-ptf
 
-# Install new ptf package
-RUN git clone https://github.com/p4lang/ptf.git \
-        && cd ptf                               \
-        && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
+# Install new ptf package not supprt in 202012 branch
+# RUN git clone https://github.com/p4lang/ptf.git \
+#         && cd ptf                               \
+#         && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt

platform/vs/docker-ptf-sai.mk

@@ -3,7 +3,7 @@
 DOCKER_PTF_SAI = docker-ptf-sai.gz
 DOCKER_PTF_BASE = docker-ptf.gz
 $(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai
-$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
+$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_13_0) $(PYTHON3_THRIFT_0_13_0)
 $(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI)
-SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI)
+SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_SAI)