XF10-889 : change ETHWAN MAC to DEVICE MAC in network_setup GUI page#142
Open
michaelamal wants to merge 3 commits into
Open
XF10-889 : change ETHWAN MAC to DEVICE MAC in network_setup GUI page#142michaelamal wants to merge 3 commits into
michaelamal wants to merge 3 commits into
Conversation
Reason for change: change ETHWAN MAC to DEVICE MAC Test Procedure: build procedure Risks: Medium Priority: P0 Signed-off-by: Michael_AmalAnand@comcast.com
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the Network Setup UI to relabel the non-DOCSIS MAC address field as “Device MAC” for PON/EPON devices (while keeping “ETHWAN MAC” for other non-DOCSIS cases).
Changes:
- Adds conditional labeling (“Device MAC” vs “ETHWAN MAC”) in the MAC address section when DOCSIS is not supported.
- Reuses the existing CM MAC DML key for the displayed value in the non-DOCSIS path.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+448
to
+452
| <?% if (is_PON_Supported()) { ?> | ||
| <span class="readonlyLabel">Device MAC:</span> | ||
| <?% } else { ?> | ||
| <span class="readonlyLabel">ETHWAN MAC:</span> | ||
| <?% } ?> |
Comment on lines
+449
to
+451
| <span class="readonlyLabel">Device MAC:</span> | ||
| <?% } else { ?> | ||
| <span class="readonlyLabel">ETHWAN MAC:</span> |
Reason for change: change ETHWAN MAC to DEVICE MAC Test Procedure: build procedure Risks: Medium Priority: P0 Signed-off-by: Michael_AmalAnand@comcast.com
| <span class="readonlyLabel">ETHWAN MAC:</span> | ||
| <span class="value"><?% echo( strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC")));?></span> | ||
| <?% } else { ?> | ||
| <?% if (is_PON_Supported()) { ?> |
Reason for change: change ETHWAN MAC to DEVICE MAC Test Procedure: build procedure Risks: Medium Priority: P0 Signed-off-by: Michael_AmalAnand@comcast.com
Comment on lines
+1338
to
+1350
| /** | ||
| * Description: | ||
| * return the device supports EPON or not | ||
| */ | ||
| function is_PON_Supported() | ||
| { | ||
| $epon_status = getenv("PON_SUPPORTED"); | ||
| if($epon_status === "false") { | ||
| return false; | ||
| } else { | ||
| return true; | ||
| } | ||
| } |
Comment on lines
+447
to
454
| <?% } else { ?> | ||
| <?% if (is_PON_Supported()) { ?> | ||
| <span class="readonlyLabel">Device MAC:</span> | ||
| <?% } else { ?> | ||
| <span class="readonlyLabel">ETHWAN MAC:</span> | ||
| <?% } ?> | ||
| <span class="value"><?% echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?></span> | ||
| <?% } ?> |
Comment on lines
+449
to
+453
| <span class="readonlyLabel">Device MAC:</span> | ||
| <?% } else { ?> | ||
| <span class="readonlyLabel">ETHWAN MAC:</span> | ||
| <?% } ?> | ||
| <span class="value"><?% echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?></span> |
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
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.
Reason for change: change ETHWAN MAC to DEVICE MAC
Test Procedure: build procedure
Risks: Medium
Priority: P0
Signed-off-by: Michael_AmalAnand@comcast.com