-
Notifications
You must be signed in to change notification settings - Fork 20
RDKB-63270 Test migration from non dhcp-manager to dhcp manager scena… #87
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.
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
vpriya623
wants to merge
1
commit into
develop
Choose a base branch
from
feature/RDKB-63270
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| #!/bin/sh | ||
| ########################################################################## | ||
| # If not stated otherwise in this file or this component's LICENSE | ||
| # file the following copyright and licenses apply: | ||
| # | ||
| # Copyright 2026 RDK Management. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
|
Check failure on line 8 in systemd_units/scripts/DHCPMgrPSMValueCheck.sh
|
||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ########################################################################## | ||
|
|
||
| if [ -e /etc/log_timestamp.sh ] | ||
| then | ||
| . /etc/log_timestamp.sh | ||
| else | ||
| echo_t() | ||
| { | ||
| echo "$(date +"%y%m%d-%T.%6N") $1" | ||
| } | ||
| fi | ||
|
|
||
| LOG_FILE=/rdklogs/logs/Consolelog.txt.0 | ||
|
|
||
| echo_t "[DHCP Manager PSM Check] Running the script to check psm records" >> $LOG_FILE | ||
|
|
||
| wanifcount=$(psmcli get dmsb.wanmanager.wan.interfacecount) | ||
| if ! echo "$wanifcount" | grep -qE "^[0-9]+$"; then | ||
| echo_t "[DHCP Manager PSM Check] Invalid interface count: '$wanifcount'" >> $LOG_FILE | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo_t "[DHCP Manager PSM Check] Number of wan interface is ${wanifcount}" >> $LOG_FILE | ||
|
|
||
| cnt=1 | ||
| while [ "$cnt" -le "$wanifcount" ] | ||
| do | ||
| psmDHCPv4=$(psmcli get dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV4Interface) | ||
| psmDHCPv6=$(psmcli get dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV6Interface) | ||
|
|
||
| if [ -z "$psmDHCPv4" ]; then | ||
| psmcli set dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV4Interface Device.DHCPv4.Client.${cnt} 2> /dev/null | ||
| echo_t "[DHCP Manager PSM Check] PSM record \"dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV4Interface\" is set with \"Device.DHCPv4.Client.${cnt}\"" >> $LOG_FILE | ||
| else | ||
| echo_t "[DHCP Manager PSM Check] PSM record \"dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV4Interface\" already exists with value: \"${psmDHCPv4}\"" >> $LOG_FILE | ||
| fi | ||
|
|
||
| if [ -z "$psmDHCPv6" ]; then | ||
| psmcli set dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV6Interface Device.DHCPv6.Client.${cnt} 2> /dev/null | ||
| echo_t "[DHCP Manager PSM Check] PSM record \"dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV6Interface\" is set with \"Device.DHCPv6.Client.${cnt}\"" >> $LOG_FILE | ||
| else | ||
| echo_t "[DHCP Manager PSM Check] PSM record \"dmsb.wanmanager.if.${cnt}.VirtualInterface.1.IP.DHCPV6Interface\" already exists with value: \"${psmDHCPv6}\"" >> $LOG_FILE | ||
| fi | ||
| cnt=$((cnt + 1)) | ||
| done | ||
| echo_t "[DHCP Manager PSM Check] End Of the Script" >> $LOG_FILE | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I didn’t notice this the first time.
We shouldn’t assume that the DHCP client index is the same as the WAN index. Any DHCP client index can be mapped to any WAN interface. We already support different DHCP client indices depending on the enabled features.
We should read the default PSM configuration and update the current configuration if this issue is detected.