[xcvrd] Add bitmap support for SFP error event #184

Junchao-Mellanox · 2021-05-13T06:58:43Z

Description

Support SFP error bitmap.

Motivation and Context

Currently, SONiC use a single value to represent SFP error, however, multiple SFP errors could exist at the same time. This PR is aimed to support it

How Has This Been Tested?

New unit test case is added to cover the change
Manual test

Additional Information (Optional)

lgtm-com · 2021-05-13T07:25:21Z

This pull request introduces 1 alert when merging 5ad1246 into 807b304 - view on LGTM.com

new alerts:

1 for Unused import

sonic-xcvrd/tests/test_xcvrd.py

…orm-daemons into sfp-bit-map

In case there is an error returned by platform API - Translate the error bitmap to error description for generic errors - Fetch the error description from sfp_error dict or via calling platform API get_error_description for vendor specific errors - Adjust unit test cases Signed-off-by: Stephen Sun <stephens@nvidia.com>

Signed-off-by: Stephen Sun <stephens@nvidia.com>

Enhanced - Handle the error status returned by platform APIs

jleveque · 2021-06-11T21:58:50Z

/azp run

azure-pipelines · 2021-06-11T21:59:02Z

Azure Pipelines successfully started running 1 pipeline(s).

stephenxs · 2021-06-15T01:49:23Z

In order to have this PR passed CI, we need to merge sonic-net/sonic-platform-common#194 and then advance the submodule head for it. It references some definitions like SFP_ERROR_DESCRIPTION_BLOCKING which are defined there.

2021-06-11T22:03:53.0398651Z =================================== FAILURES ===================================
2021-06-11T22:03:53.0399461Z _______________ TestXcvrdScript.test_detect_port_in_error_status _______________
2021-06-11T22:03:53.0399857Z 
2021-06-11T22:03:53.0400714Z self = <tests.test_xcvrd.TestXcvrdScript object at 0x7fc5961cea50>
2021-06-11T22:03:53.0401084Z 
2021-06-11T22:03:53.0401598Z     def test_detect_port_in_error_status(self):
2021-06-11T22:03:53.0402206Z         class MockTable:
2021-06-11T22:03:53.0402786Z             def get(self, key):
2021-06-11T22:03:53.0403305Z                 pass
2021-06-11T22:03:53.0403736Z     
2021-06-11T22:03:53.0404180Z         status_tbl = MockTable()
2021-06-11T22:03:53.0405776Z         status_tbl.get = MagicMock(return_value=(True, {'error': 'N/A'}))
2021-06-11T22:03:53.0406569Z >       assert not detect_port_in_error_status(None, status_tbl)
2021-06-11T22:03:53.0406913Z 
2021-06-11T22:03:53.0407370Z tests/test_xcvrd.py:326: 
2021-06-11T22:03:53.0408023Z _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
2021-06-11T22:03:53.0408410Z 
2021-06-11T22:03:53.0408841Z logical_port_name = None
2021-06-11T22:03:53.0409434Z status_tbl = <tests.test_xcvrd.MockTable instance at 0x7fc596c0a320>
2021-06-11T22:03:53.0409817Z 
2021-06-11T22:03:53.0410397Z     def detect_port_in_error_status(logical_port_name, status_tbl):
2021-06-11T22:03:53.0411119Z         rec, fvp = status_tbl.get(logical_port_name)
2021-06-11T22:03:53.0411684Z         if rec:
2021-06-11T22:03:53.0412179Z             status_dict = dict(fvp)
2021-06-11T22:03:53.0413086Z             error = status_dict.get('error')
2021-06-11T22:03:53.0413762Z >           return SfpBase.SFP_ERROR_DESCRIPTION_BLOCKING in error
2021-06-11T22:03:53.0415015Z E           AttributeError: type object 'SfpBase' has no attribute 'SFP_ERROR_DESCRIPTION_BLOCKING'
2021-06-11T22:03:53.0415493Z 
2021-06-11T22:03:53.0416035Z xcvrd/xcvrd_utilities/sfp_status_helper.py:35: AttributeError
2021-06-11T22:03:53.0417208Z ---------- generated xml file: /__w/1/s/sonic-xcvrd/test-results.xml -----------
2021-06-11T22:03:53.0417626Z 
2021-06-11T22:03:53.0418544Z ---------- coverage: platform linux2, python 2.7.16-final-0 ----------
2021-06-11T22:03:53.0419294Z Name                                         Stmts   Miss  Cover
2021-06-11T22:03:53.0420322Z ----------------------------------------------------------------
2021-06-11T22:03:53.0421049Z xcvrd/__init__.py                                0      0   100%
2021-06-11T22:03:53.0421738Z xcvrd/xcvrd.py                                 824    566    31%
2021-06-11T22:03:53.0422892Z xcvrd/xcvrd_utilities/__init__.py                0      0   100%
2021-06-11T22:03:53.0423781Z xcvrd/xcvrd_utilities/sfp_status_helper.py      25      9    64%
2021-06-11T22:03:53.0424490Z xcvrd/xcvrd_utilities/y_cable_helper.py        650    584    10%
2021-06-11T22:03:53.0425562Z ----------------------------------------------------------------
2021-06-11T22:03:53.0426286Z TOTAL                                         1499   1159    23%
2021-06-11T22:03:53.0426906Z Coverage HTML written to dir htmlcov
2021-06-11T22:03:53.0427487Z Coverage XML written to file coverage.xml
2021-06-11T22:03:53.0427772Z 
2021-06-11T22:03:53.0428338Z ===================== 1 failed, 11 passed in 0.60 seconds ======================

jleveque · 2021-06-16T16:06:16Z

