test: Cover all CPU templates in test_cpu_template

Preciously the test only supported static CPU templates. Now all the
custom CPU templates are also tested. That helps test newer custom CPU
templates (e.g. a CPU template for Intel Sapphire Rapids).

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

Author: zulinx86

tests/integration_tests/functional/test_cpu_features_x86_64.py

@@ -656,23 +656,26 @@ def test_cpu_cpuid_restore(microvm_factory, guest_kernel, cpu_template_any):
     )
 
 
-@pytest.mark.parametrize("cpu_template", ["T2", "T2S", "C3"])
-def test_cpu_template(uvm_plain_any, cpu_template, microvm_factory):
+def test_cpu_template(uvm_plain_any, cpu_template_any, microvm_factory):
     """
     Test masked and enabled cpu features against the expected template.
 
     This test checks that all expected masked features are not present in the
     guest and that expected enabled features are present for each of the
     supported CPU templates.
     """
+    cpu_template = get_cpu_template_name_str(cpu_template_any)
+    if cpu_template not in ["t2", "t2s", "c3"]:
+        pytest.skip("CPU template not supported by this test")
+
     test_microvm = uvm_plain_any
     test_microvm.spawn()
     # Set template as specified in the `cpu_template` parameter.
     test_microvm.basic_config(
         vcpu_count=1,
         mem_size_mib=256,
-        cpu_template=cpu_template,
     )
+    test_microvm.set_cpu_template(cpu_template_any)
     test_microvm.add_net_iface()
 
     if cpuid_utils.get_cpu_vendor() != cpuid_utils.CpuVendor.INTEL:
@@ -700,7 +703,7 @@ def check_masked_features(test_microvm, cpu_template):
     """Verify the masked features of the given template."""
     # fmt: off
     must_be_unset = []
-    if cpu_template == "C3":
+    if cpu_template == "c3":
         must_be_unset = [
             (0x1, 0x0, "ecx",
                 (1 << 2) |  # DTES64
@@ -785,7 +788,7 @@ def check_masked_features(test_microvm, cpu_template):
                 (1 << 26)   # PDPE1GB
             ),
         ]
-    elif cpu_template in ("T2", "T2S"):
+    elif cpu_template in ("t2", "t2s"):
         must_be_unset = [
             (0x1, 0x0, "ecx",
                 (1 << 2) |  # DTES64
@@ -959,7 +962,7 @@ def check_enabled_features(test_microvm, cpu_template):
     cpuid_utils.check_guest_cpuid_output(
         test_microvm, "cpuid -1", None, "=", enabled_list
     )
-    if cpu_template == "T2":
+    if cpu_template == "t2":
         t2_enabled_features = {
             "FMA instruction": "true",
             "BMI1 instructions": "true",