pierre/VirtWeb
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 5 Wiki Activity

Clarify disk structures names
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Pierre HUBERT
2025-05-27 21:42:46 +02:00
parent 5a5450070a
commit 5814b0ab6a
4 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
virtweb_backend/src/libvirt_rest_structures/vm.rs
View File

@ -4,7 +4,7 @@ use crate::libvirt_lib_structures::XMLUuid;
use crate::libvirt_lib_structures::domain::*;
use crate::libvirt_rest_structures::LibVirtStructError;
use crate::libvirt_rest_structures::LibVirtStructError::StructureExtraction;
use crate::utils::file_disks_utils::{DiskFormat, FileDisk};
use crate::utils::file_disks_utils::{VMDiskFormat, VMFileDisk};
use crate::utils::files_utils;
use crate::utils::files_utils::convert_size_unit_to_mb;
use lazy_regex::regex;
@ -79,7 +79,7 @@ pub struct VMInfo {
/// Attach ISO file(s)
pub iso_files: Vec<String>,
/// File Storage - https://access.redhat.com/documentation/fr-fr/red_hat_enterprise_linux/6/html/virtualization_administration_guide/sect-virtualization-virtualized_block_devices-adding_storage_devices_to_guests#sect-Virtualization-Adding_storage_devices_to_guests-Adding_file_based_storage_to_a_guest
pub file_disks: Vec<FileDisk>,
pub file_disks: Vec<VMFileDisk>,
/// Network cards
pub networks: Vec<Network>,
/// Add a TPM v2.0 module
@ -289,8 +289,8 @@ impl VMInfo {
driver: DiskDriverXML {
name: "qemu".to_string(),
r#type: match disk.format {
DiskFormat::Raw { .. } => "raw".to_string(),
DiskFormat::QCow2 => "qcow2".to_string(),
VMDiskFormat::Raw { .. } => "raw".to_string(),
VMDiskFormat::QCow2 => "qcow2".to_string(),
},
cache: "none".to_string(),
},
@ -467,7 +467,7 @@ impl VMInfo {
.disks
.iter()
.filter(|d| d.device == "disk")
.map(|d| FileDisk::load_from_file(&d.source.file).unwrap())
.map(|d| VMFileDisk::load_from_file(&d.source.file).unwrap())
.collect(),
networks: domain