Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#101

Merged
mssonicbld merged 16 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Sep 7, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#101
mssonicbld merged 16 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Collaborator

* 70ff54ccc - (head/202205) [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#16475) (2023-09-06) [mssonicbld]
* 7a9c05c1e - [yang] Add Bmc to Device Neighbor Metadata element type list (#16188) (#16470) (2023-09-06) [mssonicbld]
* 7f35f4c20 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#16476) (2023-09-06) [mssonicbld]
* f2f8f5f7a - [submodule] Update submodule linkmgrd to the latest HEAD automatically (#16474) (2023-09-06) [mssonicbld]
* 95f9f4495 - [YANG][vlan-sub-interface] Add `vlan` field (#15838) (#16469) (2023-09-06) [mssonicbld]
* 86b4d38bd - [YANG SONIC-ACL] Fix Yang definition of ACL_TABLE_TYPE (#16247) (#16472) (2023-09-06) [mssonicbld]
* 4adaa2854 - [minigraph-parser] Update the definition of acl table type BMCDATA and BMCDATAV6 (#16249) (#16473) (2023-09-06) [mssonicbld]
* 624a5d489 - [Mellanox] Revise label name and fix typo in sensor.conf of 4600C (#16271) (#16467) (2023-09-06) [mssonicbld]
* 0fe5c9fc7 - [platform]: Disable interrupt for intel i2c-i801 driver (#16309) (#16457) (2023-09-06) [mssonicbld]
* 07955af2e - [ci/build]: Upgrade SONiC package versions (#16316) (2023-09-05) [mssonicbld]
* 89f091ede - [Mellanox] set select timeout to no more than 1 sec to make sure fast shutdown (#13611) (#16449) (2023-09-05) [mssonicbld]
* d5e2c0004 - Assign the higher metric value for Ipv6 default route learnt via RA message (#16367) (#16440) (2023-09-05) [mssonicbld]
* a9564286b - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#16390) (2023-09-05) [mssonicbld]
* 8cac746a0 - Fix openconfig_acl.py (#16303) (#16345) (2023-09-05) [mssonicbld]
* 1d3d70986 - Update cisco-8000.ini (#16387) (2023-09-05) [James An]<br>```

jamesan47 and others added 16 commits September 5, 2023 21:42
Why I did it

Common Release Notes for 8102-64H, T0/DualTor, and 8101-32FH

Fix for an issue where drop counters were incrementing twice for packets with invalid tag
Fix for the ECC errors reported in SR 695600099
Fix for fwutil show updates failure

How I did it

Update platform version to 202205.2.2.11
How I did it
Fix the regex for L4 port range in openconfig_acl.py.

How to verify it
Build image and install on Arista-720DT DUT, then try the repro steps in #16189 and confirmed the ACL rule be setup correctly:

Co-authored-by: Zhijian Li <zhijianli@microsoft.com>
…D automatically (#16390)

src/sonic-platform-daemons

* 0258ecf - (HEAD -> 202205, origin/202205) [pmon][chassis][voq] Chassis DB cleanup when module is down (Azure#394) (9 hours ago) [vganesan-nokia]
…essage (#16367) (#16440)

* Fix the Loopback0 IPv6 address of LC's in chassis not reachable from peer device's
* Assign the metric vaule for Ipv6 default route learnt via RA message to higher value so that BGP learnt default route is higher priority.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com>
… shutdown (#13611) (#16449)

- Why I did it
Commit sonic-net/sonic-platform-daemons@153ea47 changed SfpStateUpdateTask from Process to Thread. In this commit, it raises an exception in SfpStateUpdateTask to make shutdown flow fast. But it does not work on Nvidia platform as Nvidia platform is passing timeout parameter of get_change_event to select. Linux select function can not be interrupted by a Python exception. There is no such issue on Nvidia platform before that commit. However, in order to comply with the commit and make shutdown flow fast, we decided to change Nvidia platform API implementation.

To fix issue #13591.

- How I did it
The select call in get_change_event should use no more than 1 second as timeout parameter.
Outside the select call, add a while loop to make sure timeout parameter of get_change_event work as expected

- How to verify it
Manual test

Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
…457)

On S6100 we are seeing almost 100K interrupts per second on intels i801 SMBUS controller which affects systems performance.

We now disable the i801 driver interrupt and instead enable polling

Microsoft ADO (number only): 24910530

How I did it
Disable the interrupt by passing the interrupt disable feature argument to i2c-i801 driver

How to verify it
This fix is NOT applicable for ARM based platforms. Applicable only for intel based platforms:-

- On SN2700 its already disabled in Mellanox hw-mgmt
- Celestica DX010 and E1031
- Dell S6100 verified the interrupts are no longer incrementing.
- Arista 7260CX3

Signed-off-by: Prince George <prgeor@microsoft.com>
Co-authored-by: Prince George <45705344+prgeor@users.noreply.github.com>
…6271) (#16467)

- Why I did it
Revise lable name and fix typo in sensor.conf of 4600C

- How I did it
Revise lable name and fix typo in sensor.conf of 4600C

- How to verify it
Manual test
sonic-mgmt test_sensors.py

Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
…d BMCDATAV6 (#16249) (#16473)

Why I did it
According to ACL-Table-Type-HLD, the value type of MATCHES, ACTIONS and BIND_POINTS should be list instead of string. Opening this PR to update the definition of BMCDATA and BMCDATAV6.

How I did it
Update the definition of BMCDATA and BMCDATAV6 in minigraph-parser.

How to verify it
Verified by UT and build SONiC image.

Co-authored-by: Zhijian Li <zhijianli@microsoft.com>
How I did it
Update Yang definition of ACL_TABLE_TYPE.
Update existing testcase.
Add new testcase to cover lowercase key scenario.

How to verify it
Verified by building sonic_yang_models-1.0-py3-none-any.whl. While building the target package, unit tests were run and passed.

Co-authored-by: Zhijian Li <zhijianli@microsoft.com>
* [YANG][vlan-sub-interface] Add `vlan` field



* Fix typo



* Fix UT



---------

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Co-authored-by: Longxiang Lyu <35479537+lolyu@users.noreply.github.com>
…y (#16474)

src/linkmgrd

* 4bf3ebb - (HEAD -> 202205, origin/202205) [active-standby] Fix extra toggle observed in `config reload` (Azure#216) (53 minutes ago) [Longxiang Lyu]
…atically (#16476)

src/sonic-utilities

* 03292ffe - (HEAD -> 202205, origin/202205) Fix show acl table for masic (#2937) (6 minutes ago) [Arvindsrinivasan Lakshmi Narasimhan]
* 627a2f59 - [Techsupport] Update the message seen during the lock acquisition failure (#2897) (55 minutes ago) [Vivek]
… (#16470)

Bmc is a valid neighbor type in minigraph, however it was missing from the YANG model definition. Usually, the Bmc type device can be neighbor of BmcMgmtToRRouter. This PR is to introduce this type.

Co-authored-by: Yaqiang Zhu <zyq1512099831@gmail.com>
… automatically (#16475)

src/sonic-platform-common

* 6a38e71 - (HEAD -> 202205, origin/202205) Default implementation of under/over speed checks (Azure#382) (10 minutes ago) [spilkey-cisco]
* 9f2f61d - Convert the tx/rx power unit to the dBm unit (Azure#377) (11 minutes ago) [ChiouRung Haung]
@mssonicbld mssonicbld requested review from a team, lguohan and qiluo-msft as code owners September 7, 2023 03:01
@mssonicbld mssonicbld merged commit 1fc2591 into Azure:202205 Sep 7, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…utomatically (#17850)

#### Why I did it
src/sonic-host-services
```
* 970e7b3 - (HEAD -> master, origin/master, origin/HEAD) Fix sonic host service (Azure#101) (5 hours ago) [ganglv]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms added a commit that referenced this pull request Jul 2, 2025
…tomatically (#1312)

#### Why I did it
src/sonic-swss
```
*   6f1603e - (HEAD -> 202503, origin/202503) Merge pull request #101 from bingwang-ms/cherry_pick_3698 (5 hours ago) [bingwang-ms]
|\  
| * ebab681 - Recreate any port(s) if the configured speed does not match (6 hours ago) [Prince George]
|/  
* 08f6b0a - Merge pull request #100 from Azure/revert-99-cherry_pick_3698 (6 hours ago) [bingwang-ms]
* 100bbaf - (origin/revert-99-cherry_pick_3698) Revert "Recreate any port(s) if the configured speed does not match" (6 hours ago) [bingwang-ms]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jul 18, 2025
…est HEAD automatically (#1370)

#### Why I did it
src/sonic-platform-common
```
* 1f222d6 - (HEAD -> 202503, origin/202503) Merge pull request #101 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 28243d5 - Merge branch '202412' of https://github.com/Azure/sonic-platform-common.msft into 202503 (23 hours ago) [Sonic Automation]
* e3e1d76 - (origin/202412) Adding is_copper api to cmis (#547) (#573) (#100) (2 days ago) [Riff]
* 1485079 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (3 days ago) [r12f]
* 7c70958 - Adding is_copper api to cmis (#547) (#573) (2 weeks ago) [ravil-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Pterosaur pushed a commit that referenced this pull request Sep 17, 2025
…tomatically (#1610)

#### Why I did it
src/sonic-gnmi
```
* 0222d5f - (HEAD -> 202412, origin/202412) Merge pull request #101 from Azure/202412-dev (2 hours ago) [Zain Budhwani]
* ec20f64 - (origin/202412-dev) Support Show Interface tranceiver lpmode  (#92) (17 hours ago) [yiliu4]
* c9b5498 - "Make interface as arg instead of option for `show interface alias` and `show interface flap` (#100) (24 hours ago) [axin]
* e9f0e29 - Add show interfaces portchannel /ecn (#77) (27 hours ago) [jiayuj2021]
* 126f6fe - Add implementation for 'show ipv6 prefix-list' (#84) (34 hours ago) [nanali-msft]
* 9977ae6 - Remove non-common functions from show_common.go (#98) (34 hours ago) [gnemuw]
* d76043c - Add option SONIC_CLI_IFACE_MODE to support naming mode environment variable refresh in gnmi (#88) (2 days ago) [axin]
* 37692e9 - Replacing the `queue-type` option with subcommands for `show queue watermark` (#89) (2 days ago) [mramezani95]
* 3f4bd4b - Fix srv6 stats (#95) (2 days ago) [Changrong Wu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
…e latest HEAD automatically (#24535)

#### Why I did it
src/wpasupplicant/sonic-wpa-supplicant
```
* b1699b610 - (HEAD -> master, origin/master, origin/HEAD) Automated agent pool migration for branch master (#101) (4 days ago) [yijingyan2]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants