chore: Use uppercase for custom CPU templates

While we use uppercase for static CPU templates (and have to do so to
follow the API specification), we used lowercase for custom CPU
templates. Using uppercase for both will make integration tests that
support both types simpler.

Signed-off-by: Takahiro Itazuri <[email protected]>

Author: zulinx86

src/vmm/src/cpu_config/aarch64/static_cpu_templates/mod.rs

@@ -39,7 +39,7 @@ mod tests {
 
     #[test]
     fn verify_consistency_with_json_templates() {
-        let static_templates = [(v1n1::v1n1(), "v1n1.json")];
+        let static_templates = [(v1n1::v1n1(), "V1N1.json")];
 
         for (hardcoded_template, filename) in static_templates {
             let json_template = get_json_template(filename);

src/vmm/src/cpu_config/x86_64/static_cpu_templates/mod.rs

@@ -84,11 +84,11 @@ mod tests {
     #[test]
     fn verify_consistency_with_json_templates() {
         let static_templates = [
-            (c3::c3(), "c3.json"),
-            (t2::t2(), "t2.json"),
-            (t2s::t2s(), "t2s.json"),
-            (t2cl::t2cl(), "t2cl.json"),
-            (t2a::t2a(), "t2a.json"),
+            (c3::c3(), "C3.json"),
+            (t2::t2(), "T2.json"),
+            (t2s::t2s(), "T2S.json"),
+            (t2cl::t2cl(), "T2CL.json"),
+            (t2a::t2a(), "T2A.json"),
         ];
 
         for (hardcoded_template, filename) in static_templates {

tests/data/custom_cpu_templates/aarch64_with_sve_and_pac.json renamed to tests/data/custom_cpu_templates/AARCH64_WITH_SVE_AND_PAC.json

@@ -802,11 +802,11 @@ def set_cpu_template(self, cpu_template):
         # static CPU template
         if isinstance(cpu_template, str):
             self.api.machine_config.patch(cpu_template=cpu_template)
-            self.cpu_template_name = cpu_template.lower()
+            self.cpu_template_name = cpu_template
         # custom CPU template
         elif isinstance(cpu_template, dict):
             self.api.cpu_config.put(**cpu_template["template"])
-            self.cpu_template_name = cpu_template["name"].lower()
+            self.cpu_template_name = cpu_template["name"]
 
     def add_drive(
         self,

tests/data/custom_cpu_templates/c3.json renamed to tests/data/custom_cpu_templates/C3.json

@@ -55,21 +55,21 @@ def get_supported_custom_cpu_templates():
         case CpuVendor.AMD, CpuModel.AMD_MILAN:
             return AMD_TEMPLATES
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_N1 if host_linux >= (6, 1):
-            return ["v1n1"]
+            return ["V1N1"]
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1 if host_linux >= (6, 1):
-            return ["v1n1", "aarch64_with_sve_and_pac"]
+            return ["V1N1", "AARCH64_WITH_SVE_AND_PAC"]
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1:
-            return ["aarch64_with_sve_and_pac"]
+            return ["AARCH64_WITH_SVE_AND_PAC"]
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V2:
-            return ["aarch64_with_sve_and_pac"]
+            return ["AARCH64_WITH_SVE_AND_PAC"]
         case _:
             return []
 
 
 def custom_cpu_templates_params():
     """Return Custom CPU templates as pytest parameters"""
     for name in sorted(get_supported_custom_cpu_templates()):
-        tmpl = Path(f"./data/custom_cpu_templates/{name.lower()}.json")
+        tmpl = Path(f"./data/custom_cpu_templates/{name}.json")
         yield pytest.param(
             {"name": name, "template": json.loads(tmpl.read_text("utf-8"))},
             id="custom_" + name,

tests/data/custom_cpu_templates/t2.json renamed to tests/data/custom_cpu_templates/T2.json

@@ -37,21 +37,21 @@ def test_guest_cpu_features(uvm_any):
     vm = uvm_any
     expected_cpu_features = set()
     match global_props.cpu_model, vm.cpu_template_name:
-        case CpuModel.ARM_NEOVERSE_N1, "v1n1":
+        case CpuModel.ARM_NEOVERSE_N1, "V1N1":
             expected_cpu_features = G2_FEATS
         case CpuModel.ARM_NEOVERSE_N1, None:
             expected_cpu_features = G2_FEATS
 
         # [cm]7g with guest kernel 5.10 and later
-        case CpuModel.ARM_NEOVERSE_V1, "v1n1":
+        case CpuModel.ARM_NEOVERSE_V1, "V1N1":
             expected_cpu_features = G2_FEATS
-        case CpuModel.ARM_NEOVERSE_V1, "aarch64_with_sve_and_pac":
+        case CpuModel.ARM_NEOVERSE_V1, "AARCH64_WITH_SVE_AND_PAC":
             expected_cpu_features = G3_FEATS | G3_SVE_AND_PAC
         case CpuModel.ARM_NEOVERSE_V1, None:
             expected_cpu_features = G3_FEATS
         case CpuModel.ARM_NEOVERSE_V2, None:
             expected_cpu_features = G4_FEATS
-        case CpuModel.ARM_NEOVERSE_V2, "aarch64_with_sve_and_pac":
+        case CpuModel.ARM_NEOVERSE_V2, "AARCH64_WITH_SVE_AND_PAC":
             expected_cpu_features = G4_FEATS | G4_SVE_AND_PAC
 
     guest_feats = set(vm.ssh.check_output(CPU_FEATURES_CMD).stdout.split())

tests/data/custom_cpu_templates/t2a.json renamed to tests/data/custom_cpu_templates/T2A.json

@@ -166,9 +166,9 @@ def get_vuln_files_exception_dict(template):
     # Since those bits are not set on Intel Skylake and C3 template makes guests pretend to be AWS
     # C3 instance (quite old processor now) by overwriting CPUID.1H:EAX, it is impossible to avoid
     # this "Unknown" state.
-    if global_props.cpu_codename == "INTEL_SKYLAKE" and template == "c3":
+    if global_props.cpu_codename == "INTEL_SKYLAKE" and template == "C3":
         exception_dict["mmio_stale_data"] = "Unknown: No mitigations"
-    elif global_props.cpu_codename == "INTEL_SKYLAKE" or template == "t2s":
+    elif global_props.cpu_codename == "INTEL_SKYLAKE" or template == "T2S":
         exception_dict["mmio_stale_data"] = "Clear CPU buffers"
 
     return exception_dict