🔥 ข่าวด่วน: Azure/sonic platform daemons/pull/

DennisChiuEC · 2024-04-18T02:01:36Z

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?

Example 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)

…media_settings.json

prgeor · 2024-04-21T19:54:19Z

@DennisChiuEC Please add unit test

prgeor

@moshemos @tshalvi Please review

DennisChiuEC · 2024-04-22T01:08:08Z

OK, I will add the unit test case.

keboliu · 2024-04-30T09:11:01Z

@tshalvi would you please review?

prgeor · 2024-05-13T16:19:50Z

-                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():


@DennisChiuEC can you write a function get_media_settings

prgeor · 2024-05-13T16:20:17Z

-            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():


@DennisChiuEC can you write a function get_media_settings

mihirpat1 · 2024-06-21T07:14:42Z


+    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'


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'

mihirpat1 · 2024-06-21T07:28:30Z

+                    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 {}


Why are we returning {} and not None?

It was added by the previous PR.
I just defined a function to simplify the code.

prgeor

@tshalvi can you please review?

longhuan-cisco · 2024-08-28T18:26:08Z

@prgeor could we add Request for 202405 Branch to cherry-pick this PR?

mihirpat1 · 2024-09-04T04:51:10Z

@bingwang-ms Can you please help to cherry-pick this to 202405?

…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

mssonicbld · 2024-09-04T15:59:06Z

Cherry-pick PR to 202405: #537

…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

longhuan-cisco · 2024-10-01T20:59:41Z

@prgeor

Could we also cherry-pick this PR to 202311?

PR #533 (which was requested for 202311 cherry-pick) depends on the regular expression support introduced by this PR.

mihirpat1 · 2024-10-02T20:13:32Z

@prgeor

Could we also cherry-pick this PR to 202311?

PR #533 (which was requested for 202311 cherry-pick) depends on the regular expression support introduced by this PR.

@yxieca Can you please help to cherry pick this PR to 202311?
MSFT ADO - 28898451

…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

mssonicbld · 2024-10-02T22:27:52Z

Cherry-pick PR to 202311: #544

…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

mihirpat1 · 2024-10-02T23:12:13Z

@prgeor

Could we also cherry-pick this PR to 202311?

PR #533 (which was requested for 202311 cherry-pick) depends on the regular expression support introduced by this PR.

@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.

longhuan-cisco · 2024-10-03T01:39:53Z

@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

…-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 <vdahiya@microsoft.com>

…ic-net#471)

[xcvrd] Modify to support regular expression when parsing the key in …

923c2bc

…media_settings.json

DennisChiuEC marked this pull request as draft April 18, 2024 03:06

fix unit test error

709a0bf

DennisChiuEC marked this pull request as ready for review April 18, 2024 03:29

prgeor reviewed Apr 21, 2024

View reviewed changes

prgeor requested a review from keboliu April 21, 2024 20:36

add unit test for getting media settings value with regular expression

5325d4d

keboliu requested review from noaOrMlnx and removed request for noaOrMlnx April 23, 2024 03:14

tshalvi approved these changes May 6, 2024

View reviewed changes

keboliu removed their request for review May 7, 2024 01:31

prgeor reviewed May 13, 2024

View reviewed changes

define get_media_settings()

fdcb74a

mihirpat1 reviewed Jun 21, 2024

View reviewed changes

apply the suggestion for if condition

778521a

mihirpat1 approved these changes Jun 26, 2024

View reviewed changes

prgeor reviewed Jul 5, 2024

View reviewed changes

prgeor approved these changes Jul 5, 2024

View reviewed changes

prgeor merged commit 74881e1 into sonic-net:master Jul 5, 2024

prgeor mentioned this pull request Jul 26, 2024

[xcvrd] Add to support MEDIA_LANE_SPEED_KEY in media_settings.json #528

Open

mihirpat1 added the Request for 202405 Branch label Sep 4, 2024

bingwang-ms added the Approved for 202405 Branch label Sep 4, 2024

mssonicbld mentioned this pull request Sep 4, 2024

[action] [PR:471] [xcvrd] Modify to support regular expression when parsing the key in media_settings.json (#471) #537

Merged

mssonicbld added the Created PR to 202405 Branch label Sep 4, 2024

mssonicbld added Included in 202405 Branch and removed Created PR to 202405 Branch labels Sep 4, 2024

mihirpat1 added the Request for 202305 Branch label Oct 2, 2024

mssonicbld added the Cherry Pick Conflict_202305 label Oct 2, 2024

mihirpat1 added Request for 202311 Branch and removed Request for 202305 Branch Cherry Pick Conflict_202305 labels Oct 2, 2024

yxieca added the Approved for 202311 Branch label Oct 2, 2024

mssonicbld mentioned this pull request Oct 2, 2024

[action] [PR:471] [xcvrd] Modify to support regular expression when parsing the key in media_settings.json (#471) #544

Merged

mssonicbld added the Created PR to 202311 Branch label Oct 2, 2024

mssonicbld added Included in 202311 Branch and removed Created PR to 202311 Branch labels Oct 2, 2024

vdahiya12 mentioned this pull request Apr 21, 2025

[ARISTA] Adding media_settings.json for Arista-7260CX3-Q64 and Arista-7060CX-32S-Q32 for supporting unreliable LOS sonic-net/sonic-buildimage#17652

Merged

11 tasks

noaOrMlnx mentioned this pull request Jun 8, 2025

Add regex escape to media_settings_parser noaOrMlnx/sonic-platform-daemons#6

Closed

lotus-nexthop pushed a commit to lotus-nexthop/sonic-platform-daemons that referenced this pull request Oct 28, 2025

Added API to decommison all datapaths of a CMIS compliant module (son…

862a67c

…ic-net#471)

	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'

Conversation

DennisChiuEC commented Apr 18, 2024

Description

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

Uh oh!

prgeor commented Apr 21, 2024

Uh oh!

prgeor left a comment

Choose a reason for hiding this comment

Uh oh!

DennisChiuEC commented Apr 22, 2024

Uh oh!

keboliu commented Apr 30, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prgeor left a comment

Choose a reason for hiding this comment

Uh oh!

longhuan-cisco commented Aug 28, 2024

Uh oh!

mihirpat1 commented Sep 4, 2024

Uh oh!

mssonicbld commented Sep 4, 2024

Uh oh!

longhuan-cisco commented Oct 1, 2024

Uh oh!

mihirpat1 commented Oct 2, 2024

Uh oh!

mssonicbld commented Oct 2, 2024

Uh oh!

mihirpat1 commented Oct 2, 2024

Uh oh!

longhuan-cisco commented Oct 3, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants