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 5e9e196..52018a1 100644 (file)
--- a/test/data/htools/hail-alloc-twodisks.json
+++ b/test/data/htools/hail-alloc-twodisks.json
@@ -57,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": {
@@ -73,9 +77,11 @@
     "disk_template": "file",
     "disks": [
       {
+        "spindles": 1,
         "size": 1536
       },
       {
+        "spindles": 1,
         "size": 1536
       }
     ],