Skip to content

[Orcas][TH5] Set sai_stats_support_mask to 0x884 for Arista-7060X6-64PE-B-O128 and update comments#24729

Closed
kewei-arista wants to merge 18 commits intosonic-net:masterfrom
kewei-arista:pr-sonic.4
Closed

[Orcas][TH5] Set sai_stats_support_mask to 0x884 for Arista-7060X6-64PE-B-O128 and update comments#24729
kewei-arista wants to merge 18 commits intosonic-net:masterfrom
kewei-arista:pr-sonic.4

Conversation

@kewei-arista
Copy link
Contributor

Why I did it

This PR is addressing a comment in #24578 by correctly set sai_stats_support_mask for Arista-7060X6-64PE-B-O128.

Note that bit 7 is not needed for Arista-7060X6-16PE-384C-B-O128S2 as srv6 is not supported for this platform. I just updated the comment for clarity.

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

Confirmed pfcwd tests are passing with this change.

Which release branch to backport (provide reason below if selected)

  • 202205
  • 202211
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Tested branch (Please provide the tested image version)

  • 202505

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang
Copy link
Contributor

sdszhang commented Dec 4, 2025

@kewei-arista can you fix the DCO error?

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

kewei-arista and others added 17 commits December 8, 2025 17:53
…PE-B-O128 and update comments

