Skip to content

Keep eth1 for multi-asic disaggregated chassis platforms#24298

Merged
kperumalbfn merged 2 commits intosonic-net:masterfrom
BYGX-wcr:fix-device-data-for-masic-ut2
Oct 28, 2025
Merged

Keep eth1 for multi-asic disaggregated chassis platforms#24298
kperumalbfn merged 2 commits intosonic-net:masterfrom
BYGX-wcr:fix-device-data-for-masic-ut2

Conversation

@BYGX-wcr
Copy link
Copy Markdown
Contributor

Why I did it

My original PR #24198 only fixed the eth1 problem for single-asic disaggregated chassis platform but it didn't resolve the problem for multi-asic platforms.

Work item tracking
  • Microsoft ADO (number only):

How I did it

Applied the same logic change in #24198 for multi-asic scenario.

How to verify it

Build a new sonic-device-data deb package and install it on a device. Then, check the HwSKU directory.

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

  • 202205
  • 202211
  • 202305
  • 202311
  • 202405
  • 202411
  • 202503

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

Copilot AI review requested due to automatic review settings October 21, 2025 00:36
@BYGX-wcr BYGX-wcr requested a review from lguohan as a code owner October 21, 2025 00:36
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@BYGX-wcr BYGX-wcr requested a review from rlhui October 21, 2025 00:36
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR extends the fix from #24198 to preserve the eth1 midplane interface for multi-ASIC disaggregated chassis platforms. The original fix only addressed single-ASIC platforms.

Key changes:

  • Added debug logging to indicate when midplane interface reservation occurs
  • Moved variable initialization and conditional logic to handle multi-ASIC scenarios correctly
  • Ensures consistency between single-ASIC and multi-ASIC code paths

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

last_line=$$(tail -n 1 device/x86_64-kvm_x86_64-r0/$$(basename $$d)/$$(basename $$subdir)/port_config.ini); \
num_columns=$$(echo $$last_line | awk '{print NF}'); \
while IFS= read -r line; do \
while IFS= read -r line || [ -n "$$line" ]; do \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you dont need change in Line #116?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, line 116 is for allocating an intf for cpu port

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BYGX-wcr Do we have any test to capture this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

T2 KVM PR checker will fail if this change impacted traditional chassis. For now, we don't have dedicated sanity test for virtual DT2.

@kperumalbfn kperumalbfn merged commit d721996 into sonic-net:master Oct 28, 2025
21 checks passed
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Dec 4, 2025
…4298)

Keep eth1 for multi-asic disaggregated chassis platforms

Signed-off-by: Feng Pan <[email protected]>
xwjiang-ms pushed a commit to xwjiang-ms/sonic-buildimage that referenced this pull request Dec 22, 2025
…4298)

Keep eth1 for multi-asic disaggregated chassis platforms

Signed-off-by: xiaweijiang <[email protected]>
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.

5 participants