External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-02 16:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Unify API based boot across architectures

Browse Source 
Use direct kernel boot for all the tests that create the VM via API.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-06-17 15:21:02 +01:00
parent 335a4e1cc0
commit 7c8719b4ea
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test_infra/src/lib.rs
View File

@ -832,30 +832,12 @@ impl Guest {
)
}
pub fn api_create_body(
&self,
cpu_count: u8,
_fw_path: &str,
_kernel_path: &str,
_kernel_cmd: &str,
) -> String {
#[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\":\"{}\"}}]}}",
cpu_count,
cpu_count,
_fw_path,
self.network.host_ip,
self.network.guest_mac,
self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),
self.disk_config.disk(DiskType::CloudInit).unwrap().as_str(),
}
#[cfg(any(target_arch = "aarch64", feature = "mshv"))]
pub fn api_create_body(&self, cpu_count: u8, kernel_path: &str, kernel_cmd: &str) -> String {
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,
_kernel_path,
_kernel_cmd,
kernel_path,
kernel_cmd,
self.network.host_ip,
self.network.guest_mac,
self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),

4
tests/integration.rs
View File

@ -4045,7 +4045,6 @@ mod parallel {
let cpu_count: u8 = 4;
let http_body = guest.api_create_body(
cpu_count,
fw_path(FwType::RustHypervisorFirmware).as_str(),
direct_kernel_boot_path().to_str().unwrap(),
DIRECT_KERNEL_BOOT_CMDLINE,
);
@ -4099,7 +4098,6 @@ mod parallel {
let cpu_count: u8 = 4;
let http_body = guest.api_create_body(
cpu_count,
fw_path(FwType::RustHypervisorFirmware).as_str(),
direct_kernel_boot_path().to_str().unwrap(),
DIRECT_KERNEL_BOOT_CMDLINE,
);
@ -4175,7 +4173,6 @@ mod parallel {
let cpu_count: u8 = 4;
let http_body = guest.api_create_body(
cpu_count,
fw_path(FwType::RustHypervisorFirmware).as_str(),
direct_kernel_boot_path().to_str().unwrap(),
DIRECT_KERNEL_BOOT_CMDLINE,
);
@ -4259,7 +4256,6 @@ mod parallel {
let cpu_count: u8 = 4;
let http_body = guest.api_create_body(
cpu_count,
fw_path(FwType::RustHypervisorFirmware).as_str(),
direct_kernel_boot_path().to_str().unwrap(),
DIRECT_KERNEL_BOOT_CMDLINE,
);