Skip to content

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

Merged
mssonicbld merged 16 commits intoAzure:202205from
mssonicbld:codesync-202205
Jun 1, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

@mssonicbld mssonicbld commented Jun 1, 2023

* 36b1341b1 - (head/202205) [Mellanox] Update hw-mgmt to 7.0020.4301 (#15260) (#15281) (2023-06-01) [mssonicbld]
* a82895659 - [CI/CD] Refine PR test templates and test_plan.py to be ready to migrate to Elastictest (#15258) (2023-05-31) [Ye Jianquan]
* 9f66b2806 - [202205][brcm] Fix alignment of soc properties (#15240) (2023-05-30) [Neetha John]
* d5abda649 - Change the docker image from alpine to debian in Makefile (#15132) (2023-05-29) [xumia]
* 6cf6c59c8 - [ci/build]: Upgrade SONiC package versions (#15245) (2023-05-28) [mssonicbld]
* d00dd1fca - [ci/build]: Upgrade SONiC package versions (#15243) (2023-05-27) [mssonicbld]
* 8661e9de2 - [202205] Update SOC properties for DLR_INIT based pfcwd recovery (#15217) (2023-05-26) [Neetha John]
* a4633d32e - Clean up the old version container images (#14978) (#15232) (2023-05-26) [mssonicbld]
* 934cf5d4c - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15236) (2023-05-26) [mssonicbld]
* 294292b1c - [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15235) (2023-05-26) [mssonicbld]
* 151a19421 - [YANG] Add MgmtLeafRouter to Device Neighbor Metadata element type list (#15202) (#15231) (2023-05-26) [mssonicbld]
* 21aa832da - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15205) (2023-05-26) [mssonicbld]
* 9f8a250f6 - Add soc property sai_pfc_dlr_init_capability=0 to missing DNX SKUs (#15155) (2023-05-26) [arista-nwolfe]
* b11e5b66e - SONiC Yang model support for IPv6 link local (#15182) (2023-05-26) [Akhilesh Samineni]
* f3ac3dd46 - [202205][minigraph] Add rack_mgmt_rack parse support in minigraph.py (#15064) (#15177) (2023-05-26) [Yaqiang Zhu]<br>```

yaqiangz and others added 15 commits May 26, 2023 08:49
…(#15064) (#15177)

Why I did it
We need to store information of power shelf in config_db for SONiC MX switch. Current minigraph parser cannot parse rack_mgmt_map field.

Work item tracking
Microsoft ADO (number only): 22179645
How I did it
Add support for parsing rack_mgmt_map.
This is backport of #14757

SONiC Yang model support for IPv6 link local

What I did
Created SONiC Yang model for IPv6 link local

How I did it
Defined Yang models for IPv6 link local based on https://github.com/sonic-net/SONiC/blob/master/doc/ipv6/ipv6_link_local.md

How to verify it
Added enable test case.

Signed-off-by: Akhilesh Samineni <[email protected]>
…D automatically (#15205)

src/sonic-platform-daemons

* f9547b7 - (HEAD -> 202205, origin/202205) Use tx_disable_channel with media_lanes_mask (Azure#353) (28 hours ago) [rajann]
…st (#15202) (#15231)

Why I did it
Introduce a new valid neighbor element type to YANG.

Work item tracking
Microsoft ADO (number only): 23994521
How I did it
Add MgmtLeafRouter to element network type list.

How to verify it
Passes UTs

Co-authored-by: Jing Kan <[email protected]>
… automatically (#15235)

src/sonic-platform-common

* f1f1dd3 - (HEAD -> 202205, origin/202205) Update CMIS api's rendering max-duration (Azure#375) (3 minutes ago) [rajann]
…D automatically (#15236)

src/sonic-platform-daemons

* 2466680 - (HEAD -> 202205, origin/202205) add async notification support in active-active topo; refactor code for ycable tasks for change events  (Azure#327) (5 minutes ago) [vdahiya12]
* a07bc21 - [ycabled] refactor code for onboarding async client changes;refactor (Azure#355) (5 minutes ago) [vdahiya12]
Why I did it
Our k8s feature will pull new version container images for each upgrade, the container images inside sonic will be more and more, but for now we don’t have a way to clean up the old version container images, the disk may be filled up. Need to add cleaning up the old version container images logic.

Work item tracking
Microsoft ADO (number only):
17979809
How I did it
Remove the old version container images besides the feature's current version and last version image, last version image is saved for supporting fallback.

How to verify it
Check whether the old version images are removed

Co-authored-by: lixiaoyuner <[email protected]>
…217)

Why I did it
Update soc properties for certain roles that need to use pfcwd dlr init based recovery mechanism

How to verify it
Updated the templates on a 7050cx3 dual tor and 7260 T1 which satisfies these conditions and validated pfcwd recovery which uses DLR_INIT based mechanism. Also validated that this mechanism is not used on 7050cx3 single tor with the updated templates

Signed-off-by: Neetha John <[email protected]>
Why I did it
For security and consistency consideration, change the docker image from alpine to Debian in Makefile

Work item tracking
Microsoft ADO (number only): 23077660
How I did it
change the docker image from alpine to Debian in Makefile
Why I did it
To improve readability of config.bcm, fixed the alignment of soc properties

How to verify it
Build sonic_config_engine-1.0-py3-none-any.whl successfully

Signed-off-by: Neetha John <[email protected]>
@mssonicbld mssonicbld requested review from a team, lguohan, qiluo-msft and xumia as code owners June 1, 2023 08:58
@mssonicbld mssonicbld merged commit 7ff17e4 into Azure:202205 Jun 1, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Aug 9, 2023
Added below commits:
9b30690 jcaiMR Fri Dec 16 fix handleSwssNotification crash in dhcp6relay (Azure#28)
047afb7 jcaiMR Wed Dec 14 14:08:58 2022 +0800 Fix multiple vlan issue (Azure#27)
ff6bec3 Vivek Thu Dec 8 09:44:15 2022 -0800 Made the Error log informative (Azure#22)
2fbe729 jcaiMR Wed Nov 30 14:41:53 2022 +0800 disable cfg dynamic change (Azure#25)
13d0805 Liu Shilong Wed Nov 30 10:54:11 2022 +0800 Use github code scanning instead of LGTM (Azure#26)
1e846f6 kellyyeh Wed Nov 23 14:36:02 2022 -0800 Fix packet range check for relay-reply packets (Azure#21)
4d19e13 kellyyeh Thu Nov 17 10:04:53 2022 -0800 Add unittest infrastructure (Azure#5)
7f4fdab jcaiMR Fri Nov 11 14:47:51 2022 +0800 fix packet range check issue (Azure#20)
257ecdf kellyyeh Thu Nov 3 11:34:11 2022 -0700 Add client packet UDP header length check (Azure#19)
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
Update the sonic-pins submodule. This brings in the following commit:

56a7762 Use json.hpp from nlohmann-json-dev instead of from swss-common (Azure#22)

Signed-off-by: Saikrishna Arcot <[email protected]>
liushilongbuaa pushed a commit that referenced this pull request Dec 26, 2024
…tically (#19550)

#### Why I did it
src/sonic-dash-api
```
* 1fd0b7d - (HEAD -> 202405, origin/202405) [202405 build] Update pool sonicbld to sonic-ububtu-1c since it's deprecated (#22) (11 days ago) [Jianquan Ye]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 26, 2025
…tically (#703)

#### Why I did it
src/sonic-sairedis
```
* 74ebac0 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #21 from Azure/revert-17-cherry/msft-202412/1508 (10 hours ago) [Riff]
|\ 
| failure_prs.log skip_prs.log 1558b98 - (origin/revert-17-cherry/msft-202412/1508) Revert "[hash] update ECMP/LAG hash VS lib with SAI_NATIVE_HASH_FIELD_IPV6_FL…" (30 hours ago) [Riff]
* 8ecb1e9 - [code sync] Merge code from sonic-net/sonic-sairedis:202411 to 202412 (#22) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request May 21, 2025
…t back to back Paladin ports up with Arista-7060X6-16PE-384C-O128S2

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it

Currently when we loaded HWSKU `Arista-7060X6-16PE-384C-O128S2` on two moby devices and connect their Paladin ports back to back, we can't get link up. It may help if we can get these links up and run the tests.

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

#### How I did it

Created a new `FANOUT` HWSKU containing special lanemap and polarity configs so that we can load `Arista-7060X6-16PE-384C-O128S2` on one Moby and `Arista-7060X6-16PE-384C-O128S2-FANOUT` and get Paladin ports up when connecting them back to back with the following setup:
```
Moby1                                    Moby2
HWSKU: Arista-7060X6-16PE-384C-O128S2    HWSKU: Arista-7060X6-16PE-384C-O128S2-FANOUT
Azure#17                 <->                  Azure#18
Azure#19                 <->                  Azure#20
Azure#21                 <->                  Azure#22
Azure#23                 <->                  Azure#24

Azure#18                 <->                  Azure#17
Azure#20                 <->                  Azure#19
Azure#22                 <->                  Azure#21
Azure#24                 <->                  Azure#23
```

#### How to verify it
Verified that all the Paladin ports can link up with the above setup.

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [x] msft-202412

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Created `Arista-7060X6-16PE-384C-O128S2-FANOUT` based on `Arista-7060X6-16PE-384C-O128S2` and only update lanemap and polarity settings in bcm config.

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
mssonicbld added a commit that referenced this pull request May 21, 2025
…UT so that we can get back to back Paladin ports up with Arista-7060X6-16PE-384C-O128S2 (#1144)

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it

Currently when we loaded HWSKU `Arista-7060X6-16PE-384C-O128S2` on two moby devices and connect their Paladin ports back to back, we can't get link up. It may help if we can get these links up and run the tests.

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

#### How I did it

Created a new `FANOUT` HWSKU containing special lanemap and polarity configs so that we can load `Arista-7060X6-16PE-384C-O128S2` on one Moby and `Arista-7060X6-16PE-384C-O128S2-FANOUT` and get Paladin ports up when connecting them back to back with the following setup:
```
Moby1 Moby2
HWSKU: Arista-7060X6-16PE-384C-O128S2 HWSKU: Arista-7060X6-16PE-384C-O128S2-FANOUT
#17 <-> #18
#19 <-> #20
#21 <-> #22
#23 <-> #24

#18 <-> #17
#20 <-> #19
#22 <-> #21
#24 <-> #23
```

#### How to verify it
Verified that all the Paladin ports can link up with the above setup.

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [x] msft-202412

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Created `Arista-7060X6-16PE-384C-O128S2-FANOUT` based on `Arista-7060X6-16PE-384C-O128S2` and only update lanemap and polarity settings in bcm config.

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
r12f added a commit that referenced this pull request Jun 19, 2025
…test HEAD automatically (#1246)

#### Why I did it
src/sonic-platform-daemons
```
* c6f5f57 - (HEAD -> 202412, origin/202412) xcvrd: Remove SFP API object when SFP is removed (#22) (9 hours ago) [mssonicbld]
* a68c977 - Add Robust Exception Handling to pcied Daemon for Improved Stability (#618) (#20) (2 days ago) [Vasundhara Volam]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jun 20, 2025
…test HEAD automatically (#1263)

#### Why I did it
src/sonic-platform-daemons
```
* e71651b - (HEAD -> 202503, origin/202503) Merge pull request #24 from mssonicbld/sonicbld/202503-merge (21 hours ago) [mssonicbld]
* 1584d10 - Merge branch '202412' of https://github.com/Azure/sonic-platform-daemons.msft into 202503 (23 hours ago) [Sonic Automation]
* c6f5f57 - (origin/202412) xcvrd: Remove SFP API object when SFP is removed (#22) (33 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…t back to back Paladin ports up with Arista-7060X6-16PE-384C-O128S2 (#22719)

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it

Currently when we loaded HWSKU `Arista-7060X6-16PE-384C-O128S2` on two moby devices and connect their Paladin ports back to back, we can't get link up. It may help if we can get these links up and run the tests.

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

#### How I did it

Created a new `FANOUT` HWSKU containing special lanemap and polarity configs so that we can load `Arista-7060X6-16PE-384C-O128S2` on one Moby and `Arista-7060X6-16PE-384C-O128S2-FANOUT` and get Paladin ports up when connecting them back to back with the following setup:
```
Moby1 Moby2
HWSKU: Arista-7060X6-16PE-384C-O128S2 HWSKU: Arista-7060X6-16PE-384C-O128S2-FANOUT
#17 <-> #18
#19 <-> #20
#21 <-> #22
#23 <-> #24

#18 <-> #17
#20 <-> #19
#22 <-> #21
#24 <-> #23
```

#### How to verify it
Verified that all the Paladin ports can link up with the above setup.

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [x] msft-202412

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Created `Arista-7060X6-16PE-384C-O128S2-FANOUT` based on `Arista-7060X6-16PE-384C-O128S2` and only update lanemap and polarity settings in bcm config.

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
* Update the kernel to 6.1.123 (#21711)

Why I did it
This updates the kernel to 6.1.123 to bring in bug and security fixes. This also includes a submodule update for sonic-linux-kernel and platform/broadcom/saibcm-modules-dnx.

sonic-linux-kernel:

aec83ae Update to Linux 6.1.123 (#454)
platform/broadom/saibcm-modules-dnx:

13a2b7a Update to Linux 6.1.123 (#22)
This also includes a hw-mgmt update for Mellanox platforms.

Work item tracking
Microsoft ADO (number only): 32198326

How to verify it
Verified that KVM and a physical device boots up, and verified that warm reboot of physical device works.

Signed-off-by: Saikrishna Arcot <[email protected]>
Co-authored-by: Vivek <[email protected]>

* Fix submodule hash to point to 202505 branch

Signed-off-by: Saikrishna Arcot <[email protected]>

---------

Signed-off-by: Saikrishna Arcot <[email protected]>
Co-authored-by: Vivek <[email protected]>
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
Why I did it
This updates the kernel to 6.1.123 to bring in bug and security fixes. This also includes a submodule update for sonic-linux-kernel and platform/broadcom/saibcm-modules-dnx.

sonic-linux-kernel:

aec83ae Update to Linux 6.1.123 (#454)
platform/broadom/saibcm-modules-dnx:

13a2b7a Update to Linux 6.1.123 (#22)
This also includes a hw-mgmt update for Mellanox platforms.

Work item tracking
Microsoft ADO (number only): 32198326

How to verify it
Verified that KVM and a physical device boots up, and verified that warm reboot of physical device works.

Signed-off-by: Saikrishna Arcot <[email protected]>
Co-authored-by: Vivek <[email protected]>
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.

7 participants