Skip to content

[Ruijie] Add ruijie platform & device #4954

Merged
jleveque merged 14 commits intosonic-net:masterfrom
tim-rj:add-ruijie-bsp-device
Feb 25, 2021
Merged

[Ruijie] Add ruijie platform & device #4954
jleveque merged 14 commits intosonic-net:masterfrom
tim-rj:add-ruijie-bsp-device

Conversation

@tim-rj
Copy link
Copy Markdown
Contributor

@tim-rj tim-rj commented Jul 13, 2020 

-What I did it
Add new platform x86_64-ruijie_b6510-48vs8cq-r0 (Trident 3)
ASIC Vendor: Broadcom
Switch ASIC: Trident 3
Port Config: 48x25G+8x100G

-How I did it
Provide device and platform related files.

-How to verify it
show platform fan
show platform ssdhealth
show platform psustatus
show platform summary
show platform syseeprom
show platform temperature
show interface status

ruijie-bsp-device-checkoutlog.txt

tim-rj added 4 commits July 13, 2020 20:04
@tim-rj
[platform/ruijie] Add ruijie device
9391b86 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@tim-rj
[platform/ruijie] Add Ruijie platform b6510
d998c2c 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@tim-rj
[platform/ruijie] Support platform new api
e513bb8 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@tim-rj
[platform/ruijie] Fix LGTM alerts version1
4e7a3d7 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jul 13, 2020

This pull request introduces 22 alerts when merging 4e7a3d7 into 39941f0 - view on LGTM.com

new alerts:

  • 6 for 'import *' may pollute namespace
  • 4 for Unused local variable
  • 3 for Except block handles 'BaseException'
  • 2 for Should use a 'with' statement
  • 2 for Non-iterable used in for loop
  • 1 for Module imports itself
  • 1 for Use of 'global' at module level
  • 1 for Wrong name for an argument in a class instantiation
  • 1 for Wrong number of arguments in a class instantiation
  • 1 for Result of integer division may be truncated

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jul 14, 2020 •
edited
Loading

@xinliu-seattle @lguohan Help forward this, integrating ruijie platform will help us make contribution much more easier, thanks!

@tim-rj
[platform/ruijie] Add ruijie debian folder
1cb6822 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jul 14, 2020

This pull request introduces 22 alerts when merging 1cb6822 into de16e6f - view on LGTM.com

new alerts:

  • 6 for 'import *' may pollute namespace
  • 4 for Unused local variable
  • 3 for Except block handles 'BaseException'
  • 2 for Should use a 'with' statement
  • 2 for Non-iterable used in for loop
  • 1 for Module imports itself
  • 1 for Use of 'global' at module level
  • 1 for Wrong name for an argument in a class instantiation
  • 1 for Wrong number of arguments in a class instantiation
  • 1 for Result of integer division may be truncated

@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Jul 16, 2020

can you fix the lgtm first?

lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
platform/broadcom/sonic-platform-modules-ruijie/b6510-48vs8cq/sonic_platform/sfp.py
#!/usr/bin/env python

#############################################################################
# Ruijie B6510-48VS8CQ
Copy link
Copy Markdown
Collaborator

@lguohan lguohan Jul 16, 2020

Choose a reason for hiding this comment

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

sonic has its sfp qsfp parse, why introduce your own parser?

Copy link
Copy Markdown
Contributor Author

@tim-rj tim-rj Jul 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Actually it's not introducing my own parser, it is for new api adptation.

lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
platform/broadcom/sonic-platform-modules-ruijie/common/lib/eepromutil/fantlv.py Outdated
bin_buffer[2] = chr(self.HW_VER)
bin_buffer[3] = chr(self.TYPE)

temp_t = "%08x" % self.typedevtype # 把devtype先处理下
Copy link
Copy Markdown
Collaborator

@lguohan lguohan Jul 16, 2020

Choose a reason for hiding this comment

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

this makes difficult for english only speaker to review. can these comments be written in english?

Copy link
Copy Markdown
Contributor Author

@tim-rj tim-rj Jul 21, 2020

Choose a reason for hiding this comment

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

done!

lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
platform/broadcom/sonic-platform-modules-ruijie/common/modules/i2c-mux-pca954x.c
@@ -0,0 +1,1763 @@
/*
* Copyright (c) 2008-2009 Rodolfo Giometti <giometti@linux.it>
Copy link
Copy Markdown
Collaborator

@lguohan lguohan Jul 16, 2020

Choose a reason for hiding this comment

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

can you use the one in linux kernel?

Copy link
Copy Markdown
Contributor Author

@tim-rj tim-rj Jul 20, 2020

Choose a reason for hiding this comment

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

Will revise I2C deadlock problem when use 9548 and 9541 at the same time.

lguohan
lguohan reviewed Jul 16, 2020
View reviewed changes
platform/broadcom/sonic-platform-modules-ruijie/common/modules/i2c-mux-pca9641.c
@@ -0,0 +1,645 @@
/*
* I2C multiplexer driver for PCA9541 bus master selector
Copy link
Copy Markdown
Collaborator

@lguohan lguohan Jul 16, 2020

Choose a reason for hiding this comment

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

can you use the one in linux kernel?

Copy link
Copy Markdown
Contributor Author

@tim-rj tim-rj Jul 20, 2020

Choose a reason for hiding this comment

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

same with above, Will revise I2C deadlock problem when use 9548 and 9541 at the same time.

tim-rj added 2 commits July 20, 2020 17:02
@tim-rj
[platform/ruijie] Fix LGTM version2 & review suggestions
848018c 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@tim-rj
[platform/ruijie] Rm self-generated file
190e16b 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jul 20, 2020

This pull request introduces 9 alerts when merging 190e16b into 5d753b8 - view on LGTM.com

new alerts:

  • 5 for 'import *' may pollute namespace
  • 2 for Non-iterable used in for loop
  • 1 for Wrong name for an argument in a class instantiation
  • 1 for Wrong number of arguments in a class instantiation

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jul 21, 2020

@lguohan Help move on, thanks!

@tim-rj
fix alerts version 1
f9b224f 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jan 12, 2021

This pull request introduces 5 alerts when merging f9b224f into 4ef3f13 - view on LGTM.com

new alerts:

  • 5 for Wrong number of arguments in a class instantiation

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jan 12, 2021

@jleveque @lguohan help forward, left 5 alerts are not ruijie's, just ignore!

@jleveque
Copy link
Copy Markdown
Contributor

jleveque commented Jan 12, 2021

@tim-rj: Thanks for fixing the LGTM alerts. However, some comments are still not addressed. Please take a look.

@tim-rj
fix code review suggestion
7c6abd7 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jan 14, 2021

This pull request introduces 5 alerts when merging 7c6abd7 into 9a1b42f - view on LGTM.com

new alerts:

  • 5 for Wrong number of arguments in a class instantiation

jleveque
jleveque suggested changes Jan 14, 2021
View reviewed changes
jleveque
jleveque suggested changes Jan 14, 2021
View reviewed changes
@tim-rj
Add newline at end of file
0d02a4a 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Jan 15, 2021

This pull request introduces 5 alerts when merging 0d02a4a into 16e5434 - view on LGTM.com

new alerts:

  • 5 for Wrong number of arguments in a class instantiation

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jan 21, 2021

@jleveque hi jleveque, help forward, thanks!

@jleveque
Copy link
Copy Markdown
Contributor

jleveque commented Jan 21, 2021

Retest mellanox please

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jan 22, 2021

Retest mellanox please

hi Jleveque, what i need to do for test mellanox? since we have no mellanox device, only broadcom device.

@jleveque
Copy link
Copy Markdown
Contributor

jleveque commented Jan 22, 2021

Retest mellanox please

hi Jleveque, what i need to do for test mellanox? since we have no mellanox device, only broadcom device.

@tim-rj: The message wasn't intended for you. It is a special phrase which triggered the mellanox check build to restart, because it had failed.

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Jan 24, 2021

@jleveque got it!

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Feb 23, 2021

@jleveque help forward this, thanks!

jleveque
jleveque suggested changes Feb 23, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@jleveque jleveque left a comment

Choose a reason for hiding this comment

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

Please fix conflicts

@tim-rj
fix merge conflict for permitted_list
ab160ec 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@tim-rj
fix merge conflict version2
061a07a 
Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Feb 24, 2021

This pull request introduces 5 alerts when merging 061a07a into d88e8cf - view on LGTM.com

new alerts:

  • 5 for Wrong number of arguments in a class instantiation

@tim-rj
Copy link
Copy Markdown
Contributor Author

tim-rj commented Feb 25, 2021

@jleveque done, help foward, thanks!

@jleveque jleveque merged commit a582c13 into sonic-net:master Feb 25, 2021
@tim-rj tim-rj mentioned this pull request Apr 26, 2021
Merged
3 tasks
yxieca pushed a commit to sonic-net/sonic-mgmt that referenced this pull request May 2, 2021
@tim-rj
[Ruijie] Add new platform B6510-48VS8CQ (#3406)
7cc4328 
Description of PR
Due to sonic-net/sonic-buildimage#4954, now add Ruijie hwsku B6510-48VS8CQ into sonic-mgmt.

Summary:

Approach
What is the motivation for this PR?
Add new Ruijie platform

How did you do it?
How did you verify/test it?
Run tests against B6510-48VS8CQ

Any platform specific information?
This change is Ruijie platform specific
saravanansv pushed a commit to saravanansv/sonic-mgmt that referenced this pull request May 6, 2021
@tim-rj @saravanansv
[Ruijie] Add new platform B6510-48VS8CQ (sonic-net#3406)
c87c67b 
Description of PR
Due to sonic-net/sonic-buildimage#4954, now add Ruijie hwsku B6510-48VS8CQ into sonic-mgmt.

Summary:

Approach
What is the motivation for this PR?
Add new Ruijie platform

How did you do it?
How did you verify/test it?
Run tests against B6510-48VS8CQ

Any platform specific information?
This change is Ruijie platform specific
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@tim-rj
[Ruijie] Add ruijie platform & device (sonic-net#4954)
1a080b8 
Add new platform x86_64-ruijie_b6510-48vs8cq-r0 (Trident 3)
    ASIC Vendor: Broadcom
    Switch ASIC: Trident 3
    Port Config: 48x25G+8x100G

Signed-off-by: tim-rj <sonic_rd@ruijie.com.cn>
vmittal-msft pushed a commit to vmittal-msft/sonic-mgmt that referenced this pull request Sep 28, 2021
@tim-rj @vmittal-msft
[Ruijie] Add new platform B6510-48VS8CQ (sonic-net#3406)
ec2fe05 
Description of PR
Due to sonic-net/sonic-buildimage#4954, now add Ruijie hwsku B6510-48VS8CQ into sonic-mgmt.

Summary:

Approach
What is the motivation for this PR?
Add new Ruijie platform

How did you do it?
How did you verify/test it?
Run tests against B6510-48VS8CQ

Any platform specific information?
This change is Ruijie platform specific
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lguohan lguohan lguohan left review comments

+1 more reviewer

@jleveque jleveque jleveque approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tim-rj @lguohan @jleveque