Skip to content
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

Convert the tx/rx power unit to the dBm unit #377

Merged
merged 8 commits into from
Aug 17, 2023
Merged

Convert the tx/rx power unit to the dBm unit #377

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ed58a5
JIRA-SONIC-7072: Convert the tx/rx power unit to the dBm unit in get_…
chiourung May 8, 2023
9f796e6
When retriving tx/rx power is not supported by the transceiver,
chiourung May 29, 2023
fdd1633
Fix TypeError("'<' not supported between instances of 'str' and 'int'")
chiourung May 29, 2023
ba1a666
Add unit test
chiourung Aug 9, 2023
3b12f48
Fix conflicts
chiourung Aug 9, 2023
dc9a0d4
Merge branch 'master' into conver_tx_rx_power
chiourung Aug 9, 2023
e3c6059
Fix test error
chiourung Aug 9, 2023
03ab51a
Merge branch 'master' into conver_tx_rx_power
prgeor Aug 16, 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
4 changes: 2 additions & 2 deletions sonic_platform_base/sonic_xcvr/api/public/sff8436.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def get_transceiver_bulk_status(self):

for i in range(1, self.NUM_CHANNELS + 1):
bulk_status["tx%dbias" % i] = tx_bias[i - 1]
bulk_status["rx%dpower" % i] = rx_power[i - 1]
bulk_status["tx%dpower" % i] = tx_power[i - 1]
bulk_status["rx%dpower" % i] = self.mw_to_dbm(rx_power[i - 1]) if rx_power[i - 1] != 'N/A' else 'N/A'
bulk_status["tx%dpower" % i] = self.mw_to_dbm(tx_power[i - 1]) if tx_power[i - 1] != 'N/A' else 'N/A'

return bulk_status

Expand Down
4 changes: 2 additions & 2 deletions sonic_platform_base/sonic_xcvr/api/public/sff8472.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ def get_transceiver_bulk_status(self):

for i in range(1, self.NUM_CHANNELS + 1):
bulk_status["tx%dbias" % i] = tx_bias[i - 1]
bulk_status["rx%dpower" % i] = rx_power[i - 1]
bulk_status["tx%dpower" % i] = tx_power[i - 1]
bulk_status["rx%dpower" % i] = self.mw_to_dbm(rx_power[i - 1]) if rx_power[i - 1] != 'N/A' else 'N/A'
bulk_status["tx%dpower" % i] = self.mw_to_dbm(tx_power[i - 1]) if tx_power[i - 1] != 'N/A' else 'N/A'

# Added to avoid failing xcvrd. Ideally xcvrd should be fixed so that this is not necessary
for i in range(2, 5):
Expand Down
4 changes: 2 additions & 2 deletions sonic_platform_base/sonic_xcvr/api/public/sff8636.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ def get_transceiver_bulk_status(self):

for i in range(1, self.NUM_CHANNELS + 1):
bulk_status["tx%dbias" % i] = tx_bias[i - 1]
bulk_status["rx%dpower" % i] = rx_power[i - 1]
bulk_status["tx%dpower" % i] = tx_power[i - 1]
bulk_status["rx%dpower" % i] = self.mw_to_dbm(rx_power[i - 1]) if rx_power[i - 1] != 'N/A' else 'N/A'
bulk_status["tx%dpower" % i] = self.mw_to_dbm(tx_power[i - 1]) if tx_power[i - 1] != 'N/A' else 'N/A'

return bulk_status

Expand Down