Skip to content

Commit d985e28

Browse files
liushilongbuaaliushilongbuaa
committed
Revert "[SAI PTF]Syncd-rpc and PTF docker support sai ptf v2 (sonic-net#11610)"
This reverts commit f0873f2.
1 parent f97cf57 commit d985e28

File tree

10 files changed

+7
-84
lines changed

10 files changed

+7
-84
lines changed

‎.azure-pipelines/azure-pipelines-build.yml

-17
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ jobs:
121121
mv target/docker-sonic-vs.gz target/docker-sonic-vs-asan.gz
122122
fi
123123
make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
124-
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-ptf-sai.gz
125124
if [ $(Build.Reason) != 'PullRequest' ];then
126125
gzip -kd target/sonic-vs.img.gz
127126
SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
@@ -139,25 +138,9 @@ jobs:
139138
make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
140139
fi
141140
if [ $(docker_syncd_rpc_image) == yes ]; then
142-
# workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache
143141
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
144-
pushd ./src/sonic-sairedis/SAI
145-
git stash
146-
popd
147142
if [ $(GROUP_NAME) == broadcom ]; then
148143
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-dnx-rpc.gz
149-
pushd ./src/sonic-sairedis/SAI
150-
git stash
151-
popd
152-
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz
153-
pushd ./src/sonic-sairedis/SAI
154-
git stash
155-
popd
156-
echo BUILD_OPTIONS $BUILD_OPTIONS
157-
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-syncd-brcm-rpcv2.gz
158-
pushd ./src/sonic-sairedis/SAI
159-
git stash
160-
popd
161144
fi
162145
fi
163146
if [ $(syncd_rpc_image) == yes ]; then

‎.azure-pipelines/build-template.yml

-15
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292
fi
9393
9494
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
95-
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-ptf-sai.gz
9695
else
9796
if [ ${{ parameters.dbg_image }} == true ]; then
9897
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) INSTALL_DEBUG_TOOLS=y target/sonic-${{ parameters.platform }}.bin && \
@@ -106,20 +105,6 @@ jobs:
106105
fi
107106
if [ ${{ parameters.sync_rpc_image }} == true ]; then
108107
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz
109-
# workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache
110-
pushd ./src/sonic-sairedis/SAI
111-
git stash
112-
popd
113-
if [ ${{ parameters.platform }} == broadcom ]; then
114-
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) SAITHRIFT_V2=y ENABLE_SYNCD_RPC=y target/docker-syncd-brcm-rpcv2.gz
115-
pushd ./src/sonic-sairedis/SAI
116-
git stash
117-
popd
118-
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz
119-
pushd ./src/sonic-sairedis/SAI
120-
git stash
121-
popd
122-
fi
123108
fi
124109
125110
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin

‎dockers/docker-ptf-sai/Dockerfile.j2

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN pip3 install crc16 \
1616
getmac \
1717
packet_helper \
1818
psutil \
19-
scapy \
19+
scapy==2.4.4 \
2020
scapy_helper \
2121
pysubnettree \
2222
xmlrunner
@@ -39,8 +39,3 @@ RUN dpkg -r python-ptf
3939
RUN git clone https://github.com/p4lang/ptf.git \
4040
&& cd ptf \
4141
&& python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
42-
43-
run echo "declare -x LANG=\"C.UTF-8\"" >> /root/.bashrc
44-
run echo "declare -x LC_ALL=\"C.UTF-8\"" >> /root/.bashrc
45-
run echo "declare -x PYTHONIOENCODING=\"UTF-8\"" >> /root/.bashrc
46-
run echo "declare -x VIRTUAL_ENV=\"/root/env-python3\"" >> /root/.bashrc

