Add UI-compatible REST API with Projects, Volumes, Templates

Implement REST endpoints compatible with mvirt-ui mock-server:
- Add Project, Volume, Template, ImportJob types and commands
- Create UI DTOs with camelCase serialization (ui_types.rs)
- Add UI-compatible handlers (ui_handlers.rs) for all resources
- Implement VM start/stop/kill with simulated state transitions
- Add data locality support (volumes/templates bound to nodes)
- Update tests to use camelCase JSON format
- Add comprehensive unit and integration tests (97 total)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: MalteJ

Cargo.lock

@@ -22,7 +22,9 @@ utoipa = { version = "5", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9", features = ["axum"] }
 
 # Async
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal", "sync", "fs"] }
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal", "sync", "fs", "time"] }
+futures = "0.3"
+async-stream = "0.3"
 
 # Serialization
 serde = { version = "1", features = ["derive"] }

mvirt-api/Cargo.toml

@@ -153,6 +153,89 @@ impl ApiAuditLogger {
             vec![vm_id.to_string()],
         );
     }
+
+    pub fn vm_started(&self, vm_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("VM started: {}", vm_id),
+            vec![vm_id.to_string()],
+        );
+    }
+
+    pub fn vm_stopped(&self, vm_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("VM stopped: {}", vm_id),
+            vec![vm_id.to_string()],
+        );
+    }
+
+    pub fn vm_killed(&self, vm_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("VM killed: {}", vm_id),
+            vec![vm_id.to_string()],
+        );
+    }
+
+    // Project events
+    pub fn project_created(&self, project_id: &str, project_name: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Project created: {} ({})", project_name, project_id),
+            vec![project_id.to_string()],
+        );
+    }
+
+    pub fn project_deleted(&self, project_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Project deleted: {}", project_id),
+            vec![project_id.to_string()],
+        );
+    }
+
+    // Volume events
+    pub fn volume_created(&self, volume_id: &str, volume_name: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Volume created: {} ({})", volume_name, volume_id),
+            vec![volume_id.to_string()],
+        );
+    }
+
+    pub fn volume_deleted(&self, volume_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Volume deleted: {}", volume_id),
+            vec![volume_id.to_string()],
+        );
+    }
+
+    pub fn volume_resized(&self, volume_id: &str, new_size: u64) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Volume resized: {} to {} bytes", volume_id, new_size),
+            vec![volume_id.to_string()],
+        );
+    }
+
+    pub fn snapshot_created(&self, volume_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Snapshot created on volume: {}", volume_id),
+            vec![volume_id.to_string()],
+        );
+    }
+
+    // Template events
+    pub fn template_import_started(&self, job_id: &str) {
+        self.log_async(
+            LogLevel::Audit,
+            format!("Template import started: {}", job_id),
+            vec![job_id.to_string()],
+        );
+    }
 }
 
 pub fn create_audit_logger(log_endpoint: &str) -> Arc<ApiAuditLogger> {

mvirt-api/src/audit.rs

@@ -111,6 +111,77 @@ pub enum Command {
         request_id: String,
         id: String,
     },
+
+    // Project operations
+    CreateProject {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        name: String,
+        description: Option<String>,
+    },
+    DeleteProject {
+        request_id: String,
+        id: String,
+    },
+
+    // Volume operations (node_id for data locality - Shared Nothing architecture)
+    CreateVolume {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        project_id: String,
+        node_id: String,
+        name: String,
+        size_bytes: u64,
+        template_id: Option<String>,
+    },
+    DeleteVolume {
+        request_id: String,
+        id: String,
+    },
+    ResizeVolume {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        size_bytes: u64,
+    },
+    CreateSnapshot {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        volume_id: String,
+        name: String,
+    },
+
+    // Template operations (node_id for locality)
+    CreateTemplate {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        node_id: String,
+        name: String,
+        size_bytes: u64,
+    },
+
+    // Import job operations
+    CreateImportJob {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        node_id: String,
+        template_name: String,
+        url: String,
+        total_bytes: u64,
+    },
+    UpdateImportJob {
+        request_id: String,
+        id: String,
+        timestamp: String,
+        bytes_written: u64,
+        state: ImportJobState,
+        error: Option<String>,
+    },
 }
 
 impl Command {
@@ -129,6 +200,15 @@ impl Command {
             Command::UpdateVmSpec { request_id, .. } => request_id,
             Command::UpdateVmStatus { request_id, .. } => request_id,
             Command::DeleteVm { request_id, .. } => request_id,
+            Command::CreateProject { request_id, .. } => request_id,
+            Command::DeleteProject { request_id, .. } => request_id,
+            Command::CreateVolume { request_id, .. } => request_id,
+            Command::DeleteVolume { request_id, .. } => request_id,
+            Command::ResizeVolume { request_id, .. } => request_id,
+            Command::CreateSnapshot { request_id, .. } => request_id,
+            Command::CreateTemplate { request_id, .. } => request_id,
+            Command::CreateImportJob { request_id, .. } => request_id,
+            Command::UpdateImportJob { request_id, .. } => request_id,
         }
     }
 }
