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.

Sign up for GitHub

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

Jump to bottom

[Nokia-7220 IXR] Add support for NOKIA 7220 IXR-H3, H4-32D, H5-64D platforms #18497

Merged
merged 4 commits into from
May 23, 2024
Merged

[Nokia-7220 IXR] Add support for NOKIA 7220 IXR-H3, H4-32D, H5-64D platforms #18497

merged 4 commits into from
May 23, 2024

Conversation

fzhou-nokia
Copy link
Contributor

@fzhou-nokia fzhou-nokia commented Mar 28, 2024 •
edited
Loading

Why I did it

Add support for NOKIA 7220 IXR-H3, NOKIA 7220-IXR-H4-32D & 7220-IXR-H5-64D platforms:

NOKIA 7220-IXR-H3:
Platform: x86_64-nokia_ixr7220_h3-r0
HwSKU: Nokia-IXR7220-H3
ASIC: Broadcom
Port Config: 32x400G + 2x10G

NOKIA 7220-IXR-H4-32D:
Platform: x86_64-nokia_ixr7220_h4_32d-r0
HwSKU: Nokia-IXR7220-H4-32D
ASIC: Broadcom
Port Config: 32x400G + 1x10G

NOKIA 7220-IXR-H5-64D:
Platform: x86_64-nokia_ixr7220_h5_64d-r0
HwSKU: Nokia-IXR7220-H5-64D
ASIC: Broadcom
Port Config: 64x400G + 2x10G

Work item tracking
  • Microsoft ADO (number only):

How I did it

  1. Added module for each platform under ../device/nokia directory.
  2. Modified the platform/broadcom/one-image.mk to include each PLATFORM_MODULE
  3. Modified the platform/broadcom/ platform-modules-nokia.mk to include each platform
  4. Add platform related directory ixr7220h3, ixr7220h4-32d and ixr7220h5-64d in platform/Broadcom/sonic-platform-modules-nokia
  5. Modified related build scripts in platform/Broadcom/sonic-platform-modules-nokia/debian

How to verify it

  1. Make sure the sonic-buildimage is successful
  2. Run this image on x86_64-nokia_ixr7220_h3-r0 and verify all dockers are up and test basic commands like:
    o show version
    o show platform summary
    o show platform syseeprom
    o show platform fan
    o show platform psustatus
    o show platform firmware status
    o show platform temperature
    o sudo show system-health detail
    o show interface status
  3. Run OC test, for T0/T1 topology and have 100% pass on platform.
  4. Run this image on x86_64-nokia_ixr7250e_sup-r0 and x86_64-nokia_ixr7250e_36x400g-r0, make sure all functions run correctly.

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

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)

@fzhou-nokia fzhou-nokia marked this pull request as ready for review March 28, 2024 19:04
@fzhou-nokia fzhou-nokia requested a review from lguohan as a code owner March 28, 2024 19:04
@fzhou-nokia
Copy link
Contributor Author

@Pavan-Nokia @jon-nokia @mlok-nokia Please help review

jon-nokia
jon-nokia reviewed Mar 28, 2024
View reviewed changes
device/nokia/x86_64-nokia_ixr7220_h3-r0/plugins/led_control.py Outdated
else:
oldfan = 0xf