/azp run

azure-pipelines · 2021-06-16T16:06:25Z

Azure Pipelines successfully started running 1 pipeline(s).

stephenxs · 2021-06-17T01:43:10Z

Submodule head of sonic-platform-common is advanced in sonic-net/sonic-buildimage#7868

liat-grozovik · 2021-06-18T07:44:18Z

/azp run

azure-pipelines · 2021-06-18T07:44:27Z

Azure Pipelines successfully started running 1 pipeline(s).

stephenxs · 2021-06-18T22:40:41Z

@jleveque Can you trigger the test rerun as the dependent PR has been merged. Thanks

jleveque · 2021-06-18T22:46:53Z

/azp run

azure-pipelines · 2021-06-18T22:47:02Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2021-06-20T14:59:52Z

/azp run

azure-pipelines · 2021-06-20T15:00:01Z

Azure Pipelines successfully started running 1 pipeline(s).

lgtm-com · 2021-06-22T17:34:19Z

This pull request introduces 1 alert when merging f7b5949 into 2fc05b2 - view on LGTM.com

new alerts:

1 for Except block handles 'BaseException'

Support SFP error bitmap. Currently, SONiC use a single value to represent SFP error, however, multiple SFP errors could exist at the same time. This PR is aimed to support it Signed-off-by: Stephen Sun <stephens@nvidia.com>

…ties (sonic-net#184) Added a `get_revision()` method to the generic platform device class which returns the hardware revision number of the device as a string.

Junchao-Mellanox added 4 commits April 12, 2021 16:22

Add bitmap support for SFP error event

d864b18

Add unit test for sfp error bitmap

84f2fa3

Move common code to sfp_status_helper.py

20d8f27

Remove unused comment lines

5ad1246

Junchao-Mellanox mentioned this pull request May 13, 2021

[Mellanox] Add bitmap support for SFP error event sonic-net/sonic-buildimage#7605

Merged

4 tasks

Junchao Chen and others added 2 commits May 17, 2021 08:43

Fix LGTM warning

5bbc490

Fix LGTM warning

fc36b01

jleveque suggested changes May 18, 2021

View reviewed changes

sonic-xcvrd/tests/test_xcvrd.py Outdated Show resolved Hide resolved

sonic-xcvrd/tests/test_xcvrd.py Show resolved Hide resolved

Junchao-Mellanox added 2 commits May 19, 2021 10:06

Merge branch 'sfp-bit-map' of github.com:Junchao-Mellanox/sonic-platf…

c907826

…orm-daemons into sfp-bit-map

Remove unused import

1ad32df

Junchao-Mellanox requested a review from jleveque May 19, 2021 02:11

Junchao-Mellanox marked this pull request as draft May 27, 2021 02:07

stephenxs and others added 3 commits June 4, 2021 08:40

Fix review comments

08ab761

Signed-off-by: Stephen Sun <stephens@nvidia.com>

Merge pull request #26 from stephenxs/sfp-bit-map-error-status

f7b5949

Enhanced - Handle the error status returned by platform APIs

keboliu mentioned this pull request Jun 9, 2021

[xcvrd HLD] Update xcvrd HLD doc sonic-net/SONiC#586

Merged

Junchao-Mellanox marked this pull request as ready for review June 10, 2021 01:36

jleveque approved these changes Jun 21, 2021

View reviewed changes

jleveque added Enhancement xcvrd labels Jun 22, 2021

jleveque changed the title ~~Add bitmap support for SFP error event~~ [xcvrd] Add bitmap support for SFP error event Jun 22, 2021

jleveque merged commit 53639de into sonic-net:master Jun 22, 2021

stephenxs mentioned this pull request Jun 24, 2021

[sonic-platform-daemons] Advance submodule head sonic-net/sonic-buildimage#7961

Merged

4 tasks

Junchao-Mellanox deleted the sfp-bit-map branch October 29, 2021 01:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[xcvrd] Add bitmap support for SFP error event #184

[xcvrd] Add bitmap support for SFP error event #184

Junchao-Mellanox commented May 13, 2021

lgtm-com bot commented May 13, 2021

jleveque commented Jun 11, 2021

azure-pipelines bot commented Jun 11, 2021

stephenxs commented Jun 15, 2021

jleveque commented Jun 16, 2021

azure-pipelines bot commented Jun 16, 2021

stephenxs commented Jun 17, 2021

liat-grozovik commented Jun 18, 2021

azure-pipelines bot commented Jun 18, 2021

stephenxs commented Jun 18, 2021

jleveque commented Jun 18, 2021

azure-pipelines bot commented Jun 18, 2021

liat-grozovik commented Jun 20, 2021

azure-pipelines bot commented Jun 20, 2021

lgtm-com bot commented Jun 22, 2021

[xcvrd] Add bitmap support for SFP error event #184

[xcvrd] Add bitmap support for SFP error event #184

Conversation

Junchao-Mellanox commented May 13, 2021

Description

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

lgtm-com bot commented May 13, 2021

jleveque commented Jun 11, 2021

azure-pipelines bot commented Jun 11, 2021

stephenxs commented Jun 15, 2021

jleveque commented Jun 16, 2021

azure-pipelines bot commented Jun 16, 2021

stephenxs commented Jun 17, 2021

liat-grozovik commented Jun 18, 2021

azure-pipelines bot commented Jun 18, 2021

stephenxs commented Jun 18, 2021

jleveque commented Jun 18, 2021

azure-pipelines bot commented Jun 18, 2021

liat-grozovik commented Jun 20, 2021

azure-pipelines bot commented Jun 20, 2021

lgtm-com bot commented Jun 22, 2021