Skip to content
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

[sai] Update SAI to latest master #562

Merged
merged 6 commits into from
May 10, 2024
Merged

[sai] Update SAI to latest master #562

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
341e147
Update SAI to latest master
r12f May 9, 2024
ca337a9
Fix CI failures with latest SAI.
r12f May 9, 2024
72035f3
Fix SAI adapter template.
r12f May 10, 2024
ae14d73
Fix adapter status getter.
r12f May 10, 2024
ca9e356
Fix missing status renaming.
r12f May 10, 2024
f45e310
Update SAI to latest master with SAI thrift fixed.
r12f May 10, 2024
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
2 changes: 1 addition & 1 deletion dash-pipeline/SAI/SAI
Open in desktop
Submodule SAI updated 44 files
+2 −2 azure-pipelines.yml
+116 −0 doc/ARS/Adaptive-Routing-and-Switching.md
+67 −107 doc/SAI-Extensions.md
+591 −0 doc/SAI-Proposal-PoE.md
+438 −0 doc/TAM/SAI-Proposal-TAM-MOD-Localhost.md
+ − doc/behavioral model/pipeline_v11.vsdx
+ − doc/figures/PoE_Physical_Design.png
+29 −0 doc/tunnel/Tunnel-decap.md
+4 −2 experimental/saiexperimentalbmtor.h
+2 −2 experimental/saiexperimentaldashacl.h
+4 −2 experimental/saiexperimentaldashdirectionlookup.h
+253 −9 experimental/saiexperimentaldasheni.h
+393 −0 experimental/saiexperimentaldashha.h
+31 −5 experimental/saiexperimentaldashinboundrouting.h
+70 −22 experimental/saiexperimentaldashmeter.h
+20 −9 experimental/saiexperimentaldashoutboundcatopa.h
+21 −10 experimental/saiexperimentaldashoutboundrouting.h
+4 −2 experimental/saiexperimentaldashpavalidation.h
+4 −2 experimental/saiexperimentaldashvip.h
+4 −2 experimental/saiexperimentaldashvnet.h
+3 −0 experimental/saiextensions.h
+133 −0 experimental/saiswitchextensions.h
+37 −0 experimental/saitypesextensions.h
+2 −0 inc/sai.h
+20 −2 inc/saiacl.h
+117 −0 inc/saiarsprofile.h
+3 −0 inc/saihostif.h
+522 −0 inc/saipoe.h
+33 −1 inc/saiport.h
+3 −0 inc/saiqueue.h
+21 −0 inc/saiswitch.h
+25 −1 inc/saitam.h
+8 −5 inc/saitunnel.h
+94 −0 inc/saitypes.h
+1 −1 inc/saiversion.h
+9 −0 meta/acronyms.txt
+5 −4 meta/parse.pl
+5 −0 meta/saimetadatatypes.h
+5 −0 meta/saisanitycheck.c
+2 −1 meta/structs.pl
+25 −18 meta/templates/sai_adapter.py.tt
+3 −0 meta/test.pm
+7 −7 ptf/saiacl.py
+1 −1 ptf/saitunnel.py
2 changes: 1 addition & 1 deletion dash-pipeline/SAI/sai_api_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class SAITypeSolver:
"sai_ip_addr_family_t": SAITypeInfo("sai_ip_addr_family_t", "u32", default="SAI_IP_ADDR_FAMILY_IPV4"),
"sai_uint32_t": SAITypeInfo("sai_uint32_t", "u32", default="0"),
"sai_uint64_t": SAITypeInfo("sai_uint64_t", "u64", default="0"),
"sai_mac_t": SAITypeInfo("sai_mac_t", "mac", default="0:0:0:0:0:0"),
"sai_mac_t": SAITypeInfo("sai_mac_t", "mac", default="vendor"),
"sai_ip_prefix_t": SAITypeInfo("sai_ip_prefix_t", "ipPrefix", default="0"),
"sai_u8_list_t": SAITypeInfo("sai_u8_list_t", "u8list", default="empty"),
"sai_u16_list_t": SAITypeInfo("sai_u16_list_t", "u16list", default="empty"),
Expand Down
6 changes: 3 additions & 3 deletions dash-pipeline/SAI/templates/headers/sai_stats_api.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if table.sai_stats | length > 0 %}
/**
* @brief Get {{ table.name }} statistics counters. Deprecated for backward compatibility.
* @brief Get {{ table.name | upper }} statistics counters. Deprecated for backward compatibility.
*
{% include 'templates/headers/sai_api_comment_object_id.j2' %}
* @param[in] number_of_counters Number of counters in the array
Expand All @@ -16,7 +16,7 @@ typedef sai_status_t (*sai_get_{{ table.name }}_stats_fn)(
_Out_ uint64_t *counters);

/**
* @brief Get {{ table.name }} statistics counters extended.
* @brief Get {{ table.name | upper }} statistics counters extended.
*
{% include 'templates/headers/sai_api_comment_object_id.j2' %}
* @param[in] number_of_counters Number of counters in the array
Expand All @@ -34,7 +34,7 @@ typedef sai_status_t (*sai_get_{{ table.name }}_stats_ext_fn)(
_Out_ uint64_t *counters);

/**
* @brief Clear {{ table.name }} statistics counters.
* @brief Clear {{ table.name | upper }} statistics counters.
*
{% include 'templates/headers/sai_api_comment_object_id.j2' %}
* @param[in] number_of_counters Number of counters in the array
Expand Down
2 changes: 1 addition & 1 deletion dash-pipeline/SAI/templates/headers/sai_stats_enum.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if table.sai_stats | length > 0 %}
/**
* @brief Counter IDs for {{ table.name }} in sai_get_{{ table.name }}_stats() call
* @brief Counter IDs for {{ table.name | upper }} in sai_get_{{ table.name }}_stats() call
*/
typedef enum _sai_{{ table.name }}_stat_t
{
Expand Down
Loading