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

vmm, build: Remove use of "credibility" from unit tests

Browse Source 
This crate was used in the integration tests to allow the tests to
continue and clean up after a failure. This isn't necessary in the unit
tests and adds a large build dependency chain including an unmaintained
crate.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-01-05 10:45:46 +00:00 committed by Sebastien Boeuf
parent 7cc1643782
commit e4763b47f1
6 changed files with 167 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Cargo.lock generated
View File

@ -9,21 +9,6 @@ dependencies = [
"vm-memory", "vm-memory",
] ]
[[package]]
name = "addr2line"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
dependencies = [
"gimli",
]
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.18" version = "0.7.18"
@ -92,21 +77,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "backtrace"
version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]] [[package]]
name = "bincode" name = "bincode"
version = "1.3.3" version = "1.3.3"
@ -183,7 +153,6 @@ dependencies = [
"anyhow", "anyhow",
"api_client", "api_client",
"clap", "clap",
"credibility",
"dirs 4.0.0", "dirs 4.0.0",
"epoll", "epoll",
"event_monitor", "event_monitor",
@ -219,16 +188,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910" checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910"
[[package]]
name = "credibility"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fae7a162fd5b462bc49704873a89950a655d44161add4be07e00e64c4c83a5bf"
dependencies = [
"failure",
"failure_derive",
]
[[package]] [[package]]
name = "devices" name = "devices"
version = "0.1.0" version = "0.1.0"
@ -311,28 +270,6 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "failure"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
dependencies = [
"backtrace",
"failure_derive",
]
[[package]]
name = "failure_derive"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2",
"quote",
"syn",
"synstructure",
]
[[package]] [[package]]
name = "fdt" name = "fdt"
version = "0.1.3" version = "0.1.3"
@ -350,12 +287,6 @@ dependencies = [
"wasi", "wasi",
] ]
[[package]]
name = "gimli"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
[[package]] [[package]]
name = "glob" name = "glob"
version = "0.3.0" version = "0.3.0"
@ -559,16 +490,6 @@ dependencies = [
"vmm-sys-util", "vmm-sys-util",
] ]
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
]
[[package]] [[package]]
name = "mshv-bindings" name = "mshv-bindings"
version = "0.1.0" version = "0.1.0"
@ -621,15 +542,6 @@ dependencies = [
"vmm-sys-util", "vmm-sys-util",
] ]
[[package]]
name = "object"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.72" version = "0.9.72"
@ -882,12 +794,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "rustc-demangle"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.2.3" version = "0.2.3"
@ -1385,7 +1291,6 @@ dependencies = [
"bitflags", "bitflags",
"block_util", "block_util",
"clap", "clap",
"credibility",
"devices", "devices",
"epoll", "epoll",
"event_monitor", "event_monitor",

1
Cargo.toml
View File

@ -40,7 +40,6 @@ kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
[dev-dependencies] [dev-dependencies]
credibility = "0.1.3"
dirs = "4.0.0" dirs = "4.0.0"
lazy_static= "1.4.0" lazy_static= "1.4.0"
net_util = { path = "net_util" } net_util = { path = "net_util" }

139
src/main.rs
View File

@ -586,10 +586,6 @@ fn main() {
std::process::exit(exit_code); std::process::exit(exit_code);
} }
#[cfg(test)]
#[macro_use]
extern crate credibility;
#[cfg(test)] #[cfg(test)]
mod unit_tests { mod unit_tests {
use crate::config::HotplugMethod; use crate::config::HotplugMethod;
@ -618,15 +614,11 @@ mod unit_tests {
let cli_vm_config = get_vm_config_from_vec(cli); let cli_vm_config = get_vm_config_from_vec(cli);
let openapi_vm_config: VmConfig = serde_json::from_str(openapi).unwrap(); let openapi_vm_config: VmConfig = serde_json::from_str(openapi).unwrap();
test_block!(tb, "", { if equal {
if equal { assert_eq!(cli_vm_config, openapi_vm_config);
aver_eq!(tb, cli_vm_config, openapi_vm_config); } else {
} else { assert_ne!(cli_vm_config, openapi_vm_config);
aver_ne!(tb, cli_vm_config, openapi_vm_config); }
}
Ok(())
});
(cli_vm_config, openapi_vm_config) (cli_vm_config, openapi_vm_config)
} }
@ -640,70 +632,67 @@ mod unit_tests {
let (result_vm_config, _) = compare_vm_config_cli_vs_json(&cli, openapi, true); let (result_vm_config, _) = compare_vm_config_cli_vs_json(&cli, openapi, true);
// As a second step, we validate all the default values. // As a second step, we validate all the default values.
test_block!(tb, "", { let expected_vm_config = VmConfig {
let expected_vm_config = VmConfig { cpus: CpusConfig {
cpus: CpusConfig { boot_vcpus: 1,
boot_vcpus: 1, max_vcpus: 1,
max_vcpus: 1, topology: None,
topology: None, kvm_hyperv: false,
kvm_hyperv: false, max_phys_bits: 46,
max_phys_bits: 46, affinity: None,
affinity: None, },
}, memory: MemoryConfig {
memory: MemoryConfig { size: 536_870_912,
size: 536_870_912, mergeable: false,
mergeable: false, hotplug_method: HotplugMethod::Acpi,
hotplug_method: HotplugMethod::Acpi, hotplug_size: None,
hotplug_size: None, hotplugged_size: None,
hotplugged_size: None, shared: false,
shared: false, hugepages: false,
hugepages: false, hugepage_size: None,
hugepage_size: None, prefault: false,
prefault: false, zones: None,
zones: None, },
}, kernel: Some(KernelConfig {
kernel: Some(KernelConfig { path: PathBuf::from("/path/to/kernel"),
path: PathBuf::from("/path/to/kernel"), }),
}), initramfs: None,
initramfs: None, cmdline: CmdlineConfig {
cmdline: CmdlineConfig { args: String::from(""),
args: String::from(""), },
}, disks: None,
disks: None, net: None,
net: None, rng: RngConfig {
rng: RngConfig { src: PathBuf::from("/dev/urandom"),
src: PathBuf::from("/dev/urandom"),
iommu: false,
},
balloon: None,
fs: None,
pmem: None,
serial: ConsoleConfig {
file: None,
mode: ConsoleOutputMode::Null,
iommu: false,
},
console: ConsoleConfig {
file: None,
mode: ConsoleOutputMode::Tty,
iommu: false,
},
devices: None,
user_devices: None,
vsock: None,
iommu: false, iommu: false,
#[cfg(target_arch = "x86_64")] },
sgx_epc: None, balloon: None,
numa: None, fs: None,
watchdog: false, pmem: None,
#[cfg(feature = "tdx")] serial: ConsoleConfig {
tdx: None, file: None,
platform: None, mode: ConsoleOutputMode::Null,
}; iommu: false,
},
console: ConsoleConfig {
file: None,
mode: ConsoleOutputMode::Tty,
iommu: false,
},
devices: None,
user_devices: None,
vsock: None,
iommu: false,
#[cfg(target_arch = "x86_64")]
sgx_epc: None,
numa: None,
watchdog: false,
#[cfg(feature = "tdx")]
tdx: None,
platform: None,
};
aver_eq!(tb, expected_vm_config, result_vm_config); assert_eq!(expected_vm_config, result_vm_config);
Ok(())
})
} }
#[test] #[test]

