RDKB-64625 : Fix sysint scripts to use generic flow#34
RDKB-64625 : Fix sysint scripts to use generic flow#34S-Parthiban-Selvaraj wants to merge 2 commits intodevelopfrom
Conversation
Reason for change: Create a /128 Ipv6 address using the received IA_PD Test Procedure: Updated in the JIra Risks: hign Priority: P0 Change-Id: Ic1fa9f5d0b4f0c01fb19de052db555481c78deb0 Signed-off-by: Parthiban Selvaraj <parthiban.selvaraj@sky.uk>
There was a problem hiding this comment.
Pull request overview
This PR updates multiple RDKB operational scripts to use a more generic IPv6 selection flow (prefer GUA on the active WAN interface, otherwise fall back to IPv4), removing several BOX_TYPE- and LANIPv6GUASupport-specific branches.
Changes:
- Simplified WAN IP discovery in
utils.shto prefer WAN-interface Global IPv6 with IPv4 fallback. - Standardized “force curl to IPv4 when no WAN Global IPv6 exists” logic across log upload scripts.
- Removed several device-specific IPv6-interface branches (e.g., HUB4 interface selection paths) in upload/tunnel scripts.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| utils.sh | Adjusts generic WAN IP selection to prefer Global IPv6 on $WANINTERFACE with IPv4 fallback; updates CM/eRouter IPv6 sourcing to WAN interface. |
| uploadRDKBLogs.sh | Removes device/LANIPv6-specific IPv6 selection branches; uses a single WAN Global IPv6 presence check with IPv4 fallback. |
| startTunnel.sh | Simplifies CM IPv6 selection in the ETHWAN path to use WAN Global IPv6 (previous special-case logic removed). |
| opsLogUpload.sh | Standardizes addr-family selection based on WAN Global IPv6 presence. |
| onboardLogUpload.sh | Standardizes addr-family selection based on WAN Global IPv6 presence. |
| dcaSplunkUpload.sh | Standardizes addr-family selection based on eRouter/WAN Global IPv6 presence. |
| DCMscript.sh | Standardizes addr-family selection based on eRouter/WAN Global IPv6 presence. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| CM_IP=`ifconfig $WAN_INTERFACE | grep Global | awk '/inet6/{print $3}' | cut -d '/' -f1` | ||
| if [ -z "$CM_IP" ]; then | ||
| CM_IP=$CM_IPV4 |
There was a problem hiding this comment.
In the ETHWAN_ENABLE path, CM_IP is now derived only from the WAN interface’s Global IPv6 address. This drops the prior LANIPv6GUASupport / SCER11BEL IPv6-only (MAP-T) handling that explicitly used brlan0’s GUA when CM_IPV4 is empty, so reverse-SSH may fail to get any reachable address in that scenario. Consider reintroducing that IPv6-only logic (or delegating to getCMIPAddress from utils.sh), and also ensure the command selects a single IPv6 (e.g., first match) to avoid CM_IP becoming multi-line when multiple Global addresses are present.
| CM_IP=`ifconfig $WAN_INTERFACE | grep Global | awk '/inet6/{print $3}' | cut -d '/' -f1` | |
| if [ -z "$CM_IP" ]; then | |
| CM_IP=$CM_IPV4 | |
| CM_IP=`ifconfig $WAN_INTERFACE | grep Global | awk '/inet6/{print $3}' | cut -d '/' -f1 | head -n1` | |
| if [ -z "$CM_IP" ]; then | |
| if [ -z "$CM_IPV4" ]; then | |
| # IPv6-only/MAP-T handling: use brlan0 GUA when WAN IPv4 is unavailable | |
| CM_IP=`ifconfig brlan0 | grep Global | awk '/inet6/{print $3}' | cut -d '/' -f1 | head -n1` | |
| fi | |
| if [ -z "$CM_IP" ]; then | |
| CM_IP=$CM_IPV4 | |
| fi |
Reason for change:
Create a /128 Ipv6 address using the received IA_PD Test Procedure: Updated in the JIra
Risks: hign
Priority: P0
Change-Id: Ic1fa9f5d0b4f0c01fb19de052db555481c78deb0
This PR is dependent on the following related PRs:
rdkcentral/telco-voice-manager#5
rdkcentral/utopia#69
rdkcentral/wan-manager#79
rdkcentral/provisioning-and-management#127
rdkcentral/xconf-client#20
rdkcentral/test-and-diagnostic#172
https://github.com/rdk-gdcs/firewall/pull/5
#34