f-82: e2e: bail et renouvellement selon le gestionnaire réseau #82

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-31 22:01:22 +01:00
commit 469a2575ee
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
9 changed files with 74 additions and 18 deletions

View file

@ -165,8 +165,27 @@ vm_has_ip () {
vm_ssh "${1}" "${2}" 'ip -4 -o addr show' | grep -q " ${3}/"
}
VM_NM='command -v nmcli >/dev/null'
lease_value () {
awk -v k="${1}" '
BEGIN { nm["ADDRESS"] = "ip_address"; nm["SERVER_ADDRESS"] = "dhcp_server_identifier"; nm["DNS"] = "domain_name_servers"; nm["NTP"] = "ntp_servers"; nm["MTU"] = "interface_mtu" }
{ sub(/^DHCP4:/, ""); gsub(/\\:/, ":") }
index($0, k "=") == 1 { print substr($0, length(k) + 2); exit }
(i = index($0, " = ")) > 0 { n = substr($0, 1, i - 1); gsub(/^ +| +$/, "", n); if (n == nm[k]) { v = substr($0, i + 3); gsub(/ +$/, "", v); print v; exit } }
'
}
vm_lease () {
vm_ssh "${1}" "${2}" "sudo cat /run/systemd/netif/leases/\$(cat /sys/class/net/${4:-ens3}/ifindex)" | sed -n "s/^${3}=//p"
vm_ssh "${1}" "${2}" "if ${VM_NM}; then nmcli -g DHCP4 device show ${4:-ens3} | tr '|' '\\n'; else sudo cat /run/systemd/netif/leases/\$(cat /sys/class/net/${4:-ens3}/ifindex); fi" | lease_value "${3}"
}
vm_lease_mtime () {
vm_ssh "${1}" "${2}" "if ${VM_NM}; then f=\$(sudo sh -c 'ls /var/lib/NetworkManager/internal-*-${3:-ens3}.lease'); else f=/run/systemd/netif/leases/\$(cat /sys/class/net/${3:-ens3}/ifindex); fi; sudo stat -c %Y \"\${f}\""
}
vm_renew () {
vm_ssh "${1}" "${2}" "if ${VM_NM}; then sudo nmcli device modify ${3:-ens3} ipv4.dhcp-timeout \$(( 300 + \$(date +%s) % 600 )); else sudo networkctl renew ${3:-ens3}; fi"
}
vm_meta () {
@ -200,7 +219,7 @@ lease_renewed () {
local t0 i
t0=$(date +%s)
sleep 1
vm_ssh "${1}" "${2}" "sudo networkctl renew ${3:-ens3}" || return 1
vm_renew "${1}" "${2}" "${3:-ens3}" || return 1
for i in $(seq 1 15); do
[ "$(dhcp_acks "${t0}" "${2}")" -gt 0 ] && return 0
sleep 2