[Platform] Accton add to support as4630-54te platform. #6683

ec-michael-shih · 2021-02-04T09:30:10Z

- Why I did it
My company(Accton) have a new model names: as4630-54te.
- How I did it
This pull request is based on as4630-54pe, so I reference as4630-54pe to create new model: as4630-54te
- How to verify it
Fan monitor is work, when execute the command: [accton_as4630_54te_util.py install], then the fan speed will come down.
SFP can detect module present, log show as follow:
=====================
...(skip)....
Ethernet48 Present
Ethernet49 Not present
Ethernet50 Present
Ethernet51 Not present
Ethernet52 Present
Ethernet56 Not present
=====================
PSU can detect the status:
=====================
root@sonic:/# psuutil status
PSU Status

  PSU 1 NOT PRESENT
  PSU 2 OK

Can get the info from eeprom:
=====================
root@sonic:/# show platform syseeprom
Warning: failed to retrieve PORT table from ConfigDB!
Warning: failed to retrieve PORT table from ConfigDB!
TlvInfo Header:
Id String:    TlvInfo
Version:      1
Total Length: 175
TLV Name             Code Len Value
Product Name         0x21  16 4630-54TE-O-AC-F
Part Number          0x22  13 F0PZZ4654043A
Serial Number        0x23  15 463054TE2102018
Base MAC Address     0x24   6 90:3C:B3:7D:52:40
Manufacture Date     0x25  19 01/14/2021 17:13:53
Label Revision       0x27   4 R01B
Platform Name        0x28  28 x86_64-accton_as4630_54pe-r0
ONIE Version         0x29  13 2020.08.00.03
MAC Addresses        0x2A   2 256
Manufacturer         0x2B   6 Accton
Manufacture Country  0x2C   2 TW
Vendor Name          0x2D   8 Edgecore
Diag Version         0x2E  11 01.01.01.00
CRC-32               0xFE   4 0x660EA8B7
(checksum valid)

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

201811
201911
202006
202012

- Description for the changelog

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

lgtm-com · 2021-02-04T09:49:44Z

This pull request introduces 61 alerts when merging 638a205 into e387531 - view on LGTM.com

new alerts:

41 for Unused import
8 for Unused local variable
6 for Use of 'global' at module level
2 for Unreachable code
2 for Variable defined multiple times
1 for Except block handles 'BaseException'
1 for Duplicate key in dict literal

jleveque · 2021-02-04T23:34:29Z

device/accton/x86_64-accton_as4630_54te-r0/plugins/eeprom.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python


These platform plugins have been deprecated in favor of the new sonic-platform package. Please refer to the documentation here: https://github.com/Azure/SONiC/wiki/Porting-Guide#sonic-platform-api-package

I believe "show version" still uses "decode-syseeprom" which loads this file.

Since the introduction of syseepromd, the system EEPROM contents should be collected by syseepromd and stored to State DB, and decode-syseeprom should simply pull the values from there.

It does appear that in show version the call is made to sudo decode-syseeprom -s, which will attempt to access the EEPROM directly. Instead, the call should probably be changed to sudo decode-syseeprom -d -s to read the serial number from the DB.

Also, decode-syseeprom should be refactored to use the new sonic-platform package for direct access rather than the old eeprom.py plugin. I have created the following issue to track this improvement: sonic-net/sonic-utilities#1404

I have refactored decode-syseeprom to utilize the sonic-platform package via sonic-net/sonic-utilities#1435.

I have also done the same for psuutil and sfputil.

It should be safe to remove these plugins now.

Goit it, I'll remove it.

jleveque · 2021-02-04T23:34:56Z

device/accton/x86_64-accton_as4630_54te-r0/plugins/psuutil.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python


These platform plugins have been deprecated in favor of the new sonic-platform package. Please refer to the documentation here: https://github.com/Azure/SONiC/wiki/Porting-Guide#sonic-platform-api-package

jleveque · 2021-02-04T23:35:03Z

device/accton/x86_64-accton_as4630_54te-r0/plugins/sfputil.py

@@ -0,0 +1,196 @@
+# sfputil.py


These platform plugins have been deprecated in favor of the new sonic-platform package. Please refer to the documentation here: https://github.com/Azure/SONiC/wiki/Porting-Guide#sonic-platform-api-package

ec-michael-shih · 2021-02-19T06:09:36Z

Dear Sonic community manager:
The platform: as4630-54te has already at sonic-platform(API2.0)
Please help to check and commit, thank you very much.
//michael

lgtm-com · 2021-02-19T06:25:34Z

This pull request introduces 52 alerts when merging cdc1291 into 5a49a0f - view on LGTM.com

new alerts:

32 for Unused import
8 for Unused local variable
6 for Use of 'global' at module level
2 for Unreachable code
2 for Variable defined multiple times
1 for Except block handles 'BaseException'
1 for Duplicate key in dict literal

jleveque

Please fix LGTM alerts.

lgtm-com · 2021-02-23T07:05:53Z

This pull request introduces 6 alerts when merging f23935c into 7ec4d15 - view on LGTM.com

new alerts:

2 for Unused import
2 for Variable defined multiple times
1 for Unused local variable
1 for Unreachable code

