From 2f6a979c8226d7604a201c32ad2d8482fcc20dc2 Mon Sep 17 00:00:00 2001
From: Jedoku <vitalii@daynix.com>
Date: Mon, 13 May 2024 01:28:17 +0300
Subject: [PATCH] Update platforms JSON to have cpus and winrm_port with
 integer type

Signed-off-by: Jedoku <vitalii@daynix.com>
---
 config.json                                               | 2 +-
 lib/engines/hcktest/platforms/PhyWin2016.json             | 2 +-
 lib/engines/hcktest/platforms/PhyWin2019.json             | 2 +-
 lib/engines/hcktest/platforms/Win10_1607x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1607x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1703x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1703x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1709x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1709x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1803x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1803x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1809x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1809x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1903x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1903x64_q35.json      | 8 ++++----
 .../hcktest/platforms/Win10_1903x64_q35_viommu.json       | 8 ++++----
 lib/engines/hcktest/platforms/Win10_1903x86.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_2004x64.json          | 8 ++++----
 lib/engines/hcktest/platforms/Win10_2004x86.json          | 8 ++++----
 .../platforms/Win11_22H2x64_host_uefi_q35_viommu.json     | 8 ++++----
 .../platforms/Win11_23H2x64_host_uefi_q35_viommu.json     | 8 ++++----
 .../platforms/Win11nextx64_host_uefi_q35_viommu.json      | 8 ++++----
 lib/engines/hcktest/platforms/Win2008R2x64.json           | 8 ++++----
 lib/engines/hcktest/platforms/Win2012R2x64.json           | 8 ++++----
 lib/engines/hcktest/platforms/Win2012x64.json             | 8 ++++----
 lib/engines/hcktest/platforms/Win2016x64.json             | 8 ++++----
 lib/engines/hcktest/platforms/Win2016x64_uefi.json        | 8 ++++----
 lib/engines/hcktest/platforms/Win2019x64.json             | 8 ++++----
 lib/engines/hcktest/platforms/Win2019x64_uefi.json        | 8 ++++----
 .../platforms/Win2022nextx64_host_uefi_q35_viommu.json    | 8 ++++----
 lib/engines/hcktest/platforms/Win2022x64.json             | 8 ++++----
 .../platforms/Win2022x64_host_uefi_q35_viommu.json        | 8 ++++----
 lib/engines/hcktest/platforms/Win2022x64_uefi.json        | 8 ++++----
 .../hcktest/platforms/Win2025x64_host_uefi_q35.json       | 8 ++++----
 lib/engines/hcktest/platforms/Win7x64.json                | 8 ++++----
 lib/engines/hcktest/platforms/Win7x86.json                | 8 ++++----
 lib/engines/hcktest/platforms/Win81x64.json               | 8 ++++----
 lib/engines/hcktest/platforms/Win81x86.json               | 8 ++++----
 lib/engines/hcktest/platforms/Win8x64.json                | 8 ++++----
 lib/engines/hcktest/platforms/Win8x86.json                | 8 ++++----
 40 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/config.json b/config.json
index 16188577..2b7b6302 100644
--- a/config.json
+++ b/config.json
@@ -2,7 +2,7 @@
     "iso_path": "/home/hck-ci/HCK-CI/iso",
     "extra_software": "/home/hck-ci/HCK-CI/extra-software",
     "workspace_path": "/home/hck-ci/HCK-CI/workspace",
-    "winrm_port": "5985",
+    "winrm_port": 5985,
     "repository": "virtio-win/kvm-guest-drivers-windows",
     "toolshck_path": "./toolsHCK.ps1",
     "studio_username": "Administrator",
diff --git a/lib/engines/hcktest/platforms/PhyWin2016.json b/lib/engines/hcktest/platforms/PhyWin2016.json
index 0d923e61..0b75727d 100644
--- a/lib/engines/hcktest/platforms/PhyWin2016.json
+++ b/lib/engines/hcktest/platforms/PhyWin2016.json
@@ -5,7 +5,7 @@
   "clients": {
     "c1": {
       "name": "C1",
-      "winrm_port": "4002"
+      "winrm_port": 4002
     }
   }
 }
