Skip to content

saithriftv2: link VPP libraries for platform=vpp + bookworm/py3 build fixes #2299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicholasching wants to merge 6 commits into
base: master
Choose a base branch
from
+15 −6
Open

saithriftv2: link VPP libraries for platform=vpp + bookworm/py3 build fixes #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc48796
feat: modify saithriftv2 makefile; phase 1, task 1
nicholasching Jun 2, 2026
fef924e
fix: index error on stringification
nicholasching Jun 10, 2026
cbd37b5
feat: enable SWSS debug logging in saiserver (link swsscommon)
nicholasching Jun 15, 2026
80bd1c9
chore: install Python bindings to python3 dist-packages for bookworm
nicholasching Jun 15, 2026
bd953b5
fix: remove sonic-swss logger from saiserver
nicholasching Jun 24, 2026
554b787
fix: serialize saithriftv2 Thrift generation for parallel Trixie builds
nicholasching Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion debian/python-saithrift.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
debian/usr/local/lib/python2.7/site-packages/* /usr/lib/python2.7/dist-packages/
#compatiable with bookworm python 3.11 environment and build with python3
debian/usr/local/local/lib/python3*/dist-packages/* /usr/lib/python3/dist-packages/
16 changes: 12 additions & 4 deletions test/saithriftv2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ CTYPESGEN = /usr/local/bin/ctypesgen.py
endif

ifeq ($(platform),vs)
LIBS = -lthrift -lpthread -lsaivs -lsaimeta -lsaimetadata -lzmq
LIBS = -lthrift -lpthread -lsaivs -lsaimeta -lsaimetadata -lzmq -lswsscommon
else ifeq ($(platform),vpp)
LIBS = -lthrift -lpthread -lsaivs -lsaimeta -lsaimetadata -lzmq \
-lvlib -lvlibapi -lvppapiclient -lvlibmemoryclient -lvppinfra -lswsscommon
else
LIBS = -lthrift -lpthread -lsai -lsaimetadata
endif
Expand Down Expand Up @@ -74,18 +77,23 @@ $(METADIR)sai.thrift:
# rm gen-cpp/gen-py is needed since thrift don't override existing files
# even if sai.thrift file changed :(

$(CPP_SOURCES): $(METADIR)sai.thrift
gen-cpp/sai_rpc.cpp: $(METADIR)sai.thrift
rm -rf gen-cpp
$(THRIFT) -o ./ --gen cpp -r $^

$(PY_SOURCES): $(METADIR)sai.thrift
$(filter-out gen-cpp/sai_rpc.cpp, $(CPP_SOURCES)): gen-cpp/sai_rpc.cpp

gen-py/sai/sai_rpc.py: $(METADIR)sai.thrift
rm -rf gen-py
$(THRIFT) -o ./ --gen py -r $^
$(INSTALL) -vCD $(METADIR)sai_adapter.py gen-py/sai/sai_adapter.py

$(filter-out gen-py/sai/sai_rpc.py, $(PY_SOURCES)): gen-py/sai/sai_rpc.py

# TODO should depend on ../../inc/sai*.h ../../experimental/sai*.h and not /usr/include/sai/sai*.h

$(SAI_PY_HEADERS): $(SAI_HEADERS)
mkdir -p gen-py/sai
$(CTYPESGEN) --output-language=py32 -I/usr/include -I$(SAI_HEADER_DIR) -I../../experimental -I../../custom --include /usr/include/linux/limits.h $^ -o $@
python3 convert_header.py -i $(SAI_PY_HEADERS) -o ./new_header.py
mv $(SAI_PY_HEADERS) ./sai_headers.py.bk
Expand All @@ -97,7 +105,7 @@ $(METADIR)saimetadata.h:
$(ODIR)/%.o: gen-cpp/%.cpp
$(CXX) $(CPPFLAGS) -c $< -o $@

$(ODIR)/sai_rpc_server.o: $(METADIR)sai_rpc_frontend.cpp $(METADIR)saimetadata.h
$(ODIR)/sai_rpc_server.o: $(METADIR)sai_rpc_frontend.cpp $(METADIR)saimetadata.h $(CPP_SOURCES)
$(CXX) $(CPPFLAGS) -c $(METADIR)sai_rpc_frontend.cpp -o $@ -I$(METADIR) -I./gen-cpp -I../../inc -I../../experimental -I../../custom

$(ODIR)/saiserver.o: src/saiserver.cpp src/switch_sai_rpc_server.h $(CPP_SOURCES)
Expand Down
2 changes: 1 addition & 1 deletion test/saithriftv2/convert_header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class sai_common_api(SAIEnum):
import enum
class SAIEnum(enum.IntEnum):
def __str__(self):
return super().__str__().split(\".\")[1]\n"""
return self.name\n"""
ENUM_PREFIX = "enum__sai_"
SAI_NAME = "SAI"
ENUM_TYPE = "= c_int"
Expand Down
Loading