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

Add sairedis support for sai_query_stats_st_capability API #1554

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add sairedis support for sai_query_stats_st_capability API #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ff4500
Add sairedis support for sai_query_stats_st_capability API
tjchadaga Mar 12, 2025
28f0f27
Update SAI submodule
tjchadaga Mar 12, 2025
7917c3c
Fix build error
tjchadaga Mar 12, 2025
239120c
Address comments and add missing notifications
tjchadaga Mar 12, 2025
1a61a29
Remove whitespace causing UT failure
tjchadaga Mar 12, 2025
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 SAI
Open in desktop
Submodule SAI updated 66 files
+7 −0 azure-pipelines.yml
+9 −0 custom/README.md
+29 −0 doc/IP-Multicast/MulticastWithMembers.md
+148 −0 doc/SAI-Proposal-Extended-Port-Notification.md
+217 −0 doc/SAI-Proposal-Hash-Algorithm-Round-Robin.md
+166 −0 doc/SAI-Proposal-Packet-Trimming.md
+53 −0 doc/SAI_1.15.1_ReleaseNotes.md
+1,010 −0 doc/TAM/SAI-Proposal-TAM-stream-telemetry.md
+4 −0 doc/TAM/netlink_dma_channel.drawio.svg
+22 −0 doc/custom-headers/README.md
+56 −0 doc/custom-headers/saicustom.h
+136 −0 doc/custom-headers/saicustomone.h
+67 −0 doc/custom-headers/saiportcustom.h
+57 −0 doc/custom-headers/saiswitchcustom.h
+56 −0 doc/custom-headers/saitypescustom.h
+ − doc/figures/Hash_based.png
+ − doc/figures/Random.png
+ − doc/figures/Round_robin.png
+ − doc/figures/Round_robin_with_weights.png
+621 −0 doc/tunnel/SAI-Proposal-EVPN-Multihoming.md
+ − doc/tunnel/figures/sai_evpnmh_df.png
+ − doc/tunnel/figures/sai_evpnmh_failover.png
+ − doc/tunnel/figures/sai_evpnmh_singleactive.png
+ − doc/tunnel/figures/sai_evpnmh_splithorizon.png
+ − doc/tunnel/figures/sai_evpnmh_unicast.png
+8 −8 experimental/saiexperimentaldashflow.h
+9 −0 experimental/saiexperimentaldashha.h
+5 −0 inc/sai.h
+52 −1 inc/saiacl.h
+74 −1 inc/saibridge.h
+70 −0 inc/saibuffer.h
+3 −3 inc/saihostif.h
+20 −0 inc/saiipmcgroup.h
+10 −0 inc/sailag.h
+5 −2 inc/sainexthop.h
+14 −0 inc/sainexthopgroup.h
+14 −0 inc/saiobject.h
+0 −0 inc/saipoe.h
+87 −0 inc/saiport.h
+15 −0 inc/saiqueue.h
+4 −4 inc/saisrv6.h
+134 −1 inc/saiswitch.h
+98 −1 inc/saitam.h
+31 −0 inc/saitypes.h
+41 −0 inc/saivlan.h
+1 −0 meta/Doxyfile
+1 −0 meta/Doxyfile.compat
+2 −3 meta/Makefile
+1 −0 meta/ancestry.5f75d99.history
+0 −1 meta/ancestry.825c835.history
+2 −0 meta/aspell.en.pws
+2 −2 meta/attrversion.sh
+2 −2 meta/checkancestry.sh
+4 −1 meta/checkheaders.pl
+2 −2 meta/checkstructs.sh
+8 −0 meta/gensairpc.pl
+102 −13 meta/parse.pl
+5 −0 meta/saimetadatatypes.h
+220 −15 meta/saisanitycheck.c
+7 −0 meta/saiserializetest.c
+1 −0 meta/structs.5f75d99.history
+0 −1 meta/structs.825c835.history
+9 −2 meta/structs.pl
+52 −9 meta/test.pm
+10 −3 meta/utils.pm
+3 −3 test/saithriftv2/Makefile
11 changes: 11 additions & 0 deletions lib/ClientSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,17 @@ sai_status_t ClientSai::queryStatsCapability(
return waitForQueryStatsCapabilityResponse(stats_capability);
}


sai_status_t ClientSai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t ClientSai::waitForQueryStatsCapabilityResponse(
_Inout_ sai_stat_capability_list_t* stats_capability)
{
Expand Down
5 changes: 5 additions & 0 deletions lib/ClientSai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
12 changes: 12 additions & 0 deletions lib/ClientServerSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,18 @@ sai_status_t ClientServerSai::queryStatsCapability(
stats_capability);
}

sai_status_t ClientServerSai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
MUTEX();
SWSS_LOG_ENTER();
REDIS_CHECK_API_INITIALIZED();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t ClientServerSai::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions lib/ClientServerSai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
11 changes: 11 additions & 0 deletions lib/RedisRemoteSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,17 @@ sai_status_t RedisRemoteSaiInterface::queryStatsCapability(
return status;
}


sai_status_t RedisRemoteSaiInterface::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t RedisRemoteSaiInterface::waitForQueryStatsCapabilityResponse(
_Inout_ sai_stat_capability_list_t* stats_capability)
{
Expand Down
5 changes: 5 additions & 0 deletions lib/RedisRemoteSaiInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
10 changes: 10 additions & 0 deletions lib/Sai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,16 @@ sai_status_t Sai::queryStatsCapability(
stats_capability);
}

