Skip to content

Fix issues in cmis.get_transceiver_bulk_status #351

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

Merged
prgeor merged 4 commits into from
Mar 15, 2023
Merged

Fix issues in cmis.get_transceiver_bulk_status #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb813ac
Fix issue in cmis.get_transceiver_bulk_status
stephenxs Mar 6, 2023
f02c287
Address comments: distinguish scenarios between not supporting and re…
stephenxs Mar 15, 2023
cc68da0
Adjust unit test case
stephenxs Mar 15, 2023
d34e9b1
Remove redundant code
stephenxs Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions sonic_platform_base/sonic_xcvr/api/public/cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ def get_transceiver_bulk_status(self):
for i in range(1, self.NUM_CHANNELS + 1):
bulk_status["tx%ddisable" % i] = tx_disable[i-1] if self.get_tx_disable_support() else 'N/A'
bulk_status["tx%dbias" % i] = tx_bias[i - 1]
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'
bulk_status["tx%dpower" % i] = float("{:.3f}".format(self.mw_to_dbm(tx_power[i - 1]))) if self.get_tx_power_support() else 'N/A'
bulk_status["rx%dpower" % i] = float("{:.3f}".format(self.mw_to_dbm(rx_power[i - 1]))) if rx_power[i - 1] != 'N/A' else 'N/A'
bulk_status["tx%dpower" % i] = float("{:.3f}".format(self.mw_to_dbm(tx_power[i - 1]))) if tx_power[i - 1] != 'N/A' else 'N/A'

laser_temp_dict = self.get_laser_temperature()
self.vdm_dict = self.get_vdm()
Expand Down Expand Up @@ -500,12 +500,12 @@ def get_tx_power(self):
'''
This function returns TX output power in mW on each media lane
'''
tx_power_support = self.get_tx_power_support()
if tx_power_support is None:
return None

tx_power = ["N/A" for _ in range(self.NUM_CHANNELS)]

tx_power_support = self.get_tx_power_support()
if not tx_power_support:
return tx_power

if tx_power_support:
tx_power = self.xcvr_eeprom.read(consts.TX_POWER_FIELD)
if tx_power is not None:
Expand All @@ -520,12 +520,12 @@ def get_rx_power(self):
'''
This function returns RX input power in mW on each media lane
'''
rx_power_support = self.get_rx_power_support()
if rx_power_support is None:
return None

rx_power = ["N/A" for _ in range(self.NUM_CHANNELS)]

rx_power_support = self.get_rx_power_support()
if not rx_power_support:
return rx_power

if rx_power_support:
rx_power = self.xcvr_eeprom.read(consts.RX_POWER_FIELD)
if rx_power is not None:
Expand Down
22 changes: 19 additions & 3 deletions tests/sonic_xcvr/test_cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def test_get_tx_power_support(self, mock_response, expected):
[0, 0, 0, 0, 0, 0, 0, 0]
),
([False, {'OpticalPowerTx1Field': 0}], ['N/A','N/A','N/A','N/A','N/A','N/A','N/A','N/A']),
([None, None], None)
([True, None], None)
])
def test_get_tx_power(self, mock_response, expected):
self.api.get_tx_power_support = MagicMock()
Expand Down Expand Up @@ -433,7 +433,7 @@ def test_get_rx_power_support(self, mock_response, expected):
[0, 0, 0, 0, 0, 0, 0, 0]
),
([False, {'OpticalPowerRx1Field': 0}], ['N/A','N/A','N/A','N/A','N/A','N/A','N/A','N/A']),
([None, None], None)
([True, None], None)
])
def test_get_rx_power(self, mock_response, expected):
self.api.get_rx_power_support = MagicMock()
Expand Down Expand Up @@ -1266,9 +1266,25 @@ def test_get_transceiver_info(self, mock_response, expected):
'N/A',
50, 3.3,
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
None,
None,
False, False, False, False, False, False,
{'monitor value': 40},
None,
],
None
),
(
[
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
False, False, False, False, False, False,
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
'N/A',
50, 3.3,
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A'],
False, False, False, False, True, True,
{'monitor value': 40},
None,
],
Expand Down