From ac3686815969c2152393054fb9dbd11112e1815f Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sun, 11 Oct 2026 23:41:51 +0200 Subject: [PATCH] =?UTF-8?q?f-41:=20lab-host:=20offre=20EM-B420E-NVME,=20zo?= =?UTF-8?q?ne=20libre,=20CPU=20x86-64-v3=20exig=C3=A9=20#41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- scripts/lab-host.sh | 87 ++++++++++++++++++++++++++++------------ scripts/lab-host_test.sh | 85 +++++++++++++++++++++++++++++++++++---- 2 files changed, 139 insertions(+), 33 deletions(-) diff --git a/scripts/lab-host.sh b/scripts/lab-host.sh index d06c1d7..77ab32d 100755 --- a/scripts/lab-host.sh +++ b/scripts/lab-host.sh @@ -2,7 +2,8 @@ API_URL="${SCW_API_URL:-https://api.scaleway.com}" CREDENTIALS_FILE="${LAB_CREDENTIALS_FILE:-${HOME}/.config/two-lab/scaleway.env}" -OFFER_NAME="${LAB_OFFER:-EM-B212X-SSD}" +OFFER_NAME="${LAB_OFFER:-EM-B420E-NVME}" +ALL_ZONES="fr-par-1 fr-par-2 nl-ams-1 nl-ams-2 pl-waw-2 pl-waw-3" OS_NAME="${LAB_OS_NAME:-Debian}" OS_VERSION="${LAB_OS_VERSION:-12}" LAB_NAME="${LAB_NAME:-two-lab}" @@ -30,20 +31,21 @@ usage: ${0##*/} [arguments] et le prix ; ne crée rien up crée le serveur de lab, attend la fin de son installation et son SSH, puis le prépare (voir prepare) - status liste les serveurs de lab du projet + status liste les serveurs de lab du projet, dans toutes les zones candidates ssh [commande] se connecte au serveur de lab ; avec une commande, un terminal n'est demandé que si l'entrée standard en est un prepare installe sur le serveur ce dont lab a besoin (qemu, genisoimage), vérifie - /dev/kvm et la virtualisation imbriquée ; lancé aussi par up + /dev/kvm, la virtualisation imbriquée et un CPU x86-64-v3 ; lancé aussi par up push compile cmd/lab pour linux/amd64 et dépose sur le serveur ~/lab et le répertoire de la topologie dans ~/topology/ (avec les fichiers qu'elle référence) ; ensuite : ssh './lab up topology/' - down supprime tous les serveurs de lab du projet et attend leur disparition + down supprime tous les serveurs de lab du projet, dans toutes les zones candidates, + et attend leur disparition session [cmd] up, puis la commande distante (ou un shell), puis down quoi qu'il arrive environnement : SCW_SECRET_KEY et SCW_DEFAULT_PROJECT_ID (requis, à défaut lus dans ${CREDENTIALS_FILE}, - fichier en 0600, lignes CLÉ=valeur), SCW_DEFAULT_ZONE (${ZONE}), - LAB_OFFER (${OFFER_NAME}), LAB_OS_NAME (${OS_NAME}), LAB_OS_VERSION (${OS_VERSION}), + fichier en 0600, lignes CLÉ=valeur), LAB_ZONES (zones candidates, dans l'ordre : + ${ZONES} ; SCW_DEFAULT_ZONE passe en tête), LAB_OFFER (${OFFER_NAME}), LAB_OS_NAME (${OS_NAME}), LAB_OS_VERSION (${OS_VERSION}), LAB_SSH_KEY (${SSH_KEY} ; à défaut, l'agent SSH) ne jamais lancer sous 'bash -x' : la trace afficherait SCW_SECRET_KEY. @@ -64,10 +66,19 @@ load_credentials () { esac done < "${CREDENTIALS_FILE}" fi - ZONE="${SCW_DEFAULT_ZONE:-fr-par-1}" + ZONES=$(candidate_zones "${SCW_DEFAULT_ZONE:-}" "${LAB_ZONES:-${ALL_ZONES}}") + ZONE="${ZONES%% *}" PROJECT_ID="${SCW_DEFAULT_PROJECT_ID:-}" } +candidate_zones () { + local PREFERRED="${1}" LIST="${2}" Z OUT="${1}" + for Z in ${LIST}; do + [[ " ${OUT} " == *" ${Z} "* ]] || OUT="${OUT:+${OUT} }${Z}" + done + printf '%s\n' "${OUT}" +} + require_env () { [[ -n "${SCW_SECRET_KEY:-}" ]] || die "SCW_SECRET_KEY absent de l'environnement" [[ -n "${PROJECT_ID}" ]] || die "SCW_DEFAULT_PROJECT_ID absent de l'environnement" @@ -124,7 +135,7 @@ resolve_offer () { [[ $(jq -r '.stock' <<< "${OFFER}") != "empty" ]] || die "offre ${OFFER_NAME} en rupture de stock en ${ZONE}" [[ $(jq -r '((.fee.units // 0) == 0) and ((.fee.nanos // 0) == 0)' <<< "${OFFER}") == "true" ]] \ || die "offre ${OFFER_NAME} : frais de mise en service non nuls ($(money '.fee' <<< "${OFFER}")), refus" - printf '%s\n' "${OFFER}" + jq -c --arg z "${ZONE}" '. + {zone: $z}' <<< "${OFFER}" } resolve_os () { @@ -164,11 +175,14 @@ build_request () { } lab_servers () { - local JSON - JSON=$(api GET "/baremetal/v1/zones/${ZONE}/servers?project_id=${PROJECT_ID}&tags=${LAB_TAG}&page_size=100") \ - || return 1 - jq -c --arg p "${PROJECT_ID}" --arg t "${LAB_TAG}" \ - '[.servers[] | select(.project_id == $p and (.tags | index($t)))]' <<< "${JSON}" + local JSON Z ALL="[]" + for Z in ${ZONES}; do + JSON=$(api GET "/baremetal/v1/zones/${Z}/servers?project_id=${PROJECT_ID}&tags=${LAB_TAG}&page_size=100") \ + || return 1 + ALL=$(jq -c --argjson all "${ALL}" --arg p "${PROJECT_ID}" --arg t "${LAB_TAG}" --arg z "${Z}" \ + '$all + [.servers[] | select(.project_id == $p and (.tags | index($t))) | . + {zone: $z}]' <<< "${JSON}") + done + printf '%s\n' "${ALL}" } server_ip () { @@ -180,12 +194,26 @@ server_is_installing () { or (.install.status // "") == "to_install" or (.install.status // "") == "installing"' >/dev/null } +select_zone () { + local Z OUT + for Z in ${ZONES}; do + if OUT=$(ZONE="${Z}" resolve_offer 2>&1); then + printf '%s\n' "${OUT}" + return 0 + fi + warn "${Z} : ${OUT##*!! }" + done + die "offre horaire ${OFFER_NAME} disponible dans aucune zone candidate (${ZONES})" +} + cmd_plan () { local OFFER OS KEYS - OFFER=$(resolve_offer) || exit 1 + OFFER=$(select_zone) || exit 1 + ZONE=$(jq -r '.zone' <<< "${OFFER}") OS=$(resolve_os "$(jq -r '.id' <<< "${OFFER}")") || exit 1 KEYS=$(resolve_ssh_keys) || exit 1 - info "offre : ${OFFER_NAME} ($(jq -r '.id' <<< "${OFFER}")), facturation $(jq -r '.subscription_period' <<< "${OFFER}"), stock $(jq -r '.stock' <<< "${OFFER}")" + info "zone : ${ZONE}" + info "offre : ${OFFER_NAME} ($(jq -r '.id' <<< "${OFFER}")), $(jq -r '[.cpus[]?.name] | unique | join(", ") | if . == "" then "CPU ?" else . end' <<< "${OFFER}"), facturation $(jq -r '.subscription_period' <<< "${OFFER}"), stock $(jq -r '.stock' <<< "${OFFER}")" info "prix : $(money '.price_per_hour' <<< "${OFFER}") HT par heure, frais de mise en service $(money '.fee' <<< "${OFFER}")" info "os : $(jq -r '"\(.name) \(.version) (\(.id))"' <<< "${OS}"), utilisateur $(jq -r '.user.default_value // "?"' <<< "${OS}")" info "clés : $(jq -r 'length' <<< "${KEYS}") clé(s) SSH du projet" @@ -260,15 +288,16 @@ report_uncertain_creation () { cmd_up () { local OFFER OS KEYS BODY JSON ID IP SSH_USER require_no_lab_server - OFFER=$(resolve_offer) || exit 1 + OFFER=$(select_zone) || exit 1 + ZONE=$(jq -r '.zone' <<< "${OFFER}") OS=$(resolve_os "$(jq -r '.id' <<< "${OFFER}")") || exit 1 KEYS=$(resolve_ssh_keys) || exit 1 BODY=$(build_request "${OFFER}" "${OS}" "${KEYS}") - info "création de ${LAB_NAME} (${OFFER_NAME}, $(money '.price_per_hour' <<< "${OFFER}")/h HT)" + info "création de ${LAB_NAME} (${OFFER_NAME}, ${ZONE}, $(money '.price_per_hour' <<< "${OFFER}")/h HT)" JSON=$(api POST "/baremetal/v1/zones/${ZONE}/servers" "${BODY}") || report_uncertain_creation ID=$(jq -r '.id // empty' <<< "${JSON}" 2>/dev/null) [[ -n "${ID}" ]] || report_uncertain_creation - CREATED_ID="${ID}" + CREATED_ID="${ZONE} ${ID}" info "serveur ${ID} créé, facturé jusqu'à '${0##*/} down'" JSON=$(wait_installed "${ID}") || die "serveur ${ID} inutilisable — il est toujours facturé : '${0##*/} down'" IP=$(server_ip <<< "${JSON}") @@ -286,10 +315,10 @@ cmd_status () { local SERVERS SERVERS=$(lab_servers) || die "impossible de lister les serveurs de lab" if [[ $(jq 'length' <<< "${SERVERS}") -eq 0 ]]; then - info "aucun serveur de lab dans le projet ${PROJECT_ID} (${ZONE})" + info "aucun serveur de lab dans le projet ${PROJECT_ID} (${ZONES})" return 0 fi - jq -r '.[] | "\(.id) \(.name) \(.offer_name) \(.status) installation \(.install.status // "none") \(.created_at) \([.ips[] | select(.version == "IPv4") | .address] | join(","))"' <<< "${SERVERS}" + jq -r '.[] | "\(.zone) \(.id) \(.name) \(.offer_name) \(.status) installation \(.install.status // "none") \(.created_at) \([.ips[] | select(.version == "IPv4") | .address] | join(","))"' <<< "${SERVERS}" } require_known_server () { @@ -319,13 +348,18 @@ case "${NESTED}" in Y|1) ;; *) echo "virtualisation imbriquée désactivée (nested=${NESTED:-absent})" >&2; exit 1 ;; esac -echo "qemu $(qemu-system-x86_64 --version | head -n 1), nested=${NESTED}" +LD=$(ls /lib64/ld-linux-x86-64.so.2 /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 2>/dev/null | head -n 1) +if ! "${LD}" --help 2>/dev/null | grep -q 'x86-64-v3 (supported'; then + echo "CPU sans x86-64-v3 :$(grep -m 1 'model name' /proc/cpuinfo | cut -d: -f2) — Rocky 10 / RHEL 10 n'y démarrent pas" >&2 + exit 1 +fi +echo "qemu $(qemu-system-x86_64 --version | head -n 1), nested=${NESTED},$(grep -m 1 'model name' /proc/cpuinfo | cut -d: -f2)" EOF } cmd_prepare () { require_known_server - info "préparation du serveur : qemu, genisoimage, KVM imbriqué" + info "préparation du serveur : qemu, genisoimage, KVM imbriqué, CPU x86-64-v3" prepare_script | ssh_run -- bash -s } @@ -393,7 +427,7 @@ lab_server_ids () { local SERVERS while (( SECONDS < DEADLINE )); do if SERVERS=$(lab_servers); then - jq -r '.[].id' <<< "${SERVERS}" + jq -r '.[] | "\(.zone) \(.id)"' <<< "${SERVERS}" return 0 fi warn "liste des serveurs de lab indisponible, nouvel essai dans ${POLL_INTERVAL}s" @@ -410,8 +444,9 @@ cmd_down () { IDS="" fi IDS=$(printf '%s\n%s\n' "${IDS}" "${CREATED_ID}" | grep -v '^$' | sort -u) - for ID in ${IDS}; do - info "suppression de ${ID}" + while read -r ZONE ID; do + [[ -n "${ID}" ]] || continue + info "suppression de ${ID} (${ZONE})" if ! delete_server "${ID}"; then warn "suppression de ${ID} toujours refusée" FAILED=1 @@ -421,7 +456,7 @@ cmd_down () { warn "${ID} toujours présent après ${DELETE_TIMEOUT}s" FAILED=1 fi - done + done <<< "${IDS}" rm -f "${STATE_DIR}/ip" "${STATE_DIR}/user" "${STATE_DIR}/known_hosts" [[ "${FAILED}" -eq 0 ]] || die "SERVEUR(S) DE LAB TOUJOURS FACTURÉ(S) — '${0##*/} status', puis la console Scaleway" info "aucun serveur de lab ne reste dans le projet" diff --git a/scripts/lab-host_test.sh b/scripts/lab-host_test.sh index 9953579..12f44f3 100755 --- a/scripts/lab-host_test.sh +++ b/scripts/lab-host_test.sh @@ -63,9 +63,11 @@ with open(os.path.join(d, "calls.log"), "a") as f: if "X-Auth-Token: " + os.environ["FAKE_SECRET"] not in headers: reply(401, {"message": "unauthorized"}) -zone = "/baremetal/v1/zones/fr-par-1" +zname = path.split("/")[4] if path.startswith("/baremetal/v1/zones/") else "" +zone = "/baremetal/v1/zones/" + zname if method == "GET" and path == zone + "/offers": - reply(200, {"offers": st["offers"], "total_count": len(st["offers"])}) + offers = st.get("zones", {}).get(zname, {}).get("offers", st["offers"] if zname == "fr-par-1" else []) + reply(200, {"offers": offers, "total_count": len(offers)}) if method == "GET" and path == zone + "/os": reply(200, {"os": st["os"], "total_count": len(st["os"])}) if method == "GET" and path == "/iam/v1alpha1/ssh-keys": @@ -74,7 +76,7 @@ if method == "GET" and path == zone + "/servers": if st["list_errors"] > 0: st["list_errors"] -= 1 reply(503, {"message": "service unavailable"}) - listed = [v for v in st["servers"].values() if not v.get("hidden")] + listed = [v for v in st["servers"].values() if not v.get("hidden") and v.get("zone", "fr-par-1") == zname] reply(200, {"servers": listed, "total_count": len(listed)}) if method == "POST" and path == zone + "/servers": req = json.loads(body) @@ -84,7 +86,7 @@ if method == "POST" and path == zone + "/servers": sid = "srv-%d" % st["seq"] st["servers"][sid] = {"id": sid, "name": req["name"], "project_id": req["project_id"], "tags": req["tags"], "offer_name": "EM-B212X-SSD", "status": "delivering", - "install": {"status": "to_install"}, "ips": [], "created_at": "now", + "install": {"status": "to_install"}, "ips": [], "created_at": "now", "zone": zname, "hidden": st["hide_from_list"]} if st["post_fail_after_create"]: reply(502, {"message": "bad gateway"}) @@ -93,7 +95,7 @@ if method == "POST" and path == zone + "/servers": reply(200, st["servers"][sid]) if path.startswith(zone + "/servers/"): sid = path.rsplit("/", 1)[1] - if sid not in st["servers"]: + if sid not in st["servers"] or st["servers"][sid].get("zone", "fr-par-1") != zname: reply(404, {"message": "not found"}) srv = st["servers"][sid] if method == "GET" and st["get_errors"] > 0: @@ -222,7 +224,8 @@ lab_env () { SCW_API_URL="https://api.example.invalid" SCW_SECRET_KEY="${SECRET}" \ SCW_DEFAULT_PROJECT_ID="${PROJECT}" LAB_POLL_INTERVAL="${LAB_POLL_INTERVAL:-0}" \ LAB_INSTALL_TIMEOUT="${LAB_INSTALL_TIMEOUT:-60}" LAB_DELETE_TIMEOUT="${LAB_DELETE_TIMEOUT:-60}" \ - LAB_SSH_TIMEOUT="${LAB_SSH_TIMEOUT:-60}" \ + LAB_SSH_TIMEOUT="${LAB_SSH_TIMEOUT:-60}" LAB_ZONES="${LAB_ZONES:-fr-par-1}" \ + LAB_OFFER="${LAB_OFFER:-EM-B212X-SSD}" ${SCW_DEFAULT_ZONE:+SCW_DEFAULT_ZONE="${SCW_DEFAULT_ZONE}"} \ "$@" } @@ -730,7 +733,7 @@ test_ssh_without_terminal_does_not_ask_for_one () { run_lab_without_env_credentials () { env -i PATH="${WORK}/bin:${PATH}" HOME="${WORK}" TMPDIR="${TMPDIR:-/tmp}" \ FAKE_DIR="${WORK}" FAKE_SECRET="${SECRET}" SCW_API_URL="https://api.example.invalid" \ - LAB_POLL_INTERVAL=0 "$@" bash "${SCRIPT}" plan > "${WORK}/out.log" 2>&1 + LAB_POLL_INTERVAL=0 LAB_ZONES=fr-par-1 LAB_OFFER=EM-B212X-SSD "$@" bash "${SCRIPT}" plan > "${WORK}/out.log" 2>&1 } write_credentials () { @@ -814,6 +817,74 @@ signal_during_session () { teardown } +zone_offer () { + jq -n --arg id "${1}" --arg stock "${2}" '{id: $id, name: "EM-B420E-NVME", subscription_period: "hourly", enable: true, + stock: $stock, cpus: [{name: "AMD EPYC 7272"}], price_per_hour: {currency_code: "EUR", units: 0, nanos: 444000000}, + fee: {currency_code: "EUR", units: 0, nanos: 0}}' +} + +test_default_offer_is_the_epyc_one () { + setup "offre par défaut : EM-B420E-NVME" + LAB_OFFER=EM-B420E-NVME run_lab plan + grep -q 'aucune zone candidate' "${WORK}/out.log" || fail "l'offre EM-B420E-NVME n'a pas été cherchée" + grep -q 'name=EM-B420E-NVME' "${WORK}/calls.log" || fail "requête : $(cat "${WORK}/calls.log")" + [[ $(env -i bash -c ". '${SCRIPT}'; echo \${OFFER_NAME}") == EM-B420E-NVME ]] \ + || fail "défaut lu : $(env -i bash -c ". '${SCRIPT}'; echo \${OFFER_NAME}")" + teardown +} + +test_up_takes_the_first_zone_with_stock () { + setup "up : première zone candidate où l'offre est en stock" + mutate ".zones = {\"fr-par-2\": {offers: [$(zone_offer off-par2 empty)]}, \"nl-ams-2\": {offers: [$(zone_offer off-ams2 available)]}} + | .progress = [[\"ready\", \"completed\"]]" + LAB_ZONES="fr-par-2 nl-ams-2 pl-waw-3" LAB_OFFER=EM-B420E-NVME run_lab up + grep -q 'POST /baremetal/v1/zones/nl-ams-2/servers' "${WORK}/calls.log" || fail "pas de création en nl-ams-2 : $(grep POST "${WORK}/calls.log")" + grep -q 'zones/pl-waw-3/offers' "${WORK}/calls.log" && fail "zone suivante interrogée après avoir trouvé du stock" + [[ $(jq -r '.offer_id' "${WORK}/create.json") == off-ams2 ]] || fail "offre créée : $(jq -c . "${WORK}/create.json")" + grep -q 'fr-par-2 : offre EM-B420E-NVME en rupture de stock' "${WORK}/out.log" || fail "raison du refus de fr-par-2 absente" + teardown +} + +test_preferred_zone_goes_first () { + setup "SCW_DEFAULT_ZONE : préférence placée en tête, sans exclure les autres" + [[ $(lab_env bash -c ". '${SCRIPT}'; candidate_zones nl-ams-2 'fr-par-1 nl-ams-2 pl-waw-3'") == "nl-ams-2 fr-par-1 pl-waw-3" ]] \ + || fail "ordre : $(lab_env bash -c ". '${SCRIPT}'; candidate_zones nl-ams-2 'fr-par-1 nl-ams-2 pl-waw-3'")" + [[ $(lab_env bash -c ". '${SCRIPT}'; candidate_zones '' 'fr-par-1 nl-ams-2'") == "fr-par-1 nl-ams-2" ]] || fail "sans préférence" + teardown +} + +test_no_zone_with_stock_is_refused_without_creation () { + setup "aucune zone en stock : refus, rien n'est créé" + LAB_ZONES="fr-par-2 nl-ams-2" LAB_OFFER=EM-B420E-NVME run_lab up && fail "code de retour nul" + grep -q 'disponible dans aucune zone candidate (fr-par-2 nl-ams-2)' "${WORK}/out.log" || fail "message absent" + grep -q '^POST' "${WORK}/calls.log" && fail "serveur créé" + teardown +} + +test_down_and_status_cover_every_candidate_zone () { + setup "down et status : serveurs de lab de toutes les zones candidates" + mutate ".servers[\"lab-ams\"] = {id: \"lab-ams\", name: \"two-lab\", project_id: \"${PROJECT}\", tags: [\"two-lab\"], + status: \"ready\", install: {status: \"completed\"}, ips: [], zone: \"nl-ams-2\", offer_name: \"EM-B420E-NVME\", created_at: \"now\"}" + mutate ".servers[\"lab-par\"] = {id: \"lab-par\", name: \"two-lab\", project_id: \"${PROJECT}\", tags: [\"two-lab\"], + status: \"ready\", install: {status: \"completed\"}, ips: [], offer_name: \"EM-B212X-SSD\", created_at: \"now\"}" + LAB_ZONES="fr-par-1 nl-ams-2" run_lab status + grep -q '^nl-ams-2 lab-ams' "${WORK}/out.log" || fail "status : $(cat "${WORK}/out.log")" + LAB_ZONES="fr-par-1 nl-ams-2" run_lab down || fail "down en échec" + grep -q 'DELETE /baremetal/v1/zones/nl-ams-2/servers/lab-ams' "${WORK}/calls.log" || fail "lab-ams non supprimé dans sa zone" + [[ $(remaining) == "foreign-1,foreign-2" ]] || fail "restants : $(remaining)" + teardown +} + +test_prepare_script_requires_x86_64_v3 () { + setup "prepare : refus d'un CPU sans x86-64-v3" + local DIR="${WORK}/root" + mkdir -p "${DIR}/bin" "${DIR}/sys/module/kvm_intel/parameters" "${DIR}/dev" + lab_env bash -c ". '${SCRIPT}'; prepare_script" > "${WORK}/prepare.sh" + grep -q "x86-64-v3 (supported" "${WORK}/prepare.sh" || fail "aucune vérification x86-64-v3 dans le script de préparation" + grep -q "exit 1" <<< "$(sed -n '/x86-64-v3/,/fi/p' "${WORK}/prepare.sh")" || fail "pas d'arrêt si le niveau manque" + teardown +} + test_session_handles_term () { signal_during_session TERM 143; } test_session_handles_hup () { signal_during_session HUP 129; } test_session_handles_int () { signal_during_session INT 130; }