External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-08 12:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Construct firmware path from tests explicitly

Browse Source 
Instead of using hardcoded firmware paths inside the `Guest` struct
constructor, this commit removes `fw_path` related code paths from the
`Guest` struct and asks each test constructs its firmware path
explicitly. This allows better flexibility for the `Guest` struct so
that it can be reused for the performance tests we are adding soon.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-02-04 09:36:50 -08:00 committed by Sebastien Boeuf
parent 832f09a075
commit 7a3d8c6299
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tests/integration.rs
View File

@ -42,7 +42,6 @@ lazy_static! {
struct Guest { struct Guest {
tmp_dir: TempDir, tmp_dir: TempDir,
disk_config: Box<dyn DiskConfig>, disk_config: Box<dyn DiskConfig>,
fw_path: String,
network: GuestNetworkConfig, network: GuestNetworkConfig,
} }
@ -473,25 +472,25 @@ enum FwType {
RustHypervisorFirmware, RustHypervisorFirmware,
} }
impl Guest { fn fw_path(fw_type: FwType) -> String {
fn fw_path(fw_type: FwType) -> String { let mut workload_path = dirs::home_dir().unwrap();
let mut workload_path = dirs::home_dir().unwrap(); workload_path.push("workloads");
workload_path.push("workloads");
let mut fw_path = workload_path; let mut fw_path = workload_path;
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
fw_path.push("CLOUDHV_EFI.fd"); fw_path.push("CLOUDHV_EFI.fd");
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
{ {
match fw_type { match fw_type {
FwType::Ovmf => fw_path.push(OVMF_NAME), FwType::Ovmf => fw_path.push(OVMF_NAME),
FwType::RustHypervisorFirmware => fw_path.push("hypervisor-fw"), FwType::RustHypervisorFirmware => fw_path.push("hypervisor-fw"),
}
} }
fw_path.to_str().unwrap().to_string()
} }
fw_path.to_str().unwrap().to_string()
}
impl Guest {
fn new_from_ip_range(mut disk_config: Box<dyn DiskConfig>, class: &str, id: u8) -> Self { fn new_from_ip_range(mut disk_config: Box<dyn DiskConfig>, class: &str, id: u8) -> Self {
let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap();
@ -513,7 +512,6 @@ impl Guest {
Guest { Guest {
tmp_dir, tmp_dir,
disk_config, disk_config,
fw_path: Self::fw_path(FwType::RustHypervisorFirmware),
network, network,
} }
} }
@ -589,12 +587,12 @@ impl Guest {
) )
} }
fn api_create_body(&self, cpu_count: u8) -> String { fn api_create_body(&self, cpu_count: u8, fw_path: &str) -> String {
#[cfg(all(target_arch = "x86_64", not(feature = "mshv")))] #[cfg(all(target_arch = "x86_64", not(feature = "mshv")))]
format! {"{{\"cpus\":{{\"boot_vcpus\":{},\"max_vcpus\":{}}},\"kernel\":{{\"path\":\"{}\"}},\"cmdline\":{{\"args\": \"\"}},\"net\":[{{\"ip\":\"{}\", \"mask\":\"255.255.255.0\", \"mac\":\"{}\"}}], \"disks\":[{{\"path\":\"{}\"}}, {{\"path\":\"{}\"}}]}}", format! {"{{\"cpus\":{{\"boot_vcpus\":{},\"max_vcpus\":{}}},\"kernel\":{{\"path\":\"{}\"}},\"cmdline\":{{\"args\": \"\"}},\"net\":[{{\"ip\":\"{}\", \"mask\":\"255.255.255.0\", \"mac\":\"{}\"}}], \"disks\":[{{\"path\":\"{}\"}}, {{\"path\":\"{}\"}}]}}",
cpu_count, cpu_count,
cpu_count, cpu_count,
self.fw_path.as_str(), fw_path,
self.network.host_ip, self.network.host_ip,
self.network.guest_mac, self.network.guest_mac,
self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(), self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),
@ -1041,8 +1039,9 @@ fn test_cpu_topology(threads_per_core: u8, cores_per_package: u8, packages: u8,
let total_vcpus = threads_per_core * cores_per_package * packages; let total_vcpus = threads_per_core * cores_per_package * packages;
let direct_kernel_boot_path = direct_kernel_boot_path(); let direct_kernel_boot_path = direct_kernel_boot_path();
let mut kernel_path = direct_kernel_boot_path.to_str().unwrap(); let mut kernel_path = direct_kernel_boot_path.to_str().unwrap();
let fw_path = fw_path(FwType::RustHypervisorFirmware);
if use_fw { if use_fw {
kernel_path = guest.fw_path.as_str(); kernel_path = fw_path.as_str();
} }
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
@ -2357,8 +2356,8 @@ mod parallel {
.drain(..) .drain(..)
.for_each(|disk_config| { .for_each(|disk_config| {
vec![ vec![
Guest::fw_path(FwType::Ovmf), fw_path(FwType::Ovmf),
Guest::fw_path(FwType::RustHypervisorFirmware), fw_path(FwType::RustHypervisorFirmware),
] ]
.drain(..) .drain(..)
.for_each(|fw_path| { .for_each(|fw_path| {
@ -3132,7 +3131,7 @@ mod parallel {
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])
.args(&["--memory", "size=512M"]) .args(&["--memory", "size=512M"])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(&[ .args(&[
"--disk", "--disk",
format!("path={},direct=on", os_path.as_path().to_str().unwrap()).as_str(), format!("path={},direct=on", os_path.as_path().to_str().unwrap()).as_str(),
@ -4332,7 +4331,8 @@ mod parallel {
// Create the VM first // Create the VM first
let cpu_count: u8 = 4; let cpu_count: u8 = 4;
let http_body = guest.api_create_body(cpu_count); let http_body =
guest.api_create_body(cpu_count, fw_path(FwType::RustHypervisorFirmware).as_str());
curl_command( curl_command(
&api_socket, &api_socket,
"PUT", "PUT",
@ -4381,7 +4381,8 @@ mod parallel {
// Create the VM first // Create the VM first
let cpu_count: u8 = 4; let cpu_count: u8 = 4;
let http_body = guest.api_create_body(cpu_count); let http_body =
guest.api_create_body(cpu_count, fw_path(FwType::RustHypervisorFirmware).as_str());
curl_command( curl_command(
&api_socket, &api_socket,
"PUT", "PUT",
@ -6281,7 +6282,7 @@ mod parallel {
.args(&["--api-socket", &api_socket]) .args(&["--api-socket", &api_socket])
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])
.args(&["--memory", "size=512M,shared=on"]) .args(&["--memory", "size=512M,shared=on"])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.default_disks() .default_disks()
.default_net() .default_net()
.capture_output() .capture_output()
@ -7434,7 +7435,7 @@ mod vfio {
"--memory", "--memory",
format!("size=4G,hotplug_size=4G,hotplug_method={}", hotplug_method).as_str(), format!("size=4G,hotplug_size=4G,hotplug_method={}", hotplug_method).as_str(),
]) ])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(&["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"]) .args(&["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"])
.args(&["--api-socket", &api_socket]) .args(&["--api-socket", &api_socket])
.default_disks() .default_disks()
@ -7485,7 +7486,7 @@ mod vfio {
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=4"]) .args(&["--cpus", "boot=4"])
.args(&["--memory", "size=4G"]) .args(&["--memory", "size=4G"])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(&["--api-socket", &api_socket]) .args(&["--api-socket", &api_socket])
.default_disks() .default_disks()
.default_net() .default_net()
@ -7527,7 +7528,7 @@ mod vfio {
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=4"]) .args(&["--cpus", "boot=4"])
.args(&["--memory", "size=4G"]) .args(&["--memory", "size=4G"])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", fw_path(FwType::RustHypervisorFirmware).as_str()])
.args(&["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"]) .args(&["--device", "path=/sys/bus/pci/devices/0000:31:00.0/"])
.args(&["--api-socket", &api_socket]) .args(&["--api-socket", &api_socket])
.default_disks() .default_disks()