sai_status_t Sai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t Sai::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions lib/Sai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
10 changes: 10 additions & 0 deletions lib/ServerSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,16 @@ sai_status_t ServerSai::queryStatsCapability(
stats_capability);
}

sai_status_t ServerSai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t ServerSai::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions lib/ServerSai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
10 changes: 10 additions & 0 deletions meta/DummySaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,16 @@ sai_status_t DummySaiInterface::queryStatsCapability(
return m_status;
}

sai_status_t DummySaiInterface::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return m_status;
}

sai_status_t DummySaiInterface::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions meta/DummySaiInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ namespace saimeta
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
10 changes: 10 additions & 0 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,16 @@ sai_status_t Meta::queryStatsCapability(
return status;
}

sai_status_t Meta::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t Meta::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions meta/Meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ namespace saimeta
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions meta/SaiInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ namespace sairedis
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) = 0;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) = 0;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
11 changes: 11 additions & 0 deletions proxylib/Sai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,17 @@ sai_status_t Sai::queryStatsCapability(
return SAI_STATUS_NOT_IMPLEMENTED;
}

sai_status_t Sai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

SWSS_LOG_ERROR("not implemented, FIXME");

return SAI_STATUS_NOT_IMPLEMENTED;
}
// BULK STATS

sai_status_t Sai::bulkGetStats(
Expand Down
5 changes: 5 additions & 0 deletions proxylib/Sai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ namespace saiproxy
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t bulkGetStats(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t object_type,
Expand Down
2 changes: 2 additions & 0 deletions syncd/SwitchNotifications.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ namespace syncd
.on_port_host_tx_ready = &Slot<context>::onPortHostTxReady,
.on_twamp_session_event = &Slot<context>::onTwampSessionEvent,
.on_icmp_echo_session_state_change = nullptr,
.on_extended_port_state_change = nullptr,
.on_tam_tel_type_config_change = nullptr,
.on_ha_set_event = nullptr,
.on_ha_scope_event = nullptr,
}) { }
Expand Down
16 changes: 16 additions & 0 deletions syncd/VendorSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ VendorSai::VendorSai()
.query_attribute_enum_values_capability = &sai_query_attribute_enum_values_capability,
.query_object_stage = nullptr,
.query_stats_capability = &sai_query_stats_capability,
.query_stats_st_capability = &sai_query_stats_st_capability,
.switch_id_query = &sai_switch_id_query,
.tam_telemetry_get_data = nullptr,
};
Expand Down Expand Up @@ -343,6 +344,21 @@ sai_status_t VendorSai::queryStatsCapability(
stats_capability);
}

sai_status_t VendorSai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
MUTEX();
SWSS_LOG_ENTER();
VENDOR_CHECK_API_INITIALIZED();

return m_globalApis.query_stats_st_capability(
switchId,
objectType,
stats_capability);
}

sai_status_t VendorSai::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions syncd/VendorSai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ namespace syncd
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
14 changes: 14 additions & 0 deletions unittest/syncd/MockableSaiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,20 @@ sai_status_t MockableSaiInterface::queryStatsCapability(
return SAI_STATUS_SUCCESS;
}

sai_status_t MockableSaiInterface::queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();
if (mock_queryStatsStCapability)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty line before if

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is similar to other functions in the file.

{
return mock_queryStatsStCapability(switch_id, object_type, stats_capability);
}

return SAI_STATUS_NOT_SUPPORTED;
}

sai_status_t MockableSaiInterface::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
7 changes: 7 additions & 0 deletions unittest/syncd/MockableSaiInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,15 @@ class MockableSaiInterface: public saimeta::DummySaiInterface
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

std::function<sai_status_t(sai_object_id_t, sai_object_type_t, sai_stat_capability_list_t *)> mock_queryStatsCapability;

std::function<sai_status_t(sai_object_id_t, sai_object_type_t, sai_stat_st_capability_list_t *)> mock_queryStatsStCapability;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
15 changes: 15 additions & 0 deletions vslib/Sai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,21 @@ sai_status_t Sai::queryStatsCapability(
stats_capability);
}

sai_status_t Sai::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
MUTEX();
SWSS_LOG_ENTER();
VS_CHECK_API_INITIALIZED();

return m_meta->queryStatsStCapability(
switchId,
objectType,
stats_capability);
}

sai_status_t Sai::getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
5 changes: 5 additions & 0 deletions vslib/Sai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ namespace saivs
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_capability_list_t *stats_capability) override;

virtual sai_status_t queryStatsStCapability(
_In_ sai_object_id_t switch_id,
_In_ sai_object_type_t object_type,
_Inout_ sai_stat_st_capability_list_t *stats_capability) override;

virtual sai_status_t getStatsExt(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand Down
10 changes: 10 additions & 0 deletions vslib/SwitchState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,16 @@ sai_status_t SwitchState::queryStatsCapability(
return SAI_STATUS_SUCCESS;
}

sai_status_t SwitchState::queryStatsStCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
_Inout_ sai_stat_st_capability_list_t *stats_capability)
{
SWSS_LOG_ENTER();

return SAI_STATUS_NOT_IMPLEMENTED;
}

std::shared_ptr<saimeta::Meta> SwitchState::getMeta()
{
SWSS_LOG_ENTER();
Expand Down
Loading
Loading