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

[code sync] Merge code from sonic-net/sonic-sairedis:202411 to 202412 #16

Merged
merged 9 commits into from
Feb 21, 2025
Merged

[code sync] Merge code from sonic-net/sonic-sairedis:202411 to 202412 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffe371d
[syncd] Support bulk set in INIT_VIEW mode (#1517)
mssonicbld Feb 5, 2025
bf049ed
Use sonictest pool instead of sonic-common and fix arm64 issue. (#1516)
mssonicbld Feb 5, 2025
f35e743
[nvidia] Skip SAI discovery on ports (#1524)
mssonicbld Feb 7, 2025
7ae00e5
Define bulk chunk size and bulk chunk size per counter ID (#1528)
mssonicbld Feb 10, 2025
e53489e
[syncd] Update log level for bulk api (#1532)
jianyuewu Feb 18, 2025
6b263b8
[FC] Support Policer Counter (#1533)
mssonicbld Feb 18, 2025
ec8b3c3
Fix pipeline errors related to rsyslogd and libswsscommon installatio…
mssonicbld Feb 19, 2025
d884ff9
[syncd] Move logSet logGet under mutex to prevent race condition (#15…
kcudnik Feb 21, 2025
f091cdb
Merge branch '202411' of https://github.com/sonic-net/sonic-sairedis …
mssonicbld Feb 21, 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
1 change: 1 addition & 0 deletions .azure-pipelines/test-docker-sonic-vs-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
sudo sonic-sairedis/.azure-pipelines/build_and_install_module.sh

sudo apt-get update
sudo apt --fix-broken install
sudo apt-get install -y libhiredis0.14 libyang0.16
sudo apt install -y $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
sudo apt install -y $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
Expand Down
2 changes: 2 additions & 0 deletions syncd/VendorSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,7 @@ sai_status_t VendorSai::logSet(
_In_ sai_api_t api,
_In_ sai_log_level_t log_level)
{
MUTEX();
SWSS_LOG_ENTER();

m_logLevelMap[api] = log_level;
Expand All @@ -1903,6 +1904,7 @@ sai_status_t VendorSai::queryApiVersion(
sai_log_level_t VendorSai::logGet(
_In_ sai_api_t api)
{
MUTEX();
SWSS_LOG_ENTER();

auto it = m_logLevelMap.find(api);
Expand Down
11 changes: 11 additions & 0 deletions unittest/syncd/TestVendorSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,3 +1543,14 @@ TEST(VendorSai, bulk_meter_rules)
EXPECT_EQ(SAI_STATUS_SUCCESS, sai.remove((sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY, meter_policy0));
EXPECT_EQ(SAI_STATUS_SUCCESS, sai.remove((sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY, meter_policy1));
}

TEST(VendorSai, logSet_logGet)
{
VendorSai sai;
sai.apiInitialize(0, &test_services);

EXPECT_EQ(SAI_STATUS_SUCCESS, sai.logSet(SAI_API_PORT, SAI_LOG_LEVEL_DEBUG));

EXPECT_EQ(SAI_LOG_LEVEL_DEBUG, sai.logGet(SAI_API_PORT));
EXPECT_EQ(SAI_LOG_LEVEL_NOTICE, sai.logGet(SAI_API_SWITCH));
}
Loading