[xcvrd] Modify to support regular expression when parsing the key in media_settings.json #471
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…media_settings.json
|
@DennisChiuEC Please add unit test |
|
OK, I will add the unit test case. |
|
@tshalvi would you please review? |
tshalvi
approved these changes
May 6, 2024
prgeor
reviewed
May 13, 2024
| if is_si_per_speed_supported(media_dict[key[VENDOR_KEY]]): | ||
| if key[LANE_SPEED_KEY] is not None and key[LANE_SPEED_KEY] in media_dict[key[VENDOR_KEY]]: # e.g: 'speed:400GAUI-8' | ||
| return media_dict[key[VENDOR_KEY]][key[LANE_SPEED_KEY]] | ||
| for dict_key in media_dict.keys(): |
There was a problem hiding this comment.
@DennisChiuEC can you write a function get_media_settings
prgeor
reviewed
May 13, 2024
| if is_si_per_speed_supported(media_dict[key[MEDIA_KEY]]): | ||
| if key[LANE_SPEED_KEY] is not None and key[LANE_SPEED_KEY] in media_dict[key[MEDIA_KEY]]: | ||
| return media_dict[key[MEDIA_KEY]][key[LANE_SPEED_KEY]] | ||
| for dict_key in media_dict.keys(): |
There was a problem hiding this comment.
@DennisChiuEC can you write a function get_media_settings
mihirpat1
reviewed
Jun 21, 2024
| @@ -168,6 +169,19 @@ def get_media_settings_value(physical_port, key): | |||
| media_dict = {} | |||
| default_dict = {} | |||
|
|
|||
| def get_media_settings(key, media_dict): | |||
| for dict_key in media_dict.keys(): | |||
| if ( re.match(dict_key, key[VENDOR_KEY]) or re.match(dict_key, key[VENDOR_KEY].split('-')[0]) # e.g: 'AMPHENOL-1234' | |||
There was a problem hiding this comment.
Suggested change
| if ( re.match(dict_key, key[VENDOR_KEY]) or re.match(dict_key, key[VENDOR_KEY].split('-')[0]) # e.g: 'AMPHENOL-1234' | |
| if (re.match(dict_key, key[VENDOR_KEY]) or \ | |
| re.match(dict_key, key[VENDOR_KEY].split('-')[0]) # e.g: 'AMPHENOL-1234' |
| if key[LANE_SPEED_KEY] is not None and key[LANE_SPEED_KEY] in media_dict[dict_key]: # e.g: 'speed:400GAUI-8' | ||
| return media_dict[dict_key][key[LANE_SPEED_KEY]] | ||
| else: | ||
| return {} |
There was a problem hiding this comment.
Why are we returning {} and not None?
There was a problem hiding this comment.
It was added by the previous PR.
I just defined a function to simplify the code.
mihirpat1
approved these changes
Jun 26, 2024
prgeor
approved these changes
Jul 5, 2024
|
@prgeor could we add |
|
@bingwang-ms Can you please help to cherry-pick this to 202405? |
mssonicbld
pushed a commit
to mssonicbld/sonic-platform-daemons
that referenced
this pull request
Sep 4, 2024
…media_settings.json (sonic-net#471) * [xcvrd] Modify to support regular expression when parsing the key in media_settings.json * fix unit test error * add unit test for getting media settings value with regular expression * define get_media_settings() * apply the suggestion for if condition
|
Cherry-pick PR to 202405: #537 |
mssonicbld
pushed a commit
that referenced
this pull request
Sep 4, 2024
…media_settings.json (#471) * [xcvrd] Modify to support regular expression when parsing the key in media_settings.json * fix unit test error * add unit test for getting media settings value with regular expression * define get_media_settings() * apply the suggestion for if condition
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
mihirpat1
added
Request for 202311 Branch
and removed
Request for 202305 Branch
Cherry Pick Conflict_202305
labels
mssonicbld
pushed a commit
to mssonicbld/sonic-platform-daemons
that referenced
this pull request
Oct 2, 2024
…media_settings.json (sonic-net#471) * [xcvrd] Modify to support regular expression when parsing the key in media_settings.json * fix unit test error * add unit test for getting media settings value with regular expression * define get_media_settings() * apply the suggestion for if condition
|
Cherry-pick PR to 202311: #544 |
mssonicbld
pushed a commit
that referenced
this pull request
Oct 2, 2024
…media_settings.json (#471) * [xcvrd] Modify to support regular expression when parsing the key in media_settings.json * fix unit test error * add unit test for getting media settings value with regular expression * define get_media_settings() * apply the suggestion for if condition
mssonicbld
added
Included in 202311 Branch
and removed
Created PR to 202311 Branch
labels
@longhuan-cisco Can you please help to create a separate 202311 PR for PR#533 since the dependent PR#471 is now cherry-picked to 202311. |
raised #545 for it |
11 tasks
yxieca
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Apr 28, 2025
…-7060CX-32S-Q32 for supporting unreliable LOS (#17652) Why I did it This PR adds a media_settings.json file to apply the parameters for arista x86_64-arista_7060_cx32s platform for QSFP+ interface of 40G speed and LR4, SR4 types. This change will go together with sonic-net/sonic-platform-daemons#471 which has the support for parsing QSFP+ 40G speed regex style keys in media_settings.json and apply the change to interface parameters in APPL DB This is indented as a part of long term fix repair item to correct RX_ERR on links facing x86_64-arista_7060_cx32s with 40G optical cables. Work item tracking 32609588 How I did it added the meda_settings.json file How to verify it tested by deploying the change and running it with xcvrd/SAI changes Signed-off-by: Vaibhav Dahiya <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Let media_settings.json can use regular expression to match 'vendor key' or 'media key'
when define a set of transceiver to use the same SI value.
Motivation and Context
Make the definition of SI value for a set of vendor or media can be more flexible
How Has This Been Tested?
root@sonic:~# cat /var/log/swss/swss.rec | grep preemphasis2024-04-17.01:53:10.594465|PORT_TABLE:Ethernet0|SET|preemphasis:0x0c8418,0x0c8418,0x0c8418,0x0c84182024-04-17.01:53:11.827324|PORT_TABLE:Ethernet4|SET|preemphasis:0x0c8418,0x0c8418,0x0c8418,0x0c8418Example of media_settings.json
"GLOBAL_MEDIA_SETTINGS": {"1-32": {"VENDOR.*-PN.*": {"preemphasis": {"lane0": "0x0c8418","lane1": "0x0c8418","lane2": "0x0c8418","lane3": "0x0c8418","lane4": "0x0c8418"}}}Additional Information (Optional)