From 3ed9a74ac907a41f38d8ef02f1c8b2028c38ca20 Mon Sep 17 00:00:00 2001 From: Srikanth Muppandam Date: Wed, 29 Oct 2025 21:45:01 +0530 Subject: [PATCH] =?UTF-8?q?utils:=20net:=20ensure=5Fnetwork=5Fonline:=20ad?= =?UTF-8?q?d=20bounded=20Wi-Fi/Ethernet=20retry=20+=20nmcli=E2=86=92wpa=5F?= =?UTF-8?q?supplicant=20fallback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change hardens connectivity bring-up for flaky first-attempt failures: - Keep fast-path: return immediately if already online; sync clock when ok. - Ethernet first: link check, interface bring-up, DHCP, status triage (0/2/1). - Wi-Fi path adds bounded retries with cooldowns and cleanup between tries. - Prefer nmcli; on failure, fall back to wpa_supplicant + DHCP automatically. - Refresh udhcpc default.script if present to repair route/DNS, then recheck. - Preserve tri-state semantics: 0=online, 2=IP but no internet, 1=offline. Signed-off-by: Srikanth Muppandam --- Runner/utils/functestlib.sh | 103 ++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 35 deletions(-) diff --git a/Runner/utils/functestlib.sh b/Runner/utils/functestlib.sh index 2c3b9358..adcd2a54 100755 --- a/Runner/utils/functestlib.sh +++ b/Runner/utils/functestlib.sh @@ -3715,7 +3715,7 @@ ensure_network_online() { esac done - # -------- Wi-Fi pass -------- + # -------- Wi-Fi pass (with bounded retry) -------- net_wifi="" if command -v get_wifi_interface >/dev/null 2>&1; then net_wifi="$(get_wifi_interface 2>/dev/null || echo "")" @@ -3733,49 +3733,82 @@ ensure_network_online() { net_creds="$(get_wifi_credentials "" "" 2>/dev/null || true)" fi - if [ -n "$net_creds" ]; then - net_ssid="$(printf '%s\n' "$net_creds" | awk '{print $1}')" - net_pass="$(printf '%s\n' "$net_creds" | awk '{print $2}')" - log_info "[NET] ${net_wifi}: trying nmcli for SSID='${net_ssid}'" - if command -v wifi_connect_nmcli >/dev/null 2>&1; then - wifi_connect_nmcli "$net_wifi" "$net_ssid" "$net_pass" || true + # ---- New: retry knobs (env-overridable) ---- + wifi_max_attempts="${NET_WIFI_RETRIES:-2}" + wifi_retry_delay="${NET_WIFI_RETRY_DELAY:-5}" + if [ -z "$wifi_max_attempts" ] || [ "$wifi_max_attempts" -lt 1 ] 2>/dev/null; then + wifi_max_attempts=1 + fi + if [ -z "$wifi_retry_delay" ] || [ "$wifi_retry_delay" -lt 0 ] 2>/dev/null; then + wifi_retry_delay=0 + fi + + wifi_attempt=1 + while [ "$wifi_attempt" -le "$wifi_max_attempts" ]; do + if [ "$wifi_max_attempts" -gt 1 ]; then + log_info "[NET] ${net_wifi}: Wi-Fi attempt ${wifi_attempt}/${wifi_max_attempts}" fi - # If nmcli brought us up, do NOT fall back to wpa_supplicant - check_network_status_rc; net_rc=$? - if [ "$net_rc" -ne 0 ]; then - log_info "[NET] ${net_wifi}: falling back to wpa_supplicant + DHCP" - if command -v wifi_connect_wpa_supplicant >/dev/null 2>&1; then - wifi_connect_wpa_supplicant "$net_wifi" "$net_ssid" "$net_pass" || true + if [ -n "$net_creds" ]; then + net_ssid="$(printf '%s\n' "$net_creds" | awk '{print $1}')" + net_pass="$(printf '%s\n' "$net_creds" | awk '{print $2}')" + log_info "[NET] ${net_wifi}: trying nmcli for SSID='${net_ssid}'" + if command -v wifi_connect_nmcli >/dev/null 2>&1; then + wifi_connect_nmcli "$net_wifi" "$net_ssid" "$net_pass" || true + fi + + # If nmcli brought us up, do NOT fall back to wpa_supplicant + check_network_status_rc; net_rc=$? + if [ "$net_rc" -ne 0 ]; then + log_info "[NET] ${net_wifi}: falling back to wpa_supplicant + DHCP" + if command -v wifi_connect_wpa_supplicant >/dev/null 2>&1; then + wifi_connect_wpa_supplicant "$net_wifi" "$net_ssid" "$net_pass" || true + fi + if command -v run_dhcp_client >/dev/null 2>&1; then + run_dhcp_client "$net_wifi" 10 >/dev/null 2>&1 || true + fi fi + else + log_info "[NET] ${net_wifi}: no credentials provided ā†’ DHCP only" if command -v run_dhcp_client >/dev/null 2>&1; then run_dhcp_client "$net_wifi" 10 >/dev/null 2>&1 || true fi fi - else - log_info "[NET] ${net_wifi}: no credentials provided ā†’ DHCP only" - if command -v run_dhcp_client >/dev/null 2>&1; then - run_dhcp_client "$net_wifi" 10 >/dev/null 2>&1 || true + + net_log_iface_snapshot "$net_wifi" + check_network_status_rc; net_rc=$? + case "$net_rc" in + 0) + log_pass "[NET] ${net_wifi}: internet reachable" + ensure_reasonable_clock || log_warn "Proceeding in limited-network mode." + unset net_wifi net_ifaces net_ifc net_rc net_had_any_ip net_creds net_ssid net_pass wifi_attempt wifi_max_attempts wifi_retry_delay + return 0 + ;; + 2) + log_warn "[NET] ${net_wifi}: IP assigned but internet not reachable" + net_had_any_ip=1 + ;; + 1) + log_info "[NET] ${net_wifi}: still no IP after connect/DHCP attempt" + ;; + esac + + # If not last attempt, cooldown + cleanup before retry + if [ "$wifi_attempt" -lt "$wifi_max_attempts" ]; then + if command -v wifi_cleanup >/dev/null 2>&1; then + wifi_cleanup "$net_wifi" || true + fi + if command -v bringup_interface >/dev/null 2>&1; then + bringup_interface "$net_wifi" 2 2 || true + fi + if [ "$wifi_retry_delay" -gt 0 ] 2>/dev/null; then + log_info "[NET] ${net_wifi}: retrying in ${wifi_retry_delay}sā€¦" + sleep "$wifi_retry_delay" + fi fi - fi - net_log_iface_snapshot "$net_wifi" - check_network_status_rc; net_rc=$? - case "$net_rc" in - 0) - log_pass "[NET] ${net_wifi}: internet reachable" - ensure_reasonable_clock || log_warn "Proceeding in limited-network mode." - unset net_wifi net_ifaces net_ifc net_rc net_had_any_ip net_creds net_ssid net_pass - return 0 - ;; - 2) - log_warn "[NET] ${net_wifi}: IP assigned but internet not reachable" - net_had_any_ip=1 - ;; - 1) - log_info "[NET] ${net_wifi}: still no IP after connect/DHCP attempt" - ;; - esac + wifi_attempt=$((wifi_attempt + 1)) + done fi # -------- DHCP/route/DNS fixup (udhcpc script) --------