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.

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-buildimage:202205 to 202205 #103

Merged
merged 3 commits into from
Sep 8, 2023

Conversation

mssonicbld
Copy link
Contributor

* 8f65b7874 - (head/202205) [minigraph] remove number of lanes check for changing speed from 400G to 100G and set speed setting before lane reconfiguration  (#16452) (2023-09-07) [vdahiya12]
* 0bc006816 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#16481) (2023-09-07) [mssonicbld]<br>```

mssonicbld and others added 3 commits September 7, 2023 10:17
…atically (#16481)

src/sonic-utilities

* 787b4a32 - (HEAD -> 202205, origin/202205) Remove SFP index usage in generating list of SFP hw error (#2961) (6 hours ago) [Prince George]
… to 100G and set speed setting before lane reconfiguration (#16452)

* [minigraph] remove number of lanes check for changing speed from 400G to 100G and set speed setting before lane reconfiguration   (#15721)

8111 800G interface, split to 2x400G (each has 4 lanes) fails to change interface speed from 400G to 100G during deploy mg. In minigraph.xml, the interface speed configuration is good, but fails to generate the right value to config_db.json.

In order to support this SKU the speed transitioning should support both 4 lanes and 8 lanes in the port_config.ini.

Why I did it

before this change for a 400G to 100G transition, in all cases except when lanes are 8, we would continue and the line
ports.setdefault(port_name, {})['speed'] = port_speed_png[port_name]
would not be executed, hence the default speed will never be set for a case and config_db will not be updated,
where speed is transitioning from 400G to 100G or 40G, but lanes are not equal to 8.

In order for those cases to pass where lanes are not specifically 8, we need the change

Work item tracking
24242657

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

* fix UT

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

---------

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
@mssonicbld mssonicbld requested a review from a team as a code owner September 8, 2023 03:00
@mssonicbld mssonicbld merged commit f58550c into Azure:202205 Sep 8, 2023
3 checks passed
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…omatically (#16715)

#### Why I did it
src/sonic-mgmt-common
```
* 42ca0a6 - (HEAD -> master, origin/master, origin/HEAD) DB Access Layer Merges: GetTablePattern ... (Azure#103) (10 hours ago) [a-barboza]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…utomatically (#18475)

#### Why I did it
src/sonic-host-services
```
* e93494c - (HEAD -> master, origin/master, origin/HEAD) Update sonic-host-services-data.determine-reboot-cause.service (Azure#119) (2 days ago) [Xincun Li]
* 15762a5 - Fix UT test data due to timestamp break. (Azure#117) (4 days ago) [Feng-msft]
* d53f431 - [caclmgrd]Fix bfd and vxlan acl rules programming in acl table update scenario (Azure#114) (13 days ago) [Sudharsan Dhamal Gopalarathnam]
* f2dbf25 - Add unittest for caclmgrd default deny rule (Azure#113) (2 weeks ago) [Zhijian Li]
* bfa06c7 - Change dependency option to fix buildimage issue. (Azure#110) (3 weeks ago) [Feng-msft]
* ba78bdb - Fix hostcfgd crash when delete entire config table. (Azure#106) (4 weeks ago) [Hua Liu]
* 6130886 - Update ProcessStats query by using API instead of parsing ps command. (Azure#103) (4 weeks ago) [Feng-msft]
```
#### 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