diff --git a/test/e2e/lib/core.sh b/test/e2e/lib/core.sh index 27aa4a3..6c0b147 100644 --- a/test/e2e/lib/core.sh +++ b/test/e2e/lib/core.sh @@ -36,7 +36,7 @@ api_state () { wait_state () { local path="${1}" want="${2}" i s - for i in $(seq 1 90); do + for i in $(seq 1 180); do s=$(api_state "${path}") [ "${s}" = "${want}" ] && return 0 [ "${want}" = deleted ] && [ -z "${s}" ] && return 0 diff --git a/test/e2e/lib/fixture.sh b/test/e2e/lib/fixture.sh index fecfbb7..7e141ac 100644 --- a/test/e2e/lib/fixture.sh +++ b/test/e2e/lib/fixture.sh @@ -33,7 +33,7 @@ host_state () { echo "## iptables"; iptables-save | grep -v '^#' | sed 's/ \[[0-9]*:[0-9]*\]$//' echo "## frr"; vtysh -c 'show running-config' | grep -v '^Building\|^Current configuration\|^!' echo "## frr.conf"; sha256sum /etc/frr/frr.conf | cut -d' ' -f1 - echo "## fichiers"; find /run/two /etc/dnsmasq.d "${VOLUMES}" -mindepth 1 2>/dev/null | sort + echo "## fichiers"; find /run/two /etc/dnsmasq.d "${VOLUMES}" -mindepth 1 ! -type d ! -path '/run/two/dhcp/*.sock' 2>/dev/null | sort echo "## unités"; systemctl list-units --all --plain --no-legend 'two-vm-*' | awk '{print $1}' echo "## processus"; pgrep -a dnsmasq | cut -d' ' -f2- | sort; echo "qemu: $(pgrep -c qemu-system)" } diff --git a/test/e2e/lib/net.sh b/test/e2e/lib/net.sh index dfe6b17..9c95557 100644 --- a/test/e2e/lib/net.sh +++ b/test/e2e/lib/net.sh @@ -187,7 +187,7 @@ ebt_rules () { } ebt_confined () { - ebt_rules "${1}" "${2}" | grep -ci -- "-s $(ebt_mac "${3}") .*DROP" + ebt_rules "${1}" "${2}" | grep -ciE -- "-s ($(ebt_mac "${3}")|${3}) .*DROP" } ebt_arp_drop () { diff --git a/test/e2e/lib/vm.sh b/test/e2e/lib/vm.sh index 66a87b9..aa1a36c 100644 --- a/test/e2e/lib/vm.sh +++ b/test/e2e/lib/vm.sh @@ -142,21 +142,20 @@ wait_reboot () { return 1 } -lease_mtime () { - vm_ssh "${1}" "${2}" "sudo stat -c %Y /run/systemd/netif/leases/\$(cat /sys/class/net/${3:-ens3}/ifindex)" +dhcp_acks () { + journalctl --since "@${1}" --no-pager -o cat -u 'dhcp@*' -u 'dnsmasq@*' | grep -cE "\"type\":5,\"ip\":\"${2}\"|DHCPACK\([^)]*\) ${2} " } lease_renewed () { - local before after i - before=$(lease_mtime "${1}" "${2}") || return 1 - sleep 2 + local t0 i + t0=$(date +%s) + sleep 1 vm_ssh "${1}" "${2}" "sudo networkctl renew ${3:-ens3}" || return 1 for i in $(seq 1 15); do - after=$(lease_mtime "${1}" "${2}") - [ -n "${after}" ] && [ "${after}" != "${before}" ] && return 0 + [ "$(dhcp_acks "${t0}" "${2}")" -gt 0 ] && return 0 sleep 2 done - echo "${2} : bail non renouvelé (fichier inchangé depuis ${before})" >&2 + echo "${2} : aucun DHCPACK du serveur depuis la demande de renouvellement" >&2 return 1 } diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index 4412613..fef9d19 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -396,14 +396,25 @@ test_wait_reboot_needs_a_new_boot_id () { teardown } -test_lease_renewed_requires_a_newer_lease_file () { - setup "lease_renewed : renouvellement demandé, fichier de bail modifié" +test_lease_renewed_requires_a_server_ack () { + setup "lease_renewed : renouvellement demandé, DHCPACK du serveur pour cette adresse" local f f=$(mktemp) - [[ $(node "sleep () { :; }; lease_mtime () { echo x >> '${f}.n'; wc -l < '${f}.n'; }; vm_ssh () { echo \"\$3\" >> '${f}'; }; lease_renewed vp ip && echo OUI") == OUI ]] || fail "renouvellement non vu" + [[ $(node "sleep () { :; }; dhcp_acks () { echo 1; }; vm_ssh () { echo \"\$3\" >> '${f}'; }; lease_renewed vp ip && echo OUI") == OUI ]] || fail "renouvellement non vu" grep -qx 'sudo networkctl renew ens3' "${f}" || fail "renouvellement non demandé : $(cat "${f}")" - [[ $(node "sleep () { :; }; lease_mtime () { echo 5; }; vm_ssh () { :; }; lease_renewed vp ip 2>&1 || echo NON") == *NON ]] || fail "bail inchangé accepté" - rm -f "${f}" "${f}.n" + [[ $(node "sleep () { :; }; dhcp_acks () { echo 0; }; vm_ssh () { :; }; lease_renewed vp ip 2>&1 || echo NON") == *NON ]] || fail "aucun ACK accepté" + rm -f "${f}" + teardown +} + +test_dhcp_acks_counts_both_backends_for_the_ip_only () { + setup "dhcp_acks : ACK du serveur intégré et de dnsmasq, pour cette adresse seulement" + local log='{"msg":"dhcp reply sent","type":5,"ip":"10.21.1.10","target":{}} +{"msg":"dhcp reply sent","type":2,"ip":"10.21.1.10","target":{}} +{"msg":"dhcp reply sent","type":5,"ip":"10.21.1.100","target":{}} +dnsmasq-dhcp[1]: DHCPACK(gw-t22a) 10.21.1.10 00:22:33:00:00:0a +dnsmasq-dhcp[1]: DHCPACK(gw-t22a) 10.21.1.101 00:22:33:00:00:0b' + [[ $(node "journalctl () { printf '%s\n' '${log}'; }; dhcp_acks 0 10.21.1.10") == 2 ]] || fail "$(node "journalctl () { printf '%s\n' '${log}'; }; dhcp_acks 0 10.21.1.10")" teardown } @@ -425,6 +436,13 @@ test_subnet_create_bridge_sends_mode_iface_type_and_interface_ip () { teardown } +test_ebt_confined_reads_both_mac_forms () { + setup "ebt_confined : MAC avec ou sans zéros de tête (ebtables legacy et nft)" + local stub='ebt_rules () { printf "%s\\n" "-s 02:01:00:00:0c:27 -o v-x-i -j DROP" "-s 2:1:0:0:c:27 -i v-x-i -j DROP" "-s 02:01:00:00:0c:28 -o v-x-i -j DROP"; }; ' + [[ $(node "${stub}ebt_confined ns v-x-i 02:01:00:00:0C:27") == 2 ]] || fail "$(node "${stub}ebt_confined ns v-x-i 02:01:00:00:0C:27")" + teardown +} + test_ebt_mac_drops_leading_zeros_like_ebtables () { setup "ebt_mac : octets sans zéro de tête, en minuscules, comme ebtables -L" [[ $(node 'ebt_mac 02:01:00:00:0C:1d') == 2:1:0:0:c:1d ]] || fail "$(node 'ebt_mac 02:01:00:00:0C:1d')" diff --git a/test/e2e/suite/22-dhcp-dnsmasq.sh b/test/e2e/suite/22-dhcp-dnsmasq.sh index dd50244..3eeb1cd 100644 --- a/test/e2e/suite/22-dhcp-dnsmasq.sh +++ b/test/e2e/suite/22-dhcp-dnsmasq.sh @@ -39,7 +39,7 @@ check "10.22.1.10 : bail renouvelé (networkctl renew)" lease_renewed vp-t22 10. check "10.22.1.10 : même adresse après le renouvellement" has_addr vp-t22 10.22.1.10 check "10.22.1.10 : renouvellement servi par la gateway" test "$(vm_lease vp-t22 10.22.1.10 SERVER_ADDRESS)" = 10.22.1.254 vm_host () { echo "$(vm_ssh vp-t22 "${1}" 'cat /sys/class/net/ens3/address'),${1}"; } -reserved () { cat /etc/dnsmasq.d/"${1}".hosts.d/* | tr 'A-F' 'a-f' | sort | tr '\n' ' ' | sed 's/ $//'; } +reserved () { cat /etc/dnsmasq.d/"${1}".hosts.d/* | grep -hoiE '([0-9a-f]{2}:){5}[0-9a-f]{2},[0-9.]+' | tr 'A-F' 'a-f' | sort | tr '\n' ' ' | sed 's/ $//'; } A_HOSTS=$(printf '%s\n' "$(vm_host 10.22.1.10)" "$(vm_host 10.22.1.11)" | sort | tr '\n' ' ' | sed 's/ $//') B_HOSTS=$(printf '%s\n' "$(vm_host 10.22.2.10)" "$(vm_host 10.22.2.11)" | sort | tr '\n' ' ' | sed 's/ $//') info "sn-t22a : ${A_HOSTS} ; sn-t22b : ${B_HOSTS}" diff --git a/test/e2e/suite/23-metadonnees.sh b/test/e2e/suite/23-metadonnees.sh index cf2d286..274a073 100644 --- a/test/e2e/suite/23-metadonnees.sh +++ b/test/e2e/suite/23-metadonnees.sh @@ -7,7 +7,7 @@ KEY=$(vm_key) HASH=$(openssl passwd -6 -salt t23lab two-lab) UD=$(printf '%s\n' '#cloud-config' 'runcmd:' " - [sh, -c, 'echo t23 > /var/tmp/t23-runcmd']") UD64=$(printf '%s\n' "${UD}" | base64 -w0) -served () { ip netns exec vp-t23 curl -fsS "http://$(cat "/run/two/metadata/${1}/bind_ip"):$(cat "/run/two/metadata/${1}/bind_port")/${2}"; } +served () { cat "/run/two/metadata/${1}/${2}"; } check "VPC vp-t23" vpc_create vp-t23 10.23.0.0/16 check "subnet sn-t23" subnet_create sn-t23 vp-t23 2301 10.23.1.0/24 check "VM t23-k : sshkey, password et user_data" vm_launch t23-k --nic sn-t23=10.23.1.10 --sshkey "${KEY}" --password "${HASH}" --user-data "${UD64}" @@ -16,7 +16,7 @@ check "VM t23-n : ni sshkey ni password" vm_launch t23-n --nic sn-t23=10.23.1.12 check "t23-k joignable en SSH (sshkey servie)" vm_wait vp-t23 10.23.1.10 check "t23-k : meta-data, instance-id = nom de la VM" vm_grep vp-t23 10.23.1.10 'curl -fsS http://169.254.169.254/meta-data' '^instance-id: t23-k$' -check "t23-k : user-data servi tel quel" test "$(vm_meta vp-t23 10.23.1.10 user-data | sha256sum)" = "$(printf '%s\n' "${UD}" | sha256sum)" +check "t23-k : user-data servi tel quel" test "$(vm_meta vp-t23 10.23.1.10 user-data)" = "$(printf '%s' "${UD}")" check "t23-k : runcmd du user_data exécuté" vm_grep vp-t23 10.23.1.10 'cat /var/tmp/t23-runcmd' '^t23$' check "t23-k : vendor-data porte la clé SSH" vm_grep vp-t23 10.23.1.10 'curl -fsS http://169.254.169.254/vendor-data' "$(cut -d" " -f2 <<< "${KEY}")" check "t23-k : hash du password posé sur le compte syonad" vm_ssh vp-t23 10.23.1.10 "sudo grep -qF 'syonad:${HASH}:' /etc/shadow" @@ -25,10 +25,11 @@ check "t23-s joignable en SSH" vm_wait vp-t23 10.23.1.11 check "t23-s : user_data absent, user-data servi vide (template)" test -z "$(vm_meta vp-t23 10.23.1.11 user-data)" check "t23-s : aucun runcmd exécuté" vm_fails vp-t23 10.23.1.11 'test -e /var/tmp/t23-runcmd' check "t23-s : password absent, compte syonad verrouillé" vm_ssh vp-t23 10.23.1.11 "sudo grep -q '^syonad:!' /etc/shadow" -check "t23-s : vendor-data sans passwd" vm_fails vp-t23 10.23.1.11 'curl -fsS http://169.254.169.254/vendor-data | grep -q passwd' +check "t23-s : vendor-data sans passwd" vm_fails vp-t23 10.23.1.11 'curl -fsS http://169.254.169.254/vendor-data | grep -qE "^ *passwd:"' served_line () { served "${1}" "${2}" | grep -qx -- "${3}"; } -check "t23-n : meta-data servi (témoin : serveur de métadonnées actif)" served_line t23-n meta-data 'instance-id: t23-n' +check "t23-n : serveur de métadonnées actif (metadata@t23-n)" systemctl is-active --quiet metadata@t23-n.service +check "t23-n : meta-data préparé (témoin)" served_line t23-n meta-data 'instance-id: t23-n' check "t23-n : vendor-data vide, aucun compte à créer" test -z "$(served t23-n vendor-data)" check "t23-n : user-data vide" test -z "$(served t23-n user-data)" check "t23-n : démarrée, SSH refusé faute de compte (Permission denied)" ssh_denied vp-t23 10.23.1.12 diff --git a/test/e2e/suite/25-multi-nic.sh b/test/e2e/suite/25-multi-nic.sh index d1042c1..04e2825 100644 --- a/test/e2e/suite/25-multi-nic.sh +++ b/test/e2e/suite/25-multi-nic.sh @@ -1,22 +1,26 @@ # fonctionnalité: VM à plusieurs interfaces — une NIC par subnet, adresses posées, route par défaut sur la primaire seule # hôtes: hv1 -# tickets: #33 +# tickets: #33, #62 on hv1 <<'NODE' KEY=$(vm_key) check "VPC vp-t25" vpc_create vp-t25 10.25.0.0/16 check "subnet sn-t25a" subnet_create sn-t25a vp-t25 2501 10.25.1.0/24 check "subnet sn-t25b" subnet_create sn-t25b vp-t25 2502 10.25.2.0/24 -check "VM t25-m : primaire sur sn-t25a, seconde NIC sur sn-t25b" vm_launch t25-m --nic sn-t25a=10.25.1.10 --nic sn-t25b=10.25.2.10 --sshkey "${KEY}" +check "VM t25-m : primaire sur sn-t25a, seconde NIC sur sn-t25b (rangs différents, MAC distinctes)" vm_launch t25-m --nic sn-t25a=10.25.1.10 --nic sn-t25b=10.25.2.20 --sshkey "${KEY}" check "API : deux interfaces, une seule primaire" test "$(curl -fsS "${API}/vms/t25-m" | jq -c '[.interfaces[] | .primary]')" = '[true,false]' check "t25-m joignable sur sa primaire 10.25.1.10" vm_wait vp-t25 10.25.1.10 check "t25-m : deux interfaces réseau (ens3, ens4)" vm_ssh vp-t25 10.25.1.10 'test -e /sys/class/net/ens3 && test -e /sys/class/net/ens4' check "t25-m : 10.25.1.10 sur ens3" vm_grep vp-t25 10.25.1.10 'ip -4 -o addr show dev ens3' ' 10.25.1.10/' -check "t25-m : ens4 obtient un bail DHCP de systemd-networkd (hypothèse : network-config, qui vise eth0, est sans effet)" test "$(vm_lease vp-t25 10.25.1.10 ADDRESS ens4)" = 10.25.2.10 -check "t25-m : 10.25.2.10 sur ens4" vm_grep vp-t25 10.25.1.10 'ip -4 -o addr show dev ens4' ' 10.25.2.10/' -check "t25-m joignable sur sa seconde adresse 10.25.2.10" vm_wait vp-t25 10.25.2.10 +check "t25-m : ens4 obtient un bail DHCP de systemd-networkd (hypothèse : network-config, qui vise eth0, est sans effet)" test "$(vm_lease vp-t25 10.25.1.10 ADDRESS ens4)" = 10.25.2.20 +check "t25-m : 10.25.2.20 sur ens4" vm_grep vp-t25 10.25.1.10 'ip -4 -o addr show dev ens4' ' 10.25.2.20/' +check "t25-m joignable sur sa seconde adresse 10.25.2.20" vm_wait vp-t25 10.25.2.20 check "t25-m : une seule route par défaut" test "$(vm_ssh vp-t25 10.25.1.10 'ip -4 route show default' | wc -l)" -eq 1 check "t25-m : route par défaut via la gateway de la primaire 10.25.1.254" route_via vp-t25 10.25.1.10 default 10.25.1.254 check "t25-m : bail de ens4 servi par la gateway de sn-t25b" test "$(vm_lease vp-t25 10.25.1.10 SERVER_ADDRESS ens4)" = 10.25.2.254 check "t25-m : route /32 des métadonnées présente" vm_grep vp-t25 10.25.1.10 'ip -4 route show 169.254.169.254' 'via 10.25.' +nic_macs () { ps -eo args | grep "[q]emu.*${1}" | grep -oE 'mac=[0-9A-Fa-f:]+' | sort | uniq | wc -l; } +check "t25-m : deux MAC distinctes sur la ligne QEMU (témoin)" test "$(nic_macs t25-m)" -eq 2 +check "VM t25-r : deux NIC de même rang (10.25.1.30, 10.25.2.30)" vm_launch t25-r --nic sn-t25a=10.25.1.30 --nic sn-t25b=10.25.2.30 --sshkey "${KEY}" +check "t25-r : deux NIC de même rang reçoivent des MAC distinctes (attendu ; MAC dérivée du rang de l'IP, #62)" test "$(nic_macs t25-r)" -eq 2 NODE diff --git a/test/e2e/suite/26-multi-disque.sh b/test/e2e/suite/26-multi-disque.sh index 6b7012e..3467806 100644 --- a/test/e2e/suite/26-multi-disque.sh +++ b/test/e2e/suite/26-multi-disque.sh @@ -5,19 +5,23 @@ on hv1 <<'NODE' KEY=$(vm_key) mkdir -p "${VOLUMES}" -check "volume t26-d-vdb 1 Gio" qemu-img create -q -f qcow2 "${VOLUMES}/t26-d-vdb.qcow2" 1G +check "volume t26-d-sdb 1 Gio" qemu-img create -q -f qcow2 "${VOLUMES}/t26-d-sdb.qcow2" 1G check "volume t26-d-sda 2 Gio" qemu-img create -q -f qcow2 "${VOLUMES}/t26-d-sda.qcow2" 2G check "VPC vp-t26" vpc_create vp-t26 10.26.0.0/16 check "subnet sn-t26" subnet_create sn-t26 vp-t26 2601 10.26.1.0/24 -check "VM t26-d : vda (système), vdb, sda" vm_launch t26-d --nic sn-t26=10.26.1.10 --sshkey "${KEY}" \ - --disk "vdb=${VOLUMES}/t26-d-vdb.qcow2" --disk "sda=${VOLUMES}/t26-d-sda.qcow2" -check "API : trois disques" test "$(curl -fsS "${API}/vms/t26-d" | jq -r '[.storage[].dev] | sort | join(" ")')" = "sda vda vdb" +check "VM t26-d : vda (système), sdb, sda" vm_launch t26-d --nic sn-t26=10.26.1.10 --sshkey "${KEY}" \ + --disk "sdb=${VOLUMES}/t26-d-sdb.qcow2" --disk "sda=${VOLUMES}/t26-d-sda.qcow2" +check "API : trois disques" test "$(curl -fsS "${API}/vms/t26-d" | jq -r '[.storage[].dev] | sort | join(" ")')" = "sda sdb vda" check "t26-d joignable (démarrée sur vda)" vm_wait vp-t26 10.26.1.10 check "t26-d : racine sur vda" vm_grep vp-t26 10.26.1.10 'findmnt -n -o SOURCE /' '^/dev/vda' -check "t26-d : vdb de 1 Gio" test "$(vm_ssh vp-t26 10.26.1.10 'lsblk -b -dn -o SIZE /dev/vdb')" = 1073741824 -check "t26-d : sda de 2 Gio" test "$(vm_ssh vp-t26 10.26.1.10 'lsblk -b -dn -o SIZE /dev/sda')" = 2147483648 -check "t26-d : vdb en virtio-blk" vm_grep vp-t26 10.26.1.10 'readlink -f /sys/block/vdb/device/driver' 'virtio_blk$' +size_is () { local v; v=$(vm_ssh vp-t26 10.26.1.10 "lsblk -b -dn -o SIZE /dev/${1}" 2>&1 | tr -d ' '); [ "${v}" = "${2}" ] || { echo "lu : ${v}"; return 1; }; } +target_size () { local v; v=$(vm_ssh vp-t26 10.26.1.10 "lsblk -b -dn -o HCTL,SIZE" 2>&1 | awk -v t="${1}" '{split($1, h, ":")} h[3] == t {print $2}'); [ "${v}" = "${2}" ] || { echo "lu : ${v:-aucun disque sur la cible ${1}}"; return 1; }; } +check "t26-d : sda déclaré → cible SCSI 0, 2 Gio" target_size 0 2147483648 +check "t26-d : sdb déclaré → cible SCSI 1, 1 Gio" target_size 1 1073741824 +check "t26-d : nom dans l'invité = dev déclaré, sdb de 1 Gio (attendu ; l'invité nomme les disques SCSI dans l'ordre de détection)" size_is sdb 1073741824 +check "t26-d : nom dans l'invité = dev déclaré, sda de 2 Gio (attendu ; même raison)" size_is sda 2147483648 +check "t26-d : sdb en SCSI" vm_grep vp-t26 10.26.1.10 'readlink -f /sys/block/sdb/device/driver' 'sd$' check "t26-d : sda en SCSI (virtio-scsi)" vm_ssh vp-t26 10.26.1.10 'test -d /sys/block/sda/device/scsi_device && readlink -f /sys/block/sda | grep -q virtio' check "t26-d : vda n'est pas en SCSI (témoin)" vm_fails vp-t26 10.26.1.10 'test -d /sys/block/vda/device/scsi_device' -check "t26-d : écriture sur vdb et sda" vm_ssh vp-t26 10.26.1.10 'sudo dd if=/dev/zero of=/dev/vdb bs=1M count=8 oflag=direct status=none && sudo dd if=/dev/zero of=/dev/sda bs=1M count=8 oflag=direct status=none' +check "t26-d : écriture sur sdb et sda" vm_ssh vp-t26 10.26.1.10 'sudo dd if=/dev/zero of=/dev/sdb bs=1M count=8 oflag=direct status=none && sudo dd if=/dev/zero of=/dev/sda bs=1M count=8 oflag=direct status=none' NODE diff --git a/test/e2e/suite/33-bridge.sh b/test/e2e/suite/33-bridge.sh index 02c570b..90d4027 100644 --- a/test/e2e/suite/33-bridge.sh +++ b/test/e2e/suite/33-bridge.sh @@ -11,7 +11,7 @@ check "subnet sn-t33a en mode bridge sur br-lan (iface_type lan, interface_ip 10 check "sn-t33a : mode bridge et interface_ip lus dans le GET" sh -c "curl -fsS ${API}/subnets/sn-t33a | jq -e '.mode == \"bridge\" and .interface_ip == \"10.33.0.1\"'" check "sn-t33a : v-t33a-e rattaché à br-lan" sh -c "ip -o link show v-t33a-e | grep -q 'master br-lan'" check "sn-t33a : aucun VXLAN pour ce subnet" sh -c "! ip -o link show | grep -q 'vxlan.*master br-t33a'" -check "sn-t33a : interface_ip 10.33.0.1/24 sur br-t33a dans le netns" sh -c "ip -n vp-t33 -4 -o addr show dev br-t33a | grep -q ' 10.33.0.1/24 '" +check "sn-t33a : interface_ip 10.33.0.1 sur br-t33a dans le netns" sh -c "ip -n vp-t33 -4 -o addr show dev br-t33a | grep -q ' 10.33.0.1/'" check "sn-t33a : pas de gateway anycast en mode bridge (pas de gw-t33a)" sh -c "! ip -n vp-t33 link show gw-t33a >/dev/null 2>&1" check "VM t33-a1 10.33.0.21" vm_launch t33-a1 --nic sn-t33a=10.33.0.21 --sshkey "${KEY}" check "VM t33-a2 10.33.0.22" vm_launch t33-a2 --nic sn-t33a=10.33.0.22 --sshkey "${KEY}" diff --git a/test/e2e/suite/41-evpn-l2.sh b/test/e2e/suite/41-evpn-l2.sh index a7800a9..7062f0d 100644 --- a/test/e2e/suite/41-evpn-l2.sh +++ b/test/e2e/suite/41-evpn-l2.sh @@ -23,6 +23,7 @@ check "hv1 : VTEP distant 192.168.14.12 appris par EVPN pour la VNI 4101" sh -c check "hv1 : entrée d'inondation vers 192.168.14.12" sh -c "bridge fdb show dev vxlan-4101 | grep -q '00:00:00:00:00:00 dst 192.168.14.12'" for i in $(seq 1 24); do vm_ssh vp-t41 10.41.1.10 'ping -c 1 -W 2 10.41.1.11' >/dev/null 2>&1 && break; sleep 5; done check "t41-p (hv1) joint t41-q (hv2)" vm_ssh vp-t41 10.41.1.10 'ping -c 3 -W 2 10.41.1.11' +for i in $(seq 1 24); do vm_ssh vp-t41 10.41.1.10 "timeout 5 bash -c '/dev/null 2>&1 && break; sleep 5; done check "t41-p ouvre une connexion TCP vers t41-q:22" vm_ssh vp-t41 10.41.1.10 "timeout 5 bash -c '/dev/null" +check "après redémarrage : processus QEMU de t61-d arrêté" sh -c "! pgrep -f '${VOLUMES}/[t]61-d.qcow2' >/dev/null" check "après redémarrage : unité two-vm-t61-d.scope retirée" sh -c "! systemctl list-units --all --plain --no-legend 'two-vm-t61-d.scope' | grep -q ." check "après redémarrage : VM t61-c créée sur le même subnet" vm_create t61-c sn-t61a 10.61.1.12 "$(vm_key)" check "t61-c joignable" vm_wait vp-t61 10.61.1.12 diff --git a/test/e2e/suite/72-perte-switch.sh b/test/e2e/suite/72-perte-switch.sh index 8ebf333..12dc2bd 100644 --- a/test/e2e/suite/72-perte-switch.sh +++ b/test/e2e/suite/72-perte-switch.sh @@ -2,6 +2,8 @@ # hôtes: # tickets: #54, #69 +. "${LAB_DIR}/lib/net.sh" + vrrp_state () { on "${1}" <<'NODE' | sed -n 's/^VRRP: //p' echo "VRRP: $(vtysh -c 'show vrrp' | awk '/Status \(v4\)/ {print $3}')"