lgtm-com · 2021-02-23T09:02:50Z

This pull request introduces 1 alert when merging 1bfc9bc into f77157f - view on LGTM.com

new alerts:

1 for Unreachable code

jleveque

As comments.

Also, please remove plugins/eeprom.py, plugins/psuutil.py and plugins/sfputil.py, as they should be no longer necessary.

jleveque · 2021-02-24T02:42:45Z

device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/component.py

@@ -0,0 +1,121 @@
+#############################################################################
+# Celestica


Celestica? Copy/paste issue?

Yes, it is copy/paste issue. I'll remove the keyword.

jleveque · 2021-02-24T02:44:52Z

device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/thermal.py

+    SYSFS_PATH = "/sys/bus/i2c/devices"
+
+    def __init__(self, thermal_index=0):
+        self.index = thermal_index


Please call the superclass initializer here for completeness.

Thanks for review, I'll modify it.

ec-michael-shih · 2021-02-24T03:08:40Z

As comments.

Also, please remove plugins/eeprom.py, plugins/psuutil.py and plugins/sfputil.py, as they should be no longer necessary.

My testing code is Mon Feb 8 08:07:33 2021 -0800
And I test [sensors] command will call into plugins/eeprom.py now.
Still need to remove plugin this directory now?!

jleveque · 2021-02-24T03:11:35Z

As comments.
Also, please remove plugins/eeprom.py, plugins/psuutil.py and plugins/sfputil.py, as they should be no longer necessary.

My testing code is Mon Feb 8 08:07:33 2021 -0800
And I test [sensors] command will call into plugins/eeprom.py now.
Still need to remove plugin this directory now?!

The sensors command calls into plugins/eeprom.py? Can you show me where?

ec-michael-shih · 2021-02-24T03:20:45Z

As comments.
Also, please remove plugins/eeprom.py, plugins/psuutil.py and plugins/sfputil.py, as they should be no longer necessary.

My testing code is Mon Feb 8 08:07:33 2021 -0800
And I test [sensors] command will call into plugins/eeprom.py now.
Still need to remove plugin this directory now?!

The sensors command calls into plugins/eeprom.py? Can you show me where?

My fault!! The command: show platform syseeprom will call into plugin/eeprom.py

try:
print('456')
from sonic_eeprom import eeprom_tlvinfo

except ImportError as e:
raise ImportError(str(e) + "- required module not found")

class board(eeprom_tlvinfo.TlvInfoDecoder):
_TLV_INFO_MAX_LEN = 256
print('123')

def __init__(self, name, path, cpld_root, ro):
    self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
    super(board, self).__init__(self.eeprom_path, 0, '', True)

log:

root@sonic:/# show platform syseeprom
456
123
TlvInfo Header:
Id String: TlvInfo
Version: 1
Total Length: 175
TLV Name Code Len Value

Product Name 0x21 16 4630-54TE-O-AC-F
Part Number 0x22 13 F0PZZ4654043A
Manufacture Date 0x25 19 01/14/2021 17:13:53
Label Revision 0x27 4 R01B
Platform Name 0x28 28 x86_64-accton_as4630_54pe-r0
ONIE Version 0x29 13 2020.08.00.03
MAC Addresses 0x2A 2 256
Manufacturer 0x2B 6 Accton
Manufacture Country 0x2C 2 TW
Vendor Name 0x2D 8 Edgecore
Diag Version 0x2E 11 01.01.01.00
Serial Number 0x23 15 463054TE2102018
Base MAC Address 0x24 6 90:3C:B3:7D:52:40
CRC-32 0xFE 4 0x660EA8B7
(checksum valid)

jleveque · 2021-02-24T03:30:49Z

I have refactored the utilities to no longer use the old plugins:

However, the sonic-utilities submodule has not yet been updated to reflect these changes in sonic-buildimage. I will do that soon.

ec-michael-shih · 2021-02-24T03:35:04Z

