Skip to content

Fix log prefix hijack in c_cmis.py #609

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix log prefix hijack in c_cmis.py #609

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1f78a
Fix log prefix hijack in c_cmis.py
nate-nexthop Nov 12, 2025
3f2bc94
Fix coverage by removing dead code
nate-nexthop Nov 13, 2025
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
35 changes: 0 additions & 35 deletions sonic_platform_base/sonic_xcvr/api/public/c_cmis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@

Implementation of XcvrApi that corresponds to C-CMIS
"""
from sonic_py_common import logger
from ...fields import consts
from .cmis import CmisApi, CMIS_VDM_KEY_TO_DB_PREFIX_KEY_MAP, CMIS_XCVR_INFO_DEFAULT_DICT
import time
import copy
BYTELENGTH = 8
SYSLOG_IDENTIFIER = "CCmisApi"

C_CMIS_DELTA_VDM_KEY_TO_DB_PREFIX_KEY_MAP = {
'Modulator Bias X/I [%]' : 'biasxi',
Expand Down Expand Up @@ -43,9 +40,6 @@
8: 'lowwarning_flag'
}


helper_logger = logger.Logger(SYSLOG_IDENTIFIER)

C_CMIS_XCVR_INFO_DEFAULT_DICT = copy.deepcopy(CMIS_XCVR_INFO_DEFAULT_DICT)
C_CMIS_XCVR_INFO_DEFAULT_DICT.update({
"supported_max_tx_power": "N/A",
Expand All @@ -62,35 +56,6 @@ def _get_vdm_key_to_db_prefix_map(self):
combined_map = {**CMIS_VDM_KEY_TO_DB_PREFIX_KEY_MAP, **C_CMIS_DELTA_VDM_KEY_TO_DB_PREFIX_KEY_MAP}
return combined_map

def _update_dict_if_vdm_key_exists(self, dict_to_be_updated, new_key, vdm_dict_key, vdm_subtype_index, lane=1):
'''
This function updates the dictionary with the VDM value if the vdm_dict_key exists.
@param dict_to_be_updated: the dictionary to be updated.
@param new_key: the key to be added in dict_to_be_updated.
@param vdm_dict_key: lookup key in the VDM dictionary.
@param vdm_subtype_index: the index of the VDM subtype in the VDM page.
0 refers to the real time value
1 refers to the high alarm threshold
2 refers to the low alarm threshold
3 refers to the high warning threshold
4 refers to the low warning threshold
5 refers to the high alarm flag
6 refers to the low alarm flag
7 refers to the high warning flag
8 refers to the low warning flag
@param lane: the lane number. Default is 1.

@return: True if the key exists in the VDM dictionary, False if not.
'''
try:
dict_to_be_updated[new_key] = self.vdm_dict[vdm_dict_key][lane][vdm_subtype_index]
except KeyError:
dict_to_be_updated[new_key] = 'N/A'
helper_logger.log_debug('key {} not present in VDM'.format(new_key))
return False

return True

def get_freq_grid(self):
'''
This function returns the configured frequency grid. Unit in GHz
Expand Down
Loading