@@ -237,16 +317,25 @@ pub struct VmData {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct VmSpec {
     pub name: String,
+    pub project_id: Option<String>,    // Project this VM belongs to
     pub node_selector: Option<String>, // Optional: require specific node
     pub cpu_cores: u32,
     pub memory_mb: u64,
     pub disk_gb: u64,
     pub network_id: String,
     pub nic_id: Option<String>, // Will be auto-created if not provided
     pub image: String,          // Boot image reference
+    pub disks: Vec<DiskConfig>, // Additional disk volumes
     pub desired_state: VmDesiredState,
 }
 
+/// Disk configuration for a VM
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DiskConfig {
+    pub volume_id: String,
+    pub readonly: bool,
+}
+
 /// Desired power state for a VM
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
 pub enum VmDesiredState {
@@ -306,13 +395,100 @@ pub enum ResourcePhase {
     Failed,
 }
 
+// =============================================================================
+// Project Types
+// =============================================================================
+
+/// Project data stored in the state machine
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProjectData {
+    pub id: String,
+    pub name: String,
+    pub description: Option<String>,
+    pub created_at: String,
+}
+
+// =============================================================================
+// Storage Types (Volumes, Templates, Import Jobs)
+// =============================================================================
+
+/// Volume data stored in the state machine (bound to a specific node)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct VolumeData {
+    pub id: String,
+    pub project_id: String,
+    pub node_id: String, // Node where the volume is stored (Shared Nothing)
+    pub name: String,
+    pub path: String, // ZFS path e.g., /dev/zvol/pool/vol-xxx
+    pub size_bytes: u64,
+    pub used_bytes: u64,
+    pub compression_ratio: f64,
+    pub snapshots: Vec<SnapshotData>,
+    pub template_id: Option<String>,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+/// Snapshot data stored inline in VolumeData
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SnapshotData {
+    pub id: String,
+    pub name: String,
+    pub created_at: String,
+    pub used_bytes: u64,
+}
+
+/// Template data stored in the state machine (bound to a specific node)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TemplateData {
+    pub id: String,
+    pub node_id: String, // Node where the template is stored
+    pub name: String,
+    pub size_bytes: u64,
+    pub clone_count: u32,
+    pub created_at: String,
+}
+
+/// Import job data stored in the state machine
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ImportJobData {
+    pub id: String,
+    pub node_id: String,
+    pub template_name: String,
+    pub url: String,
+    pub state: ImportJobState,
+    pub bytes_written: u64,
+    pub total_bytes: u64,
+    pub error: Option<String>,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+/// Import job state
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
+pub enum ImportJobState {
+    #[default]
+    Pending,
+    Running,
+    Completed,
+    Failed,
+}
+
+// =============================================================================
+// Response Types
+// =============================================================================
+
 /// Response from applying a command
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum Response {
     Node(NodeData),
     Network(NetworkData),
     Nic(NicData),
     Vm(VmData),
+    Project(ProjectData),
+    Volume(VolumeData),
+    Template(TemplateData),
+    ImportJob(ImportJobData),
     Deleted { id: String },
     DeletedWithCount { id: String, nics_deleted: u32 },
     Error { code: u32, message: String },

mvirt-api/src/command.rs

@@ -1,3 +1,6 @@
+// Allow dead code for legacy handlers during transition to UI-compatible API
+#![allow(dead_code)]
+
 use axum::{
     Json,
     extract::{Path, Query, State},
@@ -1174,13 +1177,15 @@ pub async fn create_vm(
 
     let spec = VmSpec {
         name: req.name.clone(),
+        project_id: None,
         node_selector: req.node_selector,
         cpu_cores: req.cpu_cores,
         memory_mb: req.memory_mb,
         disk_gb: req.disk_gb,
         network_id: req.network_id,
         nic_id: req.nic_id,
         image: req.image,
+        disks: vec![],
         desired_state,
     };
 

mvirt-api/src/rest/handlers.rs

@@ -1,5 +1,7 @@
 mod handlers;
 mod routes;
+pub mod ui_handlers;
+pub mod ui_types;
 
 pub use handlers::AppState;
 pub use routes::create_router;