""" # Front Panel PSU1 Panel LED setting
Copy link
Contributor

Choose a reason for hiding this comment

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

In general, we should not commit untested and/or commented out code. Save this for some other commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! I update it with 661c78b

@liushilongbuaa
Copy link
Contributor

/azpw ms_conflict

@mssonicbld
Copy link
Collaborator

@StormLiangMS,@liushilongbuaa PR: #18497 is conflict with MS internal repo
Please push fix commit to sonicbld/precheck/head/18497 and approve
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9811366
After ms PR is merged, comment "/azpw ms_conflict" to rerun PR checker.

@Pavan-Nokia
Copy link
Contributor

@StormLiangMS,@liushilongbuaa PR: #18497 is conflict with MS internal repoPlease push fix commit to sonicbld/precheck/head/18497 and approvehttps://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9811366After ms PR is merged, comment "/azpw ms_conflict" to rerun PR checker.

@liushilongbuaa @StormLiangMS Can you please take a look at this

@liushilongbuaa
Copy link
Contributor

/azpw ms_conflict

@mssonicbld
Copy link
Collaborator

@StormLiangMS,@liushilongbuaa PR: #18497 is conflict with MS internal repo
Please push fix commit to sonicbld/precheck/head/18497 and approve
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9852302
After ms PR is merged, comment "/azpw ms_conflict" to rerun PR checker.

@liushilongbuaa
Copy link
Contributor

/azpw ms_conflict

@Pavan-Nokia
Copy link
Contributor

@liushilongbuaa @mssonicbld How can we help resolve this "internal conflict" issue and get this PR merged.

@liushilongbuaa
Copy link
Contributor

@liushilongbuaa @mssonicbld How can we help resolve this "internal conflict" issue and get this PR merged.

It is resolved last week.

@Pavan-Nokia
Copy link
Contributor

@liushilongbuaa @mssonicbld How can we help resolve this "internal conflict" issue and get this PR merged.

It is resolved last week.

I still see that the corresponding PR check is in pending state and has not completed.
Do you recommend we restart the checks?

@fzhou-nokia
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@fzhou-nokia
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@fzhou-nokia
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Blueve
Copy link
Contributor

Blueve commented Apr 22, 2024

Run this image on x86_64-nokia_ixr7250e_sup-r0 and x86_64-nokia_ixr7250e_36x400g-r0, make sure all functions run correctly.

Why you state that you tested on 7250?

@fzhou-nokia
Copy link
Contributor Author

Run this image on x86_64-nokia_ixr7250e_sup-r0 and x86_64-nokia_ixr7250e_36x400g-r0, make sure all functions run correctly.

Why you state that you tested on 7250?

The H3 and 7250 share build files, so we have tested and made sure that our changes have not caused any regression to already existing platforms.

@Pavan-Nokia
Copy link
Contributor

@Blueve @yxieca Please help merge

@yxieca yxieca requested a review from prgeor May 13, 2024 17:41
@yxieca
Copy link
Contributor

yxieca commented May 13, 2024

@prgeor can you help review this PR?

@fzhou-nokia
[Nokia-7220-H3] Add support for NOKIA 7220 IXR-H3 platform
6389734 
Add support for NOKIA 7220 IXR-H3:

Platform: x86_64-nokia_ixr7220_h3-r0
HwSKU: Nokia-IXR7220-H3
ASIC: Broadcom
Port Config: 32x400G + 2x10G
@fzhou-nokia
[Nokia-7220-H3] Add support for NOKIA 7220 IXR-H3 platform
bd7f34a 
update pmon link
@fzhou-nokia
Remove untested code
0526fe9
@fzhou-nokia
[Nokia-7220-H4-32D][Nokia-7220-H5-64D]Add support for NOKIA 7220 IXR-…
9cf0ebc 
…H4-32D and 7220 IXR-H5-64D platforms
@fzhou-nokia fzhou-nokia changed the title [Nokia-7220-H3] Add support for NOKIA 7220 IXR-H3 platform [Nokia-7220 IXR] Add support for NOKIA 7220 IXR-H3, H4-32D, H5-64D platforms May 16, 2024
@Pavan-Nokia
Copy link
Contributor

@liushilongbuaa After we rebased the PR to latest Master the internal conflict (ms_conflict) has appeared again.
Could you please help resolve.

@liushilongbuaa
Copy link
Contributor

@liushilongbuaa After we rebased the PR to latest Master the internal conflict (ms_conflict) has appeared again. Could you please help resolve.

We are fixing the conflict. It still needs about 12 hours for the automation.

@Pavan-Nokia
Copy link
Contributor

@liushilongbuaa After we rebased the PR to latest Master the internal conflict (ms_conflict) has appeared again. Could you please help resolve.

We are fixing the conflict. It still needs about 12 hours for the automation.

@liushilongbuaa Thank you for your help with this.
Are we all set to retry the PR checks?

@liushilongbuaa
Copy link
Contributor

/azpw ms_conflict

@Pavan-Nokia
Copy link
Contributor

@yxieca Please help merge
Thank you

@yxieca yxieca merged commit 3acd509 into sonic-net:master May 23, 2024
19 checks passed
@fzhou-nokia fzhou-nokia deleted the dev_h3 branch May 23, 2024 17:28
@gechiang gechiang mentioned this pull request Jun 6, 2024
Closed
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jon-nokia jon-nokia jon-nokia left review comments

@prgeor prgeor prgeor approved these changes

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@fzhou-nokia @liushilongbuaa @mssonicbld @Pavan-Nokia @Blueve @yxieca @prgeor @jon-nokia