Moved SAI Header to git tag v1.8.1#816
Conversation
5a98bc3c7e86c01f3cf702054f9af7c7c5ca6daf (HEAD, tag: v1.8.0, origin/master, origin/HEAD, master) Update version to 1.8.0 (sonic-net#1207) b3244ceceb45184ffe37da55bb9a98ef126050ce saineighbor.h: Updated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX and deprecated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_IMPOSE_INDEX (sonic-net#1202) 8731ca6e09c7ba99b0b009e5821d80598e216756 Add source/dest/double NAPT entry available attributes (sonic-net#1194) f053d899feb9517f2db43ee462589a30572b5ed1 Add switch attributes for hash offset configuration. (sonic-net#1195) 13e5cd6940f9a0da1878d00f08e5941e09f16e7f PRBS RX State Data Type (sonic-net#1179) 9755845a06525a3c17f03e7b936a70783e8ef068 Packet header based VRF classification (sonic-net#1185) 2369ecb59fff1a5cae948d41eea06bf8b71330b2 SAI versioning (sonic-net#1183) 744279839c176e68b19734657975e3f5ec6f1a32 Replaced SAI_SWITCH_ATTR_MACSEC_OBJECT_ID with SAI_SWITCH_ATTR_MACSEC_OBJECT_LIST (sonic-net#1199) 584c724864fe565357e82d097ddcc7363bddefac [CI] Set up CI&PR with Azure Pipelines (sonic-net#1200) 08192237963174cc60edae9b4812a39c43b291fd Add attribute to query available packet DMA pool size (sonic-net#1198) f092ef1e3ce695fc3f9552721025695312b961a2 Add IPv6 flow label hash attribute. (sonic-net#1192) cbc9562bb7a8f2c3a79702b99be55f3b3afa6957 Override VRF (sonic-net#1186) 1eb35afdb2146baf40e6c2b8f2f8bfe99075eaee Add SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO format for GB MDIO sysfs access (sonic-net#1171) b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) 96adc95bf8316e1905143d9ecd21f32a43e80d7f Enhancements for MPLS support (sonic-net#1181) 3dcf1f2028da4060b345ad78e8a0c87d225bf5d0 Support for ACL extensions in metadata (sonic-net#1178) 24076be95b871e8f82ecaeb908cad951dc68896c [meta] Add support for allow empty list tag (sonic-net#1190) a2b3344cdde0bf5a4f8e98e1c676a658c0c615b0 spell check fixes (sonic-net#1189) bf4271bab6e8884bd96050bcba44e3134adaaec3 Do not call sai_metadata_sai get APIs before checking if they are allocated (sonic-net#1182) 5d5784dc3dbfc713c92ae7d2c472680b837bb002 [macsec]: Separate XPN configuration attribute from read-only attribute (sonic-net#1169) 6d5a9bf5ad17cb82621cabbe2449524320930606 [macsec]: add SAI_MACSEC_ATTR_SUPPORTED_CIPHER_SUITE_LIST (sonic-net#1172) e72c8f3a0cc543cb228554be82c97a63db917740 [meta] Print each tool version in Makefile (sonic-net#1177) 8f19677da88c7494d563ef7c5acb0529ecbd0b6e [meta] Add check for START, END and RANBE_BASE enums (sonic-net#1175) 24ad7906f145930b2e25682b6248909289d39e72 [meta] Create sai_switch_pointers_t struct (sonic-net#1174) 4f5f84d Tunnel loopback packet action as resource (sonic-net#1163) 8a0e82c [meta] Add create only oid attribute check on switch object (sonic-net#1170) 14cf507 Remove obsolete stub folder (sonic-net#1168) f14f406 [meta] Use safer calloc for integer overflow check (sonic-net#1166) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
Commit: b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) trigger this change. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
|
@qbdwlr This PR has your commit. |
|
Sai redis unit test are failing because of opencomputeproject/SAI#1169 where it seems alias is not maintaining backward compatibility. |
|
test main::test_macsec_p2p_establishment is failing, since SAI_MACSEC_SA_ATTR_XPN attribute changed from create_and_set to read_only and in that test: is used as SAI_MACSEC_SA_ATTR_XPN=1 Im not mantainer of this code, please ask original author to help here Ze Gan @Pterosaur to resolve this issue. If you want to disable this test case, add also SWSS_LOG_THROW exception in the place where you comment this code in SwitchStateBaseMACsec.cpp |
kcudnik
left a comment
There was a problem hiding this comment.
ask Ze Gan to help resolve this or comment code with throw and disable this test case
Could you temporarily comment this test case? @Pterosaur To move forward I have updated |
@kcudnik I have asked SAI PR author to make sure change is backward compatible. Will that be correct approach ? |
needed vy v1.8.0 Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
|
Any working solution should be fine here, i think this can't be done in one PR, since that XPN attribute changes meaning between v1.7.0 and v1.8.0 sai headers, i mean both advance sai pointer and unittests must be fixed in same PR, unless tests will be disabled temporarily |
|
another problem with other attribute: you can run tests locally to see if they will pass using "make check" also aspell needs to be updated: |
|
there is a problem with backward compatible enum attributes, so far we didn't hit that scenario, and currently this is no support for that, fastest way will be to use in that *rec file current value which is not deprecated, and i will add deprecated support to SAI repo later on |
Fix spell check. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
|
i created SAI metadata update for this scenario opencomputeproject/SAI#1214, but it will also require to update saiserialize.cpp to support new api |
|
Need to fix opencomputeproject/SAI#1169 for VS test to pass. |
|
test error: seems not related to XPN, i restarted to see if it will pass |
|
next PR opencomputeproject/SAI#1215 is bringing SAI_MACSEC_SA_ATTR_XPN back to the place it was at the first place after changing in opencomputeproject/SAI#1169, so code for macsec in sairedis will still need to be revisited (code and tests recordings) to make proper adjustment (@Pterosaur), and if this will be pulled in opencomputeproject/SAI#1214 and updated deserialize_attr_id in saiserialize.cpp then no changes would be required to sairedis.rec in tests with that XPN attributes since all will be supported |
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This PR and other PR #818 is failing at test_sflow.py . Have re-run multiple times Here are my analysis :- Looks like there is some issue with sonic-vs docker used in sonic-sai-redis repo for swss DVS test. Tried locally also: Confirmed if we just replace sflowmgrd test case passes. md5sum of Confirmed Strangely @lguohan can you please help check this. cc @kcudnik |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@abdosi: Is there a PR to move the sonic-sairedis pointer forward in sonic-buildimage so that this PR is now included in the official build? |
What I did: Moved the SAI header to v1.8.1. 7cd3a7ed84db3fc9cec13496a5339b6fe1888bb7 (HEAD, tag: v1.8.1, origin/v1.8) Update SAI version to V1.8.1 (sonic-net#1218) 5913e4cdd0c9c7ae859baa2e18086327b39a94da Fix error when compiling Broadcom SAI with v1.8.0 (sonic-net#1216) 5a98bc3c7e86c01f3cf702054f9af7c7c5ca6daf (HEAD, tag: v1.8.0, origin/master, origin/HEAD, master) Update version to 1.8.0 (sonic-net#1207) b3244ceceb45184ffe37da55bb9a98ef126050ce saineighbor.h: Updated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX and deprecated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_IMPOSE_INDEX (sonic-net#1202) 8731ca6e09c7ba99b0b009e5821d80598e216756 Add source/dest/double NAPT entry available attributes (sonic-net#1194) f053d899feb9517f2db43ee462589a30572b5ed1 Add switch attributes for hash offset configuration. (sonic-net#1195) 13e5cd6940f9a0da1878d00f08e5941e09f16e7f PRBS RX State Data Type (sonic-net#1179) 9755845a06525a3c17f03e7b936a70783e8ef068 Packet header based VRF classification (sonic-net#1185) 2369ecb59fff1a5cae948d41eea06bf8b71330b2 SAI versioning (sonic-net#1183) 744279839c176e68b19734657975e3f5ec6f1a32 Replaced SAI_SWITCH_ATTR_MACSEC_OBJECT_ID with SAI_SWITCH_ATTR_MACSEC_OBJECT_LIST (sonic-net#1199) 584c724864fe565357e82d097ddcc7363bddefac [CI] Set up CI&PR with Azure Pipelines (sonic-net#1200) 08192237963174cc60edae9b4812a39c43b291fd Add attribute to query available packet DMA pool size (sonic-net#1198) f092ef1e3ce695fc3f9552721025695312b961a2 Add IPv6 flow label hash attribute. (sonic-net#1192) cbc9562bb7a8f2c3a79702b99be55f3b3afa6957 Override VRF (sonic-net#1186) 1eb35afdb2146baf40e6c2b8f2f8bfe99075eaee Add SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO format for GB MDIO sysfs access (sonic-net#1171) b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) 96adc95bf8316e1905143d9ecd21f32a43e80d7f Enhancements for MPLS support (sonic-net#1181) 3dcf1f2028da4060b345ad78e8a0c87d225bf5d0 Support for ACL extensions in metadata (sonic-net#1178) 24076be95b871e8f82ecaeb908cad951dc68896c [meta] Add support for allow empty list tag (sonic-net#1190) a2b3344cdde0bf5a4f8e98e1c676a658c0c615b0 spell check fixes (sonic-net#1189) bf4271bab6e8884bd96050bcba44e3134adaaec3 Do not call sai_metadata_sai get APIs before checking if they are allocated (sonic-net#1182) 5d5784dc3dbfc713c92ae7d2c472680b837bb002 [macsec]: Separate XPN configuration attribute from read-only attribute (sonic-net#1169) 6d5a9bf5ad17cb82621cabbe2449524320930606 [macsec]: add SAI_MACSEC_ATTR_SUPPORTED_CIPHER_SUITE_LIST (sonic-net#1172) e72c8f3a0cc543cb228554be82c97a63db917740 [meta] Print each tool version in Makefile (sonic-net#1177) 8f19677da88c7494d563ef7c5acb0529ecbd0b6e [meta] Add check for START, END and RANBE_BASE enums (sonic-net#1175) 24ad7906f145930b2e25682b6248909289d39e72 [meta] Create sai_switch_pointers_t struct (sonic-net#1174) 4f5f84d Tunnel loopback packet action as resource (sonic-net#1163) 8a0e82c [meta] Add create only oid attribute check on switch object (sonic-net#1170) 14cf507 Remove obsolete stub folder (sonic-net#1168) f14f406 [meta] Use safer calloc for integer overflow check (sonic-net#1166) Also this PR include changes of this sonic-net#815 SAI commit b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) needed change in sai_redis_switch.cpp and sai_vs_switch.cpp for compilation. How I verify: Verify Build is fine of libsairedis*.deb, syncd*.deb, swss*.deb Co-authored-by: Ann Pokora <apokora@juniper.net>
What I did:
b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (#1173)needed change insai_redis_switch.cppandsai_vs_switch.cppfor compilation.How I verify:
Verify Build is fine of
libsairedis*.deb, syncd*.deb, swss*.deb### Please note build-image cannot be moved forward with sairedis pointer with this PR/commit since vendor sai packages are still not compiled with SAI1.8.1 Header.