-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
[SAI PTF]Support sai ptf v2 Syncd-rpc #12761
Merged
richardyu-ms
merged 1 commit into
sonic-net:master
from
richardyu-ms:add_saiptfv2_saiserver_syncd_rpc
Nov 21, 2022
Merged
[SAI PTF]Support sai ptf v2 Syncd-rpc #12761
richardyu-ms
merged 1 commit into
sonic-net:master
from
richardyu-ms:add_saiptfv2_saiserver_syncd_rpc
Nov 21, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Make syncd rpc docker which supports sai-ptf v2 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y SAITHRIFT_V2=y make target/docker-ptf-sai.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y make target/docker-ptf.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Test done: sonic-net#12619 NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-syncd-brcm-rpc.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-saiserver-brcm.gz Signed-off-by: richardyu-ms <[email protected]>
richardyu-ms
requested review from
qiluo-msft,
xumia and
lguohan
as code owners
November 19, 2022 05:56
richardyu-ms
added a commit
to richardyu-ms/sonic-buildimage
that referenced
this pull request
Nov 19, 2022
Depends on sonic-net#12761 After sonic-net#12761, enable new saiserver2 and syncd-rpcv2 in ppeline Test Done Signed-off-by: richardyu-ms <[email protected]>
7 tasks
richardyu-ms
added a commit
to richardyu-ms/sonic-buildimage
that referenced
this pull request
Nov 19, 2022
cherry-pick sonic-net#12761 Make syncd rpc docker which supports sai-ptf v2 Part of previous PR sonic-net#11610 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Signed-off-by: richardyu-ms <[email protected]>
7 tasks
richardyu-ms
added a commit
to richardyu-ms/sonic-buildimage
that referenced
this pull request
Nov 19, 2022
cherry-pick sonic-net#12761 Make syncd rpc docker which supports sai-ptf v2 Part of previous PR sonic-net#11610 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Signed-off-by: richardyu-ms <[email protected]>
7 tasks
xumia
reviewed
Nov 20, 2022
xumia
approved these changes
Nov 21, 2022
richardyu-ms
added a commit
that referenced
this pull request
Nov 21, 2022
cherry-pick #12761 Make syncd rpc docker which supports sai-ptf v2 Part of previous PR #11610 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Signed-off-by: richardyu-ms <[email protected]> Signed-off-by: richardyu-ms <[email protected]>
regarding to the problem to compatiable with thrift 014, after consideration, will upgrade existing thrift 11 to 14 at first, then we can make other component get the benefit from this change, mean while avoid to use different version of packages. |
StormLiangMS
pushed a commit
to StormLiangMS/sonic-buildimage
that referenced
this pull request
Dec 8, 2022
Make syncd rpc docker which supports sai-ptf v2 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y SAITHRIFT_V2=y make target/docker-ptf-sai.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y make target/docker-ptf.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Test done: sonic-net#12619 NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-syncd-brcm-rpc.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-saiserver-brcm.gz Signed-off-by: richardyu-ms <[email protected]> Signed-off-by: richardyu-ms <[email protected]>
StormLiangMS
pushed a commit
to StormLiangMS/sonic-buildimage
that referenced
this pull request
Dec 8, 2022
This reverts commit 9734b42.
StormLiangMS
pushed a commit
that referenced
this pull request
Dec 10, 2022
Make syncd rpc docker which supports sai-ptf v2 local bulild the target NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y SAITHRIFT_V2=y make target/docker-ptf-sai.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=vs NOSTRETCH=y NOJESSIE=y NOBULLSEYE=y make target/docker-ptf.gz NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-syncd-brcm-rpcv2.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y make target/docker-saiserverv2-brcm.gz Test done: #12619 NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-syncd-brcm-rpc.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-saiserver-brcm.gz Signed-off-by: richardyu-ms <[email protected]> Signed-off-by: richardyu-ms <[email protected]>
StormLiangMS
pushed a commit
that referenced
this pull request
Dec 10, 2022
This reverts commit 9734b42.
yaqiangz
pushed a commit
to yaqiangz/sonic-buildimage
that referenced
this pull request
Feb 14, 2023
Resolved merge conflicts in the following files manually device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 src/sonic-config-engine/tests/test_j2files.py Related work items: sonic-net#11864, sonic-net#12585, sonic-net#12607, sonic-net#12619, sonic-net#12626, sonic-net#12707, sonic-net#12714, sonic-net#12729, sonic-net#12733, sonic-net#12736, sonic-net#12750, sonic-net#12751, sonic-net#12755, sonic-net#12757, sonic-net#12758, sonic-net#12760, sonic-net#12761, sonic-net#12769, sonic-net#12783
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
Make a new syncd rpc container which can use the new sai-ptf structure. The new sai-ptf structure will generate RPC APIs from SAI interface directly.
In order to get that new syncd-rpc container, there are some problem need to handle
The previous RPC APIs are generate from here https://github.com/opencomputeproject/SAI/blob/master/test/saithrift/Makefile
The new RPC APIs are generated by this https://github.com/opencomputeproject/SAI/blob/master/test/saithriftv2/Makefile
Cause there are some cases still need the exisitng RPC APIs, then we need to use differernt versions of rpc API set for different test purpose.
How I did it
for the pronlems above, in this PR, the solutions are:
SAITHRIFT_V2
SAITHRIFT_V2
to use different thrift version when buildHow to verify it
Test done:
#12619
#12762
#12766
NOSTRETCH=y NOJESSIE=y make configure PLATFORM=broadcom NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-syncd-brcm-rpc.gz NOSTRETCH=y NOJESSIE=y ENABLE_SYNCD_RPC=y make target/docker-saiserver-brcm.gz
Signed-off-by: richardyu-ms [email protected]
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)