Fix issues in cmis.get_transceiver_bulk_status #351

stephenxs · 2023-03-06T06:11:59Z

Description

Fix issues in cmis.get_transceiver_bulk_status

In case it fails to read EEPROM, either self.get_rx_power() or self.get_tx_power() can be a list of 'N/A'. Need to test it before calling self.mw_to_dbm otherwise exception TypeError("'<' not supported between instances of 'str' and 'int'") will be thrown.

Exception occured at DomInfoUpdateTask thread due to TypeError("'<' not supported between instances of 'str' and 'int'")
Traceback (most recent call last):
File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 1696, in run
    self.task_worker()
File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 1681, in task_worker
    post_port_dom_info_to_db(logical_port_name, self.port_mapping, self.xcvr_table_helper.get_dom_tbl(asic_index), self.task_stopping_event, dom_info_cache=dom_info_cache)
File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 503, in post_port_dom_info_to_db
    dom_info_dict = _wrapper_get_transceiver_dom_info(physical_port)
File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 181, in _wrapper_get_transceiver_dom_info
    return platform_chassis.get_sfp(physical_port).get_transceiver_bulk_status()
File "/usr/local/lib/python3.9/dist-packages/sonic_platform_base/sonic_xcvr/sfp_optoe_base.py", line 28, in get_transceiver_bulk_status
    return api.get_transceiver_bulk_status() if api is not None else None
File "/usr/local/lib/python3.9/dist-packages/sonic_platform_base/sonic_xcvr/api/public/cmis.py", line 211, in get_transceiver_bulk_status
    bulk_status["rx%dpower" % i] = float("{:.3f}".format(self.mw_to_dbm(rx_power[i - 1]))) if self.get_rx_power_support() else 'N/A'
File "/usr/local/lib/python3.9/dist-packages/sonic_platform_base/sonic_xcvr/api/xcvr_api.py", line 16, in mw_to_dbm
    elif mW < 0:
TypeError: '<' not supported between instances of 'str' and 'int'
Xcvrd: exception found at child thread DomInfoUpdateTask due to TypeError("'<' not supported between instances of 'str' and 'int'")

It should be a valid case for either self.get_rx_power() or self.get_tx_power() to return None. Handle other fields instead of returning None in this case

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

1. In case it fails to read EEPROM, either self.get_rx_power() or self.get_tx_power() can be a list of 'N/A'. Need to test it before calling self.mw_to_dbm 2. It should be a valid case for either self.get_rx_power() or self.get_tx_power() to return None. Handle other fields instead of returning None in this case Signed-off-by: Stephen Sun <stephens@nvidia.com>

stephenxs · 2023-03-06T07:38:53Z

It can be cleanly cherry-picked to both 202205 and 202211
202205:

commit 16bc0c01a5ac610606c839c1a4bf5204520f4047
Author: Stephen Sun <stephens@nvidia.com>
Date:   Mon Mar 6 04:07:02 2023 +0000

    Fix issue in cmis.get_transceiver_bulk_status

    1. In case it fails to read EEPROM, either self.get_rx_power() or self.get_tx_power() can be a list of 'N/A'. Need to test it before calling self.mw_to_dbm
    2. It should be a valid case for either self.get_rx_power() or self.get_tx_power() to return None. Handle other fields instead of returning None in this case

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