diff --git a/lib/engines/hcktest/platforms/PhyWin2019.json b/lib/engines/hcktest/platforms/PhyWin2019.json
index 1eaa0162..65f4d252 100644
--- a/lib/engines/hcktest/platforms/PhyWin2019.json
+++ b/lib/engines/hcktest/platforms/PhyWin2019.json
@@ -5,7 +5,7 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "winrm_port": "4002"
+      "winrm_port": 4002
     }
   }
 }
diff --git a/lib/engines/hcktest/platforms/Win10_1607x64.json b/lib/engines/hcktest/platforms/Win10_1607x64.json
index 91656ef4..d6ca6116 100644
--- a/lib/engines/hcktest/platforms/Win10_1607x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1607x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1703-C1-Win10_1607x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1703-C2-Win10_1607x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1607x86.json b/lib/engines/hcktest/platforms/Win10_1607x86.json
index ab470021..01c0531c 100644
--- a/lib/engines/hcktest/platforms/Win10_1607x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1607x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1703-C1-Win10_1607x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1703-C2-Win10_1607x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1703x64.json b/lib/engines/hcktest/platforms/Win10_1703x64.json
index f892fb31..c9a130f4 100644
--- a/lib/engines/hcktest/platforms/Win10_1703x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1703x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1703-C1-Win10_1703x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1703-C2-Win10_1703x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1703x86.json b/lib/engines/hcktest/platforms/Win10_1703x86.json
index be0ef3cc..ac623088 100644
--- a/lib/engines/hcktest/platforms/Win10_1703x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1703x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1703-C1-Win10_1703x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1703-C2-Win10_1703x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1709x64.json b/lib/engines/hcktest/platforms/Win10_1709x64.json
index 970e98fc..19f1bc1b 100644
--- a/lib/engines/hcktest/platforms/Win10_1709x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1709x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1709-C1-Win10_1709x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1709-C2-Win10_1709x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1709x86.json b/lib/engines/hcktest/platforms/Win10_1709x86.json
index 48045782..3c29dd3e 100644
--- a/lib/engines/hcktest/platforms/Win10_1709x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1709x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1709-C1-Win10_1709x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1709-C2-Win10_1709x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1803x64.json b/lib/engines/hcktest/platforms/Win10_1803x64.json
index e45f5270..8f6ea0ce 100644
--- a/lib/engines/hcktest/platforms/Win10_1803x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1803x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1803-C1-Win10_1803x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1803-C2-Win10_1803x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1803x86.json b/lib/engines/hcktest/platforms/Win10_1803x86.json
index a58e7a02..439f7db1 100644
--- a/lib/engines/hcktest/platforms/Win10_1803x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1803x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1803-C1-Win10_1803x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1803-C2-Win10_1803x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1809x64.json b/lib/engines/hcktest/platforms/Win10_1809x64.json
index 375652f7..644323a7 100644
--- a/lib/engines/hcktest/platforms/Win10_1809x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1809x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1809-C1-Win10_1809x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1809-C2-Win10_1809x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1809x86.json b/lib/engines/hcktest/platforms/Win10_1809x86.json
index 3323751a..45eb1fed 100644
--- a/lib/engines/hcktest/platforms/Win10_1809x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1809x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1809-C1-Win10_1809x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1809-C2-Win10_1809x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64.json b/lib/engines/hcktest/platforms/Win10_1903x64.json
index 4f6168d3..89a6504f 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1903-C1-Win10_1903x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1903-C2-Win10_1903x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64_q35.json b/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
index c65f49cb..f756abdb 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
@@ -7,16 +7,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "8",
+      "cpus": 8,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "8",
+      "cpus": 8,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json b/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
index 3f176f3f..f38a558a 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x64_q35_viommu.json
@@ -10,16 +10,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "8",
+      "cpus": 8,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "8",
+      "cpus": 8,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_1903x86.json b/lib/engines/hcktest/platforms/Win10_1903x86.json
index c1fa0159..11642a01 100644
--- a/lib/engines/hcktest/platforms/Win10_1903x86.json
+++ b/lib/engines/hcktest/platforms/Win10_1903x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1903-C1-Win10_1903x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1903-C2-Win10_1903x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_2004x64.json b/lib/engines/hcktest/platforms/Win10_2004x64.json
index a3352a96..b5d02a0d 100644
--- a/lib/engines/hcktest/platforms/Win10_2004x64.json
+++ b/lib/engines/hcktest/platforms/Win10_2004x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2004-C1-Win10_2004x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2004-C2-Win10_2004x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win10_2004x86.json b/lib/engines/hcktest/platforms/Win10_2004x86.json
index cac8ecd9..f14ecdff 100644
--- a/lib/engines/hcktest/platforms/Win10_2004x86.json
+++ b/lib/engines/hcktest/platforms/Win10_2004x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2004-C1-Win10_2004x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2004-C2-Win10_2004x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
index 68590812..61556e03 100644
--- a/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
@@ -11,16 +11,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK11_22H2-C1-Win11_22H2x64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK11_22H2-C2-Win11_22H2x64-uefi-q35-viommu.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win11_23H2x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11_23H2x64_host_uefi_q35_viommu.json
index 57b92bf7..a19bb5ac 100644
--- a/lib/engines/hcktest/platforms/Win11_23H2x64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win11_23H2x64_host_uefi_q35_viommu.json
@@ -11,16 +11,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK11_23H2-C1-Win11_23H2x64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK11_23H2-C2-Win11_23H2x64-uefi-q35-viommu.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
index 34919eb2..504b2ebb 100644
--- a/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
@@ -11,16 +11,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK11_next-C1-Win11nextx64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK11_next-C2-Win11nextx64-uefi-q35-viommu.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2008R2x64.json b/lib/engines/hcktest/platforms/Win2008R2x64.json
index 5e0ba3c6..b5038a5c 100644
--- a/lib/engines/hcktest/platforms/Win2008R2x64.json
+++ b/lib/engines/hcktest/platforms/Win2008R2x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win2008R2x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win2008R2x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2012R2x64.json b/lib/engines/hcktest/platforms/Win2012R2x64.json
index e36b97c8..d6eb8852 100644
--- a/lib/engines/hcktest/platforms/Win2012R2x64.json
+++ b/lib/engines/hcktest/platforms/Win2012R2x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win2012R2x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win2012R2x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2012x64.json b/lib/engines/hcktest/platforms/Win2012x64.json
index d2d64fa3..da3d65ff 100644
--- a/lib/engines/hcktest/platforms/Win2012x64.json
+++ b/lib/engines/hcktest/platforms/Win2012x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win2012x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win2012x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2016x64.json b/lib/engines/hcktest/platforms/Win2016x64.json
index 29375d94..4b000e6d 100644
--- a/lib/engines/hcktest/platforms/Win2016x64.json
+++ b/lib/engines/hcktest/platforms/Win2016x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1607-C1-Win2016x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1607-C2-Win2016x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2016x64_uefi.json b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
index b02f4896..0c740957 100644
--- a/lib/engines/hcktest/platforms/Win2016x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
@@ -8,16 +8,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1607-C1-Win2016x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1607-C2-Win2016x64-uefi.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2019x64.json b/lib/engines/hcktest/platforms/Win2019x64.json
index 5b12ec52..20b023f2 100644
--- a/lib/engines/hcktest/platforms/Win2019x64.json
+++ b/lib/engines/hcktest/platforms/Win2019x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1809-C1-Win2019x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1809-C2-Win2019x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2019x64_uefi.json b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
index 2059615f..b7e318f4 100644
--- a/lib/engines/hcktest/platforms/Win2019x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
@@ -8,16 +8,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK1809-C1-Win2019x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK1809-C2-Win2019x64-uefi.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
index 5663d4ee..cca30ef3 100644
--- a/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
@@ -11,16 +11,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2022_next-C1-Win2022nextx64-host-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2022_next-C2-Win2022nextx64-host-uefi-q35-viommu.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2022x64.json b/lib/engines/hcktest/platforms/Win2022x64.json
index ed3da6c3..6764d93d 100644
--- a/lib/engines/hcktest/platforms/Win2022x64.json
+++ b/lib/engines/hcktest/platforms/Win2022x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2022-C1-Win2022x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2022-C2-Win2022x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
index 2c18f6de..8a804a46 100644
--- a/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
+++ b/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
@@ -11,16 +11,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2022-C1-Win2022x64-uefi-q35-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2022-C2-Win2022x64-uefi-q35-viommu.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2022x64_uefi.json b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
index c30e57d6..676e3427 100644
--- a/lib/engines/hcktest/platforms/Win2022x64_uefi.json
+++ b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
@@ -8,16 +8,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2022-C1-Win2022x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2022-C2-Win2022x64-uefi.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win2025x64_host_uefi_q35.json b/lib/engines/hcktest/platforms/Win2025x64_host_uefi_q35.json
index a25b3bd2..2a4ac1ce 100644
--- a/lib/engines/hcktest/platforms/Win2025x64_host_uefi_q35.json
+++ b/lib/engines/hcktest/platforms/Win2025x64_host_uefi_q35.json
@@ -10,16 +10,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HLK2025-C1-Win2025x64-uefi-q35.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 8,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HLK2025-C2-Win2025x64-uefi-q35.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win7x64.json b/lib/engines/hcktest/platforms/Win7x64.json
index 213674d1..fa4ac814 100644
--- a/lib/engines/hcktest/platforms/Win7x64.json
+++ b/lib/engines/hcktest/platforms/Win7x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win7x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 4,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win7x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win7x86.json b/lib/engines/hcktest/platforms/Win7x86.json
index a4ba2189..8a18c870 100644
--- a/lib/engines/hcktest/platforms/Win7x86.json
+++ b/lib/engines/hcktest/platforms/Win7x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win7x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win7x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win81x64.json b/lib/engines/hcktest/platforms/Win81x64.json
index 8c0a3f0b..efc3e345 100644
--- a/lib/engines/hcktest/platforms/Win81x64.json
+++ b/lib/engines/hcktest/platforms/Win81x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win81x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win81x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win81x86.json b/lib/engines/hcktest/platforms/Win81x86.json
index 438f6f6b..ba845693 100644
--- a/lib/engines/hcktest/platforms/Win81x86.json
+++ b/lib/engines/hcktest/platforms/Win81x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win81x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win81x86.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win8x64.json b/lib/engines/hcktest/platforms/Win8x64.json
index c7cc84a5..d78d5ed5 100644
--- a/lib/engines/hcktest/platforms/Win8x64.json
+++ b/lib/engines/hcktest/platforms/Win8x64.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win8x64.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win8x64.qcow2"
     }
   }
diff --git a/lib/engines/hcktest/platforms/Win8x86.json b/lib/engines/hcktest/platforms/Win8x86.json
index 5efc658e..4a3f4091 100644
--- a/lib/engines/hcktest/platforms/Win8x86.json
+++ b/lib/engines/hcktest/platforms/Win8x86.json
@@ -6,16 +6,16 @@
   "clients": {
     "c1": {
       "name": "CL1",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4002",
+      "winrm_port": 4002,
       "image": "HCK-C1-Win8x86.qcow2"
     },
     "c2": {
       "name": "CL2",
-      "cpus": "4",
+      "cpus": 4,
       "memory_gb": 2,
-      "winrm_port": "4003",
+      "winrm_port": 4003,
       "image": "HCK-C2-Win8x86.qcow2"
     }
   }