From 36171caba94233c9389d43bccf8f74be33b4c546 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Fri, 28 Aug 2020 15:54:50 +0200
Subject: [PATCH] ci: Add integration test for defining NUMA nodes in the guest

This new test validates the guest OS can find the NUMA nodes which have
been defined by the user through the CLI, and that the right amount of
memory is associated with each node.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 tests/integration.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/integration.rs b/tests/integration.rs
index 537c0395e..890000b07 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -734,6 +734,21 @@ mod tests {
                 .map_err(Error::Parsing)?)
         }
 
+        fn get_numa_node_memory(&self, node_id: usize) -> Result<u32, Error> {
+            Ok(self
+                .ssh_command(
+                    format!(
+                        "grep MemTotal /sys/devices/system/node/node{}/meminfo \
+                        | cut -d \":\" -f 2 | grep -o \"[0-9]*\"",
+                        node_id
+                    )
+                    .as_str(),
+                )?
+                .trim()
+                .parse()
+                .map_err(Error::Parsing)?)
+        }
+
         fn get_entropy(&self) -> Result<u32, Error> {
             Ok(self
                 .ssh_command("cat /proc/sys/kernel/random/entropy_avail")?
@@ -2264,6 +2279,39 @@ mod tests {
             });
         }
 
+        #[cfg(target_arch = "x86_64")]
+        #[cfg_attr(not(feature = "mmio"), test)]
+        fn test_guest_numa_nodes() {
+            let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
+            let guest = Guest::new(&mut focal);
+            let mut cmd = GuestCommand::new(&guest);
+            cmd.args(&["--cpus", "boot=1"])
+                .args(&["--memory", "size=0"])
+                .args(&[
+                    "--memory-zone",
+                    "size=1G,guest_numa_node=0",
+                    "size=2G,guest_numa_node=1",
+                    "size=3G,guest_numa_node=2",
+                ])
+                .args(&["--kernel", guest.fw_path.as_str()])
+                .default_disks()
+                .default_net();
+
+            let mut child = cmd.spawn().unwrap();
+
+            thread::sleep(std::time::Duration::new(20, 0));
+
+            let r = std::panic::catch_unwind(|| {
+                assert!(guest.get_numa_node_memory(0).unwrap_or_default() > 960_000);
+                assert!(guest.get_numa_node_memory(1).unwrap_or_default() > 1_920_000);
+                assert!(guest.get_numa_node_memory(2).unwrap_or_default() > 2_880_000);
+            });
+            let _ = child.kill();
+            let output = child.wait_with_output().unwrap();
+
+            handle_child_output(r, &output);
+        }
+
         #[cfg_attr(not(feature = "mmio"), test)]
         fn test_pci_msi() {
             test_block!(tb, "", {