From f443bae9d9a12c2cc7903c9c295ecf1bd721e3b7 Mon Sep 17 00:00:00 2001
From: Muminul Islam <muislam@microsoft.com>
Date: Fri, 27 Feb 2026 16:02:59 -0800
Subject: [PATCH] tests: Support CVM in api_create_body()

Refactor api_create_body() to branch based on GuestVmType.
For confidential VMs, the JSON body now includes:
- platform config with sev_snp enabled
- IGVM payload with host_data instead of kernel
- nested virtualization disabled in CPU config

Replace the monolithic format! macro with incremental
push_str calls for clearer JSON construction.

Also improve error handling in GuestCommand by replacing
an unwrap() with a descriptive expect() on the IGVM path.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
---
 test_infra/src/lib.rs | 57 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/test_infra/src/lib.rs b/test_infra/src/lib.rs
index 1ba5ceccc..27b608c98 100644
--- a/test_infra/src/lib.rs
+++ b/test_infra/src/lib.rs
@@ -1084,16 +1084,50 @@ impl Guest {
     }
 
     pub fn api_create_body(&self, cpu_count: u8, kernel_path: &str, kernel_cmd: &str) -> String {
-        format! {"{{\"cpus\":{{\"boot_vcpus\":{},\"max_vcpus\":{}}},\"payload\":{{\"kernel\":\"{}\",\"cmdline\": \"{}\"}},\"net\":[{{\"ip\":\"{}\", \"mask\":\"255.255.255.0\", \"mac\":\"{}\"}}], \"disks\":[{{\"path\":\"{}\"}}, {{\"path\":\"{}\"}}]}}",
-                 cpu_count,
-                 cpu_count,
-                 kernel_path,
-                 kernel_cmd,
-                 self.network.host_ip0,
-                 self.network.guest_mac0,
-                 self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),
-                 self.disk_config.disk(DiskType::CloudInit).unwrap().as_str(),
+        let mut body = serde_json::json!({
+            "cpus": {
+            "boot_vcpus": cpu_count,
+            "max_vcpus": cpu_count,
+            },
+            "net": [
+            {
+                "ip": self.network.host_ip0,
+                "mask": "255.255.255.0",
+                "mac": self.network.guest_mac0,
+            }
+            ],
+            "disks": [
+            {
+                "path": self.disk_config.disk(DiskType::OperatingSystem).unwrap(),
+            },
+            {
+                "path": self.disk_config.disk(DiskType::CloudInit).unwrap(),
+            }
+            ]
+        });
+
+        if !self.nested {
+            body["cpus"]["nested"] = serde_json::json!(false);
         }
+
+        if self.vm_type == GuestVmType::Confidential {
+            body["platform"] = serde_json::json!({"sev_snp": true});
+            body["payload"] = serde_json::json!({
+            "igvm": direct_igvm_boot_path(Some("hvc0"))
+                .unwrap()
+                .to_str()
+                .unwrap(),
+            "cmdline": kernel_cmd,
+            "host_data": generate_host_data(),
+            });
+        } else {
+            body["payload"] = serde_json::json!({
+            "kernel": kernel_path,
+            "cmdline": kernel_cmd,
+            });
+        }
+
+        body.to_string()
     }
 
     pub fn get_cpu_count(&self) -> Result<u32, Error> {
@@ -1656,7 +1690,10 @@ impl<'a> GuestCommand<'a> {
             };
             let igvm = direct_igvm_boot_path(Some(console_str))
                 .expect("IGVM boot file not found for console type: {console_str}");
-            self.command.args(["--igvm", igvm.to_str().unwrap()]);
+            self.command.args([
+                "--igvm",
+                igvm.to_str().expect("IGVM path is not valid UTF-8"),
+            ]);
             self.command
                 .args(["--host-data", generate_host_data().as_str()]);
             self.command.args(["--platform", "sev_snp=on"]);