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

tests: Use ch-remote to resize the VM

Browse Source 
Remove manually constructed API request in the integration tests.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-03-10 17:00:19 +00:00 committed by Sebastien Boeuf
parent 21160f7490
commit 911a2d61d7
1 changed files with 26 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tests/integration.rs
View File

@ -470,6 +470,25 @@ mod tests {
.success()
}
fn resize_command(
api_socket: &str,
desired_vcpus: Option<u8>,
desired_ram: Option<usize>,
) -> bool {
let mut cmd = Command::new("target/release/ch-remote");
cmd.args(&[&format!("--api-socket={}", api_socket), "resize"]);
if let Some(desired_vcpus) = desired_vcpus {
cmd.arg(format!("--cpus={}", desired_vcpus));
}
if let Some(desired_ram) = desired_ram {
cmd.arg(format!("--memory={}", desired_ram));
}
cmd.status().expect("Failed to launch ch-remote").success()
}
const DEFAULT_SSH_RETRIES: u8 = 6;
const DEFAULT_SSH_TIMEOUT: u8 = 10;
fn ssh_command_ip(command: &str, ip: &str, retries: u8, timeout: u8) -> Result<String, Error> {
@ -639,14 +658,6 @@ mod tests {
}
}
fn api_resize_body(&self, desired_vcpus: Option<u8>, desired_ram: Option<u64>) -> String {
let resize = vmm::api::VmResizeData {
desired_vcpus,
desired_ram,
};
serde_json::to_string(&resize).unwrap()
}
fn get_cpu_count(&self) -> Result<u32, Error> {
Ok(self
.ssh_command("grep -c processor /proc/cpuinfo")?
@ -3126,13 +3137,7 @@ mod tests {
// Resize the VM
let desired_vcpus = 4;
let http_body = guest.api_resize_body(Some(desired_vcpus), None);
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, Some(desired_vcpus), None);
guest.ssh_command("echo 1 | sudo tee /sys/bus/cpu/devices/cpu2/online")?;
guest.ssh_command("echo 1 | sudo tee /sys/bus/cpu/devices/cpu3/online")?;
@ -3170,13 +3175,8 @@ mod tests {
// Resize the VM
let desired_vcpus = 2;
let http_body = guest.api_resize_body(Some(desired_vcpus), None);
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, Some(desired_vcpus), None);
thread::sleep(std::time::Duration::new(10, 0));
aver_eq!(
tb,
@ -3222,13 +3222,7 @@ mod tests {
// Add RAM to the VM
let desired_ram = 1024 << 20;
let http_body = guest.api_resize_body(None, Some(desired_ram));
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, None, Some(desired_ram));
thread::sleep(std::time::Duration::new(10, 0));
aver!(tb, guest.get_total_memory().unwrap_or_default() > 982_000);
@ -3260,26 +3254,14 @@ mod tests {
// Add RAM to the VM
let desired_ram = 2048 << 20;
let http_body = guest.api_resize_body(None, Some(desired_ram));
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, None, Some(desired_ram));
thread::sleep(std::time::Duration::new(10, 0));
aver!(tb, guest.get_total_memory().unwrap_or_default() > 1_964_000);
// Remove RAM to the VM (only applies after reboot)
let desired_ram = 1024 << 20;
let http_body = guest.api_resize_body(None, Some(desired_ram));
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, None, Some(desired_ram));
guest.ssh_command("sudo reboot").unwrap_or_default();
@ -3336,13 +3318,7 @@ mod tests {
// Resize the VM
let desired_vcpus = 4;
let desired_ram = 1024 << 20;
let http_body = guest.api_resize_body(Some(desired_vcpus), Some(desired_ram));
curl_command(
&api_socket,
"PUT",
"http://localhost/api/v1/vm.resize",
Some(&http_body),
);
resize_command(&api_socket, Some(desired_vcpus), Some(desired_ram));
guest.ssh_command("echo 1 | sudo tee /sys/bus/cpu/devices/cpu2/online")?;
guest.ssh_command("echo 1 | sudo tee /sys/bus/cpu/devices/cpu3/online")?;