examples/vms/proxmox: neutral default names for the VM, the probe and the snapshot

examples/vms/proxmox/README.md

@@ -45,7 +45,7 @@ rerun: each step checks what is already there. It never overwrites a
 ./provision-guest.sh --apply      # ends with "G3 is met" and the versions
 
 # 3. On the Proxmox host: snapshot the working G3 host.
-qm snapshot <vmid> g3-openshell-0-1-2
+qm snapshot <vmid> lab-openshell-0-1-2
 ```
 
 For a snapshot before OpenShell as well, run `provision-guest.sh --apply

examples/vms/proxmox/create-vm.sh

@@ -33,7 +33,7 @@ required:
   --ssh-key FILE      public key(s) allowed to log in (authorized_keys format)
 
 options (defaults in brackets):
-  --name NAME         VM name [openshell-g3]
+  --name NAME         VM name [openshell-lab]
   --user NAME         login user created by cloud-init [amap]
   --storage ID        storage for the disk and the cloud-init drive [local-lvm]
   --bridge NAME       network bridge [vmbr0]
@@ -53,7 +53,7 @@ PROG="$(basename "$0")"
 die() { echo "$PROG: $*" >&2; exit 2; }
 
 VMID="" SSH_KEY="" APPLY=0
-NAME="openshell-g3" CI_USER="amap" STORAGE="local-lvm" BRIDGE="vmbr0"
+NAME="openshell-lab" CI_USER="amap" STORAGE="local-lvm" BRIDGE="vmbr0"
 IP="dhcp" GW="" CORES=4 CPU="host" MEMORY=8192 DISK_GB=64
 CACHE_DIR="/var/lib/vz/template/cache"
 IMAGE_BASE="https://cloud-images.ubuntu.com/noble/current"

examples/vms/proxmox/provision-guest.sh

@@ -81,7 +81,7 @@ MIN_KERNEL="6.2"
 MIN_DOCKER="28.0"
 GATEWAY_URL="https://127.0.0.1:17670"
 GATEWAY_NAME="openshell"
-PROBE_NAME="g3-probe"
+PROBE_NAME="lab-probe"
 INSTALLER_URL="https://raw.githubusercontent.com/NVIDIA/OpenShell/main/install.sh"
 
 # The gateway configuration. Its settings must stay identical to the TOML
@@ -425,7 +425,7 @@ EOF
 Next:
   1. On the Proxmox host, snapshot this point (snapshot names allow letters,
      digits, - and _ only):
-       qm snapshot <vmid> g3-openshell-${ver//./-}
+       qm snapshot <vmid> lab-openshell-${ver//./-}
   2. Follow docs/L1-RUNBOOK.md from step 0.
 EOF
     printf '%s' "$NEXT_3"

tests/test_examples_proxmox.py

@@ -238,10 +238,10 @@ def test_a_fresh_vm_goes_all_the_way_to_the_probe(vm) -> None:
     assert _toml_settings(vm["toml"].read_text()) == _toml_settings(
         GUEST.read_text().split("GATEWAY_CONFIG='", 1)[1].split("\n'\n", 1)[0])
     assert "openshell gateway add https://127.0.0.1:17670 --local --name openshell" in calls
-    assert "openshell sandbox create --name g3-probe --no-keep -- true" in calls
+    assert "openshell sandbox create --name lab-probe --no-keep -- true" in calls
     linger = [i for i, c in enumerate(calls) if c.startswith("sudo loginctl enable-linger ")]
-    assert linger and linger[0] < calls.index("openshell sandbox create --name g3-probe --no-keep -- true")
-    assert "G3 is met" in r.stdout and "g3-openshell-0-1-2" in r.stdout
+    assert linger and linger[0] < calls.index("openshell sandbox create --name lab-probe --no-keep -- true")
+    assert "G3 is met" in r.stdout and "lab-openshell-0-1-2" in r.stdout
 
 
 def test_a_configured_vm_is_left_as_it_is(vm) -> None:
@@ -388,7 +388,7 @@ def at(call):
              at("systemctl --user daemon-reload"), at(f"systemctl --user enable {UNIT_NAME}"),
              at(RESTART_INTERCEPTOR), gateway_restarts[-1]]
     assert order == sorted(order) and len(set(order)) == len(order), calls
-    assert at("openshell sandbox create --name g3-probe --no-keep -- true") < at(RESTART_INTERCEPTOR)
+    assert at("openshell sandbox create --name lab-probe --no-keep -- true") < at(RESTART_INTERCEPTOR)
     fragment = wire.gateway_fragment(home)
     text = toml.read_text()
     assert fragment in text