‎platform/broadcom/docker-saiserver-brcm.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
DOCKER_SAISERVER_BRCM = docker-saiserver$(SAITHRIFT_VER)-brcm.gz
44
$(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm
5-
$(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER) $(SAISERVER_DBG)
5+
$(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER)
66
$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
77
$(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)

‎platform/broadcom/docker-syncd-brcm-rpc.mk

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
11
# docker image for brcm syncd with rpc
22

3-
DOCKER_SYNCD_BRCM_RPC = docker-syncd-brcm-rpc$(SAITHRIFT_VER).gz
4-
DOCKER_SYNCD_BRCM_RPC_DBG = docker-syncd-brcm-rpc$(SAITHRIFT_VER)-$(DBG_IMAGE_MARK).gz
3+
DOCKER_SYNCD_BRCM_RPC = docker-syncd-brcm-rpc.gz
54
$(DOCKER_SYNCD_BRCM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-brcm-rpc
6-
7-
8-
#Support two different versions of thrift
9-
ifeq ($(SAITHRIFT_V2),y)
10-
$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) $(PYTHON3_THRIFT_0_14_1) $(THRIFT_0_14_1_COMPILER) $(PTF)
11-
else
125
$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(PTF)
13-
endif
14-
156
ifeq ($(INSTALL_DEBUG_TOOLS), y)
167
$(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
178
$(LIBSWSSCOMMON_DBG) \
189
$(LIBSAIMETADATA_DBG) \
1910
$(LIBSAIREDIS_DBG)
2011
endif
2112
$(DOCKER_SYNCD_BRCM_RPC)_FILES += $(DSSERVE) $(BCMCMD) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
22-
2313
$(DOCKER_SYNCD_BRCM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
24-
$(DOCKER_SYNCD_BRCM_RPC)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
25-
$(DOCKER_SYNCD_BRCM_RPC)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
26-
2714
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
2815
ifeq ($(ENABLE_SYNCD_RPC),y)
2916
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
3017
endif
3118

32-
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BRCM_RPC_DBG)
33-
ifneq ($(ENABLE_SYNCD_RPC),y)
34-
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BRCM_RPC_DBG)
35-
endif
36-
3719
$(DOCKER_SYNCD_BRCM_RPC)_CONTAINER_NAME = syncd
3820
$(DOCKER_SYNCD_BRCM_RPC)_VERSION = 1.0.0+rpc
3921
$(DOCKER_SYNCD_BRCM_RPC)_PACKAGE_NAME = syncd
@@ -48,4 +30,3 @@ $(DOCKER_SYNCD_BRCM_RPC)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
4830
$(DOCKER_SYNCD_BRCM_RPC)_MACHINE = broadcom
4931

5032
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BRCM_RPC)
51-
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SYNCD_BRCM_RPC_DBG)

‎platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN apt-get update \
2525
cmake \
2626
libqt5core5a \
2727
libqt5network5 \
28-
gdb \
2928
libboost-atomic1.74.0
3029

3130
RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \

‎platform/vs/docker-ptf-sai.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DOCKER_PTF_SAI = docker-ptf-sai.gz
44
DOCKER_PTF_BASE = docker-ptf.gz
55
$(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai
6-
$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_14_1) $(PYTHON3_THRIFT_0_14_1)
6+
$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2)
77
$(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE)
88
SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI)
99
SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI)

‎platform/vs/docker-ptf.mk

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
DOCKER_PTF = docker-ptf.gz
44
$(DOCKER_PTF)_PYTHON_WHEELS += $(PTF_PY3)
55
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
6-
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF)
7-
#Don't need PYTHON_SAITHRIFT in SAITHRIFT_V2 environment
8-
ifeq ($(SAITHRIFT_V2),)
9-
$(DOCKER_PTF)_DEPENDS += $(PYTHON_SAITHRIFT)
10-
else
11-
$(info "SAITHRIFT_V2: $(SAITHRIFT_V2):skip install $(PYTHON_SAITHRIFT).")
12-
endif
6+
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
137
SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
148
SONIC_BUSTER_DOCKERS += $(DOCKER_PTF)

‎platform/vs/libsaithrift-dev.mk

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,12 @@
22

33
SAI_VER = 0.9.4
44

5-
LIBSAITHRIFT_DEV = libsaithrift$(SAITHRIFT_VER)-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb
5+
LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb
66
$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
7-
#Support two different versions of thrift
8-
ifeq ($(SAITHRIFT_V2),y)
9-
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) $(PYTHON3_THRIFT_0_14_1) $(THRIFT_0_14_1_COMPILER) \
10-
$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV)
11-
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_14_1) $(LIBSAIVS) $(LIBSAIMETADATA)
12-
$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 platform=vs
13-
else
147
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) \
158
$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV)
169
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(LIBSAIVS) $(LIBSAIMETADATA)
1710
$(LIBSAITHRIFT_DEV)_BUILD_ENV = platform=vs
18-
endif
1911
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
2012

2113
PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_$(CONFIGURED_ARCH).deb

‎rules/syncd.mk

+1-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ $(SYNCD_RPC)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA)
1717
$(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC)))
1818

1919
# Inject libthrift build dependency for RPC build
20-
# Support two different versions of thrift
21-
ifeq ($(SAITHRIFT_V2),y)
22-
$(SYNCD)_DEPENDS += $(LIBTHRIFT_0_14_1_DEV)
23-
else
24-
$(SYNCD)_DEPENDS += $(LIBTHRIFT_DEV)
25-
endif
26-
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV)
20+
$(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV)
2721
$(SYNCD)_DPKG_TARGET = binary-syncd-rpc
2822
endif
2923

0 commit comments

Comments
 (0)