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

Can attach multiple ISOs to the same domain at the same time

Browse Source
This commit is contained in:
Pierre HUBERT
2023-12-08 17:12:19 +01:00
parent f05ae9fd52
commit 64eb90c0a4
4 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
virtweb_backend/src/libvirt_rest_structures.rs
View File

@ -87,8 +87,8 @@ pub struct VMInfo {
pub number_vcpu: usize,
/// Enable VNC access through admin console
pub vnc_access: bool,
/// Attach an ISO file
pub iso_file: Option<String>,
/// Attach ISO file(s)
pub iso_files: Vec<String>,
/// 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 disks: Vec<Disk>,
/// Network cards
@ -133,7 +133,7 @@ impl VMInfo {
let mut disks = vec![];
if let Some(iso_file) = &self.iso_file {
for iso_file in &self.iso_files {
if !files_utils::check_file_name(iso_file) {
return Err(StructureExtraction("ISO filename is invalid!").into());
}
@ -156,12 +156,15 @@ impl VMInfo {
file: path.to_string_lossy().to_string(),
},
target: DiskTargetXML {
dev: "hdc".to_string(),
dev: format!(
"hd{}",
["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"][disks.len()]
),
bus: "usb".to_string(),
},
readonly: Some(DiskReadOnlyXML {}),
boot: DiskBootXML {
order: "1".to_string(),
order: (disks.len() + 1).to_string(),
},
address: None,
})
@ -182,7 +185,7 @@ impl VMInfo {
// Check disks name for duplicates
for disk in &self.disks {
if self.disks.iter().filter(|d| d.name == disk.name).count() > 1 {
return Err(StructureExtraction("Two differents disks have the same name!").into());
return Err(StructureExtraction("Two different disks have the same name!").into());
}
}
@ -328,12 +331,13 @@ impl VMInfo {
number_vcpu: domain.vcpu.body,
memory: convert_to_mb(&domain.memory.unit, domain.memory.memory)?,
vnc_access: domain.devices.graphics.is_some(),
iso_file: domain
iso_files: domain
.devices
.disks
.iter()
.find(|d| d.device == "cdrom")
.map(|d| d.source.file.rsplit_once('/').unwrap().1.to_string()),
.filter(|d| d.device == "cdrom")
.map(|d| d.source.file.rsplit_once('/').unwrap().1.to_string())
.collect(),
disks: domain
.devices