Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / test / data / htools / hail-alloc-twodisks.json

diff --git a/test/data/htools/hail-alloc-twodisks.json b/test/data/htools/hail-alloc-twodisks.json
index 2a4f636..52018a1 100644 (file)
--- a/test/data/htools/hail-alloc-twodisks.json
+++ b/test/data/htools/hail-alloc-twodisks.json
@@ -16,24 +16,26 @@
         "disk-templates": [
           "file"
         ],
-        "minmax": {
-          "max": {
-            "cpu-count": 2,
-            "disk-count": 8,
-            "disk-size": 2048,
-            "memory-size": 12800,
-            "nic-count": 8,
-            "spindle-use": 8
-          },
-          "min": {
-            "cpu-count": 1,
-            "disk-count": 1,
-            "disk-size": 1024,
-            "memory-size": 128,
-            "nic-count": 1,
-            "spindle-use": 1
+        "minmax": [
+          {
+            "max": {
+              "cpu-count": 2,
+              "disk-count": 8,
+              "disk-size": 2048,
+              "memory-size": 12800,
+              "nic-count": 8,
+              "spindle-use": 8
+            },
+            "min": {
+              "cpu-count": 1,
+              "disk-count": 1,
+              "disk-size": 1024,
+              "memory-size": 128,
+              "nic-count": 1,
+              "spindle-use": 1
+            }
           }
-        },
+        ],
         "spindle-ratio": 32.0,
         "std": {
           "cpu-count": 1,
@@ -46,6 +48,7 @@
         "vcpu-ratio": 4.0
       },
       "name": "default",
+      "networks": [],
       "tags": []
     }
   },
@@ -54,15 +57,19 @@
       "drained": false,
       "free_disk": 1377280,
       "free_memory": 31389,
+      "free_spindles": 12,
       "group": "uuid-group-1",
       "ndparams": {
-        "spindle_count": 1
+        "spindle_count": 1,
+        "exclusive_storage": false
       },
       "offline": false,
       "reserved_memory": 1017,
+      "reserved_cpus": 1,
       "total_cpus": 4,
       "total_disk": 1377280,
-      "total_memory": 32763
+      "total_memory": 32763,
+      "total_spindles": 12
     }
   },
   "request": {
@@ -70,9 +77,11 @@
     "disk_template": "file",
     "disks": [
       {
+        "spindles": 1,
         "size": 1536
       },
       {
+        "spindles": 1,
         "size": 1536
       }
     ],
@@ -82,7 +91,8 @@
     "spindle_use": 2,
     "tags": [],
     "type": "allocate",
-    "vcpus": 1
+    "vcpus": 1,
+    "nics": []
   },
   "version": 2
 }