Skip to content

JIRA-SONIC-13444: [CMIS] [LUMENTUM] Support OSFP-ZR #25

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
chiourung merged 1 commit into from
Dec 1, 2025
Merged

JIRA-SONIC-13444: [CMIS] [LUMENTUM] Support OSFP-ZR #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions sonic-xcvrd/xcvrd/xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,7 @@ def task_worker(self):
self.port_dict[lport]['cmis_state'] = self.CMIS_STATE_READY
continue

if api.is_coherent_module():
if api.is_tx_tunable():
if 'tx_power' not in self.port_dict[lport]:
self.port_dict[lport]['tx_power'] = self.get_configured_tx_power_from_db(lport)
if 'laser_freq' not in self.port_dict[lport]:
Expand Down Expand Up @@ -1531,7 +1531,7 @@ def task_worker(self):
self.port_dict[lport]['cmis_state'] = self.CMIS_STATE_READY
continue
# Configure the target output power if ZR module
if api.is_coherent_module():
if api.is_tx_tunable():
tx_power = self.port_dict[lport]['tx_power']
# Prevent configuring same tx power multiple times
if 0 != tx_power and tx_power != api.get_tx_config_power():
Expand All @@ -1543,7 +1543,7 @@ def task_worker(self):
need_update = self.is_cmis_application_update_required(api, appl, host_lanes_mask)

# For ZR module, Datapath needes to be re-initlialized on new channel selection
if api.is_coherent_module():
if api.is_tx_tunable():
freq = self.port_dict[lport]['laser_freq']
# If user requested frequency is NOT the same as configured on the module
# force datapath re-initialization
Expand Down Expand Up @@ -1614,7 +1614,7 @@ def task_worker(self):
self.force_cmis_reinit(lport, retries + 1)
continue

if api.is_coherent_module():
if api.is_tx_tunable():
# For ZR module, configure the laser frequency when Datapath is in Deactivated state
freq = self.port_dict[lport]['laser_freq']
if 0 != freq:
Expand Down