Signed-off-by: kewei <kewei@arista.com>
…2.67 (sonic-net#24636)

- Why I did it
Updated FW/SDK to xx.2016.2096/4.8.2096 and SAI to 2505.33.2.67.

- How I did it
Updated related makefiles with the new version numbers.

- How to verify it
Run full sonic-mgmt regression.

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
…omatically (sonic-net#24285)

Why I did it
src/sonic-swss-common

* 7f1b50f - (HEAD -> master, origin/master, origin/HEAD) Revert "[sonic-db-cli] Add flag to make cli calls to container databases (sonic-net#1070)" and sonic-net#1111 (sonic-net#1123) (5 hours ago) [Qi Luo]
* 16a8a93 - [ci] Use 1ES agent pool to provide more disk when building swss. (sonic-net#1121) (2 days ago) [Liu Shilong]
* 7682785 - Revert "Fix risky unwrap(), expect(), and casting (sonic-net#1113)" (sonic-net#1118) (2 days ago) [Liu Shilong]
* cf7c7f6 - Fix issue where namespace would not be read (sonic-net#1111) (2 days ago) [Connor Roos]
* d6ccff7 - Fix risky unwrap(), expect(), and casting (sonic-net#1113) (4 days ago) [Qi Luo]
* e67092c - Add PORT_SERDES_ATTR_ID_LIST to FLEX COUNTER DATABASE (sonic-net#1099) (9 days ago) [Dhanasekar Rathinavel]
* d2c8f2c - [ci] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 (sonic-net#1101) (2 weeks ago) [Liu Shilong]
* 4b86a77 - [dhcp_relay] sonic dhcp relay agent for IPv4 (sonic-net#1017) (4 weeks ago) [Akshath TR]
* 472a425 - SHlorch changes for EVPN MH feature (sonic-net#1051) (5 weeks ago) [jayakj]
* 7407a2e - Optimize memory usage by replacing the queue's underlying container with a list. (sonic-net#1083) (7 weeks ago) [Hua Liu]
* 130d8b6 - Add chassis db. (sonic-net#1085) (7 weeks ago) [dypet]
* 66e437a - Fix mocktests for buster builds (sonic-net#1087) (8 weeks ago) [prabhataravind]
* 32b14a4 - Update static database_config.json in swsscommon (sonic-net#1086) (8 weeks ago) [prabhataravind]
* c253917 - Add pop batch size support for ZMQ Consumer (sonic-net#1084) (8 weeks ago) [Vivek]
* 4fea06e - [sonic-db-cli] Add flag to make cli calls to container databases (sonic-net#1070) (8 weeks ago) [Connor Roos]
Why I did it
Following this HLD for liquid cooling sonic-net/SONiC#2032, I created this pr to add checker inside hardware checker to monitor liquid cooling device status
…omatically (sonic-net#24734)

#### Why I did it
src/sonic-mgmt-common
```
* 5b93368 - (HEAD -> master, origin/master, origin/HEAD) Add gNSI Authz, Certz, Pathz and Credentialz YANG models (sonic-net#183) (4 hours ago) [Kanchana]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…utomatically (sonic-net#24404)

#### Why I did it
src/sonic-host-services
```
* fda4e65 - (HEAD -> master, origin/master, origin/HEAD) Include info level logs in reboot cause services (sonic-net#278) (7 days ago) [roy-nexthop]
* 3492186 - Module graceful shutdown support commit 255 is triggering loganalyzer failures in non-smartswitch platforms (sonic-net#322) (8 days ago) [rameshraghupathy]
* 1d7ec58 - Remove unwrap() in sonic-host-services (sonic-net#321) (9 days ago) [Qi Luo]
* bbee5e6 - Call sonic-kdump-config --remote after setting ssh_path and ssh_string (sonic-net#319) (12 days ago) [HP]
* ce60800 - Ignore failures in enabling a systemd service (sonic-net#320) (12 days ago) [Saikrishna Arcot]
* ee9ef3f - Module graceful shutdown support (sonic-net#255) (13 days ago) [rameshraghupathy]
* f1de8e3 - Add ExclusionList for telemetry/frr_bmp since they are not service in pub repo (sonic-net#317) (3 weeks ago) [Feng-msft]
* 6507fa3 - [hostcfg] Fix timezone mismatch after image upgrade (sonic-net#312) (4 weeks ago) [Ben Levi]
```
#### How I did it
#### How to verify it
#### Description for the changelog
#### Why I did it
If one python wheel is already installed inside slave container, it will not install again. Below is a sample log:
```
sed: -e expression sonic-net#1, char 11: extra characters after command
WARNING: The directory '/var/user/.cache/pip' or its parent directory is not owned or is not writable by the current user. The cache has been disabled. Check the permissions and owner of that directory. If executing pip with sudo, you should use sudo's -H flag.
Processing ./target/python-wheels/bookworm/sonic_yang_models-1.0-py3-none-any.whl
sonic-yang-models is already installed with the same version as the provided wheel. Use --force-reinstall to force an installation of the wheel.
WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager, possibly rendering your system unusable.It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv. Use the --root-user-action option if you know what you are doing and want to suppress this warning.

[notice] A new release of pip is available: 24.2 -> 25.3
[notice] To update, run: python3 -m pip install --upgrade pip
Build end time: Wed Dec 3 22:53:07 UTC 2025
Elapsed time: 0h 0m 1s
```
 However, we expect to reinstall the python wheel for target `$(PYTHON_WHEELS_PATH)/%-install`

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Update slave.mk to enasure force install the python wheel.

#### How to verify it
After this change, local build will successfully force install the python wheel. See new logs:
```
sed: -e expression sonic-net#1, char 11: extra characters after command
WARNING: The directory '/var/qiluo/.cache/pip' or its parent directory is not owned or is not writable by the current user. The cache has been disabled. Check the permissions and owner of that directory. If executing pip with sudo, you should use sudo's -H flag.
Processing ./target/python-wheels/bookworm/sonic_yang_models-1.0-py3-none-any.whl
Installing collected packages: sonic-yang-models
  Attempting uninstall: sonic-yang-models
    Found existing installation: sonic-yang-models 1.0
    Uninstalling sonic-yang-models-1.0:
      Successfully uninstalled sonic-yang-models-1.0
Successfully installed sonic-yang-models-1.0
WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager, possibly rendering your system unusable.It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv. Use the --root-user-action option if you know what you are doing and want to suppress this warning.

[notice] A new release of pip is available: 24.2 -> 25.3
[notice] To update, run: python3 -m pip install --upgrade pip
Build end time: Wed Dec 3 23:59:31 UTC 2025
```
…D automatically (sonic-net#24736)

#### Why I did it
src/sonic-platform-daemons
```
* a4f2b83 - (HEAD -> master, origin/master, origin/HEAD) Add suport for liquid cooling leakage detection (sonic-net#690) (17 hours ago) [Yuanzhe]
```
#### How I did it
#### How to verify it
#### Description for the changelog
* Adding HW SKU files for arista_7280r4(k)_32qf_32df

* Adding new brcm soc properties to the permitted list

* Added various fixes on Citrine platform

1. Fixed Scd PCI addrs
2. Fixed PHY library name
3. Fixed FEC encoding to match SAI convension
4. Fixed Ethernet-Rec0 lane number

* Updating SKU files to fix some mistakes with the mappings

* Fix typo on phy12_config.json

* Set PSU LED as uncontrollable

* Fix scd pci addrs

* Update gearbox firmware filename

* Fixing port_config.ini alias and generate_port_lists

* Renaming SKUs to include -64O

Arista-7280R4-32QF-32DF -> Arista-7280R4-32QF-32DF-64O
Arista-7280R4K-32QF-32DF -> Arista-7280R4K-32QF-32DF-64O

* Add and update L1 tuning files

* Add workaround for running Q3D-A1 on SAI13

CS00012432596

* Ignore nvme sensors returning IO errors

* Update PSU fan speed controllable attribute
Why I did it
Currently SONiC uses the 'isc-dhcp-relay' package to allow DHCP relay functionality on IPv4 networks.
With this PR we are adding sonic dhcp relay agent for IPv4 as described in this HLD(sonic-net/SONiC#1938)

Work item tracking
Microsoft ADO (number only):
How I did it
Edit supervisord template to start sonic DHCPv4 relay instance when configured to do so in Config DB.
Align cfg unit test to the new change.

How to verify it
Configure sonic DHCPv4 agent as described in the feature HLD(sonic-net/SONiC#1938)
Test it with real client/server with IPv4 or use the sonic-mgmt suite

Signed-off-by: Ashutosh Agrawal <ashu@cisco.com>
Co-authored-by: Shivashankar C R <shivashankar.c.r@gmail.com>
Co-authored-by: Ashutosh Agrawal <ashu@cisco.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: StormLiangMS <89824293+StormLiangMS@users.noreply.github.com>
Added grpcurl binary to PTF Docker containers to enable gRPC testing capabilities for SONiC test framework. This supports upcoming gNOI (gRPC Network Operations Interface) testing infrastructure that requires a lightweight gRPC client tool.
Background:

SONiC is moving towards gRPC-based management interfaces (gNMI, gNOI, gNSI)
Current test framework lacks unified gRPC testing capabilities
grpcurl provides a simple, dependency-free solution for gRPC operations
Eliminates need for protocol buffer compilation in test environments


Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Ying Xie <yxieca@users.noreply.github.com>
* update README.md file to add build status for branch 202511
* delete branch 202311

Signed-off-by: Sonic Automation <sonicbld@microsoft.com>
…tically (sonic-net#24764)

#### Why I did it
src/sonic-sairedis
```
* 0ed27e89 - (HEAD -> master, origin/master, origin/HEAD) [ci] Use 1ES agent pool to provide more disk when building swss. (sonic-net#1710) (22 hours ago) [Liu Shilong]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…lly (sonic-net#24534)

#### Why I did it
src/sonic-swss
```
* dabbd57 - (HEAD -> master, origin/master, origin/HEAD) Disable test_Srv6MySidUNTunnelDscpMode and test_Srv6MySidUNTunnelDscpModeAmbiguity (sonic-net#4033) (31 hours ago) [Changrong Wu]
* a7198d1 - Revert "Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847)" (sonic-net#4035) (2 days ago) [Ying Xie]
* 83adbd9 - Revert "Avoid nhgroup update when mux state changes (sonic-net#3822)" (sonic-net#4030) (2 days ago) [Ying Xie]
* f34f624 - Respect Cargo.lock for dependencies version (sonic-net#4028) (3 days ago) [Qi Luo]
* d644d2e - [bulker] Add support for bulk set object attributes (sonic-net#3703) (4 days ago) [Nikola Dancejic]
* eae91a2 - [Dash] Update ENI Based Forwarding Orchagent (sonic-net#3905) (9 days ago) [Vivek]
* 48e28b6 - Populate the Voq system Port information for the local port when the Port is removed and created when the Speed is changed dynamically via GCU (sonic-net#3976) (9 days ago) [saksarav-nokia]
* 4d39712 - [DPB]: Fix stale queue counter maps in COUNTERS_DB after port breakout (sonic-net#3982) (9 days ago) [Ravi Minnikanti(Marvell)]
* e2cc8ce - Add support for platform based on Clounix asic (sonic-net#3846) (9 days ago) [clounix-sw]
* 10df75b - Change DB that DPU orchagents listens to for all orchs (sonic-net#3827) (9 days ago) [prabhataravind]
* a2decc5 - Support SAI_PORT_SERDES_ATTR_CUSTOM_COLLECTION (sonic-net#3764) (10 days ago) [longhuan-cisco]
* c5caf50 - [SmartSwitch-HA] Support peer_ip update in ha set. (sonic-net#3964) (11 days ago) [dypet]
* 7119c2b - Enable output queue for HFT (sonic-net#3962) (11 days ago) [Ze Gan]
* 4c6457e - [SmartSwitch-HA] Set pending flags back to false. (sonic-net#3997) (12 days ago) [dypet]
* 2ed250d - Set egress mirror headroom to 0 on SN6600 platform (sonic-net#4005) (12 days ago) [Stephen Sun]
* 1c7ab03 - [HFT OTEL]: OTEL conversion init (sonic-net#3920) (12 days ago) [Janet Cui]
* 7c9315a - [buffermgrd] Optimize fast-reboot startup (sonic-net#3952) (12 days ago) [Jianyue Wu]
* 7d540cb - [fpmsyncd]: Fix uA SID programming for link-local adjacencies (sonic-net#3958) (12 days ago) [Carmine Scarpitta]
* 8541200 - [vnetorch] missing handling of rx and tx interval of monitoring session (sonic-net#3878) (12 days ago) [Jing Zhang]
* 46daad0 - [syncd] Fix the error log while running lua plugin (sonic-net#3974) (12 days ago) [Vivek]
* 5671e08 - Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847) (2 weeks ago) [lakshmi-nexthop]
* b017bd3 - Permanent isolate a fabric port if it repeatedly flapping. (sonic-net#3933) (2 weeks ago) [jfeng-arista]
* b426b2b - Support checking capabilities of the mirror (sonic-net#3934) (2 weeks ago) [Stephen Sun]
* 25647cd - [fpmsyncd]: Add Support for SRv6 VPN Route and PIC Context Processing (sonic-net#3605) (2 weeks ago) [Yuqing Zhao(Alibaba Inc)]
* 820eb74 - Allow state db to take modified entries made to the tunnel decap table (sonic-net#3960) (2 weeks ago) [Dev Ojha]
* 5685653 - Temporarily skip failing port tests to unblock pipeline runs (sonic-net#4010) (2 weeks ago) [prabhataravind]
* a4ed959 - Avoid nhgroup update when mux state changes (sonic-net#3822) (3 weeks ago) [manamand2020]
* 42929d8 - dot3 Stats collection (sonic-net#3615) (3 weeks ago) [Brad House - NextHop]
* ffea522 - [portsorch] fix crash when number of PGs returned 0 (sonic-net#3966) (3 weeks ago) [Stepan Blyshchak]
* ea54ff8 - [ci] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 (sonic-net#3987) (3 weeks ago) [Liu Shilong]
* 0adab60 - [fpmsyncd] skip routes for eth1-midplane (sonic-net#3724) (3 weeks ago) [arista-nwolfe]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Why I did it
If teamd feature is disabled,

sudo config feature state teamd disabled
swss service should not wait on team container at all. Currently there is a process

python3 /usr/bin/docker-wait-any -s swss -d syncd teamd
However, a thread inside /usr/bin/docker-wait-any is actually crashed, and the behavior is same as ignoring teamd. It still keep the whole system working.

The root fix should check service enabled instead exists, so it will not wait-any on teamd at all. After this PR,

python3 /usr/bin/docker-wait-any -s swss -d syncd
Work item tracking
Microsoft ADO (number only):
Fixing Bug: dockers flapping on SONiC fan out switch due to behavior change in docker-wait-any-rs compared to docker-wait-any when the docker does not exist sonic-net#24730
…24676)

Why I did it
Upgrade xgs SAI to 14.1 and update knet driver.

Work item tracking
Microsoft ADO (number only): 36045937
How I did it
Update xgs SAI version in sai.mk file and update saibcm-module.

How to verify it
https://elastictest.org/scheduler/testplan/693149ff990b73a38d48c607
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@kewei-arista
Copy link
Contributor Author

@sdszhang I messed up this PR when I was trying to sign my commit. Closed this one and created a new one instead: #24774

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.