hypervisor: initial polymorphic hypervisor interface

Author: delan

Cargo.lock

@@ -1,19 +1,22 @@
 [workspace]
 resolver = "3"
 default-members = ["monitor"]
-members = ["monitor", "monitor/cli", "monitor/settings", "monitor/web"]
+members = ["monitor", "monitor/cli", "monitor/hypervisor", "monitor/settings", "monitor/shell", "monitor/web"]
 exclude = ["analysis", "docker"]
 
 [workspace.dependencies]
 bytesize = "2.0.1"
 chrono = { version = "0.4.39", features = ["serde"] }
 cli = { path = "monitor/cli" }
+cmd_lib = "1.9.5"
 dotenv = "0.15.0"
+hypervisor = { path = "monitor/hypervisor" }
 jane-eyre = "0.3.0"
 mktemp = "0.5.1"
 rocket = { version = "0.5.1", features = ["json"] }
 serde = { version = "1.0.204", features = ["derive"] }
 settings = { path = "monitor/settings" }
+shell = { path = "monitor/shell" }
 toml = "0.8.15"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

Cargo.toml

@@ -11,14 +11,14 @@ bytesize = { workspace = true }
 cfg-if = "1.0.1"
 chrono = { workspace = true }
 cli = { workspace = true }
-cmd_lib = "1.9.5"
+cmd_lib = { workspace = true }
 crossbeam-channel = "0.5.13"
 dotenv = { workspace = true }
 http = "0.2"
+hypervisor = { workspace = true }
 itertools = "0.13.0"
 jane-eyre = { workspace = true }
 mktemp = { workspace = true }
-reflink = "0.1.3"
 reqwest = { version = "0.12.24", features = ["charset", "http2", "json", "rustls-tls", "system-proxy"], default-features = false }
 rocket = { workspace = true }
 serde = { workspace = true }
@@ -31,6 +31,7 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 web = { workspace = true }
 rand = "0.9.1"
+shell.workspace = true
 
 [dev-dependencies]
 settings = { workspace = true, features = ["test"] }

monitor/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "hypervisor"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+cmd_lib.workspace = true
+jane-eyre.workspace = true
+settings.workspace = true
+shell.workspace = true
+tracing.workspace = true

monitor/hypervisor/Cargo.toml

@@ -8,10 +8,9 @@ use std::{
 use cmd_lib::{run_fun, spawn_with_output};
 use jane_eyre::eyre;
 use settings::TOML;
+use shell::log_output_as_trace;
 use tracing::debug;
 
-use crate::shell::log_output_as_trace;
-
 pub fn list_template_guests() -> eyre::Result<Vec<String>> {
     // Output is not filtered by prefix, so we must filter it ourselves.
     let prefix = format!("{}-", TOML.libvirt_template_guest_prefix());

monitor/src/libvirt.rs renamed to monitor/hypervisor/src/impl_libvirt.rs

@@ -0,0 +1,30 @@
+#[cfg_attr(target_os = "linux", path = "impl_libvirt.rs")]
+mod platform;
+
+use std::{net::Ipv4Addr, path::Path};
+
+use jane_eyre::eyre;
+
+pub fn list_template_guests() -> eyre::Result<Vec<String>> {
+    self::platform::list_template_guests()
+}
+
+pub fn list_rebuild_guests() -> eyre::Result<Vec<String>> {
+    self::platform::list_rebuild_guests()
+}
+
+pub fn list_runner_guests() -> eyre::Result<Vec<String>> {
+    self::platform::list_runner_guests()
+}
+
+pub fn update_screenshot(guest_name: &str, output_dir: &Path) -> eyre::Result<()> {
+    self::platform::update_screenshot(guest_name, output_dir)
+}
+
+pub fn take_screenshot(guest_name: &str, output_path: &Path) -> eyre::Result<()> {
+    self::platform::take_screenshot(guest_name, output_path)
+}
+
+pub fn get_ipv4_address(guest_name: &str) -> Option<Ipv4Addr> {
+    self::platform::get_ipv4_address(guest_name)
+}

monitor/hypervisor/src/lib.rs

@@ -0,0 +1,10 @@
+[package]
+name = "shell"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+jane-eyre.workspace = true
+mktemp.workspace = true
+reflink = "0.1.3"
+tracing.workspace = true

monitor/shell/Cargo.toml

@@ -19,18 +19,18 @@ use std::{
 use bytesize::ByteSize;
 use chrono::{SecondsFormat, Utc};
 use cmd_lib::{run_cmd, run_fun, spawn_with_output};
+use hypervisor::{list_rebuild_guests, list_template_guests};
 use jane_eyre::eyre::{self, bail, OptionExt};
 use settings::{
     profile::{parse_rebuild_guest_name, parse_template_guest_name, Profile},
     TOML,
 };
+use shell::{log_output_as_info, reflink_or_copy_with_warning};
 use tracing::{debug, error, info, warn};
 
 use crate::{
     image::{macos13::Macos13, ubuntu2204::Ubuntu2204, windows10::Windows10},
-    libvirt::{list_rebuild_guests, list_template_guests},
     policy::{runner_images_path, template_or_rebuild_images_path, Policy},
-    shell::{log_output_as_info, reflink_or_copy_with_warning},
 };
 
 static IMAGES: LazyLock<BTreeMap<String, Box<dyn Image + Send + Sync>>> = LazyLock::new(|| {

monitor/src/shell.rs renamed to monitor/shell/src/lib.rs

@@ -10,6 +10,9 @@ use cmd_lib::spawn_with_output;
 use jane_eyre::eyre;
 use jane_eyre::eyre::OptionExt;
 use settings::profile::Profile;
+use shell::atomic_symlink;
+use shell::log_output_as_info;
+use shell::reflink_or_copy_with_warning;
 use tracing::warn;
 
 use crate::data::get_profile_data_path;
@@ -23,9 +26,6 @@ use crate::image::CdromImage;
 use crate::image::Image;
 use crate::policy::runner_image_path;
 use crate::policy::template_or_rebuild_image_path;
-use crate::shell::atomic_symlink;
-use crate::shell::log_output_as_info;
-use crate::shell::reflink_or_copy_with_warning;
 
 use super::create_disk_image;
 use super::start_libvirt_guest;