I have refactored the utilities to no longer use the old plugins:
* [Azure/sonic-utilities#1435](https://github.com/Azure/sonic-utilities/pull/1435)

* [Azure/sonic-utilities#1434](https://github.com/Azure/sonic-utilities/pull/1434)

* [Azure/sonic-utilities#1421](https://github.com/Azure/sonic-utilities/pull/1421)
However, the sonic-utilities submodule has not yet been updated to reflect these changes in sonic-buildimage. I will do that soon.

Got it.
So, your suggestion still prefer remove plugin(directory) in this PR?

jleveque · 2021-02-24T05:20:58Z

Got it.
So, your suggestion still prefer remove plugin(directory) in this PR?

I would prefer it, yes. If you would like to wait until I update the submodule so that you can test again, please let me know. I just opened a PR to update the submodule here.

ec-michael-shih · 2021-02-24T05:56:52Z

Got it.
So, your suggestion still prefer remove plugin(directory) in this PR?

I would prefer it, yes. If you would like to wait until I update the submodule so that you can test again, please let me know. I just opened a PR to update the submodule here.

By the way,
our company will face a situation where customers will develop their functions on the old branch(ex: 202012, 202006).
And this PR wants to merge into these old branch.
So is it possible to keep the plugin folder? or .... any suggestion?!

jleveque · 2021-02-24T07:49:22Z

By the way,
our company will face a situation where customers will develop their functions on the old branch(ex: 202012, 202006).
And this PR wants to merge into these old branch.
So is it possible to keep the plugin folder? or .... any suggestion?!

I didn't realize you intended to backport this PR to earlier release branches, because none of the boxes are checked in the PR description. If that is the case, then we can go ahead and keep the plugins here, and we can delete them from the master branch in the future.

…ss intialize

ec-michael-shih · 2021-02-25T02:58:46Z

By the way,
our company will face a situation where customers will develop their functions on the old branch(ex: 202012, 202006).
And this PR wants to merge into these old branch.
So is it possible to keep the plugin folder? or .... any suggestion?!

I didn't realize you intended to backport this PR to earlier release branches, because none of the boxes are checked in the PR description. If that is the case, then we can go ahead and keep the plugins here, and we can delete them from the master branch in the future.

Thank you for your suggestion.
It's Good!!! to merger this PR into backport(include /plugins folder) on 202006 and 202012 branch.
And for master branch, need to bother you to delete /plugins folder in the future.

Add support for Accton as4630-54te platform

[Platform] Accton add to support as4630-54te platform.

638a205

ec-michael-shih requested review from jleveque and lguohan as code owners February 4, 2021 09:30

jleveque suggested changes Feb 4, 2021

View reviewed changes

jleveque added Enhancement ➕ Platform: Accton labels Feb 4, 2021

[as4630-54te] Add to support AP2.0

cdc1291

jleveque suggested changes Feb 19, 2021

View reviewed changes

[as4630-54te] Fix LGTM alerts.

f23935c

[as4630-54te] Fix LGTM alerts_1.

1bfc9bc

[as4630-54te] Fix LGTM alerts_2: Fix unreachable statement.

a93a806

jleveque suggested changes Feb 24, 2021

View reviewed changes

[as4630-54te] Fix LGTM alerts_3: remove copy/paste issue and supercla…

b52b2f8

…ss intialize

jleveque approved these changes Feb 25, 2021

View reviewed changes

jleveque added Request for 202006 Branch Request for 202012 Branch labels Feb 25, 2021

jleveque merged commit 66e3e51 into sonic-net:master Feb 25, 2021

yxieca added the Included in 202012 Branch label Mar 3, 2021

yxieca pushed a commit that referenced this pull request Mar 4, 2021

[Platform] Accton add to support as4630-54te platform. (#6683)

e13672b

Add support for Accton as4630-54te platform

carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021

[Platform] Accton add to support as4630-54te platform. (sonic-net#6683)

f5f7f8d

Add support for Accton as4630-54te platform

lolyu pushed a commit to lolyu/sonic-buildimage that referenced this pull request Sep 13, 2021

[Platform] Accton add to support as4630-54te platform. (sonic-net#6683)

d606b72

Add support for Accton as4630-54te platform

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Platform] Accton add to support as4630-54te platform. #6683

[Platform] Accton add to support as4630-54te platform. #6683

ec-michael-shih commented Feb 4, 2021 •

edited

Loading

lgtm-com bot commented Feb 4, 2021

jleveque Feb 4, 2021

akokhan Feb 6, 2021

jleveque Feb 6, 2021

jleveque Feb 19, 2021

jleveque Feb 24, 2021

ec-michael-shih Feb 25, 2021

jleveque Feb 4, 2021

jleveque Feb 4, 2021

ec-michael-shih commented Feb 19, 2021

lgtm-com bot commented Feb 19, 2021

jleveque left a comment

lgtm-com bot commented Feb 23, 2021

lgtm-com bot commented Feb 23, 2021

jleveque left a comment •

edited

Loading

jleveque Feb 24, 2021

ec-michael-shih Feb 24, 2021

jleveque Feb 24, 2021

ec-michael-shih Feb 25, 2021

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021 •

edited

Loading

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021 •

edited

Loading

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021

ec-michael-shih commented Feb 25, 2021

		@@ -0,0 +1,121 @@
		#############################################################################
		# Celestica

[Platform] Accton add to support as4630-54te platform. #6683

[Platform] Accton add to support as4630-54te platform. #6683

Conversation

ec-michael-shih commented Feb 4, 2021 • edited Loading

lgtm-com bot commented Feb 4, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ec-michael-shih commented Feb 19, 2021

lgtm-com bot commented Feb 19, 2021

jleveque left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Feb 23, 2021

lgtm-com bot commented Feb 23, 2021

jleveque left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021

ec-michael-shih commented Feb 24, 2021

log:

jleveque commented Feb 24, 2021 • edited Loading

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021 • edited Loading

ec-michael-shih commented Feb 24, 2021

jleveque commented Feb 24, 2021

ec-michael-shih commented Feb 25, 2021

ec-michael-shih commented Feb 4, 2021 •

edited

Loading

jleveque left a comment •

edited

Loading

jleveque commented Feb 24, 2021 •

edited

Loading

jleveque commented Feb 24, 2021 •

edited

Loading