commit 321a8e77131ce567ec015ba26912b4fd1d0b47e1 (origin/202205)
Author: CliveNi <clive.ni@cloudlight.com.hk>
Date:   Fri Sep 23 09:29:13 2022 +0800

    Cdb fw upgrade (#308)

    * [Cloudlight] QSFP-DD FW upgrade doesn't work (#257)

    - Description

202211:

commit 0430ae52a98d47daa05de347c0510fa3c0966869 (HEAD)
Author: Stephen Sun <stephens@nvidia.com>
Date:   Mon Mar 6 04:07:02 2023 +0000

    Fix issue in cmis.get_transceiver_bulk_status

    1. In case it fails to read EEPROM, either self.get_rx_power() or self.get_tx_power() can be a list of 'N/A'. Need to test it before calling self.mw_to_dbm
    2. It should be a valid case for either self.get_rx_power() or self.get_tx_power() to return None. Handle other fields instead of returning None in this case

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

commit 2dbc0ea7ccecad1677e2f863cadcdfe451d8fd2a (origin/202211)
Author: mihirpat1 <112018033+mihirpat1@users.noreply.github.com>
Date:   Wed Jan 25 09:49:05 2023 -0800

    Change get_tx_bias return type to list (#342)

    * Change get_tx_bias return type to list

    Signed-off-by: Mihir Patel <patelmi@microsoft.com>

liat-grozovik · 2023-03-06T12:58:32Z

@prgeor could you please help review or assign someone?

prgeor · 2023-03-07T00:55:24Z

@stephenxs please provide more context in the description. What is failing? Which CLI? If the i2c read is failing then we should fix the optics or platform issue?

sonic_platform_base/sonic_xcvr/api/public/cmis.py

stephenxs · 2023-03-07T01:22:20Z

@stephenxs please provide more context in the description. What is failing? Which CLI? If the i2c read is failing then we should fix the optics or platform issue?

@prgeor Updated in the description.

liat-grozovik · 2023-03-12T13:43:24Z

@prgeor as this issue is for 202205 please review so we can have it in soon. thanks.

tests/sonic_xcvr/test_cmis.py

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

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

sonic_platform_base/sonic_xcvr/api/public/cmis.py

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

prgeor · 2023-03-15T16:18:39Z

@yxieca please cherry pick to 202205

prgeor · 2023-03-15T16:18:58Z

@StormLiangMS please help cherry pick to 202211

* Fix issue in cmis.get_transceiver_bulk_status 1. In case it fails to read EEPROM, either self.get_rx_power() or self.get_tx_power() can be a list of 'N/A'. Need to test it before calling self.mw_to_dbm 2. It should be a valid case for either self.get_rx_power() or self.get_tx_power() to return None. Handle other fields instead of returning None in this case Signed-off-by: Stephen Sun <stephens@nvidia.com> * Address comments: distinguish scenarios between not supporting and reading failure Signed-off-by: Stephen Sun <stephens@nvidia.com> * Adjust unit test case Signed-off-by: Stephen Sun <stephens@nvidia.com> * Remove redundant code Signed-off-by: Stephen Sun <stephens@nvidia.com> --------- Signed-off-by: Stephen Sun <stephens@nvidia.com>

keboliu · 2023-03-31T10:00:52Z

commits already included in 202211, so I add the label.

sonic-net#351) * PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or removed. Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> * fix swsscommon.py hdel function. * implemented code optimization. Signed-off-by: premsara <premnath.saravanan@nokia.com> --------- Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> Signed-off-by: premsara <premnath.saravanan@nokia.com>

stephenxs changed the title ~~Fix issue in cmis.get_transceiver_bulk_status~~ Fix issues in cmis.get_transceiver_bulk_status Mar 6, 2023

stephenxs requested review from Junchao-Mellanox and keboliu March 6, 2023 07:34

stephenxs added the Request for 202205 Branch label Mar 6, 2023

Junchao-Mellanox previously approved these changes Mar 6, 2023

View reviewed changes

stephenxs added the Request for 202211 Branch label Mar 6, 2023

stephenxs marked this pull request as ready for review March 6, 2023 10:26

liat-grozovik requested a review from prgeor March 6, 2023 12:58

prgeor reviewed Mar 7, 2023

View reviewed changes

sonic_platform_base/sonic_xcvr/api/public/cmis.py Outdated Show resolved Hide resolved

keboliu previously approved these changes Mar 7, 2023

View reviewed changes

stephenxs requested a review from prgeor March 8, 2023 01:09

prgeor reviewed Mar 14, 2023

View reviewed changes

tests/sonic_xcvr/test_cmis.py Show resolved Hide resolved

Address comments: distinguish scenarios between not supporting and re…

f02c287

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

stephenxs dismissed stale reviews from keboliu and Junchao-Mellanox via f02c287 March 15, 2023 03:04

Adjust unit test case

cc68da0

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

prgeor reviewed Mar 15, 2023

View reviewed changes

sonic_platform_base/sonic_xcvr/api/public/cmis.py Outdated Show resolved Hide resolved

prgeor reviewed Mar 15, 2023

View reviewed changes

sonic_platform_base/sonic_xcvr/api/public/cmis.py Outdated Show resolved Hide resolved

Remove redundant code

d34e9b1

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

prgeor approved these changes Mar 15, 2023

View reviewed changes

prgeor merged commit b205400 into sonic-net:master Mar 15, 2023

yxieca added the Included in 202205 Branch label Mar 15, 2023

stephenxs deleted the fix-cmis-get-bulk branch March 15, 2023 23:37

keboliu added the Included in 202211 Branch label Mar 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issues in cmis.get_transceiver_bulk_status #351

Fix issues in cmis.get_transceiver_bulk_status #351

stephenxs commented Mar 6, 2023 •

edited

Loading

stephenxs commented Mar 6, 2023

liat-grozovik commented Mar 6, 2023

prgeor commented Mar 7, 2023 •

edited

Loading

stephenxs commented Mar 7, 2023

liat-grozovik commented Mar 12, 2023

prgeor commented Mar 15, 2023

prgeor commented Mar 15, 2023

keboliu commented Mar 31, 2023

Fix issues in cmis.get_transceiver_bulk_status #351

Fix issues in cmis.get_transceiver_bulk_status #351

Conversation

stephenxs commented Mar 6, 2023 • edited Loading

Description

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

stephenxs commented Mar 6, 2023

liat-grozovik commented Mar 6, 2023

prgeor commented Mar 7, 2023 • edited Loading

stephenxs commented Mar 7, 2023

liat-grozovik commented Mar 12, 2023

prgeor commented Mar 15, 2023

prgeor commented Mar 15, 2023

keboliu commented Mar 31, 2023

stephenxs commented Mar 6, 2023 •

edited

Loading

prgeor commented Mar 7, 2023 •

edited

Loading