3
vmm/Cargo.toml
View File

@ -54,6 +54,3 @@ vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } vmm-sys-util = { version = "0.9.0", features = ["with-serde"] }
[dev-dependencies]
credibility = "0.1.3"

210
vmm/src/device_tree.rs
View File

@ -165,121 +165,117 @@ mod tests {
#[test] #[test]
fn test_device_tree() { fn test_device_tree() {
test_block!(tb, "", { // Check new()
// Check new() let mut device_tree = DeviceTree::new();
let mut device_tree = DeviceTree::new(); assert_eq!(device_tree.0.len(), 0);
aver_eq!(tb, device_tree.0.len(), 0);
// Check insert() // Check insert()
let id = String::from("id1"); let id = String::from("id1");
device_tree.insert(id.clone(), DeviceNode::new(id.clone(), None)); device_tree.insert(id.clone(), DeviceNode::new(id.clone(), None));
aver_eq!(tb, device_tree.0.len(), 1); assert_eq!(device_tree.0.len(), 1);
let node = device_tree.0.get(&id); let node = device_tree.0.get(&id);
aver!(tb, node.is_some()); assert!(node.is_some());
let node = node.unwrap(); let node = node.unwrap();
aver_eq!(tb, node.id, id); assert_eq!(node.id, id);
// Check get() // Check get()
let id2 = String::from("id2"); let id2 = String::from("id2");
aver!(tb, device_tree.get(&id).is_some()); assert!(device_tree.get(&id).is_some());
aver!(tb, device_tree.get(&id2).is_none()); assert!(device_tree.get(&id2).is_none());
// Check get_mut() // Check get_mut()
let node = device_tree.get_mut(&id).unwrap(); let node = device_tree.get_mut(&id).unwrap();
node.id = id2.clone(); node.id = id2.clone();
let node = device_tree.0.get(&id).unwrap(); let node = device_tree.0.get(&id).unwrap();
aver_eq!(tb, node.id, id2); assert_eq!(node.id, id2);
// Check remove() // Check remove()
let node = device_tree.remove(&id).unwrap(); let node = device_tree.remove(&id).unwrap();
aver_eq!(tb, node.id, id2); assert_eq!(node.id, id2);
aver_eq!(tb, device_tree.0.len(), 0); assert_eq!(device_tree.0.len(), 0);
// Check iter() // Check iter()
let disk_id = String::from("disk0"); let disk_id = String::from("disk0");
let net_id = String::from("net0"); let net_id = String::from("net0");
let rng_id = String::from("rng0"); let rng_id = String::from("rng0");
let device_list = vec![ let device_list = vec![
(disk_id.clone(), device_node!(disk_id)), (disk_id.clone(), device_node!(disk_id)),
(net_id.clone(), device_node!(net_id)), (net_id.clone(), device_node!(net_id)),
(rng_id.clone(), device_node!(rng_id)), (rng_id.clone(), device_node!(rng_id)),
]; ];
device_tree.0.extend(device_list); device_tree.0.extend(device_list);
for (id, node) in device_tree.iter() { for (id, node) in device_tree.iter() {
if id == &disk_id { if id == &disk_id {
aver_eq!(tb, node.id, disk_id); assert_eq!(node.id, disk_id);
} else if id == &net_id { } else if id == &net_id {
aver_eq!(tb, node.id, net_id); assert_eq!(node.id, net_id);
} else if id == &rng_id { } else if id == &rng_id {
aver_eq!(tb, node.id, rng_id); assert_eq!(node.id, rng_id);
} else { } else {
aver!(tb, false); unreachable!()
}
} }
}
// Check breadth_first_traversal() based on the following hierarchy // Check breadth_first_traversal() based on the following hierarchy
// //
// 0 // 0
// | \ // | \
// 1 2 // 1 2
// | | \ // | | \
// 3 4 5 // 3 4 5
// //
let mut device_tree = DeviceTree::new(); let mut device_tree = DeviceTree::new();
let child_1_id = String::from("child1"); let child_1_id = String::from("child1");
let child_2_id = String::from("child2"); let child_2_id = String::from("child2");
let child_3_id = String::from("child3"); let child_3_id = String::from("child3");
let parent_1_id = String::from("parent1"); let parent_1_id = String::from("parent1");
let parent_2_id = String::from("parent2"); let parent_2_id = String::from("parent2");
let root_id = String::from("root"); let root_id = String::from("root");
let mut child_1_node = device_node!(child_1_id); let mut child_1_node = device_node!(child_1_id);
let mut child_2_node = device_node!(child_2_id); let mut child_2_node = device_node!(child_2_id);
let mut child_3_node = device_node!(child_3_id); let mut child_3_node = device_node!(child_3_id);
let mut parent_1_node = device_node!(parent_1_id); let mut parent_1_node = device_node!(parent_1_id);
let mut parent_2_node = device_node!(parent_2_id); let mut parent_2_node = device_node!(parent_2_id);
let mut root_node = device_node!(root_id); let mut root_node = device_node!(root_id);
child_1_node.parent = Some(parent_1_id.clone()); child_1_node.parent = Some(parent_1_id.clone());
child_2_node.parent = Some(parent_2_id.clone()); child_2_node.parent = Some(parent_2_id.clone());
child_3_node.parent = Some(parent_2_id.clone()); child_3_node.parent = Some(parent_2_id.clone());
parent_1_node.children = vec![child_1_id.clone()]; parent_1_node.children = vec![child_1_id.clone()];
parent_1_node.parent = Some(root_id.clone()); parent_1_node.parent = Some(root_id.clone());
parent_2_node.children = vec![child_2_id.clone(), child_3_id.clone()]; parent_2_node.children = vec![child_2_id.clone(), child_3_id.clone()];
parent_2_node.parent = Some(root_id.clone()); parent_2_node.parent = Some(root_id.clone());
root_node.children = vec![parent_1_id.clone(), parent_2_id.clone()]; root_node.children = vec![parent_1_id.clone(), parent_2_id.clone()];
let device_list = vec![ let device_list = vec![
(child_1_id.clone(), child_1_node), (child_1_id.clone(), child_1_node),
(child_2_id.clone(), child_2_node), (child_2_id.clone(), child_2_node),
(child_3_id.clone(), child_3_node), (child_3_id.clone(), child_3_node),
(parent_1_id.clone(), parent_1_node), (parent_1_id.clone(), parent_1_node),
(parent_2_id.clone(), parent_2_node), (parent_2_id.clone(), parent_2_node),
(root_id.clone(), root_node), (root_id.clone(), root_node),
]; ];
device_tree.0.extend(device_list); device_tree.0.extend(device_list);
let iter_vec = device_tree let iter_vec = device_tree
.breadth_first_traversal() .breadth_first_traversal()
.collect::<Vec<&DeviceNode>>(); .collect::<Vec<&DeviceNode>>();
aver_eq!(tb, iter_vec.len(), 6); assert_eq!(iter_vec.len(), 6);
aver_eq!(tb, iter_vec[0].id, root_id); assert_eq!(iter_vec[0].id, root_id);
aver_eq!(tb, iter_vec[1].id, parent_1_id); assert_eq!(iter_vec[1].id, parent_1_id);
aver_eq!(tb, iter_vec[2].id, parent_2_id); assert_eq!(iter_vec[2].id, parent_2_id);
aver_eq!(tb, iter_vec[3].id, child_1_id); assert_eq!(iter_vec[3].id, child_1_id);
aver_eq!(tb, iter_vec[4].id, child_2_id); assert_eq!(iter_vec[4].id, child_2_id);
aver_eq!(tb, iter_vec[5].id, child_3_id); assert_eq!(iter_vec[5].id, child_3_id);
let iter_vec = device_tree let iter_vec = device_tree
.breadth_first_traversal() .breadth_first_traversal()
.rev() .rev()
.collect::<Vec<&DeviceNode>>(); .collect::<Vec<&DeviceNode>>();
aver_eq!(tb, iter_vec.len(), 6); assert_eq!(iter_vec.len(), 6);
aver_eq!(tb, iter_vec[5].id, root_id); assert_eq!(iter_vec[5].id, root_id);
aver_eq!(tb, iter_vec[4].id, parent_1_id); assert_eq!(iter_vec[4].id, parent_1_id);
aver_eq!(tb, iter_vec[3].id, parent_2_id); assert_eq!(iter_vec[3].id, parent_2_id);
aver_eq!(tb, iter_vec[2].id, child_1_id); assert_eq!(iter_vec[2].id, child_1_id);
aver_eq!(tb, iter_vec[1].id, child_2_id); assert_eq!(iter_vec[1].id, child_2_id);
aver_eq!(tb, iter_vec[0].id, child_3_id); assert_eq!(iter_vec[0].id, child_3_id);
Ok(())
})
} }
} }

3
vmm/src/lib.rs
View File

@ -11,9 +11,6 @@ extern crate lazy_static;
extern crate log; extern crate log;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;
#[cfg(test)]
#[macro_use]
extern crate credibility;
use crate::api::{ use crate::api::{
ApiError, ApiRequest, ApiResponse, ApiResponsePayload, VmInfo, VmReceiveMigrationData, ApiError, ApiRequest, ApiResponse, ApiResponsePayload, VmInfo, VmReceiveMigrationData,